From f76d2d47d8cbefc4ce87589471062dec2f36562e Mon Sep 17 00:00:00 2001
From: Nick Davis <nick.davis@narfindustries.com>
Date: Mon, 1 Feb 2016 18:09:22 -0500
Subject: [PATCH 01/68] Fixed bugs in @NbBundle.Messages annotations (scope and
 mis-spellings of tags).

---
 .../src/org/sleuthkit/autopsy/imagegallery/actions/Back.java | 4 ++--
 .../sleuthkit/autopsy/imagegallery/actions/OpenAction.java   | 4 ++--
 .../org/sleuthkit/autopsy/imagegallery/gui/StatusBar.java    | 5 ++---
 .../imagegallery/gui/drawableviews/DrawableTileBase.java     | 4 ++--
 .../autopsy/imagegallery/gui/drawableviews/GroupPane.java    | 2 +-
 5 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/actions/Back.java b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/actions/Back.java
index 1b051e6fb2..ca11b8420a 100644
--- a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/actions/Back.java
+++ b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/actions/Back.java
@@ -31,15 +31,15 @@ import org.sleuthkit.autopsy.imagegallery.ImageGalleryController;
  *
  */
 //TODO: This and the corresponding timeline action are identical except for the type of the controller...  abstract something! -jm
+@NbBundle.Messages({"Back_diplayName=Back"})
 public class Back extends Action {
 
     private static final Image BACK_IMAGE = new Image("/org/sleuthkit/autopsy/imagegallery/images/arrow-180.png", 16, 16, true, true, true); //NON-NLS
 
     private final ImageGalleryController controller;
 
-    @NbBundle.Messages({"Back.diplayName=Back"})
     public Back(ImageGalleryController controller) {
-        super(Bundle.Back_displayName());
+        super(Bundle.Back_diplayName());
         setGraphic(new ImageView(BACK_IMAGE));
         setAccelerator(new KeyCodeCombination(KeyCode.LEFT, KeyCodeCombination.ALT_DOWN));
         this.controller = controller;
diff --git a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/actions/OpenAction.java b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/actions/OpenAction.java
index a758107da5..ea0d04abf8 100644
--- a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/actions/OpenAction.java
+++ b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/actions/OpenAction.java
@@ -87,8 +87,8 @@ public final class OpenAction extends CallableSystemAction {
 
         if (ImageGalleryModule.isDrawableDBStale(currentCase)) {
             //drawable db is stale, ask what to do
-            int answer = JOptionPane.showConfirmDialog(WindowManager.getDefault().getMainWindow(), Bundle.OpenAction.stale.confDlg.msg(),
-                    Bundle.OpenAction_stale_confDlg.title(), JOptionPane.YES_NO_CANCEL_OPTION, JOptionPane.WARNING_MESSAGE);
+            int answer = JOptionPane.showConfirmDialog(WindowManager.getDefault().getMainWindow(), Bundle.OpenAction_stale_confDlg_msg(),
+                    Bundle.OpenAction_stale_confDlg_title(), JOptionPane.YES_NO_CANCEL_OPTION, JOptionPane.WARNING_MESSAGE);
 
             switch (answer) {
                 case JOptionPane.YES_OPTION:
diff --git a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/StatusBar.java b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/StatusBar.java
index 0a0ce0f663..607dcd1b1c 100644
--- a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/StatusBar.java
+++ b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/StatusBar.java
@@ -63,8 +63,7 @@ public class StatusBar extends AnchorPane {
     private ProgressBar bgTaskProgressBar;
 
     @FXML
-    @NbBundle.Messages({"# {0} - file update queue size",
-            "StatusBar.fileUpdateTaskLabel.text={0} File Update Tasks",
+    @NbBundle.Messages({"StatusBar.fileUpdateTaskLabel.text= File Update Tasks",
             "StatusBar.bgTaskLabel.text=Regrouping",
             "StatuBar.toolTip=Some data may be out of date.  Enable Image Gallery in Tools | Options | Image /Video Gallery , after ingest is complete to update the Image Gallery data."})
     void initialize() {
@@ -74,7 +73,7 @@ public class StatusBar extends AnchorPane {
         assert bgTaskLabel != null : "fx:id=\"bgTaskLabel\" was not injected: check your FXML file 'StatusBar.fxml'.";
         assert bgTaskProgressBar != null : "fx:id=\"bgTaskProgressBar\" was not injected: check your FXML file 'StatusBar.fxml'.";
 
-        fileUpdateTaskLabel.textProperty().bind(Bundle.StatusBar_fileUpdateTaskLabel_text(controller.getFileUpdateQueueSizeProperty().asString()));//;setText(newSize.toString() + " File Update Tasks");
+        fileUpdateTaskLabel.textProperty().bind(controller.getFileUpdateQueueSizeProperty().asString().concat(Bundle.StatusBar_fileUpdateTaskLabel_text()));//;setText(newSize.toString() + " File Update Tasks");
         fileTaskProgresBar.progressProperty().bind(controller.getFileUpdateQueueSizeProperty().negate());
 //        controller.getFileUpdateQueueSizeProperty().addListener((ov, oldSize, newSize) -> {
 //            Platform.runLater(() -> {
diff --git a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/drawableviews/DrawableTileBase.java b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/drawableviews/DrawableTileBase.java
index 7cbc9350cb..3b16fa6b77 100644
--- a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/drawableviews/DrawableTileBase.java
+++ b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/drawableviews/DrawableTileBase.java
@@ -145,6 +145,8 @@ public abstract class DrawableTileBase extends DrawableUIBase {
      * @param groupPane  the value of groupPane
      * @param controller the value of controller
      */
+    @NbBundle.Messages({"DrawableTileBase.menuItem.extractFiles=Extract File(s)",
+            "DrawableTileBase.menuItem.showContentViewer=Show Content Viewer"})
     protected DrawableTileBase(GroupPane groupPane, final ImageGalleryController controller) {
         super(controller);
         this.groupPane = groupPane;
@@ -197,8 +199,6 @@ public abstract class DrawableTileBase extends DrawableUIBase {
                 t.consume();
             }
 
-            @NbBundle.Messages({"DrawableTileBase.menuItem.extractFiles=Extract File(s)",
-                    "DrawableTileBase.menuItem.showContentViewer=Show Content Viewer"})
             private ContextMenu buildContextMenu(DrawableFile<?> file) {
                 final ArrayList<MenuItem> menuItems = new ArrayList<>();
 
diff --git a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/drawableviews/GroupPane.java b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/drawableviews/GroupPane.java
index 7955368a9e..965736ece8 100644
--- a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/drawableviews/GroupPane.java
+++ b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/drawableviews/GroupPane.java
@@ -397,6 +397,7 @@ public class GroupPane extends BorderPane {
      * checks that FXML loading went ok and performs additional setup
      */
     @FXML
+    @NbBundle.Messages({"GroupPane.gridViewContextMenuItem.extractFiles=Extract File(s)"})
     void initialize() {
         assert cat0Toggle != null : "fx:id=\"cat0Toggle\" was not injected: check your FXML file 'SlideShowView.fxml'.";
         assert cat1Toggle != null : "fx:id=\"cat1Toggle\" was not injected: check your FXML file 'SlideShowView.fxml'.";
@@ -519,7 +520,6 @@ public class GroupPane extends BorderPane {
         addEventFilter(KeyEvent.KEY_PRESSED, tileKeyboardNavigationHandler);
         gridView.addEventHandler(MouseEvent.MOUSE_CLICKED, new EventHandler<MouseEvent>() {
 
-            @NbBundle.Messages({"GroupPane.gridViewContextMenuItem.extractFiles=Extract File(s)"})
             private ContextMenu buildContextMenu() {
                 ArrayList<MenuItem> menuItems = new ArrayList<>();
 

From d0446ea3d541fce7e0aeb31b33edbe760303bbc6 Mon Sep 17 00:00:00 2001
From: Kay Bassi <kb@narfindustries.com>
Date: Mon, 1 Feb 2016 16:06:35 -0800
Subject: [PATCH 02/68] Finished translation/editing

---
 .../org/sleuthkit/autopsy/contentviewers/Bundle_ja.properties   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Core/src/org/sleuthkit/autopsy/contentviewers/Bundle_ja.properties b/Core/src/org/sleuthkit/autopsy/contentviewers/Bundle_ja.properties
index 4068c5be0e..31cda15feb 100644
--- a/Core/src/org/sleuthkit/autopsy/contentviewers/Bundle_ja.properties
+++ b/Core/src/org/sleuthkit/autopsy/contentviewers/Bundle_ja.properties
@@ -13,7 +13,7 @@ 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
+Metadata.nodeText.nonFilePassedIn=\u5165\u529B\u3055\u308C\u305F\u3082\u306E\u306F\u30D5\u30A1\u30A4\u30EB\u3067\u306F\u3042\u308A\u307E\u305B\u3093
 Metadata.tableRowTitle.type=\u30BF\u30A4\u30D7
 Metadata.nodeText.exceptionNotice.text=\u30D5\u30A1\u30A4\u30EB\u30E1\u30BF\u30C7\u30FC\u30BF\u3092\u53D6\u5F97\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F\uFF1A
 Metadata.nodeText.text=Sleuth Kit istat\u30C4\u30FC\u30EB\u304B\u3089\uFF1A
\ No newline at end of file

From 86ffcac6b7a06f011cd8d78d82690b9e15535df0 Mon Sep 17 00:00:00 2001
From: Kay Bassi <kb@narfindustries.com>
Date: Tue, 2 Feb 2016 10:20:34 -0800
Subject: [PATCH 03/68] Completed editing/translation

---
 .../org/sleuthkit/autopsy/filesearch/Bundle_ja.properties  | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/filesearch/Bundle_ja.properties b/Core/src/org/sleuthkit/autopsy/filesearch/Bundle_ja.properties
index c2d100672c..891bf77b29 100644
--- a/Core/src/org/sleuthkit/autopsy/filesearch/Bundle_ja.properties
+++ b/Core/src/org/sleuthkit/autopsy/filesearch/Bundle_ja.properties
@@ -1,6 +1,6 @@
 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.knownBadOptionCheckBox.text=\u65E2\u77E5\u306E\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
@@ -31,7 +31,7 @@ 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.custComp.label.text=\u6B21\u306E\u6761\u4EF6\u306B\u4E00\u81F4\u3059\u308B\u30D5\u30A1\u30A4\u30EB\u3092\u691C\u7D22\uFF1A
 FileSearchPanel.filterTitle.name=\u540D\u524D
 FileSearchPanel.filterTitle.metadata=\u30E1\u30BF\u30C7\u30FC\u30BF
 FileSearchPanel.filterTitle.knownStatus=\u65E2\u77E5\u30B9\u30C6\u30FC\u30BF\u30B9
@@ -40,8 +40,9 @@ FileSearchPanel.search.results.title=\u30D5\u30A1\u30A4\u30EB\u691C\u7D22\u7D50\
 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.exception.noFilterSelected.msg=\u6700\u4F4E\uFF11\u500B\u306E\u30D5\u30A3\u30EB\u30BF\u30FC\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}
+FileSearchPanel.emptyWhereClause.text=\u7121\u52B9\u306A\u30AA\u30D7\u30B7\u30E7\u30F3\u3067\u3059\u3002\u8868\u793A\u3059\u308B\u3082\u306E\u304C\u3042\u308A\u307E\u305B\u3093\u3002
 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\u524D\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

From 91629abf70d2e9bee81a28244a5f33bc582562ba Mon Sep 17 00:00:00 2001
From: Kay Bassi <kb@narfindustries.com>
Date: Tue, 2 Feb 2016 10:45:06 -0800
Subject: [PATCH 04/68] Completed editing/translation

---
 .../autopsy/ingest/Bundle_ja.properties       | 204 ++++++++++--------
 1 file changed, 110 insertions(+), 94 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/ingest/Bundle_ja.properties b/Core/src/org/sleuthkit/autopsy/ingest/Bundle_ja.properties
index 44761bc32e..b11134b1ac 100644
--- a/Core/src/org/sleuthkit/autopsy/ingest/Bundle_ja.properties
+++ b/Core/src/org/sleuthkit/autopsy/ingest/Bundle_ja.properties
@@ -1,100 +1,116 @@
-CTL_IngestMessageTopComponent=\u30e1\u30c3\u30bb\u30fc\u30b8
-HINT_IngestMessageTopComponent=\u30e1\u30c3\u30bb\u30fc\u30b8\u30a6\u30a3\u30f3\u30c9\u30a6
-IngestDialog.closeButton.title=\u9589\u3058\u308b
-IngestDialog.startButton.title=\u958b\u59cb
-IngestDialog.title.text=\u30a4\u30f3\u30b8\u30a7\u30b9\u30c8\u30e2\u30b8\u30e5\u30fc\u30eb
-IngestJob.progress.cancelling={0}\uff08\u30ad\u30e3\u30f3\u30bb\u30eb\u4e2d\u2026\uff09
-IngestJob.progress.dataSourceIngest.displayName={1}\u306e{0}
-IngestJob.progress.fileIngest.displayName={0}\u306e\u30d5\u30a1\u30a4\u30eb\u3092\u89e3\u6790\u4e2d
-IngestManager.moduleErr=\u30e2\u30b8\u30e5\u30fc\u30eb\u30a8\u30e9\u30fc
-IngestManager.moduleErr.errListenToUpdates.msg=Ingest Manager\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
-IngestManager.StartIngestJobsTask.run.cancelling={0}\uff08\u30ad\u30e3\u30f3\u30bb\u30eb\u4e2d\u2026\uff09
-IngestManager.StartIngestJobsTask.run.displayName=\u30a4\u30f3\u30b8\u30a7\u30b9\u30c8\u958b\u59cb\u4e2d
-IngestMessage.exception.srcSubjDetailsDataNotNull.msg=\u30bd\u30fc\u30b9\u3001\u30b5\u30d6\u30b8\u30a7\u30af\u30c8\u3001\u8a73\u7d30\u304a\u3088\u3073\u30c7\u30fc\u30bf\u306f\u30cc\u30eb\u3067\u3042\u3063\u3066\u306f\u3044\u3051\u307e\u305b\u3093
-IngestMessage.exception.srcSubjNotNull.msg=\u30bd\u30fc\u30b9\u304a\u3088\u3073\u30b5\u30d6\u30b8\u30a7\u30af\u30c8\u306f\u30cc\u30eb\u3067\u3042\u3063\u3066\u306f\u3044\u3051\u307e\u305b\u3093
-IngestMessage.exception.typeSrcSubjNotNull.msg=\u30e1\u30c3\u30bb\u30fc\u30b8\u30bf\u30a4\u30d7\u3001\u30bd\u30fc\u30b9\u304a\u3088\u3073\u30b5\u30d6\u30b8\u30a7\u30af\u30c8\u306f\u30cc\u30eb\u3067\u3042\u3063\u3066\u306f\u3044\u3051\u307e\u305b\u3093
-IngestMessage.toString.data.text=\ \u30c7\u30fc\u30bf\uff1a{0}
-IngestMessage.toString.date.text=\ \u65e5\u4ed8\uff1a{0}
-IngestMessage.toString.details.text=\ \u8a73\u7d30\uff1a{0}
-IngestMessage.toString.subject.text=\ \u30b5\u30d6\u30b8\u30a7\u30af\u30c8\uff1a{0}
-IngestMessage.toString.type.text=\u30bf\u30a4\u30d7\uff1a{0}
-IngestMessageDetailsPanel.copyMenuItem.text=\u30b3\u30d4\u30fc
-IngestMessageDetailsPanel.messageDetailsPane.contentType=\u30c6\u30ad\u30b9\u30c8\uff0fhtml
-IngestMessageDetailsPanel.selectAllMenuItem.text=\u3059\u3079\u3066\u9078\u629e
-IngestMessageDetailsPanel.viewArtifactButton.text=\u7d50\u679c\u3078\u79fb\u52d5
-IngestMessageDetailsPanel.viewContentButton.text=\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u3078\u79fb\u52d5
-IngestMessagePanel.BooleanRenderer.exception.nonBoolVal.msg=\u30d6\u30fc\u30eb\u5024\u3067\u306f\u306a\u3044\u3082\u306e\u306bBooleanRenderer\u3092\u4f7f\u7528\u3057\u3088\u3046\u3068\u3057\u307e\u3057\u305f\u3002
-IngestMessagePanel.DateRenderer.exception.nonDateVal.text=\u65e5\u4ed8\u3067\u306f\u306a\u3044\u3082\u306e\u306bDateRenderer\u3092\u4f7f\u7528\u3057\u3088\u3046\u3068\u3057\u307e\u3057\u305f\u3002
-IngestMessagePanel.moduleErr=\u30e2\u30b8\u30e5\u30fc\u30eb\u30a8\u30e9\u30fc
-IngestMessagePanel.moduleErr.errListenUpdates.text=IngestMessagePanel\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
-IngestMessagePanel.MsgTableMod.colNames.module=\u30e2\u30b8\u30e5\u30fc\u30eb
-IngestMessagePanel.MsgTableMod.colNames.new=\u65b0\u898f\uff1f
-IngestMessagePanel.MsgTableMod.colNames.num=\u756a\u53f7
-IngestMessagePanel.MsgTableMod.colNames.subject=\u30b5\u30d6\u30b8\u30a7\u30af\u30c8
-IngestMessagePanel.MsgTableMod.colNames.timestamp=\u30bf\u30a4\u30e0\u30b9\u30bf\u30f3\u30d7
-IngestMessagePanel.sortByComboBox.model.priority=\u512a\u5148\u5ea6
+CTL_IngestMessageTopComponent=\u30E1\u30C3\u30BB\u30FC\u30B8
+HINT_IngestMessageTopComponent=\u30E1\u30C3\u30BB\u30FC\u30B8\u30A6\u30A3\u30F3\u30C9\u30A6
+IngestDialog.closeButton.title=\u9589\u3058\u308B
+IngestDialog.startButton.title=\u958B\u59CB
+IngestDialog.title.text=\u30E2\u30B8\u30E5\u30FC\u30EB\u3092\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8
+IngestJob.progress.cancelling={0}\uFF08\u30AD\u30E3\u30F3\u30BB\u30EB\u4E2D\u2026\uFF09
+IngestJob.progress.dataSourceIngest.displayName={1}\u306E{0}
+IngestJob.progress.fileIngest.displayName={0}\u306E\u30D5\u30A1\u30A4\u30EB\u3092\u89E3\u6790\u4E2D
+IngestManager.moduleErr=\u30E2\u30B8\u30E5\u30FC\u30EB\u30A8\u30E9\u30FC
+IngestManager.moduleErr.errListenToUpdates.msg=Ingest Manager\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\u3092\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
+IngestManager.StartIngestJobsTask.run.cancelling={0}\uFF08\u30AD\u30E3\u30F3\u30BB\u30EB\u4E2D\u2026\uFF09
+IngestManager.StartIngestJobsTask.run.displayName=\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u958B\u59CB\u4E2D
+IngestMessage.exception.srcSubjDetailsDataNotNull.msg=\u30BD\u30FC\u30B9\u3001\u30B5\u30D6\u30B8\u30A7\u30AF\u30C8\u3001\u8A73\u7D30\u304A\u3088\u3073\u30C7\u30FC\u30BF\u306F\u30CC\u30EB\u3067\u306F\u3044\u3051\u307E\u305B\u3093
+IngestMessage.exception.srcSubjNotNull.msg=\u30BD\u30FC\u30B9\u304A\u3088\u3073\u30B5\u30D6\u30B8\u30A7\u30AF\u30C8\u306F\u30CC\u30EB\u3067\u306F\u3044\u3051\u307E\u305B\u3093
+IngestMessage.exception.typeSrcSubjNotNull.msg=\u30E1\u30C3\u30BB\u30FC\u30B8\u30BF\u30A4\u30D7\u3001\u30BD\u30FC\u30B9\u304A\u3088\u3073\u30B5\u30D6\u30B8\u30A7\u30AF\u30C8\u306F\u30CC\u30EB\u3067\u306F\u3044\u3051\u307E\u305B\u3093
+IngestMessage.toString.data.text=\ \u30C7\u30FC\u30BF\uFF1A{0}
+IngestMessage.toString.date.text=\ \u65E5\u4ED8\uFF1A{0}
+IngestMessage.toString.details.text=\ \u8A73\u7D30\uFF1A{0}
+IngestMessage.toString.subject.text=\ \u30B5\u30D6\u30B8\u30A7\u30AF\u30C8\uFF1A{0}
+IngestMessage.toString.type.text=\u30BF\u30A4\u30D7\uFF1A{0}
+IngestMessageDetailsPanel.copyMenuItem.text=\u30B3\u30D4\u30FC
+IngestMessageDetailsPanel.messageDetailsPane.contentType=\u30C6\u30AD\u30B9\u30C8\uFF0Fhtml
+IngestMessageDetailsPanel.selectAllMenuItem.text=\u3059\u3079\u3066\u9078\u629E
+IngestMessageDetailsPanel.viewArtifactButton.text=\u7D50\u679C\u3078\u79FB\u52D5
+IngestMessageDetailsPanel.viewContentButton.text=\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3078\u79FB\u52D5
+IngestMessagePanel.BooleanRenderer.exception.nonBoolVal.msg=\u30D6\u30FC\u30EB\u5024\u3067\u306F\u306A\u3044\u3082\u306E\u306BBooleanRenderer\u3092\u4F7F\u7528\u3057\u3088\u3046\u3068\u3057\u307E\u3057\u305F\u3002
+IngestMessagePanel.DateRenderer.exception.nonDateVal.text=\u65E5\u4ED8\u3067\u306F\u306A\u3044\u3082\u306E\u306BDateRenderer\u3092\u4F7F\u7528\u3057\u3088\u3046\u3068\u3057\u307E\u3057\u305F\u3002
+IngestMessagePanel.moduleErr=\u30E2\u30B8\u30E5\u30FC\u30EB\u30A8\u30E9\u30FC
+IngestMessagePanel.moduleErr.errListenUpdates.text=IngestMessagePanel\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\u3092\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
+IngestMessagePanel.MsgTableMod.colNames.module=\u30E2\u30B8\u30E5\u30FC\u30EB
+IngestMessagePanel.MsgTableMod.colNames.new=\u65B0\u898F\uFF1F
+IngestMessagePanel.MsgTableMod.colNames.num=\u756A\u53F7
+IngestMessagePanel.MsgTableMod.colNames.subject=\u30B5\u30D6\u30B8\u30A7\u30AF\u30C8
+IngestMessagePanel.MsgTableMod.colNames.timestamp=\u30BF\u30A4\u30E0\u30B9\u30BF\u30F3\u30D7
+IngestMessagePanel.sortByComboBox.model.priority=\u512A\u5148\u5EA6
 IngestMessagePanel.sortByComboBox.model.time=\u6642\u9593
-IngestMessagePanel.sortByComboBox.toolTipText=\u6642\u9593\u9806\uff08\u6642\u7cfb\u5217\uff09\u307e\u305f\u306f\u30e1\u30c3\u30bb\u30fc\u30b8\u306e\u512a\u5148\u5ea6\u3067\u30bd\u30fc\u30c8
-IngestMessagePanel.sortByLabel.text=\u4e0b\u8a18\u3067\u30bd\u30fc\u30c8\uff1a
-IngestMessagePanel.totalMessagesNameLabel.text=\u5408\u8a08\uff1a
+IngestMessagePanel.sortByComboBox.toolTipText=\u6642\u9593\u9806\uFF08\u6642\u7CFB\u5217\uFF09\u307E\u305F\u306F\u30E1\u30C3\u30BB\u30FC\u30B8\u306E\u512A\u5148\u5EA6\u3067\u30BD\u30FC\u30C8
+IngestMessagePanel.sortByLabel.text=\u6B21\u3067\u30BD\u30FC\u30C8\uFF1A
+IngestMessagePanel.totalMessagesNameLabel.text=\u5408\u8A08\uFF1A
 IngestMessagePanel.totalMessagesNameVal.text=-
-IngestMessagePanel.totalUniqueMessagesNameLabel.text=\u30e6\u30cb\u30fc\u30af\uff1a
+IngestMessagePanel.totalUniqueMessagesNameLabel.text=\u30E6\u30CB\u30FC\u30AF\uFF1A
 IngestMessagePanel.totalUniqueMessagesNameVal.text=-
-IngestMessagesToolbar.customizeButton.toolTipText=\u30a4\u30f3\u30b8\u30a7\u30b9\u30c8\u30e1\u30c3\u30bb\u30fc\u30b8
-IngestMessageTopComponent.displayName=\u30a4\u30f3\u30b8\u30a7\u30b9\u30c8\u30a4\u30f3\u30dc\u30c3\u30af\u30b9
-IngestMessageTopComponent.displayReport.option.GenRpt=\u30ec\u30dd\u30fc\u30c8\u751f\u6210
+IngestMessagesToolbar.customizeButton.toolTipText=\u30E1\u30C3\u30BB\u30FC\u30B8\u3092\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8
+IngestMessageTopComponent.displayName=\u30A4\u30F3\u30DC\u30C3\u30AF\u30B9\u3092\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8
+IngestMessageTopComponent.displayReport.option.GenRpt=\u30EC\u30DD\u30FC\u30C8\u3092\u751F\u6210
 IngestMessageTopComponent.displayReport.option.OK=OK
-IngestMessageTopComponent.initComponents.name=\u30a4\u30f3\u30b8\u30a7\u30b9\u30c8\u30a4\u30f3\u30dc\u30c3\u30af\u30b9
-IngestMessageTopComponent.msgDlg.ingestRpt.text=\u30a4\u30f3\u30b8\u30a7\u30b9\u30c8\u30ec\u30dd\u30fc\u30c8
-IngestMonitor.mgrErrMsg.lowDiskSpace.msg=\u30c7\u30a3\u30b9\u30af{0}\u306e\u30c7\u30a3\u30b9\u30af\u9818\u57df\u4e0d\u8db3\u306e\u305f\u3081\u30a4\u30f3\u30b8\u30a7\u30b9\u30c8\u3092\u4e2d\u6b62\u3057\u307e\u3059\u3002\n\u30b1\u30fc\u30b9\u30c9\u30e9\u30a4\u30d6\u306b\u6700\u4f4e1GB\u306e\u7a7a\u304d\u9818\u57df\u304c\u3042\u308b\u306e\u3092\u78ba\u8a8d\u3057\u3001\u30a4\u30f3\u30b8\u30a7\u30b9\u30c8\u3092\u518d\u30b9\u30bf\u30fc\u30c8\u3057\u3066\u4e0b\u3055\u3044\u3002
-IngestMonitor.mgrErrMsg.lowDiskSpace.title=\u30a4\u30f3\u30b8\u30a7\u30b9\u30c8\u304c\u4e2d\u6b62\u3055\u308c\u307e\u3057\u305f\u30fc{0}\u306e\u30c7\u30a3\u30b9\u30af\u9818\u57df\u4e0d\u8db3
-OpenIDE-Module-Name=\u30a4\u30f3\u30b8\u30a7\u30b9\u30c8
-IngestManager.StartIngestJobsTask.run.startupErr.dlgErrorList=\n\u30a8\u30e9\u30fc\uff1a\n{0}
-IngestManager.StartIngestJobsTask.run.startupErr.dlgMsg=\uff11\u3064\u307e\u305f\u306f\u8907\u6570\u306e\u30a4\u30f3\u30b8\u30a7\u30b9\u30c8\u30e2\u30b8\u30e5\u30fc\u30eb\u3092\u30b9\u30bf\u30fc\u30c8\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002\u30a4\u30f3\u30b8\u30a7\u30b9\u30c8\u30b8\u30e7\u30d6\u306f\u30ad\u30e3\u30f3\u30bb\u30eb\u3055\u308c\u307e\u3057\u305f\u3002
-IngestManager.StartIngestJobsTask.run.startupErr.dlgSolution=\u5931\u6557\u3057\u305f\u30e2\u30b8\u30e5\u30fc\u30eb\u3092\u7121\u52b9\u5316\u3059\u308b\u304b\u30a8\u30e9\u30fc\u3092\u89e3\u6c7a\u3057\u3001\u305d\u306e\u5f8c\u30c7\u30fc\u30bf\u30bd\u30fc\u30b9\u3092\u53f3\u30af\u30ea\u30c3\u30af\u3057\u3001\n\u300c\u30a4\u30f3\u30b8\u30a7\u30b9\u30c8\u30e2\u30b8\u30e5\u30fc\u30eb\u5b9f\u884c\u300d\u3092\u9078\u629e\u3057\u3066\u3001\u30a4\u30f3\u30b8\u30a7\u30b9\u30c8\u3092\u30ea\u30b9\u30bf\u30fc\u30c8\u3057\u3066\u4e0b\u3055\u3044\u3002
-IngestManager.StartIngestJobsTask.run.startupErr.dlgTitle=\u30a4\u30f3\u30b8\u30a7\u30b9\u30c8\u5931\u6557
-IngestJobSettings.createModuleSettingsFolder.warning=\u30a4\u30f3\u30b8\u30a7\u30b9\u30c8\u30e2\u30b8\u30e5\u30fc\u30eb\u8a2d\u5b9a\u30d5\u30a9\u30eb\u30c0\u306e\u4f5c\u6210\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002\u8a2d\u5b9a\u3092\u4fdd\u5b58\u3067\u304d\u307e\u305b\u3093\u3002
-IngestJob.progress.dataSourceIngest.initialDisplayName={0}\u3092\u89e3\u6790\u4e2d
-IngestProgressSnapshotPanel.SnapshotsTableModel.colNames.dataSource=\u30c7\u30fc\u30bf\u30bd\u30fc\u30b9
-IngestProgressSnapshotPanel.SnapshotsTableModel.colNames.elapsedTime=\u7d4c\u904e\u6642\u9593\uff08\u6642\uff1a\u5206\uff1a\u79d2\uff09
-IngestProgressSnapshotPanel.SnapshotsTableModel.colNames.file=\u30d5\u30a1\u30a4\u30eb
-IngestProgressSnapshotPanel.SnapshotsTableModel.colNames.startTime=\u958b\u59cb\u6642\u9593
-IngestProgressSnapshotPanel.SnapshotsTableModel.colNames.threadID=\u30b9\u30ec\u30c3\u30c9ID
-IngestManager.IngestMessage.ErrorMessageLimitReached.msg=\u6700\u5927\u6570({0})\u306e\u30a8\u30e9\u30fc\u304a\u3088\u3073\u307e\u305f\u306f\u8b66\u544a\u30e1\u30c3\u30bb\u30fc\u30b8\u304c\u63b2\u8f09\u3055\u308c\u307e\u3057\u305f\u3002\u3055\u3089\u306a\u308b\u30a8\u30e9\u30fc\uff0f\u8b66\u544a\u306f\u30ed\u30b0\u3092\u78ba\u8a8d\u3057\u3066\u4e0b\u3055\u3044\uff08\u30d8\u30eb\u30d7->\u30ed\u30b0\u30d5\u30a9\u30eb\u30c0\u30fc\u3092\u958b\u304f\uff09
-IngestManager.IngestMessage.ErrorMessageLimitReached.subject=\u6700\u5927\u6570\u306e\u30a8\u30e9\u30fc\u304c\u63b2\u8f09\u3055\u308c\u307e\u3057\u305f
-IngestManager.IngestMessage.ErrorMessageLimitReached.title=\u30a4\u30f3\u30b8\u30a7\u30b9\u30c8\u30de\u30cd\u30b8\u30e3\u30fc
-IngestManager.IngestThreadActivitySnapshot.idleThread=\u30a2\u30a4\u30c9\u30eb
-IngestProgressSnapshotDialog.title.text=\u30a4\u30f3\u30b8\u30a7\u30b9\u30c8\u30d7\u30ed\u30b0\u30ec\u30b9\u30fb\u30b9\u30ca\u30c3\u30d7\u30b7\u30e7\u30c3\u30c8
-IngestProgressSnapshotPanel.closeButton.text=\u9589\u3058\u308b
-IngestProgressSnapshotPanel.refreshButton.text=\u30ea\u30d5\u30ec\u30c3\u30b7\u30e5
-IngestProgressSnapshotPanel.SnapshotsTableModel.colNames.activity=\u30a2\u30af\u30c6\u30a3\u30d3\u30c6\u30a3
-IngestJobSettingsPanel.advancedButton.actionCommand=\u30a2\u30c9\u30d0\u30f3\u30b9
-IngestJobSettingsPanel.advancedButton.text=\u30a2\u30c9\u30d0\u30f3\u30b9
+IngestMessageTopComponent.initComponents.name=\u30A4\u30F3\u30DC\u30C3\u30AF\u30B9\u3092\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8
+IngestMessageTopComponent.msgDlg.ingestRpt.text=\u30EC\u30DD\u30FC\u30C8\u3092\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8
+IngestMonitor.mgrErrMsg.lowDiskSpace.msg=\u30C7\u30A3\u30B9\u30AF{0}\u306E\u30C7\u30A3\u30B9\u30AF\u9818\u57DF\u4E0D\u8DB3\u306E\u305F\u3081\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u3092\u4E2D\u6B62\u3057\u307E\u3059\u3002\n\u30B1\u30FC\u30B9\u30C9\u30E9\u30A4\u30D6\u306B\u6700\u4F4E1GB\u306E\u7A7A\u304D\u9818\u57DF\u304C\u3042\u308B\u306E\u3092\u78BA\u8A8D\u3057\u3001\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u3092\u518D\u5B9F\u884C\u3057\u3066\u4E0B\u3055\u3044\u3002
+IngestMonitor.mgrErrMsg.lowDiskSpace.title=\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u304C\u4E2D\u6B62\u3055\u308C\u307E\u3057\u305F\u30FC{0}\u306E\u30C7\u30A3\u30B9\u30AF\u9818\u57DF\u4E0D\u8DB3
+OpenIDE-Module-Name=\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8
+IngestManager.StartIngestJobsTask.run.startupErr.dlgErrorList=\n\u30A8\u30E9\u30FC\uFF1A\n{0}
+IngestManager.StartIngestJobsTask.run.startupErr.dlgMsg=\u5358\u6570\u307E\u305F\u306F\u8907\u6570\u306E\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u30E2\u30B8\u30E5\u30FC\u30EB\u3092\u30B9\u30BF\u30FC\u30C8\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F\u3002\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u30B8\u30E7\u30D6\u306F\u30AD\u30E3\u30F3\u30BB\u30EB\u3055\u308C\u307E\u3057\u305F\u3002
+IngestManager.StartIngestJobsTask.run.startupErr.dlgSolution=\u5931\u6557\u3057\u305F\u30E2\u30B8\u30E5\u30FC\u30EB\u3092\u7121\u52B9\u5316\u3059\u308B\u304B\u30A8\u30E9\u30FC\u3092\u89E3\u6C7A\u3057\u3001\u305D\u306E\u5F8C\u30C7\u30FC\u30BF\u30BD\u30FC\u30B9\u3092\u53F3\u30AF\u30EA\u30C3\u30AF\u3057\u3001\n\u300C\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u30E2\u30B8\u30E5\u30FC\u30EB\u5B9F\u884C\u300D\u3092\u9078\u629E\u3057\u3066\u3001\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u3092\u518D\u5B9F\u884C\u3057\u3066\u4E0B\u3055\u3044\u3002
+IngestManager.StartIngestJobsTask.run.startupErr.dlgTitle=\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u5931\u6557
+IngestJobSettings.createModuleSettingsFolder.warning=\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u30E2\u30B8\u30E5\u30FC\u30EB\u8A2D\u5B9A\u30D5\u30A9\u30EB\u30C0\u306E\u4F5C\u6210\u306B\u5931\u6557\u3057\u307E\u3057\u305F\u3002\u8A2D\u5B9A\u3092\u4FDD\u5B58\u3067\u304D\u307E\u305B\u3093\u3002
+IngestJob.progress.dataSourceIngest.initialDisplayName={0}\u3092\u89E3\u6790\u4E2D
+IngestProgressSnapshotPanel.SnapshotsTableModel.colNames.dataSource=\u30C7\u30FC\u30BF\u30BD\u30FC\u30B9
+IngestProgressSnapshotPanel.SnapshotsTableModel.colNames.elapsedTime=\u7D4C\u904E\u6642\u9593\uFF08\u6642\uFF1A\u5206\uFF1A\u79D2\uFF09
+IngestProgressSnapshotPanel.SnapshotsTableModel.colNames.file=\u30D5\u30A1\u30A4\u30EB
+IngestProgressSnapshotPanel.SnapshotsTableModel.colNames.startTime=\u958B\u59CB\u6642\u9593
+IngestProgressSnapshotPanel.SnapshotsTableModel.colNames.threadID=\u30B9\u30EC\u30C3\u30C9ID
+IngestManager.IngestMessage.ErrorMessageLimitReached.msg=\u6700\u5927\u6570({0})\u306E\u30A8\u30E9\u30FC\u304A\u3088\u3073\u307E\u305F\u306F\u8B66\u544A\u30E1\u30C3\u30BB\u30FC\u30B8\u304C\u63B2\u8F09\u3055\u308C\u307E\u3057\u305F\u3002\u3055\u3089\u306A\u308B\u30A8\u30E9\u30FC\uFF0F\u8B66\u544A\u306F\u30ED\u30B0\u3092\u78BA\u8A8D\u3057\u3066\u4E0B\u3055\u3044\uFF08\u30D8\u30EB\u30D7->\u30ED\u30B0\u30D5\u30A9\u30EB\u30C0\u30FC\u3092\u958B\u304F\uFF09
+IngestManager.IngestMessage.ErrorMessageLimitReached.subject=\u6700\u5927\u6570\u306E\u30A8\u30E9\u30FC\u304C\u63B2\u8F09\u3055\u308C\u307E\u3057\u305F
+IngestManager.IngestMessage.ErrorMessageLimitReached.title=\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u30DE\u30CD\u30B8\u30E3\u30FC
+IngestManager.IngestThreadActivitySnapshot.idleThread=\u30A2\u30A4\u30C9\u30EB
+IngestProgressSnapshotDialog.title.text=\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u30D7\u30ED\u30B0\u30EC\u30B9\u30FB\u30B9\u30CA\u30C3\u30D7\u30B7\u30E7\u30C3\u30C8
+IngestProgressSnapshotPanel.closeButton.text=\u9589\u3058\u308B
+IngestProgressSnapshotPanel.refreshButton.text=\u30EA\u30D5\u30EC\u30C3\u30B7\u30E5
+IngestProgressSnapshotPanel.SnapshotsTableModel.colNames.activity=\u30A2\u30AF\u30C6\u30A3\u30D3\u30C6\u30A3
+IngestJobSettingsPanel.advancedButton.actionCommand=\u30A2\u30C9\u30D0\u30F3\u30B9
+IngestJobSettingsPanel.advancedButton.text=\u30A2\u30C9\u30D0\u30F3\u30B9
 ModuleTableModel.colName.duration=\u6240\u8981\u6642\u9593
-IngestJob.cancellationDialog.title=\u30a4\u30f3\u30b8\u30a7\u30b9\u30c8\u3092\u30ad\u30e3\u30f3\u30bb\u30eb
-IngestMessagesToolbar.toolTipText=
-IngestMessageDetailsPanel.messageDetailsPane.toolTipText=
-IngestMessageDetailsPanel.backButton.text=
-IngestJobSettings.missingModule.warning=\u4ee5\u524d\u306b\u8aad\u307f\u8fbc\u3093\u3060{0}\u30e2\u30b8\u30e5\u30fc\u30eb\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3067\u3057\u305f\u3002
-DataSourceIngestCancellationPanel.cancelAllModulesRadioButton.text=\u5168\u3066\u306e\u30a4\u30f3\u30b8\u30a7\u30b9\u30c8\u30e2\u30b8\u30e5\u30fc\u30eb\u3092\u30ad\u30e3\u30f3\u30bb\u30eb
-DataSourceIngestCancellationPanel.cancelCurrentModuleRadioButton.text=\u73fe\u5728\u306e\u30a4\u30f3\u30b8\u30a7\u30b9\u30c8\u30e2\u30b8\u30e5\u30fc\u30eb\u306e\u307f\u30ad\u30e3\u30f3\u30bb\u30eb
-FileIngestCancellationPanel.cancelFileIngestRadioButton.text=\u30d5\u30a1\u30a4\u30eb\u30a4\u30f3\u30b8\u30a7\u30b9\u30c8\u306e\u307f\u30ad\u30e3\u30f3\u30bb\u30eb
-FileIngestCancellationPanel.cancelIngestJobRadioButton.text=\u30c7\u30fc\u30bf\u30bd\u30fc\u30b9\u30a4\u30f3\u30b8\u30a7\u30b9\u30c8\u304a\u3088\u3073\u30d5\u30a1\u30a4\u30eb\u30a4\u30f3\u30b8\u30a7\u30b9\u30c8\u3092\u30ad\u30e3\u30f3\u30bb\u30eb
-IngestJobSettings.moduleSettingsLoad.warning=\u30c7\u30d5\u30a9\u30eb\u30c8\u3092\u4f7f\u7528\u3057\u3001{1}\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u306e{0}\u30e2\u30b8\u30e5\u30fc\u30eb\u7528\u306e\u30a4\u30f3\u30b8\u30a7\u30b9\u30c8\u30b8\u30e7\u30d6\u8a2d\u5b9a\u3092\u8aad\u307f\u8fbc\u307f\u4e2d\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002\
-IngestJobSettings.moduleSettingsSave.warning={1}\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u306e{0}\u30e2\u30b8\u30e5\u30fc\u30eb\u7528\u306e\u30a4\u30f3\u30b8\u30a7\u30b9\u30c8\u30b8\u30e7\u30d6\u8a2d\u5b9a\u3092\u4fdd\u5b58\u4e2d\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002
-IngestJobSettings.save.warning={0}\u30e2\u30b8\u30e5\u30fc\u30eb\u306e\u30a4\u30f3\u30b8\u30a7\u30b9\u30c8\u30b8\u30e7\u30d6\u8a2d\u5b9a\u3092\u4fdd\u5b58\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002
-IngestJobTableModel.colName.dataSource=\u30c7\u30fc\u30bf\u30bd\u30fc\u30b9
-IngestJobTableModel.colName.dirQueued=\u30ad\u30e5\u30fc\u3055\u308c\u305f\u30c7\u30a3\u30ec\u30af\u30c8\u30ea
-IngestJobTableModel.colName.filesPerSec=\u30d5\u30a1\u30a4\u30eb\uff0f\u79d2
-IngestJobTableModel.colName.filesQueued=\u30ad\u30e5\u30fc\u3055\u308c\u305f\u30d5\u30a1\u30a4\u30eb
-IngestJobTableModel.colName.inProgress=\u51e6\u7406\u4e2d
-IngestJobTableModel.colName.jobID=\u30b8\u30e7\u30d6ID
-IngestJobTableModel.colName.numProcessed=\u51e6\u7406\u3055\u308c\u305f\u6570
-IngestJobTableModel.colName.rootQueued=\u30ad\u30e5\u30fc\u3055\u308c\u305f\u30eb\u30fc\u30c8
-IngestJobTableModel.colName.start=\u30b9\u30bf\u30fc\u30c8
-IngestModuleFactoryLoader.errorMessages.duplicateDisplayName=\u5225\u306e\u30e2\u30b8\u30e5\u30fc\u30eb\u306e\u540d\u524d\u3092\u91cd\u8907\u3059\u308b\u3001{0}\u306e\u540d\u524d\u3092\u6301\u3064\u30e2\u30b8\u30e5\u30fc\u30eb\u304c\u898b\u3064\u304b\u308a\u307e\u3057\u305f\u3002\u30e2\u30b8\u30e5\u30fc\u30eb\u306f\u4f7f\u7528\u3057\u307e\u305b\u3093\u3002
-IngestProgressSnapshotPanel.SnapshotsTableModel.colNames.jobID=\u30b8\u30e7\u30d6ID
-ModuleTableModel.colName.module=\u30e2\u30b8\u30e5\u30fc\u30eb
-IngestJobSettingsPanel.processUnallocCheckbox.toolTipText=\u524a\u9664\u3055\u308c\u305f\u30d5\u30a1\u30a4\u30eb\u7b49\u306e\u672a\u5272\u308a\u5f53\u3066\u9818\u57df\u3092\u51e6\u7406\u3002\u3088\u308a\u5b8c\u5168\u306a\u7d50\u679c\u304c\u51fa\u307e\u3059\u304c\u3001\u5927\u304d\u3044\u30a4\u30e1\u30fc\u30b8\u3067\u306f\u51e6\u7406\u6642\u9593\u304c\u9577\u304f\u306a\u308b\u304b\u3082\u3057\u308c\u307e\u305b\u3093\u3002
+IngestJob.cancellationDialog.title=\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u3092\u30AD\u30E3\u30F3\u30BB\u30EB
+IngestJobSettings.missingModule.warning=\u4EE5\u524D\u306B\u8AAD\u307F\u8FBC\u3093\u3060{0}\u30E2\u30B8\u30E5\u30FC\u30EB\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3067\u3057\u305F\u3002
+DataSourceIngestCancellationPanel.cancelAllModulesRadioButton.text=\u5168\u3066\u306E\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u30E2\u30B8\u30E5\u30FC\u30EB\u3092\u30AD\u30E3\u30F3\u30BB\u30EB
+DataSourceIngestCancellationPanel.cancelCurrentModuleRadioButton.text=\u73FE\u5728\u306E\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u30E2\u30B8\u30E5\u30FC\u30EB\u306E\u307F\u30AD\u30E3\u30F3\u30BB\u30EB
+FileIngestCancellationPanel.cancelFileIngestRadioButton.text=\u30D5\u30A1\u30A4\u30EB\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u306E\u307F\u30AD\u30E3\u30F3\u30BB\u30EB
+FileIngestCancellationPanel.cancelIngestJobRadioButton.text=\u30C7\u30FC\u30BF\u30BD\u30FC\u30B9\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u304A\u3088\u3073\u30D5\u30A1\u30A4\u30EB\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u3092\u30AD\u30E3\u30F3\u30BB\u30EB
+IngestJobSettings.moduleSettingsLoad.warning={1}\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\u306E{0}\u30E2\u30B8\u30E5\u30FC\u30EB\u7528\u306E\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u30B8\u30E7\u30D6\u8A2D\u5B9A\u3092\u8AAD\u307F\u8FBC\u307F\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F\u3002\u30C7\u30D5\u30A9\u30EB\u30C8\u8A2D\u5B9A\u3092\u4F7F\u7528\u3057\u3066\u3044\u307E\u3059\u3002
+IngestJobSettings.save.warning={0}\u30E2\u30B8\u30E5\u30FC\u30EB\u306E\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u30B8\u30E7\u30D6\u8A2D\u5B9A\u3092\u4FDD\u5B58\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F\u3002
+IngestJobTableModel.colName.dataSource=\u30C7\u30FC\u30BF\u30BD\u30FC\u30B9
+IngestJobTableModel.colName.dirQueued=\u30AD\u30E5\u30FC\u3055\u308C\u305F\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA
+IngestJobTableModel.colName.filesPerSec=\u30D5\u30A1\u30A4\u30EB\uFF0F\u79D2
+IngestJobTableModel.colName.filesQueued=\u30AD\u30E5\u30FC\u3055\u308C\u305F\u30D5\u30A1\u30A4\u30EB
+IngestJobTableModel.colName.inProgress=\u51E6\u7406\u4E2D
+IngestJobTableModel.colName.jobID=\u30B8\u30E7\u30D6ID
+IngestJobTableModel.colName.numProcessed=\u51E6\u7406\u3055\u308C\u305F\u6570
+IngestJobTableModel.colName.rootQueued=\u30AD\u30E5\u30FC\u3055\u308C\u305F\u30EB\u30FC\u30C8
+IngestJobTableModel.colName.start=\u30B9\u30BF\u30FC\u30C8
+IngestModuleFactoryLoader.errorMessages.duplicateDisplayName=\u5225\u306E\u30E2\u30B8\u30E5\u30FC\u30EB\u306E\u540D\u524D\u3092\u91CD\u8907\u3059\u308B\u3001{0}\u306E\u540D\u524D\u3092\u6301\u3064\u30E2\u30B8\u30E5\u30FC\u30EB\u304C\u898B\u3064\u304B\u308A\u307E\u3057\u305F\u3002\u30E2\u30B8\u30E5\u30FC\u30EB\u306F\u4F7F\u7528\u3057\u307E\u305B\u3093\u3002
+IngestProgressSnapshotPanel.SnapshotsTableModel.colNames.jobID=\u30B8\u30E7\u30D6ID
+ModuleTableModel.colName.module=\u30E2\u30B8\u30E5\u30FC\u30EB
+IngestJobSettingsPanel.processUnallocCheckbox.toolTipText=\u524A\u9664\u3055\u308C\u305F\u30D5\u30A1\u30A4\u30EB\u7B49\u306E\u672A\u5272\u308A\u5F53\u3066\u9818\u57DF\u3092\u51E6\u7406\u3002\u3088\u308A\u5B8C\u5168\u306A\u7D50\u679C\u304C\u51FA\u307E\u3059\u304C\u3001\u5927\u304D\u3044\u30A4\u30E1\u30FC\u30B8\u3067\u306F\u51E6\u7406\u6642\u9593\u304C\u9577\u304F\u306A\u308B\u304B\u3082\u3057\u308C\u307E\u305B\u3093\u3002
 
-IngestJobSettingsPanel.processUnallocCheckbox.text=\u672a\u5272\u308a\u5f53\u3066\u9818\u57df\u306e\u51e6\u7406
+IngestJobSettingsPanel.processUnallocCheckbox.text=\u672A\u5272\u308A\u5F53\u3066\u9818\u57DF\u306E\u51E6\u7406
+Menu/Tools/RunIngestModules=\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u30E2\u30B8\u30E5\u30FC\u30EB\u3092\u5B9F\u884C
+IngestJob.progress.fileIngest.cancelMessage={1}\u306E{0}\u3092\u5F85\u3063\u3066\u3044\u307E\u3059
+IngestManager.OpenEventChannel.Fail.ErrMsg=\u3053\u306E\u30B1\u30FC\u30B9\u3067\u4F7F\u308F\u308C\u3066\u3044\u308B\u304B\u3082\u3057\u308C\u306A\u3044\u4ED6\u306E\u30CE\u30FC\u30C9\u306B\u89E3\u6790\u30D7\u30ED\u30BB\u30B9\u304C\u63A5\u7D9A\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F\u3002
+IngestManager.OpenEventChannel.Fail.Title=\u63A5\u7D9A\u5931\u6557
+IngestJobSettings.moduleSettingsSave.warning={1}\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\u306E{0}\u30E2\u30B8\u30E5\u30FC\u30EB\u7528\u306E\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u30B8\u30E7\u30D6\u8A2D\u5B9A\u3092\u8AAD\u307F\u8FBC\u307F\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F\u3002
+IngestJobTableModel.colName.dsQueued=\u30AD\u30E5\u30FC\u3055\u308C\u305FDS
+IngestJobSettingsPanel.jButtonSelectAll.text=\u5168\u3066\u9078\u629E
+IngestJobSettingsPanel.jButtonDeselectAll.text=\u5168\u3066\u9078\u629E\u89E3\u9664
+IngestManager.cancellingIngest.msgDlg.text=\u73FE\u5728\u5B9F\u884C\u4E2D\u306E\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u30B8\u30E7\u30D6\u3092\u30AD\u30E3\u30F3\u30BB\u30EB\u4E2D
+IngestManager.serviceIsDown.msgDlg.text={0}\u304C\u30C0\u30A6\u30F3\u3057\u3066\u3044\u307E\u3059
+RunIngestSubMenu.menuItem.empty=\u30FC\u7A7A\u767D\u30FC
+RunIngestModulesMenu.getName.text=\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u30E2\u30B8\u30E5\u30FC\u30EB\u3092\u5B9F\u884C
+DataSourceIngestPipeline.moduleError.title.text={0}\u30A8\u30E9\u30FC
+FileIngestPipeline.moduleError.title.text={0}\u30A8\u30E9\u30FC
+IngestJob.cancelReason.notCancelled.text=\u30AD\u30E3\u30F3\u30BB\u30EB\u3055\u308C\u3066\u3044\u307E\u305B\u3093
+IngestJob.cancelReason.cancelledByUser.text=\u30E6\u30FC\u30B6\u30FC\u304C\u30AD\u30E3\u30F3\u30BB\u30EB\u3057\u307E\u3057\u305F
+IngestJob.cancelReason.ingestModStartFail.text=\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u30E2\u30B8\u30E5\u30FC\u30EB\u306E\u8D77\u52D5\u306B\u5931\u6557
+IngestJob.cancelReason.outOfDiskSpace.text=\u30C7\u30A3\u30B9\u30AF\u30B9\u30DA\u30FC\u30B9\u304C\u8DB3\u308A\u307E\u305B\u3093
+IngestJob.cancelReason.servicesDown.text=\u30AD\u30E3\u30F3\u30BB\u30EB\u3055\u308C\u307E\u305B\u3093\u3067\u3057\u305F
+IngestJob.cancelReason.caseClosed.text=\u30B1\u30FC\u30B9\u3092\u9589\u3058\u307E\u3057\u305F

From 95377231e7ef2255b176edac1dffcd70a2a0a4bf Mon Sep 17 00:00:00 2001
From: Kay Bassi <kb@narfindustries.com>
Date: Tue, 2 Feb 2016 10:57:50 -0800
Subject: [PATCH 05/68] Completed editing/translation

---
 .../autopsy/modules/e01verify/Bundle_ja.properties   | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/modules/e01verify/Bundle_ja.properties b/Core/src/org/sleuthkit/autopsy/modules/e01verify/Bundle_ja.properties
index 680f90d546..eb5c151271 100644
--- a/Core/src/org/sleuthkit/autopsy/modules/e01verify/Bundle_ja.properties
+++ b/Core/src/org/sleuthkit/autopsy/modules/e01verify/Bundle_ja.properties
@@ -1,16 +1,16 @@
-OpenIDE-Module-Name=EWF\u30D9\u30EA\u30D5\u30A1\u30A4
-EwfVerifyIngestModule.process.errProcImg={0}\u306E\u51E6\u7406\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F
-EwfVerifyIngestModule.moduleName.text=E01\u30D9\u30EA\u30D5\u30A1\u30A4
+OpenIDE-Module-Name=EWFVerify
+EwfVerifyIngestModule.process.errProcImg={0}\u3092\u51E6\u7406\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F
+EwfVerifyIngestModule.moduleName.text=E01\u8A8D\u8A3C\u30C4\u30FC\u30EB
 EwfVerifyIngestModule.moduleDesc.text=E01\u30D5\u30A1\u30A4\u30EB\u306E\u6574\u5408\u6027\u3092\u8A8D\u8A3C\u3057\u307E\u3059\u3002
 EwfVerifyIngestModule.process.skipNonEwf=E01\u30A4\u30E1\u30FC\u30B8\u3067\u306F\u306A\u3044{0}\u3092\u30B9\u30AD\u30C3\u30D7\u3057\u3066\u3044\u307E\u3059
-EwfVerifyIngestModule.process.noStoredHash=\u30A4\u30E1\u30FC\u30B8{0}\u306F\u30CF\u30C3\u30B7\u30E5\u304C\u683C\u7D0D\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
+EwfVerifyIngestModule.process.noStoredHash=\u30A4\u30E1\u30FC\u30B8{0}\u306F\u4FDD\u5B58\u3055\u308C\u3066\u3044\u308B\u30CF\u30C3\u30B7\u30E5\u304C\u3042\u308A\u307E\u305B\u3093\u3002
 EwfVerifyIngestModule.process.startingImg={0}\u3092\u958B\u59CB\u4E2D
 EwfVerifyIngestModule.process.errGetSizeOfImg={0}\u306E\u30B5\u30A4\u30BA\u306E\u53D6\u5F97\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F\u3002\u30A4\u30E1\u30FC\u30B8\u306F\u51E6\u7406\u3055\u308C\u307E\u305B\u3093\u3002
 EwfVerifyIngestModule.process.errReadImgAtChunk={0}\u306E\u30C1\u30E3\u30F3\u30AF{1}\u306E\u8AAD\u307F\u53D6\u308A\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F
-EwfVerifyIngestModule.shutDown.calcHashLi=<li>\u30CF\u30C3\u30B7\u30E5\u5024\u3092\u8A08\u7B97\uFF1A{0}</li>
+EwfVerifyIngestModule.shutDown.calcHashLi=<li>\u8A08\u7B97\u3055\u308C\u305F\u30CF\u30C3\u30B7\u30E5\u5024\uFF1A{0}</li>
 EwfVerifyIngestModule.shutDown.notVerified=\u8A8D\u8A3C\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F
 EwfVerifyIngestModule.shutDown.resultLi=<li>\u7D50\u679C\uFF1A{0}</li>
-EwfVerifyIngestModule.shutDown.storedHashLi=<li>\u683C\u7D0D\u3055\u308C\u305F\u30CF\u30C3\u30B7\u30E5\uFF1A {0}</li>
+EwfVerifyIngestModule.shutDown.storedHashLi=<li>\u4FDD\u5B58\u3055\u308C\u305F\u30CF\u30C3\u30B7\u30E5\uFF1A {0}</li>
 EwfVerifyIngestModule.shutDown.verifyResultsHeader=<p>{0}\u306EEWF\u30D9\u30EA\u30D5\u30A3\u30B1\u30FC\u30B7\u30E7\u30F3\u7D50\u679C</p>
 EwfVerifyIngestModule.startUp.exception.failGetMd5=MD5\u30A2\u30EB\u30B4\u30EA\u30BA\u30E0\u306E\u53D6\u5F97\u306B\u5931\u6557\u3057\u307E\u3057\u305F
 EwfVerifyIngestModule.shutDown.verified=\u8A8D\u8A3C\u3055\u308C\u307E\u3057\u305F
\ No newline at end of file

From e144692318f2e4b5721176521fa25ec72480fea3 Mon Sep 17 00:00:00 2001
From: Kay Bassi <kb@narfindustries.com>
Date: Tue, 2 Feb 2016 14:39:54 -0800
Subject: [PATCH 06/68] Completed editing/translation

---
 .../embeddedfileextractor/Bundle.properties   |  4 +-
 .../Bundle_ja.properties                      | 52 +++++++++++++++----
 2 files changed, 44 insertions(+), 12 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/modules/embeddedfileextractor/Bundle.properties b/Core/src/org/sleuthkit/autopsy/modules/embeddedfileextractor/Bundle.properties
index 3523597a00..06b5b5a44f 100644
--- a/Core/src/org/sleuthkit/autopsy/modules/embeddedfileextractor/Bundle.properties
+++ b/Core/src/org/sleuthkit/autopsy/modules/embeddedfileextractor/Bundle.properties
@@ -30,13 +30,13 @@ EmbeddedFileExtractorIngestModule.ArchiveExtractor.unpack.encrFileDetected.detai
 EmbeddedFileExtractorIngestModule.ArchiveExtractor.UnpackStream.write.exception.msg=Error writing unpacked file to\: {0}
 EmbeddedFileExtractorIngestModule.ArchiveExtractor.UnpackedTree.exception.msg=Error adding a derived file to db\:{0}
 EmbeddedFileExtractorIngestModule.ImageExtractor.docContainer.init.err=Doc container could not be initialized while reading 
-EmbeddedFileExtractorIngestModule.ImageExtractor.docxContainer.init.err=Docx container could not be initialized while reading: {0}
+EmbeddedFileExtractorIngestModule.ImageExtractor.docxContainer.init.err=Docx container could not be initialized while reading\: {0}
 EmbeddedFileExtractorIngestModule.ImageExtractor.pptContainer.init.err=Ppt container could not be initialized while reading: {0}
 EmbeddedFileExtractorIngestModule.ImageExtractor.pptxContainer.init.err=Pptx container could not be initialized while reading: {0}
 EmbeddedFileExtractorIngestModule.ImageExtractor.xlsContainer.init.err=Xls container could not be initialized while reading: {0}
 EmbeddedFileExtractorIngestModule.ImageExtractor.xlsxContainer.init.err=Xlsx container could not be initialized while reading: {0}
 EmbeddedFileExtractorIngestModule.ImageExtractor.extractImage.addToDB.exception.msg=Unable to add the derived files to the database.
-EmbeddedFileExtractorIngestModule.ImageExtractor.getOutputFolderPath.exception.msg=Could not get path for image extraction from Abstract File: {0}
+EmbeddedFileExtractorIngestModule.ImageExtractor.getOutputFolderPath.exception.msg=Could not get path for image extraction from Abstract File\: {0}
 EmbeddedFileExtractorIngestModule.ImageExtractor.getOutputFolderPath.exception.msg=Could not get path for image extraction from Abstract File: {0}
 EmbeddedFileExtractorIngestModule.ArchiveExtractor.UnpackStream.write.noSpace.msg=Unable to write content to disk. Not enough space.
 SevenZipContentReadStream.seek.exception.invalidOrigin=Invalid origin {0}
diff --git a/Core/src/org/sleuthkit/autopsy/modules/embeddedfileextractor/Bundle_ja.properties b/Core/src/org/sleuthkit/autopsy/modules/embeddedfileextractor/Bundle_ja.properties
index dd4f49b9b6..8ceab3a14a 100644
--- a/Core/src/org/sleuthkit/autopsy/modules/embeddedfileextractor/Bundle_ja.properties
+++ b/Core/src/org/sleuthkit/autopsy/modules/embeddedfileextractor/Bundle_ja.properties
@@ -1,11 +1,43 @@
-OpenIDE-Module-Display-Category=\u30a4\u30f3\u30b8\u30a7\u30b9\u30c8\u30e2\u30b8\u30e5\u30fc\u30eb
+OpenIDE-Module-Display-Category=\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u30E2\u30B8\u30E5\u30FC\u30EB
 OpenIDE-Module-Long-Description=\
-    7Zip\u30a4\u30f3\u30b8\u30a7\u30b9\u30c8\u30e2\u30b8\u30e5\u30fc\u30eb\n\n7Zip\u30a4\u30f3\u30b8\u30a7\u30b9\u30c8\u30e2\u30b8\u30e5\u30fc\u30eb\u306f\u30a2\u30fc\u30ab\u30a4\u30d6\u30d5\u30a1\u30a4\u30eb\u3092\u51e6\u7406\u3057\u307e\u3059\uff08zip\u30847zip\u30a8\u30af\u30b9\u30c8\u30e9\u30af\u30bf\u30fc\u306b\u30b5\u30dd\u30fc\u30c8\u3055\u308c\u3066\u3044\u308b\u305d\u306e\u4ed6\u306e\u30a2\u30fc\u30ab\u30a4\u30d6\u30bf\u30a4\u30d7\u306a\u3069\uff09\u3002\n\
-    \u30a2\u30fc\u30ab\u30a4\u30d6\u306e\u30b3\u30f3\u30c6\u30f3\u30c4\u306f\u62bd\u51fa\u3055\u308c\u3001\u6d3e\u751f\u30d5\u30a1\u30a4\u30eb\u306f\u8a2d\u5b9a\u3055\u308c\u305f\u30a4\u30f3\u30b8\u30a7\u30b9\u30c8\u30e2\u30b8\u30e5\u30fc\u30eb\u306b\u51e6\u7406\u3055\u308c\u308b\u305f\u3081\u3001\u73fe\u5728\u306e\u30a4\u30f3\u30b8\u30a7\u30b9\u30c8\u306b\u8ffd\u52a0\u3055\u308c\u307e\u3059\u3002\n\
-    \u3082\u3057\u6d3e\u751f\u30d5\u30a1\u30a4\u30eb\u304c\u30a2\u30fc\u30ab\u30a4\u30d6\u30d5\u30a1\u30a4\u30eb\u3067\u3042\u308c\u3070\u30017Zip\u30a8\u30af\u30b9\u30c8\u30e9\u30af\u30bf\u30fc\u306b\u3088\u308a\u3001\u518d\u5ea6\u51e6\u7406\u3055\u308c\u307e\u3059 - \u30a8\u30af\u30b9\u30c8\u30e9\u30af\u30bf\u30fc\u306f\u30a2\u30fc\u30ab\u30a4\u30d6\u30d5\u30a1\u30a4\u30eb\u3092N-\u30ec\u30d9\u30eb\u306e\u6df1\u3055\u3067\u51e6\u7406\u3057\u307e\u3059\u3002\n\n\
-    \u62bd\u51fa\u3055\u308c\u305f\u30d5\u30a1\u30a4\u30eb\u306f\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u30c4\u30ea\u30fc\u3067\u30ca\u30d3\u30b2\u30fc\u30c8\u3067\u304d\u307e\u3059\u3002\n\n\
-    \u3053\u306e\u30e2\u30b8\u30e5\u30fc\u30eb\u306fWindows\u3001Linux\u3001Mac\u306e\u30aa\u30da\u30ec\u30fc\u30c6\u30a3\u30f3\u30b0\u30b7\u30b9\u30c6\u30e0\u74b0\u5883\u3092\u30b5\u30dd\u30fc\u30c8\u3057\u3066\u3044\u307e\u3059\u3002
-OpenIDE-Module-Name=7Zip
-OpenIDE-Module-Short-Description=7Zip\u30a4\u30f3\u30b8\u30a7\u30b9\u30c8\u30e2\u30b8\u30e5\u30fc\u30eb
-SevenZipContentReadStream.seek.exception.invalidOrigin=\u7121\u52b9\u306a\u30b7\u30fc\u30af\u30aa\u30ea\u30b8\u30f3\uff1a {0}
-SevenZipContentReadStream.read.exception.errReadStream=\u30b3\u30f3\u30c6\u30f3\u30c4\u30b9\u30c8\u30ea\u30fc\u30e0\u306e\u8aad\u307f\u53d6\u308a\u4e2d\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002
+    \u57CB\u3081\u8FBC\u307F\u30D5\u30A1\u30A4\u30EB\u62BD\u51FA\u306E\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u30E2\u30B8\u30E5\u30FC\u30EB\n\n\u57CB\u3081\u8FBC\u307F\u30D5\u30A1\u30A4\u30EB\u62BD\u51FA\u306E\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u30E2\u30B8\u30E5\u30FC\u30EB\u306F\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u30D5\u30A1\u30A4\u30EB\uFF08doc\u3001docx\u3001ppt\u3001pptx\u3001xls\u3001xlsx\u7B49\uFF09\u3084\u30A2\u30FC\u30AB\u30A4\u30D6\u30D5\u30A1\u30A4\u30EB\uFF08zip\u3084\u305D\u306E\u4ED6\u306E7zip\u30A8\u30AF\u30B9\u30C8\u30E9\u30AF\u30BF\u30FC\u3067\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u308B\u30A2\u30FC\u30AB\u30A4\u30D6\u30D5\u30A1\u30A4\u30EB\uFF09\u3092\u51E6\u7406\u3057\u307E\u3059\u3002\n\
+    7Zip\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u30E2\u30B8\u30E5\u30FC\u30EB\n\n7Zip\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u30E2\u30B8\u30E5\u30FC\u30EB\u306F\u30A2\u30FC\u30AB\u30A4\u30D6\u30D5\u30A1\u30A4\u30EB\u3092\u51E6\u7406\u3057\u307E\u3059\uFF08zip\u30847zip\u30A8\u30AF\u30B9\u30C8\u30E9\u30AF\u30BF\u30FC\u306B\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u308B\u305D\u306E\u4ED6\u306E\u30A2\u30FC\u30AB\u30A4\u30D6\u30BF\u30A4\u30D7\u306A\u3069\uFF09\u3002\n\
+    \u30A2\u30FC\u30AB\u30A4\u30D6\u306E\u30B3\u30F3\u30C6\u30F3\u30C4\u304C\u62BD\u51FA\u3055\u308C\u3001\u6D3E\u751F\u30D5\u30A1\u30A4\u30EB\u306F\u5B9F\u884C\u4E2D\u306E\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u306B\u8FFD\u52A0\u3055\u308C\u3001\u8A2D\u5B9A\u3055\u308C\u305F\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u30E2\u30B8\u30E5\u30FC\u30EB\u3067\u51E6\u7406\u3055\u308C\u307E\u3059\u3002\n\
+    \u3082\u3057\u6D3E\u751F\u30D5\u30A1\u30A4\u30EB\u304C\u30A2\u30FC\u30AB\u30A4\u30D6\u30D5\u30A1\u30A4\u30EB\u3067\u3042\u308C\u3070\u30017Zip\u30A8\u30AF\u30B9\u30C8\u30E9\u30AF\u30BF\u30FC\u306B\u3088\u308A\u3001\u518D\u5EA6\u51E6\u7406\u3055\u308C\u307E\u3059 - \u30A8\u30AF\u30B9\u30C8\u30E9\u30AF\u30BF\u30FC\u306F\u30A2\u30FC\u30AB\u30A4\u30D6\u30D5\u30A1\u30A4\u30EB\u3092N-\u30EC\u30D9\u30EB\u306E\u6DF1\u3055\u3067\u51E6\u7406\u3057\u307E\u3059\u3002\n\n\
+    \u62BD\u51FA\u3055\u308C\u305F\u30D5\u30A1\u30A4\u30EB\u306F\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u30C4\u30EA\u30FC\u3067\u30CA\u30D3\u30B2\u30FC\u30C8\u3067\u304D\u307E\u3059\u3002\n\n\
+    \u3053\u306E\u30E2\u30B8\u30E5\u30FC\u30EB\u306FWindows\u3001Linux\u3001Mac\u306E\u30AA\u30DA\u30EC\u30FC\u30C6\u30A3\u30F3\u30B0\u30B7\u30B9\u30C6\u30E0\u74B0\u5883\u3092\u30B5\u30DD\u30FC\u30C8\u3057\u3066\u3044\u307E\u3059\u3002
+OpenIDE-Module-Name=\u57CB\u3081\u8FBC\u307F\u30D5\u30A1\u30A4\u30EB\u62BD\u51FA
+OpenIDE-Module-Short-Description=\u57CB\u3081\u8FBC\u307F\u30D5\u30A1\u30A4\u30EB\u62BD\u51FA\u306E\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u30E2\u30B8\u30E5\u30FC\u30EB
+SevenZipContentReadStream.seek.exception.invalidOrigin=\u7121\u52B9\u306A\u30B7\u30FC\u30AF\u539F\u70B9\uFF1A {0}
+SevenZipContentReadStream.read.exception.errReadStream=\u30B3\u30F3\u30C6\u30F3\u30C4\u30B9\u30C8\u30EA\u30FC\u30E0\u306E\u8AAD\u307F\u53D6\u308A\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F\u3002
+EmbeddedFileExtractorIngestModule.SevenZipContentReadStream.seek.exception.invalidOrigin=\u7121\u52B9\u306A\u30B7\u30FC\u30AF\u306E\u539F\u70B9\: {0}
+EmbeddedFileExtractorIngestModule.SevenZipContentReadStream.read.exception.errReadStream=\u30B3\u30F3\u30C6\u30F3\u30C4\u30B9\u30C8\u30EA\u30FC\u30E0\u306E\u8AAD\u307F\u53D6\u308A\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F\u3002
+EmbeddedFileExtractorIngestModule.ArchiveExtractor.moduleName=\u57CB\u3081\u8FBC\u307F\u30D5\u30A1\u30A4\u30EB\u306E\u62BD\u51FA\u30C4\u30FC\u30EB
+EmbeddedFileExtractorIngestModule.ArchiveExtractor.moduleDesc.text=\u57CB\u3081\u8FBC\u307F\u30D5\u30A1\u30A4\u30EB\uFF08doc, docx, ppt, pptx, xls, xlsx, zip, rar, arj, 7z, gzip, bzip2, tar\uFF09\u3092\u62BD\u51FA\u3057\u3001\u5B9F\u884C\u4E2D\u306E\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u306B\u30EA\u30B9\u30B1\u30B8\u30E5\u30FC\u30EB\u3057\u3001\u65B0\u3057\u3044\u30D5\u30A1\u30A4\u30EB\u3092\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u30C4\u30EA\u30FC\u306B\u5165\u529B\u3057\u307E\u3059\u3002
+EmbeddedFileExtractorIngestModule.ArchiveExtractor.encryptionFileLevel=\u30D5\u30A1\u30A4\u30EB\u30EC\u30D9\u30EB\u3067\u306E\u6697\u53F7\u5316
+EmbeddedFileExtractorIngestModule.ArchiveExtractor.encryptionFull=\u5B8C\u5168\u306A\u6697\u53F7\u5316
+EmbeddedFileExtractorIngestModule.ArchiveExtractor.init.errInitModule.msg=\u8D77\u52D5\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F{0}
+EmbeddedFileExtractorIngestModule.ArchiveExtractor.init.errInitModule.details=\u30A2\u30A6\u30C8\u30D7\u30C3\u30C8\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\: {0}\: {1}\u3092\u8D77\u52D5\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F
+EmbeddedFileExtractorIngestModule.ArchiveExtractor.init.errCantInitLib=7-ZIP\u30E9\u30A4\u30D6\u30E9\u30EA\: {0}\u3092\u8D77\u52D5\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F
+EmbeddedFileExtractorIngestModule.ArchiveExtractor.isZipBombCheck.warnMsg=\u30A2\u30FC\u30AB\u30A4\u30D6\: {0}, item\: {1}\u306BZIP\u7206\u5F3E\u304B\u3082\u3057\u308C\u306A\u3044\u3082\u306E\u3092\u767A\u898B
+EmbeddedFileExtractorIngestModule.ArchiveExtractor.isZipBombCheck.warnDetails=\u5727\u7E2E\u7387\u304C{0}\u3001{1}\u306B\u3042\u308B\u30A2\u30A4\u30C6\u30E0\u3092\u30B9\u30AD\u30C3\u30D7\u3057\u307E\u3059\u3002
+EmbeddedFileExtractorIngestModule.ArchiveExtractor.unpack.warnMsg.zipBomb=ZIP\u7206\u5F3E\u304B\u3082\u3057\u308C\u306A\u3044\u3082\u306E\u3092\u767A\u898B\uFF1A{0}
+EmbeddedFileExtractorIngestModule.ArchiveExtractor.unpack.warnDetails.zipBomb=\u30A2\u30FC\u30AB\u30A4\u30D6\u306F{0}\u30EC\u30D9\u30EB\u306E\u6DF1\u3055\u3067\u3059\u3002{1}\u306E\u51E6\u7406\u3092\u30B9\u30AD\u30C3\u30D7\u3057\u307E\u3059\u3002
+EmbeddedFileExtractorIngestModule.ArchiveExtractor.unpack.unknownPath.msg=\u30A2\u30FC\u30AB\u30A4\u30D6\: {0}\u306B\u4E0D\u660E\u306A\u30A2\u30A4\u30C6\u30E0\u30D1\u30B9\u304C\u3042\u308A\u307E\u3059\u3002{1}\u3092\u4F7F\u7528\u3057\u307E\u3059\u3002
+EmbeddedFileExtractorIngestModule.ArchiveExtractor.unpack.notEnoughDiskSpace.msg=\u30A2\u30FC\u30AB\u30A4\u30D6\u30A2\u30A4\u30C6\u30E0\: {0}, {1}\u3092\u89E3\u51CD\u3059\u308B\u306E\u306B\u30C7\u30A3\u30B9\u30AF\u30B9\u30DA\u30FC\u30B9\u304C\u8DB3\u308A\u307E\u305B\u3093
+EmbeddedFileExtractorIngestModule.ArchiveExtractor.unpack.notEnoughDiskSpace.details=\u30A2\u30FC\u30AB\u30A4\u30D6\u30A2\u30A4\u30C6\u30E0\u304C\u89E3\u51CD\u3059\u308B\u306E\u306B\u5927\u304D\u3059\u304E\u307E\u3059\u3002\u3053\u306E\u30A2\u30A4\u30C6\u30E0\u306E\u89E3\u51CD\u3092\u30B9\u30AD\u30C3\u30D7\u3057\u307E\u3059\u3002
+EmbeddedFileExtractorIngestModule.ArchiveExtractor.unpack.errUnpacking.msg={0}\u306E\u89E3\u51CD\u30A8\u30E9\u30FC
+EmbeddedFileExtractorIngestModule.ArchiveExtractor.unpack.errUnpacking.details={0}. {1}\u3092\u89E3\u51CD\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F
+EmbeddedFileExtractorIngestModule.ArchiveExtractor.unpack.encrFileDetected.msg=\u30A2\u30FC\u30AB\u30A4\u30D6\u306B\u6697\u53F7\u5316\u3055\u308C\u305F\u30D5\u30A1\u30A4\u30EB\u3092\u767A\u898B\u3057\u307E\u3057\u305F\u3002
+EmbeddedFileExtractorIngestModule.ArchiveExtractor.unpack.encrFileDetected.details=\u30A2\u30FC\u30AB\u30A4\u30D6\: {0}\u306E\u4E00\u90E8\u306E\u30D5\u30A1\u30A4\u30EB\u306F\u6697\u53F7\u5316\u3055\u308C\u3066\u3044\u307E\u3059\u3002 {1} \u30A8\u30AF\u30B9\u30C8\u30E9\u30AF\u30BF\u30FC\u304C\u3053\u306E\u30A2\u30FC\u30AB\u30A4\u30D6\u306E\u5168\u3066\u306E\u30D5\u30A1\u30A4\u30EB\u3092\u62BD\u51FA\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F\u3002
+EmbeddedFileExtractorIngestModule.ArchiveExtractor.UnpackStream.write.exception.msg=\u89E3\u51CD\u3055\u308C\u305F\u30D5\u30A1\u30A4\u30EB\u3092\: {0}\u306B\u66F8\u304D\u8FBC\u307F\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F
+EmbeddedFileExtractorIngestModule.ArchiveExtractor.UnpackedTree.exception.msg=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\:{0}\u306B\u6D3E\u751F\u30D5\u30A1\u30A4\u30EB\u3092\u8FFD\u52A0\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F
+EmbeddedFileExtractorIngestModule.ImageExtractor.docContainer.init.err=\u8AAD\u307F\u53D6\u308A\u4E2D\u306BDoc\u30B3\u30F3\u30C6\u30A4\u30CA\u30FC\u3092\u8D77\u52D5\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F
+EmbeddedFileExtractorIngestModule.ImageExtractor.docxContainer.init.err={0}\u3092\u8AAD\u307F\u53D6\u308A\u4E2D\u306BDocx\u30B3\u30F3\u30C6\u30A4\u30CA\u30FC\u3092\u8D77\u52D5\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F
+EmbeddedFileExtractorIngestModule.ImageExtractor.pptContainer.init.err={0}\u3092\u8AAD\u307F\u53D6\u308A\u4E2D\u306BPpt\u30B3\u30F3\u30C6\u30A4\u30CA\u30FC\u3092\u8D77\u52D5\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F
+EmbeddedFileExtractorIngestModule.ImageExtractor.pptxContainer.init.err={0}\u3092\u8AAD\u307F\u53D6\u308A\u4E2D\u306BPptx\u30B3\u30F3\u30C6\u30A4\u30CA\u30FC\u3092\u8D77\u52D5\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F
+EmbeddedFileExtractorIngestModule.ImageExtractor.xlsContainer.init.err={0}\u3092\u8AAD\u307F\u53D6\u308A\u4E2D\u306BXls\u30B3\u30F3\u30C6\u30A4\u30CA\u30FC\u3092\u8D77\u52D5\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F
+EmbeddedFileExtractorIngestModule.ImageExtractor.xlsxContainer.init.err={0}\u3092\u8AAD\u307F\u53D6\u308A\u4E2D\u306BXlsx\u30B3\u30F3\u30C6\u30A4\u30CA\u30FC\u3092\u8D77\u52D5\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F
+EmbeddedFileExtractorIngestModule.ImageExtractor.extractImage.addToDB.exception.msg=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u306B\u6D3E\u751F\u30D5\u30A1\u30A4\u30EB\u3092\u8FFD\u52A0\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F\u3002
+EmbeddedFileExtractorIngestModule.ImageExtractor.getOutputFolderPath.exception.msg=\u30A2\u30D6\u30B9\u30C8\u30E9\u30AF\u30C8\u30D5\u30A1\u30A4\u30EB\: {0}\u304B\u3089\u753B\u50CF\u62BD\u51FA\u306E\u30D1\u30B9\u3092\u5165\u624B\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F
+EmbeddedFileExtractorIngestModule.ArchiveExtractor.UnpackStream.write.noSpace.msg=\u30B3\u30F3\u30C6\u30F3\u30C4\u3092\u30C7\u30A3\u30B9\u30AF\u306B\u66F8\u304D\u8FBC\u3081\u307E\u305B\u3093\u3067\u3057\u305F\u3002

From 3efcbb3f1f9928b7665f2fcb930e1a4b1b32ee03 Mon Sep 17 00:00:00 2001
From: Kay Bassi <kb@narfindustries.com>
Date: Tue, 2 Feb 2016 14:45:19 -0800
Subject: [PATCH 07/68] Completed editing/translation

---
 .../sleuthkit/autopsy/modules/exif/Bundle_ja.properties  | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/modules/exif/Bundle_ja.properties b/Core/src/org/sleuthkit/autopsy/modules/exif/Bundle_ja.properties
index 7d9e66eb8b..8a325b22d9 100644
--- a/Core/src/org/sleuthkit/autopsy/modules/exif/Bundle_ja.properties
+++ b/Core/src/org/sleuthkit/autopsy/modules/exif/Bundle_ja.properties
@@ -1,8 +1,9 @@
 OpenIDE-Module-Display-Category=\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u30E2\u30B8\u30E5\u30FC\u30EB
 OpenIDE-Module-Long-Description=\
-    Exif\u30E1\u30BF\u30C7\u30FC\u30BF\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u30E2\u30B8\u30E5\u30FC\u30EB\u3002\n\n\
-    \u3053\u306E\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u30E2\u30B8\u30E5\u30FC\u30EB\u306F\u30A4\u30E1\u30FC\u30B8\u30D5\u30A1\u30A4\u30EB\u3092\u89E3\u6790\u3057\u3001Exif\u60C5\u5831\u3092\u62BD\u51FA\u3057\u3001Exif\u60C5\u5831\u3092\u7D50\u679C\u3068\u3057\u3066\u6295\u7A3F\u3057\u307E\u3059\u3002
+    Exif\u30E1\u30BF\u30C7\u30FC\u30BF\u306E\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u30E2\u30B8\u30E5\u30FC\u30EB\u3002\n\n\
+    \u3053\u306E\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u30E2\u30B8\u30E5\u30FC\u30EB\u306F\u753B\u50CF\u30D5\u30A1\u30A4\u30EB\u3092\u89E3\u6790\u3057\u3001Exif\u60C5\u5831\u3092\u62BD\u51FA\u3057\u3001Exif\u60C5\u5831\u3092\u7D50\u679C\u3068\u3057\u3066\u30DD\u30B9\u30C8\u3057\u307E\u3059\u3002
 OpenIDE-Module-Name=Exif\u30D1\u30FC\u30B5
-OpenIDE-Module-Short-Description=Exif\u30E1\u30BF\u30C7\u30FC\u30BF\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u30E2\u30B8\u30E5\u30FC\u30EB
+OpenIDE-Module-Short-Description=Exif\u30E1\u30BF\u30C7\u30FC\u30BF\u306E\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u30E2\u30B8\u30E5\u30FC\u30EB
 ExifParserFileIngestModule.moduleName.text=Exif\u30D1\u30FC\u30B5
-ExifParserFileIngestModule.getDesc.text=JPEG\u30D5\u30A1\u30A4\u30EB\u3092\u51E6\u7406\u3057\u3001\u305D\u308C\u3089\u306EEXIF\u30E1\u30BF\u30C7\u30FC\u30BF\u3092\u53D6\u5F97\u3057\u307E\u3059\u3002
\ No newline at end of file
+ExifParserFileIngestModule.getDesc.text=JPEG\u30D5\u30A1\u30A4\u30EB\u3092\u51E6\u7406\u3057\u3001\u305D\u308C\u3089\u306EEXIF\u30E1\u30BF\u30C7\u30FC\u30BF\u3092\u53D6\u5F97\u3057\u307E\u3059\u3002
+ExifParserFileIngestModule.startUp.fileTypeDetectorInitializationException.msg=\u30D5\u30A1\u30A4\u30EB\u30BF\u30A4\u30D7\u30C7\u30A3\u30C6\u30AF\u30BF\u3092\u8D77\u52D5\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F\u3002
\ No newline at end of file

From add56fe71d660730a76d193afbf689ccc8df2004 Mon Sep 17 00:00:00 2001
From: Kay Bassi <kb@narfindustries.com>
Date: Tue, 2 Feb 2016 14:51:50 -0800
Subject: [PATCH 08/68] Completed editing/translation

---
 .../fileextmismatch/Bundle_ja.properties      | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/Bundle_ja.properties b/Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/Bundle_ja.properties
index 8921a26d21..06cbd4336f 100644
--- a/Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/Bundle_ja.properties
+++ b/Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/Bundle_ja.properties
@@ -2,22 +2,22 @@ OpenIDE-Module-Name=\u30D5\u30A1\u30A4\u30EB\u62E1\u5F35\u5B50\u4E0D\u4E00\u81F4
 OptionsCategory_Name_FileExtMismatchOptions=\u30D5\u30A1\u30A4\u30EB\u62E1\u5F35\u5B50\u4E0D\u4E00\u81F4
 OptionsCategory_FileExtMismatch=\u30D5\u30A1\u30A4\u30EB\u62E1\u5F35\u5B50\u4E0D\u4E00\u81F4
 AddFileExtensionAction.msgDlg.msg=XML\u8A2D\u5B9A\u30D5\u30A1\u30A4\u30EB\u3092\u66F8\u304F\u306E\u3092\u5931\u6557\u3057\u307E\u3057\u305F\u3002
-AddFileExtensionAction.msgDlg.title=\u4E0D\u4E00\u81F4\u62E1\u5F35\u5B50\u306E\u8FFD\u52A0\u30A8\u30E9\u30FC
-FileExtMismatchConfigPanel.name.text=\u30A2\u30C9\u30D0\u30F3\u30B9\u30D5\u30A1\u30A4\u30EB\u62E1\u5F35\u5B50\u4E0D\u4E00\u81F4\u8A2D\u5B9A
+AddFileExtensionAction.msgDlg.title=\u4E0D\u4E00\u81F4\u62E1\u5F35\u5B50\u306E\u30A8\u30E9\u30FC\u3092\u8FFD\u52A0
+FileExtMismatchConfigPanel.name.text=\u30A2\u30C9\u30D0\u30F3\u30B9\u30D5\u30A1\u30A4\u30EB\u62E1\u5F35\u5B50\u4E0D\u4E00\u81F4\u306E\u8A2D\u5B9A
 FileExtMismatchConfigPanel.addExtButton.errLabel.empty=\u62E1\u5F35\u5B50\u30C6\u30AD\u30B9\u30C8\u304C\u7A7A\u767D\u3067\u3059\uFF01
 FileExtMismatchConfigPanel.addExtButton.errLabel.noMimeType=MIME\u30BF\u30A4\u30D7\u304C\u9078\u629E\u3055\u308C\u3066\u3044\u307E\u305B\u3093\uFF01
 FileExtMismatchConfigPanel.addExtButton.errLabel.extExists=\u62E1\u5F35\u5B50\u306F\u3059\u3067\u306B\u5B58\u5728\u3057\u307E\u3059\uFF01
-FileExtMismatchConfigPanel.addExtButton.errLabel.extAdded=\u62E1\u5F35\u5B50{0}\u306F\u8FFD\u52A0\u3055\u308C\u307E\u3057\u305F\u3002
+FileExtMismatchConfigPanel.addExtButton.errLabel.extAdded=\u62E1\u5F35\u5B50{0}\u304C\u8FFD\u52A0\u3055\u308C\u307E\u3057\u305F\u3002
 FileExtMismatchConfigPanel.addTypeButton.empty=MIME\u30BF\u30A4\u30D7\u30C6\u30AD\u30B9\u30C8\u304C\u7A7A\u767D\u3067\u3059\uFF01
-FileExtMismatchConfigPanel.addTypeButton.mimeTypeNotSupported=MIME\u30BF\u30A4\u30D7\u306F\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093\uFF01
-FileExtMismatchConfigPanel.addTypeButton.mimeTypeExists=MIME\u30BF\u30A4\u30D7\u306F\u3059\u3067\u306B\u5B58\u5728\u3057\u307E\u3059\uFF01
-FileExtMismatchConfigPanel.addTypeButton.mimeTypeNotDetectable=MIME\u30BF\u30A4\u30D7\u306F\u3053\u306E\u30E2\u30B8\u30E5\u30FC\u30EB\u3067\u306F\u691C\u51FA\u3067\u304D\u307E\u305B\u3093\u3002
-FileExtMismatchConfigPanel.addTypeButton.mimeTypeAdded=MIME\u30BF\u30A4\u30D7{0}\u306F\u8FFD\u52A0\u3055\u308C\u307E\u3057\u305F\u3002
+FileExtMismatchConfigPanel.addTypeButton.mimeTypeNotSupported=MIME\u30BF\u30A4\u30D7\u304C\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093\uFF01
+FileExtMismatchConfigPanel.addTypeButton.mimeTypeExists=MIME\u30BF\u30A4\u30D7\u304C\u3059\u3067\u306B\u5B58\u5728\u3057\u307E\u3059\uFF01
+FileExtMismatchConfigPanel.addTypeButton.mimeTypeNotDetectable=MIME\u30BF\u30A4\u30D7\u304C\u3053\u306E\u30E2\u30B8\u30E5\u30FC\u30EB\u3067\u306F\u691C\u51FA\u3067\u304D\u307E\u305B\u3093\u3002
+FileExtMismatchConfigPanel.addTypeButton.mimeTypeAdded=MIME\u30BF\u30A4\u30D7{0}\u304C\u8FFD\u52A0\u3055\u308C\u307E\u3057\u305F\u3002
 FileExtMismatchConfigPanel.removeTypeButton.noneSelected=MIME\u30BF\u30A4\u30D7\u304C\u9078\u629E\u3055\u308C\u3066\u3044\u307E\u305B\u3093\uFF01
-FileExtMismatchConfigPanel.remoteTypeButton.deleted=MIME\u30BF\u30A4\u30D7{0}\u306F\u524A\u9664\u3055\u308C\u307E\u3057\u305F\u3002
+FileExtMismatchConfigPanel.remoteTypeButton.deleted=MIME\u30BF\u30A4\u30D7{0}\u304C\u524A\u9664\u3055\u308C\u307E\u3057\u305F\u3002
 FileExtMismatchConfigPanel.removeExtButton.noneSelected=\u62E1\u5F35\u5B50\u304C\u9078\u629E\u3055\u308C\u3066\u3044\u307E\u305B\u3093\uFF01
 FileExtMismatchConfigPanel.removeExtButton.noMimeTypeSelected=MIME\u30BF\u30A4\u30D7\u304C\u9078\u629E\u3055\u308C\u3066\u3044\u307E\u305B\u3093\uFF01
-FileExtMismatchConfigPanel.removeExtButton.deleted=\u62E1\u5F35\u5B50{0}\u306F\u524A\u9664\u3055\u308C\u307E\u3057\u305F\u3002
+FileExtMismatchConfigPanel.removeExtButton.deleted=\u62E1\u5F35\u5B50{0}\u304C\u524A\u9664\u3055\u308C\u307E\u3057\u305F\u3002
 FileExtMismatchConfigPanel.store.msg=\u4FDD\u5B58\u3055\u308C\u307E\u3057\u305F\u3002
 FileExtMismatchConfigPanel.store.msgDlg.msg=XML\u8A2D\u5B9A\u30D5\u30A1\u30A4\u30EB\u3092\u66F8\u304F\u306E\u3092\u5931\u6557\u3057\u307E\u3057\u305F\u3002
 FileExtMismatchConfigPanel.save.msgDlg.title=\u4FDD\u5B58\u30A8\u30E9\u30FC
@@ -27,15 +27,15 @@ FileExtMismatchConfigPanel.mimeTableModel.colName=MIME\u30BF\u30A4\u30D7
 FileExtMismatchConfigPanel.extTableModel.colName=\u62E1\u5F35\u5B50
 FileExtMismatchContextMenuActionsProvider.menuItemStr=\u62E1\u5F35\u5B50{0}\u3092MIME\u30BF\u30A4\u30D7{1}\u306E\u4E00\u81F4\u3068\u3057\u3066\u8FFD\u52A0
 FileExtMismatchIngestModule.moduleName=\u62E1\u5F35\u5B50\u4E0D\u4E00\u81F4\u30C7\u30A3\u30C6\u30AF\u30BF\u30FC
-FileExtMismatchIngestModule.moduleDesc.text=\u30D5\u30A1\u30A4\u30EB\u30BF\u30A4\u30D7\u306B\u57FA\u3065\u3044\u3066\u3001\u6A19\u6E96\u7684\u3067\u306F\u306A\u3044\u62E1\u5F35\u5B50\u3092\u6301\u3064\u30D5\u30A1\u30A4\u30EB\u3092\u30D5\u30E9\u30B0\u4ED8\u3051\u3057\u307E\u3059\u3002d
+FileExtMismatchIngestModule.moduleDesc.text=\u30D5\u30A1\u30A4\u30EB\u30BF\u30A4\u30D7\u306B\u57FA\u3065\u3044\u3066\u3001\u6A19\u6E96\u7684\u3067\u306F\u306A\u3044\u62E1\u5F35\u5B50\u3092\u6301\u3064\u30D5\u30A1\u30A4\u30EB\u3092\u30D5\u30E9\u30B0\u3057\u307E\u3059\u3002d
 FileExtMismatchIngestModule.complete.totalProcTime=\u5408\u8A08\u51E6\u7406\u6642\u9593
 FileExtMismatchIngestModule.complete.totalFiles=\u5408\u8A08\u51E6\u7406\u30D5\u30A1\u30A4\u30EB\u6570
 FileExtMismatchIngestModule.complete.svcMsg.text=\u30D5\u30A1\u30A4\u30EB\u62E1\u5F35\u5B50\u4E0D\u4E00\u81F4\u7D50\u679C
 FileExtMismatchOptionsPanelController.moduleErr=\u30E2\u30B8\u30E5\u30FC\u30EB\u30A8\u30E9\u30FC
-FileExtMismatchOptionsPanelController.moduleErr.msg=FileExtMismatchOptionsPanelController\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u306E\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
+FileExtMismatchOptionsPanelController.moduleErr.msg=FileExtMismatchOptionsPanelController\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u306E\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\u3092\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
 AddFileExtensionAction.extHeaderLbl.text=\u4E0B\u8A18\u7528\u306B\u8A31\u53EF\u3059\u308B\u62E1\u5F35\u5B50
-FileExtMismatchModuleSettingsPanel.skipTextPlain.text=\u30C6\u30AD\u30B9\u30C8\u30D5\u30A1\u30A4\u30EB\u306F\u30B9\u30AD\u30C3\u30D7
-FileExtMismatchModuleSettingsPanel.skipNoExtCheckBox.text=\u62E1\u5F35\u5B50\u306E\u7121\u3044\u30D5\u30A1\u30A4\u30EB\u306F\u30B9\u30AD\u30C3\u30D7
+FileExtMismatchModuleSettingsPanel.skipTextPlain.text=\u30C6\u30AD\u30B9\u30C8\u30D5\u30A1\u30A4\u30EB\u3092\u30B9\u30AD\u30C3\u30D7
+FileExtMismatchModuleSettingsPanel.skipNoExtCheckBox.text=\u62E1\u5F35\u5B50\u306E\u7121\u3044\u30D5\u30A1\u30A4\u30EB\u3092\u30B9\u30AD\u30C3\u30D7
 FileExtMismatchSettingsPanel.addTypeButton.text=\u30BF\u30A4\u30D7\u3092\u8FFD\u52A0
 FileExtMismatchSettingsPanel.extHeaderLabel.text=\u8A31\u53EF\u3059\u308B\u62E1\u5F35\u5B50\uFF1A
 FileExtMismatchSettingsPanel.removeTypeButton.text=\u9078\u629E\u3057\u305F\u30BF\u30A4\u30D7\u3092\u524A\u9664

From 4d561e15d2870aac943a81bc4a89820b8baa2348 Mon Sep 17 00:00:00 2001
From: Kay Bassi <kb@narfindustries.com>
Date: Tue, 2 Feb 2016 15:07:41 -0800
Subject: [PATCH 09/68] Completed editing/translation

---
 .../modules/filetypeid/Bundle_ja.properties   | 85 ++++++++++---------
 1 file changed, 47 insertions(+), 38 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/modules/filetypeid/Bundle_ja.properties b/Core/src/org/sleuthkit/autopsy/modules/filetypeid/Bundle_ja.properties
index 6c4794a851..dd67259dae 100644
--- a/Core/src/org/sleuthkit/autopsy/modules/filetypeid/Bundle_ja.properties
+++ b/Core/src/org/sleuthkit/autopsy/modules/filetypeid/Bundle_ja.properties
@@ -1,38 +1,47 @@
-OpenIDE-Module-Name=\u30d5\u30a1\u30a4\u30eb\u30bf\u30a4\u30d7ID
-FileTypeIdIngestModule.moduleName.text=\u30d5\u30a1\u30a4\u30eb\u30bf\u30a4\u30d7\u306e\u7279\u5b9a
-FileTypeIdIngestModule.moduleDesc.text=\u30d0\u30a4\u30ca\u30ea\u30b7\u30b0\u30cd\u30c1\u30e3\u306b\u57fa\u3065\u3044\u3066\u30d5\u30a1\u30a4\u30eb\u30bf\u30a4\u30d7\u3092\u4e00\u81f4\u3059\u308b\u3002
-FileTypeIdIngestModule.complete.totalProcTime=\u5408\u8a08\u51e6\u7406\u6642\u9593
-FileTypeIdIngestModule.complete.totalFiles=\u5408\u8a08\u51e6\u7406\u30d5\u30a1\u30a4\u30eb\u6570
-FileTypeIdIngestModule.complete.srvMsg.text=\u30d5\u30a1\u30a4\u30eb\u30bf\u30a4\u30d7ID\u306e\u7d50\u679c
-FileTypeIdModuleFactory.getIngestJobSettingsPanel.exception.msg=\u8a2d\u5b9a\u3092\u884c\u3046\u70ba\u306e\u60f3\u5b9a\u3055\u308c\u308b\u5f15\u6570\u306finstanceof FileTypeIdModuleSettings\u3067\u3059\u3002
-FileTypeIdModuleFactory.createFileIngestModule.exception.msg=\u8a2d\u5b9a\u3092\u884c\u3046\u70ba\u306e\u60f3\u5b9a\u3055\u308c\u308b\u5f15\u6570\u306finstanceof FileTypeIdModuleSettings\u3067\u3059\u3002
-FileTypeIdIngestJobSettingsPanel.skipKnownCheckBox.toolTipText=\u65e2\u77e5\u306e\u30cf\u30c3\u30b7\u30e5\u5024\u3092\u6301\u3064\u30d5\u30a1\u30a4\u30eb\u6570\u306b\u3088\u3063\u3066\u306f\u3001\u3053\u306e\u30dc\u30c3\u30af\u30b9\u3092\u9078\u629e\u3059\u308b\u306e\u306b\u3088\u308a\u3001\u30d5\u30a1\u30a4\u30eb\u30bf\u30a4\u30d7\u306e\u7279\u5b9a\u3092\u52a0\u901f\u3057\u307e\u3059\u3002
-FileTypeIdIngestJobSettingsPanel.skipKnownCheckBox.text=\u65e2\u77e5\u30d5\u30a1\u30a4\u30eb\uff08NSRL\uff09\u3092\u30b9\u30ad\u30c3\u30d7
-FileTypeIdGlobalSettingsPanel.deleteTypeButton.text=\u524a\u9664\u30bf\u30a4\u30d7
-FileTypeIdGlobalSettingsPanel.filesSetNameLabel.text=\u30d5\u30a1\u30a4\u30eb\u30bb\u30c3\u30c8\u540d
-FileTypeIdGlobalSettingsPanel.ingestRunningWarningLabel.text=\u30a4\u30f3\u30b8\u30a7\u30b9\u30c8\u304c\u5b9f\u884c\u4e2d\u306b\u30d5\u30a1\u30a4\u30eb\u30bf\u30a4\u30d7\u5b9a\u7fa9\u3092\u5909\u66f4\u3067\u304d\u307e\u305b\u3093\uff01
-FileTypeIdGlobalSettingsPanel.JOptionPane.invalidInterestingFilesSetName.title=\u7591\u308f\u3057\u3044\u30d5\u30a1\u30a4\u30eb\u30bb\u30c3\u30c8\u540d\u304c\u6b20\u3051\u3066\u3044\u307e\u3059
-FileTypeIdGlobalSettingsPanel.JOptionPane.invalidMIMEType.message=MIME\u30bf\u30a4\u30d7\u304c\u5fc5\u8981\u3067\u3059\u3002
-FileTypeIdGlobalSettingsPanel.JOptionPane.invalidMIMEType.title=MIME\u30bf\u30a4\u30d7\u304c\u6b20\u3051\u3066\u3044\u307e\u3059
-FileTypeIdGlobalSettingsPanel.JOptionPane.invalidOffset.message=\u30aa\u30d5\u30bb\u30c3\u30c8\u306f\u6b63\u6574\u6570\u3067\u306a\u3051\u308c\u3070\u3044\u3051\u307e\u305b\u3093\u3002
-FileTypeIdGlobalSettingsPanel.JOptionPane.invalidOffset.title=\u7121\u52b9\u306a\u30aa\u30d5\u30bb\u30c3\u30c8
-FileTypeIdGlobalSettingsPanel.JOptionPane.invalidRawSignatureBytes.message=\u3053\u306e\u30b7\u30b0\u30cd\u30c1\u30e3\u306b\u4e00\u3064\u4ee5\u4e0a\u306e\u7121\u52b9\u306a16\u9032\u6570\u304c\u542b\u307e\u308c\u3066\u3044\u307e\u3059\u3002
-FileTypeIdGlobalSettingsPanel.JOptionPane.invalidSignature.message=\u30b7\u30b0\u30cd\u30c1\u30e3\u304c\u5fc5\u8981\u3067\u3059\u3002
-FileTypeIdGlobalSettingsPanel.JOptionPane.invalidSignature.title=\u30b7\u30b0\u30cd\u30c1\u30e3\u304c\u6b20\u3051\u3066\u3044\u307e\u3059
-FileTypeIdGlobalSettingsPanel.JOptionPane.invalidSignatureBytes.title=\u30b7\u30b0\u30cd\u30c1\u30e3\u304c\u7121\u52b9\u3067\u3059
-FileTypeIdGlobalSettingsPanel.JOptionPane.loadFailed.title=\u8aad\u307f\u8fbc\u307f\u304c\u5931\u6557\u3057\u307e\u3057\u305f
-FileTypeIdGlobalSettingsPanel.JOptionPane.storeFailed.title=\u4fdd\u5b58\u304c\u5931\u6557\u3057\u307e\u3057\u305f
-FileTypeIdGlobalSettingsPanel.mimeTypeLabel.text=MIME\u30bf\u30a4\u30d7
-FileTypeIdGlobalSettingsPanel.newTypeButton.text=\u65b0\u898f\u30bf\u30a4\u30d7
-FileTypeIdGlobalSettingsPanel.offsetLabel.text=\u30aa\u30d5\u30bb\u30c3\u30c8
-FileTypeIdGlobalSettingsPanel.postHitCheckBox.text=\u7591\u308f\u3057\u3044\u30d5\u30a1\u30a4\u30eb\u30d2\u30c3\u30c8\u3092\u691c\u77e5\u3057\u305f\u5834\u5408\u8868\u793a\u3059\u308b
-FileTypeIdGlobalSettingsPanel.saveTypeButton.text=\u4fdd\u5b58\u30bf\u30a4\u30d7
-FileTypeIdGlobalSettingsPanel.signatureComboBox.asciiItem=\u30b9\u30c8\u30ea\u30f3\u30b0\uff08ASCII\uff09
-FileTypeIdGlobalSettingsPanel.signatureComboBox.rawItem=\u30d0\u30a4\u30c8\uff08HEX\uff09
-FileTypeIdGlobalSettingsPanel.signatureLabel.text=\u30b7\u30b0\u30cd\u30c1\u30e3
-FileTypeIdGlobalSettingsPanel.signatureTypeLabel.text=\u30b7\u30b0\u30cd\u30c1\u30e3\u30bf\u30a4\u30d7
-OptionsCategory_Keywords_FileTypeId=\u30d5\u30a1\u30a4\u30eb\u30bf\u30a4\u30d7ID
-OptionsCategory_Name_FileTypeId=\u30d5\u30a1\u30a4\u30eb\u30bf\u30a4\u30d7ID
-UserDefinedFileTypesManager.loadFileTypes.errorMessage=\u65e2\u5b58\u306e\u30d5\u30a1\u30a4\u30eb\u30bf\u30a4\u30d7\u5b9a\u7fa9\u306e\u30ed\u30fc\u30c9\u306b\u5931\u6557\u3057\u307e\u3057\u305f
-UserDefinedFileTypesManager.saveFileTypes.errorMessage=\u30d5\u30a1\u30a4\u30eb\u30bf\u30a4\u30d7\u5b9a\u7fa9\u306e\u4fdd\u5b58\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002
-FileTypeIdGlobalSettingsPanel.JOptionPane.invalidInterestingFilesSetName.message=\u30a2\u30e9\u30fc\u30c8\u3092\u8a2d\u5b9a\u3059\u308b\u306b\u306f\u7591\u308f\u3057\u3044\u30d5\u30a1\u30a4\u30eb\u30bb\u30c3\u30c8\u540d\u304c\u5fc5\u8981\u3067\u3059\u3002
+OpenIDE-Module-Name=\u30D5\u30A1\u30A4\u30EB\u30BF\u30A4\u30D7ID
+FileTypeIdIngestModule.moduleName.text=\u30D5\u30A1\u30A4\u30EB\u30BF\u30A4\u30D7\u306E\u7279\u5B9A
+FileTypeIdIngestModule.moduleDesc.text=\u30D0\u30A4\u30CA\u30EA\u30B7\u30B0\u30CD\u30C1\u30E3\u306B\u57FA\u3065\u3044\u3066\u30D5\u30A1\u30A4\u30EB\u30BF\u30A4\u30D7\u3092\u4E00\u81F4\u3057\u307E\u3059\u3002
+FileTypeIdIngestModule.complete.totalProcTime=\u5408\u8A08\u51E6\u7406\u6642\u9593
+FileTypeIdIngestModule.complete.totalFiles=\u5408\u8A08\u51E6\u7406\u30D5\u30A1\u30A4\u30EB\u6570
+FileTypeIdIngestModule.complete.srvMsg.text=\u30D5\u30A1\u30A4\u30EB\u30BF\u30A4\u30D7ID\u306E\u7D50\u679C
+FileTypeIdModuleFactory.getIngestJobSettingsPanel.exception.msg=\u8A2D\u5B9A\u3092\u884C\u3046\u70BA\u306E\u60F3\u5B9A\u3055\u308C\u308B\u5F15\u6570\u306Finstanceof FileTypeIdModuleSettings\u3067\u3059\u3002
+FileTypeIdModuleFactory.createFileIngestModule.exception.msg=\u8A2D\u5B9A\u3092\u884C\u3046\u70BA\u306E\u60F3\u5B9A\u3055\u308C\u308B\u5F15\u6570\u306Finstanceof FileTypeIdModuleSettings\u3067\u3059\u3002
+FileTypeIdIngestJobSettingsPanel.skipKnownCheckBox.toolTipText=\u65E2\u77E5\u306E\u30CF\u30C3\u30B7\u30E5\u5024\u3092\u6301\u3064\u30D5\u30A1\u30A4\u30EB\u6570\u306B\u3088\u3063\u3066\u306F\u3001\u3053\u306E\u30DC\u30C3\u30AF\u30B9\u3092\u9078\u629E\u3059\u308B\u3053\u3068\u306B\u3088\u308A\u3001\u30D5\u30A1\u30A4\u30EB\u30BF\u30A4\u30D7\u306E\u7279\u5B9A\u3092\u52A0\u901F\u3057\u307E\u3059\u3002
+FileTypeIdIngestJobSettingsPanel.skipKnownCheckBox.text=\u65E2\u77E5\u30D5\u30A1\u30A4\u30EB\uFF08NSRL\uFF09\u3092\u30B9\u30AD\u30C3\u30D7
+FileTypeIdGlobalSettingsPanel.deleteTypeButton.text=\u524A\u9664
+FileTypeIdGlobalSettingsPanel.filesSetNameLabel.text=\u30BB\u30C3\u30C8\u540D
+FileTypeIdGlobalSettingsPanel.ingestRunningWarningLabel.text=\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u3092\u5B9F\u884C\u4E2D\u306B\u30D5\u30A1\u30A4\u30EB\u30BF\u30A4\u30D7\u5B9A\u7FA9\u3092\u5909\u66F4\u3067\u304D\u307E\u305B\u3093\uFF01
+FileTypeIdGlobalSettingsPanel.JOptionPane.invalidInterestingFilesSetName.title=\u7591\u308F\u3057\u3044\u30D5\u30A1\u30A4\u30EB\u30BB\u30C3\u30C8\u540D\u304C\u6B20\u3051\u3066\u3044\u307E\u3059
+FileTypeIdGlobalSettingsPanel.JOptionPane.invalidMIMEType.message=MIME\u30BF\u30A4\u30D7\u304C\u5FC5\u8981\u3067\u3059\u3002
+FileTypeIdGlobalSettingsPanel.JOptionPane.invalidMIMEType.title=MIME\u30BF\u30A4\u30D7\u304C\u6B20\u3051\u3066\u3044\u307E\u3059
+FileTypeIdGlobalSettingsPanel.JOptionPane.invalidOffset.message=\u30AA\u30D5\u30BB\u30C3\u30C8\u306F\u6B63\u6574\u6570\u3067\u306A\u3051\u308C\u3070\u3044\u3051\u307E\u305B\u3093\u3002
+FileTypeIdGlobalSettingsPanel.JOptionPane.invalidOffset.title=\u7121\u52B9\u306A\u30AA\u30D5\u30BB\u30C3\u30C8
+FileTypeIdGlobalSettingsPanel.JOptionPane.invalidRawSignatureBytes.message=\u3053\u306E\u30B7\u30B0\u30CD\u30C1\u30E3\u306B\u4E00\u3064\u4EE5\u4E0A\u306E\u7121\u52B9\u306A16\u9032\u6570\u304C\u542B\u307E\u308C\u3066\u3044\u307E\u3059\u3002
+FileTypeIdGlobalSettingsPanel.JOptionPane.invalidSignature.message=\u30B7\u30B0\u30CD\u30C1\u30E3\u304C\u5FC5\u8981\u3067\u3059\u3002
+FileTypeIdGlobalSettingsPanel.JOptionPane.invalidSignature.title=\u30B7\u30B0\u30CD\u30C1\u30E3\u304C\u6B20\u3051\u3066\u3044\u307E\u3059
+FileTypeIdGlobalSettingsPanel.JOptionPane.invalidSignatureBytes.title=\u30B7\u30B0\u30CD\u30C1\u30E3\u304C\u7121\u52B9\u3067\u3059
+FileTypeIdGlobalSettingsPanel.JOptionPane.loadFailed.title=\u8AAD\u307F\u8FBC\u307F\u304C\u5931\u6557\u3057\u307E\u3057\u305F
+FileTypeIdGlobalSettingsPanel.JOptionPane.storeFailed.title=\u4FDD\u5B58\u304C\u5931\u6557\u3057\u307E\u3057\u305F
+FileTypeIdGlobalSettingsPanel.mimeTypeLabel.text=MIME\u30BF\u30A4\u30D7
+FileTypeIdGlobalSettingsPanel.newTypeButton.text=\u65B0\u898F\u30BF\u30A4\u30D7
+FileTypeIdGlobalSettingsPanel.offsetLabel.text=\u30D0\u30A4\u30C8\u30AA\u30D5\u30BB\u30C3\u30C8
+FileTypeIdGlobalSettingsPanel.postHitCheckBox.text=\u767A\u898B\u3057\u305F\u969B\u306B\u300C\u7591\u308F\u3057\u3044\u30D5\u30A1\u30A4\u30EB\u300D\u3068\u8B66\u544A
+FileTypeIdGlobalSettingsPanel.saveTypeButton.text=\u4FDD\u5B58\u30BF\u30A4\u30D7
+FileTypeIdGlobalSettingsPanel.signatureComboBox.asciiItem=\u30B9\u30C8\u30EA\u30F3\u30B0\uFF08ASCII\uFF09
+FileTypeIdGlobalSettingsPanel.signatureComboBox.rawItem=\u30D0\u30A4\u30C8\uFF08HEX\uFF09
+FileTypeIdGlobalSettingsPanel.signatureLabel.text=\u30B7\u30B0\u30CD\u30C1\u30E3
+FileTypeIdGlobalSettingsPanel.signatureTypeLabel.text=\u30B7\u30B0\u30CD\u30C1\u30E3\u30BF\u30A4\u30D7
+OptionsCategory_Keywords_FileTypeId=\u30D5\u30A1\u30A4\u30EB\u30BF\u30A4\u30D7ID
+OptionsCategory_Name_FileTypeId=\u30D5\u30A1\u30A4\u30EB\u30BF\u30A4\u30D7
+UserDefinedFileTypesManager.loadFileTypes.errorMessage=\u65E2\u5B58\u306E\u30D5\u30A1\u30A4\u30EB\u30BF\u30A4\u30D7\u5B9A\u7FA9\u306E\u8AAD\u307F\u8FBC\u307F\u306B\u5931\u6557\u3057\u307E\u3057\u305F
+UserDefinedFileTypesManager.saveFileTypes.errorMessage=\u30D5\u30A1\u30A4\u30EB\u30BF\u30A4\u30D7\u5B9A\u7FA9\u306E\u4FDD\u5B58\u306B\u5931\u6557\u3057\u307E\u3057\u305F\u3002
+FileTypeIdGlobalSettingsPanel.JOptionPane.invalidInterestingFilesSetName.message=\u30A2\u30E9\u30FC\u30C8\u3092\u8A2D\u5B9A\u3059\u308B\u306B\u306F\u7591\u308F\u3057\u3044\u30D5\u30A1\u30A4\u30EB\u30BB\u30C3\u30C8\u540D\u304C\u5FC5\u8981\u3067\u3059\u3002
+FileTypeIdGlobalSettingsPanel.offsetComboBox.startItem=\u958B\u59CB
+FileTypeIdGlobalSettingsPanel.offsetComboBox.endItem=\u505C\u6B62
+FileTypeIdGlobalSettingsPanel.JOptionPane.invalidOffset.length=\u30AA\u30D5\u30BB\u30C3\u30C8\u306F\u30B7\u30B0\u30CD\u30C1\u30E3\u30B5\u30A4\u30BA\u3088\u308A\u5C0F\u3055\u304F\u3066\u306F\u3044\u3051\u307E\u305B\u3093\u3002
+FileTypeIdGlobalSettingsPanel.jLabel1.text=\u30AB\u30B9\u30BF\u30E0\u30D5\u30A1\u30A4\u30EB\u30BF\u30A4\u30D7
+FileTypeIdGlobalSettingsPanel.jLabel2.text=MIME\u30BF\u30A4\u30D7\uFF1A
+FileTypeIdGlobalSettingsPanel.jLabel3.text=Autopsy\u306F\u81EA\u52D5\u7684\u306B\u591A\u304F\u306E\u30D5\u30A1\u30A4\u30EB\u30BF\u30A4\u30D7\u3092\u691C\u77E5\u3067\u304D\u307E\u3059\u3002\u3053\u3053\u306B\u306F\u3042\u306A\u305F\u306E\u30AB\u30B9\u30BF\u30E0\u306E\u30D5\u30A1\u30A4\u30EB\u30BF\u30A4\u30D7\u3092\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044\u3002
+FileTypeIdGlobalSettingsPanel.startUp.fileTypeDetectorInitializationException.msg=\u30D5\u30A1\u30A4\u30EB\u30BF\u30A4\u30D7\u30C7\u30A3\u30C6\u30AF\u30BF\u3092\u8D77\u52D5\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F\u3002
+FileTypeIdIngestModule.startUp.fileTypeDetectorInitializationException.msg=\u30D5\u30A1\u30A4\u30EB\u30BF\u30A4\u30D7\u30C7\u30A3\u30C6\u30AF\u30BF\u3092\u8D77\u52D5\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F\u3002
+FileTypeIdGlobalSettingsPanel.offsetRelativeToLabel.text=\u30AA\u30D5\u30BB\u30C3\u30C8\u306F\u6B21\u3068\u76F8\u5BFE\u7684

From b476dfe0b16c694f9d011073a5cf0382f00f76ff Mon Sep 17 00:00:00 2001
From: Kay Bassi <kb@narfindustries.com>
Date: Tue, 2 Feb 2016 15:34:01 -0800
Subject: [PATCH 10/68] Completed editing/translation

---
 .../modules/hashdatabase/Bundle_ja.properties | 398 +++++++++---------
 1 file changed, 208 insertions(+), 190 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/Bundle_ja.properties b/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/Bundle_ja.properties
index 90c7f77266..d63bbe7d37 100644
--- a/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/Bundle_ja.properties
+++ b/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/Bundle_ja.properties
@@ -1,194 +1,212 @@
-OpenIDE-Module-Display-Category=\u30a4\u30f3\u30b8\u30a7\u30b9\u30c8\u30e2\u30b8\u30e5\u30fc\u30eb
+OpenIDE-Module-Display-Category=\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u30E2\u30B8\u30E5\u30FC\u30EB
 OpenIDE-Module-Long-Description=\
-    \u30cf\u30c3\u30b7\u30e5\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u30a4\u30f3\u30b8\u30a7\u30b9\u30c8\u30e2\u30b8\u30e5\u30fc\u30eb  \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\u60aa\u8cea\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\u8a2d\u5b9a\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
-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\u30a4\u30f3\u30b8\u30a7\u30b9\u30c8\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\u540d\uff1a
-HashDbImportDatabaseDialog.knownBadRadioButton.text=\u65e2\u77e5\u306e\u60aa\u8cea
-HashDbImportDatabaseDialog.jLabel2.text=\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u306e\u30bf\u30a4\u30d7\uff1a
+    \u30CF\u30C3\u30B7\u30E5\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u306E\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u30E2\u30B8\u30E5\u30FC\u30EB  \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\u60AA\u8CEA\uFF0F\u7591\u308F\u3057\u3044\u300D\uFF08\u30E6\u30FC\u30B6\u30FC\u304C\u6307\u5B9A\u3057\u305F\u5358\u6570\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\u8A2D\u5B9A\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
+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=\u6B21\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=\u30C3\u30B7\u30E5\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u306E\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\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\u540D\uFF1A
+HashDbImportDatabaseDialog.knownBadRadioButton.text=\u65E2\u77E5\u306E\u60AA\u8CEA
+HashDbImportDatabaseDialog.jLabel2.text=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u306E\u30BF\u30A4\u30D7\uFF1A
 HashDbImportDatabaseDialog.okButton.text=OK
-HashDbImportDatabaseDialog.cancelButton.text=\u30ad\u30e3\u30f3\u30bb\u30eb
-HashDbCreateDatabaseDialog.jLabel2.text=\u30bf\u30a4\u30d7\uff1a
-HashDbCreateDatabaseDialog.knownBadRadioButton.text=\u65e2\u77e5\u306e\u60aa\u8cea
-HashDbCreateDatabaseDialog.cancelButton.text=\u30ad\u30e3\u30f3\u30bb\u30eb
-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
-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=\u30d2\u30c3\u30c8\u6bce\u306b\u30a4\u30f3\u30b8\u30a7\u30b9\u30c8\u30a4\u30f3\u30dc\u30c3\u30af\u30b9\u306b\u30e1\u30c3\u30bb\u30fc\u30b8\u3092\u9001\u308b
-HashDbImportDatabaseDialog.sendIngestMessagesCheckbox.text=\u30d2\u30c3\u30c8\u6bce\u306b\u30a4\u30f3\u30b8\u30a7\u30b9\u30c8\u30a4\u30f3\u30dc\u30c3\u30af\u30b9\u306b\u30e1\u30c3\u30bb\u30fc\u30b8\u3092\u9001\u308b
-HashDbImportDatabaseDialog.openButton.text=\u958b\u304f...
-HashDbCreateDatabaseDialog.jLabel3.text=\u30cf\u30c3\u30b7\u30e5\u30bb\u30c3\u30c8\u540d\uff1a
+HashDbImportDatabaseDialog.cancelButton.text=\u30AD\u30E3\u30F3\u30BB\u30EB
+HashDbCreateDatabaseDialog.jLabel2.text=\u30BF\u30A4\u30D7\uFF1A
+HashDbCreateDatabaseDialog.knownBadRadioButton.text=\u65E2\u77E5\u306E\u60AA\u8CEA
+HashDbCreateDatabaseDialog.cancelButton.text=\u30AD\u30E3\u30F3\u30BB\u30EB
+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
+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=\u30D2\u30C3\u30C8\u6BCE\u306B\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u30A4\u30F3\u30DC\u30C3\u30AF\u30B9\u306B\u30E1\u30C3\u30BB\u30FC\u30B8\u3092\u9001\u308B
+HashDbImportDatabaseDialog.sendIngestMessagesCheckbox.text=\u30D2\u30C3\u30C8\u6BCE\u306B\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u30A4\u30F3\u30DC\u30C3\u30AF\u30B9\u306B\u30E1\u30C3\u30BB\u30FC\u30B8\u3092\u9001\u308B
+HashDbImportDatabaseDialog.openButton.text=\u958B\u304F...
+HashDbCreateDatabaseDialog.jLabel3.text=\u30CF\u30C3\u30B7\u30E5\u30BB\u30C3\u30C8\u540D\uFF1A
 HashDbCreateDatabaseDialog.okButton.text=OK
-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.addToHashDbErr1.text=\u30cf\u30c3\u30b7\u30e5\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u30a8\u30e9\u30fc\u306b\u8ffd\u52a0
-AddContentToHashDbAction.addFilesToHashSet.addToHashDbErr2.text=\u30cf\u30c3\u30b7\u30e5\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u30a8\u30e9\u30fc\u306b\u8ffd\u52a0
-AddContentToHashDbAction.addFilesToHashSet.addToHashDbErr3.text=\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\u304b\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\u53d6\u5f97\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\n {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\u3001\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
-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\n{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.lookingUpKnownHashValueErr={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.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\n {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}\n\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\n{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\n {1}\n \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
-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\n\
-\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\u5834\u5408\u306f\n\
-\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\n\
-\u3000\u3000\u3000\u3000\u3000\u3000\u3000\u3000\u3000\u3000\u3000\u3000\u3000\u3000\u3000\u3000\u3000\u3000\u3000\u3000\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\n{0}
-HashDbManager.hashDbFileExistsExceptionMsg=\u4e0b\u8a18\u306b\u306f\u65e2\u306b\u30d5\u30a1\u30a4\u30eb\u304c\u5b58\u5728\u3057\u307e\u3059\u3002\n{0}
-HashDbManager.hashDbAlreadyAddedExceptionMsg=\u4e0b\u8a18\u306e\u30cf\u30c3\u30b7\u30e5\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\n{0}\n\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=\u51e6\u7406\u4e2d\uff1b\u5b8c\u4e86\u3059\u308b\u307e\u3067\u3053\u306e\u30b5\u30fc\u30d3\u30b9\u306f\u5229\u7528\u3067\u304d\u307e\u305b\u3093\u3002
-ModalNoButtons.CURRENTDB_LABEL.text=\uff08\u73fe\u5728\u306e\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\uff09
-HashDbCreateDatabaseDialog.defaultFileName=\u30cf\u30c3\u30b7\u30e5\u30bb\u30c3\u30c8
-HashDbManager.saveErrorExceptionMsg=\u30cf\u30c3\u30b7\u30e5\u8a2d\u5b9a\u306e\u4fdd\u5b58\u4e2d\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f
-AddContentToHashDbAction.addFilesToHashSet.files=\u30d5\u30a1\u30a4\u30eb
-AddContentToHashDbAction.addFilesToHashSet.file=\u30d5\u30a1\u30a4\u30eb
-HashDbManager.errCreatingIndex.title=\u30a4\u30f3\u30c7\u30c3\u30af\u30b9\u306e\u4f5c\u6210\u4e2d\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f
-HashDbManager.errCreatingIndex.msg=\u4e0b\u8a18\u306e\u30a4\u30f3\u30c7\u30c3\u30af\u30b9\u306e\u4f5c\u6210\u4e2d\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f\uff1a {0}
+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.addToHashDbErr1.text=\u30CF\u30C3\u30B7\u30E5\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u30A8\u30E9\u30FC\u306B\u8FFD\u52A0
+AddContentToHashDbAction.addFilesToHashSet.addToHashDbErr2.text=\u30CF\u30C3\u30B7\u30E5\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u30A8\u30E9\u30FC\u306B\u8FFD\u52A0
+AddContentToHashDbAction.addFilesToHashSet.addToHashDbErr3.text=\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\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\u304B\u30ED\u30B0\u3092\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\u53D6\u5F97\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=\u6B21\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\n {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\u3092\u5931\u6557\u3057\u307E\u3057\u305F\u3002
+HashDbImportDatabaseDialog.importHashDbErr=\u30CF\u30C3\u30B7\u30E5\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u306E\u30A8\u30E9\u30FC\u3092\u30A4\u30F3\u30DD\u30FC\u30C8
+HashDbImportDatabaseDialog.mustSelectHashDbFilePathMsg=\u30CF\u30C3\u30B7\u30E5\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u306E\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\u3001\u65E2\u77E5\u307E\u305F\u306F\u7591\u308F\u3057\u3044\u3082\u306E\u3092\u691C\u77E5\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
+HashDbConfigPanel.dbNotIndexedMsg=\u6B21\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\n{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\u65E2\u77E5\u306E\u60AA\u8CEA\u30B9\u30C6\u30FC\u30BF\u30B9\u3092\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.lookingUpKnownHashValueErr={0}\u306E\u65E2\u77E5\u306E\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\u3092\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=\u91CD\u8907\u306E\u30CF\u30C3\u30B7\u30E5\u30BB\u30C3\u30C8\u540D {0} \u304C\u898B\u3064\u304B\u308A\u307E\u3057\u305F\u3002\n {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}\n\u53E4\u3044\u8A2D\u5B9A\u306E\u30D0\u30C3\u30AF\u30A2\u30C3\u30D7\u30B3\u30D4\u30FC\u304C\u6B21\u306E\u901A\u308A\u4FDD\u5B58\u3055\u308C\u307E\u3057\u305F\u3002\n{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\u6B21\u306E\u30ED\u30B1\u30FC\u30B7\u30E7\u30F3\u306B\u3042\u308A\u307E\u305B\u3093\u3067\u3057\u305F\u3002\n {1}\n \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
+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\n\
+\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\u5834\u5408\u306F\n\
+\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\n\
+\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=\u30CF\u30C3\u30B7\u30E5\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u304C\u6B21\u3067\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3067\u3057\u305F\n{0}
+HashDbManager.hashDbFileExistsExceptionMsg=\u65E2\u306B\u30D5\u30A1\u30A4\u30EB\u304C\u6B21\u306B\u5B58\u5728\u3057\u307E\u3059\n{0}
+HashDbManager.hashDbAlreadyAddedExceptionMsg=\u6B21\u306E\u30CF\u30C3\u30B7\u30E5\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\n{0}\n\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=\u51E6\u7406\u4E2D\uFF1B\u5B8C\u4E86\u3059\u308B\u307E\u3067\u3053\u306E\u30B5\u30FC\u30D3\u30B9\u306F\u5229\u7528\u3067\u304D\u307E\u305B\u3093\u3002
+ModalNoButtons.CURRENTDB_LABEL.text=\uFF08\u73FE\u5728\u306E\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\uFF09
+HashDbCreateDatabaseDialog.defaultFileName=\u30CF\u30C3\u30B7\u30E5\u30BB\u30C3\u30C8
+HashDbManager.saveErrorExceptionMsg=\u30CF\u30C3\u30B7\u30E5\u8A2D\u5B9A\u306E\u4FDD\u5B58\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F
+AddContentToHashDbAction.addFilesToHashSet.files=\u30D5\u30A1\u30A4\u30EB
+AddContentToHashDbAction.addFilesToHashSet.file=\u30D5\u30A1\u30A4\u30EB
+HashDbManager.errCreatingIndex.title=\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9\u306E\u4F5C\u6210\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F
+HashDbManager.errCreatingIndex.msg=\u6B21\u306E\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9\u306E\u4F5C\u6210\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F\uFF1A {0}
 
-HashLookupSettingsPanel.optionsLabel.text=\u30aa\u30d7\u30b7\u30e7\u30f3
-HashLookupSettingsPanel.jButton3.text=\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u3092\u30a4\u30f3\u30dd\u30fc\u30c8
-HashLookupSettingsPanel.indexPathLabelLabel.text=\u30a4\u30f3\u30c7\u30c3\u30af\u30b9\u30d1\u30b9\uff1a
-HashLookupSettingsPanel.createDatabaseButton.text=\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u3092\u4f5c\u6210
-HashLookupSettingsPanel.jLabel6.text=\u30bf\u30a4\u30d7\uff1a
-HashLookupSettingsPanel.jLabel4.text=\u30ed\u30b1\u30fc\u30b7\u30e7\u30f3\uff1a
-HashLookupSettingsPanel.jLabel2.text=\u540d\u524d\uff1a
-HashLookupSettingsPanel.indexPathLabel.text=\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u304c\u9078\u629e\u3055\u308c\u3066\u3044\u307e\u305b\u3093
-HashLookupSettingsPanel.ingestWarningLabel.text=\u30a4\u30f3\u30b8\u30a7\u30b9\u30c8\u4e2d\u3067\u3059\u3002\u5b8c\u4e86\u3059\u308b\u307e\u3067\u4e00\u90e8\u306e\u8a2d\u5b9a\u306f\u5229\u7528\u3067\u304d\u307e\u305b\u3093\u3002
-HashLookupSettingsPanel.deleteDatabaseButton.text=\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u3092\u524a\u9664
-HashLookupSettingsPanel.importDatabaseButton.text=\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u3092\u30a4\u30f3\u30dd\u30fc\u30c8
-HashLookupSettingsPanel.hashDatabasesLabel.text=\u30cf\u30c3\u30b7\u30e5\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\uff1a
-HashLookupSettingsPanel.nameLabel.text=\u30cf\u30c3\u30b7\u30e5\u30bb\u30c3\u30c8\u540d\uff1a
-HashLookupSettingsPanel.informationLabel.text=\u60c5\u5831
-HashLookupSettingsPanel.sendIngestMessagesCheckBox.text=\u30d2\u30c3\u30c8\u6bce\u306b\u30a4\u30f3\u30b8\u30a7\u30b9\u30c8\u30a4\u30f3\u30dc\u30c3\u30af\u30b9\u306b\u30e1\u30c3\u30bb\u30fc\u30b8\u3092\u9001\u308b
-HashLookupSettingsPanel.hashDbLocationLabel.text=\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u304c\u9078\u629e\u3055\u308c\u3066\u3044\u307e\u305b\u3093
-HashLookupSettingsPanel.hashDbNameLabel.text=\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u304c\u9078\u629e\u3055\u308c\u3066\u3044\u307e\u305b\u3093
-HashLookupSettingsPanel.typeLabel.text=\u30bf\u30a4\u30d7\uff1a
-HashLookupSettingsPanel.locationLabel.text=\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u30d1\u30b9\uff1a
-HashLookupSettingsPanel.hashDbIndexStatusLabel.text=\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u304c\u9078\u629e\u3055\u308c\u3066\u3044\u307e\u305b\u3093
-HashLookupSettingsPanel.hashDbTypeLabel.text=\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u304c\u9078\u629e\u3055\u308c\u3066\u3044\u307e\u305b\u3093
-HashLookupSettingsPanel.indexButton.text=\u30a4\u30f3\u30c7\u30c3\u30af\u30b9
-HashLookupSettingsPanel.indexLabel.text=\u30a4\u30f3\u30c7\u30c3\u30af\u30b9\u30b9\u30c6\u30fc\u30bf\u30b9\uff1a
-HashLookupModuleSettingsPanel.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
-HashLookupModuleSettingsPanel.knownHashDbsLabel.text=\u5229\u7528\u3059\u308b\u65e2\u77e5\u306e\u30cf\u30c3\u30b7\u30e5\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u3092\u9078\u629e\uff1a
-HashLookupModuleSettingsPanel.knownBadHashDbsLabel.text=\u51e6\u7406\u306b\u5229\u7528\u3059\u308b\u65e2\u77e5\u306e\u60aa\u8cea\u306a\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u3092\u9078\u629e\uff1a
-HashLookupModuleFactory.createFileIngestModule.exception.msg=\u8a2d\u5b9a\u3092\u884c\u3046\u70ba\u306e\u60f3\u5b9a\u3055\u308c\u308b\u5f15\u6570\u306finstanceof HashLookupModuleSettings\u3067\u3059\u3002
-HashLookupModuleFactory.getIngestJobSettingsPanel.exception.msg=\u8a2d\u5b9a\u3092\u884c\u3046\u70ba\u306e\u60f3\u5b9a\u3055\u308c\u308b\u5f15\u6570\u306finstanceof HashLookupModuleSettings\u3067\u3059\u3002
-HashLookupModuleSettingsPanel.alwaysCalcHashesCheckbox.toolTipText=\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
-HashDbSearchPanel.hashTable.defaultModel.title.text=MD5\u30cf\u30c3\u30b7\u30e5
-AddContentToHashDbAction.addFilesToHashSet.unableToAddFileEmptyMsg=\u30cf\u30c3\u30b7\u30e5\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u306b{0}\u3092\u8ffd\u52a0\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002\u30d5\u30a1\u30a4\u30eb\u306b\u30b3\u30f3\u30c6\u30f3\u30c4\u304c\u3042\u308a\u307e\u305b\u3093\u3002
+HashLookupSettingsPanel.optionsLabel.text=\u30AA\u30D7\u30B7\u30E7\u30F3
+HashLookupSettingsPanel.jButton3.text=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u3092\u30A4\u30F3\u30DD\u30FC\u30C8
+HashLookupSettingsPanel.indexPathLabelLabel.text=\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9\u30D1\u30B9\uFF1A
+HashLookupSettingsPanel.createDatabaseButton.text=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u3092\u4F5C\u6210
+HashLookupSettingsPanel.jLabel6.text=\u30BF\u30A4\u30D7\uFF1A
+HashLookupSettingsPanel.jLabel4.text=\u30ED\u30B1\u30FC\u30B7\u30E7\u30F3\uFF1A
+HashLookupSettingsPanel.jLabel2.text=\u540D\u524D\uFF1A
+HashLookupSettingsPanel.indexPathLabel.text=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u304C\u9078\u629E\u3055\u308C\u3066\u3044\u307E\u305B\u3093
+HashLookupSettingsPanel.ingestWarningLabel.text=\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u4E2D\u3067\u3059\u3002\u5B8C\u4E86\u3059\u308B\u307E\u3067\u4E00\u90E8\u306E\u8A2D\u5B9A\u306F\u5229\u7528\u3067\u304D\u307E\u305B\u3093\u3002
+HashLookupSettingsPanel.deleteDatabaseButton.text=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u3092\u524A\u9664
+HashLookupSettingsPanel.importDatabaseButton.text=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u3092\u30A4\u30F3\u30DD\u30FC\u30C8
+HashLookupSettingsPanel.hashDatabasesLabel.text=\u30CF\u30C3\u30B7\u30E5\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\uFF1A
+HashLookupSettingsPanel.nameLabel.text=\u30CF\u30C3\u30B7\u30E5\u30BB\u30C3\u30C8\u540D\uFF1A
+HashLookupSettingsPanel.informationLabel.text=\u60C5\u5831
+HashLookupSettingsPanel.sendIngestMessagesCheckBox.text=\u30D2\u30C3\u30C8\u6BCE\u306B\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u30A4\u30F3\u30DC\u30C3\u30AF\u30B9\u306B\u30E1\u30C3\u30BB\u30FC\u30B8\u3092\u9001\u308B
+HashLookupSettingsPanel.hashDbLocationLabel.text=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u304C\u9078\u629E\u3055\u308C\u3066\u3044\u307E\u305B\u3093
+HashLookupSettingsPanel.hashDbNameLabel.text=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u304C\u9078\u629E\u3055\u308C\u3066\u3044\u307E\u305B\u3093
+HashLookupSettingsPanel.typeLabel.text=\u30BF\u30A4\u30D7\uFF1A
+HashLookupSettingsPanel.locationLabel.text=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u30D1\u30B9\uFF1A
+HashLookupSettingsPanel.hashDbIndexStatusLabel.text=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u304C\u9078\u629E\u3055\u308C\u3066\u3044\u307E\u305B\u3093
+HashLookupSettingsPanel.hashDbTypeLabel.text=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u304C\u9078\u629E\u3055\u308C\u3066\u3044\u307E\u305B\u3093
+HashLookupSettingsPanel.indexButton.text=\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9
+HashLookupSettingsPanel.indexLabel.text=\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9\u30B9\u30C6\u30FC\u30BF\u30B9\uFF1A
+HashLookupModuleSettingsPanel.alwaysCalcHashesCheckbox.text=\u30CF\u30C3\u30B7\u30E5\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u304C\u9078\u629E\u3055\u308C\u3066\u3044\u306A\u304F\u3066\u3082\u3001MD5\u3092\u8A08\u7B97
+HashLookupModuleSettingsPanel.knownHashDbsLabel.text=\u5229\u7528\u3059\u308B\u65E2\u77E5\u306E\u30CF\u30C3\u30B7\u30E5\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u3092\u9078\u629E\uFF1A
+HashLookupModuleSettingsPanel.knownBadHashDbsLabel.text=\u51E6\u7406\u306B\u5229\u7528\u3059\u308B\u65E2\u77E5\u306E\u60AA\u8CEA\u306A\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u3092\u9078\u629E\uFF1A
+HashLookupModuleFactory.createFileIngestModule.exception.msg=\u8A2D\u5B9A\u3092\u884C\u3046\u70BA\u306E\u60F3\u5B9A\u3055\u308C\u308B\u5F15\u6570\u306Finstanceof HashLookupModuleSettings\u3067\u3059\u3002
+HashLookupModuleFactory.getIngestJobSettingsPanel.exception.msg=\u8A2D\u5B9A\u3092\u884C\u3046\u70BA\u306E\u60F3\u5B9A\u3055\u308C\u308B\u5F15\u6570\u306Finstanceof HashLookupModuleSettings\u3067\u3059\u3002
+HashLookupModuleSettingsPanel.alwaysCalcHashesCheckbox.toolTipText=\u30CF\u30C3\u30B7\u30E5\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u304C\u9078\u629E\u3055\u308C\u3066\u3044\u306A\u304F\u3066\u3082\u3001MD5\u3092\u8A08\u7B97
+HashDbSearchPanel.hashTable.defaultModel.title.text=MD5\u30CF\u30C3\u30B7\u30E5
+AddContentToHashDbAction.addFilesToHashSet.unableToAddFileEmptyMsg=\u30CF\u30C3\u30B7\u30E5\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u306B{0}\u3092\u8FFD\u52A0\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F\u3002\u30D5\u30A1\u30A4\u30EB\u306B\u30B3\u30F3\u30C6\u30F3\u30C4\u304C\u3042\u308A\u307E\u305B\u3093\u3002
+AddHashValuesToDatabaseDialog.JDialog.Title=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u306B\u30CF\u30C3\u30B7\u30E5\u3092\u8FFD\u52A0\
+HashLookupSettingsPanel.addHashesToDatabaseButton.text=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u306B\u30CF\u30C3\u30B7\u30E5\u3092\u8FFD\u52A0
+AddHashValuesToDatabaseDialog.instructionLabel.text_1=\u4E0B\u8A18\u306BMD5\u306E\u30CF\u30C3\u30B7\u30E5\u5024\u3092\u8CBC\u308A\u4ED8\u3051\u308B\uFF08\u30E9\u30A4\u30F3\u3054\u3068\u306B\u4E00\u3064\u305A\u3064\uFF09\uFF1A
+AddHashValuesToDatabaseDialog.cancelButton.text_2=\u30AD\u30E3\u30F3\u30BB\u30EB
+AddHashValuesToDatabaseDialog.AddValuesToHashDatabaseButton.text_2=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u306B\u30CF\u30C3\u30B7\u30E5\u3092\u8FFD\u52A0
+AddHashValuesToDatabaseDialog.pasteFromClipboardButton.text_2=\u30AF\u30EA\u30C3\u30D7\u30DC\u30FC\u30C9\u304B\u3089\u8CBC\u308A\u4ED8\u3051\u308B
+AddHashValuesToDatabaseProgressDialog.okButton.text=OK
+AddHashValuesToDatabaseProgressDialog.statusLabel.text=\u30B9\u30C6\u30FC\u30BF\u30B9
+AddHashValuesToDatabaseProgressDialog.title=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u30D7\u30ED\u30B0\u30EC\u30B9\u306B\u30CF\u30C3\u30B7\u30E5\u3092\u8FFD\u52A0
+AddHashValuesToDatabaseDialog.title=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u306B\u30CF\u30C3\u30B7\u30E5\u3092\u8FFD\u52A0
+AddHashValuesToDatabaseProgressDialog.showErrorsButton.text=\u30A8\u30E9\u30FC\u3092\u8868\u793A
+AddHashValuesToDatabaseProgressDialog.addHashValuesToDatabase.parsing=MD5\u30CF\u30C3\u30B7\u30E5\u306B\u30C6\u30AD\u30B9\u30C8\u3092\u30D1\u30FC\u30B9\u4E2D...
+AddHashValuesToDatabaseProgressDialog.addHashValuesToDatabase.invalidHash=\u30A4\u30F3\u30D7\u30C3\u30C8\u306B\u7121\u52B9\u306A\u30CF\u30C3\u30B7\u30E5\u304C\u542B\u307E\u308C\u3066\u3044\u307E\u3059\u3002
+AddHashValuesToDatabaseProgressDialog.addHashValuesToDatabase.invaliHash.msg=\u7121\u52B9\u306A\u30CF\u30C3\u30B7\u30E5\uFF1A
+AddHashValuesToDatabaseProgressDialog.addHashValuesToDatabase.noHashesToAdd=\u8FFD\u52A0\u3059\u308B\u30CF\u30C3\u30B7\u30E5\u304C\u3042\u308A\u307E\u305B\u3093\u3002
+AddHashValuesToDatabaseProgressDialog.addHashValuesToDatabase.success={0}\u30CF\u30C3\u30B7\u30E5\u304C\u6B63\u3057\u304F\u8FFD\u52A0\u3055\u308C\u307E\u3057\u305F\u3002
+AddHashValuesToDatabaseProgressDialog.addHashValuesToDatabase.errorAddingValidHash=\u6709\u52B9\u306A\u30CF\u30C3\u30B7\u30E5\u3092\u8FFD\u52A0\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F\u3002
+AddHashValuesToDatabaseProgressDialog.addHashValuesToDatabase.errorAddingValidHash.msg=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u306B\u6709\u52B9\u306A\u30CF\u30C3\u30B7\u30E5\u3092\u8FFD\u52A0\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F\u3002

From de3735bd12e6d6f99c8d4ac4c99fa54dcc1b758a Mon Sep 17 00:00:00 2001
From: Kay Bassi <kb@narfindustries.com>
Date: Tue, 2 Feb 2016 15:40:47 -0800
Subject: [PATCH 11/68] Completed editing/translation

---
 .../interestingitems/Bundle.properties        |  2 +-
 .../interestingitems/Bundle_ja.properties     | 24 +++++++++++--------
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/modules/interestingitems/Bundle.properties b/Core/src/org/sleuthkit/autopsy/modules/interestingitems/Bundle.properties
index f132bd8f77..10dbc8140e 100755
--- a/Core/src/org/sleuthkit/autopsy/modules/interestingitems/Bundle.properties
+++ b/Core/src/org/sleuthkit/autopsy/modules/interestingitems/Bundle.properties
@@ -56,7 +56,7 @@ InterestingItemDefsPanel.jLabel3.text=Name Pattern
 InterestingItemDefsPanel.jLabel4.text=Path Pattern: 
 InterestingItemDefsPanel.jLabel5.text=Description:
 InterestingItemDefsPanel.jLabel6.text=Set Details
-FilesSetRulePanel.jLabel1.text=Type*:
+FilesSetRulePanel.jLabel1.text=Type*\:
 FilesSetRulePanel.jLabel2.text=Name Pattern*:
 FilesSetRulePanel.jLabel3.text=Path Pattern:
 InterestingItemDefsPanel.jTextArea1.text=This module allows you to find files that match specified criteria. Each set has a list of rules, which will match on file name and parent path patterns. 
diff --git a/Core/src/org/sleuthkit/autopsy/modules/interestingitems/Bundle_ja.properties b/Core/src/org/sleuthkit/autopsy/modules/interestingitems/Bundle_ja.properties
index e84363de1c..90c0f44998 100755
--- a/Core/src/org/sleuthkit/autopsy/modules/interestingitems/Bundle_ja.properties
+++ b/Core/src/org/sleuthkit/autopsy/modules/interestingitems/Bundle_ja.properties
@@ -1,4 +1,4 @@
-FilesIdentifierIngestJobSettingsPanel.border.title=\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u4E2D\u6709\u52B9\u306B\u3059\u308B\u7591\u308F\u3057\u3044\u30D5\u30A1\u30A4\u30EB\u30BB\u30C3\u30C8\u3092\u9078\u629E\uFF1A
+FilesIdentifierIngestJobSettingsPanel.border.title=\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u4E2D\u306B\u6709\u52B9\u306B\u3059\u308B\u7591\u308F\u3057\u3044\u30D5\u30A1\u30A4\u30EB\u30BB\u30C3\u30C8\u3092\u9078\u629E\uFF1A
 FilesSetPanel.descPanel.border.title=\u6982\u8981
 FilesSetPanel.descriptionPanel.border.title=\u6982\u8981
 FilesSetPanel.ignoreKnownFilesCheckbox.text=\u65E2\u77E5\u30D5\u30A1\u30A4\u30EB\u3092\u7121\u8996
@@ -10,10 +10,10 @@ FilesSetRulePanel.extensionRadioButton.text=\u62E1\u5F35\u5B50\u306E\u307F
 FilesSetRulePanel.filesAndDirsRadioButton.text=\u30D5\u30A1\u30A4\u30EB\u304A\u3088\u3073\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA
 FilesSetRulePanel.filesRadioButton.text=\u30D5\u30A1\u30A4\u30EB
 FilesSetRulePanel.fullNameRadioButton.text=\u30D5\u30EB\u30CD\u30FC\u30E0
-FilesSetRulePanel.jLabel1.text=\u30D5\u30A1\u30A4\u30EB\u30BF\u30A4\u30D7\uFF1A
-FilesSetRulePanel.jLabel2.text=\u30CD\u30FC\u30E0\u30D1\u30BF\u30FC\u30F3\uFF1A
+FilesSetRulePanel.jLabel1.text=\u30BF\u30A4\u30D7*\uFF1A
+FilesSetRulePanel.jLabel2.text=\u30CD\u30FC\u30E0\u30D1\u30BF\u30FC\u30F3*\uFF1A
 FilesSetRulePanel.jLabel3.text=\u30D1\u30B9\u30D1\u30BF\u30FC\u30F3\uFF1A
-FilesSetRulePanel.messages.emptyNameFilter=\u7591\u308F\u3057\u3044\u30D5\u30A1\u30A4\u30EB\u30BB\u30C3\u30C8\u30EB\u30FC\u30EB\u306F\u691C\u7D22\u3059\u308B\u540D\u524D\u304C\u5FC5\u8981\u3067\u3059\u3002
+FilesSetRulePanel.messages.emptyNameFilter=\u3053\u306E\u30EB\u30FC\u30EB\u306F\u30CD\u30FC\u30E0\u30D1\u30BF\u30FC\u30F3\u3092\u7279\u5B9A\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
 FilesSetRulePanel.messages.invalidCharInName=\u6B63\u898F\u8868\u73FE\u4EE5\u5916\u306F\\\u3001/\u3001\:\u3001*\u3001?\u3001"\u3001<\u3001>\u3092\u540D\u524D\u306B\u542B\u3081\u307E\u305B\u3093\u3002
 FilesSetRulePanel.messages.invalidCharInPath=\u6B63\u898F\u8868\u73FE\u4EE5\u5916\u306F\\\u3001\:\u3001*\u3001?\u3001"\u3001<\u3001>\u3092\u30D1\u30B9\u306B\u542B\u3081\u307E\u305B\u3093\u3002
 FilesSetRulePanel.messages.invalidNameRegex=\u6B63\u898F\u8868\u73FE\u306F\u6709\u52B9\u306A\u540D\u524D\u3067\u306F\u3042\u308A\u307E\u305B\u3093\uFF1A\n\n{0}
@@ -46,10 +46,14 @@ InterestingItemDefsPanel.newSetButton.text=\u65B0\u898F\u30BB\u30C3\u30C8
 InterestingItemDefsPanel.rulePathFilterRegexCheckBox.text=\u6B63\u898F\u8868\u73FE
 InterestingItemDefsPanel.rulesListLabel.text=\u30EB\u30FC\u30EB\uFF1A
 InterestingItemDefsPanel.setsListLabel.text=\u30EB\u30FC\u30EB\u30BB\u30C3\u30C8
-InterestingItemsIdentifierIngestModule.moduleDescription=\u7591\u308F\u3057\u3044\u30A2\u30A4\u30C6\u30E0\u30EB\u30FC\u30EB\u30BB\u30C3\u30C8\u306E\u5B9A\u7FA9\u3092\u3082\u3068\u306B\u7591\u308F\u3057\u3044\u30A2\u30A4\u30C6\u30E0\u3092\u898B\u3064\u3051\u307E\u3059\u3002
-InterestingItemsIdentifierIngestModule.moduleName=\u7591\u308F\u3057\u3044\u30D5\u30A1\u30A4\u30EB\u30A2\u30A4\u30C7\u30F3\u30C6\u30A3\u30D5\u30A1\u30A4\u30A2
+InterestingItemsIdentifierIngestModule.moduleDescription=\u7591\u308F\u3057\u3044\u30A2\u30A4\u30C6\u30E0\u30EB\u30FC\u30EB\u30BB\u30C3\u30C8\u306E\u5B9A\u7FA9\u3092\u3082\u3068\u306B\u7591\u308F\u3057\u3044\u30A2\u30A4\u30C6\u30E0\u3092\u691C\u77E5\u3057\u307E\u3059\u3002
+InterestingItemsIdentifierIngestModule.moduleName=\u7591\u308F\u3057\u3044\u30D5\u30A1\u30A4\u30EB\u691C\u77E5
 OpenIDE-Module-Display-Category=\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u30E2\u30B8\u30E5\u30FC\u30EB
-OpenIDE-Module-Long-Description=\u7591\u308F\u3057\u3044\u30D5\u30A1\u30A4\u30EB\u30A2\u30A4\u30C7\u30F3\u30C6\u30A3\u30D5\u30A1\u30A4\u30A2\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u30E2\u30B8\u30E5\u30FC\u30EB\u3002\n\n\u7591\u308F\u3057\u3044\u30D5\u30A1\u30A4\u30EB\u30EB\u30FC\u30EB\u30BB\u30C3\u30C8\u306E\u5B9A\u7FA9\u3092\u3082\u3068\u306B\u7591\u308F\u3057\u3044\u30D5\u30A1\u30A4\u30EB\u3092\u691C\u77E5\u3057\u307E\u3059\u3002
-OpenIDE-Module-Name=\u7591\u308F\u3057\u3044\u30D5\u30A1\u30A4\u30EB\u30A2\u30A4\u30C7\u30F3\u30C6\u30A3\u30D5\u30A1\u30A4\u30A2
-OpenIDE-Module-Short-Description=\u7591\u308F\u3057\u3044\u30D5\u30A1\u30A4\u30EB\u30A2\u30A4\u30C7\u30F3\u30C6\u30A3\u30D5\u30A1\u30A4\u30A2\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u30E2\u30B8\u30E5\u30FC\u30EB
-OptionsCategory_Name_InterestingItemDefinitions=\u7591\u308F\u3057\u3044\u30A2\u30A4\u30C6\u30E0\u5B9A\u7FA9
\ No newline at end of file
+OpenIDE-Module-Long-Description=\u7591\u308F\u3057\u3044\u30D5\u30A1\u30A4\u30EB\u691C\u77E5\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u30E2\u30B8\u30E5\u30FC\u30EB\u3002\n\n\u7591\u308F\u3057\u3044\u30D5\u30A1\u30A4\u30EB\u30EB\u30FC\u30EB\u30BB\u30C3\u30C8\u306E\u5B9A\u7FA9\u3092\u3082\u3068\u306B\u7591\u308F\u3057\u3044\u30D5\u30A1\u30A4\u30EB\u3092\u691C\u77E5\u3057\u307E\u3059\u3002
+OpenIDE-Module-Name=\u7591\u308F\u3057\u3044\u30D5\u30A1\u30A4\u30EB\u691C\u77E5
+OpenIDE-Module-Short-Description=\u7591\u308F\u3057\u3044\u30D5\u30A1\u30A4\u30EB\u691C\u77E5\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u30E2\u30B8\u30E5\u30FC\u30EB
+OptionsCategory_Name_InterestingItemDefinitions=\u7591\u308F\u3057\u3044\u30D5\u30A1\u30A4\u30EB
+OptionsCategory_Keywords_InterestingItemDefinitions=\u7591\u308F\u3057\u3044\u30A2\u30A4\u30C6\u30E0\u5B9A\u7FA9
+InterestingItemDefsPanel.doFileSetsDialog.duplicateRuleSet.text=\u540D\u524D\u304C{0}\u306E\u30EB\u30FC\u30EB\u30BB\u30C3\u30C8\u306F\u65E2\u306B\u5B58\u5728\u3057\u307E\u3059\u3002
+FilesSetRulePanel.jLabel4.text=*\u5FC5\u9808
+FilesSetRulePanel.jLabel5.text=\u898B\u3064\u3051\u305F\u3044\u30D5\u30A1\u30A4\u30EB\u306E\u60C5\u5831\u3092\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044\u3002
\ No newline at end of file

From 295d4eb3b94c2bc5baff699fc44786a6eddd8f5c Mon Sep 17 00:00:00 2001
From: Kay Bassi <kb@narfindustries.com>
Date: Tue, 2 Feb 2016 15:42:28 -0800
Subject: [PATCH 12/68] Completed editing/translation

---
 .../org/sleuthkit/autopsy/modules/iOS/Bundle_ja.properties   | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Core/src/org/sleuthkit/autopsy/modules/iOS/Bundle_ja.properties b/Core/src/org/sleuthkit/autopsy/modules/iOS/Bundle_ja.properties
index 38b86e4f10..bfccdf05e9 100644
--- a/Core/src/org/sleuthkit/autopsy/modules/iOS/Bundle_ja.properties
+++ b/Core/src/org/sleuthkit/autopsy/modules/iOS/Bundle_ja.properties
@@ -1,2 +1,5 @@
 iOSModuleFactory.moduleDescription=\u30B7\u30B9\u30C6\u30E0\u304A\u3088\u3073\u7B2C\u4E09\u8005\u30A2\u30D7\u30EA\u30C7\u30FC\u30BF\u3092\u62BD\u51FA
-iOSModuleFactory.moduleName=iOS\u30A2\u30CA\u30E9\u30A4\u30B6
\ No newline at end of file
+iOSModuleFactory.moduleName=iOS\u30A2\u30CA\u30E9\u30A4\u30B6
+TextMessageAnalyzer.bbAttribute.incoming=\u53D7\u4FE1
+TextMessageAnalyzer.bbAttribute.outgoing=\u9001\u4FE1
+TextMessageAnalyzer.bbAttribute.smsMessage=SMS\u30E1\u30C3\u30BB\u30FC\u30B8
\ No newline at end of file

From 4f88731406bf9d6f199d36d589a129b450a3da0e Mon Sep 17 00:00:00 2001
From: Kay Bassi <kb@narfindustries.com>
Date: Tue, 2 Feb 2016 16:04:16 -0800
Subject: [PATCH 13/68] Completed editing/translation

---
 .../modules/photoreccarver/Bundle.properties  |  6 ++---
 .../photoreccarver/Bundle_ja.properties       | 27 ++++++++++++++++---
 2 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/modules/photoreccarver/Bundle.properties b/Core/src/org/sleuthkit/autopsy/modules/photoreccarver/Bundle.properties
index 0d18ff4e2f..1c84490714 100755
--- a/Core/src/org/sleuthkit/autopsy/modules/photoreccarver/Bundle.properties
+++ b/Core/src/org/sleuthkit/autopsy/modules/photoreccarver/Bundle.properties
@@ -9,11 +9,11 @@ unallocatedSpaceProcessingSettingsError.message="Process Unallocated Space" is n
 unsupportedOS.message=PhotoRec Module is supported only on Windows platforms
 missingExecutable.message=Unable to locate PhotoRec executable.
 cannotRunExecutable.message=Unable to execute PhotoRec
-cannotCreateOutputDir.message=Unable to create output directory: {0}
+cannotCreateOutputDir.message=Unable to create output directory\: {0}
 PhotoRecIngestModule.nonHostnameUNCPathUsed=Photorec cannot operate on a UNC path containing IP addresses
 PhotoRecIngestModule.processTerminated=PhotoRec Carver ingest module was terminated due to exceeding max allowable run time when scanning
 PhotoRecIngestModule.moduleError=PhotoRec Carver Module Error
-PhotoRecIngestModule.UnableToCarve=Unable to carve file: {0}
+PhotoRecIngestModule.UnableToCarve=Unable to carve file\: {0}
 PhotoRecIngestModule.NotEnoughDiskSpace=Not enough disk space to save unallocated file. Carving will be skipped.
 PhotoRecIngestModule.complete.numberOfCarved=Number of Files Carved\:
 PhotoRecIngestModule.complete.totalWritetime=Total Time To Write To Disk\:
@@ -21,7 +21,7 @@ PhotoRecIngestModule.complete.totalParsetime=Total Parsing Time\:
 PhotoRecIngestModule.complete.photoRecResults=PhotoRec Results
 PhotoRecIngestModule.NotEnoughDiskSpace.detail.msg=PhotoRec error processing {0} with {1} Not enough space on primary disk to save unallocated space.
 PhotoRecIngestModule.cancelledByUser=PhotoRec cancelled by user.
-PhotoRecIngestModule.error.exitValue=PhotoRec carver returned error exit value = {0} when scanning {1}
+PhotoRecIngestModule.error.exitValue=PhotoRec carver returned error exit value \= {0} when scanning {1}
 PhotoRecIngestModule.error.msg=Error processing {0} with PhotoRec carver.
 PhotoRecIngestModule.complete.numberOfErrors=Number of Errors while Carving\:
 PhotoRecIngestModule.PermissionsNotSufficient=Insufficient permissions accessing
diff --git a/Core/src/org/sleuthkit/autopsy/modules/photoreccarver/Bundle_ja.properties b/Core/src/org/sleuthkit/autopsy/modules/photoreccarver/Bundle_ja.properties
index 45cdd48789..c241e21292 100644
--- a/Core/src/org/sleuthkit/autopsy/modules/photoreccarver/Bundle_ja.properties
+++ b/Core/src/org/sleuthkit/autopsy/modules/photoreccarver/Bundle_ja.properties
@@ -1,6 +1,27 @@
 moduleDescription.text=\u30B7\u30B9\u30C6\u30E0\u306E\u672A\u5272\u308A\u5F53\u3066\u9818\u57DF\u306B\u5BFE\u3057\u3066PhotoRec\u30AB\u30FC\u30D0\u3092\u5B9F\u884C\u3057\u307E\u3059\u3002
 moduleDisplayName.text=PhotoRec\u30AB\u30FC\u30D0
 OpenIDE-Module-Display-Category=\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u30E2\u30B8\u30E5\u30FC\u30EB
-OpenIDE-Module-Long-Description=PhotoRec\u30AB\u30FC\u30D0\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u30E2\u30B8\u30E5\u30FC\u30EB\u3002\n\n\u672A\u5272\u308A\u5F53\u3066\u9818\u57DF\u3092\u5207\u308A\u51FA\u3057\u3001\u51E6\u7406\u3059\u308B\u3081\u306B\u30B7\u30B9\u30C6\u30E0\u3078\u30D5\u30A3\u30FC\u30C9\u3057\u307E\u3059\u3002
-OpenIDE-Module-Name=PhotoRec\u30AB\u30FC\u30D0\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u30E2\u30B8\u30E5\u30FC\u30EB
-OpenIDE-Module-Short-Description=\u51E6\u7406\u3059\u308B\u3081\u306B\u672A\u5272\u308A\u5F53\u3066\u9818\u57DF\u3092\u5207\u308A\u51FA\u3057\u3001\u30B7\u30B9\u30C6\u30E0\u3078\u30D5\u30A3\u30FC\u30C9\u3057\u307E\u3059\u3002
\ No newline at end of file
+OpenIDE-Module-Long-Description=PhotoRec\u30AB\u30FC\u30D0\u306E\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u30E2\u30B8\u30E5\u30FC\u30EB\u3002\n\n\u672A\u5272\u308A\u5F53\u3066\u9818\u57DF\u3092\u5207\u308A\u51FA\u3057\u3001\u5207\u308A\u51FA\u3057\u305F\u30D5\u30A1\u30A4\u30EB\u3092\u51E6\u7406\u3059\u308B\u3081\u306B\u30B7\u30B9\u30C6\u30E0\u3078\u30D5\u30A3\u30FC\u30C9\u3057\u307E\u3059\u3002
+OpenIDE-Module-Name=PhotoRec\u30AB\u30FC\u30D0\u306E\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u30E2\u30B8\u30E5\u30FC\u30EB
+OpenIDE-Module-Short-Description=\u672A\u5272\u308A\u5F53\u3066\u9818\u57DF\u3092\u5207\u308A\u51FA\u3057\u3001\u5207\u308A\u51FA\u3057\u305F\u30D5\u30A1\u30A4\u30EB\u3092\u51E6\u7406\u306E\u305F\u3081\u306B\u30B7\u30B9\u30C6\u30E0\u3078\u30D5\u30A3\u30FC\u30C9\u3057\u307E\u3059\u3002
+unallocatedSpaceProcessingSettingsError.message=\u300C\u672A\u5272\u308A\u5F53\u3066\u9818\u57DF\u3092\u51E6\u7406\u300D\u304C\u30C1\u30A7\u30C3\u30AF\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002PhotoRec\u30E2\u30B8\u30E5\u30FC\u30EB\u306F\u672A\u5272\u308A\u5F53\u3066\u9818\u57DF\u3092\u30AB\u30FC\u30D6\u3059\u308B\u3088\u3046\u306B\u8A2D\u8A08\u3055\u308C\u3066\u3044\u307E\u3059\u3002\u672A\u5272\u308A\u5F53\u3066\u9818\u57DF\u306E\u51E6\u7406\u3092\u6709\u52B9\u306B\u3059\u308B\u304B\u3001\u3053\u306E\u30E2\u30B8\u30E5\u30FC\u30EB\u3092\u7121\u52B9\u306B\u3057\u3066\u304F\u3060\u3055\u3044\u3002
+unsupportedOS.message=PhotoRec\u30E2\u30B8\u30E5\u30FC\u30EB\u306FWindows\u30B7\u30B9\u30C6\u30E0\u3067\u3057\u304B\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
+missingExecutable.message=PhotoRec\u306E\u5B9F\u884C\u30D5\u30A1\u30A4\u30EB\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3067\u3057\u305F\u3002
+cannotRunExecutable.message=PhotoRec\u3092\u5B9F\u884C\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F
+cannotCreateOutputDir.message=\u30A2\u30A6\u30C8\u30D7\u30C3\u30C8\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA{0}\u3092\u4F5C\u6210\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F
+PhotoRecIngestModule.nonHostnameUNCPathUsed=Photorec\u306FIP\u30A2\u30C9\u30EC\u30B9\u3092\u542B\u3080UNC\u30D1\u30B9\u3067\u306F\u5B9F\u884C\u3067\u304D\u307E\u305B\u3093
+PhotoRecIngestModule.processTerminated=\u30B9\u30AD\u30E3\u30F3\u306B\u304B\u3051\u308C\u308B\u6700\u5927\u306E\u6642\u9593\u304C\u904E\u304E\u305F\u306E\u3067\u3001PhotoRec\u30AB\u30FC\u30D0\u306E\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u30E2\u30B8\u30E5\u30FC\u30EB\u3092\u505C\u6B62\u3057\u307E\u3057\u305F
+PhotoRecIngestModule.moduleError=PhotoRec\u30AB\u30FC\u30D0\u306E\u30E2\u30B8\u30E5\u30FC\u30EB\u30A8\u30E9\u30FC
+PhotoRecIngestModule.UnableToCarve=\u6B21\u306E\u30D5\u30A1\u30A4\u30EB\u3092\u30AB\u30FC\u30D6\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F\uFF1A{0}
+PhotoRecIngestModule.NotEnoughDiskSpace=\u672A\u5272\u308A\u5F53\u3066\u306E\u30D5\u30A1\u30A4\u30EB\u3092\u4FDD\u5B58\u3059\u308B\u306E\u306B\u30C7\u30A3\u30B9\u30AF\u30B9\u30DA\u30FC\u30B9\u304C\u8DB3\u308A\u307E\u305B\u3093\u3002\u30AB\u30FC\u30D3\u30F3\u30B0\u304C\u30B9\u30AD\u30C3\u30D7\u3055\u308C\u307E\u3059\u3002
+PhotoRecIngestModule.complete.numberOfCarved=\u30AB\u30FC\u30D6\u3055\u308C\u305F\u30D5\u30A1\u30A4\u30EB\u6570\uFF1A
+PhotoRecIngestModule.complete.totalWritetime=\u30C7\u30A3\u30B9\u30AF\u3078\u306E\u66F8\u304D\u8FBC\u307F\u6642\u9593\u306E\u5408\u8A08
+PhotoRecIngestModule.complete.totalParsetime=\u30D1\u30FC\u30B7\u30F3\u30B0\u6642\u9593\u306E\u5408\u8A08\uFF1A
+PhotoRecIngestModule.complete.photoRecResults=PhotoRec\u7D50\u679C
+PhotoRecIngestModule.NotEnoughDiskSpace.detail.msg={0}\u3092{1}\u3067\u51E6\u7406\u3059\u308B\u969B\u306BPhotoRec\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F\u3002\u672A\u5272\u308A\u5F53\u3066\u30B9\u30DA\u30FC\u30B9\u3092\u30D7\u30E9\u30A4\u30DE\u30EA\u30FC\u30C7\u30A3\u30B9\u30AF\u306B\u4FDD\u5B58\u3059\u308B\u306E\u306B\u30B9\u30DA\u30FC\u30B9\u304C\u8DB3\u308A\u307E\u305B\u3093\u3002
+PhotoRecIngestModule.cancelledByUser=PhotoRec\u304C\u30E6\u30FC\u30B6\u30FC\u306B\u3088\u308A\u30AD\u30E3\u30F3\u30BB\u30EB\u3055\u308C\u307E\u3057\u305F\u3002
+PhotoRecIngestModule.error.exitValue=PhotoRec\u304C\u30A8\u30E9\u30FC\u3092\u51FA\u3057\u307E\u3057\u305F\u3002Exit\u30D0\u30EA\u30E5\u30FC\uFF1D{1}\u3092\u30B9\u30AD\u30E3\u30F3\u4E2D\u306B{0}
+PhotoRecIngestModule.error.msg=PhotoRec\u30AB\u30FC\u30D0\u3067{0}\u3092\u51E6\u7406\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F\u3002
+PhotoRecIngestModule.complete.numberOfErrors=\u30AB\u30FC\u30D3\u30F3\u30B0\u4E2D\u306E\u30A8\u30E9\u30FC\u6570\uFF1A
+PhotoRecIngestModule.PermissionsNotSufficient=\u30D1\u30FC\u30DF\u30C3\u30B7\u30E7\u30F3\u306E\u30A2\u30AF\u30BB\u30B9\u304C\u4E0D\u5341\u5206\u3067\u3059
+PhotoRecIngestModule.PermissionsNotSufficientSeeReference=Autopsy\u30D8\u30EB\u30D7\u3067\u300C\u5171\u6709\u30C9\u30E9\u30A4\u30D6\u8A8D\u8A3C\u300D\u3092\u3054\u89A7\u304F\u3060\u3055\u3044\u3002
\ No newline at end of file

From 9cc6e74160ab47f2cf80aa51e50528e65b145f51 Mon Sep 17 00:00:00 2001
From: Kay Bassi <kb@narfindustries.com>
Date: Tue, 2 Feb 2016 16:07:13 -0800
Subject: [PATCH 14/68] Completed editing/translation

---
 .../org/sleuthkit/autopsy/modules/stix/Bundle_ja.properties   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/modules/stix/Bundle_ja.properties b/Core/src/org/sleuthkit/autopsy/modules/stix/Bundle_ja.properties
index 8e658f564b..242f9b6b5c 100644
--- a/Core/src/org/sleuthkit/autopsy/modules/stix/Bundle_ja.properties
+++ b/Core/src/org/sleuthkit/autopsy/modules/stix/Bundle_ja.properties
@@ -1,13 +1,13 @@
 OpenIDE-Module-Name=stix\u30E2\u30B8\u30E5\u30FC\u30EB
 STIXReportModule.getDesc.text=\u30C7\u30FC\u30BF\u30BD\u30FC\u30B9\u306B\u5BFE\u3057\u3066\u5E7E\u3064\u304B\u306ESTIX\uFF08Structured Threat Information eXpression\uFF1B\u8105\u5A01\u60C5\u5831\u69CB\u9020\u5316\u8A18\u8FF0\u5F62\u5F0F\uFF09\u30D5\u30A1\u30A4\u30EB\u3092\u5B9F\u884C\u3057\u3001\u30EC\u30DD\u30FC\u30C8\u3092\u751F\u6210\u3057\u307E\u3059\u3002\u307E\u305F\u3001\u7591\u308F\u3057\u3044\u30D5\u30A1\u30A4\u30EB\u5185\u306B\u30A2\u30FC\u30C6\u30A3\u30D5\u30A1\u30AF\u30C8\u3092\u4F5C\u6210\u3002
 STIXReportModule.getName.text=STIX
-STIXReportModule.notifyMsg.tooManyArtifactsgt1000="{0}"\u7528\u306B\u751F\u6210\u3055\u308C\u305FSTIX\u95A2\u9023\u306E\u30A2\u30FC\u30C6\u30A3\u30D5\u30A1\u30AF\u30C8\u304C\u591A\u3059\u304E\u307E\u3059\u3002\u6700\u521D\u306E1000\u306E\u307F\u4FDD\u5B58\u3002
+STIXReportModule.notifyMsg.tooManyArtifactsgt1000="{0}"\u7528\u306B\u751F\u6210\u3055\u308C\u305FSTIX\u95A2\u9023\u306E\u30A2\u30FC\u30C6\u30A3\u30D5\u30A1\u30AF\u30C8\u304C\u591A\u3059\u304E\u307E\u3059\u3002\u6700\u521D\u306E1000\u306E\u307F\u4FDD\u5B58\u3055\u308C\u307E\u3059\u3002
 STIXReportModule.notifyMsg.unableToOpenFileDir=STIX\u30D5\u30A1\u30A4\u30EB\uFF0F\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA{0}\u3092\u958B\u3051\u307E\u305B\u3093\u3067\u3057\u305F
 STIXReportModule.notifyMsg.unableToOpenReportFile=STIX\u30EC\u30DD\u30FC\u30C8\u30D5\u30A1\u30A4\u30EB{0}\u3092\u958B\u3051\u307E\u305B\u3093\u3067\u3057\u305F
 STIXReportModule.progress.completedWithErrors=\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F\u304C\u3001\u5B8C\u4E86\u3057\u307E\u3057\u305F
 STIXReportModule.progress.couldNotOpenFileDir=\u30D5\u30A1\u30A4\u30EB\uFF0F\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA{0}\u3092\u958B\u3051\u307E\u305B\u3093\u3067\u3057\u305F
 STIXReportModule.progress.readSTIX=STIX\u30D5\u30A1\u30A4\u30EB\u3092\u30D1\u30FC\u30B9\u4E2D
-STIXReportModuleConfigPanel.jButton1.text=\u30D5\u30A1\u30A4\u30EB\u9078\u629E
+STIXReportModuleConfigPanel.jButton1.text=\u30D5\u30A1\u30A4\u30EB\u3092\u9078\u629E
 STIXReportModuleConfigPanel.jCheckBox1.text=\u30A2\u30A6\u30C8\u30D7\u30C3\u30C8\u30D5\u30A1\u30A4\u30EB\u306E\u8AA4\u3063\u305F\u30A4\u30F3\u30B8\u30B1\u30FC\u30BF\u30FC\u306E\u7D50\u679C\u3082\u542B\u3080
 STIXReportModuleConfigPanel.jLabel2.text=STIX\u30D5\u30A1\u30A4\u30EB\u307E\u305F\u306FSTIX\u30D5\u30A1\u30A4\u30EB\u306E\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3092\u9078\u629E
 STIXReportModule.notifyErr.noFildDirProvided=STIX\u30D5\u30A1\u30A4\u30EB\uFF0F\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u304C\u63D0\u4F9B\u3055\u308C\u3066\u3044\u307E\u305B\u3093

From b2480a4925b434519ce611b3aef40ccae4d4e448 Mon Sep 17 00:00:00 2001
From: Kay Bassi <kb@narfindustries.com>
Date: Tue, 2 Feb 2016 16:13:46 -0800
Subject: [PATCH 15/68] Completed editing/translation

---
 .../autopsy/modules/vmextractor/Bundle.properties     |  2 +-
 .../autopsy/modules/vmextractor/Bundle_ja.properties  | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/Core/src/org/sleuthkit/autopsy/modules/vmextractor/Bundle.properties b/Core/src/org/sleuthkit/autopsy/modules/vmextractor/Bundle.properties
index 7d56265f3d..f915174388 100644
--- a/Core/src/org/sleuthkit/autopsy/modules/vmextractor/Bundle.properties
+++ b/Core/src/org/sleuthkit/autopsy/modules/vmextractor/Bundle.properties
@@ -1,7 +1,7 @@
 VMExtractorIngestModuleFactory.moduleDisplayName=Virtual Machine Extractor
 VMExtractorIngestModuleFactory.moduleDescription=Extracts virtual machine files and adds them to a case as data sources.
 VMExtractorIngestModuleFactory.version=1.0
-VMExtractorIngestModule.cannotCreateOutputDir.message=Unable to create output directory: {0}
+VMExtractorIngestModule.cannotCreateOutputDir.message=Unable to create output directory\: {0}
 VMExtractorIngestModule.addedVirtualMachineImage.message=Added virtual machine image {0}
 VMExtractorIngestModule.searchingImage.message=Searching image for virtual machine files
 VMExtractorIngestModule.exportingToDisk.message=Exporting virtual machine files to disk
diff --git a/Core/src/org/sleuthkit/autopsy/modules/vmextractor/Bundle_ja.properties b/Core/src/org/sleuthkit/autopsy/modules/vmextractor/Bundle_ja.properties
index e69de29bb2..17ff042186 100644
--- a/Core/src/org/sleuthkit/autopsy/modules/vmextractor/Bundle_ja.properties
+++ b/Core/src/org/sleuthkit/autopsy/modules/vmextractor/Bundle_ja.properties
@@ -0,0 +1,11 @@
+VMExtractorIngestModuleFactory.moduleDisplayName=\u4EEE\u60F3\u30DE\u30B7\u30F3\u30A8\u30AF\u30B9\u30C8\u30E9\u30AF\u30BF\u30FC
+VMExtractorIngestModuleFactory.moduleDescription=\u4EEE\u60F3\u30DE\u30B7\u30F3\u306E\u30D5\u30A1\u30A4\u30EB\u3092\u62BD\u51FA\u3057\u3001\u30C7\u30FC\u30BF\u30BD\u30FC\u30B9\u3068\u3057\u3066\u30B1\u30FC\u30B9\u306B\u8FFD\u52A0\u3057\u307E\u3059\u3002
+VMExtractorIngestModule.cannotCreateOutputDir.message=\u30A2\u30A6\u30C8\u30D7\u30C3\u30C8\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\uFF1A{0}\u3092\u4F5C\u6210\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F\u3002
+VMExtractorIngestModule.addedVirtualMachineImage.message=\u4EEE\u60F3\u30DE\u30B7\u30F3\u30A4\u30E1\u30FC\u30B8{0}\u3092\u8FFD\u52A0
+VMExtractorIngestModule.searchingImage.message=\u30A4\u30E1\u30FC\u30B8\u306B\u4EEE\u60F3\u30DE\u30B7\u30F3\u30D5\u30A1\u30A4\u30EB\u304C\u306A\u3044\u304B\u691C\u7D22\u4E2D
+VMExtractorIngestModule.exportingToDisk.message=\u4EEE\u60F3\u30DE\u30B7\u30F3\u30D5\u30A1\u30A4\u30EB\u3092\u30C7\u30A3\u30B9\u30AF\u306B\u30A8\u30AF\u30B9\u30DD\u30FC\u30C8\u4E2D
+VMExtractorIngestModule.queuingIngestJobs.message=\u62BD\u51FA\u3055\u308C\u305F\u4EEE\u60F3\u30DE\u30B7\u30F3\u306E\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u30B8\u30E7\u30D6\u3092\u30AD\u30E5\u30FC\u30A4\u30F3\u30B0
+VMExtractorIngestModule.msgNotify.failedExtractVM.title.txt=\u4EEE\u60F3\u30DE\u30B7\u30F3\u30D5\u30A1\u30A4\u30EB\u3092\u62BD\u51FA\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F\u3002
+VMExtractorIngestModule.msgNotify.failedExtractVM.msg.txt=\u4EEE\u60F3\u30DE\u30B7\u30F3\u30D5\u30A1\u30A4\u30EB{0}\u3092\u30C7\u30A3\u30B9\u30AF\u306B\u66F8\u304D\u8FBC\u3081\u307E\u305B\u3093\u3067\u3057\u305F\u3002
+VMExtractorIngestModule.msgNotify.failedIngestVM.title.txt=\u4EEE\u60F3\u30DE\u30B7\u30F3\u3092\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F\u3002
+VMExtractorIngestModule.msgNotify.failedIngestVM.msg.txt=\u4EEE\u60F3\u30DE\u30B7\u30F3\u30D5\u30A1\u30A4\u30EB{0}\u3092\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F\u3002
\ No newline at end of file

From 02457228c8b3cacc0ce8643b74050ea0de429e6a Mon Sep 17 00:00:00 2001
From: Kay Bassi <kb@narfindustries.com>
Date: Tue, 2 Feb 2016 16:15:34 -0800
Subject: [PATCH 16/68] Completed editing/translation

---
 .../autopsy/modules/UserArtifacts/Bundle_ja.properties          | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Core/src/org/sleuthkit/autopsy/modules/UserArtifacts/Bundle_ja.properties b/Core/src/org/sleuthkit/autopsy/modules/UserArtifacts/Bundle_ja.properties
index e69de29bb2..990fd0aa8c 100644
--- a/Core/src/org/sleuthkit/autopsy/modules/UserArtifacts/Bundle_ja.properties
+++ b/Core/src/org/sleuthkit/autopsy/modules/UserArtifacts/Bundle_ja.properties
@@ -0,0 +1,2 @@
+UserArtifactIngestModuleFactory.moduleName=\u30AB\u30B9\u30BF\u30E0\u30A2\u30FC\u30C6\u30A3\u30D5\u30A1\u30AF\u30C8\u8FFD\u52A0\u30C4\u30FC\u30EB
+UserArtifactIngestModuleFactory.moduleDescription=\u30AB\u30B9\u30BF\u30E0\u306E\u30A2\u30FC\u30C6\u30A3\u30D5\u30A1\u30AF\u30C8\u30BF\u30A4\u30D7\u3092\u8FFD\u52A0
\ No newline at end of file

From c409a0c379d7dd48e289d39f20499c372663e919 Mon Sep 17 00:00:00 2001
From: Kay Bassi <kb@narfindustries.com>
Date: Tue, 2 Feb 2016 16:38:01 -0800
Subject: [PATCH 17/68] Completed editing/translation

---
 .../autopsy/report/Bundle_ja.properties       | 45 ++++++++++---------
 1 file changed, 25 insertions(+), 20 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/report/Bundle_ja.properties b/Core/src/org/sleuthkit/autopsy/report/Bundle_ja.properties
index c6c931baad..bc76fbb82f 100644
--- a/Core/src/org/sleuthkit/autopsy/report/Bundle_ja.properties
+++ b/Core/src/org/sleuthkit/autopsy/report/Bundle_ja.properties
@@ -1,25 +1,25 @@
 OpenIDE-Module-Name=\u30EC\u30DD\u30FC\u30C8
-CTL_ReportWizardAction=\u30EC\u30DD\u30FC\u30C8\u5B9F\u884C
+CTL_ReportWizardAction=\u30EC\u30DD\u30FC\u30C8\u3092\u5B9F\u884C
 ArtifactSelectionDialog.titleLabel.text=\u3069\u306E\u30A2\u30FC\u30C6\u30A3\u30D5\u30A1\u30AF\u30C8\u306B\u3064\u3044\u3066\u30EC\u30DD\u30FC\u30C8\u3059\u308B\u304B\u9078\u629E\u3057\u3066\u4E0B\u3055\u3044\uFF1A
 ArtifactSelectionDialog.okButton.text=OK
 ReportVisualPanel1.reportModulesLabel.text=\u30EC\u30DD\u30FC\u30C8\u30E2\u30B8\u30E5\u30FC\u30EB\uFF1A
 DefaultReportConfigurationPanel.infoLabel.text=\u3053\u306E\u30EC\u30DD\u30FC\u30C8\u306F\u6B21\u306E\u30B9\u30AF\u30EA\u30FC\u30F3\u3067\u8A2D\u5B9A\u3055\u308C\u307E\u3059\u3002
 ReportVisualPanel2.dataLabel.text=\u3069\u306E\u30C7\u30FC\u30BF\u306B\u3064\u3044\u3066\u30EC\u30DD\u30FC\u30C8\u3059\u308B\u304B\u9078\u629E\u3057\u3066\u4E0B\u3055\u3044\uFF1A
-ReportVisualPanel2.deselectAllButton.text=\u3059\u3079\u3066\u9078\u629E\u89E3\u9664
-ReportVisualPanel2.selectAllButton.text=\u3059\u3079\u3066\u9078\u629E
+ReportVisualPanel2.deselectAllButton.text=\u5168\u3066\u9078\u629E\u89E3\u9664
+ReportVisualPanel2.selectAllButton.text=\u5168\u3066\u9078\u629E
 ReportVisualPanel2.advancedButton.text=\u30C7\u30FC\u30BF\u30BF\u30A4\u30D7
-ArtifactSelectionDialog.deselectAllButton.text=\u3059\u3079\u3066\u9078\u629E\u89E3\u9664
-ArtifactSelectionDialog.selectAllButton.text=\u3059\u3079\u3066\u9078\u629E
+ArtifactSelectionDialog.deselectAllButton.text=\u5168\u3066\u9078\u629E\u89E3\u9664
+ArtifactSelectionDialog.selectAllButton.text=\u5168\u3066\u9078\u629E
 ReportGenerationPanel.closeButton.text=\u9589\u3058\u308B
 ReportProgressPanel.reportLabel.text=\u30EC\u30DD\u30FC\u30C8\u30E9\u30D9\u30EB
 ReportProgressPanel.pathLabel.text=\u30D1\u30B9\u30E9\u30D9\u30EB
 ReportProgressPanel.separationLabel.text=-
 ReportProgressPanel.processingLabel.text=\u30D7\u30ED\u30BB\u30B7\u30F3\u30B0\u30E9\u30D9\u30EB
 ReportGenerationPanel.titleLabel.text=\u30EC\u30DD\u30FC\u30C8\u751F\u6210\u30D7\u30ED\u30B0\u30EC\u30B9
-ReportVisualPanel2.taggedResultsRadioButton.text=\u30BF\u30B0\u4ED8\u3051\u3055\u308C\u305F\u7D50\u679C
-ReportVisualPanel2.allResultsRadioButton.text=\u3059\u3079\u3066\u306E\u7D50\u679C
-ReportWizardFileOptionsVisualPanel.selectAllButton.text=\u3059\u3079\u3066\u9078\u629E
-ReportWizardFileOptionsVisualPanel.deselectAllButton.text=\u3059\u3079\u3066\u9078\u629E\u89E3\u9664
+ReportVisualPanel2.taggedResultsRadioButton.text=\u30BF\u30B0\u3055\u308C\u305F\u7D50\u679C
+ReportVisualPanel2.allResultsRadioButton.text=\u5168\u3066\u306E\u7D50\u679C
+ReportWizardFileOptionsVisualPanel.selectAllButton.text=\u5168\u3066\u9078\u629E
+ReportWizardFileOptionsVisualPanel.deselectAllButton.text=\u5168\u3066\u9078\u629E\u89E3\u9664
 ReportWizardFileOptionsVisualPanel.jLabel1.text=\u30D5\u30A1\u30A4\u30EB\u30EC\u30DD\u30FC\u30C8\u306B\u542B\u3081\u308B\u30A2\u30A4\u30C6\u30E0\u3092\u9078\u629E\u3057\u3066\u4E0B\u3055\u3044\uFF1A
 ArtifactSelectionDialog.dlgTitle.text=\u30A2\u30C9\u30D0\u30F3\u30B9\u30A2\u30FC\u30C6\u30A3\u30D5\u30A1\u30AF\u30C8\u9078\u629E
 FileReportDataTypes.filename.text=\u540D\u524D
@@ -27,7 +27,7 @@ FileReportDataTypes.fileExt.text=\u30D5\u30A1\u30A4\u30EB\u62E1\u5F35\u5B50
 FileReportDataTypes.fileType.text=\u30D5\u30A1\u30A4\u30EB\u30BF\u30A4\u30D7
 FileReportDataTypes.isDel.text=\u306F\u524A\u9664\u3055\u308C\u307E\u3057\u305F
 FileReportDataTypes.aTime.text=\u6700\u5F8C\u306E\u30A2\u30AF\u30BB\u30B9
-FileReportDataTypes.crTime.text=\u751F\u6210\u3055\u308C\u305F\u30D5\u30A1\u30A4\u30EB
+FileReportDataTypes.crTime.text=\u4F5C\u6210\u3055\u308C\u305F\u30D5\u30A1\u30A4\u30EB
 FileReportDataTypes.mTime.text=\u6700\u5F8C\u306E\u4FEE\u6B63
 FileReportDataTypes.size.text=\u30B5\u30A4\u30BA
 FileReportDataTypes.address.text=\u30A2\u30C9\u30EC\u30B9
@@ -60,21 +60,21 @@ ReportGenerationPanel.confDlg.title.closing=\u9589\u3058\u3066\u3044\u307E\u3059
 ReportGenerator.displayProgress.title.text=\u30EC\u30DD\u30FC\u30C8\u751F\u6210\u30D7\u30ED\u30B0\u30EC\u30B9\u2026
 ReportGenerator.progress.queryingDb.text=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u306E\u30AF\u30A8\u30EA\u3092\u5B9F\u884C\u4E2D\u2026
 ReportGenerator.progress.processingFile.text={0}\u3092\u51E6\u7406\u4E2D
-ReportGenerator.artifactTable.taggedResults.text=\u4E0B\u8A18\u306E\u4E2D\u306E\u4E00\u3064\u3067\u30BF\u30B0\u4ED8\u3051\u3055\u308C\u305F\u7D50\u679C\u304C\u542B\u307E\u308C\u3066\u3044\u307E\u3059\uFF1A
+ReportGenerator.artifactTable.taggedResults.text=\u6B21\u306E\u4E2D\u306E\u4E00\u3064\u3067\u30BF\u30B0\u3055\u308C\u305F\u7D50\u679C\u304C\u542B\u307E\u308C\u3066\u3044\u307E\u3059\uFF1A
 ReportGenerator.progress.processing={0}\u3092\u51E6\u7406\u4E2D\u2026
 ReportGenerator.msgShow.skippingArtType.title=\u30A2\u30FC\u30C6\u30A3\u30D5\u30A1\u30AF\u30C8\u30BF\u30A4\u30D7{0}\u3092\u30EC\u30DD\u30FC\u30C8\u3067\u30B9\u30AD\u30C3\u30D7\u3057\u3066\u3044\u307E\u3059
 ReportGenerator.msgShow.skippingArtType.msg=\u30EC\u30DD\u30FC\u30C8\u751F\u6210\u3059\u308B\u306E\u306B\u4E0D\u660E\u306A\u30B3\u30E9\u30E0
 ReportGenerator.msgShow.skippingArtRow.title=\u30BF\u30A4\u30D7{0}\u306E\u30A2\u30FC\u30C6\u30A3\u30D5\u30A1\u30AF\u30C8\u884C\u3092\u30EC\u30DD\u30FC\u30C8\u3067\u30B9\u30AD\u30C3\u30D7\u3057\u3066\u3044\u307E\u3059
 ReportGenerator.msgShow.skippingArtRow.msg=\u30EC\u30DD\u30FC\u30C8\u751F\u6210\u3059\u308B\u306E\u306B\u4E0D\u660E\u306A\u30B3\u30E9\u30E0
-ReportGenerator.makeContTagTab.taggedFiles.msg=\u4E0B\u8A18\u306E\u4E2D\u306E\u4E00\u3064\u3067\u30BF\u30B0\u4ED8\u3051\u3055\u308C\u305F\u7D50\u679C\u304C\u542B\u307E\u308C\u3066\u3044\u307E\u3059\uFF1A
-ReportGenerator.makeBbArtTagTab.taggedRes.msg=\u3053\u306E\u30EC\u30DD\u30FC\u30C8\u306B\u306F\u4E0B\u8A18\u3067\u30BF\u30B0\u4ED8\u3051\u3055\u308C\u305F\u7D50\u679C\u3057\u304B\u542B\u307E\u308C\u307E\u305B\u3093\uFF1A
+ReportGenerator.makeContTagTab.taggedFiles.msg=\u306E\u4E2D\u306E\u4E00\u3064\u3067\u30BF\u30B0\u3055\u308C\u305F\u7D50\u679C\u304C\u542B\u307E\u308C\u3066\u3044\u307E\u3059\uFF1A
+ReportGenerator.makeBbArtTagTab.taggedRes.msg=\u3053\u306E\u30EC\u30DD\u30FC\u30C8\u306B\u306F\u6B21\u3067\u30BF\u30B0\u3055\u308C\u305F\u7D50\u679C\u3057\u304B\u542B\u307E\u308C\u307E\u305B\u3093\uFF1A
 ReportGenerator.tagTable.header.resultType=\u7D50\u679C\u30BF\u30A4\u30D7
 ReportGenerator.tagTable.header.tag=\u30BF\u30B0
 ReportGenerator.tagTable.header.comment=\u30B3\u30E1\u30F3\u30C8
 ReportGenerator.tagTable.header.srcFile=\u30BD\u30FC\u30B9\u30D5\u30A1\u30A4\u30EB
 ReportGenerator.progress.createdThumb.text=\u30B5\u30E0\u30CD\u30A4\u30EB\u3092\u4F5C\u6210\u4E2D\u2026
 ReportGenerator.thumbnailTable.name=\u30B5\u30E0\u30CD\u30A4\u30EB
-ReportGenerator.thumbnailTable.desc=\u30BF\u30B0\u4ED8\u3051\u3055\u308C\u305F\u30D5\u30A1\u30A4\u30EB\u3084\u7D50\u679C\u306B\u95A2\u9023\u3059\u308B\u30A4\u30E1\u30FC\u30B8\u306E\u30B5\u30E0\u30CD\u30A4\u30EB\u304C\u542B\u307E\u308C\u307E\u3059\u3002
+ReportGenerator.thumbnailTable.desc=\u30BF\u30B0\u3055\u308C\u305F\u30D5\u30A1\u30A4\u30EB\u3084\u7D50\u679C\u306B\u95A2\u9023\u3059\u308B\u30A4\u30E1\u30FC\u30B8\u306E\u30B5\u30E0\u30CD\u30A4\u30EB\u304C\u542B\u307E\u308C\u307E\u3059\u3002
 ReportGenerator.writeKwHits.userSrchs=\u30E6\u30FC\u30B6\u691C\u7D22
 ReportGenerator.progress.processingList={0} ({1})\u3092\u51E6\u7406\u4E2D\u2026
 ReportGenerator.artTableColHdr.url=URL
@@ -146,9 +146,9 @@ ReportProgressPanel.start.cancelButton.text=\u30AD\u30E3\u30F3\u30BB\u30EB
 ReportProgressPanel.complete.processLbl.text=\u5B8C\u4E86
 ReportProgressPanel.complete.cancelButton.text=\u5B8C\u4E86
 ReportProgressPanel.cancel.cancelButton.toolTipText=\u30AD\u30E3\u30F3\u30BB\u30EB\u3055\u308C\u307E\u3057\u305F
-ReportWizardAction.actionName.text=\u30EC\u30DD\u30FC\u30C8\u751F\u6210
-ReportWizardAction.reportWiz.title=\u30EC\u30DD\u30FC\u30C8\u751F\u6210
-ReportWizardAction.toolBarButton.text=\u30EC\u30DD\u30FC\u30C8\u751F\u6210
+ReportWizardAction.actionName.text=\u30EC\u30DD\u30FC\u30C8\u3092\u751F\u6210
+ReportWizardAction.reportWiz.title=\u30EC\u30DD\u30FC\u30C8\u3092\u751F\u6210
+ReportWizardAction.toolBarButton.text=\u30EC\u30DD\u30FC\u30C8\u3092\u751F\u6210
 ReportWizardPanel1.nextButton.text=\u6B21 >
 ReportWizardPanel2.nextButton.text=\u6B21 >
 ReportGenerator.artTableColHdr.direction=\u65B9\u5411
@@ -218,7 +218,7 @@ ReportGenerator.artTableColHdr.urlDomainDecoded=URL\u30C9\u30E1\u30A4\u30F3
 ReportGenerator.artTableColHdr.userName=\u30E6\u30FC\u30B6\u540D
 ReportGenerator.errList.coreExceptionWhileGenRptRow=\u30A2\u30FC\u30C6\u30A3\u30D5\u30A1\u30AF\u30C8\u30EC\u30DD\u30FC\u30C8\u7528\u30ED\u30FC\u30C7\u30FC\u30BF\u306E\u751F\u6210\u4E2D\u306B\u30B3\u30A2\u30A8\u30AF\u30BB\u30D7\u30B7\u30E7\u30F3\uFF08\u4F8B\u5916\uFF09\u304C\u691C\u51FA\u3055\u308C\u307E\u3057\u305F
 ReportGenerator.errList.errGetContentFromBBArtifact=Blackboard\u30A2\u30FC\u30C6\u30A3\u30D5\u30A1\u30AF\u30C8\u304B\u3089\u30EC\u30DD\u30FC\u30C8\u7528\u306E\u30B3\u30F3\u30C6\u30F3\u30C4\u3092\u53D6\u5F97\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F\u3002
-ReportGenerator.errList.failedGetAbstractFileByID=ID\u306B\u57FA\u3065\u304D\u62BD\u8C61\u30D5\u30A1\u30A4\u30EB\u3092\u53D6\u5F97\u3059\u308B\u306E\u3092\u5931\u6557\u3057\u307E\u3057\u305F
+ReportGenerator.errList.failedGetAbstractFileByID=ID\u306B\u57FA\u3065\u304D\u30A2\u30D6\u30B9\u30C8\u30E9\u30AF\u30C8\u30D5\u30A1\u30A4\u30EB\u3092\u53D6\u5F97\u3059\u308B\u306E\u3092\u5931\u6557\u3057\u307E\u3057\u305F
 ReportGenerator.errList.failedGetBBArtifacts=\u30EC\u30DD\u30FC\u30C8\u751F\u6210\u4E2D\u306BBlackboard\u30A2\u30FC\u30C6\u30A3\u30D5\u30A1\u30AF\u30C8\u306E\u53D6\u5F97\u306B\u5931\u6557\u3057\u307E\u3057\u305F\u3002
 ReportGenerator.errList.failedGetBBArtifactTags=Blackboard\u30A2\u30FC\u30C6\u30A3\u30D5\u30A1\u30AF\u30C8\u30BF\u30B0\u306E\u53D6\u5F97\u306B\u5931\u6557\u3057\u307E\u3057\u305F\u3002
 ReportGenerator.errList.failedGetBBAttribs=\u30EC\u30DD\u30FC\u30C8\u751F\u6210\u4E2D\u306BBlackboard\u5C5E\u6027\u306E\u53D6\u5F97\u306B\u5931\u6557\u3057\u307E\u3057\u305F\u3002
@@ -238,5 +238,10 @@ ReportGenerator.htmlOutput.header.timeChanged=\u5909\u66F4\u65E5\u6642
 ReportGenerator.htmlOutput.header.timeCreated=\u4F5C\u6210\u65E5\u6642
 ReportGenerator.htmlOutput.header.timeModified=\u4FEE\u6B63\u65E5\u6642
 ReportGenerator.notifyErr.errsDuringRptGen=\u30EC\u30DD\u30FC\u30C8\u751F\u6210\u4E2D\u306E\u30A8\u30E9\u30FC\uFF1A
-ReportGenerator.errList.failedGetAbstractFileFromID=ID\u306B\u57FA\u3065\u304D\u62BD\u8C61\u30D5\u30A1\u30A4\u30EB\u3092\u53D6\u5F97\u3059\u308B\u306E\u3092\u5931\u6557\u3057\u307E\u3057\u305F
-ReportKML.getFilePath.text=\u30EC\u30DD\u30FC\u30C8KML.kml
\ No newline at end of file
+ReportGenerator.errList.failedGetAbstractFileFromID=ID\u306B\u57FA\u3065\u304D\u30A2\u30D6\u30B9\u30C8\u30E9\u30AF\u30C8\u30D5\u30A1\u30A4\u30EB\u3092\u53D6\u5F97\u3059\u308B\u306E\u3092\u5931\u6557\u3057\u307E\u3057\u305F
+ReportKML.getFilePath.text=\u30EC\u30DD\u30FC\u30C8KML.kml
+ReportVisualPanel1.invalidModuleWarning=\u7121\u52B9\u306A\u30EC\u30DD\u30FC\u30C8\u30E2\u30B8\u30E5\u30FC\u30EB({0})\u306B\u906D\u9047\u3057\u307E\u3057\u305F
+ReportGenerationPanel.confDlg.cancelReport.msg=\u672C\u5F53\u306B\u30EC\u30DD\u30FC\u30C8\u3092\u30AD\u30E3\u30F3\u30BB\u30EB\u3057\u307E\u3059\u304B\uFF1F
+ReportProgressPanel.complete.processLb2.text=\u5B8C\u4E86\u3057\u307E\u3057\u305F\u304C\u3001\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F
+ReportGenerationPanel.cancelButton.actionCommand=\u30AD\u30E3\u30F3\u30BB\u30EB
+ReportGenerationPanel.cancelButton.text=\u30AD\u30E3\u30F3\u30BB\u30EB
\ No newline at end of file

From 9ba6aa695e74f794916fd29fc3abfd5fe890c67c Mon Sep 17 00:00:00 2001
From: Kay Bassi <kb@narfindustries.com>
Date: Tue, 2 Feb 2016 16:39:52 -0800
Subject: [PATCH 18/68] Completed editing/translation

---
 Core/src/org/sleuthkit/autopsy/python/Bundle_ja.properties | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Core/src/org/sleuthkit/autopsy/python/Bundle_ja.properties b/Core/src/org/sleuthkit/autopsy/python/Bundle_ja.properties
index e69de29bb2..c407b6cf35 100644
--- a/Core/src/org/sleuthkit/autopsy/python/Bundle_ja.properties
+++ b/Core/src/org/sleuthkit/autopsy/python/Bundle_ja.properties
@@ -0,0 +1,2 @@
+JythonModuleLoader.errorMessages.failedToOpenModule={0}\u304C\u958B\u3051\u307E\u305B\u3093\u3067\u3057\u305F\u3002\u8A73\u7D30\u306F\u30ED\u30B0\u3092\u78BA\u8A8D\u3057\u3066\u304F\u3060\u3055\u3044\u3002
+JythonModuleLoader.errorMessages.failedToLoadModule={0}.  {1}. \u304C\u958B\u3051\u307E\u305B\u3093\u3067\u3057\u305F\u3002\u8A73\u7D30\u306F\u30ED\u30B0\u3092\u78BA\u8A8D\u3057\u3066\u304F\u3060\u3055\u3044\u3002
\ No newline at end of file

From daa6ceee7b3af94e5813470113baae9c857907f2 Mon Sep 17 00:00:00 2001
From: Nick Davis <nick.davis@narfindustries.com>
Date: Tue, 2 Feb 2016 19:59:41 -0500
Subject: [PATCH 19/68] converted fonts to be derivative.

---
 .../MultiUserSettingsPanel.form               | 110 +++++++++++++-----
 .../MultiUserSettingsPanel.java               |  37 +++---
 2 files changed, 103 insertions(+), 44 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/MultiUserSettingsPanel.form b/Core/src/org/sleuthkit/autopsy/corecomponents/MultiUserSettingsPanel.form
index 0ffb633a41..98d19b82c0 100644
--- a/Core/src/org/sleuthkit/autopsy/corecomponents/MultiUserSettingsPanel.form
+++ b/Core/src/org/sleuthkit/autopsy/corecomponents/MultiUserSettingsPanel.form
@@ -21,7 +21,11 @@
     </DimensionLayout>
     <DimensionLayout dim="1">
       <Group type="103" groupAlignment="0" attributes="0">
-          <Component id="jScrollPane" alignment="0" pref="559" max="32767" attributes="0"/>
+          <Group type="102" alignment="0" attributes="0">
+              <EmptySpace max="-2" attributes="0"/>
+              <Component id="jScrollPane" pref="537" max="32767" attributes="0"/>
+              <EmptySpace max="-2" attributes="0"/>
+          </Group>
       </Group>
     </DimensionLayout>
   </Layout>
@@ -132,8 +136,10 @@
               <SubComponents>
                 <Component class="javax.swing.JTextField" name="tbDbHostname">
                   <Properties>
-                    <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
-                      <Font name="Tahoma" size="12" style="0"/>
+                    <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+                      <FontInfo relative="true">
+                        <Font bold="false" component="tbDbHostname" property="font" relativeSize="false" size="12"/>
+                      </FontInfo>
                     </Property>
                     <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
                       <ResourceString bundle="org/sleuthkit/autopsy/corecomponents/Bundle.properties" key="MultiUserSettingsPanel.tbDbHostname.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
@@ -145,8 +151,10 @@
                 </Component>
                 <Component class="javax.swing.JTextField" name="tbDbPort">
                   <Properties>
-                    <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
-                      <Font name="Tahoma" size="12" style="0"/>
+                    <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+                      <FontInfo relative="true">
+                        <Font bold="false" component="tbDbPort" property="font" relativeSize="false" size="12"/>
+                      </FontInfo>
                     </Property>
                     <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
                       <ResourceString bundle="org/sleuthkit/autopsy/corecomponents/Bundle.properties" key="MultiUserSettingsPanel.tbDbPort.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
@@ -158,8 +166,10 @@
                 </Component>
                 <Component class="javax.swing.JTextField" name="tbDbUsername">
                   <Properties>
-                    <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
-                      <Font name="Tahoma" size="12" style="0"/>
+                    <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+                      <FontInfo relative="true">
+                        <Font bold="false" component="tbDbUsername" property="font" relativeSize="false" size="12"/>
+                      </FontInfo>
                     </Property>
                     <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
                       <ResourceString bundle="org/sleuthkit/autopsy/corecomponents/Bundle.properties" key="MultiUserSettingsPanel.tbDbUsername.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
@@ -171,8 +181,10 @@
                 </Component>
                 <Component class="javax.swing.JPasswordField" name="tbDbPassword">
                   <Properties>
-                    <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
-                      <Font name="Tahoma" size="12" style="0"/>
+                    <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+                      <FontInfo relative="true">
+                        <Font bold="false" component="tbDbPassword" property="font" relativeSize="false" size="12"/>
+                      </FontInfo>
                     </Property>
                     <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
                       <ResourceString bundle="org/sleuthkit/autopsy/corecomponents/Bundle.properties" key="MultiUserSettingsPanel.tbDbPassword.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
@@ -184,8 +196,10 @@
                 </Component>
                 <Component class="javax.swing.JLabel" name="lbDatabaseSettings">
                   <Properties>
-                    <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
-                      <Font name="Tahoma" size="12" style="0"/>
+                    <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+                      <FontInfo relative="true">
+                        <Font bold="false" component="lbDatabaseSettings" property="font" relativeSize="false" size="12"/>
+                      </FontInfo>
                     </Property>
                     <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
                       <ResourceString bundle="org/sleuthkit/autopsy/corecomponents/Bundle.properties" key="MultiUserSettingsPanel.lbDatabaseSettings.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
@@ -195,6 +209,11 @@
                 </Component>
                 <Component class="javax.swing.JButton" name="bnTestDatabase">
                   <Properties>
+                    <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+                      <FontInfo relative="true">
+                        <Font bold="false" component="bnTestDatabase" property="font" relativeSize="false" size="11"/>
+                      </FontInfo>
+                    </Property>
                     <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
                       <ResourceString bundle="org/sleuthkit/autopsy/corecomponents/Bundle.properties" key="MultiUserSettingsPanel.bnTestDatabase.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                     </Property>
@@ -281,8 +300,10 @@
               <SubComponents>
                 <Component class="javax.swing.JLabel" name="lbSolrSettings">
                   <Properties>
-                    <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
-                      <Font name="Tahoma" size="12" style="0"/>
+                    <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+                      <FontInfo relative="true">
+                        <Font bold="false" component="lbSolrSettings" property="font" relativeSize="false" size="12"/>
+                      </FontInfo>
                     </Property>
                     <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
                       <ResourceString bundle="org/sleuthkit/autopsy/corecomponents/Bundle.properties" key="MultiUserSettingsPanel.lbSolrSettings.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
@@ -291,8 +312,10 @@
                 </Component>
                 <Component class="javax.swing.JTextField" name="tbSolrHostname">
                   <Properties>
-                    <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
-                      <Font name="Tahoma" size="12" style="0"/>
+                    <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+                      <FontInfo relative="true">
+                        <Font bold="false" component="tbSolrHostname" property="font" relativeSize="false" size="12"/>
+                      </FontInfo>
                     </Property>
                     <Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
                       <ResourceString bundle="org/sleuthkit/autopsy/corecomponents/Bundle.properties" key="MultiUserSettingsPanel.tbSolrHostname.toolTipText" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
@@ -301,8 +324,10 @@
                 </Component>
                 <Component class="javax.swing.JTextField" name="tbSolrPort">
                   <Properties>
-                    <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
-                      <Font name="Tahoma" size="12" style="0"/>
+                    <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+                      <FontInfo relative="true">
+                        <Font bold="false" component="tbSolrPort" property="font" relativeSize="false" size="12"/>
+                      </FontInfo>
                     </Property>
                     <Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
                       <ResourceString bundle="org/sleuthkit/autopsy/corecomponents/Bundle.properties" key="MultiUserSettingsPanel.tbSolrPort.toolTipText" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
@@ -311,6 +336,11 @@
                 </Component>
                 <Component class="javax.swing.JButton" name="bnTestSolr">
                   <Properties>
+                    <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+                      <FontInfo relative="true">
+                        <Font bold="false" component="bnTestSolr" property="font" relativeSize="false" size="11"/>
+                      </FontInfo>
+                    </Property>
                     <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
                       <ResourceString bundle="org/sleuthkit/autopsy/corecomponents/Bundle.properties" key="MultiUserSettingsPanel.bnTestSolr.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                     </Property>
@@ -402,8 +432,10 @@
               <SubComponents>
                 <Component class="javax.swing.JLabel" name="lbMessageServiceSettings">
                   <Properties>
-                    <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
-                      <Font name="Tahoma" size="12" style="0"/>
+                    <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+                      <FontInfo relative="true">
+                        <Font bold="false" component="lbMessageServiceSettings" property="font" relativeSize="false" size="12"/>
+                      </FontInfo>
                     </Property>
                     <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
                       <ResourceString bundle="org/sleuthkit/autopsy/corecomponents/Bundle.properties" key="MultiUserSettingsPanel.lbMessageServiceSettings.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
@@ -412,8 +444,10 @@
                 </Component>
                 <Component class="javax.swing.JTextField" name="tbMsgHostname">
                   <Properties>
-                    <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
-                      <Font name="Tahoma" size="12" style="0"/>
+                    <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+                      <FontInfo relative="true">
+                        <Font bold="false" component="tbMsgHostname" property="font" relativeSize="false" size="12"/>
+                      </FontInfo>
                     </Property>
                     <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
                       <ResourceString bundle="org/sleuthkit/autopsy/corecomponents/Bundle.properties" key="MultiUserSettingsPanel.tbMsgHostname.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
@@ -425,8 +459,10 @@
                 </Component>
                 <Component class="javax.swing.JTextField" name="tbMsgUsername">
                   <Properties>
-                    <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
-                      <Font name="Tahoma" size="12" style="0"/>
+                    <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+                      <FontInfo relative="true">
+                        <Font bold="false" component="tbMsgUsername" property="font" relativeSize="false" size="12"/>
+                      </FontInfo>
                     </Property>
                     <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
                       <ResourceString bundle="org/sleuthkit/autopsy/corecomponents/Bundle.properties" key="MultiUserSettingsPanel.tbMsgUsername.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
@@ -438,8 +474,10 @@
                 </Component>
                 <Component class="javax.swing.JTextField" name="tbMsgPort">
                   <Properties>
-                    <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
-                      <Font name="Tahoma" size="12" style="0"/>
+                    <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+                      <FontInfo relative="true">
+                        <Font bold="false" component="tbMsgPort" property="font" relativeSize="false" size="12"/>
+                      </FontInfo>
                     </Property>
                     <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
                       <ResourceString bundle="org/sleuthkit/autopsy/corecomponents/Bundle.properties" key="MultiUserSettingsPanel.tbMsgPort.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
@@ -451,8 +489,10 @@
                 </Component>
                 <Component class="javax.swing.JPasswordField" name="tbMsgPassword">
                   <Properties>
-                    <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
-                      <Font name="Tahoma" size="12" style="0"/>
+                    <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+                      <FontInfo relative="true">
+                        <Font bold="false" component="tbMsgPassword" property="font" relativeSize="false" size="12"/>
+                      </FontInfo>
                     </Property>
                     <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
                       <ResourceString bundle="org/sleuthkit/autopsy/corecomponents/Bundle.properties" key="MultiUserSettingsPanel.tbMsgPassword.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
@@ -464,6 +504,11 @@
                 </Component>
                 <Component class="javax.swing.JButton" name="bnTestMessageService">
                   <Properties>
+                    <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+                      <FontInfo relative="true">
+                        <Font bold="false" component="bnTestMessageService" property="font" relativeSize="false" size="11"/>
+                      </FontInfo>
+                    </Property>
                     <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
                       <ResourceString bundle="org/sleuthkit/autopsy/corecomponents/Bundle.properties" key="MultiUserSettingsPanel.bnTestMessageService.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                     </Property>
@@ -493,6 +538,11 @@
             </Container>
             <Component class="javax.swing.JCheckBox" name="cbEnableMultiUser">
               <Properties>
+                <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+                  <FontInfo relative="true">
+                    <Font bold="false" component="cbEnableMultiUser" property="font" relativeSize="false" size="11"/>
+                  </FontInfo>
+                </Property>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
                   <ResourceString bundle="org/sleuthkit/autopsy/corecomponents/Bundle.properties" key="MultiUserSettingsPanel.cbEnableMultiUser.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
@@ -504,8 +554,10 @@
             <Component class="javax.swing.JTextField" name="tbOops">
               <Properties>
                 <Property name="editable" type="boolean" value="false"/>
-                <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
-                  <Font name="Tahoma" size="12" style="1"/>
+                <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+                  <FontInfo relative="true">
+                    <Font bold="true" component="tbOops" property="font" relativeSize="false" size="12"/>
+                  </FontInfo>
                 </Property>
                 <Property name="foreground" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
                   <Color blue="0" green="0" red="ff" type="rgb"/>
diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/MultiUserSettingsPanel.java b/Core/src/org/sleuthkit/autopsy/corecomponents/MultiUserSettingsPanel.java
index a9a729b59b..8b4af64dc3 100644
--- a/Core/src/org/sleuthkit/autopsy/corecomponents/MultiUserSettingsPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/corecomponents/MultiUserSettingsPanel.java
@@ -185,26 +185,27 @@ public final class MultiUserSettingsPanel extends javax.swing.JPanel {
 
         pnDatabaseSettings.setBorder(javax.swing.BorderFactory.createEtchedBorder());
 
-        tbDbHostname.setFont(new java.awt.Font("Tahoma", 0, 12)); // NOI18N
+        tbDbHostname.setFont(tbDbHostname.getFont().deriveFont(tbDbHostname.getFont().getStyle() & ~java.awt.Font.BOLD, 12));
         tbDbHostname.setText(org.openide.util.NbBundle.getMessage(MultiUserSettingsPanel.class, "MultiUserSettingsPanel.tbDbHostname.text")); // NOI18N
         tbDbHostname.setToolTipText(org.openide.util.NbBundle.getMessage(MultiUserSettingsPanel.class, "MultiUserSettingsPanel.tbDbHostname.toolTipText")); // NOI18N
 
-        tbDbPort.setFont(new java.awt.Font("Tahoma", 0, 12)); // NOI18N
+        tbDbPort.setFont(tbDbPort.getFont().deriveFont(tbDbPort.getFont().getStyle() & ~java.awt.Font.BOLD, 12));
         tbDbPort.setText(org.openide.util.NbBundle.getMessage(MultiUserSettingsPanel.class, "MultiUserSettingsPanel.tbDbPort.text")); // NOI18N
         tbDbPort.setToolTipText(org.openide.util.NbBundle.getMessage(MultiUserSettingsPanel.class, "MultiUserSettingsPanel.tbDbPort.toolTipText")); // NOI18N
 
-        tbDbUsername.setFont(new java.awt.Font("Tahoma", 0, 12)); // NOI18N
+        tbDbUsername.setFont(tbDbUsername.getFont().deriveFont(tbDbUsername.getFont().getStyle() & ~java.awt.Font.BOLD, 12));
         tbDbUsername.setText(org.openide.util.NbBundle.getMessage(MultiUserSettingsPanel.class, "MultiUserSettingsPanel.tbDbUsername.text")); // NOI18N
         tbDbUsername.setToolTipText(org.openide.util.NbBundle.getMessage(MultiUserSettingsPanel.class, "MultiUserSettingsPanel.tbDbUsername.toolTipText")); // NOI18N
 
-        tbDbPassword.setFont(new java.awt.Font("Tahoma", 0, 12)); // NOI18N
+        tbDbPassword.setFont(tbDbPassword.getFont().deriveFont(tbDbPassword.getFont().getStyle() & ~java.awt.Font.BOLD, 12));
         tbDbPassword.setText(org.openide.util.NbBundle.getMessage(MultiUserSettingsPanel.class, "MultiUserSettingsPanel.tbDbPassword.text")); // NOI18N
         tbDbPassword.setToolTipText(org.openide.util.NbBundle.getMessage(MultiUserSettingsPanel.class, "MultiUserSettingsPanel.tbDbPassword.toolTipText")); // NOI18N
 
-        lbDatabaseSettings.setFont(new java.awt.Font("Tahoma", 0, 12)); // NOI18N
+        lbDatabaseSettings.setFont(lbDatabaseSettings.getFont().deriveFont(lbDatabaseSettings.getFont().getStyle() & ~java.awt.Font.BOLD, 12));
         org.openide.awt.Mnemonics.setLocalizedText(lbDatabaseSettings, org.openide.util.NbBundle.getMessage(MultiUserSettingsPanel.class, "MultiUserSettingsPanel.lbDatabaseSettings.text")); // NOI18N
         lbDatabaseSettings.setVerticalAlignment(javax.swing.SwingConstants.TOP);
 
+        bnTestDatabase.setFont(bnTestDatabase.getFont().deriveFont(bnTestDatabase.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         org.openide.awt.Mnemonics.setLocalizedText(bnTestDatabase, org.openide.util.NbBundle.getMessage(MultiUserSettingsPanel.class, "MultiUserSettingsPanel.bnTestDatabase.text")); // NOI18N
         bnTestDatabase.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
@@ -263,15 +264,16 @@ public final class MultiUserSettingsPanel extends javax.swing.JPanel {
 
         pnSolrSettings.setBorder(javax.swing.BorderFactory.createEtchedBorder());
 
-        lbSolrSettings.setFont(new java.awt.Font("Tahoma", 0, 12)); // NOI18N
+        lbSolrSettings.setFont(lbSolrSettings.getFont().deriveFont(lbSolrSettings.getFont().getStyle() & ~java.awt.Font.BOLD, 12));
         org.openide.awt.Mnemonics.setLocalizedText(lbSolrSettings, org.openide.util.NbBundle.getMessage(MultiUserSettingsPanel.class, "MultiUserSettingsPanel.lbSolrSettings.text")); // NOI18N
 
-        tbSolrHostname.setFont(new java.awt.Font("Tahoma", 0, 12)); // NOI18N
+        tbSolrHostname.setFont(tbSolrHostname.getFont().deriveFont(tbSolrHostname.getFont().getStyle() & ~java.awt.Font.BOLD, 12));
         tbSolrHostname.setToolTipText(org.openide.util.NbBundle.getMessage(MultiUserSettingsPanel.class, "MultiUserSettingsPanel.tbSolrHostname.toolTipText")); // NOI18N
 
-        tbSolrPort.setFont(new java.awt.Font("Tahoma", 0, 12)); // NOI18N
+        tbSolrPort.setFont(tbSolrPort.getFont().deriveFont(tbSolrPort.getFont().getStyle() & ~java.awt.Font.BOLD, 12));
         tbSolrPort.setToolTipText(org.openide.util.NbBundle.getMessage(MultiUserSettingsPanel.class, "MultiUserSettingsPanel.tbSolrPort.toolTipText")); // NOI18N
 
+        bnTestSolr.setFont(bnTestSolr.getFont().deriveFont(bnTestSolr.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         org.openide.awt.Mnemonics.setLocalizedText(bnTestSolr, org.openide.util.NbBundle.getMessage(MultiUserSettingsPanel.class, "MultiUserSettingsPanel.bnTestSolr.text")); // NOI18N
         bnTestSolr.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
@@ -324,25 +326,26 @@ public final class MultiUserSettingsPanel extends javax.swing.JPanel {
 
         pnMessagingSettings.setBorder(javax.swing.BorderFactory.createEtchedBorder());
 
-        lbMessageServiceSettings.setFont(new java.awt.Font("Tahoma", 0, 12)); // NOI18N
+        lbMessageServiceSettings.setFont(lbMessageServiceSettings.getFont().deriveFont(lbMessageServiceSettings.getFont().getStyle() & ~java.awt.Font.BOLD, 12));
         org.openide.awt.Mnemonics.setLocalizedText(lbMessageServiceSettings, org.openide.util.NbBundle.getMessage(MultiUserSettingsPanel.class, "MultiUserSettingsPanel.lbMessageServiceSettings.text")); // NOI18N
 
-        tbMsgHostname.setFont(new java.awt.Font("Tahoma", 0, 12)); // NOI18N
+        tbMsgHostname.setFont(tbMsgHostname.getFont().deriveFont(tbMsgHostname.getFont().getStyle() & ~java.awt.Font.BOLD, 12));
         tbMsgHostname.setText(org.openide.util.NbBundle.getMessage(MultiUserSettingsPanel.class, "MultiUserSettingsPanel.tbMsgHostname.text")); // NOI18N
         tbMsgHostname.setToolTipText(org.openide.util.NbBundle.getMessage(MultiUserSettingsPanel.class, "MultiUserSettingsPanel.tbMsgHostname.toolTipText")); // NOI18N
 
-        tbMsgUsername.setFont(new java.awt.Font("Tahoma", 0, 12)); // NOI18N
+        tbMsgUsername.setFont(tbMsgUsername.getFont().deriveFont(tbMsgUsername.getFont().getStyle() & ~java.awt.Font.BOLD, 12));
         tbMsgUsername.setText(org.openide.util.NbBundle.getMessage(MultiUserSettingsPanel.class, "MultiUserSettingsPanel.tbMsgUsername.text")); // NOI18N
         tbMsgUsername.setToolTipText(org.openide.util.NbBundle.getMessage(MultiUserSettingsPanel.class, "MultiUserSettingsPanel.tbMsgUsername.toolTipText")); // NOI18N
 
-        tbMsgPort.setFont(new java.awt.Font("Tahoma", 0, 12)); // NOI18N
+        tbMsgPort.setFont(tbMsgPort.getFont().deriveFont(tbMsgPort.getFont().getStyle() & ~java.awt.Font.BOLD, 12));
         tbMsgPort.setText(org.openide.util.NbBundle.getMessage(MultiUserSettingsPanel.class, "MultiUserSettingsPanel.tbMsgPort.text")); // NOI18N
         tbMsgPort.setToolTipText(org.openide.util.NbBundle.getMessage(MultiUserSettingsPanel.class, "MultiUserSettingsPanel.tbMsgPort.toolTipText")); // NOI18N
 
-        tbMsgPassword.setFont(new java.awt.Font("Tahoma", 0, 12)); // NOI18N
+        tbMsgPassword.setFont(tbMsgPassword.getFont().deriveFont(tbMsgPassword.getFont().getStyle() & ~java.awt.Font.BOLD, 12));
         tbMsgPassword.setText(org.openide.util.NbBundle.getMessage(MultiUserSettingsPanel.class, "MultiUserSettingsPanel.tbMsgPassword.text")); // NOI18N
         tbMsgPassword.setToolTipText(org.openide.util.NbBundle.getMessage(MultiUserSettingsPanel.class, "MultiUserSettingsPanel.tbMsgPassword.toolTipText")); // NOI18N
 
+        bnTestMessageService.setFont(bnTestMessageService.getFont().deriveFont(bnTestMessageService.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         org.openide.awt.Mnemonics.setLocalizedText(bnTestMessageService, org.openide.util.NbBundle.getMessage(MultiUserSettingsPanel.class, "MultiUserSettingsPanel.bnTestMessageService.text")); // NOI18N
         bnTestMessageService.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
@@ -399,6 +402,7 @@ public final class MultiUserSettingsPanel extends javax.swing.JPanel {
                 .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
         );
 
+        cbEnableMultiUser.setFont(cbEnableMultiUser.getFont().deriveFont(cbEnableMultiUser.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         org.openide.awt.Mnemonics.setLocalizedText(cbEnableMultiUser, org.openide.util.NbBundle.getMessage(MultiUserSettingsPanel.class, "MultiUserSettingsPanel.cbEnableMultiUser.text")); // NOI18N
         cbEnableMultiUser.addItemListener(new java.awt.event.ItemListener() {
             public void itemStateChanged(java.awt.event.ItemEvent evt) {
@@ -407,7 +411,7 @@ public final class MultiUserSettingsPanel extends javax.swing.JPanel {
         });
 
         tbOops.setEditable(false);
-        tbOops.setFont(new java.awt.Font("Tahoma", 1, 12)); // NOI18N
+        tbOops.setFont(tbOops.getFont().deriveFont(tbOops.getFont().getStyle() | java.awt.Font.BOLD, 12));
         tbOops.setForeground(new java.awt.Color(255, 0, 0));
         tbOops.setText(org.openide.util.NbBundle.getMessage(MultiUserSettingsPanel.class, "MultiUserSettingsPanel.tbOops.text")); // NOI18N
         tbOops.setBorder(null);
@@ -453,7 +457,10 @@ public final class MultiUserSettingsPanel extends javax.swing.JPanel {
         );
         layout.setVerticalGroup(
             layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-            .addComponent(jScrollPane, javax.swing.GroupLayout.DEFAULT_SIZE, 559, Short.MAX_VALUE)
+            .addGroup(layout.createSequentialGroup()
+                .addContainerGap()
+                .addComponent(jScrollPane, javax.swing.GroupLayout.DEFAULT_SIZE, 537, Short.MAX_VALUE)
+                .addContainerGap())
         );
     }// </editor-fold>//GEN-END:initComponents
 

From a0c6359795bca6f7122bd020f22933de2ff26314 Mon Sep 17 00:00:00 2001
From: Nick Davis <nick.davis@narfindustries.com>
Date: Tue, 2 Feb 2016 20:41:48 -0500
Subject: [PATCH 20/68] converted UI fonts to derived fonts

---
 .../directorytree/FileSystemDetailsPanel.form | 104 ++++++++++++++++-
 .../directorytree/FileSystemDetailsPanel.java |  28 ++++-
 .../directorytree/ImageDetailsPanel.form      | 109 +++++++++++++-----
 .../directorytree/ImageDetailsPanel.java      |  54 +++++----
 .../directorytree/VolumeDetailsPanel.form     |  63 +++++++++-
 .../directorytree/VolumeDetailsPanel.java     |  13 ++-
 6 files changed, 309 insertions(+), 62 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/directorytree/FileSystemDetailsPanel.form b/Core/src/org/sleuthkit/autopsy/directorytree/FileSystemDetailsPanel.form
index 6892af7264..0b460a54c4 100644
--- a/Core/src/org/sleuthkit/autopsy/directorytree/FileSystemDetailsPanel.form
+++ b/Core/src/org/sleuthkit/autopsy/directorytree/FileSystemDetailsPanel.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">
   <AuxValues>
@@ -187,6 +187,11 @@
           <SubComponents>
             <Component class="javax.swing.JLabel" name="fsTypeLabel">
               <Properties>
+                <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+                  <FontInfo relative="true">
+                    <Font bold="false" component="fsTypeLabel" property="font" relativeSize="false" size="11"/>
+                  </FontInfo>
+                </Property>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
                   <ResourceString bundle="org/sleuthkit/autopsy/directorytree/Bundle.properties" key="FileSystemDetailsPanel.fsTypeLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
@@ -194,6 +199,11 @@
             </Component>
             <Component class="javax.swing.JLabel" name="imgOffsetLabel">
               <Properties>
+                <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+                  <FontInfo relative="true">
+                    <Font bold="false" component="imgOffsetLabel" property="font" relativeSize="false" size="11"/>
+                  </FontInfo>
+                </Property>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
                   <ResourceString bundle="org/sleuthkit/autopsy/directorytree/Bundle.properties" key="FileSystemDetailsPanel.imgOffsetLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
@@ -201,6 +211,11 @@
             </Component>
             <Component class="javax.swing.JLabel" name="volumeIDLabel">
               <Properties>
+                <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+                  <FontInfo relative="true">
+                    <Font bold="false" component="volumeIDLabel" property="font" relativeSize="false" size="11"/>
+                  </FontInfo>
+                </Property>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
                   <ResourceString bundle="org/sleuthkit/autopsy/directorytree/Bundle.properties" key="FileSystemDetailsPanel.volumeIDLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
@@ -208,6 +223,11 @@
             </Component>
             <Component class="javax.swing.JLabel" name="blockSizeLabel">
               <Properties>
+                <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+                  <FontInfo relative="true">
+                    <Font bold="false" component="blockSizeLabel" property="font" relativeSize="false" size="11"/>
+                  </FontInfo>
+                </Property>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
                   <ResourceString bundle="org/sleuthkit/autopsy/directorytree/Bundle.properties" key="FileSystemDetailsPanel.blockSizeLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
@@ -215,6 +235,11 @@
             </Component>
             <Component class="javax.swing.JLabel" name="blockCountLabel">
               <Properties>
+                <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+                  <FontInfo relative="true">
+                    <Font bold="false" component="blockCountLabel" property="font" relativeSize="false" size="11"/>
+                  </FontInfo>
+                </Property>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
                   <ResourceString bundle="org/sleuthkit/autopsy/directorytree/Bundle.properties" key="FileSystemDetailsPanel.blockCountLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
@@ -222,6 +247,11 @@
             </Component>
             <Component class="javax.swing.JLabel" name="rootInumLabel">
               <Properties>
+                <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+                  <FontInfo relative="true">
+                    <Font bold="false" component="rootInumLabel" property="font" relativeSize="false" size="11"/>
+                  </FontInfo>
+                </Property>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
                   <ResourceString bundle="org/sleuthkit/autopsy/directorytree/Bundle.properties" key="FileSystemDetailsPanel.rootInumLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
@@ -229,6 +259,11 @@
             </Component>
             <Component class="javax.swing.JLabel" name="firstInumLabel">
               <Properties>
+                <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+                  <FontInfo relative="true">
+                    <Font bold="false" component="firstInumLabel" property="font" relativeSize="false" size="11"/>
+                  </FontInfo>
+                </Property>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
                   <ResourceString bundle="org/sleuthkit/autopsy/directorytree/Bundle.properties" key="FileSystemDetailsPanel.firstInumLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
@@ -236,6 +271,11 @@
             </Component>
             <Component class="javax.swing.JLabel" name="lastInumLabel">
               <Properties>
+                <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+                  <FontInfo relative="true">
+                    <Font bold="false" component="lastInumLabel" property="font" relativeSize="false" size="11"/>
+                  </FontInfo>
+                </Property>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
                   <ResourceString bundle="org/sleuthkit/autopsy/directorytree/Bundle.properties" key="FileSystemDetailsPanel.lastInumLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
@@ -243,6 +283,11 @@
             </Component>
             <Component class="javax.swing.JLabel" name="fsTypeValue">
               <Properties>
+                <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+                  <FontInfo relative="true">
+                    <Font bold="false" component="fsTypeValue" property="font" relativeSize="false" size="11"/>
+                  </FontInfo>
+                </Property>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
                   <ResourceString bundle="org/sleuthkit/autopsy/directorytree/Bundle.properties" key="FileSystemDetailsPanel.fsTypeValue.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
@@ -250,6 +295,11 @@
             </Component>
             <Component class="javax.swing.JLabel" name="imgOffsetValue">
               <Properties>
+                <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+                  <FontInfo relative="true">
+                    <Font bold="false" component="imgOffsetValue" property="font" relativeSize="false" size="11"/>
+                  </FontInfo>
+                </Property>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
                   <ResourceString bundle="org/sleuthkit/autopsy/directorytree/Bundle.properties" key="FileSystemDetailsPanel.imgOffsetValue.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
@@ -257,6 +307,11 @@
             </Component>
             <Component class="javax.swing.JLabel" name="volumeIDValue">
               <Properties>
+                <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+                  <FontInfo relative="true">
+                    <Font bold="false" component="volumeIDValue" property="font" relativeSize="false" size="11"/>
+                  </FontInfo>
+                </Property>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
                   <ResourceString bundle="org/sleuthkit/autopsy/directorytree/Bundle.properties" key="FileSystemDetailsPanel.volumeIDValue.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
@@ -264,6 +319,11 @@
             </Component>
             <Component class="javax.swing.JLabel" name="blockSizeValue">
               <Properties>
+                <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+                  <FontInfo relative="true">
+                    <Font bold="false" component="blockSizeValue" property="font" relativeSize="false" size="11"/>
+                  </FontInfo>
+                </Property>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
                   <ResourceString bundle="org/sleuthkit/autopsy/directorytree/Bundle.properties" key="FileSystemDetailsPanel.blockSizeValue.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
@@ -271,6 +331,11 @@
             </Component>
             <Component class="javax.swing.JLabel" name="blockCountValue">
               <Properties>
+                <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+                  <FontInfo relative="true">
+                    <Font bold="false" component="blockCountValue" property="font" relativeSize="false" size="11"/>
+                  </FontInfo>
+                </Property>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
                   <ResourceString bundle="org/sleuthkit/autopsy/directorytree/Bundle.properties" key="FileSystemDetailsPanel.blockCountValue.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
@@ -278,6 +343,11 @@
             </Component>
             <Component class="javax.swing.JLabel" name="rootInumValue">
               <Properties>
+                <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+                  <FontInfo relative="true">
+                    <Font bold="false" component="rootInumValue" property="font" relativeSize="false" size="11"/>
+                  </FontInfo>
+                </Property>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
                   <ResourceString bundle="org/sleuthkit/autopsy/directorytree/Bundle.properties" key="FileSystemDetailsPanel.rootInumValue.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
@@ -285,6 +355,11 @@
             </Component>
             <Component class="javax.swing.JLabel" name="firstInumValue">
               <Properties>
+                <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+                  <FontInfo relative="true">
+                    <Font bold="false" component="firstInumValue" property="font" relativeSize="false" size="11"/>
+                  </FontInfo>
+                </Property>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
                   <ResourceString bundle="org/sleuthkit/autopsy/directorytree/Bundle.properties" key="FileSystemDetailsPanel.firstInumValue.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
@@ -292,6 +367,11 @@
             </Component>
             <Component class="javax.swing.JLabel" name="lastInumValue">
               <Properties>
+                <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+                  <FontInfo relative="true">
+                    <Font bold="false" component="lastInumValue" property="font" relativeSize="false" size="11"/>
+                  </FontInfo>
+                </Property>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
                   <ResourceString bundle="org/sleuthkit/autopsy/directorytree/Bundle.properties" key="FileSystemDetailsPanel.lastInumValue.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
@@ -299,8 +379,10 @@
             </Component>
             <Component class="javax.swing.JLabel" name="genInfoLabel">
               <Properties>
-                <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
-                  <Font name="Tahoma" size="18" style="1"/>
+                <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+                  <FontInfo relative="true">
+                    <Font bold="true" component="genInfoLabel" property="font" relativeSize="false" size="18"/>
+                  </FontInfo>
                 </Property>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
                   <ResourceString bundle="org/sleuthkit/autopsy/directorytree/Bundle.properties" key="FileSystemDetailsPanel.genInfoLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
@@ -314,6 +396,11 @@
             </Component>
             <Component class="javax.swing.JLabel" name="jLabel2">
               <Properties>
+                <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+                  <FontInfo relative="true">
+                    <Font bold="false" component="jLabel2" property="font" relativeSize="false" size="11"/>
+                  </FontInfo>
+                </Property>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
                   <ResourceString bundle="org/sleuthkit/autopsy/directorytree/Bundle.properties" key="FileSystemDetailsPanel.jLabel2.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
@@ -321,6 +408,11 @@
             </Component>
             <Component class="javax.swing.JLabel" name="jLabel3">
               <Properties>
+                <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+                  <FontInfo relative="true">
+                    <Font bold="false" component="jLabel3" property="font" relativeSize="false" size="11"/>
+                  </FontInfo>
+                </Property>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
                   <ResourceString bundle="org/sleuthkit/autopsy/directorytree/Bundle.properties" key="FileSystemDetailsPanel.jLabel3.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
@@ -368,8 +460,10 @@
           <SubComponents>
             <Component class="javax.swing.JLabel" name="jLabel1">
               <Properties>
-                <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
-                  <Font name="Tahoma" size="18" style="1"/>
+                <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+                  <FontInfo relative="true">
+                    <Font bold="true" component="jLabel1" property="font" relativeSize="false" size="18"/>
+                  </FontInfo>
                 </Property>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
                   <ResourceString bundle="org/sleuthkit/autopsy/directorytree/Bundle.properties" key="FileSystemDetailsPanel.jLabel1.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
diff --git a/Core/src/org/sleuthkit/autopsy/directorytree/FileSystemDetailsPanel.java b/Core/src/org/sleuthkit/autopsy/directorytree/FileSystemDetailsPanel.java
index 7a642230e3..c751014552 100644
--- a/Core/src/org/sleuthkit/autopsy/directorytree/FileSystemDetailsPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/directorytree/FileSystemDetailsPanel.java
@@ -78,45 +78,63 @@ class FileSystemDetailsPanel extends javax.swing.JPanel {
         genInfoPanel.setBorder(javax.swing.BorderFactory.createEtchedBorder());
         genInfoPanel.setPreferredSize(new java.awt.Dimension(815, 170));
 
+        fsTypeLabel.setFont(fsTypeLabel.getFont().deriveFont(fsTypeLabel.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         fsTypeLabel.setText(org.openide.util.NbBundle.getMessage(FileSystemDetailsPanel.class, "FileSystemDetailsPanel.fsTypeLabel.text")); // NOI18N
 
+        imgOffsetLabel.setFont(imgOffsetLabel.getFont().deriveFont(imgOffsetLabel.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         imgOffsetLabel.setText(org.openide.util.NbBundle.getMessage(FileSystemDetailsPanel.class, "FileSystemDetailsPanel.imgOffsetLabel.text")); // NOI18N
 
+        volumeIDLabel.setFont(volumeIDLabel.getFont().deriveFont(volumeIDLabel.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         volumeIDLabel.setText(org.openide.util.NbBundle.getMessage(FileSystemDetailsPanel.class, "FileSystemDetailsPanel.volumeIDLabel.text")); // NOI18N
 
+        blockSizeLabel.setFont(blockSizeLabel.getFont().deriveFont(blockSizeLabel.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         blockSizeLabel.setText(org.openide.util.NbBundle.getMessage(FileSystemDetailsPanel.class, "FileSystemDetailsPanel.blockSizeLabel.text")); // NOI18N
 
+        blockCountLabel.setFont(blockCountLabel.getFont().deriveFont(blockCountLabel.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         blockCountLabel.setText(org.openide.util.NbBundle.getMessage(FileSystemDetailsPanel.class, "FileSystemDetailsPanel.blockCountLabel.text")); // NOI18N
 
+        rootInumLabel.setFont(rootInumLabel.getFont().deriveFont(rootInumLabel.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         rootInumLabel.setText(org.openide.util.NbBundle.getMessage(FileSystemDetailsPanel.class, "FileSystemDetailsPanel.rootInumLabel.text")); // NOI18N
 
+        firstInumLabel.setFont(firstInumLabel.getFont().deriveFont(firstInumLabel.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         firstInumLabel.setText(org.openide.util.NbBundle.getMessage(FileSystemDetailsPanel.class, "FileSystemDetailsPanel.firstInumLabel.text")); // NOI18N
 
+        lastInumLabel.setFont(lastInumLabel.getFont().deriveFont(lastInumLabel.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         lastInumLabel.setText(org.openide.util.NbBundle.getMessage(FileSystemDetailsPanel.class, "FileSystemDetailsPanel.lastInumLabel.text")); // NOI18N
 
+        fsTypeValue.setFont(fsTypeValue.getFont().deriveFont(fsTypeValue.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         fsTypeValue.setText(org.openide.util.NbBundle.getMessage(FileSystemDetailsPanel.class, "FileSystemDetailsPanel.fsTypeValue.text")); // NOI18N
 
+        imgOffsetValue.setFont(imgOffsetValue.getFont().deriveFont(imgOffsetValue.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         imgOffsetValue.setText(org.openide.util.NbBundle.getMessage(FileSystemDetailsPanel.class, "FileSystemDetailsPanel.imgOffsetValue.text")); // NOI18N
 
+        volumeIDValue.setFont(volumeIDValue.getFont().deriveFont(volumeIDValue.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         volumeIDValue.setText(org.openide.util.NbBundle.getMessage(FileSystemDetailsPanel.class, "FileSystemDetailsPanel.volumeIDValue.text")); // NOI18N
 
+        blockSizeValue.setFont(blockSizeValue.getFont().deriveFont(blockSizeValue.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         blockSizeValue.setText(org.openide.util.NbBundle.getMessage(FileSystemDetailsPanel.class, "FileSystemDetailsPanel.blockSizeValue.text")); // NOI18N
 
+        blockCountValue.setFont(blockCountValue.getFont().deriveFont(blockCountValue.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         blockCountValue.setText(org.openide.util.NbBundle.getMessage(FileSystemDetailsPanel.class, "FileSystemDetailsPanel.blockCountValue.text")); // NOI18N
 
+        rootInumValue.setFont(rootInumValue.getFont().deriveFont(rootInumValue.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         rootInumValue.setText(org.openide.util.NbBundle.getMessage(FileSystemDetailsPanel.class, "FileSystemDetailsPanel.rootInumValue.text")); // NOI18N
 
+        firstInumValue.setFont(firstInumValue.getFont().deriveFont(firstInumValue.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         firstInumValue.setText(org.openide.util.NbBundle.getMessage(FileSystemDetailsPanel.class, "FileSystemDetailsPanel.firstInumValue.text")); // NOI18N
 
+        lastInumValue.setFont(lastInumValue.getFont().deriveFont(lastInumValue.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         lastInumValue.setText(org.openide.util.NbBundle.getMessage(FileSystemDetailsPanel.class, "FileSystemDetailsPanel.lastInumValue.text")); // NOI18N
 
-        genInfoLabel.setFont(genInfoLabel.getFont().deriveFont(Font.BOLD, 18));
+        genInfoLabel.setFont(genInfoLabel.getFont().deriveFont(genInfoLabel.getFont().getStyle() | java.awt.Font.BOLD, 18));
         genInfoLabel.setText(org.openide.util.NbBundle.getMessage(FileSystemDetailsPanel.class, "FileSystemDetailsPanel.genInfoLabel.text")); // NOI18N
 
         jSeparator1.setOrientation(javax.swing.SwingConstants.VERTICAL);
 
+        jLabel2.setFont(jLabel2.getFont().deriveFont(jLabel2.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         jLabel2.setText(org.openide.util.NbBundle.getMessage(FileSystemDetailsPanel.class, "FileSystemDetailsPanel.jLabel2.text")); // NOI18N
 
+        jLabel3.setFont(jLabel3.getFont().deriveFont(jLabel3.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         jLabel3.setText(org.openide.util.NbBundle.getMessage(FileSystemDetailsPanel.class, "FileSystemDetailsPanel.jLabel3.text")); // NOI18N
 
         javax.swing.GroupLayout genInfoPanelLayout = new javax.swing.GroupLayout(genInfoPanel);
@@ -162,7 +180,7 @@ class FileSystemDetailsPanel extends javax.swing.JPanel {
         genInfoPanelLayout.setVerticalGroup(
             genInfoPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
             .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, genInfoPanelLayout.createSequentialGroup()
-                .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                .addContainerGap(23, Short.MAX_VALUE)
                 .addComponent(genInfoLabel)
                 .addGap(18, 18, 18)
                 .addGroup(genInfoPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
@@ -204,7 +222,7 @@ class FileSystemDetailsPanel extends javax.swing.JPanel {
                             .addComponent(firstInumLabel)
                             .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
                             .addComponent(lastInumLabel)))
-                    .addComponent(jSeparator1, javax.swing.GroupLayout.DEFAULT_SIZE, 89, Short.MAX_VALUE))
+                    .addComponent(jSeparator1, javax.swing.GroupLayout.DEFAULT_SIZE, 101, Short.MAX_VALUE))
                 .addContainerGap())
         );
 
@@ -213,7 +231,7 @@ class FileSystemDetailsPanel extends javax.swing.JPanel {
         detailInfoPanel.setBorder(javax.swing.BorderFactory.createEtchedBorder());
         detailInfoPanel.setPreferredSize(new java.awt.Dimension(516, 293));
 
-        jLabel1.setFont(jLabel1.getFont().deriveFont(Font.BOLD, 18));
+        jLabel1.setFont(jLabel1.getFont().deriveFont(jLabel1.getFont().getStyle() | java.awt.Font.BOLD, 18));
         jLabel1.setText(org.openide.util.NbBundle.getMessage(FileSystemDetailsPanel.class, "FileSystemDetailsPanel.jLabel1.text")); // NOI18N
 
         javax.swing.GroupLayout detailInfoPanelLayout = new javax.swing.GroupLayout(detailInfoPanel);
@@ -230,7 +248,7 @@ class FileSystemDetailsPanel extends javax.swing.JPanel {
             .addGroup(detailInfoPanelLayout.createSequentialGroup()
                 .addGap(23, 23, 23)
                 .addComponent(jLabel1)
-                .addContainerGap(259, Short.MAX_VALUE))
+                .addContainerGap(235, Short.MAX_VALUE))
         );
 
         jSplitPane1.setRightComponent(detailInfoPanel);
diff --git a/Core/src/org/sleuthkit/autopsy/directorytree/ImageDetailsPanel.form b/Core/src/org/sleuthkit/autopsy/directorytree/ImageDetailsPanel.form
index a9508bc56e..161b073bed 100644
--- a/Core/src/org/sleuthkit/autopsy/directorytree/ImageDetailsPanel.form
+++ b/Core/src/org/sleuthkit/autopsy/directorytree/ImageDetailsPanel.form
@@ -21,29 +21,32 @@
               <Component id="imageInfoLabel" min="-2" max="-2" attributes="0"/>
               <EmptySpace pref="78" max="32767" attributes="0"/>
           </Group>
-          <Group type="102" alignment="0" attributes="0">
+          <Group type="102" alignment="1" attributes="0">
               <EmptySpace max="32767" attributes="0"/>
               <Group type="103" groupAlignment="0" attributes="0">
-                  <Component id="imgNameLabel" alignment="0" min="-2" max="-2" attributes="0"/>
-                  <Component id="imgTypeLabel" alignment="0" min="-2" max="-2" attributes="0"/>
-                  <Component id="imgSectorSizeLabel" alignment="0" min="-2" max="-2" attributes="0"/>
-                  <Component id="imgTotalSizeLabel" alignment="0" min="-2" max="-2" attributes="0"/>
-                  <Component id="imgHashLabel" alignment="0" min="-2" max="-2" attributes="0"/>
+                  <Group type="102" alignment="1" attributes="0">
+                      <Group type="103" groupAlignment="0" attributes="0">
+                          <Component id="imgNameLabel" alignment="0" min="-2" max="-2" attributes="0"/>
+                          <Component id="imgTypeLabel" alignment="0" min="-2" max="-2" attributes="0"/>
+                          <Component id="imgSectorSizeLabel" alignment="0" min="-2" max="-2" attributes="0"/>
+                          <Component id="imgTotalSizeLabel" alignment="0" min="-2" max="-2" attributes="0"/>
+                          <Component id="imgHashLabel" alignment="0" min="-2" max="-2" attributes="0"/>
+                      </Group>
+                      <EmptySpace type="separate" max="-2" attributes="0"/>
+                      <Group type="103" groupAlignment="0" attributes="0">
+                          <Component id="imgNameValue" min="-2" max="-2" attributes="0"/>
+                          <Component id="imgTypeValue" alignment="0" min="-2" max="-2" attributes="0"/>
+                          <Component id="imgSectorSizeValue" alignment="0" min="-2" max="-2" attributes="0"/>
+                          <Component id="imgTotalSizeValue" min="-2" max="-2" attributes="0"/>
+                          <Component id="imgHashValue" min="-2" max="-2" attributes="0"/>
+                      </Group>
+                      <EmptySpace max="32767" attributes="0"/>
+                  </Group>
+                  <Group type="102" alignment="1" attributes="0">
+                      <Component id="OKButton" min="-2" pref="80" max="-2" attributes="0"/>
+                      <EmptySpace max="32767" attributes="0"/>
+                  </Group>
               </Group>
-              <EmptySpace type="separate" max="-2" attributes="0"/>
-              <Group type="103" groupAlignment="0" attributes="0">
-                  <Component id="imgNameValue" min="-2" max="-2" attributes="0"/>
-                  <Component id="imgTypeValue" alignment="0" min="-2" max="-2" attributes="0"/>
-                  <Component id="imgSectorSizeValue" alignment="0" min="-2" max="-2" attributes="0"/>
-                  <Component id="imgTotalSizeValue" min="-2" max="-2" attributes="0"/>
-                  <Component id="imgHashValue" min="-2" max="-2" attributes="0"/>
-              </Group>
-              <EmptySpace max="32767" attributes="0"/>
-          </Group>
-          <Group type="102" alignment="0" attributes="0">
-              <EmptySpace max="32767" attributes="0"/>
-              <Component id="OKButton" min="-2" pref="80" max="-2" attributes="0"/>
-              <EmptySpace max="32767" attributes="0"/>
           </Group>
       </Group>
     </DimensionLayout>
@@ -73,10 +76,7 @@
                               <Component id="imgTypeLabel" min="-2" max="-2" attributes="0"/>
                               <EmptySpace min="-2" pref="25" max="-2" attributes="0"/>
                           </Group>
-                          <Group type="102" alignment="1" attributes="0">
-                              <EmptySpace min="50" pref="50" max="-2" attributes="0"/>
-                              <Component id="imgSectorSizeLabel" min="-2" max="-2" attributes="0"/>
-                          </Group>
+                          <Component id="imgSectorSizeLabel" alignment="1" min="-2" max="-2" attributes="0"/>
                       </Group>
                       <EmptySpace type="unrelated" max="-2" attributes="0"/>
                       <Component id="imgTotalSizeLabel" min="-2" max="-2" attributes="0"/>
@@ -94,8 +94,10 @@
   <SubComponents>
     <Component class="javax.swing.JLabel" name="imageInfoLabel">
       <Properties>
-        <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
-          <Font name="Tahoma" size="18" style="1"/>
+        <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+          <FontInfo relative="true">
+            <Font bold="true" component="imageInfoLabel" property="font" relativeSize="false" size="18"/>
+          </FontInfo>
         </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
           <ResourceString bundle="org/sleuthkit/autopsy/directorytree/Bundle.properties" key="ImageDetailsPanel.imageInfoLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
@@ -104,6 +106,11 @@
     </Component>
     <Component class="javax.swing.JLabel" name="imgNameLabel">
       <Properties>
+        <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+          <FontInfo relative="true">
+            <Font bold="false" component="imgNameLabel" property="font" relativeSize="false" size="11"/>
+          </FontInfo>
+        </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
           <ResourceString bundle="org/sleuthkit/autopsy/directorytree/Bundle.properties" key="ImageDetailsPanel.imgNameLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
@@ -111,6 +118,11 @@
     </Component>
     <Component class="javax.swing.JLabel" name="imgTypeLabel">
       <Properties>
+        <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+          <FontInfo relative="true">
+            <Font bold="false" component="imgTypeLabel" property="font" relativeSize="false" size="11"/>
+          </FontInfo>
+        </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
           <ResourceString bundle="org/sleuthkit/autopsy/directorytree/Bundle.properties" key="ImageDetailsPanel.imgTypeLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
@@ -118,6 +130,11 @@
     </Component>
     <Component class="javax.swing.JLabel" name="imgSectorSizeLabel">
       <Properties>
+        <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+          <FontInfo relative="true">
+            <Font bold="false" component="imgSectorSizeLabel" property="font" relativeSize="false" size="11"/>
+          </FontInfo>
+        </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
           <ResourceString bundle="org/sleuthkit/autopsy/directorytree/Bundle.properties" key="ImageDetailsPanel.imgSectorSizeLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
@@ -125,6 +142,11 @@
     </Component>
     <Component class="javax.swing.JLabel" name="imgNameValue">
       <Properties>
+        <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+          <FontInfo relative="true">
+            <Font bold="false" component="imgNameValue" property="font" relativeSize="false" size="11"/>
+          </FontInfo>
+        </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
           <ResourceString bundle="org/sleuthkit/autopsy/directorytree/Bundle.properties" key="ImageDetailsPanel.imgNameValue.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
@@ -132,6 +154,11 @@
     </Component>
     <Component class="javax.swing.JLabel" name="imgTypeValue">
       <Properties>
+        <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+          <FontInfo relative="true">
+            <Font bold="false" component="imgTypeValue" property="font" relativeSize="false" size="11"/>
+          </FontInfo>
+        </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
           <ResourceString bundle="org/sleuthkit/autopsy/directorytree/Bundle.properties" key="ImageDetailsPanel.imgTypeValue.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
@@ -139,6 +166,11 @@
     </Component>
     <Component class="javax.swing.JLabel" name="imgSectorSizeValue">
       <Properties>
+        <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+          <FontInfo relative="true">
+            <Font bold="false" component="imgSectorSizeValue" property="font" relativeSize="false" size="11"/>
+          </FontInfo>
+        </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
           <ResourceString bundle="org/sleuthkit/autopsy/directorytree/Bundle.properties" key="ImageDetailsPanel.imgSectorSizeValue.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
@@ -146,6 +178,11 @@
     </Component>
     <Component class="javax.swing.JButton" name="OKButton">
       <Properties>
+        <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+          <FontInfo relative="true">
+            <Font bold="false" component="OKButton" property="font" relativeSize="false" size="11"/>
+          </FontInfo>
+        </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
           <ResourceString bundle="org/sleuthkit/autopsy/directorytree/Bundle.properties" key="ImageDetailsPanel.OKButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
@@ -153,6 +190,11 @@
     </Component>
     <Component class="javax.swing.JLabel" name="imgTotalSizeLabel">
       <Properties>
+        <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+          <FontInfo relative="true">
+            <Font bold="false" component="imgTotalSizeLabel" property="font" relativeSize="false" size="11"/>
+          </FontInfo>
+        </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
           <ResourceString bundle="org/sleuthkit/autopsy/directorytree/Bundle.properties" key="ImageDetailsPanel.imgTotalSizeLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
@@ -160,6 +202,11 @@
     </Component>
     <Component class="javax.swing.JLabel" name="imgTotalSizeValue">
       <Properties>
+        <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+          <FontInfo relative="true">
+            <Font bold="false" component="imgTotalSizeValue" property="font" relativeSize="false" size="11"/>
+          </FontInfo>
+        </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
           <ResourceString bundle="org/sleuthkit/autopsy/directorytree/Bundle.properties" key="ImageDetailsPanel.imgTotalSizeValue.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
@@ -167,6 +214,11 @@
     </Component>
     <Component class="javax.swing.JLabel" name="imgHashLabel">
       <Properties>
+        <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+          <FontInfo relative="true">
+            <Font bold="false" component="imgHashLabel" property="font" relativeSize="false" size="11"/>
+          </FontInfo>
+        </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
           <ResourceString bundle="org/sleuthkit/autopsy/directorytree/Bundle.properties" key="ImageDetailsPanel.imgHashLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
@@ -174,6 +226,11 @@
     </Component>
     <Component class="javax.swing.JLabel" name="imgHashValue">
       <Properties>
+        <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+          <FontInfo relative="true">
+            <Font bold="false" component="imgHashValue" property="font" relativeSize="false" size="11"/>
+          </FontInfo>
+        </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
           <ResourceString bundle="org/sleuthkit/autopsy/directorytree/Bundle.properties" key="ImageDetailsPanel.imgHashValue.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
diff --git a/Core/src/org/sleuthkit/autopsy/directorytree/ImageDetailsPanel.java b/Core/src/org/sleuthkit/autopsy/directorytree/ImageDetailsPanel.java
index 3a865b3561..a9f117b6dd 100644
--- a/Core/src/org/sleuthkit/autopsy/directorytree/ImageDetailsPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/directorytree/ImageDetailsPanel.java
@@ -62,29 +62,40 @@ class ImageDetailsPanel extends javax.swing.JPanel {
         imgHashLabel = new javax.swing.JLabel();
         imgHashValue = new javax.swing.JLabel();
 
-        imageInfoLabel.setFont(imageInfoLabel.getFont().deriveFont(Font.BOLD, 18));
+        imageInfoLabel.setFont(imageInfoLabel.getFont().deriveFont(imageInfoLabel.getFont().getStyle() | java.awt.Font.BOLD, 18));
         imageInfoLabel.setText(org.openide.util.NbBundle.getMessage(ImageDetailsPanel.class, "ImageDetailsPanel.imageInfoLabel.text")); // NOI18N
 
+        imgNameLabel.setFont(imgNameLabel.getFont().deriveFont(imgNameLabel.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         imgNameLabel.setText(org.openide.util.NbBundle.getMessage(ImageDetailsPanel.class, "ImageDetailsPanel.imgNameLabel.text")); // NOI18N
 
+        imgTypeLabel.setFont(imgTypeLabel.getFont().deriveFont(imgTypeLabel.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         imgTypeLabel.setText(org.openide.util.NbBundle.getMessage(ImageDetailsPanel.class, "ImageDetailsPanel.imgTypeLabel.text")); // NOI18N
 
+        imgSectorSizeLabel.setFont(imgSectorSizeLabel.getFont().deriveFont(imgSectorSizeLabel.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         imgSectorSizeLabel.setText(org.openide.util.NbBundle.getMessage(ImageDetailsPanel.class, "ImageDetailsPanel.imgSectorSizeLabel.text")); // NOI18N
 
+        imgNameValue.setFont(imgNameValue.getFont().deriveFont(imgNameValue.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         imgNameValue.setText(org.openide.util.NbBundle.getMessage(ImageDetailsPanel.class, "ImageDetailsPanel.imgNameValue.text")); // NOI18N
 
+        imgTypeValue.setFont(imgTypeValue.getFont().deriveFont(imgTypeValue.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         imgTypeValue.setText(org.openide.util.NbBundle.getMessage(ImageDetailsPanel.class, "ImageDetailsPanel.imgTypeValue.text")); // NOI18N
 
+        imgSectorSizeValue.setFont(imgSectorSizeValue.getFont().deriveFont(imgSectorSizeValue.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         imgSectorSizeValue.setText(org.openide.util.NbBundle.getMessage(ImageDetailsPanel.class, "ImageDetailsPanel.imgSectorSizeValue.text")); // NOI18N
 
+        OKButton.setFont(OKButton.getFont().deriveFont(OKButton.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         OKButton.setText(org.openide.util.NbBundle.getMessage(ImageDetailsPanel.class, "ImageDetailsPanel.OKButton.text")); // NOI18N
 
+        imgTotalSizeLabel.setFont(imgTotalSizeLabel.getFont().deriveFont(imgTotalSizeLabel.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         imgTotalSizeLabel.setText(org.openide.util.NbBundle.getMessage(ImageDetailsPanel.class, "ImageDetailsPanel.imgTotalSizeLabel.text")); // NOI18N
 
+        imgTotalSizeValue.setFont(imgTotalSizeValue.getFont().deriveFont(imgTotalSizeValue.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         imgTotalSizeValue.setText(org.openide.util.NbBundle.getMessage(ImageDetailsPanel.class, "ImageDetailsPanel.imgTotalSizeValue.text")); // NOI18N
 
+        imgHashLabel.setFont(imgHashLabel.getFont().deriveFont(imgHashLabel.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         imgHashLabel.setText(org.openide.util.NbBundle.getMessage(ImageDetailsPanel.class, "ImageDetailsPanel.imgHashLabel.text")); // NOI18N
 
+        imgHashValue.setFont(imgHashValue.getFont().deriveFont(imgHashValue.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         imgHashValue.setText(org.openide.util.NbBundle.getMessage(ImageDetailsPanel.class, "ImageDetailsPanel.imgHashValue.text")); // NOI18N
 
         javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
@@ -95,26 +106,27 @@ class ImageDetailsPanel extends javax.swing.JPanel {
                 .addGap(0, 68, Short.MAX_VALUE)
                 .addComponent(imageInfoLabel)
                 .addContainerGap(78, Short.MAX_VALUE))
-            .addGroup(layout.createSequentialGroup()
+            .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
                 .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
                 .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                    .addComponent(imgNameLabel)
-                    .addComponent(imgTypeLabel)
-                    .addComponent(imgSectorSizeLabel)
-                    .addComponent(imgTotalSizeLabel)
-                    .addComponent(imgHashLabel))
-                .addGap(18, 18, 18)
-                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                    .addComponent(imgNameValue)
-                    .addComponent(imgTypeValue)
-                    .addComponent(imgSectorSizeValue)
-                    .addComponent(imgTotalSizeValue)
-                    .addComponent(imgHashValue))
-                .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
-            .addGroup(layout.createSequentialGroup()
-                .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-                .addComponent(OKButton, javax.swing.GroupLayout.PREFERRED_SIZE, 80, javax.swing.GroupLayout.PREFERRED_SIZE)
-                .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+                    .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
+                        .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                            .addComponent(imgNameLabel)
+                            .addComponent(imgTypeLabel)
+                            .addComponent(imgSectorSizeLabel)
+                            .addComponent(imgTotalSizeLabel)
+                            .addComponent(imgHashLabel))
+                        .addGap(18, 18, 18)
+                        .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                            .addComponent(imgNameValue)
+                            .addComponent(imgTypeValue)
+                            .addComponent(imgSectorSizeValue)
+                            .addComponent(imgTotalSizeValue)
+                            .addComponent(imgHashValue))
+                        .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+                    .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
+                        .addComponent(OKButton, javax.swing.GroupLayout.PREFERRED_SIZE, 80, javax.swing.GroupLayout.PREFERRED_SIZE)
+                        .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))))
         );
         layout.setVerticalGroup(
             layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
@@ -140,9 +152,7 @@ class ImageDetailsPanel extends javax.swing.JPanel {
                                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
                                 .addComponent(imgTypeLabel)
                                 .addGap(25, 25, 25))
-                            .addGroup(layout.createSequentialGroup()
-                                .addGap(50, 50, 50)
-                                .addComponent(imgSectorSizeLabel)))
+                            .addComponent(imgSectorSizeLabel))
                         .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
                         .addComponent(imgTotalSizeLabel)
                         .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
diff --git a/Core/src/org/sleuthkit/autopsy/directorytree/VolumeDetailsPanel.form b/Core/src/org/sleuthkit/autopsy/directorytree/VolumeDetailsPanel.form
index 5c73074beb..5f4e933d1c 100644
--- a/Core/src/org/sleuthkit/autopsy/directorytree/VolumeDetailsPanel.form
+++ b/Core/src/org/sleuthkit/autopsy/directorytree/VolumeDetailsPanel.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">
   <AuxValues>
@@ -121,6 +121,11 @@
       <SubComponents>
         <Component class="javax.swing.JLabel" name="flagsValue">
           <Properties>
+            <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+              <FontInfo relative="true">
+                <Font bold="false" component="flagsValue" property="font" relativeSize="false" size="11"/>
+              </FontInfo>
+            </Property>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
               <ResourceString bundle="org/sleuthkit/autopsy/directorytree/Bundle.properties" key="VolumeDetailsPanel.flagsValue.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
             </Property>
@@ -128,6 +133,11 @@
         </Component>
         <Component class="javax.swing.JLabel" name="descValue">
           <Properties>
+            <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+              <FontInfo relative="true">
+                <Font bold="false" component="descValue" property="font" relativeSize="false" size="11"/>
+              </FontInfo>
+            </Property>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
               <ResourceString bundle="org/sleuthkit/autopsy/directorytree/Bundle.properties" key="VolumeDetailsPanel.descValue.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
             </Property>
@@ -135,6 +145,11 @@
         </Component>
         <Component class="javax.swing.JLabel" name="lengthValue">
           <Properties>
+            <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+              <FontInfo relative="true">
+                <Font bold="false" component="lengthValue" property="font" relativeSize="false" size="11"/>
+              </FontInfo>
+            </Property>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
               <ResourceString bundle="org/sleuthkit/autopsy/directorytree/Bundle.properties" key="VolumeDetailsPanel.lengthValue.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
             </Property>
@@ -142,6 +157,11 @@
         </Component>
         <Component class="javax.swing.JLabel" name="startValue">
           <Properties>
+            <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+              <FontInfo relative="true">
+                <Font bold="false" component="startValue" property="font" relativeSize="false" size="11"/>
+              </FontInfo>
+            </Property>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
               <ResourceString bundle="org/sleuthkit/autopsy/directorytree/Bundle.properties" key="VolumeDetailsPanel.startValue.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
             </Property>
@@ -149,6 +169,11 @@
         </Component>
         <Component class="javax.swing.JLabel" name="startLabel">
           <Properties>
+            <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+              <FontInfo relative="true">
+                <Font bold="false" component="startLabel" property="font" relativeSize="false" size="11"/>
+              </FontInfo>
+            </Property>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
               <ResourceString bundle="org/sleuthkit/autopsy/directorytree/Bundle.properties" key="VolumeDetailsPanel.startLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
             </Property>
@@ -156,6 +181,11 @@
         </Component>
         <Component class="javax.swing.JLabel" name="lengthLabel">
           <Properties>
+            <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+              <FontInfo relative="true">
+                <Font bold="false" component="lengthLabel" property="font" relativeSize="false" size="11"/>
+              </FontInfo>
+            </Property>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
               <ResourceString bundle="org/sleuthkit/autopsy/directorytree/Bundle.properties" key="VolumeDetailsPanel.lengthLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
             </Property>
@@ -163,8 +193,10 @@
         </Component>
         <Component class="javax.swing.JLabel" name="jLabel1">
           <Properties>
-            <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
-              <Font name="Tahoma" size="18" style="1"/>
+            <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+              <FontInfo relative="true">
+                <Font bold="true" component="jLabel1" property="font" relativeSize="false" size="18"/>
+              </FontInfo>
             </Property>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
               <ResourceString bundle="org/sleuthkit/autopsy/directorytree/Bundle.properties" key="VolumeDetailsPanel.jLabel1.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
@@ -173,6 +205,11 @@
         </Component>
         <Component class="javax.swing.JLabel" name="volumeIDLabel">
           <Properties>
+            <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+              <FontInfo relative="true">
+                <Font bold="false" component="volumeIDLabel" property="font" relativeSize="false" size="11"/>
+              </FontInfo>
+            </Property>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
               <ResourceString bundle="org/sleuthkit/autopsy/directorytree/Bundle.properties" key="VolumeDetailsPanel.volumeIDLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
             </Property>
@@ -183,6 +220,11 @@
         </Component>
         <Component class="javax.swing.JLabel" name="volumeIDValue">
           <Properties>
+            <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+              <FontInfo relative="true">
+                <Font bold="false" component="volumeIDValue" property="font" relativeSize="false" size="11"/>
+              </FontInfo>
+            </Property>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
               <ResourceString bundle="org/sleuthkit/autopsy/directorytree/Bundle.properties" key="VolumeDetailsPanel.volumeIDValue.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
             </Property>
@@ -190,6 +232,11 @@
         </Component>
         <Component class="javax.swing.JLabel" name="descLabel">
           <Properties>
+            <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+              <FontInfo relative="true">
+                <Font bold="false" component="descLabel" property="font" relativeSize="false" size="11"/>
+              </FontInfo>
+            </Property>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
               <ResourceString bundle="org/sleuthkit/autopsy/directorytree/Bundle.properties" key="VolumeDetailsPanel.descLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
             </Property>
@@ -197,6 +244,11 @@
         </Component>
         <Component class="javax.swing.JLabel" name="flagsLabel">
           <Properties>
+            <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+              <FontInfo relative="true">
+                <Font bold="false" component="flagsLabel" property="font" relativeSize="false" size="11"/>
+              </FontInfo>
+            </Property>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
               <ResourceString bundle="org/sleuthkit/autopsy/directorytree/Bundle.properties" key="VolumeDetailsPanel.flagsLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
             </Property>
@@ -206,6 +258,11 @@
     </Container>
     <Component class="javax.swing.JButton" name="OKButton">
       <Properties>
+        <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+          <FontInfo relative="true">
+            <Font bold="false" component="OKButton" property="font" relativeSize="false" size="11"/>
+          </FontInfo>
+        </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
           <ResourceString bundle="org/sleuthkit/autopsy/directorytree/Bundle.properties" key="VolumeDetailsPanel.OKButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
diff --git a/Core/src/org/sleuthkit/autopsy/directorytree/VolumeDetailsPanel.java b/Core/src/org/sleuthkit/autopsy/directorytree/VolumeDetailsPanel.java
index 12cdb7175e..44359f92c4 100644
--- a/Core/src/org/sleuthkit/autopsy/directorytree/VolumeDetailsPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/directorytree/VolumeDetailsPanel.java
@@ -56,27 +56,37 @@ class VolumeDetailsPanel extends javax.swing.JPanel {
         flagsLabel = new javax.swing.JLabel();
         OKButton = new javax.swing.JButton();
 
+        flagsValue.setFont(flagsValue.getFont().deriveFont(flagsValue.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         flagsValue.setText(org.openide.util.NbBundle.getMessage(VolumeDetailsPanel.class, "VolumeDetailsPanel.flagsValue.text")); // NOI18N
 
+        descValue.setFont(descValue.getFont().deriveFont(descValue.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         descValue.setText(org.openide.util.NbBundle.getMessage(VolumeDetailsPanel.class, "VolumeDetailsPanel.descValue.text")); // NOI18N
 
+        lengthValue.setFont(lengthValue.getFont().deriveFont(lengthValue.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         lengthValue.setText(org.openide.util.NbBundle.getMessage(VolumeDetailsPanel.class, "VolumeDetailsPanel.lengthValue.text")); // NOI18N
 
+        startValue.setFont(startValue.getFont().deriveFont(startValue.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         startValue.setText(org.openide.util.NbBundle.getMessage(VolumeDetailsPanel.class, "VolumeDetailsPanel.startValue.text")); // NOI18N
 
+        startLabel.setFont(startLabel.getFont().deriveFont(startLabel.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         startLabel.setText(org.openide.util.NbBundle.getMessage(VolumeDetailsPanel.class, "VolumeDetailsPanel.startLabel.text")); // NOI18N
 
+        lengthLabel.setFont(lengthLabel.getFont().deriveFont(lengthLabel.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         lengthLabel.setText(org.openide.util.NbBundle.getMessage(VolumeDetailsPanel.class, "VolumeDetailsPanel.lengthLabel.text")); // NOI18N
 
-        jLabel1.setFont(jLabel1.getFont().deriveFont(Font.BOLD, 18));
+        jLabel1.setFont(jLabel1.getFont().deriveFont(jLabel1.getFont().getStyle() | java.awt.Font.BOLD, 18));
         jLabel1.setText(org.openide.util.NbBundle.getMessage(VolumeDetailsPanel.class, "VolumeDetailsPanel.jLabel1.text")); // NOI18N
 
+        volumeIDLabel.setFont(volumeIDLabel.getFont().deriveFont(volumeIDLabel.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         volumeIDLabel.setText(org.openide.util.NbBundle.getMessage(VolumeDetailsPanel.class, "VolumeDetailsPanel.volumeIDLabel.text")); // NOI18N
 
+        volumeIDValue.setFont(volumeIDValue.getFont().deriveFont(volumeIDValue.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         volumeIDValue.setText(org.openide.util.NbBundle.getMessage(VolumeDetailsPanel.class, "VolumeDetailsPanel.volumeIDValue.text")); // NOI18N
 
+        descLabel.setFont(descLabel.getFont().deriveFont(descLabel.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         descLabel.setText(org.openide.util.NbBundle.getMessage(VolumeDetailsPanel.class, "VolumeDetailsPanel.descLabel.text")); // NOI18N
 
+        flagsLabel.setFont(flagsLabel.getFont().deriveFont(flagsLabel.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         flagsLabel.setText(org.openide.util.NbBundle.getMessage(VolumeDetailsPanel.class, "VolumeDetailsPanel.flagsLabel.text")); // NOI18N
 
         javax.swing.GroupLayout jPanel1Layout = new javax.swing.GroupLayout(jPanel1);
@@ -136,6 +146,7 @@ class VolumeDetailsPanel extends javax.swing.JPanel {
                 .addContainerGap(15, Short.MAX_VALUE))
         );
 
+        OKButton.setFont(OKButton.getFont().deriveFont(OKButton.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         OKButton.setText(org.openide.util.NbBundle.getMessage(VolumeDetailsPanel.class, "VolumeDetailsPanel.OKButton.text")); // NOI18N
 
         javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);

From 01faca0bbedf642e76a05226487b7ad98c291b37 Mon Sep 17 00:00:00 2001
From: Nick Davis <nick.davis@narfindustries.com>
Date: Tue, 2 Feb 2016 20:55:49 -0500
Subject: [PATCH 21/68] converted fonts to derivative

---
 .../autopsy/filesearch/NameSearchPanel.form    | 18 +++++++++++++++---
 .../autopsy/filesearch/NameSearchPanel.java    |  4 +++-
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/filesearch/NameSearchPanel.form b/Core/src/org/sleuthkit/autopsy/filesearch/NameSearchPanel.form
index 0f88bedac3..e28dd6d357 100644
--- a/Core/src/org/sleuthkit/autopsy/filesearch/NameSearchPanel.form
+++ b/Core/src/org/sleuthkit/autopsy/filesearch/NameSearchPanel.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>
@@ -86,6 +86,11 @@
   <SubComponents>
     <Component class="javax.swing.JCheckBox" name="nameCheckBox">
       <Properties>
+        <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+          <FontInfo relative="true">
+            <Font bold="false" component="nameCheckBox" property="font" relativeSize="false" size="11"/>
+          </FontInfo>
+        </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
           <ResourceString bundle="org/sleuthkit/autopsy/filesearch/Bundle.properties" key="NameSearchPanel.nameCheckBox.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
@@ -93,6 +98,11 @@
     </Component>
     <Component class="javax.swing.JTextField" name="searchTextField">
       <Properties>
+        <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+          <FontInfo relative="true">
+            <Font bold="false" component="searchTextField" property="font" relativeSize="false" size="11"/>
+          </FontInfo>
+        </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
           <ResourceString bundle="org/sleuthkit/autopsy/filesearch/Bundle.properties" key="NameSearchPanel.searchTextField.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
@@ -103,8 +113,10 @@
     </Component>
     <Component class="javax.swing.JLabel" name="noteNameLabel">
       <Properties>
-        <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
-          <Font name="Tahoma" size="10" style="0"/>
+        <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+          <FontInfo relative="true">
+            <Font bold="false" component="noteNameLabel" property="font" relativeSize="false" size="10"/>
+          </FontInfo>
         </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
           <ResourceString bundle="org/sleuthkit/autopsy/filesearch/Bundle.properties" key="NameSearchPanel.noteNameLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
diff --git a/Core/src/org/sleuthkit/autopsy/filesearch/NameSearchPanel.java b/Core/src/org/sleuthkit/autopsy/filesearch/NameSearchPanel.java
index 3fa0fcc687..7f59ec3e3b 100644
--- a/Core/src/org/sleuthkit/autopsy/filesearch/NameSearchPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/filesearch/NameSearchPanel.java
@@ -108,8 +108,10 @@ class NameSearchPanel extends javax.swing.JPanel {
         selectAllMenuItem.setText(org.openide.util.NbBundle.getMessage(NameSearchPanel.class, "NameSearchPanel.selectAllMenuItem.text")); // NOI18N
         rightClickMenu.add(selectAllMenuItem);
 
+        nameCheckBox.setFont(nameCheckBox.getFont().deriveFont(nameCheckBox.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         nameCheckBox.setText(org.openide.util.NbBundle.getMessage(NameSearchPanel.class, "NameSearchPanel.nameCheckBox.text")); // NOI18N
 
+        searchTextField.setFont(searchTextField.getFont().deriveFont(searchTextField.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         searchTextField.setText(org.openide.util.NbBundle.getMessage(NameSearchPanel.class, "NameSearchPanel.searchTextField.text")); // NOI18N
         searchTextField.addMouseListener(new java.awt.event.MouseAdapter() {
             public void mouseClicked(java.awt.event.MouseEvent evt) {
@@ -117,7 +119,7 @@ class NameSearchPanel extends javax.swing.JPanel {
             }
         });
 
-        noteNameLabel.setFont(noteNameLabel.getFont().deriveFont(Font.PLAIN, 10));
+        noteNameLabel.setFont(noteNameLabel.getFont().deriveFont(noteNameLabel.getFont().getStyle() & ~java.awt.Font.BOLD, 10));
         noteNameLabel.setText(org.openide.util.NbBundle.getMessage(NameSearchPanel.class, "NameSearchPanel.noteNameLabel.text")); // NOI18N
 
         javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);

From 5c3cbb622215c4a08c7dff8a4b76428a17f18e08 Mon Sep 17 00:00:00 2001
From: Oliver Spohngellert <oliver@basistech.net>
Date: Wed, 3 Feb 2016 10:19:53 -0500
Subject: [PATCH 22/68] Fixed tagged results bug

---
 .../sleuthkit/autopsy/report/ReportVisualPanel2.java   | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel2.java b/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel2.java
index 68a167b0bc..ef882bc01c 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel2.java
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel2.java
@@ -96,10 +96,12 @@ final class ReportVisualPanel2 extends JPanel {
             public void mousePressed(MouseEvent evt) {
 
                 int index = tagsList.locationToIndex(evt.getPoint());
-                String value = tagsModel.getElementAt(index);
-                tagStates.put(value, !tagStates.get(value));
-                tagsList.repaint();
-                updateFinishButton();
+                if (index < tagsModel.getSize() && index >= 0) {
+                    String value = tagsModel.getElementAt(index);
+                    tagStates.put(value, !tagStates.get(value));
+                    tagsList.repaint();
+                    updateFinishButton();
+                }
             }
         });
     }

From b380430532fd3bcbb88cc911fca639844bc1540d Mon Sep 17 00:00:00 2001
From: jmillman <jmillman@basistech.com>
Date: Tue, 2 Feb 2016 13:07:11 -0500
Subject: [PATCH 23/68] restrict double click action on SlideShowView to non
 control areas

cleanup, fix selection
---
 .../gui/drawableviews/DrawableTile.java       | 37 ++++++++----
 .../gui/drawableviews/DrawableTileBase.java   | 46 +++++----------
 .../gui/drawableviews/GroupPane.java          |  2 -
 .../gui/drawableviews/SlideShowView.fxml      | 20 ++++---
 .../gui/drawableviews/SlideShowView.java      | 56 ++++++++++++-------
 5 files changed, 85 insertions(+), 76 deletions(-)

diff --git a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/drawableviews/DrawableTile.java b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/drawableviews/DrawableTile.java
index badfc20b92..528f5d9bab 100644
--- a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/drawableviews/DrawableTile.java
+++ b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/drawableviews/DrawableTile.java
@@ -1,7 +1,7 @@
 /*
  * Autopsy Forensic Browser
  *
- * Copyright 2013-15 Basis Technology Corp.
+ * Copyright 2013-16 Basis Technology Corp.
  * Contact: carrier <at> sleuthkit <dot> org
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -19,7 +19,6 @@
 package org.sleuthkit.autopsy.imagegallery.gui.drawableviews;
 
 import java.util.Objects;
-import java.util.logging.Level;
 import javafx.application.Platform;
 import javafx.beans.value.ChangeListener;
 import javafx.beans.value.WeakChangeListener;
@@ -29,6 +28,8 @@ import javafx.scene.CacheHint;
 import javafx.scene.control.Control;
 import javafx.scene.effect.DropShadow;
 import javafx.scene.image.Image;
+import javafx.scene.input.MouseButton;
+import javafx.scene.input.MouseEvent;
 import javafx.scene.paint.Color;
 import org.sleuthkit.autopsy.coreutils.Logger;
 import org.sleuthkit.autopsy.imagegallery.FXMLConstructor;
@@ -51,11 +52,7 @@ public class DrawableTile extends DrawableTileBase {
 
     private static final Logger LOGGER = Logger.getLogger(DrawableTile.class.getName());
     private final ChangeListener<? super Long> lastSelectionListener = (observable, oldValue, newValue) -> {
-        try {
-            setEffect(Objects.equals(newValue, getFileID()) ? LAST_SELECTED_EFFECT : null);
-        } catch (java.lang.IllegalStateException ex) {
-            Logger.getLogger(DrawableTile.class.getName()).log(Level.WARNING, "Error displaying tile"); //NON-NLS
-        }
+        updateSelectionState();
     };
 
     @FXML
@@ -73,11 +70,28 @@ public class DrawableTile extends DrawableTileBase {
         imageView.fitWidthProperty().bind(Toolbar.getDefault(getController()).sizeSliderValue());
 
         selectionModel.lastSelectedProperty().addListener(new WeakChangeListener<>(lastSelectionListener));
+
+        //set up mouse listener
+        addEventHandler(MouseEvent.MOUSE_CLICKED, clickEvent -> {
+            if (clickEvent.getButton() == MouseButton.PRIMARY) {
+                getFile().ifPresent(file -> {
+                    final long fileID = file.getId();
+                    if (clickEvent.isControlDown()) {
+                        selectionModel.toggleSelection(fileID);
+                    } else {
+                        getGroupPane().makeSelection(clickEvent.isShiftDown(), fileID);
+                    }
+                    if (clickEvent.getClickCount() > 1) {
+                        getGroupPane().activateSlideShowViewer(fileID);
+                    }
+                });
+                clickEvent.consume();
+            }
+        });
     }
 
     public DrawableTile(GroupPane gp, ImageGalleryController controller) {
         super(gp, controller);
-
         FXMLConstructor.construct(this, "DrawableTile.fxml"); //NON-NLS
     }
 
@@ -87,9 +101,9 @@ public class DrawableTile extends DrawableTileBase {
     @Override
     protected void updateSelectionState() {
         super.updateSelectionState();
-        final boolean lastSelected = Objects.equals(selectionModel.lastSelectedProperty().get(), getFileID());
-        Platform.runLater(() -> {
-            setEffect(lastSelected ? LAST_SELECTED_EFFECT : null);
+        getFileID().ifPresent(fileID -> {
+            final boolean lastSelected = Objects.equals(selectionModel.lastSelectedProperty().get(), fileID);
+            Platform.runLater(() -> setEffect(lastSelected ? LAST_SELECTED_EFFECT : null));
         });
     }
 
@@ -102,5 +116,4 @@ public class DrawableTile extends DrawableTileBase {
     protected String getTextForLabel() {
         return getFile().map(AbstractContent::getName).orElse("");
     }
-
 }
diff --git a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/drawableviews/DrawableTileBase.java b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/drawableviews/DrawableTileBase.java
index 3b16fa6b77..b25b76f7ff 100644
--- a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/drawableviews/DrawableTileBase.java
+++ b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/drawableviews/DrawableTileBase.java
@@ -1,8 +1,7 @@
-
 /*
  * Autopsy Forensic Browser
  *
- * Copyright 2013-15 Basis Technology Corp.
+ * Copyright 2013-16 Basis Technology Corp.
  * Contact: carrier <at> sleuthkit <dot> org
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -26,9 +25,7 @@ import java.util.Optional;
 import java.util.logging.Level;
 import javafx.application.Platform;
 import javafx.beans.InvalidationListener;
-import javafx.beans.Observable;
 import javafx.beans.WeakInvalidationListener;
-import javafx.event.ActionEvent;
 import javafx.event.EventHandler;
 import javafx.fxml.FXML;
 import javafx.scene.control.ContextMenu;
@@ -73,7 +70,6 @@ import org.sleuthkit.autopsy.imagegallery.actions.OpenExternalViewerAction;
 import org.sleuthkit.autopsy.imagegallery.actions.SwingMenuItemAdapter;
 import org.sleuthkit.autopsy.imagegallery.datamodel.DrawableAttribute;
 import org.sleuthkit.autopsy.imagegallery.datamodel.DrawableFile;
-import org.sleuthkit.autopsy.imagegallery.datamodel.grouping.GroupViewMode;
 import org.sleuthkit.datamodel.ContentTag;
 import org.sleuthkit.datamodel.TagName;
 import org.sleuthkit.datamodel.TskCoreException;
@@ -154,29 +150,14 @@ public abstract class DrawableTileBase extends DrawableUIBase {
         selectionModel.getSelected().addListener(new WeakInvalidationListener(selectionListener));
 
         //set up mouse listener
-        //TODO: split this between DrawableTile and SingleDrawableViewBase
-        addEventFilter(MouseEvent.MOUSE_CLICKED, new EventHandler<MouseEvent>() {
+        addEventHandler(MouseEvent.MOUSE_CLICKED, new EventHandler<MouseEvent>() {
 
             @Override
             public void handle(MouseEvent t) {
                 getFile().ifPresent(file -> {
                     final long fileID = file.getId();
                     switch (t.getButton()) {
-                        case PRIMARY:
-                            if (t.getClickCount() == 1) {
-                                if (t.isControlDown()) {
-                                    selectionModel.toggleSelection(fileID);
-                                } else {
-                                    groupPane.makeSelection(t.isShiftDown(), fileID);
-                                }
-                            } else if (t.getClickCount() > 1) {
-                                if (groupPane.getGroupViewMode() == GroupViewMode.TILE) {
-                                    groupPane.activateSlideShowViewer(fileID);
-                                } else {
-                                    groupPane.activateTileViewer();
-                                }
-                            }
-                            break;
+
                         case SECONDARY:
                             if (t.getClickCount() == 1) {
                                 if (selectionModel.isSelected(fileID) == false) {
@@ -195,7 +176,6 @@ public abstract class DrawableTileBase extends DrawableUIBase {
                             break;
                     }
                 });
-
                 t.consume();
             }
 
@@ -206,8 +186,9 @@ public abstract class DrawableTileBase extends DrawableUIBase {
 
                 menuItems.add(new AddDrawableTagAction(getController()).getPopupMenu());
 
+
                 final MenuItem extractMenuItem = new MenuItem(Bundle.DrawableTileBase_menuItem_extractFiles());
-                extractMenuItem.setOnAction((ActionEvent t) -> {
+                extractMenuItem.setOnAction(actionEvent -> {
                     SwingUtilities.invokeLater(() -> {
                         TopComponent etc = WindowManager.getDefault().findTopComponent(ImageGalleryTopComponent.PREFERRED_ID);
                         ExtractAction.getInstance().actionPerformed(new java.awt.event.ActionEvent(etc, 0, null));
@@ -215,8 +196,9 @@ public abstract class DrawableTileBase extends DrawableUIBase {
                 });
                 menuItems.add(extractMenuItem);
 
+
                 MenuItem contentViewer = new MenuItem(Bundle.DrawableTileBase_menuItem_showContentViewer());
-                contentViewer.setOnAction((ActionEvent t) -> {
+                contentViewer.setOnAction(actionEvent -> {
                     SwingUtilities.invokeLater(() -> {
                         new NewWindowViewAction(Bundle.DrawableTileBase_menuItem_showContentViewer(), new FileNode(file.getAbstractFile())).actionPerformed(null);
                     });
@@ -246,7 +228,7 @@ public abstract class DrawableTileBase extends DrawableUIBase {
             }
         });
     }
-    private final InvalidationListener selectionListener = (Observable observable) -> updateSelectionState();
+    private final InvalidationListener selectionListener = observable -> updateSelectionState();
 
     GroupPane getGroupPane() {
         return groupPane;
@@ -255,7 +237,7 @@ public abstract class DrawableTileBase extends DrawableUIBase {
     protected abstract String getTextForLabel();
 
     protected void initialize() {
-        followUpToggle.setOnAction((ActionEvent event) -> {
+        followUpToggle.setOnAction(actionEvent -> {
             getFile().ifPresent(file -> {
                 if (followUpToggle.isSelected() == true) {
                     try {
@@ -265,7 +247,7 @@ public abstract class DrawableTileBase extends DrawableUIBase {
                         LOGGER.log(Level.SEVERE, "Failed to add Follow Up tag.  Could not load TagName.", ex); //NON-NLS
                     }
                 } else {
-                    new DeleteFollowUpTagAction(getController(), file).handle(event);
+                    new DeleteFollowUpTagAction(getController(), file).handle(actionEvent);
                 }
             });
         });
@@ -339,8 +321,8 @@ public abstract class DrawableTileBase extends DrawableUIBase {
      * DrawableView
      */
     protected void updateSelectionState() {
-        getFile().ifPresent(file -> {
-            final boolean selected = selectionModel.isSelected(file.getId());
+        getFileID().ifPresent(fileID -> {
+            final boolean selected = selectionModel.isSelected(fileID);
             Platform.runLater(() -> setBorder(selected ? SELECTED_BORDER : UNSELECTED_BORDER));
         });
     }
@@ -353,7 +335,7 @@ public abstract class DrawableTileBase extends DrawableUIBase {
     @Subscribe
     @Override
     public void handleTagAdded(ContentTagAddedEvent evt) {
-        getFileID().ifPresent((fileID) -> {
+        getFileID().ifPresent(fileID -> {
             try {
                 final TagName followUpTagName = getController().getTagsManager().getFollowUpTagName();
                 final ContentTag addedTag = evt.getAddedTag();
@@ -373,7 +355,7 @@ public abstract class DrawableTileBase extends DrawableUIBase {
     @Subscribe
     @Override
     public void handleTagDeleted(ContentTagDeletedEvent evt) {
-        getFileID().ifPresent((fileID) -> {
+        getFileID().ifPresent(fileID -> {
             try {
                 final TagName followUpTagName = getController().getTagsManager().getFollowUpTagName();
                 final ContentTagDeletedEvent.DeletedContentTagInfo deletedTagInfo = evt.getDeletedTagInfo();
diff --git a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/drawableviews/GroupPane.java b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/drawableviews/GroupPane.java
index 965736ece8..fb70931898 100644
--- a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/drawableviews/GroupPane.java
+++ b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/drawableviews/GroupPane.java
@@ -560,7 +560,6 @@ public class GroupPane extends BorderPane {
                                 contextMenu.hide();
                             }
                         }
-                        t.consume();
                         break;
                     case SECONDARY:
                         if (t.getClickCount() == 1) {
@@ -574,7 +573,6 @@ public class GroupPane extends BorderPane {
                             contextMenu.hide();
                             contextMenu.show(GroupPane.this, t.getScreenX(), t.getScreenY());
                         }
-                        t.consume();
                         break;
                 }
             }
diff --git a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/drawableviews/SlideShowView.fxml b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/drawableviews/SlideShowView.fxml
index d7a631854e..30ec0397c6 100644
--- a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/drawableviews/SlideShowView.fxml
+++ b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/drawableviews/SlideShowView.fxml
@@ -1,14 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import java.lang.*?>
-<?import java.net.*?>
-<?import javafx.geometry.*?>
-<?import javafx.scene.control.*?>
-<?import javafx.scene.image.*?>
-<?import javafx.scene.layout.*?>
-<?import org.controlsfx.control.*?>
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.ToggleButton?>
+<?import javafx.scene.image.Image?>
+<?import javafx.scene.image.ImageView?>
+<?import javafx.scene.layout.AnchorPane?>
+<?import javafx.scene.layout.BorderPane?>
+<?import javafx.scene.layout.HBox?>
 
-<fx:root type="AnchorPane" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1">
+<fx:root type="AnchorPane" xmlns="http://javafx.com/javafx/8.0.65" xmlns:fx="http://javafx.com/fxml/1">
     <children>
         <HBox AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
             <children>
@@ -27,7 +29,7 @@
                 </HBox>
                 <BorderPane fx:id="internalBorderPane" maxWidth="-1.0" prefHeight="-1.0" prefWidth="-1.0" BorderPane.alignment="CENTER" HBox.hgrow="ALWAYS">
                     <center>
-                        <AnchorPane maxHeight="-1.0" maxWidth="-1.0" minHeight="-Infinity" minWidth="-Infinity" opacity="1.0" prefHeight="-1.0" prefWidth="-1.0" style="-fx-border-width: 1; -fx-border-color: darkgray; -fx-border-radius: 2; -fx-background-color: linear-gradient(to bottom, derive(-fx-base,-30%), derive(-fx-base,-60%)),        linear-gradient(to bottom, derive(-fx-base,65%) 2%, derive(-fx-base,-20%) 95%); -fx-background-radius: 2;" BorderPane.alignment="CENTER">
+                        <AnchorPane fx:id="innerPane" maxHeight="-1.0" maxWidth="-1.0" minHeight="-Infinity" minWidth="-Infinity" opacity="1.0" prefHeight="-1.0" prefWidth="-1.0" style="-fx-border-width: 1; -fx-border-color: darkgray; -fx-border-radius: 2; -fx-background-color: linear-gradient(to bottom, derive(-fx-base,-30%), derive(-fx-base,-60%)),        linear-gradient(to bottom, derive(-fx-base,65%) 2%, derive(-fx-base,-20%) 95%); -fx-background-radius: 2;" BorderPane.alignment="CENTER">
                             <children>
                                 <BorderPane maxHeight="-1.0" maxWidth="-1.0" minHeight="-Infinity" minWidth="-Infinity" prefHeight="-1.0" prefWidth="-1.0" snapToPixel="true" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
                                     <bottom>
diff --git a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/drawableviews/SlideShowView.java b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/drawableviews/SlideShowView.java
index 1818f65521..a3aef0cca3 100644
--- a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/drawableviews/SlideShowView.java
+++ b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/drawableviews/SlideShowView.java
@@ -1,7 +1,7 @@
 /*
  * Autopsy Forensic Browser
  *
- * Copyright 2013-15 Basis Technology Corp.
+ * Copyright 2013-16 Basis Technology Corp.
  * Contact: carrier <at> sleuthkit <dot> org
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -27,7 +27,6 @@ import javafx.application.Platform;
 import javafx.beans.Observable;
 import javafx.collections.ObservableList;
 import javafx.concurrent.Task;
-import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
 import javafx.scene.Node;
 import javafx.scene.control.Button;
@@ -37,7 +36,10 @@ import javafx.scene.image.Image;
 import static javafx.scene.input.KeyCode.LEFT;
 import static javafx.scene.input.KeyCode.RIGHT;
 import javafx.scene.input.KeyEvent;
+import javafx.scene.input.MouseButton;
+import javafx.scene.input.MouseEvent;
 import javafx.scene.layout.BorderPane;
+import javafx.scene.layout.Pane;
 import javafx.scene.media.Media;
 import javafx.scene.media.MediaException;
 import javafx.scene.media.MediaPlayer;
@@ -54,6 +56,7 @@ import org.sleuthkit.autopsy.imagegallery.datamodel.VideoFile;
 import org.sleuthkit.autopsy.imagegallery.gui.VideoPlayer;
 import static org.sleuthkit.autopsy.imagegallery.gui.drawableviews.DrawableUIBase.exec;
 import static org.sleuthkit.autopsy.imagegallery.gui.drawableviews.DrawableView.CAT_BORDER_WIDTH;
+import org.sleuthkit.datamodel.AbstractContent;
 
 /**
  * Displays the files of a group one at a time. Designed to be embedded in a
@@ -72,6 +75,8 @@ public class SlideShowView extends DrawableTileBase {
 
     @FXML
     private BorderPane footer;
+    @FXML
+    private Pane innerPane;
 
     private volatile MediaLoadTask mediaTask;
 
@@ -90,24 +95,33 @@ public class SlideShowView extends DrawableTileBase {
         imageView.fitWidthProperty().bind(imageBorder.widthProperty().subtract(CAT_BORDER_WIDTH * 2));
         imageView.fitHeightProperty().bind(heightProperty().subtract(CAT_BORDER_WIDTH * 4).subtract(footer.heightProperty()));
 
-        leftButton.setOnAction((ActionEvent t) -> {
-            cycleSlideShowImage(-1);
-        });
-        rightButton.setOnAction((ActionEvent t) -> {
-            cycleSlideShowImage(1);
+        leftButton.setOnAction(actionEvent -> cycleSlideShowImage(-1));
+        rightButton.setOnAction(sctionEvent -> cycleSlideShowImage(1));
+
+        innerPane.addEventHandler(MouseEvent.MOUSE_CLICKED, clickEvent -> {
+            if (clickEvent.getButton() == MouseButton.PRIMARY) {
+                getFile().ifPresent(file -> {
+                    final long fileID = file.getId();
+                    getGroupPane().makeSelection(false, fileID);
+                    if (clickEvent.getClickCount() > 1) {
+                        getGroupPane().activateTileViewer();
+                    }
+                });
+                clickEvent.consume();
+            }
         });
 
         //set up key listener equivalents of buttons
-        addEventFilter(KeyEvent.KEY_PRESSED, (KeyEvent t) -> {
-            if (t.getEventType() == KeyEvent.KEY_PRESSED) {
-                switch (t.getCode()) {
+        addEventFilter(KeyEvent.KEY_PRESSED, keyEvent -> {
+            if (keyEvent.getEventType() == KeyEvent.KEY_PRESSED) {
+                switch (keyEvent.getCode()) {
                     case LEFT:
                         cycleSlideShowImage(-1);
-                        t.consume();
+                        keyEvent.consume();
                         break;
                     case RIGHT:
                         cycleSlideShowImage(1);
-                        t.consume();
+                        keyEvent.consume();
                         break;
                 }
             }
@@ -115,12 +129,11 @@ public class SlideShowView extends DrawableTileBase {
 
         syncButtonVisibility();
 
-        getGroupPane().grouping().addListener((Observable observable) -> {
+        getGroupPane().grouping().addListener(observable -> {
             syncButtonVisibility();
             if (getGroupPane().getGroup() != null) {
-                getGroupPane().getGroup().getFileIDs().addListener((Observable observable1) -> {
-                    syncButtonVisibility();
-                });
+                getGroupPane().getGroup().getFileIDs().addListener((Observable observable1) ->
+                        syncButtonVisibility());
             }
         });
     }
@@ -252,7 +265,7 @@ public class SlideShowView extends DrawableTileBase {
      */
     @Override
     protected String getTextForLabel() {
-        return getFile().map(file -> file.getName()).orElse("") + " " + getSupplementalText();
+        return getFile().map(AbstractContent::getName).orElse("") + " " + getSupplementalText();
     }
 
     /**
@@ -266,10 +279,11 @@ public class SlideShowView extends DrawableTileBase {
     synchronized private void cycleSlideShowImage(int direction) {
         stopVideo();
         final int groupSize = getGroupPane().getGroup().getFileIDs().size();
-        final Integer nextIndex = getFileID().map(fileID -> {
-            final int currentIndex = getGroupPane().getGroup().getFileIDs().indexOf(fileID);
-            return (currentIndex + direction + groupSize) % groupSize;
-        }).orElse(0);
+        final Integer nextIndex = getFileID()
+                .map(fileID -> {
+                    final int currentIndex = getGroupPane().getGroup().getFileIDs().indexOf(fileID);
+                    return (currentIndex + direction + groupSize) % groupSize;
+                }).orElse(0);
         setFile(getGroupPane().getGroup().getFileIDs().get(nextIndex));
 
     }

From 0a8b4fcc5531a0fb05417853ccb7daa5d0c4c530 Mon Sep 17 00:00:00 2001
From: Kay Bassi <kb@narfindustries.com>
Date: Wed, 3 Feb 2016 08:48:47 -0800
Subject: [PATCH 24/68] Completed editing/translation

---
 .../autopsy/corecomponentinterfaces/Bundle_ja.properties        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Core/src/org/sleuthkit/autopsy/corecomponentinterfaces/Bundle_ja.properties b/Core/src/org/sleuthkit/autopsy/corecomponentinterfaces/Bundle_ja.properties
index 8e2fd233f8..a2727c5700 100644
--- a/Core/src/org/sleuthkit/autopsy/corecomponentinterfaces/Bundle_ja.properties
+++ b/Core/src/org/sleuthkit/autopsy/corecomponentinterfaces/Bundle_ja.properties
@@ -1,3 +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_DirectoryTreeTopComponent=\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u30C4\u30EA\u30FC
 CoreComponentControl.CTL_FavoritesTopComponent=\u304A\u6C17\u306B\u5165\u308A
\ No newline at end of file

From 09739749848a79f9197b0ace054fc511606f63a3 Mon Sep 17 00:00:00 2001
From: Nick Davis <nick.davis@narfindustries.com>
Date: Wed, 3 Feb 2016 12:28:31 -0500
Subject: [PATCH 25/68] merged ja translations into casemodule

---
 .../autopsy/casemodule/Bundle_ja.properties   | 24 +++++++++++--------
 .../casemodule/services/Bundle_ja.properties  | 11 +++++++--
 2 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/Bundle_ja.properties b/Core/src/org/sleuthkit/autopsy/casemodule/Bundle_ja.properties
index ce3ffbc462..49e6f64701 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/Bundle_ja.properties
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/Bundle_ja.properties
@@ -1,9 +1,9 @@
 CTL_AddImage=\u30C7\u30FC\u30BF\u30BD\u30FC\u30B9\u3092\u8FFD\u52A0...
 CTL_AddImageButton=\u30C7\u30FC\u30BF\u30BD\u30FC\u30B9\u3092\u8FFD\u52A0
 CTL_CaseCloseAct=\u30B1\u30FC\u30B9\u3092\u9589\u3058\u308B
-CTL_CaseNewAction=\u65B0\u898F\u30B1\u30FC\u30B9\u2026
-CTL_CasePropertiesAction=\u30B1\u30FC\u30B9\u30D7\u30ED\u30D1\u30C6\u30A3\u2026
-CTL_OpenAction=\u30B1\u30FC\u30B9\u3092\u958B\u304F\u2026
+CTL_CaseNewAction=\u65B0\u898F\u30B1\u30FC\u30B9...
+CTL_CasePropertiesAction=\u30B1\u30FC\u30B9\u30D7\u30ED\u30D1\u30C6\u30A3...
+CTL_OpenAction=\u30B1\u30FC\u30B9\u3092\u958B\u304F...
 Menu/File/OpenRecentCase=\u6700\u8FD1\u958B\u3044\u305F\u30B1\u30FC\u30B9\u3092\u958B\u304F
 CTL_CaseDeleteAction=\u30B1\u30FC\u30B9\u3092\u524A\u9664
 OpenIDE-Module-Name=\u30B1\u30FC\u30B9
@@ -15,7 +15,7 @@ NewCaseVisualPanel1.jLabel2.text_1=\u30B1\u30FC\u30B9\u30C7\u30FC\u30BF\u306F\u6
 CasePropertiesForm.caseDirLabel.text=\u30B1\u30FC\u30B9\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\uFF1A
 CasePropertiesForm.crDateLabel.text=\u4F5C\u6210\u65E5\uFF1A
 CasePropertiesForm.caseNameLabel.text=\u30B1\u30FC\u30B9\u540D\uFF1A
-CasePropertiesForm.updateCaseNameButton.text=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
+CasePropertiesForm.updateCaseNameButton.text=\u66F4\u65B0
 CasePropertiesForm.casePropLabel.text=\u30B1\u30FC\u30B9\u60C5\u5831
 CasePropertiesForm.genInfoLabel.text=\u4E00\u822C\u60C5\u5831
 CasePropertiesForm.imgInfoLabel.text=\u30A4\u30E1\u30FC\u30B8\u60C5\u5831
@@ -47,7 +47,7 @@ MissingImageDialog.cancelButton.text=\u30AD\u30E3\u30F3\u30BB\u30EB
 LocalDiskPanel.errorLabel.text=\u30A8\u30E9\u30FC\u30E9\u30D9\u30EB
 LocalFilesPanel.infoLabel.text=\u30ED\u30FC\u30AB\u30EB\u30D5\u30A1\u30A4\u30EB\u304A\u3088\u3073\u30D5\u30A9\u30EB\u30C0\u3092\u8FFD\u52A0\uFF1A
 LocalFilesPanel.selectButton.text=\u8FFD\u52A0
-LocalFilesPanel.localFileChooser.dialogTitle=\u30ED\u30FC\u30AB\u30EB\u30D5\u30A1\u30A4\u30EB\u53C8\u306F\u30D5\u30A9\u30EB\u30C0\u3092\u9078\u629E
+LocalFilesPanel.localFileChooser.dialogTitle=\u30ED\u30FC\u30AB\u30EB\u30D5\u30A1\u30A4\u30EB\u307E\u305F\u306F\u30D5\u30A9\u30EB\u30C0\u3092\u9078\u629E
 LocalFilesPanel.selectButton.toolTipText=\u30ED\u30FC\u30AB\u30EB\u30D5\u30A1\u30A4\u30EB\u304A\u3088\u3073\u30D5\u30A9\u30EB\u30C0\u3092\u30ED\u30B8\u30AB\u30EB\u30D5\u30A1\u30A4\u30EB\u3068\u3057\u3066\u8FFD\u52A0\u3057\u307E\u3059
 LocalFilesPanel.clearButton.text=\u30AF\u30EA\u30A2
 LocalFilesPanel.clearButton.toolTipText=\u73FE\u5728\u9078\u629E\u3055\u308C\u3066\u3044\u308B\u30ED\u30FC\u30AB\u30EB\u30D5\u30A1\u30A4\u30EB\u30D1\u30B9\u304C\u30AF\u30EA\u30A2\u3055\u308C\u307E\u3059
@@ -88,8 +88,8 @@ AddLocalFilesTask.localFileAdd.progress.text=\u8FFD\u52A0\u4E2D\uFF1A{0}/{1}
 Case.getCurCase.exception.noneOpen=\u4F5C\u696D\u4E2D\u306E\u30B1\u30FC\u30B9\u3092\u53D6\u5F97\u3067\u304D\u307E\u305B\u3093\uFF1B\u958B\u3044\u3066\u3044\u308B\u30B1\u30FC\u30B9\u304C\u3042\u308A\u307E\u305B\u3093\uFF01
 Case.create.exception.msg=\u30B1\u30FC\u30B9\u4F5C\u6210\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F\uFF1A\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA{1}\u306E{0}
 Case.open.exception.blankCase.msg=\u30B1\u30FC\u30B9\u540D\u304C\u7A7A\u767D\u3067\u3059\u3002
-Case.open.msgDlg.updated.msg=\u30B1\u30FC\u30B9\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u306E\u30B9\u30AD\u30FC\u30DE\u3092\u66F4\u65B0\u3057\u307E\u3057\u305F\u3002\n\u306E\u30D1\u30B9\u3092\u6301\u3064\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u306E\u30D0\u30C3\u30AF\u30A2\u30C3\u30D7\u30B3\u30D4\u30FC\u304C\u4F5C\u6210\u3055\u308C\u307E\u3057\u305F\uFF1A\n\
- {\u6B210}
+Case.open.msgDlg.updated.msg=\u30B1\u30FC\u30B9\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u306E\u30B9\u30AD\u30FC\u30DE\u3092\u66F4\u65B0\u3057\u307E\u3057\u305F\u3002\n\u6B21\u306E\u30D1\u30B9\u3092\u6301\u3064\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u306E\u30D0\u30C3\u30AF\u30A2\u30C3\u30D7\u30B3\u30D4\u30FC\u304C\u4F5C\u6210\u3055\u308C\u307E\u3057\u305F\uFF1A\n\
+ {0}
 Case.open.msgDlg.updated.title=\u30B1\u30FC\u30B9\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u306E\u30B9\u30AD\u30FC\u30DE\u3092\u66F4\u65B0
 Case.open.exception.checkFile.msg=\u30B1\u30FC\u30B9\u30D5\u30A1\u30A4\u30EB\u306F{0}\u62E1\u5F35\u5B50\u304C\u5FC5\u8981\u3067\u3059\u3002
 Case.checkImgExist.confDlg.doesntExist.msg={0} \u304C\u3053\u306E\u30B1\u30FC\u30B9\u306B\u95A2\u9023\u3059\u308B\u30A4\u30E1\u30FC\u30B8\u306E\u3046\u3061\uFF11\u3064\u304C\u6B20\u843D\u3057\u3066\u3044\u308B\u306E\u3092\u691C\u51FA\u3057\u307E\u3057\u305F\u3002\u305D\u308C\u3092\u4ECA\u304B\u3089\u691C\u7D22\u3057\u307E\u3059\u304B\uFF1F\n\n\
@@ -118,7 +118,7 @@ CaseDeleteAction.closeConfMsg.title=\u8B66\u544A\uFF1A\u4F5C\u696D\u4E2D\u306E\u
 CaseDeleteAction.msgDlg.fileInUse.msg=\u5225\u306E\u30D7\u30ED\u30B0\u30E9\u30E0\u3067\u30D5\u30A9\u30EB\u30C0\u307E\u305F\u306F\u30D5\u30A1\u30A4\u30EB\u3092\u958B\u3044\u3066\u3044\u308B\u306E\u3067\u3001\u524A\u9664\u3092\u5B8C\u4E86\u3067\u304D\u307E\u305B\u3093\u3002\n\n\
 \u30D5\u30A9\u30EB\u30C0\u307E\u305F\u306F\u30D5\u30A1\u30A4\u30EB\u3092\u9589\u3058\u3066\u304B\u3089\u518D\u5B9F\u884C\u3059\u308B\u304B\u3001\u624B\u52D5\u3067\u30B1\u30FC\u30B9\u3092\u524A\u9664\u3057\u3066\u4E0B\u3055\u3044\u3002
 CaseDeleteAction.msgDlg.fileInUse.title=\u30A8\u30E9\u30FC\uFF1A\u30D5\u30A9\u30EB\u30C0\u304C\u4F7F\u7528\u4E2D
-CaseDeleteAction.msgDlg.caseDelete.msg=\u30B1\u30FC\u30B9\u306F\u304C\u524A\u9664\u3055\u308C\u307E\u3057\u305F\u3002
+CaseDeleteAction.msgDlg.caseDelete.msg=\u30B1\u30FC\u30B9\u304C\u524A\u9664\u3055\u308C\u307E\u3057\u305F\u3002
 CaseOpenAction.autFilter.title={0} \u30B1\u30FC\u30B9\u30D5\u30A1\u30A4\u30EB ( {1})
 CaseOpenAction.msgDlg.cantOpenCase.title=\u30B1\u30FC\u30B9\u3092\u958B\u304F\u969B\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F
 CasePropertiesAction.window.title=\u30B1\u30FC\u30B9\u30D7\u30ED\u30D1\u30C6\u30A3
@@ -126,7 +126,7 @@ CasePropertiesForm.updateCaseName.msgDlg.empty.msg=\u30B1\u30FC\u30B9\u540D\u306
 CasePropertiesForm.updateCaseName.msgDlg.empty.title=\u30A8\u30E9\u30FC
 CasePropertiesForm.updateCaseName.msgDlg.invalidSymbols.msg=\u30B1\u30FC\u30B9\u540D\u306B\u306F\u6B21\u306E\u8A18\u53F7\u3092\u542B\u3081\u307E\u305B\u3093\uFF1A\\ / \: * ? " < > |
 CasePropertiesForm.updateCaseName.msgDlg.invalidSymbols.title=\u30A8\u30E9\u30FC
-CasePropertiesForm.updateCaseName.confMsg.msg=\u30B1\u30FC\u30B9\u540D\u3092"0}"\u304B\u3089"{1}"\u306B\u672C\u5F53\u306B\u66F4\u65B0\u3057\u307E\u3059\u304B\uFF1F
+CasePropertiesForm.updateCaseName.confMsg.msg=\u30B1\u30FC\u30B9\u540D\u3092"{0}"\u304B\u3089"{1}"\u306B\u672C\u5F53\u306B\u66F4\u65B0\u3057\u307E\u3059\u304B\uFF1F
 CasePropertiesForm.updateCaseName.confMsg.title=\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u4F5C\u6210
 CueBannerPanel.title.text=\u6700\u8FD1\u958B\u3044\u305F\u30B1\u30FC\u30B9\u3092\u958B\u304F
 GeneralFilter.rawImageDesc.text=\u30ED\u30FC\u30A4\u30E1\u30FC\u30B8(*.img, *.dd, *.001, *.aa, *.raw, *.bin)
@@ -134,7 +134,7 @@ GeneralFilter.encaseImageDesc.text=\u30A8\u30F3\u30B1\u30FC\u30B9\u30A4\u30E1\u3
 ImageDSProcessor.dsType.text=\u30A4\u30E1\u30FC\u30B8\u30D5\u30A1\u30A4\u30EB
 ImageDSProcessor.allDesc.text=\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u308B\u5168\u30BF\u30A4\u30D7
 ImageFilePanel.moduleErr=\u30E2\u30B8\u30E5\u30FC\u30EB\u30A8\u30E9\u30FC
-ImageFilePanel.moduleErr.msg=ImageFilePanel\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\u304B\u30ED\u30B0\u3092\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
+ImageFilePanel.moduleErr.msg=ImageFilePanel\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\u304B\u30ED\u30B0\u3092\u78BA\u8A8D\u3057\u3066\u304F\u3060\u3055\u3044\u3002\u4E00\u90E8\u306E\u30C7\u30FC\u30BF\u304C\u4E0D\u5B8C\u5168\u304B\u3082\u3057\u308C\u307E\u305B\u3093\u3002
 LocalDiskDSProcessor.dsType.text=\u30ED\u30FC\u30AB\u30EB\u30C7\u30A3\u30B9\u30AF
 LocalDiskPanel.localDiskModel.loading.msg=\u30ED\u30FC\u30AB\u30EB\u30C7\u30A3\u30B9\u30AF\u3092\u30ED\u30FC\u30C9\u4E2D\u2026
 LocalDiskPanel.moduleErr=\u30E2\u30B8\u30E5\u30FC\u30EB\u30A8\u30E9\u30FC
@@ -226,3 +226,7 @@ SingleUserCaseConverter.UnableToCopySourceImages=\u30BD\u30FC\u30B9\u30A4\u30E1\
 SingleUserCaseConverter.CanNotOpenDatabase=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u3092\u958B\u3051\u307E\u305B\u3093\u3067\u3057\u305F
 CloseCaseWhileIngesting.Warning=\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u304C\u5B9F\u884C\u4E2D\u3067\u3059\u3002\u3053\u306E\u30B1\u30FC\u30B9\u3092\u672C\u5F53\u306B\u9589\u3058\u307E\u3059\u304B\uFF1F
 CloseCaseWhileIngesting.Warning.title=\u8B66\u544A\uFF1A\u3053\u308C\u3092\u5B9F\u884C\u3059\u308C\u3070\u4F5C\u696D\u4E2D\u306E\u30B1\u30FC\u30B9\u3092\u9589\u3058\u307E\u3059
+Case_caseType_multiUser=\u8907\u6570\u30E6\u30FC\u30B6\u30FC\u30B1\u30FC\u30B9
+Case_caseType_singleUser=\u5358\u6570\u30E6\u30FC\u30B6\u30FC\u30B1\u30FC\u30B9
+CasePropertiesForm.imagesTable.path=\u30D1\u30B9
+CasePropertiesForm.imagesTable.remove=\u524A\u9664
diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/services/Bundle_ja.properties b/Core/src/org/sleuthkit/autopsy/casemodule/services/Bundle_ja.properties
index 5645e83cfe..186fa5f8b4 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/services/Bundle_ja.properties
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/services/Bundle_ja.properties
@@ -6,7 +6,7 @@ FileManager.addDerivedFile.exception.msg=FileManager\u3092\u9589\u3058\u305F\u5F
 FileManager.addCarvedFile.exception.msg=FileManager\u3092\u9589\u3058\u305F\u5F8C\u306B\u4F7F\u7528\u3092\u8A66\u307F\u307E\u3057\u305F\u3002
 FileManager.addLocalFilesDirs.exception.notReadable.msg=\u8FFD\u52A0\u3059\u308B\u30ED\u30FC\u30AB\u30EB\u30D5\u30A1\u30A4\u30EB\uFF0F\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306E\u4E2D\u306B\u8AAD\u307F\u53D6\u308C\u306A\u3044\u3082\u306E\u304C\uFF11\u500B\u3042\u308A\u307E\u3059\uFF1A{0}\u3001\u30D5\u30A1\u30A4\u30EB\u304C\u8FFD\u52A0\u3055\u308C\u308B\u524D\u306B\u51E6\u7406\u3092\u4E2D\u6B62\u3057\u307E\u3059
 FileManager.addLocalFilesDirs.exception.cantAdd.msg=\u30ED\u30FC\u30AB\u30EB\u30D5\u30A1\u30A4\u30EB\uFF0F\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306E\uFF11\u500B\u306F\u8FFD\u52A0\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F\uFF1A{0}
-FileManager.addLocalFileSetRootDir.exception.errCreateDir.msg=\u30ED\u30FC\u30AB\u30EB\u30D5\u30A1\u30A4\u30EB\u30BB\u30C3\u30C8\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u4F5C\u6210\u306B\u30A8\u30E9\u30FC\u304C\u8D77\u3053\u308A\u307E\u3057\u305F\uFF1A {0}
+FileManager.addLocalFileSetRootDir.exception.errCreateDir.msg=\u30ED\u30FC\u30AB\u30EB\u30D5\u30A1\u30A4\u30EB\u30BB\u30C3\u30C8\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3092\u4F5C\u6210\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u8D77\u3053\u308A\u307E\u3057\u305F\uFF1A {0}
 FileManager.addLocalDirInt.exception.closed.msg=FileManager\u3092\u9589\u3058\u305F\u5F8C\u306B\u4F7F\u7528\u3092\u8A66\u307F\u307E\u3057\u305F\u3002
 FileManager.addLocalDirInt.exception.doesntExist.msg=\u5B58\u5728\u3057\u306A\u3044\u30ED\u30FC\u30AB\u30EB\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306E\u8FFD\u52A0\u3092\u8A66\u307F\u307E\u3057\u305F\: {0}
 FileManager.addLocalDirInt.exception.notReadable.msg=\u8AAD\u307F\u53D6\u308A\u3067\u304D\u306A\u3044\u30ED\u30FC\u30AB\u30EB\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306E\u8FFD\u52A0\u3092\u8A66\u307F\u307E\u3057\u305F\: {0}
@@ -14,4 +14,11 @@ FileManager.addLocalDirInt2.exception.closed.msg=FileManager\u3092\u9589\u3058\u
 TagsManager.addContentTag.exception.beginByteOffsetOOR.msg=beginByteOffset \= {0} \u30B3\u30F3\u30C6\u30F3\u30C4\u30B5\u30A4\u30BA\u7BC4\u56F2(0 - {1})\u306E\u5916\u3067\u3059
 TagsManager.addContentTag.exception.endByteOffsetOOR.msg=endByteOffset \= {0} \u30B3\u30F3\u30C6\u30F3\u30C4\u30B5\u30A4\u30BA\u7BC4\u56F2(0 - {1})\u306E\u5916\u3067\u3059
 TagsManager.addContentTag.exception.endLTbegin.msg=endByteOffset < beginByteOffset
-TagsManager.predefTagNames.bookmark.text=\u30D6\u30C3\u30AF\u30DE\u30FC\u30AF
\ No newline at end of file
+TagsManager.predefTagNames.bookmark.text=\u30D6\u30C3\u30AF\u30DE\u30FC\u30AF
+TagsManager.addContentTag.noCaseWarning=\u65B0\u3057\u3044\u30BF\u30B0\u30A4\u30D9\u30F3\u30C8\u3092\u30D1\u30D6\u30EA\u30C3\u30B7\u30E5\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F\u3002\u958B\u3044\u3066\u3044\u308B\u30B1\u30FC\u30B9\u304C\u3042\u308A\u307E\u305B\u3093\u3002
+TagsManager.deleteContentTag.noCaseWarning=\u524A\u9664\u3055\u308C\u305F\u30A4\u30D9\u30F3\u30C8\u306E\u30BF\u30B0\u306E\u30B3\u30F3\u30C6\u30F3\u30C4\u3092\u30D1\u30D6\u30EA\u30C3\u30B7\u30E5\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F\u3002\u958B\u3044\u3066\u3044\u308B\u30B1\u30FC\u30B9\u304C\u3042\u308A\u307E\u305B\u3093\u3002
+TagsManager.addBlackboardArtifactTag.noCaseWarning=\u30A4\u30D9\u30F3\u30C8\u306E\u30BF\u30B0\u306E\u65B0\u3057\u3044blackboard\u30A2\u30FC\u30C6\u30A3\u30D5\u30A1\u30AF\u30C8\u3092\u30D1\u30D6\u30EA\u30C3\u30B7\u30E5\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F\u3002\u958B\u3044\u3066\u3044\u308B\u30B1\u30FC\u30B9\u304C\u3042\u308A\u307E\u305B\u3093\u3002
+TagsManager.deleteBlackboardArtifactTag.noCaseWarning=\u524A\u9664\u3055\u308C\u305F\u30A4\u30D9\u30F3\u30C8\u306E\u30BF\u30B0\u306E\u65B0\u3057\u3044blackboard\u30A2\u30FC\u30C6\u30A3\u30D5\u30A1\u30AF\u30C8\u3092\u30D1\u30D6\u30EA\u30C3\u30B7\u30E5\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F\u3002\u958B\u3044\u3066\u3044\u308B\u30B1\u30FC\u30B9\u304C\u3042\u308A\u307E\u305B\u3093\u3002
+Blackboard.keywordSearchNotFound.exception.msg=\u30AD\u30FC\u30EF\u30FC\u30C9\u691C\u7D22\u30B5\u30FC\u30D3\u30B9\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3067\u3057\u305F\u3002
+Blackboard.unableToIndexArtifact.exception.msg=blackboard\u30A2\u30FC\u30C6\u30A3\u30D5\u30A1\u30AF\u30C8\u3092\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F\u3002
+Blackboard.unableToIndexArtifact.error.msg=blackboard\u30A2\u30FC\u30C6\u30A3\u30D5\u30A1\u30AF\u30C8{0}\u3092\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F\u3002
\ No newline at end of file

From b149ce03c6ccdd215a7f26792785c47033390efb Mon Sep 17 00:00:00 2001
From: Nick Davis <nick.davis@narfindustries.com>
Date: Wed, 3 Feb 2016 12:35:28 -0500
Subject: [PATCH 26/68] merged translations into timeline

---
 .../autopsy/timeline/Bundle_ja.properties     | 36 +++++++++++--------
 .../timeline/actions/Bundle_ja.properties     | 32 +++++++++++++----
 .../datamodel/eventtype/Bundle_ja.properties  |  4 +--
 .../autopsy/timeline/db/Bundle_ja.properties  | 13 +++----
 .../timeline/filters/Bundle_ja.properties     | 11 ++++--
 .../ui/countsview/Bundle_ja.properties        | 12 +++----
 .../timeline/zooming/Bundle_ja.properties     |  1 -
 7 files changed, 68 insertions(+), 41 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/timeline/Bundle_ja.properties b/Core/src/org/sleuthkit/autopsy/timeline/Bundle_ja.properties
index 7efc917835..9a728dc050 100644
--- a/Core/src/org/sleuthkit/autopsy/timeline/Bundle_ja.properties
+++ b/Core/src/org/sleuthkit/autopsy/timeline/Bundle_ja.properties
@@ -2,28 +2,34 @@ CTL_MakeTimeline=\u300C\u30BF\u30A4\u30E0\u30E9\u30A4\u30F3\u300D
 CTL_TimeLineTopComponent=\u30BF\u30A4\u30E0\u30E9\u30A4\u30F3\u30A6\u30A3\u30F3\u30C9\u30A6
 CTL_TimeLineTopComponentAction=\u30BF\u30A4\u30E0\u30E9\u30A4\u30F3\u30C8\u30C3\u30D7\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8
 HINT_TimeLineTopComponent=\u3053\u308C\u306F\u30BF\u30A4\u30E0\u30E9\u30A4\u30F3\u30A6\u30A3\u30F3\u30C9\u30A6\u3067\u3059
-OpenIDE-Module-Name=\u30BF\u30A4\u30E0\u30E9\u30A4\u30F3
 OpenTimelineAction.title=\u30BF\u30A4\u30E0\u30E9\u30A4\u30F3
-Timeline.do_repopulate.msg=\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u3092\u5B9F\u884C\u4E2D\u306B\u30A4\u30D9\u30F3\u30C8\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u306F\u4EE5\u524D\u57CB\u3081\u3089\u308C\u307E\u3057\u305F\u3002\n\u4E00\u90E8\u306E\u30A4\u30D9\u30F3\u30C8\u306F\u7A7A\u767D\u306E\u307E\u307E\u3082\u3057\u304F\u306F\u4E0D\u6B63\u78BA\u306A\u30C7\u30FC\u30BF\u3067\u57CB\u307E\u3063\u3066\u3044\u308B\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059\u3002\n\u4ECA\u3059\u3050\u30A4\u30D9\u30F3\u30C8\u306E\u30C7\u30FC\u30BF\u3092\u518D\u5EA6\u57CB\u3081\u307E\u3059\u304B\uFF1F
 Timeline.frameName.text={0} - Autopsy\u30BF\u30A4\u30E0\u30E9\u30A4\u30F3
 Timeline.goToButton.text=\u4E0B\u8A18\u3078\u79FB\u52D5\uFF1A
-Timeline.initTimeline.confDlg.genBeforeIngest.details=\u30BF\u30A4\u30E0\u30E9\u30A4\u30F3
-Timeline.initTimeline.confDlg.genBeforeIngest.msg=\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u304C\u5B8C\u4E86\u3059\u308B\u524D\u306B\u30BF\u30A4\u30E0\u30E9\u30A4\u30F3\u3092\u4F5C\u6210\u3057\u3088\u3046\u3068\u3057\u3066\u3044\u307E\u3059\u3002\u30BF\u30A4\u30E0\u30E9\u30A4\u30F3\u304C\u4E0D\u5B8C\u5168\u306B\u306A\u308B\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059\u3002\u5B9F\u884C\u3057\u307E\u3059\u304B\uFF1F
 Timeline.node.root=\u30EB\u30FC\u30C8
-Timeline.ProgressWindow.cancel.confdlg.detail=\u30BF\u30A4\u30E0\u30E9\u30A4\u30F3\u4F5C\u6210\u3092\u30AD\u30E3\u30F3\u30BB\u30EB\u3057\u307E\u3059\u304B\uFF1F
-Timeline.ProgressWindow.cancel.confdlg.msg=\u30BF\u30A4\u30E0\u30E9\u30A4\u30F3\u4F5C\u6210\u3092\u30AD\u30E3\u30F3\u30BB\u30EB\u3057\u307E\u3059\u304B\uFF1F
-Timeline.progressWindow.name=\u30BF\u30A4\u30E0\u30E9\u30A4\u30F3
-Timeline.progressWindow.title=\u30BF\u30A4\u30E0\u30E9\u30A4\u30F3\u30C7\u30FC\u30BF\u4F5C\u6210\u4E2D
-Timeline.propChg.confDlg.timelineOOD.details=\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u9078\u629E
-Timeline.propChg.confDlg.timelineOOD.msg=\u30A4\u30D9\u30F3\u30C8\u30C7\u30FC\u30BF\u304C\u6700\u65B0\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002\u518D\u5EA6\u4F5C\u6210\u3057\u307E\u3059\u304B\uFF1F
-Timeline.pushDescrLOD.confdlg.msg=\u5B9F\u884C\u3059\u308B\u3068{0}\u30A4\u30D9\u30F3\u30C8\u306E\u8A73\u7D30\u304C\u8868\u793A\u3055\u308C\u307E\u3059\u3002\u3053\u306E\u51E6\u7406\u306F\u9577\u6642\u9593\u304B\u304B\u308B\u3082\u3057\u304F\u306FAutopsy\u3092\u30AF\u30E9\u30C3\u30B7\u30E5\u3059\u308B\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059\u3002\n\n\u5B9F\u884C\u3057\u307E\u3059\u304B\uFF1F
+Timeline.pushDescrLOD.confdlg.msg={0}\u30A4\u30D9\u30F3\u30C8\u306E\u8A73\u7D30\u304C\u8868\u793A\u53EF\u80FD\u3067\u3059\u3002\u3053\u306E\u51E6\u7406\u306F\u9577\u6642\u9593\u304B\u304B\u308B\u3082\u3057\u304F\u306FAutopsy\u3092\u30AF\u30E9\u30C3\u30B7\u30E5\u3059\u308B\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059\u3002\n\n\u5B9F\u884C\u3057\u307E\u3059\u304B\uFF1F
 Timeline.resultPanel.loading=\u30ED\u30FC\u30C9\u4E2D\u30FB\u30FB\u30FB
 Timeline.resultsPanel.title=\u30BF\u30A4\u30E0\u30E9\u30A4\u30F3\u7D50\u679C
 Timeline.runJavaFxThread.progress.creating=\u30BF\u30A4\u30E0\u30E9\u30A4\u30F3\u4F5C\u6210\u4E2D\u30FB\u30FB\u30FB
-Timeline.showLastPopulatedWhileIngestingConf.confDlg.details=\u30A4\u30D9\u30F3\u30C8\u3092\u518D\u5EA6\u57CB\u3081\u307E\u3059\u304B\uFF1F
 Timeline.zoomOutButton.text=\u30BA\u30FC\u30E0\u30A2\u30A6\u30C8
 TimelineFrame.title=\u30BF\u30A4\u30E0\u30E9\u30A4\u30F3
 TimeLineTopComponent.eventsTab.name=\u30A4\u30D9\u30F3\u30C8
-TimeLineTopComponent.filterTab.name=\u30D5\u30A3\u30EB\u30BF
-OpenTimeLineAction.msgdlg.text=\u30BF\u30A4\u30E0\u30E9\u30A4\u30F3\u4F5C\u6210\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F\u3002\u30C7\u30FC\u30BF\u30BD\u30FC\u30B9\u304C\u3042\u308A\u307E\u305B\u3093\u3002
-TimeLineTopComponent.timeZonePanel.text=\u6642\u9593\u3092\u4E0B\u8A18\u3067\u8868\u793A\uFF1A
\ No newline at end of file
+TimeLineTopComponent.filterTab.name=\u30D5\u30A3\u30EB\u30BF\u30FC
+OpenTimeLineAction.msgdlg.text=\u30BF\u30A4\u30E0\u30E9\u30A4\u30F3\u3092\u4F5C\u6210\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F\u3002\u30C7\u30FC\u30BF\u30BD\u30FC\u30B9\u304C\u3042\u308A\u307E\u305B\u3093\u3002
+PrompDialogManager.buttonType.continueNoUpdate=\u66F4\u65B0\u305B\u305A\u6B21\u3078
+PrompDialogManager.buttonType.showTimeline=\u30BF\u30A4\u30E0\u30E9\u30A4\u30F3\u3092\u8868\u793A
+PrompDialogManager.buttonType.update=\u66F4\u65B0
+PromptDialogManager.confirmDuringIngest.contentText=\u6B21\u3078\u9032\u307F\u307E\u3059\u304B\uFF1F
+PromptDialogManager.confirmDuringIngest.headerText=\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u304C\u5B8C\u4E86\u3059\u308B\u524D\u306B\u30BF\u30A4\u30E0\u30E9\u30A4\u30F3\u3092\u8868\u793A\u3057\u3088\u3046\u3068\u3057\u3066\u3044\u307E\u3059\u3002\n\u30BF\u30A4\u30E0\u30E9\u30A4\u30F3\u304C\u5B8C\u6210\u3057\u3066\u3044\u306A\u3044\u304B\u3082\u3057\u308C\u307E\u305B\u3093\u3002
+PromptDialogManager.progressDialog.title=\u30BF\u30A4\u30E0\u30E9\u30A4\u30F3\u30C7\u30FC\u30BF\u3092\u5165\u529B\u4E2D
+PromptDialogManager.rebuildPrompt.details=\u8A73\u7D30\uFF1A
+PromptDialogManager.rebuildPrompt.headerText=\u30BF\u30A4\u30E0\u30E9\u30A4\u30F3\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u304C\u4E0D\u5B8C\u5168\u307E\u305F\u306F\u6700\u65B0\u3067\u306F\u306A\u3044\u304B\u3082\u3057\u308C\u307E\u305B\u3093\u3002\n \u6B20\u843D\u3057\u3066\u3044\u308B\u307E\u305F\u306F\u4E0D\u6B63\u78BA\u306A\u30A4\u30D9\u30F3\u30C8\u304C\u4E00\u90E8\u3042\u308B\u304B\u3082\u3057\u308C\u307E\u305B\u3093\u3002\u4E00\u90E8\u306E\u6A5F\u80FD\u304C\u5229\u7528\u3067\u304D\u306A\u3044\u304B\u3082\u3057\u308C\u307E\u305B\u3093\u3002
+Timeline.confirmation.dialogs.title=\u30BF\u30A4\u30E0\u30E9\u30A4\u30F3\u306E\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u3092\u66F4\u65B0\u3057\u307E\u3059\u304B\uFF1F
+Timeline.pushDescrLOD.confdlg.title=\u8AAC\u660E\u306E\u8A18\u8FF0\u30EC\u30D9\u30EB\u3092\u5909\u66F4\u3057\u307E\u3059\u304B\uFF1F
+TimeLineController.errorTitle=\u30BF\u30A4\u30E0\u30E9\u30A4\u30F3\u30A8\u30E9\u30FC
+TimeLineController.outOfDate.errorMessage=\u30BF\u30A4\u30E0\u30E9\u30A4\u30F3\u304C\u6700\u65B0\u304B\u78BA\u8A8D\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F\u3002\u66F4\u65B0\u304C\u5FC5\u8981\u3060\u3068\u60F3\u5B9A\u3057\u307E\u3059\u3002
+TimeLineController.rebuildReasons.incompleteOldSchema=\u30BF\u30A4\u30E0\u30E9\u30A4\u30F3\u30A4\u30D9\u30F3\u30C8\u306E\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u306B\u4E0D\u5B8C\u5168\u306A\u60C5\u5831\u304C\u4EE5\u524D\u5165\u529B\u3055\u308C\u3066\u3044\u307E\u3057\u305F\uFF1A\u30A4\u30D9\u30F3\u30C8\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u3092\u66F4\u65B0\u3057\u306A\u3044\u3068\u3001\u4E00\u90E8\u306E\u6A5F\u80FD\u304C\u5229\u7528\u3067\u304D\u306A\u3044\u3001\u307E\u305F\u306F\u6A5F\u80FD\u3057\u306A\u3044\u304B\u3082\u3057\u308C\u306A\u3044\u3067\u3059\u3002
+TimeLineController.rebuildReasons.ingestWasRunning=\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u304C\u5B9F\u884C\u4E2D\u306B\u30BF\u30A4\u30E0\u30E9\u30A4\u30F3\u30A4\u30D9\u30F3\u30C8\u306E\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u306B\u60C5\u5831\u304C\u5165\u529B\u3055\u308C\u3066\u3044\u307E\u3057\u305F\uFF1A\u30A4\u30D9\u30F3\u30C8\u304C\u6B20\u3051\u3066\u3044\u308B\u3001\u4E0D\u5B8C\u5168\u3001\u307E\u305F\u306F\u4E0D\u6B63\u78BA\u304B\u3082\u3057\u308C\u307E\u305B\u3093\u3002
+TimeLineController.rebuildReasons.outOfDate=\u30A4\u30D9\u30F3\u30C8\u30C7\u30FC\u30BF\u304C\u53E4\u3044\u3067\u3059\uFF1A\u898B\u308C\u306A\u3044\u30A4\u30D9\u30F3\u30C8\u304C\u3042\u308A\u307E\u3059\u3002
+TimeLineController.rebuildReasons.outOfDateError=\u30BF\u30A4\u30E0\u30E9\u30A4\u30F3\u30C7\u30FC\u30BF\u304C\u53E4\u3044\u304B\u78BA\u8A8D\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F\u3002
+TimeLinecontroller.updateNowQuestion=\u30A4\u30D9\u30F3\u30C8\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u3092\u4ECA\u66F4\u65B0\u3057\u307E\u3059\u304B\uFF1F
+TimelinePanel.jButton13.text=\u5168\u3066
\ No newline at end of file
diff --git a/Core/src/org/sleuthkit/autopsy/timeline/actions/Bundle_ja.properties b/Core/src/org/sleuthkit/autopsy/timeline/actions/Bundle_ja.properties
index 03ca0a58f5..dc8dbf8829 100644
--- a/Core/src/org/sleuthkit/autopsy/timeline/actions/Bundle_ja.properties
+++ b/Core/src/org/sleuthkit/autopsy/timeline/actions/Bundle_ja.properties
@@ -1,6 +1,26 @@
-Back.actions.name.text=\u623B\u308B
-DefaultFilters.action.name.text=\u30C7\u30D5\u30A9\u30EB\u30C8\u30D5\u30A3\u30EB\u30BF\u3092\u9069\u7528
-Forward.action.name.text=\u9032\u3080
-SaveSnapshot.action.name.text=\u30B9\u30CA\u30C3\u30D7\u30B7\u30E7\u30C3\u30C8\u3092\u4FDD\u5B58
-SaveSnapshot.fileChoose.title.text=\u4E0B\u8A18\u3078\u4FDD\u5B58
-ZoomOut.action.name.text=\u30C7\u30D5\u30A9\u30EB\u30C8\u30D5\u30A3\u30EB\u30BF\u3092\u9069\u7528
\ No newline at end of file
+Back.longText=\u6700\u5F8C\u306E\u30D3\u30E5\u30FC\u8A2D\u5B9A\u306B\u623B\u308B\u3002
+Back.text=\u623B\u308B
+Forward.text=\u6B21\u3078
+OpenReportAction.DisplayName=\u30EC\u30DD\u30FC\u30C8\u3092\u958B\u304F
+OpenReportAction.MessageBoxTitle=\u30EC\u30DD\u30FC\u30C8\u3092\u958B\u3051\u307E\u305B\u3093\u3067\u3057\u305F
+OpenReportAction.MissingReportFileMessage=\u30EC\u30DD\u30FC\u30C8\u30D5\u30A1\u30A4\u30EB\u304C\u5B58\u5728\u3057\u307E\u305B\u3093\u3002
+OpenReportAction.NoAssociatedEditorMessage=\u3053\u306E\u30BF\u30A4\u30D7\u306E\u30EC\u30DD\u30FC\u30C8\u306E\u95A2\u9023\u30A8\u30C7\u30A3\u30BF\u30FC\u304C\u3042\u308A\u307E\u305B\u3093\u3002\u307E\u305F\u306F\u95A2\u9023\u306E\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u304C\u8D77\u52D5\u3057\u307E\u305B\u3093\u3067\u3057\u305F\u3002
+OpenReportAction.NoOpenInEditorSupportMessage=\u3053\u306E\u30D7\u30E9\u30C3\u30C8\u30D5\u30A9\u30FC\u30E0\uFF08\u30AA\u30DA\u30EC\u30FC\u30C6\u30A3\u30F3\u30B0\u30B7\u30B9\u30C6\u30E0\uFF09\u306F\u3053\u306E\u3088\u3046\u306B\u30D5\u30A1\u30A4\u30EB\u3092\u30A8\u30C7\u30A3\u30BF\u30FC\u3067\u958B\u304F\u306E\u3092\u30B5\u30DD\u30FC\u30C8\u3057\u3066\u3044\u307E\u305B\u3093\u3002
+OpenReportAction.ReportFileOpenPermissionDeniedMessage=\u30EC\u30DD\u30FC\u30C8\u30D5\u30A1\u30A4\u30EB\u3092\u958B\u304F\u8A31\u53EF\u304C\u5374\u4E0B\u3055\u308C\u307E\u3057\u305F\u3002
+ResetFilters.text=\u5168\u3066\u306E\u30D5\u30A3\u30EB\u30BF\u30FC\u3092\u30EA\u30BB\u30C3\u30C8
+RestFilters.longText=\u5168\u3066\u306E\u30D5\u30A3\u30EB\u30BF\u30FC\u3092\u30C7\u30D5\u30A9\u30EB\u30C8\u72B6\u614B\u306B\u30EA\u30BB\u30C3\u30C8\u3057\u307E\u3059\u3002
+SaveSnapshot.action.longText=\u30EC\u30DD\u30FC\u30C8\u3068\u3057\u3066\u30D3\u30B8\u30E5\u30A2\u30E9\u30A4\u30BC\u30FC\u30B7\u30E7\u30F3\uFF08\u53EF\u8996\u5316\uFF09\u306E\u30B9\u30AF\u30EA\u30FC\u30F3\u30AD\u30E3\u30D7\u30C1\u30E3\u3092\u4FDD\u5B58\u3057\u307E\u3059\u3002
+SaveSnapshot.action.name.text=\u30B9\u30CA\u30C3\u30D7\u30B7\u30E7\u30C3\u30C8\u30EC\u30DD\u30FC\u30C8
+SaveSnapshot.fileChoose.title.text=\u6B21\u3078\u30B9\u30CA\u30C3\u30D7\u30B7\u30E7\u30C3\u30C8\u3092\u4FDD\u5B58
+SaveSnapShotAsReport.ErrorWritingReport=\u30EC\u30DD\u30FC\u30C8{0}\u3092\u30C7\u30A3\u30B9\u30AF\u3092\u66F8\u304D\u8FBC\u3081\u307E\u305B\u3093\u3067\u3057\u305F\u3002\u8A73\u7D30\u306F\u30ED\u30B0\u3092\u78BA\u8A8D\u3057\u3066\u304F\u3060\u3055\u3044\u3002
+SaveSnapShotAsReport.FailedToAddReport=\u30EC\u30DD\u30FC\u30C8\u3068\u3057\u3066\u30B9\u30CA\u30C3\u30D7\u30B7\u30E7\u30C3\u30C8\u3092\u8FFD\u52A0\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F\u3002\u8A73\u7D30\u306F\u30ED\u30B0\u3092\u78BA\u8A8D\u3057\u3066\u304F\u3060\u3055\u3044\u3002
+SaveSnapsHotAsReport.ReportName=\u30BF\u30A4\u30E0\u30E9\u30A4\u30F3\u30FC\u30EC\u30DD\u30FC\u30C8\u30FC{0}
+SaveSnapShotAsReport.ReportSavedAt=\u30EC\u30DD\u30FC\u30C8\u306F\u6B21\u3078\u4FDD\u5B58\u3055\u308C\u307E\u3057\u305F[{0}]
+SaveSnapShotAsReport.Success=\u6210\u529F
+Timeline.ModuleName=\u30BF\u30A4\u30E0\u30E9\u30A4\u30F3
+ZoomIn.action.text=\u62E1\u5927
+ZoomIn.longText=\u304A\u3088\u305D\u534A\u5206\u306E\u6642\u9593\u3092\u8868\u793A\u3059\u308B\u3088\u3046\u306B\u62E1\u5927\u3057\u307E\u3059\u3002
+ZoomOut.action.text=\u7E2E\u5C0F
+ZoomOut.longText=\u304A\u3088\u305D50%\u591A\u304F\u3092\u8868\u793A\u3059\u308B\u3088\u3046\u306B\u7E2E\u5C0F\u3057\u307E\u3059\u3002
+ZoomToEvents.action.text=\u30A4\u30D9\u30F3\u30C8\u3078\u30BA\u30FC\u30E0
+ZoomToEvents.longText=\u4E00\u756A\u8FD1\u304F\u306E\u30A4\u30D9\u30F3\u30C8\u304C\u8868\u793A\u3055\u308C\u308B\u3088\u3046\u306B\u7E2E\u5C0F\u3057\u307E\u3059\u3002
diff --git a/Core/src/org/sleuthkit/autopsy/timeline/datamodel/eventtype/Bundle_ja.properties b/Core/src/org/sleuthkit/autopsy/timeline/datamodel/eventtype/Bundle_ja.properties
index f6d6a011a1..1e65f3c427 100644
--- a/Core/src/org/sleuthkit/autopsy/timeline/datamodel/eventtype/Bundle_ja.properties
+++ b/Core/src/org/sleuthkit/autopsy/timeline/datamodel/eventtype/Bundle_ja.properties
@@ -6,8 +6,8 @@ FileSystemTypes.fileChanged.name=\u5909\u66F4\u3055\u308C\u305F\u30D5\u30A1\u30A
 FileSystemTypes.fileCreated.name=\u4F5C\u6210\u3055\u308C\u305F\u30D5\u30A1\u30A4\u30EB
 FileSystemTypes.fileModified.name=\u66F4\u65B0\u3055\u308C\u305F\u30D5\u30A1\u30A4\u30EB
 MiscTypes.Calls.name=\u30B3\u30FC\u30EB
-MiscTypes.devicesAttached.name=\u30A2\u30BF\u30C3\u30C1\u3055\u308C\u3066\u3044\u308B\u6A5F\u5668
-MiscTypes.Email.name=E\u30E1\u30FC\u30EB
+MiscTypes.devicesAttached.name=\u63A5\u7D9A\u3055\u308C\u3066\u3044\u308B\u6A5F\u5668
+MiscTypes.Email.name=Email
 MiscTypes.exif.name=Exif
 MiscTypes.GPSRoutes.name=GPS\u30EB\u30FC\u30C8
 MiscTypes.GPSTrackpoint.name=\u4F4D\u7F6E\u60C5\u5831\u5C65\u6B74
diff --git a/Core/src/org/sleuthkit/autopsy/timeline/db/Bundle_ja.properties b/Core/src/org/sleuthkit/autopsy/timeline/db/Bundle_ja.properties
index 55992eec21..9b3adae0ba 100644
--- a/Core/src/org/sleuthkit/autopsy/timeline/db/Bundle_ja.properties
+++ b/Core/src/org/sleuthkit/autopsy/timeline/db/Bundle_ja.properties
@@ -1,6 +1,7 @@
-EventsRepository.msgdlg.problem.text=\u30BF\u30A4\u30E0\u30E9\u30A4\u30F3\u4F5C\u6210\u4E2D\u306B\u554F\u984C\u304C\u767A\u751F\u3057\u307E\u3057\u305F\u3002\u6B20\u843D\u3057\u3066\u3044\u308B\u307E\u305F\u306F\u4E0D\u6B63\u78BA\u306A\u30A4\u30D9\u30F3\u30C8\u304C\u3042\u308B\u304B\u3082\u3057\u308C\u307E\u305B\u3093\u3002\u8A73\u7D30\u306F\u30ED\u30B0\u3092\u78BA\u8A8D\u3057\u3066\u304F\u3060\u3055\u3044\u3002
-EventsRepository.progressWindow.msg.commitingDb=\u30A4\u30D9\u30F3\u30C8DB\u3092\u30B3\u30DF\u30C3\u30C8\u4E2D
-EventsRepository.progressWindow.msg.reinit_db=\u30A4\u30D9\u30F3\u30C8\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u3092\uFF08\u518D\uFF09\u521D\u671F\u5316\u4E2D
-EventsRepository.progressWindow.msg.populateMacEventsFiles=\u4E0B\u8A18\u30D5\u30A1\u30A4\u30EB\u306EMAC time\u30A4\u30D9\u30F3\u30C8\u3092\u5165\u529B\u4E2D\uFF1A
-EventsRepository.progressWindow.msg.populateMacEventsFiles2=\u4E0B\u8A18\u30D5\u30A1\u30A4\u30EB\u306EMAC time\u30A4\u30D9\u30F3\u30C8\u3092\u5165\u529B\u4E2D\uFF1A
-EventsRepository.progressWindow.populatingXevents={0} \u30A4\u30D9\u30F3\u30C8\u3092\u5165\u529B\u4E2D
\ No newline at end of file
+msgdlg.problem.text=\u30BF\u30A4\u30E0\u30E9\u30A4\u30F3\u306B\u5165\u529B\u3059\u308B\u969B\u306B\u554F\u984C\u304C\u767A\u751F\u3057\u307E\u3057\u305F\u3002\u5168\u3066\u306E\u30A4\u30D9\u30F3\u30C8\u304C\u73FE\u5728\u306A\u3044\u304B\u6B63\u78BA\u3067\u306F\u306A\u3044\u304B\u3082\u3057\u308C\u307E\u305B\u3093\u3002
+progressWindow.msg.commitingDb=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u306B\u30A4\u30D9\u30F3\u30C8\u3092\u30B3\u30DF\u30C3\u30C8\u3057\u3066\u3044\u307E\u3059\u3002
+progressWindow.msg.gatheringData=\u30A4\u30D9\u30F3\u30C8\u30C7\u30FC\u30BF\u3092\u53CE\u96C6\u4E2D
+progressWindow.msg.populateMacEventsFiles=\u30D5\u30A1\u30A4\u30EB\u306EMAC\u30BF\u30A4\u30E0\u306B\u5165\u529B\u4E2D
+progressWindow.msg.refreshingFileTags=\u30D5\u30A1\u30A4\u30EB\u30BF\u30B0\u3092\u30EA\u30D5\u30EC\u30C3\u30B7\u30E5\u4E2D
+progressWindow.msg.refreshingResultTags=\u7D50\u679C\u30BF\u30B0\u3092\u30EA\u30D5\u30EC\u30C3\u30B7\u30E5\u4E2D
+progressWindow.populatingXevents={0}\u30A4\u30D9\u30F3\u30C8\u306B\u5165\u529B\u4E2D
diff --git a/Core/src/org/sleuthkit/autopsy/timeline/filters/Bundle_ja.properties b/Core/src/org/sleuthkit/autopsy/timeline/filters/Bundle_ja.properties
index 410abe0b58..00dca873f4 100644
--- a/Core/src/org/sleuthkit/autopsy/timeline/filters/Bundle_ja.properties
+++ b/Core/src/org/sleuthkit/autopsy/timeline/filters/Bundle_ja.properties
@@ -1,4 +1,9 @@
 hideKnownFilter.displayName.text=\u65E2\u77E5\u30D5\u30A1\u30A4\u30EB\u3092\u96A0\u3059
-TextFilter.displayName.text=\u30C6\u30AD\u30B9\u30C8\u30D5\u30A3\u30EB\u30BF
-TypeFilter.displayName.text=\u30A4\u30D9\u30F3\u30C8\u30BF\u30A4\u30D7\u30D5\u30A3\u30EB\u30BF
-IntersectionFilter.displayName.text=\u30A4\u30F3\u30BF\u30FC\u30BB\u30AF\u30B7\u30E7\u30F3{0}
\ No newline at end of file
+TextFilter.displayName.text=\u30C6\u30AD\u30B9\u30C8\u30D5\u30A3\u30EB\u30BF\u30FC
+TypeFilter.displayName.text=\u30A4\u30D9\u30F3\u30C8\u30BF\u30A4\u30D7\u30D5\u30A3\u30EB\u30BF\u30FC
+IntersectionFilter.displayName.text=\u30A4\u30F3\u30BF\u30FC\u30BB\u30AF\u30B7\u30E7\u30F3{0}
+DataSourcesFilter.displayName.text=\u30C7\u30FC\u30BF\u30BD\u30FC\u30B9
+DescriptionFilter.mode.exclude=\u9664\u5916\u3059\u308B
+DescriptionFilter.mode.include=\u542B\u3080
+hashHitsFilter.displayName.text=\u30CF\u30C3\u30B7\u30E5\u30BB\u30C3\u30C8\u306E\u30D2\u30C3\u30C8\u306E\u307F
+tagsFilter.displayName.text=\u30BF\u30B0\u3055\u308C\u305F\u30A4\u30D9\u30F3\u30C8\u306E\u307F
\ No newline at end of file
diff --git a/Core/src/org/sleuthkit/autopsy/timeline/ui/countsview/Bundle_ja.properties b/Core/src/org/sleuthkit/autopsy/timeline/ui/countsview/Bundle_ja.properties
index d276872508..d372432159 100644
--- a/Core/src/org/sleuthkit/autopsy/timeline/ui/countsview/Bundle_ja.properties
+++ b/Core/src/org/sleuthkit/autopsy/timeline/ui/countsview/Bundle_ja.properties
@@ -1,18 +1,14 @@
 CountsChartPane.numberOfEvents=\u30A4\u30D9\u30F3\u30C8\u6570
 CountsViewPane.detailSwitchMessage=\u79D2\u3088\u308A\u5C0F\u3055\u3044\u5358\u4F4D\u306F\u3042\u308A\u307E\u305B\u3093\u3002\n\u8A73\u7D30\u30D3\u30E5\u30FC\u306B\u5909\u66F4\u3057\u307E\u3059\u304B\uFF1F
 CountsViewPane.detailSwitchTitle=\u8A73\u7D30\u30D3\u30E5\u30FC\u306B\u5909\u66F4\u3057\u307E\u3059\u304B\uFF1F
-Timeline.ui.countsview.contextMenu.ActionGroup.zoomHistory.title=\u30BA\u30FC\u30E0\u5C65\u6B74
 Timeline.ui.countsview.menuItem.selectEventType=\u30A4\u30D9\u30F3\u30C8\u30BF\u30A4\u30D7\u3092\u9078\u629E
 Timeline.ui.countsview.menuItem.selectTimeandType=\u6642\u9593\u3068\u30BF\u30A4\u30D7\u3092\u9078\u629E
 Timeline.ui.countsview.menuItem.selectTimeRange=\u6642\u9593\u7BC4\u56F2\u3092\u9078\u629E
 Timeline.ui.countsview.menuItem.zoomIntoTimeRange=\u6642\u9593\u7BC4\u56F2\u3078\u30BA\u30FC\u30E0\u30A4\u30F3
-CountsViewPane.loggedTask.name=\u30AB\u30A6\u30F3\u30C8\u30B0\u30E9\u30D5\u66F4\u65B0\u4E2D
-CountsViewPane.loggedTask.prepUpdate=\u66F4\u65B0\u3092\u6E96\u5099\u4E2D
-CountsViewPane.loggedTask.resetUI=ui\u3092\u30EA\u30BB\u30C3\u30C8\u4E2D
-CountsViewPane.loggedTask.updatingCounts=\u30AB\u30A6\u30F3\u30C8\u3092\u66F4\u65B0\u4E2D
-CountsViewPane.loggedTask.wrappingUp=\u6700\u7D42\u51E6\u7406\u5B9F\u884C\u4E2D
+CountsViewPane.loggedTask.name=\u30AB\u30A6\u30F3\u30C8\u30D3\u30E5\u30FC\u3092\u66F4\u65B0\u4E2D
+CountsViewPane.loggedTask.updatingCounts=\u30D3\u30B8\u30E5\u30A2\u30E9\u30A4\u30BC\u30FC\u30B7\u30E7\u30F3\uFF08\u53EF\u8996\u5316\uFF09\u306B\u5165\u529B\u4E2D
 CountsViewPane.tooltip.text={0} {1} \u30A4\u30D9\u30F3\u30C8\n{2}\u3068\n{3}\u306E\u9593
-EventCountsChart.contextMenu.zoomHistory.name=\u30BA\u30FC\u30E0\u5C65\u6B74
 CountsViewPane.linearRadio.text=\u30EA\u30CB\u30A2
 CountsViewPane.logRadio.text=\u5BFE\u6570\u7684
-CountsViewPane.scaleLabel.text=\u30B9\u30B1\u30FC\u30EB\uFF1A
\ No newline at end of file
+CountsViewPane.scaleLabel.text=\u30B9\u30B1\u30FC\u30EB\uFF1A
+*=Autopsy\u30D5\u30A9\u30EC\u30F3\u30B8\u30C3\u30AF\u30D6\u30E9\u30A6\u30B6
\ No newline at end of file
diff --git a/Core/src/org/sleuthkit/autopsy/timeline/zooming/Bundle_ja.properties b/Core/src/org/sleuthkit/autopsy/timeline/zooming/Bundle_ja.properties
index db2b09b66b..6708e6f9ba 100644
--- a/Core/src/org/sleuthkit/autopsy/timeline/zooming/Bundle_ja.properties
+++ b/Core/src/org/sleuthkit/autopsy/timeline/zooming/Bundle_ja.properties
@@ -1,7 +1,6 @@
 EventTypeZoomLevel.baseType=\u30D9\u30FC\u30B9\u30BF\u30A4\u30D7
 EventTypeZoomLevel.rootType=\u30EB\u30FC\u30C8\u30BF\u30A4\u30D7
 EventTypeZoomLevel.subType=\u30B5\u30D6\u30BF\u30A4\u30D7
-ZoomParams.toString=\u30BA\u30FC\u30E0\u72B6\u614B\uFF1A{0}
 ZoomSettingsPane.backButton.toolTip.text=\u623B\u308B\uFF1A{0}
 ZoomSettingsPane.forwardButton.toolTip.text=\u9032\u3080\uFF1A{0}
 DescriptionLOD.short=\u7C21\u6F54

From 1cca81703876c4ddfff88aec5aa10f3d9e16d876 Mon Sep 17 00:00:00 2001
From: Nick Davis <nick.davis@narfindustries.com>
Date: Wed, 3 Feb 2016 13:06:24 -0500
Subject: [PATCH 27/68] converted ui fonts to derived fonts in casemodule

---
 .../casemodule/CasePropertiesForm.form        | 103 +++++++++++++++++-
 .../casemodule/CasePropertiesForm.java        |  28 +++--
 .../autopsy/casemodule/CueBannerPanel.form    |  23 +++-
 .../autopsy/casemodule/CueBannerPanel.java    |  15 +--
 .../autopsy/casemodule/LocalDiskPanel.form    |  35 ++++++
 .../autopsy/casemodule/LocalDiskPanel.java    |  10 +-
 .../casemodule/MissingImageDialog.form        |  32 +++++-
 .../casemodule/MissingImageDialog.java        |   8 +-
 .../casemodule/NewCaseVisualPanel1.form       |  61 ++++++++++-
 .../casemodule/NewCaseVisualPanel1.java       |  13 ++-
 .../casemodule/NewCaseVisualPanel2.form       |  28 ++++-
 .../casemodule/NewCaseVisualPanel2.java       |   6 +-
 12 files changed, 322 insertions(+), 40 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/CasePropertiesForm.form b/Core/src/org/sleuthkit/autopsy/casemodule/CasePropertiesForm.form
index 94e9161756..c5ebfa82f4 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/CasePropertiesForm.form
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/CasePropertiesForm.form
@@ -145,8 +145,10 @@
   <SubComponents>
     <Component class="javax.swing.JLabel" name="casePropLabel">
       <Properties>
-        <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
-          <Font name="Tahoma" size="24" style="1"/>
+        <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+          <FontInfo relative="true">
+            <Font bold="true" component="casePropLabel" property="font" relativeSize="false" size="24"/>
+          </FontInfo>
         </Property>
         <Property name="horizontalAlignment" type="int" value="0"/>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
@@ -156,6 +158,11 @@
     </Component>
     <Component class="javax.swing.JLabel" name="caseNameLabel">
       <Properties>
+        <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+          <FontInfo relative="true">
+            <Font bold="false" component="caseNameLabel" property="font" relativeSize="false" size="11"/>
+          </FontInfo>
+        </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
           <ResourceString bundle="org/sleuthkit/autopsy/casemodule/Bundle.properties" key="CasePropertiesForm.caseNameLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
@@ -163,6 +170,11 @@
     </Component>
     <Component class="javax.swing.JLabel" name="crDateLabel">
       <Properties>
+        <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+          <FontInfo relative="true">
+            <Font bold="false" component="crDateLabel" property="font" relativeSize="false" size="11"/>
+          </FontInfo>
+        </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
           <ResourceString bundle="org/sleuthkit/autopsy/casemodule/Bundle.properties" key="CasePropertiesForm.crDateLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
@@ -170,6 +182,11 @@
     </Component>
     <Component class="javax.swing.JLabel" name="caseDirLabel">
       <Properties>
+        <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+          <FontInfo relative="true">
+            <Font bold="false" component="caseDirLabel" property="font" relativeSize="false" size="11"/>
+          </FontInfo>
+        </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
           <ResourceString bundle="org/sleuthkit/autopsy/casemodule/Bundle.properties" key="CasePropertiesForm.caseDirLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
@@ -178,6 +195,11 @@
     <Component class="javax.swing.JTextField" name="crDateTextField">
       <Properties>
         <Property name="editable" type="boolean" value="false"/>
+        <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+          <FontInfo relative="true">
+            <Font bold="false" component="crDateTextField" property="font" relativeSize="false" size="11"/>
+          </FontInfo>
+        </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
           <ResourceString bundle="org/sleuthkit/autopsy/casemodule/Bundle.properties" key="CasePropertiesForm.crDateTextField.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
@@ -185,6 +207,11 @@
     </Component>
     <Component class="javax.swing.JTextField" name="caseNameTextField">
       <Properties>
+        <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+          <FontInfo relative="true">
+            <Font bold="false" component="caseNameTextField" property="font" relativeSize="false" size="11"/>
+          </FontInfo>
+        </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
           <ResourceString bundle="org/sleuthkit/autopsy/casemodule/Bundle.properties" key="CasePropertiesForm.caseNameTextField.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
@@ -192,6 +219,11 @@
     </Component>
     <Component class="javax.swing.JButton" name="updateCaseNameButton">
       <Properties>
+        <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+          <FontInfo relative="true">
+            <Font bold="false" component="updateCaseNameButton" property="font" relativeSize="false" size="11"/>
+          </FontInfo>
+        </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
           <ResourceString bundle="org/sleuthkit/autopsy/casemodule/Bundle.properties" key="CasePropertiesForm.updateCaseNameButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
@@ -202,8 +234,10 @@
     </Component>
     <Component class="javax.swing.JLabel" name="genInfoLabel">
       <Properties>
-        <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
-          <Font name="Tahoma" size="14" style="1"/>
+        <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+          <FontInfo relative="true">
+            <Font bold="true" component="genInfoLabel" property="font" relativeSize="false" size="14"/>
+          </FontInfo>
         </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
           <ResourceString bundle="org/sleuthkit/autopsy/casemodule/Bundle.properties" key="CasePropertiesForm.genInfoLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
@@ -212,8 +246,10 @@
     </Component>
     <Component class="javax.swing.JLabel" name="imgInfoLabel">
       <Properties>
-        <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
-          <Font name="Tahoma" size="14" style="1"/>
+        <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+          <FontInfo relative="true">
+            <Font bold="true" component="imgInfoLabel" property="font" relativeSize="false" size="14"/>
+          </FontInfo>
         </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
           <ResourceString bundle="org/sleuthkit/autopsy/casemodule/Bundle.properties" key="CasePropertiesForm.imgInfoLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
@@ -222,6 +258,11 @@
     </Component>
     <Component class="javax.swing.JButton" name="OKButton">
       <Properties>
+        <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+          <FontInfo relative="true">
+            <Font bold="false" component="OKButton" property="font" relativeSize="false" size="11"/>
+          </FontInfo>
+        </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
           <ResourceString bundle="org/sleuthkit/autopsy/casemodule/Bundle.properties" key="CasePropertiesForm.OKButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
@@ -236,6 +277,11 @@
       <SubComponents>
         <Component class="javax.swing.JTable" name="imagesTable">
           <Properties>
+            <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+              <FontInfo relative="true">
+                <Font bold="false" component="imagesTable" property="font" relativeSize="false" size="11"/>
+              </FontInfo>
+            </Property>
             <Property name="model" type="javax.swing.table.TableModel" editor="org.netbeans.modules.form.editors2.TableModelEditor">
               <Table columnCount="2" rowCount="0">
                 <Column editable="false" title="Path" type="java.lang.Object"/>
@@ -274,6 +320,11 @@
     </Container>
     <Component class="javax.swing.JButton" name="deleteCaseButton">
       <Properties>
+        <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+          <FontInfo relative="true">
+            <Font bold="false" component="deleteCaseButton" property="font" relativeSize="false" size="11"/>
+          </FontInfo>
+        </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
           <ResourceString bundle="org/sleuthkit/autopsy/casemodule/Bundle.properties" key="CasePropertiesForm.deleteCaseButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
@@ -284,6 +335,11 @@
     </Component>
     <Component class="javax.swing.JLabel" name="caseNumberLabel">
       <Properties>
+        <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+          <FontInfo relative="true">
+            <Font bold="false" component="caseNumberLabel" property="font" relativeSize="false" size="11"/>
+          </FontInfo>
+        </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
           <ResourceString bundle="org/sleuthkit/autopsy/casemodule/Bundle.properties" key="CasePropertiesForm.caseNumberLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
@@ -291,6 +347,11 @@
     </Component>
     <Component class="javax.swing.JLabel" name="examinerLabel">
       <Properties>
+        <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+          <FontInfo relative="true">
+            <Font bold="false" component="examinerLabel" property="font" relativeSize="false" size="11"/>
+          </FontInfo>
+        </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
           <ResourceString bundle="org/sleuthkit/autopsy/casemodule/Bundle.properties" key="CasePropertiesForm.examinerLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
@@ -299,6 +360,11 @@
     <Component class="javax.swing.JTextField" name="caseNumberTextField">
       <Properties>
         <Property name="editable" type="boolean" value="false"/>
+        <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+          <FontInfo relative="true">
+            <Font bold="false" component="caseNumberTextField" property="font" relativeSize="false" size="11"/>
+          </FontInfo>
+        </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
           <ResourceString bundle="org/sleuthkit/autopsy/casemodule/Bundle.properties" key="CasePropertiesForm.caseNumberTextField.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
@@ -307,6 +373,11 @@
     <Component class="javax.swing.JTextField" name="examinerTextField">
       <Properties>
         <Property name="editable" type="boolean" value="false"/>
+        <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+          <FontInfo relative="true">
+            <Font bold="false" component="examinerTextField" property="font" relativeSize="false" size="11"/>
+          </FontInfo>
+        </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
           <ResourceString bundle="org/sleuthkit/autopsy/casemodule/Bundle.properties" key="CasePropertiesForm.examinerTextField.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
@@ -314,6 +385,11 @@
     </Component>
     <Component class="javax.swing.JLabel" name="lbDbType">
       <Properties>
+        <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+          <FontInfo relative="true">
+            <Font bold="false" component="lbDbType" property="font" relativeSize="false" size="11"/>
+          </FontInfo>
+        </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
           <ResourceString bundle="org/sleuthkit/autopsy/casemodule/Bundle.properties" key="CasePropertiesForm.lbDbType.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
@@ -322,6 +398,11 @@
     <Component class="javax.swing.JTextField" name="tbDbType">
       <Properties>
         <Property name="editable" type="boolean" value="false"/>
+        <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+          <FontInfo relative="true">
+            <Font bold="false" component="tbDbType" property="font" relativeSize="false" size="11"/>
+          </FontInfo>
+        </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
           <ResourceString bundle="org/sleuthkit/autopsy/casemodule/Bundle.properties" key="CasePropertiesForm.tbDbType.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
@@ -329,6 +410,11 @@
     </Component>
     <Component class="javax.swing.JLabel" name="lbDbName">
       <Properties>
+        <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+          <FontInfo relative="true">
+            <Font bold="false" component="lbDbName" property="font" relativeSize="false" size="11"/>
+          </FontInfo>
+        </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
           <ResourceString bundle="org/sleuthkit/autopsy/casemodule/Bundle.properties" key="CasePropertiesForm.lbDbName.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
@@ -337,6 +423,11 @@
     <Component class="javax.swing.JTextField" name="tbDbName">
       <Properties>
         <Property name="editable" type="boolean" value="false"/>
+        <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+          <FontInfo relative="true">
+            <Font bold="false" component="tbDbName" property="font" relativeSize="false" size="11"/>
+          </FontInfo>
+        </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
           <ResourceString bundle="org/sleuthkit/autopsy/casemodule/Bundle.properties" key="CasePropertiesForm.tbDbName.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/CasePropertiesForm.java b/Core/src/org/sleuthkit/autopsy/casemodule/CasePropertiesForm.java
index 89cbaad77a..043fffacf8 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/CasePropertiesForm.java
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/CasePropertiesForm.java
@@ -174,8 +174,6 @@ class CasePropertiesForm extends javax.swing.JPanel {
      */
     @SuppressWarnings("unchecked")
     // <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
-    @NbBundle.Messages({"CasePropertiesForm.imagesTable.path=Path",
-            "CasePropertiesForm.imagesTable.remove=Remove"})
     private void initComponents() {
 
         jScrollPane1 = new javax.swing.JScrollPane();
@@ -208,21 +206,27 @@ class CasePropertiesForm extends javax.swing.JPanel {
         jTextArea1.setRows(5);
         jScrollPane1.setViewportView(jTextArea1);
 
-        casePropLabel.setFont(casePropLabel.getFont().deriveFont(Font.BOLD, 24));
+        casePropLabel.setFont(casePropLabel.getFont().deriveFont(casePropLabel.getFont().getStyle() | java.awt.Font.BOLD, 24));
         casePropLabel.setHorizontalAlignment(javax.swing.SwingConstants.CENTER);
         casePropLabel.setText(org.openide.util.NbBundle.getMessage(CasePropertiesForm.class, "CasePropertiesForm.casePropLabel.text")); // NOI18N
 
+        caseNameLabel.setFont(caseNameLabel.getFont().deriveFont(caseNameLabel.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         caseNameLabel.setText(org.openide.util.NbBundle.getMessage(CasePropertiesForm.class, "CasePropertiesForm.caseNameLabel.text")); // NOI18N
 
+        crDateLabel.setFont(crDateLabel.getFont().deriveFont(crDateLabel.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         crDateLabel.setText(org.openide.util.NbBundle.getMessage(CasePropertiesForm.class, "CasePropertiesForm.crDateLabel.text")); // NOI18N
 
+        caseDirLabel.setFont(caseDirLabel.getFont().deriveFont(caseDirLabel.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         caseDirLabel.setText(org.openide.util.NbBundle.getMessage(CasePropertiesForm.class, "CasePropertiesForm.caseDirLabel.text")); // NOI18N
 
         crDateTextField.setEditable(false);
+        crDateTextField.setFont(crDateTextField.getFont().deriveFont(crDateTextField.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         crDateTextField.setText(org.openide.util.NbBundle.getMessage(CasePropertiesForm.class, "CasePropertiesForm.crDateTextField.text")); // NOI18N
 
+        caseNameTextField.setFont(caseNameTextField.getFont().deriveFont(caseNameTextField.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         caseNameTextField.setText(org.openide.util.NbBundle.getMessage(CasePropertiesForm.class, "CasePropertiesForm.caseNameTextField.text")); // NOI18N
 
+        updateCaseNameButton.setFont(updateCaseNameButton.getFont().deriveFont(updateCaseNameButton.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         updateCaseNameButton.setText(org.openide.util.NbBundle.getMessage(CasePropertiesForm.class, "CasePropertiesForm.updateCaseNameButton.text")); // NOI18N
         updateCaseNameButton.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
@@ -230,21 +234,22 @@ class CasePropertiesForm extends javax.swing.JPanel {
             }
         });
 
-        genInfoLabel.setFont(genInfoLabel.getFont().deriveFont(Font.BOLD, 14));
+        genInfoLabel.setFont(genInfoLabel.getFont().deriveFont(genInfoLabel.getFont().getStyle() | java.awt.Font.BOLD, 14));
         genInfoLabel.setText(org.openide.util.NbBundle.getMessage(CasePropertiesForm.class, "CasePropertiesForm.genInfoLabel.text")); // NOI18N
 
-        imgInfoLabel.setFont(imgInfoLabel.getFont().deriveFont(Font.BOLD, 14));
+        imgInfoLabel.setFont(imgInfoLabel.getFont().deriveFont(imgInfoLabel.getFont().getStyle() | java.awt.Font.BOLD, 14));
         imgInfoLabel.setText(org.openide.util.NbBundle.getMessage(CasePropertiesForm.class, "CasePropertiesForm.imgInfoLabel.text")); // NOI18N
 
+        OKButton.setFont(OKButton.getFont().deriveFont(OKButton.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         OKButton.setText(org.openide.util.NbBundle.getMessage(CasePropertiesForm.class, "CasePropertiesForm.OKButton.text")); // NOI18N
 
+        imagesTable.setFont(imagesTable.getFont().deriveFont(imagesTable.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         imagesTable.setModel(new javax.swing.table.DefaultTableModel(
             new Object [][] {
 
             },
             new String [] {
-                Bundle.CasePropertiesForm_imagesTable_path(),
-                Bundle.CasePropertiesForm_imagesTable_remove()
+                "Path", "Remove"
             }
         ) {
             boolean[] canEdit = new boolean [] {
@@ -268,6 +273,7 @@ class CasePropertiesForm extends javax.swing.JPanel {
         caseDirTextArea.setRequestFocusEnabled(false);
         jScrollPane2.setViewportView(caseDirTextArea);
 
+        deleteCaseButton.setFont(deleteCaseButton.getFont().deriveFont(deleteCaseButton.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         deleteCaseButton.setText(org.openide.util.NbBundle.getMessage(CasePropertiesForm.class, "CasePropertiesForm.deleteCaseButton.text")); // NOI18N
         deleteCaseButton.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
@@ -275,24 +281,32 @@ class CasePropertiesForm extends javax.swing.JPanel {
             }
         });
 
+        caseNumberLabel.setFont(caseNumberLabel.getFont().deriveFont(caseNumberLabel.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         caseNumberLabel.setText(org.openide.util.NbBundle.getMessage(CasePropertiesForm.class, "CasePropertiesForm.caseNumberLabel.text")); // NOI18N
 
+        examinerLabel.setFont(examinerLabel.getFont().deriveFont(examinerLabel.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         examinerLabel.setText(org.openide.util.NbBundle.getMessage(CasePropertiesForm.class, "CasePropertiesForm.examinerLabel.text")); // NOI18N
 
         caseNumberTextField.setEditable(false);
+        caseNumberTextField.setFont(caseNumberTextField.getFont().deriveFont(caseNumberTextField.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         caseNumberTextField.setText(org.openide.util.NbBundle.getMessage(CasePropertiesForm.class, "CasePropertiesForm.caseNumberTextField.text")); // NOI18N
 
         examinerTextField.setEditable(false);
+        examinerTextField.setFont(examinerTextField.getFont().deriveFont(examinerTextField.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         examinerTextField.setText(org.openide.util.NbBundle.getMessage(CasePropertiesForm.class, "CasePropertiesForm.examinerTextField.text")); // NOI18N
 
+        lbDbType.setFont(lbDbType.getFont().deriveFont(lbDbType.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         lbDbType.setText(org.openide.util.NbBundle.getMessage(CasePropertiesForm.class, "CasePropertiesForm.lbDbType.text")); // NOI18N
 
         tbDbType.setEditable(false);
+        tbDbType.setFont(tbDbType.getFont().deriveFont(tbDbType.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         tbDbType.setText(org.openide.util.NbBundle.getMessage(CasePropertiesForm.class, "CasePropertiesForm.tbDbType.text")); // NOI18N
 
+        lbDbName.setFont(lbDbName.getFont().deriveFont(lbDbName.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         lbDbName.setText(org.openide.util.NbBundle.getMessage(CasePropertiesForm.class, "CasePropertiesForm.lbDbName.text")); // NOI18N
 
         tbDbName.setEditable(false);
+        tbDbName.setFont(tbDbName.getFont().deriveFont(tbDbName.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         tbDbName.setText(org.openide.util.NbBundle.getMessage(CasePropertiesForm.class, "CasePropertiesForm.tbDbName.text")); // NOI18N
 
         javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/CueBannerPanel.form b/Core/src/org/sleuthkit/autopsy/casemodule/CueBannerPanel.form
index 57670e96aa..223b83b7d4 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/CueBannerPanel.form
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/CueBannerPanel.form
@@ -129,8 +129,10 @@
     </Component>
     <Component class="javax.swing.JLabel" name="createNewLabel">
       <Properties>
-        <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
-          <Font name="Tahoma" size="13" style="0"/>
+        <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+          <FontInfo relative="true">
+            <Font bold="false" component="createNewLabel" property="font" relativeSize="false" size="13"/>
+          </FontInfo>
         </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
           <ResourceString bundle="org/sleuthkit/autopsy/casemodule/Bundle.properties" key="CueBannerPanel.createNewLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
@@ -139,8 +141,10 @@
     </Component>
     <Component class="javax.swing.JLabel" name="openRecentLabel">
       <Properties>
-        <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
-          <Font name="Tahoma" size="13" style="0"/>
+        <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+          <FontInfo relative="true">
+            <Font bold="false" component="openRecentLabel" property="font" relativeSize="false" size="13"/>
+          </FontInfo>
         </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
           <ResourceString bundle="org/sleuthkit/autopsy/casemodule/Bundle.properties" key="CueBannerPanel.openRecentLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
@@ -173,8 +177,10 @@
     </Component>
     <Component class="javax.swing.JLabel" name="openLabel">
       <Properties>
-        <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
-          <Font name="Tahoma" size="13" style="0"/>
+        <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+          <FontInfo relative="true">
+            <Font bold="false" component="openLabel" property="font" relativeSize="false" size="13"/>
+          </FontInfo>
         </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
           <ResourceString bundle="org/sleuthkit/autopsy/casemodule/Bundle.properties" key="CueBannerPanel.openLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
@@ -183,6 +189,11 @@
     </Component>
     <Component class="javax.swing.JButton" name="closeButton">
       <Properties>
+        <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+          <FontInfo relative="true">
+            <Font bold="false" component="closeButton" property="font" relativeSize="false" size="11"/>
+          </FontInfo>
+        </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
           <ResourceString bundle="org/sleuthkit/autopsy/casemodule/Bundle.properties" key="CueBannerPanel.closeButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/CueBannerPanel.java b/Core/src/org/sleuthkit/autopsy/casemodule/CueBannerPanel.java
index b409e42830..9326bbb8d9 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/CueBannerPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/CueBannerPanel.java
@@ -77,10 +77,10 @@ public class CueBannerPanel extends javax.swing.JPanel {
         closeButton = new javax.swing.JButton();
         jSeparator1 = new javax.swing.JSeparator();
 
-        autopsyLogo.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/casemodule/welcome_logo.png"))); // NOI18N NON-NLS
+        autopsyLogo.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/casemodule/welcome_logo.png"))); // NOI18N
         autopsyLogo.setText(org.openide.util.NbBundle.getMessage(CueBannerPanel.class, "CueBannerPanel.autopsyLogo.text")); // NOI18N
 
-        newCaseButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/casemodule/btn_icon_create_new_case.png"))); // NOI18N NON-NLS
+        newCaseButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/casemodule/btn_icon_create_new_case.png"))); // NOI18N
         newCaseButton.setText(org.openide.util.NbBundle.getMessage(CueBannerPanel.class, "CueBannerPanel.newCaseButton.text")); // NOI18N
         newCaseButton.setBorder(null);
         newCaseButton.setBorderPainted(false);
@@ -92,7 +92,7 @@ public class CueBannerPanel extends javax.swing.JPanel {
             }
         });
 
-        openRecentButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/casemodule/btn_icon_open_recent.png"))); // NOI18N NON-NLS
+        openRecentButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/casemodule/btn_icon_open_recent.png"))); // NOI18N
         openRecentButton.setText(org.openide.util.NbBundle.getMessage(CueBannerPanel.class, "CueBannerPanel.openRecentButton.text")); // NOI18N
         openRecentButton.setBorder(null);
         openRecentButton.setBorderPainted(false);
@@ -104,13 +104,13 @@ public class CueBannerPanel extends javax.swing.JPanel {
             }
         });
 
-        createNewLabel.setFont(createNewLabel.getFont().deriveFont(Font.PLAIN, 13));
+        createNewLabel.setFont(createNewLabel.getFont().deriveFont(createNewLabel.getFont().getStyle() & ~java.awt.Font.BOLD, 13));
         createNewLabel.setText(org.openide.util.NbBundle.getMessage(CueBannerPanel.class, "CueBannerPanel.createNewLabel.text")); // NOI18N
 
-        openRecentLabel.setFont(openRecentLabel.getFont().deriveFont(Font.PLAIN, 13));
+        openRecentLabel.setFont(openRecentLabel.getFont().deriveFont(openRecentLabel.getFont().getStyle() & ~java.awt.Font.BOLD, 13));
         openRecentLabel.setText(org.openide.util.NbBundle.getMessage(CueBannerPanel.class, "CueBannerPanel.openRecentLabel.text")); // NOI18N
 
-        openCaseButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/casemodule/btn_icon_open_existing.png"))); // NOI18N NON-NLS
+        openCaseButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/casemodule/btn_icon_open_existing.png"))); // NOI18N
         openCaseButton.setText(org.openide.util.NbBundle.getMessage(CueBannerPanel.class, "CueBannerPanel.openCaseButton.text")); // NOI18N
         openCaseButton.setBorder(null);
         openCaseButton.setBorderPainted(false);
@@ -123,9 +123,10 @@ public class CueBannerPanel extends javax.swing.JPanel {
             }
         });
 
-        openLabel.setFont(openLabel.getFont().deriveFont(Font.PLAIN, 13));
+        openLabel.setFont(openLabel.getFont().deriveFont(openLabel.getFont().getStyle() & ~java.awt.Font.BOLD, 13));
         openLabel.setText(org.openide.util.NbBundle.getMessage(CueBannerPanel.class, "CueBannerPanel.openLabel.text")); // NOI18N
 
+        closeButton.setFont(closeButton.getFont().deriveFont(closeButton.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         closeButton.setText(org.openide.util.NbBundle.getMessage(CueBannerPanel.class, "CueBannerPanel.closeButton.text")); // NOI18N
 
         jSeparator1.setOrientation(javax.swing.SwingConstants.VERTICAL);
diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/LocalDiskPanel.form b/Core/src/org/sleuthkit/autopsy/casemodule/LocalDiskPanel.form
index 55707d9f0c..b1409546e6 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/LocalDiskPanel.form
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/LocalDiskPanel.form
@@ -69,6 +69,11 @@
   <SubComponents>
     <Component class="javax.swing.JLabel" name="diskLabel">
       <Properties>
+        <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+          <FontInfo relative="true">
+            <Font bold="false" component="diskLabel" property="font" relativeSize="false" size="11"/>
+          </FontInfo>
+        </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
           <ResourceString bundle="org/sleuthkit/autopsy/casemodule/Bundle.properties" key="LocalDiskPanel.diskLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
@@ -76,6 +81,11 @@
     </Component>
     <Component class="javax.swing.JComboBox" name="diskComboBox">
       <Properties>
+        <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+          <FontInfo relative="true">
+            <Font bold="false" component="diskComboBox" property="font" relativeSize="false" size="11"/>
+          </FontInfo>
+        </Property>
         <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor">
           <StringArray count="0"/>
         </Property>
@@ -87,6 +97,11 @@
     </Component>
     <Component class="javax.swing.JLabel" name="errorLabel">
       <Properties>
+        <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+          <FontInfo relative="true">
+            <Font bold="false" component="errorLabel" property="font" relativeSize="false" size="11"/>
+          </FontInfo>
+        </Property>
         <Property name="foreground" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
           <Color blue="0" green="0" red="ff" type="rgb"/>
         </Property>
@@ -97,6 +112,11 @@
     </Component>
     <Component class="javax.swing.JLabel" name="timeZoneLabel">
       <Properties>
+        <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+          <FontInfo relative="true">
+            <Font bold="false" component="timeZoneLabel" property="font" relativeSize="false" size="11"/>
+          </FontInfo>
+        </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
           <ResourceString bundle="org/sleuthkit/autopsy/casemodule/Bundle.properties" key="LocalDiskPanel.timeZoneLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
@@ -104,6 +124,11 @@
     </Component>
     <Component class="javax.swing.JComboBox" name="timeZoneComboBox">
       <Properties>
+        <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+          <FontInfo relative="true">
+            <Font bold="false" component="timeZoneComboBox" property="font" relativeSize="false" size="11"/>
+          </FontInfo>
+        </Property>
         <Property name="maximumRowCount" type="int" value="30"/>
         <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor">
           <StringArray count="0"/>
@@ -115,6 +140,11 @@
     </Component>
     <Component class="javax.swing.JCheckBox" name="noFatOrphansCheckbox">
       <Properties>
+        <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+          <FontInfo relative="true">
+            <Font bold="false" component="noFatOrphansCheckbox" property="font" relativeSize="false" size="11"/>
+          </FontInfo>
+        </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
           <ResourceString bundle="org/sleuthkit/autopsy/casemodule/Bundle.properties" key="LocalDiskPanel.noFatOrphansCheckbox.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
@@ -125,6 +155,11 @@
     </Component>
     <Component class="javax.swing.JLabel" name="descLabel">
       <Properties>
+        <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+          <FontInfo relative="true">
+            <Font bold="false" component="descLabel" property="font" relativeSize="false" size="11"/>
+          </FontInfo>
+        </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
           <ResourceString bundle="org/sleuthkit/autopsy/casemodule/Bundle.properties" key="LocalDiskPanel.descLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/LocalDiskPanel.java b/Core/src/org/sleuthkit/autopsy/casemodule/LocalDiskPanel.java
index 669ffad552..c60dce298e 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/LocalDiskPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/LocalDiskPanel.java
@@ -111,25 +111,33 @@ final class LocalDiskPanel extends JPanel {
         diskComboBox = new javax.swing.JComboBox<>();
         errorLabel = new javax.swing.JLabel();
         timeZoneLabel = new javax.swing.JLabel();
-        timeZoneComboBox = new javax.swing.JComboBox<String>();
+        timeZoneComboBox = new javax.swing.JComboBox<>();
         noFatOrphansCheckbox = new javax.swing.JCheckBox();
         descLabel = new javax.swing.JLabel();
 
         setMinimumSize(new java.awt.Dimension(0, 65));
         setPreferredSize(new java.awt.Dimension(485, 65));
 
+        diskLabel.setFont(diskLabel.getFont().deriveFont(diskLabel.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         org.openide.awt.Mnemonics.setLocalizedText(diskLabel, org.openide.util.NbBundle.getMessage(LocalDiskPanel.class, "LocalDiskPanel.diskLabel.text")); // NOI18N
 
+        diskComboBox.setFont(diskComboBox.getFont().deriveFont(diskComboBox.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
+
+        errorLabel.setFont(errorLabel.getFont().deriveFont(errorLabel.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         errorLabel.setForeground(new java.awt.Color(255, 0, 0));
         org.openide.awt.Mnemonics.setLocalizedText(errorLabel, org.openide.util.NbBundle.getMessage(LocalDiskPanel.class, "LocalDiskPanel.errorLabel.text")); // NOI18N
 
+        timeZoneLabel.setFont(timeZoneLabel.getFont().deriveFont(timeZoneLabel.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         org.openide.awt.Mnemonics.setLocalizedText(timeZoneLabel, org.openide.util.NbBundle.getMessage(LocalDiskPanel.class, "LocalDiskPanel.timeZoneLabel.text")); // NOI18N
 
+        timeZoneComboBox.setFont(timeZoneComboBox.getFont().deriveFont(timeZoneComboBox.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         timeZoneComboBox.setMaximumRowCount(30);
 
+        noFatOrphansCheckbox.setFont(noFatOrphansCheckbox.getFont().deriveFont(noFatOrphansCheckbox.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         org.openide.awt.Mnemonics.setLocalizedText(noFatOrphansCheckbox, org.openide.util.NbBundle.getMessage(LocalDiskPanel.class, "LocalDiskPanel.noFatOrphansCheckbox.text")); // NOI18N
         noFatOrphansCheckbox.setToolTipText(org.openide.util.NbBundle.getMessage(LocalDiskPanel.class, "LocalDiskPanel.noFatOrphansCheckbox.toolTipText")); // NOI18N
 
+        descLabel.setFont(descLabel.getFont().deriveFont(descLabel.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         org.openide.awt.Mnemonics.setLocalizedText(descLabel, org.openide.util.NbBundle.getMessage(LocalDiskPanel.class, "LocalDiskPanel.descLabel.text")); // NOI18N
 
         javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/MissingImageDialog.form b/Core/src/org/sleuthkit/autopsy/casemodule/MissingImageDialog.form
index 8225797395..e57b005115 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/MissingImageDialog.form
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/MissingImageDialog.form
@@ -85,6 +85,11 @@
       <SubComponents>
         <Component class="javax.swing.JButton" name="selectButton">
           <Properties>
+            <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+              <FontInfo relative="true">
+                <Font bold="false" component="selectButton" property="font" relativeSize="false" size="11"/>
+              </FontInfo>
+            </Property>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
               <ResourceString bundle="org/sleuthkit/autopsy/casemodule/Bundle.properties" key="MissingImageDialog.selectButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
             </Property>
@@ -95,6 +100,11 @@
         </Component>
         <Component class="javax.swing.JButton" name="cancelButton">
           <Properties>
+            <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+              <FontInfo relative="true">
+                <Font bold="false" component="cancelButton" property="font" relativeSize="false" size="11"/>
+              </FontInfo>
+            </Property>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
               <ResourceString bundle="org/sleuthkit/autopsy/casemodule/Bundle.properties" key="MissingImageDialog.cancelButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
             </Property>
@@ -142,6 +152,11 @@
       <SubComponents>
         <Component class="javax.swing.JTextField" name="pathNameTextField">
           <Properties>
+            <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+              <FontInfo relative="true">
+                <Font bold="false" component="pathNameTextField" property="font" relativeSize="false" size="11"/>
+              </FontInfo>
+            </Property>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
               <ResourceString bundle="org/sleuthkit/autopsy/casemodule/Bundle.properties" key="MissingImageDialog.pathNameTextField.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
             </Property>
@@ -152,6 +167,11 @@
         </Component>
         <Component class="javax.swing.JButton" name="browseButton">
           <Properties>
+            <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+              <FontInfo relative="true">
+                <Font bold="false" component="browseButton" property="font" relativeSize="false" size="11"/>
+              </FontInfo>
+            </Property>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
               <ResourceString bundle="org/sleuthkit/autopsy/casemodule/Bundle.properties" key="MissingImageDialog.browseButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
             </Property>
@@ -162,8 +182,10 @@
         </Component>
         <Component class="javax.swing.JLabel" name="lbWarning">
           <Properties>
-            <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
-              <Font name="Tahoma" size="12" style="1"/>
+            <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+              <FontInfo relative="true">
+                <Font bold="true" component="lbWarning" property="font" relativeSize="false" size="12"/>
+              </FontInfo>
             </Property>
             <Property name="foreground" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
               <Color blue="0" green="0" red="f4" type="rgb"/>
@@ -180,8 +202,10 @@
     </Container>
     <Component class="javax.swing.JLabel" name="titleLabel">
       <Properties>
-        <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
-          <Font name="Tahoma" size="12" style="1"/>
+        <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+          <FontInfo relative="true">
+            <Font bold="true" component="titleLabel" property="font" relativeSize="false" size="12"/>
+          </FontInfo>
         </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
           <ResourceString bundle="org/sleuthkit/autopsy/casemodule/Bundle.properties" key="MissingImageDialog.titleLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/MissingImageDialog.java b/Core/src/org/sleuthkit/autopsy/casemodule/MissingImageDialog.java
index 18b2c5b8e8..301f8e8af2 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/MissingImageDialog.java
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/MissingImageDialog.java
@@ -143,6 +143,7 @@ class MissingImageDialog extends javax.swing.JDialog {
 
         setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE);
 
+        selectButton.setFont(selectButton.getFont().deriveFont(selectButton.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         org.openide.awt.Mnemonics.setLocalizedText(selectButton, org.openide.util.NbBundle.getMessage(MissingImageDialog.class, "MissingImageDialog.selectButton.text")); // NOI18N
         selectButton.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
@@ -150,6 +151,7 @@ class MissingImageDialog extends javax.swing.JDialog {
             }
         });
 
+        cancelButton.setFont(cancelButton.getFont().deriveFont(cancelButton.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         org.openide.awt.Mnemonics.setLocalizedText(cancelButton, org.openide.util.NbBundle.getMessage(MissingImageDialog.class, "MissingImageDialog.cancelButton.text")); // NOI18N
         cancelButton.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
@@ -178,6 +180,7 @@ class MissingImageDialog extends javax.swing.JDialog {
                 .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
         );
 
+        pathNameTextField.setFont(pathNameTextField.getFont().deriveFont(pathNameTextField.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         pathNameTextField.setText(org.openide.util.NbBundle.getMessage(MissingImageDialog.class, "MissingImageDialog.pathNameTextField.text")); // NOI18N
         pathNameTextField.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
@@ -185,6 +188,7 @@ class MissingImageDialog extends javax.swing.JDialog {
             }
         });
 
+        browseButton.setFont(browseButton.getFont().deriveFont(browseButton.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         org.openide.awt.Mnemonics.setLocalizedText(browseButton, org.openide.util.NbBundle.getMessage(MissingImageDialog.class, "MissingImageDialog.browseButton.text")); // NOI18N
         browseButton.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
@@ -192,7 +196,7 @@ class MissingImageDialog extends javax.swing.JDialog {
             }
         });
 
-        lbWarning.setFont(lbWarning.getFont().deriveFont(Font.BOLD, 12));
+        lbWarning.setFont(lbWarning.getFont().deriveFont(lbWarning.getFont().getStyle() | java.awt.Font.BOLD, 12));
         lbWarning.setForeground(new java.awt.Color(244, 0, 0));
         org.openide.awt.Mnemonics.setLocalizedText(lbWarning, org.openide.util.NbBundle.getMessage(MissingImageDialog.class, "MissingImageDialog.lbWarning.text")); // NOI18N
         lbWarning.setToolTipText(org.openide.util.NbBundle.getMessage(MissingImageDialog.class, "MissingImageDialog.lbWarning.toolTipText")); // NOI18N
@@ -223,7 +227,7 @@ class MissingImageDialog extends javax.swing.JDialog {
                 .addGap(18, 18, 18))
         );
 
-        titleLabel.setFont(titleLabel.getFont().deriveFont(Font.BOLD, 12));
+        titleLabel.setFont(titleLabel.getFont().deriveFont(titleLabel.getFont().getStyle() | java.awt.Font.BOLD, 12));
         org.openide.awt.Mnemonics.setLocalizedText(titleLabel, org.openide.util.NbBundle.getMessage(MissingImageDialog.class, "MissingImageDialog.titleLabel.text")); // NOI18N
 
         titleSeparator.setForeground(new java.awt.Color(102, 102, 102));
diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseVisualPanel1.form b/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseVisualPanel1.form
index 76bdf8ace0..72b0a6cb9b 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseVisualPanel1.form
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseVisualPanel1.form
@@ -105,8 +105,10 @@
   <SubComponents>
     <Component class="javax.swing.JLabel" name="jLabel1">
       <Properties>
-        <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
-          <Font name="Tahoma" size="14" style="1"/>
+        <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+          <FontInfo relative="true">
+            <Font bold="true" component="jLabel1" property="font" relativeSize="false" size="14"/>
+          </FontInfo>
         </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
           <ResourceString bundle="org/sleuthkit/autopsy/casemodule/Bundle.properties" key="NewCaseVisualPanel1.jLabel1.text_1" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
@@ -115,6 +117,11 @@
     </Component>
     <Component class="javax.swing.JLabel" name="caseNameLabel">
       <Properties>
+        <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+          <FontInfo relative="true">
+            <Font bold="false" component="caseNameLabel" property="font" relativeSize="false" size="11"/>
+          </FontInfo>
+        </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
           <ResourceString bundle="org/sleuthkit/autopsy/casemodule/Bundle.properties" key="NewCaseVisualPanel1.caseNameLabel.text_1" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
@@ -122,6 +129,11 @@
     </Component>
     <Component class="javax.swing.JLabel" name="caseDirLabel">
       <Properties>
+        <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+          <FontInfo relative="true">
+            <Font bold="false" component="caseDirLabel" property="font" relativeSize="false" size="11"/>
+          </FontInfo>
+        </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
           <ResourceString bundle="org/sleuthkit/autopsy/casemodule/Bundle.properties" key="NewCaseVisualPanel1.caseDirLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
@@ -129,6 +141,11 @@
     </Component>
     <Component class="javax.swing.JTextField" name="caseNameTextField">
       <Properties>
+        <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+          <FontInfo relative="true">
+            <Font bold="false" component="caseNameTextField" property="font" relativeSize="false" size="11"/>
+          </FontInfo>
+        </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
           <ResourceString bundle="org/sleuthkit/autopsy/casemodule/Bundle.properties" key="NewCaseVisualPanel1.caseNameTextField.text_1" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
@@ -136,6 +153,11 @@
     </Component>
     <Component class="javax.swing.JTextField" name="caseParentDirTextField">
       <Properties>
+        <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+          <FontInfo relative="true">
+            <Font bold="false" component="caseParentDirTextField" property="font" relativeSize="false" size="11"/>
+          </FontInfo>
+        </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
           <ResourceString bundle="org/sleuthkit/autopsy/casemodule/Bundle.properties" key="NewCaseVisualPanel1.caseParentDirTextField.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
@@ -143,6 +165,11 @@
     </Component>
     <Component class="javax.swing.JButton" name="caseDirBrowseButton">
       <Properties>
+        <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+          <FontInfo relative="true">
+            <Font bold="false" component="caseDirBrowseButton" property="font" relativeSize="false" size="11"/>
+          </FontInfo>
+        </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
           <ResourceString bundle="org/sleuthkit/autopsy/casemodule/Bundle.properties" key="NewCaseVisualPanel1.caseDirBrowseButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
@@ -153,6 +180,11 @@
     </Component>
     <Component class="javax.swing.JLabel" name="jLabel2">
       <Properties>
+        <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+          <FontInfo relative="true">
+            <Font bold="false" component="jLabel2" property="font" relativeSize="false" size="11"/>
+          </FontInfo>
+        </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
           <ResourceString bundle="org/sleuthkit/autopsy/casemodule/Bundle.properties" key="NewCaseVisualPanel1.jLabel2.text_1" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
@@ -161,6 +193,11 @@
     <Component class="javax.swing.JTextField" name="caseDirTextField">
       <Properties>
         <Property name="editable" type="boolean" value="false"/>
+        <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+          <FontInfo relative="true">
+            <Font bold="false" component="caseDirTextField" property="font" relativeSize="false" size="11"/>
+          </FontInfo>
+        </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
           <ResourceString bundle="org/sleuthkit/autopsy/casemodule/Bundle.properties" key="NewCaseVisualPanel1.caseDirTextField.text_1" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
@@ -171,6 +208,11 @@
         <Property name="buttonGroup" type="javax.swing.ButtonGroup" editor="org.netbeans.modules.form.RADComponent$ButtonGroupPropertyEditor">
           <ComponentRef name="caseTypeButtonGroup"/>
         </Property>
+        <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+          <FontInfo relative="true">
+            <Font bold="false" component="singleUserCaseRadioButton" property="font" relativeSize="false" size="11"/>
+          </FontInfo>
+        </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
           <ResourceString bundle="org/sleuthkit/autopsy/casemodule/Bundle.properties" key="NewCaseVisualPanel1.singleUserCaseRadioButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
@@ -184,6 +226,11 @@
         <Property name="buttonGroup" type="javax.swing.ButtonGroup" editor="org.netbeans.modules.form.RADComponent$ButtonGroupPropertyEditor">
           <ComponentRef name="caseTypeButtonGroup"/>
         </Property>
+        <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+          <FontInfo relative="true">
+            <Font bold="false" component="multiUserCaseRadioButton" property="font" relativeSize="false" size="11"/>
+          </FontInfo>
+        </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
           <ResourceString bundle="org/sleuthkit/autopsy/casemodule/Bundle.properties" key="NewCaseVisualPanel1.multiUserCaseRadioButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
@@ -194,6 +241,11 @@
     </Component>
     <Component class="javax.swing.JLabel" name="caseParentDirWarningLabel">
       <Properties>
+        <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+          <FontInfo relative="true">
+            <Font bold="false" component="caseParentDirWarningLabel" property="font" relativeSize="false" size="11"/>
+          </FontInfo>
+        </Property>
         <Property name="foreground" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
           <Color blue="0" green="0" red="ff" type="rgb"/>
         </Property>
@@ -204,6 +256,11 @@
     </Component>
     <Component class="javax.swing.JLabel" name="caseTypeLabel">
       <Properties>
+        <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+          <FontInfo relative="true">
+            <Font bold="false" component="caseTypeLabel" property="font" relativeSize="false" size="11"/>
+          </FontInfo>
+        </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
           <ResourceString bundle="org/sleuthkit/autopsy/casemodule/Bundle.properties" key="NewCaseVisualPanel1.caseTypeLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseVisualPanel1.java b/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseVisualPanel1.java
index 3dde0a0056..d3f19f872c 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseVisualPanel1.java
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseVisualPanel1.java
@@ -215,17 +215,22 @@ final class NewCaseVisualPanel1 extends JPanel implements DocumentListener {
         caseParentDirWarningLabel = new javax.swing.JLabel();
         caseTypeLabel = new javax.swing.JLabel();
 
-        jLabel1.setFont(jLabel1.getFont().deriveFont(Font.BOLD, 14));
+        jLabel1.setFont(jLabel1.getFont().deriveFont(jLabel1.getFont().getStyle() | java.awt.Font.BOLD, 14));
         org.openide.awt.Mnemonics.setLocalizedText(jLabel1, org.openide.util.NbBundle.getMessage(NewCaseVisualPanel1.class, "NewCaseVisualPanel1.jLabel1.text_1")); // NOI18N
 
+        caseNameLabel.setFont(caseNameLabel.getFont().deriveFont(caseNameLabel.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         org.openide.awt.Mnemonics.setLocalizedText(caseNameLabel, org.openide.util.NbBundle.getMessage(NewCaseVisualPanel1.class, "NewCaseVisualPanel1.caseNameLabel.text_1")); // NOI18N
 
+        caseDirLabel.setFont(caseDirLabel.getFont().deriveFont(caseDirLabel.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         org.openide.awt.Mnemonics.setLocalizedText(caseDirLabel, org.openide.util.NbBundle.getMessage(NewCaseVisualPanel1.class, "NewCaseVisualPanel1.caseDirLabel.text")); // NOI18N
 
+        caseNameTextField.setFont(caseNameTextField.getFont().deriveFont(caseNameTextField.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         caseNameTextField.setText(org.openide.util.NbBundle.getMessage(NewCaseVisualPanel1.class, "NewCaseVisualPanel1.caseNameTextField.text_1")); // NOI18N
 
+        caseParentDirTextField.setFont(caseParentDirTextField.getFont().deriveFont(caseParentDirTextField.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         caseParentDirTextField.setText(org.openide.util.NbBundle.getMessage(NewCaseVisualPanel1.class, "NewCaseVisualPanel1.caseParentDirTextField.text")); // NOI18N
 
+        caseDirBrowseButton.setFont(caseDirBrowseButton.getFont().deriveFont(caseDirBrowseButton.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         org.openide.awt.Mnemonics.setLocalizedText(caseDirBrowseButton, org.openide.util.NbBundle.getMessage(NewCaseVisualPanel1.class, "NewCaseVisualPanel1.caseDirBrowseButton.text")); // NOI18N
         caseDirBrowseButton.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
@@ -233,12 +238,15 @@ final class NewCaseVisualPanel1 extends JPanel implements DocumentListener {
             }
         });
 
+        jLabel2.setFont(jLabel2.getFont().deriveFont(jLabel2.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         org.openide.awt.Mnemonics.setLocalizedText(jLabel2, org.openide.util.NbBundle.getMessage(NewCaseVisualPanel1.class, "NewCaseVisualPanel1.jLabel2.text_1")); // NOI18N
 
         caseDirTextField.setEditable(false);
+        caseDirTextField.setFont(caseDirTextField.getFont().deriveFont(caseDirTextField.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         caseDirTextField.setText(org.openide.util.NbBundle.getMessage(NewCaseVisualPanel1.class, "NewCaseVisualPanel1.caseDirTextField.text_1")); // NOI18N
 
         caseTypeButtonGroup.add(singleUserCaseRadioButton);
+        singleUserCaseRadioButton.setFont(singleUserCaseRadioButton.getFont().deriveFont(singleUserCaseRadioButton.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         org.openide.awt.Mnemonics.setLocalizedText(singleUserCaseRadioButton, org.openide.util.NbBundle.getMessage(NewCaseVisualPanel1.class, "NewCaseVisualPanel1.singleUserCaseRadioButton.text")); // NOI18N
         singleUserCaseRadioButton.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
@@ -247,6 +255,7 @@ final class NewCaseVisualPanel1 extends JPanel implements DocumentListener {
         });
 
         caseTypeButtonGroup.add(multiUserCaseRadioButton);
+        multiUserCaseRadioButton.setFont(multiUserCaseRadioButton.getFont().deriveFont(multiUserCaseRadioButton.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         org.openide.awt.Mnemonics.setLocalizedText(multiUserCaseRadioButton, org.openide.util.NbBundle.getMessage(NewCaseVisualPanel1.class, "NewCaseVisualPanel1.multiUserCaseRadioButton.text")); // NOI18N
         multiUserCaseRadioButton.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
@@ -254,9 +263,11 @@ final class NewCaseVisualPanel1 extends JPanel implements DocumentListener {
             }
         });
 
+        caseParentDirWarningLabel.setFont(caseParentDirWarningLabel.getFont().deriveFont(caseParentDirWarningLabel.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         caseParentDirWarningLabel.setForeground(new java.awt.Color(255, 0, 0));
         org.openide.awt.Mnemonics.setLocalizedText(caseParentDirWarningLabel, org.openide.util.NbBundle.getMessage(NewCaseVisualPanel1.class, "NewCaseVisualPanel1.caseParentDirWarningLabel.text")); // NOI18N
 
+        caseTypeLabel.setFont(caseTypeLabel.getFont().deriveFont(caseTypeLabel.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         org.openide.awt.Mnemonics.setLocalizedText(caseTypeLabel, org.openide.util.NbBundle.getMessage(NewCaseVisualPanel1.class, "NewCaseVisualPanel1.caseTypeLabel.text")); // NOI18N
 
         javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseVisualPanel2.form b/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseVisualPanel2.form
index dccd11860d..fcce5c4033 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseVisualPanel2.form
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseVisualPanel2.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">
   <AuxValues>
@@ -58,6 +58,11 @@
   <SubComponents>
     <Component class="javax.swing.JTextField" name="caseNumberTextField">
       <Properties>
+        <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+          <FontInfo relative="true">
+            <Font bold="false" component="caseNumberTextField" property="font" relativeSize="false" size="11"/>
+          </FontInfo>
+        </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
           <ResourceString bundle="org/sleuthkit/autopsy/casemodule/Bundle.properties" key="NewCaseVisualPanel2.caseNumberTextField.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
@@ -65,6 +70,11 @@
     </Component>
     <Component class="javax.swing.JTextField" name="examinerTextField">
       <Properties>
+        <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+          <FontInfo relative="true">
+            <Font bold="false" component="examinerTextField" property="font" relativeSize="false" size="11"/>
+          </FontInfo>
+        </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
           <ResourceString bundle="org/sleuthkit/autopsy/casemodule/Bundle.properties" key="NewCaseVisualPanel2.examinerTextField.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
@@ -72,6 +82,11 @@
     </Component>
     <Component class="javax.swing.JLabel" name="caseNumberLabel">
       <Properties>
+        <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+          <FontInfo relative="true">
+            <Font bold="false" component="caseNumberLabel" property="font" relativeSize="false" size="11"/>
+          </FontInfo>
+        </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
           <ResourceString bundle="org/sleuthkit/autopsy/casemodule/Bundle.properties" key="NewCaseVisualPanel2.caseNumberLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
@@ -79,6 +94,11 @@
     </Component>
     <Component class="javax.swing.JLabel" name="examinerLabel">
       <Properties>
+        <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+          <FontInfo relative="true">
+            <Font bold="false" component="examinerLabel" property="font" relativeSize="false" size="11"/>
+          </FontInfo>
+        </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
           <ResourceString bundle="org/sleuthkit/autopsy/casemodule/Bundle.properties" key="NewCaseVisualPanel2.examinerLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
@@ -86,8 +106,10 @@
     </Component>
     <Component class="javax.swing.JLabel" name="optionalLabel">
       <Properties>
-        <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
-          <Font name="Tahoma" size="14" style="1"/>
+        <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+          <FontInfo relative="true">
+            <Font bold="true" component="optionalLabel" property="font" relativeSize="false" size="14"/>
+          </FontInfo>
         </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
           <ResourceString bundle="org/sleuthkit/autopsy/casemodule/Bundle.properties" key="NewCaseVisualPanel2.optionalLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseVisualPanel2.java b/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseVisualPanel2.java
index 65ea37b79c..e20fce9aea 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseVisualPanel2.java
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseVisualPanel2.java
@@ -67,15 +67,19 @@ class NewCaseVisualPanel2 extends javax.swing.JPanel {
         examinerLabel = new javax.swing.JLabel();
         optionalLabel = new javax.swing.JLabel();
 
+        caseNumberTextField.setFont(caseNumberTextField.getFont().deriveFont(caseNumberTextField.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         caseNumberTextField.setText(org.openide.util.NbBundle.getMessage(NewCaseVisualPanel2.class, "NewCaseVisualPanel2.caseNumberTextField.text")); // NOI18N
 
+        examinerTextField.setFont(examinerTextField.getFont().deriveFont(examinerTextField.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         examinerTextField.setText(org.openide.util.NbBundle.getMessage(NewCaseVisualPanel2.class, "NewCaseVisualPanel2.examinerTextField.text")); // NOI18N
 
+        caseNumberLabel.setFont(caseNumberLabel.getFont().deriveFont(caseNumberLabel.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         caseNumberLabel.setText(org.openide.util.NbBundle.getMessage(NewCaseVisualPanel2.class, "NewCaseVisualPanel2.caseNumberLabel.text")); // NOI18N
 
+        examinerLabel.setFont(examinerLabel.getFont().deriveFont(examinerLabel.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         examinerLabel.setText(org.openide.util.NbBundle.getMessage(NewCaseVisualPanel2.class, "NewCaseVisualPanel2.examinerLabel.text")); // NOI18N
 
-        optionalLabel.setFont(optionalLabel.getFont().deriveFont(Font.BOLD, 14));
+        optionalLabel.setFont(optionalLabel.getFont().deriveFont(optionalLabel.getFont().getStyle() | java.awt.Font.BOLD, 14));
         optionalLabel.setText(org.openide.util.NbBundle.getMessage(NewCaseVisualPanel2.class, "NewCaseVisualPanel2.optionalLabel.text")); // NOI18N
 
         javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);

From 2ed710544890357f9f2bb552611a244931e7cd88 Mon Sep 17 00:00:00 2001
From: Nick Davis <nick.davis@narfindustries.com>
Date: Wed, 3 Feb 2016 14:07:26 -0500
Subject: [PATCH 28/68] fixed hard coded string in generated form code

---
 .../autopsy/casemodule/Bundle.properties      |  5 ++-
 .../casemodule/CasePropertiesForm.form        | 32 +++++++++++++++++++
 .../casemodule/CasePropertiesForm.java        | 22 ++++++++++++-
 3 files changed, 57 insertions(+), 2 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/Bundle.properties b/Core/src/org/sleuthkit/autopsy/casemodule/Bundle.properties
index f2d9e38e13..6149cf49bb 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/Bundle.properties
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/Bundle.properties
@@ -250,4 +250,7 @@ SingleUserCaseConverter.NonUniqueDatabaseName=Database name not unique.
 SingleUserCaseConverter.UnableToCopySourceImages=Unable to copy source images
 SingleUserCaseConverter.CanNotOpenDatabase=Unable to open database
 CloseCaseWhileIngesting.Warning=Ingest is running. Are you sure you want to close the case?
-CloseCaseWhileIngesting.Warning.title=Warning\: This will close the current case
\ No newline at end of file
+CloseCaseWhileIngesting.Warning.title=Warning\: This will close the current case
+CasePropertiesForm.imagesTable.columnModel.title1=Remove
+
+CasePropertiesForm.imagesTable.columnModel.title0=Path
diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/CasePropertiesForm.form b/Core/src/org/sleuthkit/autopsy/casemodule/CasePropertiesForm.form
index c5ebfa82f4..14b675bc54 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/CasePropertiesForm.form
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/CasePropertiesForm.form
@@ -269,6 +269,13 @@
       </Properties>
     </Component>
     <Container class="javax.swing.JScrollPane" name="imagesTableScrollPane">
+      <Properties>
+        <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+          <FontInfo relative="true">
+            <Font bold="false" component="imagesTableScrollPane" property="font" relativeSize="false" size="11"/>
+          </FontInfo>
+        </Property>
+      </Properties>
       <AuxValues>
         <AuxValue name="autoScrollPane" type="java.lang.Boolean" value="true"/>
       </AuxValues>
@@ -288,6 +295,24 @@
                 <Column editable="true" title="Remove" type="java.lang.Object"/>
               </Table>
             </Property>
+            <Property name="columnModel" type="javax.swing.table.TableColumnModel" editor="org.netbeans.modules.form.editors2.TableColumnModelEditor">
+              <TableColumnModel selectionModel="0">
+                <Column maxWidth="-1" minWidth="-1" prefWidth="-1" resizable="true">
+                  <Title editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+                    <ResourceString bundle="org/sleuthkit/autopsy/casemodule/Bundle.properties" key="CasePropertiesForm.imagesTable.path" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                  </Title>
+                  <Editor/>
+                  <Renderer/>
+                </Column>
+                <Column maxWidth="-1" minWidth="-1" prefWidth="-1" resizable="true">
+                  <Title editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+                    <ResourceString bundle="org/sleuthkit/autopsy/casemodule/Bundle.properties" key="CasePropertiesForm.imagesTable.remove" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                  </Title>
+                  <Editor/>
+                  <Renderer/>
+                </Column>
+              </TableColumnModel>
+            </Property>
             <Property name="showHorizontalLines" type="boolean" value="false"/>
             <Property name="showVerticalLines" type="boolean" value="false"/>
             <Property name="tableHeader" type="javax.swing.table.JTableHeader" editor="org.netbeans.modules.form.editors2.JTableHeaderEditor">
@@ -299,6 +324,13 @@
       </SubComponents>
     </Container>
     <Container class="javax.swing.JScrollPane" name="jScrollPane2">
+      <Properties>
+        <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+          <FontInfo relative="true">
+            <Font bold="false" component="jScrollPane2" property="font" relativeSize="false" size="11"/>
+          </FontInfo>
+        </Property>
+      </Properties>
       <AuxValues>
         <AuxValue name="autoScrollPane" type="java.lang.Boolean" value="true"/>
       </AuxValues>
diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/CasePropertiesForm.java b/Core/src/org/sleuthkit/autopsy/casemodule/CasePropertiesForm.java
index 043fffacf8..c9c4d87864 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/CasePropertiesForm.java
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/CasePropertiesForm.java
@@ -102,7 +102,9 @@ class CasePropertiesForm extends javax.swing.JPanel {
         int totalImages = imgPaths.size();
 
         // create the headers and add all the rows
-        String[] headers = {"Path"}; //NON-NLS
+        // Header names are internationalized via the generated code, do not overwrite.
+        String[] headers = {imagesTable.getColumnName(0), 
+                            imagesTable.getColumnName(1)};
         String[][] rows = new String[totalImages][];
 
         int i = 0;
@@ -167,6 +169,16 @@ class CasePropertiesForm extends javax.swing.JPanel {
 //        buttonColumn.setMnemonic(KeyEvent.VK_D);
     }
 
+    /** 
+     * In this generated code below, there are 2 strings "Path" and "Remove" that are
+     * table column headers in the DefaultTableModel. When this model is generated,
+     * it puts the hard coded English strings into the generated code. And then about 15
+     * lines later, it separately internationalizes them using:
+     * imagesTable.getColumnModel().getColumn(0).setHeaderValue().
+     * There is no way to prevent the GUI designer from putting the hard coded
+     * English strings into the generated code. So, they remain, and are not used.
+     */
+    
     /**
      * 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
@@ -243,6 +255,8 @@ class CasePropertiesForm extends javax.swing.JPanel {
         OKButton.setFont(OKButton.getFont().deriveFont(OKButton.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         OKButton.setText(org.openide.util.NbBundle.getMessage(CasePropertiesForm.class, "CasePropertiesForm.OKButton.text")); // NOI18N
 
+        imagesTableScrollPane.setFont(imagesTableScrollPane.getFont().deriveFont(imagesTableScrollPane.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
+
         imagesTable.setFont(imagesTable.getFont().deriveFont(imagesTable.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         imagesTable.setModel(new javax.swing.table.DefaultTableModel(
             new Object [][] {
@@ -265,6 +279,12 @@ class CasePropertiesForm extends javax.swing.JPanel {
         imagesTable.getTableHeader().setReorderingAllowed(false);
         imagesTable.setUpdateSelectionOnSort(false);
         imagesTableScrollPane.setViewportView(imagesTable);
+        if (imagesTable.getColumnModel().getColumnCount() > 0) {
+            imagesTable.getColumnModel().getColumn(0).setHeaderValue(org.openide.util.NbBundle.getMessage(CasePropertiesForm.class, "CasePropertiesForm.imagesTable.columnModel.title0")); // NOI18N
+            imagesTable.getColumnModel().getColumn(1).setHeaderValue(org.openide.util.NbBundle.getMessage(CasePropertiesForm.class, "CasePropertiesForm.imagesTable.columnModel.title1")); // NOI18N
+        }
+
+        jScrollPane2.setFont(jScrollPane2.getFont().deriveFont(jScrollPane2.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
 
         caseDirTextArea.setEditable(false);
         caseDirTextArea.setBackground(new java.awt.Color(240, 240, 240));

From beeaff1291d87d5565a4f23d9bd6a375a54c1e58 Mon Sep 17 00:00:00 2001
From: Nick Davis <nick.davis@narfindustries.com>
Date: Wed, 3 Feb 2016 14:10:43 -0500
Subject: [PATCH 29/68] merged in updated casemodule translations.

---
 .../autopsy/casemodule/Bundle_ja.properties   | 456 +++++++++---------
 1 file changed, 228 insertions(+), 228 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/Bundle_ja.properties b/Core/src/org/sleuthkit/autopsy/casemodule/Bundle_ja.properties
index 49e6f64701..071aafab4c 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/Bundle_ja.properties
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/Bundle_ja.properties
@@ -1,232 +1,232 @@
-CTL_AddImage=\u30C7\u30FC\u30BF\u30BD\u30FC\u30B9\u3092\u8FFD\u52A0...
-CTL_AddImageButton=\u30C7\u30FC\u30BF\u30BD\u30FC\u30B9\u3092\u8FFD\u52A0
-CTL_CaseCloseAct=\u30B1\u30FC\u30B9\u3092\u9589\u3058\u308B
-CTL_CaseNewAction=\u65B0\u898F\u30B1\u30FC\u30B9...
-CTL_CasePropertiesAction=\u30B1\u30FC\u30B9\u30D7\u30ED\u30D1\u30C6\u30A3...
-CTL_OpenAction=\u30B1\u30FC\u30B9\u3092\u958B\u304F...
-Menu/File/OpenRecentCase=\u6700\u8FD1\u958B\u3044\u305F\u30B1\u30FC\u30B9\u3092\u958B\u304F
-CTL_CaseDeleteAction=\u30B1\u30FC\u30B9\u3092\u524A\u9664
-OpenIDE-Module-Name=\u30B1\u30FC\u30B9
-NewCaseVisualPanel1.jLabel1.text_1=\u65B0\u898F\u30B1\u30FC\u30B9\u60C5\u5831\u3092\u5165\u529B\uFF1A
-NewCaseVisualPanel1.caseNameLabel.text_1=\u30B1\u30FC\u30B9\u540D\uFF1A
-NewCaseVisualPanel1.caseDirLabel.text=\u30D9\u30FC\u30B9\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\uFF1A
-NewCaseVisualPanel1.caseDirBrowseButton.text=\u95B2\u89A7
-NewCaseVisualPanel1.jLabel2.text_1=\u30B1\u30FC\u30B9\u30C7\u30FC\u30BF\u306F\u6B21\u306E\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306B\u4FDD\u5B58\u3055\u308C\u307E\u3059\uFF1A
-CasePropertiesForm.caseDirLabel.text=\u30B1\u30FC\u30B9\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\uFF1A
-CasePropertiesForm.crDateLabel.text=\u4F5C\u6210\u65E5\uFF1A
-CasePropertiesForm.caseNameLabel.text=\u30B1\u30FC\u30B9\u540D\uFF1A
-CasePropertiesForm.updateCaseNameButton.text=\u66F4\u65B0
-CasePropertiesForm.casePropLabel.text=\u30B1\u30FC\u30B9\u60C5\u5831
-CasePropertiesForm.genInfoLabel.text=\u4E00\u822C\u60C5\u5831
-CasePropertiesForm.imgInfoLabel.text=\u30A4\u30E1\u30FC\u30B8\u60C5\u5831
+CTL_AddImage=\u30c7\u30fc\u30bf\u30bd\u30fc\u30b9\u3092\u8ffd\u52a0...
+CTL_AddImageButton=\u30c7\u30fc\u30bf\u30bd\u30fc\u30b9\u3092\u8ffd\u52a0
+CTL_CaseCloseAct=\u30b1\u30fc\u30b9\u3092\u9589\u3058\u308b
+CTL_CaseNewAction=\u65b0\u898f\u30b1\u30fc\u30b9...
+CTL_CasePropertiesAction=\u30b1\u30fc\u30b9\u30d7\u30ed\u30d1\u30c6\u30a3...
+CTL_OpenAction=\u30b1\u30fc\u30b9\u3092\u958b\u304f...
+Menu/File/OpenRecentCase=\u6700\u8fd1\u958b\u3044\u305f\u30b1\u30fc\u30b9\u3092\u958b\u304f
+CTL_CaseDeleteAction=\u30b1\u30fc\u30b9\u3092\u524a\u9664
+OpenIDE-Module-Name=\u30b1\u30fc\u30b9
+NewCaseVisualPanel1.jLabel1.text_1=\u65b0\u898f\u30b1\u30fc\u30b9\u60c5\u5831\u3092\u5165\u529b\uff1a
+NewCaseVisualPanel1.caseNameLabel.text_1=\u30b1\u30fc\u30b9\u540d\uff1a
+NewCaseVisualPanel1.caseDirLabel.text=\u30d9\u30fc\u30b9\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\uff1a
+NewCaseVisualPanel1.caseDirBrowseButton.text=\u95b2\u89a7
+NewCaseVisualPanel1.jLabel2.text_1=\u30b1\u30fc\u30b9\u30c7\u30fc\u30bf\u306f\u6b21\u306e\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u306b\u4fdd\u5b58\u3055\u308c\u307e\u3059\uff1a
+CasePropertiesForm.caseDirLabel.text=\u30b1\u30fc\u30b9\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\uff1a
+CasePropertiesForm.crDateLabel.text=\u4f5c\u6210\u65e5\uff1a
+CasePropertiesForm.caseNameLabel.text=\u30b1\u30fc\u30b9\u540d\uff1a
+CasePropertiesForm.updateCaseNameButton.text=\u66f4\u65b0
+CasePropertiesForm.casePropLabel.text=\u30b1\u30fc\u30b9\u60c5\u5831
+CasePropertiesForm.genInfoLabel.text=\u4e00\u822c\u60c5\u5831
+CasePropertiesForm.imgInfoLabel.text=\u30a4\u30e1\u30fc\u30b8\u60c5\u5831
 CasePropertiesForm.OKButton.text=OK
-CasePropertiesForm.deleteCaseButton.text=\u30B1\u30FC\u30B9\u3092\u524A\u9664
-CueBannerPanel.createNewLabel.text=\u65B0\u898F\u30B1\u30FC\u30B9\u3092\u4F5C\u6210
-CueBannerPanel.openLabel.text=\u65E2\u5B58\u30B1\u30FC\u30B9\u3092\u958B\u304F
-CueBannerPanel.closeButton.text=\u9589\u3058\u308B
-CueBannerPanel.openRecentLabel.text=\u6700\u8FD1\u958B\u3044\u305F\u30B1\u30FC\u30B9\u3092\u958B\u304F
-OpenRecentCasePanel.cancelButton.text=\u30AD\u30E3\u30F3\u30BB\u30EB
-OpenRecentCasePanel.jLabel1.text=\u6700\u8FD1\u958B\u3044\u305F\u30D5\u30A1\u30A4\u30EB
-CasePropertiesForm.caseNumberLabel.text=\u30B1\u30FC\u30B9\u756A\u53F7\uFF1A
-CasePropertiesForm.examinerLabel.text=\u8ABF\u67FB\u62C5\u5F53\u8005\uFF1A
-NewCaseVisualPanel2.examinerLabel.text=\u8ABF\u67FB\u62C5\u5F53\u8005\uFF1A
-NewCaseVisualPanel2.caseNumberLabel.text=\u30B1\u30FC\u30B9\u756A\u53F7\uFF1A
-NewCaseVisualPanel2.optionalLabel.text=\u30AA\u30D7\u30B7\u30E7\u30CA\u30EB\uFF1A\u30B1\u30FC\u30B9\u756A\u53F7\u304A\u3088\u3073\u8ABF\u67FB\u62C5\u5F53\u8005\u3092\u8A2D\u5B9A
-AddImageErrorsDialog.title=\u30A4\u30E1\u30FC\u30B8\u30ED\u30B0\u3092\u8FFD\u52A0
-AddImageErrorsDialog.copyButton.toolTipText=\u30A8\u30E9\u30FC\u3092\u30AF\u30EA\u30C3\u30D7\u30DC\u30FC\u30C9\u306B\u30B3\u30D4\u30FC\u3057\u307E\u3059
-AddImageErrorsDialog.copyButton.text=\u30B3\u30D4\u30FC
-AddImageErrorsDialog.closeButton.toolTipText=\u3053\u306E\u30A6\u30A3\u30F3\u30C9\u30A6\u3092\u9589\u3058\u307E\u3059
-AddImageErrorsDialog.closeButton.text=\u9589\u3058\u308B
-OpenRecentCasePanel.openButton.text=\u958B\u304F
-ImageFilePanel.pathLabel.text=\u30A4\u30E1\u30FC\u30B8\u30D5\u30A1\u30A4\u30EB\u3092\u95B2\u89A7\uFF1A
-ImageFilePanel.browseButton.text=\u95B2\u89A7
-LocalDiskPanel.diskLabel.text=\u30ED\u30FC\u30AB\u30EB\u30C7\u30A3\u30B9\u30AF\u3092\u9078\u629E\uFF1A
-MissingImageDialog.selectButton.text=\u30A4\u30E1\u30FC\u30B8\u3092\u9078\u629E
-MissingImageDialog.titleLabel.text=\u6B20\u843D\u3057\u305F\u30A4\u30E1\u30FC\u30B8\u306E\u691C\u7D22
-MissingImageDialog.cancelButton.text=\u30AD\u30E3\u30F3\u30BB\u30EB
-LocalDiskPanel.errorLabel.text=\u30A8\u30E9\u30FC\u30E9\u30D9\u30EB
-LocalFilesPanel.infoLabel.text=\u30ED\u30FC\u30AB\u30EB\u30D5\u30A1\u30A4\u30EB\u304A\u3088\u3073\u30D5\u30A9\u30EB\u30C0\u3092\u8FFD\u52A0\uFF1A
-LocalFilesPanel.selectButton.text=\u8FFD\u52A0
-LocalFilesPanel.localFileChooser.dialogTitle=\u30ED\u30FC\u30AB\u30EB\u30D5\u30A1\u30A4\u30EB\u307E\u305F\u306F\u30D5\u30A9\u30EB\u30C0\u3092\u9078\u629E
-LocalFilesPanel.selectButton.toolTipText=\u30ED\u30FC\u30AB\u30EB\u30D5\u30A1\u30A4\u30EB\u304A\u3088\u3073\u30D5\u30A9\u30EB\u30C0\u3092\u30ED\u30B8\u30AB\u30EB\u30D5\u30A1\u30A4\u30EB\u3068\u3057\u3066\u8FFD\u52A0\u3057\u307E\u3059
-LocalFilesPanel.clearButton.text=\u30AF\u30EA\u30A2
-LocalFilesPanel.clearButton.toolTipText=\u73FE\u5728\u9078\u629E\u3055\u308C\u3066\u3044\u308B\u30ED\u30FC\u30AB\u30EB\u30D5\u30A1\u30A4\u30EB\u30D1\u30B9\u304C\u30AF\u30EA\u30A2\u3055\u308C\u307E\u3059
-LocalFilesPanel.localFileChooser.approveButtonText=\u9078\u629E
-LocalFilesPanel.selectButton.actionCommand=\u8FFD\u52A0
-AddImageWizardIngestConfigVisual.subtitleLabel.text=\u3053\u306E\u30C7\u30FC\u30BF\u30BD\u30FC\u30B9\u306B\u5BFE\u3057\u3066\u5B9F\u884C\u3057\u305F\u3044\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u30E2\u30B8\u30E5\u30FC\u30EB\u3092\u8A2D\u5B9A\u3057\u307E\u3059\u3002
-AddImageWizardAddingProgressVisual.statusLabel.text=\u30ED\u30FC\u30AB\u30EB\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u306B\u30D5\u30A1\u30A4\u30EB\u30B7\u30B9\u30C6\u30E0\u304C\u8FFD\u52A0\u3055\u308C\u307E\u3057\u305F\u3002\u30D5\u30A1\u30A4\u30EB\u3092\u89E3\u6790\u4E2D\u3067\u3059\u3002
-AddImageWizardChooseDataSourceVisual.typeTabel.text=\u8FFD\u52A0\u3059\u308B\u30BD\u30FC\u30B9\u30BF\u30A4\u30D7\u3092\u9078\u629E\uFF1A
+CasePropertiesForm.deleteCaseButton.text=\u30b1\u30fc\u30b9\u3092\u524a\u9664
+CueBannerPanel.createNewLabel.text=\u65b0\u898f\u30b1\u30fc\u30b9\u3092\u4f5c\u6210
+CueBannerPanel.openLabel.text=\u65e2\u5b58\u30b1\u30fc\u30b9\u3092\u958b\u304f
+CueBannerPanel.closeButton.text=\u9589\u3058\u308b
+CueBannerPanel.openRecentLabel.text=\u6700\u8fd1\u958b\u3044\u305f\u30b1\u30fc\u30b9\u3092\u958b\u304f
+OpenRecentCasePanel.cancelButton.text=\u30ad\u30e3\u30f3\u30bb\u30eb
+OpenRecentCasePanel.jLabel1.text=\u6700\u8fd1\u958b\u3044\u305f\u30d5\u30a1\u30a4\u30eb
+CasePropertiesForm.caseNumberLabel.text=\u30b1\u30fc\u30b9\u756a\u53f7\uff1a
+CasePropertiesForm.examinerLabel.text=\u8abf\u67fb\u62c5\u5f53\u8005\uff1a
+NewCaseVisualPanel2.examinerLabel.text=\u8abf\u67fb\u62c5\u5f53\u8005\uff1a
+NewCaseVisualPanel2.caseNumberLabel.text=\u30b1\u30fc\u30b9\u756a\u53f7\uff1a
+NewCaseVisualPanel2.optionalLabel.text=\u30aa\u30d7\u30b7\u30e7\u30ca\u30eb\uff1a\u30b1\u30fc\u30b9\u756a\u53f7\u304a\u3088\u3073\u8abf\u67fb\u62c5\u5f53\u8005\u3092\u8a2d\u5b9a
+AddImageErrorsDialog.title=\u30a4\u30e1\u30fc\u30b8\u30ed\u30b0\u3092\u8ffd\u52a0
+AddImageErrorsDialog.copyButton.toolTipText=\u30a8\u30e9\u30fc\u3092\u30af\u30ea\u30c3\u30d7\u30dc\u30fc\u30c9\u306b\u30b3\u30d4\u30fc\u3057\u307e\u3059
+AddImageErrorsDialog.copyButton.text=\u30b3\u30d4\u30fc
+AddImageErrorsDialog.closeButton.toolTipText=\u3053\u306e\u30a6\u30a3\u30f3\u30c9\u30a6\u3092\u9589\u3058\u307e\u3059
+AddImageErrorsDialog.closeButton.text=\u9589\u3058\u308b
+OpenRecentCasePanel.openButton.text=\u958b\u304f
+ImageFilePanel.pathLabel.text=\u30a4\u30e1\u30fc\u30b8\u30d5\u30a1\u30a4\u30eb\u3092\u95b2\u89a7\uff1a
+ImageFilePanel.browseButton.text=\u95b2\u89a7
+LocalDiskPanel.diskLabel.text=\u30ed\u30fc\u30ab\u30eb\u30c7\u30a3\u30b9\u30af\u3092\u9078\u629e\uff1a
+MissingImageDialog.selectButton.text=\u30a4\u30e1\u30fc\u30b8\u3092\u9078\u629e
+MissingImageDialog.titleLabel.text=\u6b20\u843d\u3057\u305f\u30a4\u30e1\u30fc\u30b8\u306e\u691c\u7d22
+MissingImageDialog.cancelButton.text=\u30ad\u30e3\u30f3\u30bb\u30eb
+LocalDiskPanel.errorLabel.text=\u30a8\u30e9\u30fc\u30e9\u30d9\u30eb
+LocalFilesPanel.infoLabel.text=\u30ed\u30fc\u30ab\u30eb\u30d5\u30a1\u30a4\u30eb\u304a\u3088\u3073\u30d5\u30a9\u30eb\u30c0\u3092\u8ffd\u52a0\uff1a
+LocalFilesPanel.selectButton.text=\u8ffd\u52a0
+LocalFilesPanel.localFileChooser.dialogTitle=\u30ed\u30fc\u30ab\u30eb\u30d5\u30a1\u30a4\u30eb\u307e\u305f\u306f\u30d5\u30a9\u30eb\u30c0\u3092\u9078\u629e
+LocalFilesPanel.selectButton.toolTipText=\u30ed\u30fc\u30ab\u30eb\u30d5\u30a1\u30a4\u30eb\u304a\u3088\u3073\u30d5\u30a9\u30eb\u30c0\u3092\u30ed\u30b8\u30ab\u30eb\u30d5\u30a1\u30a4\u30eb\u3068\u3057\u3066\u8ffd\u52a0\u3057\u307e\u3059
+LocalFilesPanel.clearButton.text=\u30af\u30ea\u30a2
+LocalFilesPanel.clearButton.toolTipText=\u73fe\u5728\u9078\u629e\u3055\u308c\u3066\u3044\u308b\u30ed\u30fc\u30ab\u30eb\u30d5\u30a1\u30a4\u30eb\u30d1\u30b9\u304c\u30af\u30ea\u30a2\u3055\u308c\u307e\u3059
+LocalFilesPanel.localFileChooser.approveButtonText=\u9078\u629e
+LocalFilesPanel.selectButton.actionCommand=\u8ffd\u52a0
+AddImageWizardIngestConfigVisual.subtitleLabel.text=\u3053\u306e\u30c7\u30fc\u30bf\u30bd\u30fc\u30b9\u306b\u5bfe\u3057\u3066\u5b9f\u884c\u3057\u305f\u3044\u30a4\u30f3\u30b8\u30a7\u30b9\u30c8\u30e2\u30b8\u30e5\u30fc\u30eb\u3092\u8a2d\u5b9a\u3057\u307e\u3059\u3002
+AddImageWizardAddingProgressVisual.statusLabel.text=\u30ed\u30fc\u30ab\u30eb\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u306b\u30d5\u30a1\u30a4\u30eb\u30b7\u30b9\u30c6\u30e0\u304c\u8ffd\u52a0\u3055\u308c\u307e\u3057\u305f\u3002\u30d5\u30a1\u30a4\u30eb\u3092\u89e3\u6790\u4e2d\u3067\u3059\u3002
+AddImageWizardChooseDataSourceVisual.typeTabel.text=\u8ffd\u52a0\u3059\u308b\u30bd\u30fc\u30b9\u30bf\u30a4\u30d7\u3092\u9078\u629e\uff1a
 AddImageWizardChooseDataSourceVisual.jLabel2.text=jLabel2
-AddImageWizardChooseDataSourceVisual.nextLabel.text=<html> \u300C\u6B21\u3078\u300D\u3092\u30AF\u30EA\u30C3\u30AF\u3057\u3066\u3001\u30A4\u30F3\u30D7\u30C3\u30C8\u30C7\u30FC\u30BF\u3092\u89E3\u6790\u3001\u30DC\u30EA\u30E5\u30FC\u30E0\u304A\u3088\u3073\u30D5\u30A1\u30A4\u30EB\u30B7\u30B9\u30C6\u30E0\u30C7\u30FC\u30BF\u3092\u62BD\u51FA\u3001\u30ED\u30FC\u30AB\u30EB\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u306B\u30C7\u30FC\u30BF\u3092\u6295\u5165\u3002</html>
-AddImageWizardAddingProgressVisual.progressLabel.text=\uFF1C\u30D7\u30ED\u30B0\u30EC\u30B9\uFF1E
-AddImageWizardAddingProgressVisual.viewLogButton.text=\u30ED\u30B0\u3092\u8868\u793A
-AddImageWizardAddingProgressVisual.subTitle1Label.text=\u30ED\u30FC\u30AB\u30EB\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u306B\u30D5\u30A1\u30A4\u30EB\u30B7\u30B9\u30C6\u30E0\u60C5\u5831\u3092\u8FFD\u52A0\u4E2D\u3067\u3059\u3002\u3053\u3061\u3089\u304C\u5B8C\u4E86\u6B21\u7B2C\u3001\u30D5\u30A1\u30A4\u30EB\u89E3\u6790\u304C\u59CB\u307E\u308A\u307E\u3059\u3002
-ImageFilePanel.timeZoneLabel.text=\u30A4\u30F3\u30D7\u30C3\u30C8\u30BF\u30A4\u30E0\u30BE\u30FC\u30F3\u3092\u9078\u629E\u3057\u3066\u4E0B\u3055\u3044\uFF1A
-ImageFilePanel.descLabel.text=\uFF08\u3088\u308A\u901F\u3044\u7D50\u679C\u3001\u3057\u304B\u3057\u4E00\u90E8\u306E\u30C7\u30FC\u30BF\u306F\u691C\u7D22\u3055\u308C\u307E\u305B\u3093\uFF09
-LocalDiskPanel.timeZoneLabel.text=\u30A4\u30F3\u30D7\u30C3\u30C8\u30BF\u30A4\u30E0\u30BE\u30FC\u30F3\u3092\u9078\u629E\u3057\u3066\u4E0B\u3055\u3044\uFF1A
-LocalDiskPanel.descLabel.text=\uFF08\u3088\u308A\u901F\u3044\u7D50\u679C\u3001\u3057\u304B\u3057\u4E00\u90E8\u306E\u30C7\u30FC\u30BF\u306F\u691C\u7D22\u3055\u308C\u307E\u305B\u3093\uFF09
-MissingImageDialog.browseButton.text=\u95B2\u89A7
-AddImageWizardAddingProgressVisual.progressTextArea.border.title=\u30B9\u30C6\u30FC\u30BF\u30B9
-AddImageAction.wizard.title=\u30C7\u30FC\u30BF\u30BD\u30FC\u30B9\u3092\u8FFD\u52A0
-AddImageAction.ingestConfig.ongoingIngest.msg=<html>\u4ED6\u306E\u30C7\u30FC\u30BF\u30BD\u30FC\u30B9\u304C\u51E6\u7406\u4E2D\u3067\u3059\u3002\u4ECA\u65B0\u898F\u30BD\u30FC\u30B9\u3092\u8FFD\u52A0\u3059\u308B\u3068\u5B9F\u884C\u4E2D\u306E\u51E6\u7406\u304C\u9045\u304F\u306A\u308B\u304B\u3082\u3057\u308C\u307E\u305B\u3093\u3002<br />\u3053\u306E\u307E\u307E\u5B9F\u884C\u3057\u3001\u65B0\u898F\u30C7\u30FC\u30BF\u30BD\u30FC\u30B9\u3092\u8FFD\u52A0\u3057\u307E\u3059\u304B\uFF1F</html>
-AddImageAction.ingestConfig.ongoingIngest.title=\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u3092\u5B9F\u884C\u4E2D
-AddImageTask.run.progress.adding=\u8FFD\u52A0\u4E2D\uFF1A{0}
-AddImageTask.interrupt.exception.msg=\u30A4\u30E1\u30FC\u30B8\u8FFD\u52A0\u30D7\u30ED\u30BB\u30B9\u306E\u505C\u6B62\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F\u3002
-AddImageWizardAddingProgressPanel.isValid.focusNext=\u6B21 >
-AddImageWizardAddingProgressPanel.stateStarted.progressBarText=*\u5927\u304D\u3044\u30C7\u30FC\u30BF\u30BD\u30FC\u30B9\u306E\u5834\u5408\u3001\u3053\u306E\u30D7\u30ED\u30BB\u30B9\u306F\u6642\u9593\u304C\u304B\u304B\u308B\u304B\u3082\u3057\u308C\u307E\u305B\u3093\u3002
-AddImageWizardAddingProgressVisual.addingDsComplete.text=\u30C7\u30FC\u30BF\u30BD\u30FC\u30B9\u3092\u8FFD\u52A0 - \u5B8C\u4E86
-AddImageWizardAddingProgressVisual.getName.text=\u30C7\u30FC\u30BF\u30BD\u30FC\u30B9\u3092\u8FFD\u52A0
-AddImageWizardAddingProgressVisual.showErrors.critText=*\u30C7\u30FC\u30BF\u30BD\u30FC\u30B9\u306E\u8FFD\u52A0\u306B\u5931\u6557\u3057\u307E\u3057\u305F\uFF08\u81F4\u547D\u7684\u306A\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F\uFF09\u3002\u4E0B\u8A18\u3092\u30AF\u30EA\u30C3\u30AF\u3057\u3066\u30ED\u30B0\u3092\u78BA\u8A8D\u3057\u3066\u4E0B\u3055\u3044\u3002
-AddImageWizardAddingProgressVisual.showErrors.nonCritText=*\u30C7\u30FC\u30BF\u30BD\u30FC\u30B9\u306E\u8FFD\u52A0\u306B\u5931\u6557\u3057\u307E\u3057\u305F\uFF08\u81F4\u547D\u7684\u3067\u306F\u306A\u3044\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F\uFF09\u3002\u4E0B\u8A18\u3092\u30AF\u30EA\u30C3\u30AF\u3057\u3066\u30ED\u30B0\u3092\u78BA\u8A8D\u3057\u3066\u4E0B\u3055\u3044\u3002
-AddImageWizardChooseDataSourcePanel.moveFocusNext=\u6B21 >
-AddImageWizardChooseDataSourceVisual.getName.text=\u30C7\u30FC\u30BF\u30BD\u30FC\u30B9\u60C5\u5831\u3092\u5165\u529B
-AddImageWizardIngestConfigPanel.dsProcDone.noErrs.text=*\u30C7\u30FC\u30BF\u30BD\u30FC\u30B9\u304C\u8FFD\u52A0\u3055\u308C\u307E\u3057\u305F\u3002
-AddImageWizardIngestConfigPanel.dsProcDone.errs.text=*\u30C7\u30FC\u30BF\u30BD\u30FC\u30B9\u306E\u8FFD\u52A0\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F\u3002
-AddImageWizardIngestConfigVisual.getName.text=\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u30E2\u30B8\u30E5\u30FC\u30EB\u3092\u8A2D\u5B9A
-AddImageWizardIterator.stepXofN=\u30B9\u30C6\u30C3\u30D7{0}\uFF0F{1}
-AddLocalFilesTask.localFileAdd.progress.text=\u8FFD\u52A0\u4E2D\uFF1A{0}/{1}
-Case.getCurCase.exception.noneOpen=\u4F5C\u696D\u4E2D\u306E\u30B1\u30FC\u30B9\u3092\u53D6\u5F97\u3067\u304D\u307E\u305B\u3093\uFF1B\u958B\u3044\u3066\u3044\u308B\u30B1\u30FC\u30B9\u304C\u3042\u308A\u307E\u305B\u3093\uFF01
-Case.create.exception.msg=\u30B1\u30FC\u30B9\u4F5C\u6210\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F\uFF1A\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA{1}\u306E{0}
-Case.open.exception.blankCase.msg=\u30B1\u30FC\u30B9\u540D\u304C\u7A7A\u767D\u3067\u3059\u3002
-Case.open.msgDlg.updated.msg=\u30B1\u30FC\u30B9\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u306E\u30B9\u30AD\u30FC\u30DE\u3092\u66F4\u65B0\u3057\u307E\u3057\u305F\u3002\n\u6B21\u306E\u30D1\u30B9\u3092\u6301\u3064\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u306E\u30D0\u30C3\u30AF\u30A2\u30C3\u30D7\u30B3\u30D4\u30FC\u304C\u4F5C\u6210\u3055\u308C\u307E\u3057\u305F\uFF1A\n\
+AddImageWizardChooseDataSourceVisual.nextLabel.text=<html> \u300c\u6b21\u3078\u300d\u3092\u30af\u30ea\u30c3\u30af\u3057\u3066\u3001\u30a4\u30f3\u30d7\u30c3\u30c8\u30c7\u30fc\u30bf\u3092\u89e3\u6790\u3001\u30dc\u30ea\u30e5\u30fc\u30e0\u304a\u3088\u3073\u30d5\u30a1\u30a4\u30eb\u30b7\u30b9\u30c6\u30e0\u30c7\u30fc\u30bf\u3092\u62bd\u51fa\u3001\u30ed\u30fc\u30ab\u30eb\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u306b\u30c7\u30fc\u30bf\u3092\u6295\u5165\u3002</html>
+AddImageWizardAddingProgressVisual.progressLabel.text=\uff1c\u30d7\u30ed\u30b0\u30ec\u30b9\uff1e
+AddImageWizardAddingProgressVisual.viewLogButton.text=\u30ed\u30b0\u3092\u8868\u793a
+AddImageWizardAddingProgressVisual.subTitle1Label.text=\u30ed\u30fc\u30ab\u30eb\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u306b\u30d5\u30a1\u30a4\u30eb\u30b7\u30b9\u30c6\u30e0\u60c5\u5831\u3092\u8ffd\u52a0\u4e2d\u3067\u3059\u3002\u3053\u3061\u3089\u304c\u5b8c\u4e86\u6b21\u7b2c\u3001\u30d5\u30a1\u30a4\u30eb\u89e3\u6790\u304c\u59cb\u307e\u308a\u307e\u3059\u3002
+ImageFilePanel.timeZoneLabel.text=\u30a4\u30f3\u30d7\u30c3\u30c8\u30bf\u30a4\u30e0\u30be\u30fc\u30f3\u3092\u9078\u629e\u3057\u3066\u4e0b\u3055\u3044\uff1a
+ImageFilePanel.descLabel.text=\uff08\u3088\u308a\u901f\u3044\u7d50\u679c\u3001\u3057\u304b\u3057\u4e00\u90e8\u306e\u30c7\u30fc\u30bf\u306f\u691c\u7d22\u3055\u308c\u307e\u305b\u3093\uff09
+LocalDiskPanel.timeZoneLabel.text=\u30a4\u30f3\u30d7\u30c3\u30c8\u30bf\u30a4\u30e0\u30be\u30fc\u30f3\u3092\u9078\u629e\u3057\u3066\u4e0b\u3055\u3044\uff1a
+LocalDiskPanel.descLabel.text=\uff08\u3088\u308a\u901f\u3044\u7d50\u679c\u3001\u3057\u304b\u3057\u4e00\u90e8\u306e\u30c7\u30fc\u30bf\u306f\u691c\u7d22\u3055\u308c\u307e\u305b\u3093\uff09
+MissingImageDialog.browseButton.text=\u95b2\u89a7
+AddImageWizardAddingProgressVisual.progressTextArea.border.title=\u30b9\u30c6\u30fc\u30bf\u30b9
+AddImageAction.wizard.title=\u30c7\u30fc\u30bf\u30bd\u30fc\u30b9\u3092\u8ffd\u52a0
+AddImageAction.ingestConfig.ongoingIngest.msg=<html>\u4ed6\u306e\u30c7\u30fc\u30bf\u30bd\u30fc\u30b9\u304c\u51e6\u7406\u4e2d\u3067\u3059\u3002\u4eca\u65b0\u898f\u30bd\u30fc\u30b9\u3092\u8ffd\u52a0\u3059\u308b\u3068\u5b9f\u884c\u4e2d\u306e\u51e6\u7406\u304c\u9045\u304f\u306a\u308b\u304b\u3082\u3057\u308c\u307e\u305b\u3093\u3002<br />\u3053\u306e\u307e\u307e\u5b9f\u884c\u3057\u3001\u65b0\u898f\u30c7\u30fc\u30bf\u30bd\u30fc\u30b9\u3092\u8ffd\u52a0\u3057\u307e\u3059\u304b\uff1f</html>
+AddImageAction.ingestConfig.ongoingIngest.title=\u30a4\u30f3\u30b8\u30a7\u30b9\u30c8\u3092\u5b9f\u884c\u4e2d
+AddImageTask.run.progress.adding=\u8ffd\u52a0\u4e2d\uff1a{0}
+AddImageTask.interrupt.exception.msg=\u30a4\u30e1\u30fc\u30b8\u8ffd\u52a0\u30d7\u30ed\u30bb\u30b9\u306e\u505c\u6b62\u4e2d\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002
+AddImageWizardAddingProgressPanel.isValid.focusNext=\u6b21 >
+AddImageWizardAddingProgressPanel.stateStarted.progressBarText=*\u5927\u304d\u3044\u30c7\u30fc\u30bf\u30bd\u30fc\u30b9\u306e\u5834\u5408\u3001\u3053\u306e\u30d7\u30ed\u30bb\u30b9\u306f\u6642\u9593\u304c\u304b\u304b\u308b\u304b\u3082\u3057\u308c\u307e\u305b\u3093\u3002
+AddImageWizardAddingProgressVisual.addingDsComplete.text=\u30c7\u30fc\u30bf\u30bd\u30fc\u30b9\u3092\u8ffd\u52a0 - \u5b8c\u4e86
+AddImageWizardAddingProgressVisual.getName.text=\u30c7\u30fc\u30bf\u30bd\u30fc\u30b9\u3092\u8ffd\u52a0
+AddImageWizardAddingProgressVisual.showErrors.critText=*\u30c7\u30fc\u30bf\u30bd\u30fc\u30b9\u306e\u8ffd\u52a0\u306b\u5931\u6557\u3057\u307e\u3057\u305f\uff08\u81f4\u547d\u7684\u306a\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f\uff09\u3002\u4e0b\u8a18\u3092\u30af\u30ea\u30c3\u30af\u3057\u3066\u30ed\u30b0\u3092\u78ba\u8a8d\u3057\u3066\u4e0b\u3055\u3044\u3002
+AddImageWizardAddingProgressVisual.showErrors.nonCritText=*\u30c7\u30fc\u30bf\u30bd\u30fc\u30b9\u306e\u8ffd\u52a0\u306b\u5931\u6557\u3057\u307e\u3057\u305f\uff08\u81f4\u547d\u7684\u3067\u306f\u306a\u3044\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f\uff09\u3002\u4e0b\u8a18\u3092\u30af\u30ea\u30c3\u30af\u3057\u3066\u30ed\u30b0\u3092\u78ba\u8a8d\u3057\u3066\u4e0b\u3055\u3044\u3002
+AddImageWizardChooseDataSourcePanel.moveFocusNext=\u6b21 >
+AddImageWizardChooseDataSourceVisual.getName.text=\u30c7\u30fc\u30bf\u30bd\u30fc\u30b9\u60c5\u5831\u3092\u5165\u529b
+AddImageWizardIngestConfigPanel.dsProcDone.noErrs.text=*\u30c7\u30fc\u30bf\u30bd\u30fc\u30b9\u304c\u8ffd\u52a0\u3055\u308c\u307e\u3057\u305f\u3002
+AddImageWizardIngestConfigPanel.dsProcDone.errs.text=*\u30c7\u30fc\u30bf\u30bd\u30fc\u30b9\u306e\u8ffd\u52a0\u4e2d\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002
+AddImageWizardIngestConfigVisual.getName.text=\u30a4\u30f3\u30b8\u30a7\u30b9\u30c8\u30e2\u30b8\u30e5\u30fc\u30eb\u3092\u8a2d\u5b9a
+AddImageWizardIterator.stepXofN=\u30b9\u30c6\u30c3\u30d7{0}\uff0f{1}
+AddLocalFilesTask.localFileAdd.progress.text=\u8ffd\u52a0\u4e2d\uff1a{0}/{1}
+Case.getCurCase.exception.noneOpen=\u4f5c\u696d\u4e2d\u306e\u30b1\u30fc\u30b9\u3092\u53d6\u5f97\u3067\u304d\u307e\u305b\u3093\uff1b\u958b\u3044\u3066\u3044\u308b\u30b1\u30fc\u30b9\u304c\u3042\u308a\u307e\u305b\u3093\uff01
+Case.create.exception.msg=\u30b1\u30fc\u30b9\u4f5c\u6210\u4e2d\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f\uff1a\u30c7\u30a3\u30ec\u30af\u30c8\u30ea{1}\u306e{0}
+Case.open.exception.blankCase.msg=\u30b1\u30fc\u30b9\u540d\u304c\u7a7a\u767d\u3067\u3059\u3002
+Case.open.msgDlg.updated.msg=\u30b1\u30fc\u30b9\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u306e\u30b9\u30ad\u30fc\u30de\u3092\u66f4\u65b0\u3057\u307e\u3057\u305f\u3002\n\u6b21\u306e\u30d1\u30b9\u3092\u6301\u3064\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u306e\u30d0\u30c3\u30af\u30a2\u30c3\u30d7\u30b3\u30d4\u30fc\u304c\u4f5c\u6210\u3055\u308c\u307e\u3057\u305f\uff1a\n\
  {0}
-Case.open.msgDlg.updated.title=\u30B1\u30FC\u30B9\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u306E\u30B9\u30AD\u30FC\u30DE\u3092\u66F4\u65B0
-Case.open.exception.checkFile.msg=\u30B1\u30FC\u30B9\u30D5\u30A1\u30A4\u30EB\u306F{0}\u62E1\u5F35\u5B50\u304C\u5FC5\u8981\u3067\u3059\u3002
-Case.checkImgExist.confDlg.doesntExist.msg={0} \u304C\u3053\u306E\u30B1\u30FC\u30B9\u306B\u95A2\u9023\u3059\u308B\u30A4\u30E1\u30FC\u30B8\u306E\u3046\u3061\uFF11\u3064\u304C\u6B20\u843D\u3057\u3066\u3044\u308B\u306E\u3092\u691C\u51FA\u3057\u307E\u3057\u305F\u3002\u305D\u308C\u3092\u4ECA\u304B\u3089\u691C\u7D22\u3057\u307E\u3059\u304B\uFF1F\n\n\
-\u4EE5\u524D\u3001\u30A4\u30E1\u30FC\u30B8\u306F\u6B21\u306B\u3042\u308A\u307E\u3057\u305F\uFF1A\n\
+Case.open.msgDlg.updated.title=\u30b1\u30fc\u30b9\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u306e\u30b9\u30ad\u30fc\u30de\u3092\u66f4\u65b0
+Case.open.exception.checkFile.msg=\u30b1\u30fc\u30b9\u30d5\u30a1\u30a4\u30eb\u306f{0}\u62e1\u5f35\u5b50\u304c\u5fc5\u8981\u3067\u3059\u3002
+Case.checkImgExist.confDlg.doesntExist.msg={0} \u304c\u3053\u306e\u30b1\u30fc\u30b9\u306b\u95a2\u9023\u3059\u308b\u30a4\u30e1\u30fc\u30b8\u306e\u3046\u3061\uff11\u3064\u304c\u6b20\u843d\u3057\u3066\u3044\u308b\u306e\u3092\u691c\u51fa\u3057\u307e\u3057\u305f\u3002\u305d\u308c\u3092\u4eca\u304b\u3089\u691c\u7d22\u3057\u307e\u3059\u304b\uff1f\n\n\
+\u4ee5\u524d\u3001\u30a4\u30e1\u30fc\u30b8\u306f\u6b21\u306b\u3042\u308a\u307e\u3057\u305f\uff1a\n\
 {1}\n\
-\u3044\u3044\u3048\u3092\u9078\u629E\u3057\u3066\u3082\u3001\u4ECA\u5F8C\u3082\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3092\u95B2\u89A7\u3057\u3001\u30EC\u30DD\u30FC\u30C8\u751F\u6210\u304C\u3067\u304D\u307E\u3059\u304C\u3001\n\u30D5\u30A1\u30A4\u30EB\u30B3\u30F3\u30C6\u30F3\u30C4\u306E\u8868\u793A\u307E\u305F\u306F\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u30D7\u30ED\u30BB\u30B9\u306E\u5B9F\u884C\u304C\u3067\u304D\u306A\u304F\u306A\u308A\u307E\u3059\u3002
-Case.checkImgExist.confDlg.doesntExist.title=\u6B20\u843D\u3057\u3066\u3044\u308B\u30A4\u30E1\u30FC\u30B8
-Case.addImg.exception.msg=\u30B1\u30FC\u30B9\u306B\u30A4\u30E1\u30FC\u30B8\u3092\u8FFD\u52A0\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F
-Case.closeCase.exception.msg=\u4F5C\u696D\u4E2D\u306E\u30B1\u30FC\u30B9\u3092\u9589\u3058\u308B\u6700\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F\u3002
-Case.deleteCase.exception.msg=\u30B1\u30FC\u30B9\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3092\u524A\u9664\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F\uFF1A{0}
-Case.deleteCase.exception.msg2=\u30B1\u30FC\u30B9\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3092\u524A\u9664\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F\uFF1A{0}
-Case.updateCaseName.exception.msg=\u30B1\u30FC\u30B9\u540D\u3092\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F\u3002
-Case.updateExaminer.exception.msg=\u8ABF\u67FB\u62C5\u5F53\u8005\u3092\u66F4\u65B0\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F\u3002
-Case.updateCaseNum.exception.msg=\u30B1\u30FC\u30B9\u756A\u53F7\u3092\u66F4\u65B0\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F\u3002
-Case.exception.errGetRootObj=\u30EB\u30FC\u30C8\u30AA\u30D6\u30B8\u30A7\u30AF\u30C8\u3092\u53D6\u5F97\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F\u3002
-Case.createCaseDir.exception.existNotDir=\u30B1\u30FC\u30B9\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3092\u4F5C\u6210\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F\u3002\u65E2\u306B\u5B58\u5728\u3057\u3001\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3067\u306F\u3042\u308A\u307E\u305B\u3093\uFF1A{0}
-Case.createCaseDir.exception.existCantRW=\u30B1\u30FC\u30B9\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3092\u4F5C\u6210\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F\u3002\u65E2\u306B\u5B58\u5728\u3057\u3001\u8AAD\u307F\u53D6\u308A\uFF0F\u66F8\u304D\u8FBC\u307F\u304C\u3067\u304D\u307E\u305B\u3093\uFF1A{0}
-Case.createCaseDir.exception.cantCreate=\u30B1\u30FC\u30B9\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3092\u4F5C\u6210\u3067\u304D\u307E\u305B\u3093\uFF1A {0}
-Case.createCaseDir.exception.cantCreateCaseDir=\u30B1\u30FC\u30B9\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3092\u4F5C\u6210\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F\uFF1A {0}
-Case.createCaseDir.exception.cantCreateModDir=\u30E2\u30B8\u30E5\u30FC\u30EB\u30A2\u30A6\u30C8\u30D7\u30C3\u30C8\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3092\u4F5C\u6210\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F\uFF1A{0}
-Case.createCaseDir.exception.gen=\u30B1\u30FC\u30B9\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3092\u4F5C\u6210\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F\uFF1A{0}
-CaseDeleteAction.closeConfMsg.text=\u3053\u306E\u30B1\u30FC\u30B9\u3092\u672C\u5F53\u306B\u9589\u3058\u3001\u524A\u9664\u3057\u307E\u3059\u304B\uFF1F\n\
-     \u30B1\u30FC\u30B9\u540D\uFF1A {0}\n\
-     \u30B1\u30FC\u30B9\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\: {1}
-CaseDeleteAction.closeConfMsg.title=\u8B66\u544A\uFF1A\u4F5C\u696D\u4E2D\u306E\u30B1\u30FC\u30B9\u3092\u9589\u3058\u307E\u3059
-CaseDeleteAction.msgDlg.fileInUse.msg=\u5225\u306E\u30D7\u30ED\u30B0\u30E9\u30E0\u3067\u30D5\u30A9\u30EB\u30C0\u307E\u305F\u306F\u30D5\u30A1\u30A4\u30EB\u3092\u958B\u3044\u3066\u3044\u308B\u306E\u3067\u3001\u524A\u9664\u3092\u5B8C\u4E86\u3067\u304D\u307E\u305B\u3093\u3002\n\n\
-\u30D5\u30A9\u30EB\u30C0\u307E\u305F\u306F\u30D5\u30A1\u30A4\u30EB\u3092\u9589\u3058\u3066\u304B\u3089\u518D\u5B9F\u884C\u3059\u308B\u304B\u3001\u624B\u52D5\u3067\u30B1\u30FC\u30B9\u3092\u524A\u9664\u3057\u3066\u4E0B\u3055\u3044\u3002
-CaseDeleteAction.msgDlg.fileInUse.title=\u30A8\u30E9\u30FC\uFF1A\u30D5\u30A9\u30EB\u30C0\u304C\u4F7F\u7528\u4E2D
-CaseDeleteAction.msgDlg.caseDelete.msg=\u30B1\u30FC\u30B9\u304C\u524A\u9664\u3055\u308C\u307E\u3057\u305F\u3002
-CaseOpenAction.autFilter.title={0} \u30B1\u30FC\u30B9\u30D5\u30A1\u30A4\u30EB ( {1})
-CaseOpenAction.msgDlg.cantOpenCase.title=\u30B1\u30FC\u30B9\u3092\u958B\u304F\u969B\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F
-CasePropertiesAction.window.title=\u30B1\u30FC\u30B9\u30D7\u30ED\u30D1\u30C6\u30A3
-CasePropertiesForm.updateCaseName.msgDlg.empty.msg=\u30B1\u30FC\u30B9\u540D\u306F\u7A7A\u767D\u3067\u306F\u3044\u3051\u307E\u305B\u3093\u3002
-CasePropertiesForm.updateCaseName.msgDlg.empty.title=\u30A8\u30E9\u30FC
-CasePropertiesForm.updateCaseName.msgDlg.invalidSymbols.msg=\u30B1\u30FC\u30B9\u540D\u306B\u306F\u6B21\u306E\u8A18\u53F7\u3092\u542B\u3081\u307E\u305B\u3093\uFF1A\\ / \: * ? " < > |
-CasePropertiesForm.updateCaseName.msgDlg.invalidSymbols.title=\u30A8\u30E9\u30FC
-CasePropertiesForm.updateCaseName.confMsg.msg=\u30B1\u30FC\u30B9\u540D\u3092"{0}"\u304B\u3089"{1}"\u306B\u672C\u5F53\u306B\u66F4\u65B0\u3057\u307E\u3059\u304B\uFF1F
-CasePropertiesForm.updateCaseName.confMsg.title=\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u4F5C\u6210
-CueBannerPanel.title.text=\u6700\u8FD1\u958B\u3044\u305F\u30B1\u30FC\u30B9\u3092\u958B\u304F
-GeneralFilter.rawImageDesc.text=\u30ED\u30FC\u30A4\u30E1\u30FC\u30B8(*.img, *.dd, *.001, *.aa, *.raw, *.bin)
-GeneralFilter.encaseImageDesc.text=\u30A8\u30F3\u30B1\u30FC\u30B9\u30A4\u30E1\u30FC\u30B8(*.e01)
-ImageDSProcessor.dsType.text=\u30A4\u30E1\u30FC\u30B8\u30D5\u30A1\u30A4\u30EB
-ImageDSProcessor.allDesc.text=\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u308B\u5168\u30BF\u30A4\u30D7
-ImageFilePanel.moduleErr=\u30E2\u30B8\u30E5\u30FC\u30EB\u30A8\u30E9\u30FC
-ImageFilePanel.moduleErr.msg=ImageFilePanel\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\u304B\u30ED\u30B0\u3092\u78BA\u8A8D\u3057\u3066\u304F\u3060\u3055\u3044\u3002\u4E00\u90E8\u306E\u30C7\u30FC\u30BF\u304C\u4E0D\u5B8C\u5168\u304B\u3082\u3057\u308C\u307E\u305B\u3093\u3002
-LocalDiskDSProcessor.dsType.text=\u30ED\u30FC\u30AB\u30EB\u30C7\u30A3\u30B9\u30AF
-LocalDiskPanel.localDiskModel.loading.msg=\u30ED\u30FC\u30AB\u30EB\u30C7\u30A3\u30B9\u30AF\u3092\u30ED\u30FC\u30C9\u4E2D\u2026
-LocalDiskPanel.moduleErr=\u30E2\u30B8\u30E5\u30FC\u30EB\u30A8\u30E9\u30FC
-LocalDiskPanel.moduleErr.msg=LocalDiskPanel\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\u3092\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
-LocalDiskPanel.errLabel.disksNotDetected.text=\u30C7\u30A3\u30B9\u30AF\u304C\u691C\u51FA\u3055\u308C\u307E\u305B\u3093\u3067\u3057\u305F\u3002\u4E00\u90E8\u306E\u30B7\u30B9\u30C6\u30E0\u3067\u306F\u7BA1\u7406\u8005\u6A29\u9650\u304C\u5FC5\u8981\u3067\u3059\uFF08\u3082\u3057\u304F\u306F\u300C\u7BA1\u7406\u8005\u3068\u3057\u3066\u5B9F\u884C\u3059\u308B\u300D\u304C\u5FC5\u8981\uFF09\u3002
-LocalDiskPanel.errLabel.disksNotDetected.toolTipText=\u30C7\u30A3\u30B9\u30AF\u304C\u691C\u51FA\u3055\u308C\u307E\u305B\u3093\u3067\u3057\u305F\u3002\u4E00\u90E8\u306E\u30B7\u30B9\u30C6\u30E0\u3067\u306F\u7BA1\u7406\u8005\u6A29\u9650\u304C\u5FC5\u8981\u3067\u3059\uFF08\u3082\u3057\u304F\u306F\u300C\u7BA1\u7406\u8005\u3068\u3057\u3066\u5B9F\u884C\u3059\u308B\u300D\u304C\u5FC5\u8981\uFF09\u3002
-LocalDiskPanel.errLabel.drivesNotDetected.text=\u30ED\u30FC\u30AB\u30EB\u30C9\u30E9\u30A4\u30D6\u304C\u691C\u51FA\u3055\u308C\u307E\u305B\u3093\u3067\u3057\u305F\u3002\u81EA\u52D5\u691C\u51FA\u306F\u3053\u306EOS\u3067\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u306A\u3044\u304B\u3001\u7BA1\u7406\u8005\u6A29\u9650\u304C\u5FC5\u8981\u3067\u3059\u3002
-LocalDiskPanel.errLabel.drivesNotDetected.toolTipText=\u30ED\u30FC\u30AB\u30EB\u30C9\u30E9\u30A4\u30D6\u304C\u691C\u51FA\u3055\u308C\u307E\u305B\u3093\u3067\u3057\u305F\u3002\u81EA\u52D5\u691C\u51FA\u306F\u3053\u306EOS\u3067\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u306A\u3044\u304B\u3001\u7BA1\u7406\u8005\u6A29\u9650\u304C\u5FC5\u8981\u3067\u3059\u3002
-LocalDiskPanel.errLabel.someDisksNotDetected.text=\u4E00\u90E8\u306E\u30C7\u30A3\u30B9\u30AF\u304C\u691C\u51FA\u3055\u308C\u307E\u305B\u3093\u3067\u3057\u305F\u3002\u4E00\u90E8\u306E\u30B7\u30B9\u30C6\u30E0\u3067\u306F\u7BA1\u7406\u8005\u6A29\u9650\u304C\u5FC5\u8981\u3067\u3059\uFF08\u3082\u3057\u304F\u306F\u300C\u7BA1\u7406\u8005\u3068\u3057\u3066\u5B9F\u884C\u3059\u308B\u300D\uFF09\u3002
-LocalDiskPanel.errLabel.someDisksNotDetected.toolTipText=\u4E00\u90E8\u306E\u30C7\u30A3\u30B9\u30AF\u304C\u691C\u51FA\u3055\u308C\u307E\u305B\u3093\u3067\u3057\u305F\u3002\u4E00\u90E8\u306E\u30B7\u30B9\u30C6\u30E0\u3067\u306F\u7BA1\u7406\u8005\u6A29\u9650\u304C\u5FC5\u8981\u3067\u3059\uFF08\u3082\u3057\u304F\u306F\u300C\u7BA1\u7406\u8005\u3068\u3057\u3066\u5B9F\u884C\u3059\u308B\u300D\uFF09\u3002
-LocalFilesDSProcessor.dsType=\u30ED\u30B8\u30AB\u30EB\u30D5\u30A1\u30A4\u30EB
-LocalFilesDSProcessor.toString.text=\u30ED\u30B8\u30AB\u30EB\u30D5\u30A1\u30A4\u30EB
-LocalFilesPanel.contentType.text=\u30ED\u30FC\u30AB\u30EB
-LocalFilesPanel.moduleErr=\u30E2\u30B8\u30E5\u30FC\u30EB\u30A8\u30E9\u30FC
-LocalFilesPanel.moduleErr.msg=LocalFilesPanel\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\u3092\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
-MissingImageDialog.allDesc.text=\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u308B\u5168\u3066\u306E\u30BF\u30A4\u30D7
-MissingImageDialog.display.title=\u6B20\u843D\u30A4\u30E1\u30FC\u30B8\u3092\u691C\u7D22
-MissingImageDialog.confDlg.noFileSel.msg=\u30A4\u30E1\u30FC\u30B8\u30D5\u30A1\u30A4\u30EB\u304C\u9078\u629E\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002\u30A4\u30E1\u30FC\u30B8\u3092\u898B\u3064\u3051\u308B\n\u524D\u306B\u672C\u5F53\u306B\u7D42\u4E86\u3057\u307E\u3059\u304B\uFF1F
-MissingImageDialog.confDlg.noFileSel.title=\u6B20\u843D\u30A4\u30E1\u30FC\u30B8
-NewCaseVisualPanel1.getName.text=\u30B1\u30FC\u30B9\u60C5\u5831
-NewCaseVisualPanel1.caseDirBrowse.selectButton.text=\u9078\u629E
-NewCaseVisualPanel2.getName.text=\u4ED8\u52A0\u60C5\u5831
-NewCaseWizardAction.newCase.windowTitle.text=\u65B0\u898F\u30B1\u30FC\u30B9\u60C5\u5831
-NewCaseWizardAction.getName.text=\u65B0\u898F\u30B1\u30FC\u30B9\u30A6\u30A3\u30B6\u30FC\u30C9
-NewCaseWizardPanel1.validate.errMsg.invalidSymbols=\u30B1\u30FC\u30B9\u540D\u306B\u306F\u6B21\u306E\u8A18\u53F7\u3092\u542B\u3081\u307E\u305B\u3093\uFF1A\\ / \: * ? " < > |
-NewCaseWizardPanel1.validate.errMsg.dirExists=\u30B1\u30FC\u30B9\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA''{0}''\u306F\u65E2\u306B\u5B58\u5728\u3057\u307E\u3059\u3002
-NewCaseWizardPanel1.validate.confMsg.createDir.msg=\u30D9\u30FC\u30B9\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA''{0}''\u306F\u5B58\u5728\u3057\u307E\u305B\u3093\u3002\n\n\
-\u3053\u306E\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3092\u4F5C\u6210\u3057\u307E\u3059\u304B\uFF1F
-NewCaseWizardPanel1.validate.confMsg.createDir.title=\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3092\u4F5C\u6210
-NewCaseWizardPanel1.validate.errMsg.cantCreateParDir.msg=\u30A8\u30E9\u30FC\uFF1A\u30B1\u30FC\u30B9\u30DA\u30A2\u30EC\u30F3\u30C8\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA{0}\u3092\u4F5C\u6210\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F
-NewCaseWizardPanel1.validate.errMsg.prevCreateBaseDir.msg=\u30D9\u30FC\u30B9\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA{0}\u306E\u4F5C\u6210\u3092\u9632\u6B62\u3055\u308C\u307E\u3057\u305F
-NewCaseWizardPanel1.validate.errMsg.cantCreateDir=\u30A8\u30E9\u30FC\uFF1A\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3092\u4F5C\u6210\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F\u3002
-NewCaseWizardPanel1.validate.errMsg.invalidBaseDir.msg=\u30A8\u30E9\u30FC\uFF1A\u5165\u529B\u3057\u305F\u30D9\u30FC\u30B9\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306F\u6709\u52B9\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002\n\u6709\u52B9\u306A\u30D9\u30FC\u30B9\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3092\u5165\u529B\u3057\u3066\u4E0B\u3055\u3044\u3002
-NewCaseWizardPanel1.createDir.errMsg.cantCreateDir.msg=\u30A8\u30E9\u30FC\uFF1A\u30B1\u30FC\u30B9\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3092\u4F5C\u6210\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F\u3002\n\u6709\u52B9\u306A\u30B1\u30FC\u30B9\u540D\u304A\u3088\u3073\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3092\u5165\u529B\u3057\u3066\u4E0B\u3055\u3044\u3002
-NewCaseWizardPanel2.validate.errCreateCase.msg=\u30B1\u30FC\u30B9\u306E\u4F5C\u6210\u30A8\u30E9\u30FC
-OpenRecentCasePanel.colName.caseName=\u30B1\u30FC\u30B9\u540D
-OpenRecentCasePanel.colName.path=\u30D1\u30B9
-RecentCases.exception.caseIdxOutOfRange.msg=\u6700\u8FD1\u306E\u30B1\u30FC\u30B9\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9{0}\u306F\u7BC4\u56F2\u5916\u3067\u3059\u3002
-RecentCases.getName.text=\u6700\u8FD1\u958B\u3044\u305F\u30B1\u30FC\u30B9\u3092\u30AF\u30EA\u30A2
-RecentItems.openRecentCase.msgDlg.text=\u30A8\u30E9\u30FC\uFF1A\u30B1\u30FC\u30B9{0}\u306F\u3082\u3046\u5B58\u5728\u3057\u307E\u305B\u3093\u3002
-StartupWindow.title.text=\u3088\u3046\u3053\u305D
-UpdateRecentCases.menuItem.clearRecentCases.text=\u6700\u8FD1\u958B\u3044\u305F\u30B1\u30FC\u30B9\u3092\u30AF\u30EA\u30A2
-UpdateRecentCases.menuItem.empty=-\u7A7A\u767D-
-XMLCaseManagement.create.exception.msg=\u30B1\u30FC\u30B9XML\u30D5\u30A1\u30A4\u30EB\u306E\u8A2D\u5B9A\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F\u3001
-XMLCaseManagement.writeFile.exception.noCase.msg=\u30DE\u30CD\u30B8\u30E1\u30F3\u30C8\u30D5\u30A1\u30A4\u30EB\u3092\u66F8\u304F\u5FC5\u8981\u304C\u3042\u308B\u30B1\u30FC\u30B9\u304C\u3042\u308A\u307E\u305B\u3093\u3002
-XMLCaseManagement.writeFile.exception.errWriteToFile.msg=\u30B1\u30FC\u30B9\u30D5\u30A1\u30A4\u30EB\u3078\u306E\u66F8\u304D\u8FBC\u307F\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F
-XMLCaseManagement.open.exception.errReadXMLFile.msg=\u30B1\u30FC\u30B9XML\u30D5\u30A1\u30A4\u30EB\u306E\u8AAD\u307F\u53D6\u308A\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F\uFF1A{0}
-XMLCaseManagement.open.msgDlg.notAutCase.msg=\u30A8\u30E9\u30FC\uFF1AAutopsy\u8A2D\u5B9A\u30D5\u30A1\u30A4\u30EB("{0}")\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002\n\n\
-\u8A73\u7D30\uFF1A\n\
-Autopsy\u8A2D\u5B9A\u30D5\u30A1\u30A4\u30EB\u4EE5\u5916\u306F(at {1})\u3067\u958B\u3051\u307E\u305B\u3093\u3002
-XMLCaseManagement.open.msgDlg.notAutCase.title=\u30A8\u30E9\u30FC
-ImageFilePanel.noFatOrphansCheckbox.text=FAT\u30D5\u30A1\u30A4\u30EB\u30B7\u30B9\u30C6\u30E0\u306E\u30AA\u30FC\u30D5\u30A1\u30F3\u30D5\u30A1\u30A4\u30EB\u306F\u7121\u8996
-LocalDiskPanel.noFatOrphansCheckbox.text=FAT\u30D5\u30A1\u30A4\u30EB\u30B7\u30B9\u30C6\u30E0\u306E\u30AA\u30FC\u30D5\u30A1\u30F3\u30D5\u30A1\u30A4\u30EB\u306F\u7121\u8996
-AddImageWizardIngestConfigPanel.CANCEL_BUTTON.text=\u30AD\u30E3\u30F3\u30BB\u30EB
-ImageFilePanel.errorLabel.text=\u30A8\u30E9\u30FC\u30E9\u30D9\u30EB
-LocalFilesPanel.errorLabel.text=\u30A8\u30E9\u30FC\u30E9\u30D9\u30EB
-NewCaseVisualPanel1.caseTypeLabel.text=\u30B1\u30FC\u30B9\u30BF\u30A4\u30D7\uFF1A
-Case.databaseConnectionInfo.error.msg=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u30B5\u30FC\u30D0\u30FC\u306E\u63A5\u7D9A\u60C5\u5831\u3092\u5165\u624B\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F\u3002\u30C4\u30FC\u30EB\u3001\u30AA\u30D7\u30B7\u30E7\u30F3\u3001\u8907\u6570\u30E6\u30FC\u30B6\u30FC\u3092\u78BA\u8A8D\u3057\u3066\u304F\u3060\u3055\u3044\u3002
-Case.open.exception.multiUserCaseNotEnabled=\u8907\u6570\u30E6\u30FC\u30B6\u30FC\u306E\u30B1\u30FC\u30B9\u304C\u6709\u52B9\u5316\u3055\u308C\u3066\u3044\u306A\u3044\u3068\u3001\u8907\u6570\u30E6\u30FC\u30B6\u30FC\u306E\u30B1\u30FC\u30B9\u306F\u958B\u3051\u307E\u305B\u3093\u3002\u30C4\u30FC\u30EB\u3001\u30AA\u30D7\u30B7\u30E7\u30F3\u3001\u8907\u6570\u30E6\u30FC\u30B6\u30FC\u3092\u78BA\u8A8D\u3057\u3066\u304F\u3060\u3055\u3044\u3002
-Case.createCaseDir.exception.cantCreateReportsDir=\u30EC\u30DD\u30FC\u30C8\u30A2\u30A6\u30C8\u30D7\u30C3\u30C8\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3092\u4F5C\u6210\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F\uFF1A{0}
-Case.CollaborationSetup.FailNotify.ErrMsg=\u3053\u306E\u30B1\u30FC\u30B9\u3067\u4F7F\u308F\u308C\u3066\u3044\u308B\u304B\u3082\u3057\u308C\u306A\u3044\u30CE\u30FC\u30C9\u306B\u63A5\u7D9A\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F\u3002
-Case.CollaborationSetup.FailNotify.Title=\u63A5\u7D9A\u306B\u5931\u6557
-Case.GetCaseTypeGivenPath.Failure=\u30B1\u30FC\u30B9\u30BF\u30A4\u30D7\u3092\u53D6\u5F97\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F
-Case.metaDataFileCorrupt.exception.msg=\u30B1\u30FC\u30B9\u30E1\u30BF\u30C7\u30FC\u30BF\u30D5\u30A1\u30A4\u30EB(.aut)\u304C\u7834\u640D\u3057\u3066\u3044\u307E\u3059\u3002
-Case.deleteReports.deleteFromDiskException.log.msg=\u30C7\u30A3\u30B9\u30AF\u304B\u3089\u30EC\u30DD\u30FC\u30C8\u3092\u524A\u9664\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F\u3002
-Case.deleteReports.deleteFromDiskException.msg=\u30C7\u30A3\u30B9\u30AF\u304B\u3089{0}\u30EC\u30DD\u30FC\u30C8\u3092\u524A\u9664\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F\u3002\n{1}\u304B\u3089\u624B\u52D5\u3067\u524A\u9664\u3067\u304D\u307E\u3059\u3002
-CaseCreateAction.msgDlg.cantCreateCase.msg=\u30B1\u30FC\u30B9\u3092\u4F5C\u6210\u3067\u304D\u307E\u305B\u3093
-IntervalErrorReport.NewIssues=\u65B0\u898F\u306E\u30A4\u30B7\u30E5\u30FC
-IntervalErrorReport.TotalIssues=\u5168\u30A4\u30B7\u30E5\u30FC
-IntervalErrorReport.ErrorText=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u306E\u63A5\u7D9A\u30A8\u30E9\u30FC
-GeneralFilter.virtualMachineImageDesc.text=\u4EEE\u60F3\u30DE\u30B7\u30F3(*.vmdk, *.vhd)
-LocalDiskPanel.localDiskModel.nodrives.msg=\u30A2\u30AF\u30BB\u30B9\u3067\u304D\u308B\u30C9\u30E9\u30A4\u30D6\u304C\u3042\u308A\u307E\u305B\u3093
-MissingImageDialog.ErrorSettingImage=\u30A4\u30E1\u30FC\u30B8\u30D1\u30B9\u3092\u8A2D\u5B9A\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F\u3002\u518D\u5EA6\u5B9F\u884C\u3057\u3066\u304F\u3060\u3055\u3044\u3002
-NewCaseVisualPanel1.badCredentials.text=\u4F7F\u3048\u306A\u3044\u8907\u6570\u30E6\u30FC\u30B6\u30FC\u306E\u8A2D\u5B9A\uFF08\u30C4\u30FC\u30EB\u3001\u30AA\u30D7\u30B7\u30E7\u30F3\u3001\u8907\u6570\u30E6\u30FC\u30B6\u30FC\u3092\u78BA\u8A8D\u3057\u3066\u304F\u3060\u3055\u3044\uFF09\u307E\u305F\u306F\u30B5\u30FC\u30D3\u30B9\u304C\u30C0\u30A6\u30F3\u3057\u3066\u3044\u307E\u3059\u3002
-NewCaseWizardAction.databaseProblem1.text=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u3092\u958B\u3051\u307E\u305B\u3093\u3002\u30B1\u30FC\u30B9\u4F5C\u6210\u3092\u30AD\u30E3\u30F3\u30BB\u30EB\u3057\u3066\u3044\u307E\u3059\u3002
-NewCaseWizardAction.databaseProblem2.text=\u30A8\u30E9\u30FC
-DataSourceOnCDriveError.text=\u8B66\u544A\uFF1A\u8907\u6570\u30E6\u30FC\u30B6\u30FC\u306E\u30C7\u30FC\u30BF\u30BD\u30FC\u30B9\u3078\u306E\u30D1\u30B9\u306F"C\:"\u30C9\u30E9\u30A4\u30D6\u306B\u3042\u308A\u307E\u3059
-NewCaseVisualPanel1.CaseFolderOnCDriveError.text=\u8B66\u544A\uFF1A\u8907\u6570\u30E6\u30FC\u30B6\u30FC\u306E\u30B1\u30FC\u30B9\u30D5\u30A9\u30EB\u30C0\u3078\u306E\u30D1\u30B9\u306F"C\:"\u30C9\u30E9\u30A4\u30D6\u306B\u3042\u308A\u307E\u3059
-CollaborationMonitor.addingDataSourceStatus.msg={0}\u304C\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u3092\u8FFD\u52A0\u4E2D
-CollaborationMonitor.analyzingDataSourceStatus.msg={0}\u304C{1}\u3092\u89E3\u6790\u4E2D
-NewCaseVisualPanel1.multiUserCaseRadioButton.text=\u8907\u6570\u30E6\u30FC\u30B6\u30FC
-NewCaseVisualPanel1.singleUserCaseRadioButton.text=\u5358\u6570\u30E6\u30FC\u30B6\u30FC
-CasePropertiesForm.lbDbType.text=\u30B1\u30FC\u30B9\u30BF\u30A4\u30D7\uFF1A
-CasePropertiesForm.lbDbName.text=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u540D\uFF1A
-SingleUserCaseConverter.BadDatabaseFileName=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u30D5\u30A1\u30A4\u30EB\u304C\u5B58\u5728\u3057\u307E\u305B\u3093\uFF01
-SingleUserCaseConverter.AlreadyMultiUser=\u30B1\u30FC\u30B9\u306F\u65E2\u306B\u8907\u6570\u30E6\u30FC\u30B6\u30FC\u3067\u3059\uFF01
-SingleUserCaseConverter.NonUniqueDatabaseName=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u540D\u304C\u30E6\u30CB\u30FC\u30AF\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002
-SingleUserCaseConverter.UnableToCopySourceImages=\u30BD\u30FC\u30B9\u30A4\u30E1\u30FC\u30B8\u3092\u30B3\u30D4\u30FC\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F\u3002
-SingleUserCaseConverter.CanNotOpenDatabase=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u3092\u958B\u3051\u307E\u305B\u3093\u3067\u3057\u305F
-CloseCaseWhileIngesting.Warning=\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u304C\u5B9F\u884C\u4E2D\u3067\u3059\u3002\u3053\u306E\u30B1\u30FC\u30B9\u3092\u672C\u5F53\u306B\u9589\u3058\u307E\u3059\u304B\uFF1F
-CloseCaseWhileIngesting.Warning.title=\u8B66\u544A\uFF1A\u3053\u308C\u3092\u5B9F\u884C\u3059\u308C\u3070\u4F5C\u696D\u4E2D\u306E\u30B1\u30FC\u30B9\u3092\u9589\u3058\u307E\u3059
-Case_caseType_multiUser=\u8907\u6570\u30E6\u30FC\u30B6\u30FC\u30B1\u30FC\u30B9
-Case_caseType_singleUser=\u5358\u6570\u30E6\u30FC\u30B6\u30FC\u30B1\u30FC\u30B9
-CasePropertiesForm.imagesTable.path=\u30D1\u30B9
-CasePropertiesForm.imagesTable.remove=\u524A\u9664
+\u3044\u3044\u3048\u3092\u9078\u629e\u3057\u3066\u3082\u3001\u4eca\u5f8c\u3082\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u3092\u95b2\u89a7\u3057\u3001\u30ec\u30dd\u30fc\u30c8\u751f\u6210\u304c\u3067\u304d\u307e\u3059\u304c\u3001\n\u30d5\u30a1\u30a4\u30eb\u30b3\u30f3\u30c6\u30f3\u30c4\u306e\u8868\u793a\u307e\u305f\u306f\u30a4\u30f3\u30b8\u30a7\u30b9\u30c8\u30d7\u30ed\u30bb\u30b9\u306e\u5b9f\u884c\u304c\u3067\u304d\u306a\u304f\u306a\u308a\u307e\u3059\u3002
+Case.checkImgExist.confDlg.doesntExist.title=\u6b20\u843d\u3057\u3066\u3044\u308b\u30a4\u30e1\u30fc\u30b8
+Case.addImg.exception.msg=\u30b1\u30fc\u30b9\u306b\u30a4\u30e1\u30fc\u30b8\u3092\u8ffd\u52a0\u4e2d\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f
+Case.closeCase.exception.msg=\u4f5c\u696d\u4e2d\u306e\u30b1\u30fc\u30b9\u3092\u9589\u3058\u308b\u6700\u4e2d\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002
+Case.deleteCase.exception.msg=\u30b1\u30fc\u30b9\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u3092\u524a\u9664\u4e2d\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f\uff1a{0}
+Case.deleteCase.exception.msg2=\u30b1\u30fc\u30b9\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u3092\u524a\u9664\u4e2d\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f\uff1a{0}
+Case.updateCaseName.exception.msg=\u30b1\u30fc\u30b9\u540d\u3092\u30a2\u30c3\u30d7\u30c7\u30fc\u30c8\u4e2d\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002
+Case.updateExaminer.exception.msg=\u8abf\u67fb\u62c5\u5f53\u8005\u3092\u66f4\u65b0\u4e2d\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002
+Case.updateCaseNum.exception.msg=\u30b1\u30fc\u30b9\u756a\u53f7\u3092\u66f4\u65b0\u4e2d\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002
+Case.exception.errGetRootObj=\u30eb\u30fc\u30c8\u30aa\u30d6\u30b8\u30a7\u30af\u30c8\u3092\u53d6\u5f97\u4e2d\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002
+Case.createCaseDir.exception.existNotDir=\u30b1\u30fc\u30b9\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u3092\u4f5c\u6210\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002\u65e2\u306b\u5b58\u5728\u3057\u3001\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u3067\u306f\u3042\u308a\u307e\u305b\u3093\uff1a{0}
+Case.createCaseDir.exception.existCantRW=\u30b1\u30fc\u30b9\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u3092\u4f5c\u6210\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002\u65e2\u306b\u5b58\u5728\u3057\u3001\u8aad\u307f\u53d6\u308a\uff0f\u66f8\u304d\u8fbc\u307f\u304c\u3067\u304d\u307e\u305b\u3093\uff1a{0}
+Case.createCaseDir.exception.cantCreate=\u30b1\u30fc\u30b9\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u3092\u4f5c\u6210\u3067\u304d\u307e\u305b\u3093\uff1a {0}
+Case.createCaseDir.exception.cantCreateCaseDir=\u30b1\u30fc\u30b9\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u3092\u4f5c\u6210\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\uff1a {0}
+Case.createCaseDir.exception.cantCreateModDir=\u30e2\u30b8\u30e5\u30fc\u30eb\u30a2\u30a6\u30c8\u30d7\u30c3\u30c8\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u3092\u4f5c\u6210\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\uff1a{0}
+Case.createCaseDir.exception.gen=\u30b1\u30fc\u30b9\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u3092\u4f5c\u6210\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\uff1a{0}
+CaseDeleteAction.closeConfMsg.text=\u3053\u306e\u30b1\u30fc\u30b9\u3092\u672c\u5f53\u306b\u9589\u3058\u3001\u524a\u9664\u3057\u307e\u3059\u304b\uff1f\n\
+     \u30b1\u30fc\u30b9\u540d\uff1a {0}\n\
+     \u30b1\u30fc\u30b9\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\: {1}
+CaseDeleteAction.closeConfMsg.title=\u8b66\u544a\uff1a\u4f5c\u696d\u4e2d\u306e\u30b1\u30fc\u30b9\u3092\u9589\u3058\u307e\u3059
+CaseDeleteAction.msgDlg.fileInUse.msg=\u5225\u306e\u30d7\u30ed\u30b0\u30e9\u30e0\u3067\u30d5\u30a9\u30eb\u30c0\u307e\u305f\u306f\u30d5\u30a1\u30a4\u30eb\u3092\u958b\u3044\u3066\u3044\u308b\u306e\u3067\u3001\u524a\u9664\u3092\u5b8c\u4e86\u3067\u304d\u307e\u305b\u3093\u3002\n\n\
+\u30d5\u30a9\u30eb\u30c0\u307e\u305f\u306f\u30d5\u30a1\u30a4\u30eb\u3092\u9589\u3058\u3066\u304b\u3089\u518d\u5b9f\u884c\u3059\u308b\u304b\u3001\u624b\u52d5\u3067\u30b1\u30fc\u30b9\u3092\u524a\u9664\u3057\u3066\u4e0b\u3055\u3044\u3002
+CaseDeleteAction.msgDlg.fileInUse.title=\u30a8\u30e9\u30fc\uff1a\u30d5\u30a9\u30eb\u30c0\u304c\u4f7f\u7528\u4e2d
+CaseDeleteAction.msgDlg.caseDelete.msg=\u30b1\u30fc\u30b9\u304c\u524a\u9664\u3055\u308c\u307e\u3057\u305f\u3002
+CaseOpenAction.autFilter.title={0} \u30b1\u30fc\u30b9\u30d5\u30a1\u30a4\u30eb ( {1})
+CaseOpenAction.msgDlg.cantOpenCase.title=\u30b1\u30fc\u30b9\u3092\u958b\u304f\u969b\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f
+CasePropertiesAction.window.title=\u30b1\u30fc\u30b9\u30d7\u30ed\u30d1\u30c6\u30a3
+CasePropertiesForm.updateCaseName.msgDlg.empty.msg=\u30b1\u30fc\u30b9\u540d\u306f\u7a7a\u767d\u3067\u306f\u3044\u3051\u307e\u305b\u3093\u3002
+CasePropertiesForm.updateCaseName.msgDlg.empty.title=\u30a8\u30e9\u30fc
+CasePropertiesForm.updateCaseName.msgDlg.invalidSymbols.msg=\u30b1\u30fc\u30b9\u540d\u306b\u306f\u6b21\u306e\u8a18\u53f7\u3092\u542b\u3081\u307e\u305b\u3093\uff1a\\ / \: * ? " < > |
+CasePropertiesForm.updateCaseName.msgDlg.invalidSymbols.title=\u30a8\u30e9\u30fc
+CasePropertiesForm.updateCaseName.confMsg.msg=\u30b1\u30fc\u30b9\u540d\u3092"{0}"\u304b\u3089"{1}"\u306b\u672c\u5f53\u306b\u66f4\u65b0\u3057\u307e\u3059\u304b\uff1f
+CasePropertiesForm.updateCaseName.confMsg.title=\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u4f5c\u6210
+CueBannerPanel.title.text=\u6700\u8fd1\u958b\u3044\u305f\u30b1\u30fc\u30b9\u3092\u958b\u304f
+GeneralFilter.rawImageDesc.text=\u30ed\u30fc\u30a4\u30e1\u30fc\u30b8(*.img, *.dd, *.001, *.aa, *.raw, *.bin)
+GeneralFilter.encaseImageDesc.text=\u30a8\u30f3\u30b1\u30fc\u30b9\u30a4\u30e1\u30fc\u30b8(*.e01)
+ImageDSProcessor.dsType.text=\u30a4\u30e1\u30fc\u30b8\u30d5\u30a1\u30a4\u30eb
+ImageDSProcessor.allDesc.text=\u30b5\u30dd\u30fc\u30c8\u3055\u308c\u3066\u3044\u308b\u5168\u30bf\u30a4\u30d7
+ImageFilePanel.moduleErr=\u30e2\u30b8\u30e5\u30fc\u30eb\u30a8\u30e9\u30fc
+ImageFilePanel.moduleErr.msg=ImageFilePanel\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\u304b\u30ed\u30b0\u3092\u78ba\u8a8d\u3057\u3066\u304f\u3060\u3055\u3044\u3002\u4e00\u90e8\u306e\u30c7\u30fc\u30bf\u304c\u4e0d\u5b8c\u5168\u304b\u3082\u3057\u308c\u307e\u305b\u3093\u3002
+LocalDiskDSProcessor.dsType.text=\u30ed\u30fc\u30ab\u30eb\u30c7\u30a3\u30b9\u30af
+LocalDiskPanel.localDiskModel.loading.msg=\u30ed\u30fc\u30ab\u30eb\u30c7\u30a3\u30b9\u30af\u3092\u30ed\u30fc\u30c9\u4e2d\u2026
+LocalDiskPanel.moduleErr=\u30e2\u30b8\u30e5\u30fc\u30eb\u30a8\u30e9\u30fc
+LocalDiskPanel.moduleErr.msg=LocalDiskPanel\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\u3092\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
+LocalDiskPanel.errLabel.disksNotDetected.text=\u30c7\u30a3\u30b9\u30af\u304c\u691c\u51fa\u3055\u308c\u307e\u305b\u3093\u3067\u3057\u305f\u3002\u4e00\u90e8\u306e\u30b7\u30b9\u30c6\u30e0\u3067\u306f\u7ba1\u7406\u8005\u6a29\u9650\u304c\u5fc5\u8981\u3067\u3059\uff08\u3082\u3057\u304f\u306f\u300c\u7ba1\u7406\u8005\u3068\u3057\u3066\u5b9f\u884c\u3059\u308b\u300d\u304c\u5fc5\u8981\uff09\u3002
+LocalDiskPanel.errLabel.disksNotDetected.toolTipText=\u30c7\u30a3\u30b9\u30af\u304c\u691c\u51fa\u3055\u308c\u307e\u305b\u3093\u3067\u3057\u305f\u3002\u4e00\u90e8\u306e\u30b7\u30b9\u30c6\u30e0\u3067\u306f\u7ba1\u7406\u8005\u6a29\u9650\u304c\u5fc5\u8981\u3067\u3059\uff08\u3082\u3057\u304f\u306f\u300c\u7ba1\u7406\u8005\u3068\u3057\u3066\u5b9f\u884c\u3059\u308b\u300d\u304c\u5fc5\u8981\uff09\u3002
+LocalDiskPanel.errLabel.drivesNotDetected.text=\u30ed\u30fc\u30ab\u30eb\u30c9\u30e9\u30a4\u30d6\u304c\u691c\u51fa\u3055\u308c\u307e\u305b\u3093\u3067\u3057\u305f\u3002\u81ea\u52d5\u691c\u51fa\u306f\u3053\u306eOS\u3067\u30b5\u30dd\u30fc\u30c8\u3055\u308c\u3066\u3044\u306a\u3044\u304b\u3001\u7ba1\u7406\u8005\u6a29\u9650\u304c\u5fc5\u8981\u3067\u3059\u3002
+LocalDiskPanel.errLabel.drivesNotDetected.toolTipText=\u30ed\u30fc\u30ab\u30eb\u30c9\u30e9\u30a4\u30d6\u304c\u691c\u51fa\u3055\u308c\u307e\u305b\u3093\u3067\u3057\u305f\u3002\u81ea\u52d5\u691c\u51fa\u306f\u3053\u306eOS\u3067\u30b5\u30dd\u30fc\u30c8\u3055\u308c\u3066\u3044\u306a\u3044\u304b\u3001\u7ba1\u7406\u8005\u6a29\u9650\u304c\u5fc5\u8981\u3067\u3059\u3002
+LocalDiskPanel.errLabel.someDisksNotDetected.text=\u4e00\u90e8\u306e\u30c7\u30a3\u30b9\u30af\u304c\u691c\u51fa\u3055\u308c\u307e\u305b\u3093\u3067\u3057\u305f\u3002\u4e00\u90e8\u306e\u30b7\u30b9\u30c6\u30e0\u3067\u306f\u7ba1\u7406\u8005\u6a29\u9650\u304c\u5fc5\u8981\u3067\u3059\uff08\u3082\u3057\u304f\u306f\u300c\u7ba1\u7406\u8005\u3068\u3057\u3066\u5b9f\u884c\u3059\u308b\u300d\uff09\u3002
+LocalDiskPanel.errLabel.someDisksNotDetected.toolTipText=\u4e00\u90e8\u306e\u30c7\u30a3\u30b9\u30af\u304c\u691c\u51fa\u3055\u308c\u307e\u305b\u3093\u3067\u3057\u305f\u3002\u4e00\u90e8\u306e\u30b7\u30b9\u30c6\u30e0\u3067\u306f\u7ba1\u7406\u8005\u6a29\u9650\u304c\u5fc5\u8981\u3067\u3059\uff08\u3082\u3057\u304f\u306f\u300c\u7ba1\u7406\u8005\u3068\u3057\u3066\u5b9f\u884c\u3059\u308b\u300d\uff09\u3002
+LocalFilesDSProcessor.dsType=\u30ed\u30b8\u30ab\u30eb\u30d5\u30a1\u30a4\u30eb
+LocalFilesDSProcessor.toString.text=\u30ed\u30b8\u30ab\u30eb\u30d5\u30a1\u30a4\u30eb
+LocalFilesPanel.contentType.text=\u30ed\u30fc\u30ab\u30eb
+LocalFilesPanel.moduleErr=\u30e2\u30b8\u30e5\u30fc\u30eb\u30a8\u30e9\u30fc
+LocalFilesPanel.moduleErr.msg=LocalFilesPanel\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\u3092\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
+MissingImageDialog.allDesc.text=\u30b5\u30dd\u30fc\u30c8\u3055\u308c\u3066\u3044\u308b\u5168\u3066\u306e\u30bf\u30a4\u30d7
+MissingImageDialog.display.title=\u6b20\u843d\u30a4\u30e1\u30fc\u30b8\u3092\u691c\u7d22
+MissingImageDialog.confDlg.noFileSel.msg=\u30a4\u30e1\u30fc\u30b8\u30d5\u30a1\u30a4\u30eb\u304c\u9078\u629e\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002\u30a4\u30e1\u30fc\u30b8\u3092\u898b\u3064\u3051\u308b\n\u524d\u306b\u672c\u5f53\u306b\u7d42\u4e86\u3057\u307e\u3059\u304b\uff1f
+MissingImageDialog.confDlg.noFileSel.title=\u6b20\u843d\u30a4\u30e1\u30fc\u30b8
+NewCaseVisualPanel1.getName.text=\u30b1\u30fc\u30b9\u60c5\u5831
+NewCaseVisualPanel1.caseDirBrowse.selectButton.text=\u9078\u629e
+NewCaseVisualPanel2.getName.text=\u4ed8\u52a0\u60c5\u5831
+NewCaseWizardAction.newCase.windowTitle.text=\u65b0\u898f\u30b1\u30fc\u30b9\u60c5\u5831
+NewCaseWizardAction.getName.text=\u65b0\u898f\u30b1\u30fc\u30b9\u30a6\u30a3\u30b6\u30fc\u30c9
+NewCaseWizardPanel1.validate.errMsg.invalidSymbols=\u30b1\u30fc\u30b9\u540d\u306b\u306f\u6b21\u306e\u8a18\u53f7\u3092\u542b\u3081\u307e\u305b\u3093\uff1a\\ / \: * ? " < > |
+NewCaseWizardPanel1.validate.errMsg.dirExists=\u30b1\u30fc\u30b9\u30c7\u30a3\u30ec\u30af\u30c8\u30ea''{0}''\u306f\u65e2\u306b\u5b58\u5728\u3057\u307e\u3059\u3002
+NewCaseWizardPanel1.validate.confMsg.createDir.msg=\u30d9\u30fc\u30b9\u30c7\u30a3\u30ec\u30af\u30c8\u30ea''{0}''\u306f\u5b58\u5728\u3057\u307e\u305b\u3093\u3002\n\n\
+\u3053\u306e\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u3092\u4f5c\u6210\u3057\u307e\u3059\u304b\uff1f
+NewCaseWizardPanel1.validate.confMsg.createDir.title=\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u3092\u4f5c\u6210
+NewCaseWizardPanel1.validate.errMsg.cantCreateParDir.msg=\u30a8\u30e9\u30fc\uff1a\u30b1\u30fc\u30b9\u30da\u30a2\u30ec\u30f3\u30c8\u30c7\u30a3\u30ec\u30af\u30c8\u30ea{0}\u3092\u4f5c\u6210\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f
+NewCaseWizardPanel1.validate.errMsg.prevCreateBaseDir.msg=\u30d9\u30fc\u30b9\u30c7\u30a3\u30ec\u30af\u30c8\u30ea{0}\u306e\u4f5c\u6210\u3092\u9632\u6b62\u3055\u308c\u307e\u3057\u305f
+NewCaseWizardPanel1.validate.errMsg.cantCreateDir=\u30a8\u30e9\u30fc\uff1a\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u3092\u4f5c\u6210\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002
+NewCaseWizardPanel1.validate.errMsg.invalidBaseDir.msg=\u30a8\u30e9\u30fc\uff1a\u5165\u529b\u3057\u305f\u30d9\u30fc\u30b9\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u306f\u6709\u52b9\u3067\u306f\u3042\u308a\u307e\u305b\u3093\u3002\n\u6709\u52b9\u306a\u30d9\u30fc\u30b9\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u3092\u5165\u529b\u3057\u3066\u4e0b\u3055\u3044\u3002
+NewCaseWizardPanel1.createDir.errMsg.cantCreateDir.msg=\u30a8\u30e9\u30fc\uff1a\u30b1\u30fc\u30b9\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u3092\u4f5c\u6210\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002\n\u6709\u52b9\u306a\u30b1\u30fc\u30b9\u540d\u304a\u3088\u3073\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u3092\u5165\u529b\u3057\u3066\u4e0b\u3055\u3044\u3002
+NewCaseWizardPanel2.validate.errCreateCase.msg=\u30b1\u30fc\u30b9\u306e\u4f5c\u6210\u30a8\u30e9\u30fc
+OpenRecentCasePanel.colName.caseName=\u30b1\u30fc\u30b9\u540d
+OpenRecentCasePanel.colName.path=\u30d1\u30b9
+RecentCases.exception.caseIdxOutOfRange.msg=\u6700\u8fd1\u306e\u30b1\u30fc\u30b9\u30a4\u30f3\u30c7\u30c3\u30af\u30b9{0}\u306f\u7bc4\u56f2\u5916\u3067\u3059\u3002
+RecentCases.getName.text=\u6700\u8fd1\u958b\u3044\u305f\u30b1\u30fc\u30b9\u3092\u30af\u30ea\u30a2
+RecentItems.openRecentCase.msgDlg.text=\u30a8\u30e9\u30fc\uff1a\u30b1\u30fc\u30b9{0}\u306f\u3082\u3046\u5b58\u5728\u3057\u307e\u305b\u3093\u3002
+StartupWindow.title.text=\u3088\u3046\u3053\u305d
+UpdateRecentCases.menuItem.clearRecentCases.text=\u6700\u8fd1\u958b\u3044\u305f\u30b1\u30fc\u30b9\u3092\u30af\u30ea\u30a2
+UpdateRecentCases.menuItem.empty=-\u7a7a\u767d-
+XMLCaseManagement.create.exception.msg=\u30b1\u30fc\u30b9XML\u30d5\u30a1\u30a4\u30eb\u306e\u8a2d\u5b9a\u4e2d\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3001
+XMLCaseManagement.writeFile.exception.noCase.msg=\u30de\u30cd\u30b8\u30e1\u30f3\u30c8\u30d5\u30a1\u30a4\u30eb\u3092\u66f8\u304f\u5fc5\u8981\u304c\u3042\u308b\u30b1\u30fc\u30b9\u304c\u3042\u308a\u307e\u305b\u3093\u3002
+XMLCaseManagement.writeFile.exception.errWriteToFile.msg=\u30b1\u30fc\u30b9\u30d5\u30a1\u30a4\u30eb\u3078\u306e\u66f8\u304d\u8fbc\u307f\u4e2d\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f
+XMLCaseManagement.open.exception.errReadXMLFile.msg=\u30b1\u30fc\u30b9XML\u30d5\u30a1\u30a4\u30eb\u306e\u8aad\u307f\u53d6\u308a\u4e2d\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f\uff1a{0}
+XMLCaseManagement.open.msgDlg.notAutCase.msg=\u30a8\u30e9\u30fc\uff1aAutopsy\u8a2d\u5b9a\u30d5\u30a1\u30a4\u30eb("{0}")\u3067\u306f\u3042\u308a\u307e\u305b\u3093\u3002\n\n\
+\u8a73\u7d30\uff1a\n\
+Autopsy\u8a2d\u5b9a\u30d5\u30a1\u30a4\u30eb\u4ee5\u5916\u306f(at {1})\u3067\u958b\u3051\u307e\u305b\u3093\u3002
+XMLCaseManagement.open.msgDlg.notAutCase.title=\u30a8\u30e9\u30fc
+ImageFilePanel.noFatOrphansCheckbox.text=FAT\u30d5\u30a1\u30a4\u30eb\u30b7\u30b9\u30c6\u30e0\u306e\u30aa\u30fc\u30d5\u30a1\u30f3\u30d5\u30a1\u30a4\u30eb\u306f\u7121\u8996
+LocalDiskPanel.noFatOrphansCheckbox.text=FAT\u30d5\u30a1\u30a4\u30eb\u30b7\u30b9\u30c6\u30e0\u306e\u30aa\u30fc\u30d5\u30a1\u30f3\u30d5\u30a1\u30a4\u30eb\u306f\u7121\u8996
+AddImageWizardIngestConfigPanel.CANCEL_BUTTON.text=\u30ad\u30e3\u30f3\u30bb\u30eb
+ImageFilePanel.errorLabel.text=\u30a8\u30e9\u30fc\u30e9\u30d9\u30eb
+LocalFilesPanel.errorLabel.text=\u30a8\u30e9\u30fc\u30e9\u30d9\u30eb
+NewCaseVisualPanel1.caseTypeLabel.text=\u30b1\u30fc\u30b9\u30bf\u30a4\u30d7\uff1a
+Case.databaseConnectionInfo.error.msg=\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u30b5\u30fc\u30d0\u30fc\u306e\u63a5\u7d9a\u60c5\u5831\u3092\u5165\u624b\u4e2d\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002\u30c4\u30fc\u30eb\u3001\u30aa\u30d7\u30b7\u30e7\u30f3\u3001\u8907\u6570\u30e6\u30fc\u30b6\u30fc\u3092\u78ba\u8a8d\u3057\u3066\u304f\u3060\u3055\u3044\u3002
+Case.open.exception.multiUserCaseNotEnabled=\u8907\u6570\u30e6\u30fc\u30b6\u30fc\u306e\u30b1\u30fc\u30b9\u304c\u6709\u52b9\u5316\u3055\u308c\u3066\u3044\u306a\u3044\u3068\u3001\u8907\u6570\u30e6\u30fc\u30b6\u30fc\u306e\u30b1\u30fc\u30b9\u306f\u958b\u3051\u307e\u305b\u3093\u3002\u30c4\u30fc\u30eb\u3001\u30aa\u30d7\u30b7\u30e7\u30f3\u3001\u8907\u6570\u30e6\u30fc\u30b6\u30fc\u3092\u78ba\u8a8d\u3057\u3066\u304f\u3060\u3055\u3044\u3002
+Case.createCaseDir.exception.cantCreateReportsDir=\u30ec\u30dd\u30fc\u30c8\u30a2\u30a6\u30c8\u30d7\u30c3\u30c8\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u3092\u4f5c\u6210\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\uff1a{0}
+Case.CollaborationSetup.FailNotify.ErrMsg=\u3053\u306e\u30b1\u30fc\u30b9\u3067\u4f7f\u308f\u308c\u3066\u3044\u308b\u304b\u3082\u3057\u308c\u306a\u3044\u30ce\u30fc\u30c9\u306b\u63a5\u7d9a\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002
+Case.CollaborationSetup.FailNotify.Title=\u63a5\u7d9a\u306b\u5931\u6557
+Case.GetCaseTypeGivenPath.Failure=\u30b1\u30fc\u30b9\u30bf\u30a4\u30d7\u3092\u53d6\u5f97\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f
+Case.metaDataFileCorrupt.exception.msg=\u30b1\u30fc\u30b9\u30e1\u30bf\u30c7\u30fc\u30bf\u30d5\u30a1\u30a4\u30eb(.aut)\u304c\u7834\u640d\u3057\u3066\u3044\u307e\u3059\u3002
+Case.deleteReports.deleteFromDiskException.log.msg=\u30c7\u30a3\u30b9\u30af\u304b\u3089\u30ec\u30dd\u30fc\u30c8\u3092\u524a\u9664\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002
+Case.deleteReports.deleteFromDiskException.msg=\u30c7\u30a3\u30b9\u30af\u304b\u3089{0}\u30ec\u30dd\u30fc\u30c8\u3092\u524a\u9664\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002\n{1}\u304b\u3089\u624b\u52d5\u3067\u524a\u9664\u3067\u304d\u307e\u3059\u3002
+CaseCreateAction.msgDlg.cantCreateCase.msg=\u30b1\u30fc\u30b9\u3092\u4f5c\u6210\u3067\u304d\u307e\u305b\u3093
+IntervalErrorReport.NewIssues=\u65b0\u898f\u306e\u30a4\u30b7\u30e5\u30fc
+IntervalErrorReport.TotalIssues=\u5168\u30a4\u30b7\u30e5\u30fc
+IntervalErrorReport.ErrorText=\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u306e\u63a5\u7d9a\u30a8\u30e9\u30fc
+GeneralFilter.virtualMachineImageDesc.text=\u4eee\u60f3\u30de\u30b7\u30f3(*.vmdk, *.vhd)
+LocalDiskPanel.localDiskModel.nodrives.msg=\u30a2\u30af\u30bb\u30b9\u3067\u304d\u308b\u30c9\u30e9\u30a4\u30d6\u304c\u3042\u308a\u307e\u305b\u3093
+MissingImageDialog.ErrorSettingImage=\u30a4\u30e1\u30fc\u30b8\u30d1\u30b9\u3092\u8a2d\u5b9a\u4e2d\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002\u518d\u5ea6\u5b9f\u884c\u3057\u3066\u304f\u3060\u3055\u3044\u3002
+NewCaseVisualPanel1.badCredentials.text=\u4f7f\u3048\u306a\u3044\u8907\u6570\u30e6\u30fc\u30b6\u30fc\u306e\u8a2d\u5b9a\uff08\u30c4\u30fc\u30eb\u3001\u30aa\u30d7\u30b7\u30e7\u30f3\u3001\u8907\u6570\u30e6\u30fc\u30b6\u30fc\u3092\u78ba\u8a8d\u3057\u3066\u304f\u3060\u3055\u3044\uff09\u307e\u305f\u306f\u30b5\u30fc\u30d3\u30b9\u304c\u30c0\u30a6\u30f3\u3057\u3066\u3044\u307e\u3059\u3002
+NewCaseWizardAction.databaseProblem1.text=\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u3092\u958b\u3051\u307e\u305b\u3093\u3002\u30b1\u30fc\u30b9\u4f5c\u6210\u3092\u30ad\u30e3\u30f3\u30bb\u30eb\u3057\u3066\u3044\u307e\u3059\u3002
+NewCaseWizardAction.databaseProblem2.text=\u30a8\u30e9\u30fc
+DataSourceOnCDriveError.text=\u8b66\u544a\uff1a\u8907\u6570\u30e6\u30fc\u30b6\u30fc\u306e\u30c7\u30fc\u30bf\u30bd\u30fc\u30b9\u3078\u306e\u30d1\u30b9\u306f"C\:"\u30c9\u30e9\u30a4\u30d6\u306b\u3042\u308a\u307e\u3059
+NewCaseVisualPanel1.CaseFolderOnCDriveError.text=\u8b66\u544a\uff1a\u8907\u6570\u30e6\u30fc\u30b6\u30fc\u306e\u30b1\u30fc\u30b9\u30d5\u30a9\u30eb\u30c0\u3078\u306e\u30d1\u30b9\u306f"C\:"\u30c9\u30e9\u30a4\u30d6\u306b\u3042\u308a\u307e\u3059
+CollaborationMonitor.addingDataSourceStatus.msg={0}\u304c\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u3092\u8ffd\u52a0\u4e2d
+CollaborationMonitor.analyzingDataSourceStatus.msg={0}\u304c{1}\u3092\u89e3\u6790\u4e2d
+NewCaseVisualPanel1.multiUserCaseRadioButton.text=\u8907\u6570\u30e6\u30fc\u30b6\u30fc
+NewCaseVisualPanel1.singleUserCaseRadioButton.text=\u5358\u6570\u30e6\u30fc\u30b6\u30fc
+CasePropertiesForm.lbDbType.text=\u30b1\u30fc\u30b9\u30bf\u30a4\u30d7\uff1a
+CasePropertiesForm.lbDbName.text=\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u540d\uff1a
+SingleUserCaseConverter.BadDatabaseFileName=\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u30d5\u30a1\u30a4\u30eb\u304c\u5b58\u5728\u3057\u307e\u305b\u3093\uff01
+SingleUserCaseConverter.AlreadyMultiUser=\u30b1\u30fc\u30b9\u306f\u65e2\u306b\u8907\u6570\u30e6\u30fc\u30b6\u30fc\u3067\u3059\uff01
+SingleUserCaseConverter.NonUniqueDatabaseName=\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u540d\u304c\u30e6\u30cb\u30fc\u30af\u3067\u306f\u3042\u308a\u307e\u305b\u3093\u3002
+SingleUserCaseConverter.UnableToCopySourceImages=\u30bd\u30fc\u30b9\u30a4\u30e1\u30fc\u30b8\u3092\u30b3\u30d4\u30fc\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002
+SingleUserCaseConverter.CanNotOpenDatabase=\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u3092\u958b\u3051\u307e\u305b\u3093\u3067\u3057\u305f
+CloseCaseWhileIngesting.Warning=\u30a4\u30f3\u30b8\u30a7\u30b9\u30c8\u304c\u5b9f\u884c\u4e2d\u3067\u3059\u3002\u3053\u306e\u30b1\u30fc\u30b9\u3092\u672c\u5f53\u306b\u9589\u3058\u307e\u3059\u304b\uff1f
+CloseCaseWhileIngesting.Warning.title=\u8b66\u544a\uff1a\u3053\u308c\u3092\u5b9f\u884c\u3059\u308c\u3070\u4f5c\u696d\u4e2d\u306e\u30b1\u30fc\u30b9\u3092\u9589\u3058\u307e\u3059
+Case_caseType_multiUser=\u8907\u6570\u30e6\u30fc\u30b6\u30fc\u30b1\u30fc\u30b9
+Case_caseType_singleUser=\u5358\u6570\u30e6\u30fc\u30b6\u30fc\u30b1\u30fc\u30b9
+CasePropertiesForm.imagesTable.columnModel.title0=\u30d1\u30b9
+CasePropertiesForm.imagesTable.columnModel.title1=\u524a\u9664

From 72aa790ba2a45543dbe009e98ed7bdbd13869d5f Mon Sep 17 00:00:00 2001
From: Richard Cordovano <rcordovano@basistech.com>
Date: Wed, 3 Feb 2016 14:20:16 -0500
Subject: [PATCH 30/68] Work on device ids for virtual directories

---
 .../autopsy/casemodule/AddLocalFilesTask.java | 189 +++++++-----------
 .../autopsy/casemodule/ImageDSProcessor.java  |   4 +-
 .../casemodule/LocalDiskDSProcessor.java      |   1 -
 .../casemodule/LocalFilesDSProcessor.java     | 166 +++++++--------
 .../casemodule/services/FileManager.java      |  47 +++++
 5 files changed, 207 insertions(+), 200 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/AddLocalFilesTask.java b/Core/src/org/sleuthkit/autopsy/casemodule/AddLocalFilesTask.java
index 476a241936..53c433ff0b 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/AddLocalFilesTask.java
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/AddLocalFilesTask.java
@@ -1,7 +1,7 @@
 /*
  * Autopsy Forensic Browser
  *
- * Copyright 2013-2014 Basis Technology Corp.
+ * Copyright 2013-2016 Basis Technology Corp.
  * Contact: carrier <at> sleuthkit <dot> org
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -22,7 +22,6 @@ 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;
@@ -31,153 +30,111 @@ import org.sleuthkit.datamodel.AbstractFile;
 import org.sleuthkit.datamodel.Content;
 import org.sleuthkit.autopsy.casemodule.services.FileManager;
 import org.sleuthkit.datamodel.TskCoreException;
+import org.sleuthkit.datamodel.VirtualDirectory;
 
 /**
- * Thread that will add logical files to database, and then kick-off ingest
- * modules. Note: the add logical files task cannot currently be reverted as the
- * add image task can. This is a separate task from AddImgTask because it is
- * much simpler and does not require locks, since the underlying file manager
- * methods acquire the locks for each transaction when adding logical files.
+ * A runnable that adds a set of local/logical files and/or directories to the
+ * case database, grouped under a virtual directory that serves as the data
+ * source.
  */
 class AddLocalFilesTask implements Runnable {
 
     private final Logger logger = Logger.getLogger(AddLocalFilesTask.class.getName());
-
-    private final String dataSourcePath;
+    private final String deviceId;
+    private final List<String> paths;
     private final DataSourceProcessorProgressMonitor progressMonitor;
-    private final DataSourceProcessorCallback callbackObj;
+    private final DataSourceProcessorCallback callback;
+    private final List<Content> dataSources;
+    private final List<String> errors;
+    private volatile boolean cancelRequested;
 
-    private final Case currentCase;
-
-    // synchronization object for cancelRequested
-    private final Object lock = new Object();
-    // true if the process was requested to stop
-    private volatile boolean cancelRequested = false;
-
-    private boolean hasCritError = false;
-
-    private final List<String> errorList = new ArrayList<>();
-    private final List<Content> newContents = Collections.synchronizedList(new ArrayList<Content>());
-
-    public AddLocalFilesTask(String dataSourcePath, DataSourceProcessorProgressMonitor aProgressMonitor, DataSourceProcessorCallback cbObj) {
-
-        currentCase = Case.getCurrentCase();
-
-        this.dataSourcePath = dataSourcePath;
-        this.callbackObj = cbObj;
-        this.progressMonitor = aProgressMonitor;
+    /**
+     * Constructs a runnable that adds a set of local/logical files and/or
+     * directories to the case database, grouped under a virtual directory that
+     * serves as the data source.
+     *
+     * @param deviceId    An ASCII-printable identifier for the device
+     *                        associated with the data source, in this case a
+     *                        gropu of local/logical files, that is intended to
+     *                        be unique across multiple cases (e.g., a UUID).
+     * @param paths           A list of paths of local/logical files and/or
+     *                        directories.
+     * @param progressMonitor Progress monitor to report progress during
+     *                        processing.
+     * @param callback        Callback to call when processing is done.
+     */
+    AddLocalFilesTask(String deviceId, List<String> paths, DataSourceProcessorProgressMonitor progressMonitor, DataSourceProcessorCallback callback) {
+        this.deviceId = deviceId;
+        this.paths = paths;
+        this.callback = callback;
+        this.progressMonitor = progressMonitor;
+        this.errors = new ArrayList<>();
+        this.dataSources = Collections.synchronizedList(new ArrayList<Content>());
     }
 
     /**
-     * Add local files and directories to the case
-     *
-     * @return
-     *
-     * @throws Exception
+     * Adds a set of local/logical files and/or directories to the case
+     * database, grouped under a virtual directory that serves as the data
+     * source.
      */
     @Override
     public void run() {
-
-        errorList.clear();
-
-        final LocalFilesAddProgressUpdater progUpdater = new LocalFilesAddProgressUpdater(progressMonitor);
+        ProgressUpdater progressUpdater = new ProgressUpdater();
         try {
-
             progressMonitor.setIndeterminate(true);
             progressMonitor.setProgress(0);
-
-            final FileManager fileManager = currentCase.getServices().getFileManager();
-            String[] paths = dataSourcePath.split(LocalFilesPanel.FILES_SEP);
-            List<String> absLocalPaths = new ArrayList<>();
-            for (String path : paths) {
-                absLocalPaths.add(path);
-            }
-            newContents.add(fileManager.addLocalFilesDirs(absLocalPaths, progUpdater));
+            FileManager fileManager = Case.getCurrentCase().getServices().getFileManager();
+            VirtualDirectory dataSource = fileManager.addLocalFilesDirs(paths, progressUpdater);
+            dataSources.add(dataSource);
         } catch (TskCoreException ex) {
-            logger.log(Level.WARNING, "Errors occurred while running add logical files. ", ex); //NON-NLS
-            hasCritError = true;
-            errorList.add(ex.getMessage());
+            logger.log(Level.SEVERE, String.format("Error adding logical files %s", paths), ex); //NON-NLS
+            errors.add(ex.getMessage());
         }
 
-        // handle  done
-        postProcess();
-
-    }
-
-    private void postProcess() {
-
-        if (cancelRequested() || hasCritError) {
-            logger.log(Level.WARNING, "Handling errors or interruption that occurred in logical files process");  //NON-NLS
-        }
-        if (!errorList.isEmpty()) {
-            //data error (non-critical)
-            logger.log(Level.WARNING, "Handling non-critical errors that occurred in logical files process"); //NON-NLS
-        }
-
-        if (!(cancelRequested() || hasCritError)) {
+        if (!cancelRequested && errors.isEmpty()) {
             progressMonitor.setProgress(100);
             progressMonitor.setIndeterminate(false);
         }
 
-        // invoke the callBack, unless the caller cancelled 
-        if (!cancelRequested()) {
-            doCallBack();
-        }
-
-    }
-
-    /*
-     * Call the callback with results, new content, and errors, if any
-     */
-    private void doCallBack() {
-        DataSourceProcessorCallback.DataSourceProcessorResult result;
-
-        if (hasCritError) {
-            result = DataSourceProcessorCallback.DataSourceProcessorResult.CRITICAL_ERRORS;
-        } else if (!errorList.isEmpty()) {
-            result = DataSourceProcessorCallback.DataSourceProcessorResult.NONCRITICAL_ERRORS;
-        } else {
-            result = DataSourceProcessorCallback.DataSourceProcessorResult.NO_ERRORS;
-        }
-
-        // invoke the callback, passing it the result, list of new contents, and list of errors
-        callbackObj.done(result, errorList, newContents);
-    }
-
-    /*
-     * cancel the files addition, if possible
-     */
-    public void cancelTask() {
-        synchronized (lock) {
-            cancelRequested = true;
-        }
-    }
-
-    private boolean cancelRequested() {
-        synchronized (lock) {
-            return cancelRequested;
+        if (!cancelRequested) {
+            DataSourceProcessorCallback.DataSourceProcessorResult result;
+            if (!errors.isEmpty()) {
+                result = DataSourceProcessorCallback.DataSourceProcessorResult.CRITICAL_ERRORS;
+            } else {
+                result = DataSourceProcessorCallback.DataSourceProcessorResult.NO_ERRORS;
+            }
+            callback.done(result, errors, dataSources);
         }
     }
 
     /**
-     * Updates the wizard status with logical file/folder
+     * Sets a cancel requested flag. Does not cancel adding the local/logical
+     * files and/or directories, but will cancel the return of the data source
+     * via the callback, if the flag is set before the run method completes.
      */
-    private class LocalFilesAddProgressUpdater implements FileManager.FileAddProgressUpdater {
+    public void cancelTask() {
+        cancelRequested = true;
+    }
 
-        private int count = 0;
-        private final DataSourceProcessorProgressMonitor progressMonitor;
+    /**
+     * Updates the progress progressMonitor with progress reported by the files
+     * manager.
+     */
+    private class ProgressUpdater implements FileManager.FileAddProgressUpdater {
 
-        LocalFilesAddProgressUpdater(DataSourceProcessorProgressMonitor progressMonitor) {
-
-            this.progressMonitor = progressMonitor;
-        }
+        private int count;
 
+        /**
+         * @inheritDoc
+         */
         @Override
-        public void fileAdded(final AbstractFile newFile) {
-            if (count++ % 10 == 0) {
-                progressMonitor.setProgressText(
-                        NbBundle.getMessage(this.getClass(), "AddLocalFilesTask.localFileAdd.progress.text",
-                                newFile.getParentPath(), newFile.getName()));
+        public void fileAdded(final AbstractFile file) {
+            ++count;
+            if (count % 10 == 0) {
+                progressMonitor.setProgressText(NbBundle.getMessage(this.getClass(),
+                        "AddLocalFilesTask.localFileAdd.progress.text",
+                        file.getParentPath(),
+                        file.getName()));
             }
         }
     }
diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/ImageDSProcessor.java b/Core/src/org/sleuthkit/autopsy/casemodule/ImageDSProcessor.java
index 03065775e2..249409a8e1 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/ImageDSProcessor.java
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/ImageDSProcessor.java
@@ -31,7 +31,7 @@ import org.sleuthkit.autopsy.corecomponentinterfaces.DataSourceProcessorCallback
 import org.sleuthkit.autopsy.corecomponentinterfaces.DataSourceProcessor;
 
 /**
- * An image data source processor with a configuration panel. This data source
+ * An image file data source processor with a configuration panel. This data source
  * processor implements the DataSourceProcessor service provider interface to
  * allow integration with the add data source wizard. It also provides a run
  * method overload to allow it to be used independently of the configuration UI.
@@ -66,7 +66,7 @@ public class ImageDSProcessor implements DataSourceProcessor {
     }
 
     /**
-     * Constructs a local drive data source processor with a configuration
+     * Constructs an image file data source processor with a configuration
      * panel. This data source processor implements the DataSourceProcessor
      * service provider interface to allow integration with the add data source
      * wizard. It also provides a run method overload to allow it to be used
diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/LocalDiskDSProcessor.java b/Core/src/org/sleuthkit/autopsy/casemodule/LocalDiskDSProcessor.java
index 90fc238d32..bb7a796ad2 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/LocalDiskDSProcessor.java
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/LocalDiskDSProcessor.java
@@ -93,7 +93,6 @@ public class LocalDiskDSProcessor implements DataSourceProcessor {
      * Indicates whether or not the inputs to the configuration panel are valid.
      *
      * @return True or false.
-     *
      */
     @Override
     public boolean isPanelValid() {
diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/LocalFilesDSProcessor.java b/Core/src/org/sleuthkit/autopsy/casemodule/LocalFilesDSProcessor.java
index f8f8353ee9..d03a3dbe33 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/LocalFilesDSProcessor.java
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/LocalFilesDSProcessor.java
@@ -1,7 +1,7 @@
 /*
  * Autopsy Forensic Browser
  *
- * Copyright 2013-2014  Basis Technology Corp.
+ * Copyright 2013-2016  Basis Technology Corp.
  * Contact: carrier <at> sleuthkit <dot> org
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,60 +18,60 @@
  */
 package org.sleuthkit.autopsy.casemodule;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.UUID;
 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;
 import org.sleuthkit.autopsy.corecomponentinterfaces.DataSourceProcessor;
-import org.sleuthkit.autopsy.coreutils.Logger;
 
+/**
+ * A local/logical files and/or directories data source processor with a
+ * configuration panel. This data source processor implements the
+ * DataSourceProcessor service provider interface to allow integration with the
+ * add data source wizard. It also provides a run method overload to allow it to
+ * be used independently of the configuration UI.
+ */
 @ServiceProvider(service = DataSourceProcessor.class)
 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 = NbBundle.getMessage(LocalFilesDSProcessor.class, "LocalFilesDSProcessor.dsType");
-
-    // The Config UI panel that plugins into the Choose Data Source Wizard
-    private final LocalFilesPanel localFilesPanel;
-
-    // The Background task that does the actual work of adding the files 
+    private final LocalFilesPanel configPanel;
+    private String deviceId;
+    private List<String> paths;
+    private boolean configured;
     private AddLocalFilesTask addFilesTask;
 
-    // true if cancelled by the caller
-    private boolean cancelled = false;
-
-    DataSourceProcessorCallback callbackObj = null;
-
-    // set to TRUE if the image options have been set via API and config Jpanel should be ignored
-    private boolean localFilesOptionsSet = false;
-
-    // data source options
-    private String localFilesPath;
-
-    /*
-     * A no argument constructor is required for the NM lookup() method to
-     * create an object
+    /**
+     * Constructs a local/logical files and/or directories data source processor
+     * with a configuration panel. This data source processor implements the
+     * DataSourceProcessor service provider interface to allow integration with
+     * the add data source wizard. It also provides a run method overload to
+     * allow it to be used independently of the configuration UI.
      */
     public LocalFilesDSProcessor() {
-
-        // Create the config panel
-        localFilesPanel = LocalFilesPanel.getDefault();
+        configPanel = LocalFilesPanel.getDefault();
     }
 
-    // this static method is used by the wizard to determine dsp type for 'core' data source processors
+    /**
+     * Gets the display name of the type of data source this type of data source
+     * processor is able to process.
+     *
+     * @return The data source type display name.
+     */
     public static String getType() {
         return dsType;
     }
 
     /**
-     * Returns the Data source type (string) handled by this DSP
-     *
-     * @return String the data source type
+     * Gets the display name of the type of data source this data source
+     * processor is able to process.
      *
+     * @return The data source type display name.
      */
     @Override
     public String getDataSourceType() {
@@ -79,97 +79,101 @@ public class LocalFilesDSProcessor implements DataSourceProcessor {
     }
 
     /**
-     * Returns the JPanel for collecting the Data source information
-     *
-     * @return JPanel the config panel 
+     * Gets the a configuration panel for this data source processor.
      *
+     * @return JPanel The configuration panel.
      */
     @Override
     public JPanel getPanel() {
-        localFilesPanel.select();
-        return localFilesPanel;
+        configPanel.select();
+        return configPanel;
     }
 
     /**
      * Validates the data collected by the JPanel
      *
      * @return String returns NULL if success, error string if there is any
-     *         errors  
+     *         errors
      *
      */
     @Override
     public boolean isPanelValid() {
-        return localFilesPanel.validatePanel();
+        return configPanel.validatePanel();
     }
 
     /**
-     * Runs the data source processor. This must kick off processing the data
-     * source in background
-     *
-     * @param progressMonitor Progress monitor to report progress during
-     *                        processing
-     * @param cbObj           callback to call when processing is done.
+     * Runs the data source processor in a separate thread. Should only be
+     * called after further configuration has been completed.
      *
+     * @param monitor Progress monitor to report progress during processing.
+     * @param cbObj   Callback to call when processing is done.
      */
     @Override
-    public void run(DataSourceProcessorProgressMonitor progressMonitor, DataSourceProcessorCallback cbObj) {
-
-        callbackObj = cbObj;
-        cancelled = false;
-
-        if (!localFilesOptionsSet) {
-            // get the selected file paths from the panel
-            localFilesPath = localFilesPanel.getContentPaths();
+    public void run(DataSourceProcessorProgressMonitor monitor, DataSourceProcessorCallback cbObj) {
+        if (!configured) {
+            if (null == deviceId) {
+                deviceId = UUID.randomUUID().toString();
+            }
+            paths = Arrays.asList(configPanel.getContentPaths().split(LocalFilesPanel.FILES_SEP));
+            configured = true;
         }
-
-        addFilesTask = new AddLocalFilesTask(localFilesPath, progressMonitor, cbObj);
+        addFilesTask = new AddLocalFilesTask(deviceId, paths, monitor, cbObj);
         new Thread(addFilesTask).start();
-
     }
 
     /**
-     * Cancel the data source processing
+     * Runs the data source processor in a separate thread without requiring use
+     * the configuration panel.
      *
+     * @param dataSourceId An ASCII-printable identifier for the device
+     *                     associated with the data source, in this case a group
+     *                     of local/logical files, that is intended to be unique
+     *                     across multiple cases (e.g., a UUID).
+     * @param paths        A list of local/logical file and/or directory paths.
+     * @param monitor      Progress monitor to report progress during
+     *                     processing.
+     * @param cbObj        Callback to call when processing is done.
+     */
+    public void run(String deviceId, List<String> paths, DataSourceProcessorProgressMonitor monitor, DataSourceProcessorCallback cbObj) {
+        this.deviceId = deviceId;
+        this.paths = new ArrayList<>(paths);
+        configured = true;
+        run(monitor, cbObj);
+    }
+
+    /**
+     * Cancels the processing of the data source.
      */
     @Override
     public void cancel() {
-
-        cancelled = true;
         addFilesTask.cancelTask();
-
     }
 
     /**
-     * Reset the data source processor
-   *
+     * Resets the configuration of this data source processor, including its
+     * configuration panel.
      */
     @Override
     public void reset() {
-
-        // reset the config panel
-        localFilesPanel.reset();
-
-        // reset state 
-        localFilesOptionsSet = false;
-        localFilesPath = null;
-
+        configPanel.reset();
+        paths = null;
+        configured = false;
     }
 
     /**
-     * Sets the data source options externally. To be used by a client that does
-     * not have a UI and does not use the JPanel to collect this information
-     * from a user.
-     *
-     * @param filesPath PATH_SEP list of paths to local files
+     * Sets the configuration of the data source processor without using the
+     * configuration panel. The data source processor will assign a UUID to the
+     * data source and will use the time zone of the machine executing this code
+     * when when processing dates and times for the image.
      *
+     * @param paths A list of local/logical file and/or directory paths.
      *
+     * @deprecated Use the run method instead.
      */
-    public void setDataSourceOptions(String filesPath) {
-
-        localFilesPath = filesPath;
-
-        localFilesOptionsSet = true;
-
+    @Deprecated
+    public void setDataSourceOptions(String paths) {
+        this.paths = Arrays.asList(configPanel.getContentPaths().split(LocalFilesPanel.FILES_SEP));
+        configured = true;
     }
 
 }
diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/services/FileManager.java b/Core/src/org/sleuthkit/autopsy/casemodule/services/FileManager.java
index 76b8420630..48f19e6581 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/services/FileManager.java
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/services/FileManager.java
@@ -391,6 +391,53 @@ public class FileManager implements Closeable {
         return fileSetRootDir;
     }
 
+    public synchronized VirtualDirectory addLocalFilesAndDirs(List<String> localAbsPaths, FileAddProgressUpdater progressUpdater) throws TskCoreException {
+        final List<java.io.File> rootsToAdd = new ArrayList<>();
+        //first validate all the inputs before any additions
+        for (String absPath : localAbsPaths) {
+            java.io.File localFile = new java.io.File(absPath);
+            if (!localFile.exists() || !localFile.canRead()) {
+                String msg = NbBundle
+                        .getMessage(this.getClass(), "FileManager.addLocalFilesDirs.exception.notReadable.msg",
+                                localFile.getAbsolutePath());
+                logger.log(Level.SEVERE, msg);
+                throw new TskCoreException(msg);
+            }
+            rootsToAdd.add(localFile);
+        }
+
+        CaseDbTransaction trans = tskCase.beginTransaction();
+        // make a virtual top-level directory for this set of files/dirs
+        final VirtualDirectory fileSetRootDir = addLocalFileSetRootDir(trans);
+
+        try {
+            // recursively add each item in the set
+            for (java.io.File localRootToAdd : rootsToAdd) {
+                AbstractFile localFileAdded = addLocalDirInt(trans, fileSetRootDir, localRootToAdd, progressUpdater);
+
+                if (localFileAdded == null) {
+                    String msg = NbBundle
+                            .getMessage(this.getClass(), "FileManager.addLocalFilesDirs.exception.cantAdd.msg",
+                                    localRootToAdd.getAbsolutePath());
+                    logger.log(Level.SEVERE, msg);
+                    throw new TskCoreException(msg);
+                } else {
+                    //added.add(localFileAdded);
+                    //send new content event
+                    //for now reusing ingest events, in future this will be replaced by datamodel / observer sending out events
+                    // @@@ Is this the right place for this? A directory tree refresh will be triggered, so this may be creating a race condition
+                    // since the transaction is not yet committed.   
+                    IngestServices.getInstance().fireModuleContentEvent(new ModuleContentEvent(localFileAdded));
+                }
+            }
+
+            trans.commit();
+        } catch (TskCoreException ex) {
+            trans.rollback();
+        }
+        return fileSetRootDir;
+    }    
+    
     /**
      * Adds a new virtual directory root object with FileSet X name and
      * consecutive sequence number characteristic to every add operation

From 1da3e4a72b232cd10c3e8e4ca10512978ecefe43 Mon Sep 17 00:00:00 2001
From: Nick Davis <nick.davis@narfindustries.com>
Date: Wed, 3 Feb 2016 14:25:03 -0500
Subject: [PATCH 31/68] converted ui fonts to derived fonts

---
 .../ingest/IngestMessageDetailsPanel.form     | 16 ++++++++--
 .../ingest/IngestMessageDetailsPanel.java     | 20 ++++++------
 .../autopsy/ingest/IngestMessagePanel.form    | 31 +++++++++++++++++--
 .../autopsy/ingest/IngestMessagePanel.java    | 13 +++++---
 4 files changed, 61 insertions(+), 19 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestMessageDetailsPanel.form b/Core/src/org/sleuthkit/autopsy/ingest/IngestMessageDetailsPanel.form
index bec4110472..a5472cdc25 100644
--- a/Core/src/org/sleuthkit/autopsy/ingest/IngestMessageDetailsPanel.form
+++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestMessageDetailsPanel.form
@@ -74,8 +74,10 @@
             <Property name="contentType" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
               <ResourceString bundle="org/sleuthkit/autopsy/ingest/Bundle.properties" key="IngestMessageDetailsPanel.messageDetailsPane.contentType" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
             </Property>
-            <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
-              <Font name="Tahoma" size="10" style="0"/>
+            <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+              <FontInfo relative="true">
+                <Font bold="false" component="messageDetailsPane" property="font" relativeSize="false" size="10"/>
+              </FontInfo>
             </Property>
             <Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
               <ResourceString bundle="org/sleuthkit/autopsy/ingest/Bundle.properties" key="IngestMessageDetailsPanel.messageDetailsPane.toolTipText" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
@@ -136,6 +138,11 @@
         </Component>
         <Component class="javax.swing.JButton" name="viewArtifactButton">
           <Properties>
+            <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+              <FontInfo relative="true">
+                <Font bold="false" component="viewArtifactButton" property="font" relativeSize="false" size="11"/>
+              </FontInfo>
+            </Property>
             <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
               <Image iconType="3" name="/org/sleuthkit/autopsy/ingest/goto_res.png"/>
             </Property>
@@ -153,6 +160,11 @@
         </Component>
         <Component class="javax.swing.JButton" name="viewContentButton">
           <Properties>
+            <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+              <FontInfo relative="true">
+                <Font bold="false" component="viewContentButton" property="font" relativeSize="false" size="11"/>
+              </FontInfo>
+            </Property>
             <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
               <Image iconType="3" name="/org/sleuthkit/autopsy/ingest/goto_dir.png"/>
             </Property>
diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestMessageDetailsPanel.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestMessageDetailsPanel.java
index aca7541263..0a8222bca0 100644
--- a/Core/src/org/sleuthkit/autopsy/ingest/IngestMessageDetailsPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestMessageDetailsPanel.java
@@ -127,25 +127,23 @@ class IngestMessageDetailsPanel extends javax.swing.JPanel {
         messageDetailsPane.setEditable(false);
         messageDetailsPane.setBackground(new java.awt.Color(221, 221, 235));
         messageDetailsPane.setBorder(null);
-        messageDetailsPane.setContentType(org.openide.util.NbBundle.getMessage(IngestMessageDetailsPanel.class,
-                                                                               "IngestMessageDetailsPanel.messageDetailsPane.contentType")); // NOI18N
-        messageDetailsPane.setFont(messageDetailsPane.getFont().deriveFont(Font.PLAIN, 10));
-        messageDetailsPane.setToolTipText(org.openide.util.NbBundle.getMessage(IngestMessageDetailsPanel.class,
-                                                                               "IngestMessageDetailsPanel.messageDetailsPane.toolTipText")); // NOI18N
+        messageDetailsPane.setContentType(org.openide.util.NbBundle.getMessage(IngestMessageDetailsPanel.class, "IngestMessageDetailsPanel.messageDetailsPane.contentType")); // NOI18N
+        messageDetailsPane.setFont(messageDetailsPane.getFont().deriveFont(messageDetailsPane.getFont().getStyle() & ~java.awt.Font.BOLD, 10));
+        messageDetailsPane.setToolTipText(org.openide.util.NbBundle.getMessage(IngestMessageDetailsPanel.class, "IngestMessageDetailsPanel.messageDetailsPane.toolTipText")); // NOI18N
         jScrollPane1.setViewportView(messageDetailsPane);
 
         jToolBar1.setFloatable(false);
         jToolBar1.setRollover(true);
 
-        backButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/ingest/btn_step_back.png"))); // NOI18N NON-NLS
+        backButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/ingest/btn_step_back.png"))); // NOI18N
         backButton.setText(org.openide.util.NbBundle.getMessage(IngestMessageDetailsPanel.class, "IngestMessageDetailsPanel.backButton.text")); // NOI18N
         backButton.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
         backButton.setMargin(new java.awt.Insets(2, 2, 2, 2));
         backButton.setMaximumSize(new java.awt.Dimension(23, 23));
         backButton.setMinimumSize(new java.awt.Dimension(23, 23));
         backButton.setPreferredSize(new java.awt.Dimension(23, 23));
-        backButton.setPressedIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/ingest/btn_step_back_hover.png"))); // NOI18N NON-NLS
-        backButton.setRolloverIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/ingest/btn_step_back_hover.png"))); // NOI18N NON-NLS
+        backButton.setPressedIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/ingest/btn_step_back_hover.png"))); // NOI18N
+        backButton.setRolloverIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/ingest/btn_step_back_hover.png"))); // NOI18N
         backButton.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
                 backButtonActionPerformed(evt);
@@ -154,7 +152,8 @@ class IngestMessageDetailsPanel extends javax.swing.JPanel {
         jToolBar1.add(backButton);
         jToolBar1.add(filler1);
 
-        viewArtifactButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/ingest/goto_res.png"))); // NOI18N NON-NLS
+        viewArtifactButton.setFont(viewArtifactButton.getFont().deriveFont(viewArtifactButton.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
+        viewArtifactButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/ingest/goto_res.png"))); // NOI18N
         viewArtifactButton.setText(org.openide.util.NbBundle.getMessage(IngestMessageDetailsPanel.class, "IngestMessageDetailsPanel.viewArtifactButton.text")); // NOI18N
         viewArtifactButton.setIconTextGap(2);
         viewArtifactButton.setPreferredSize(new java.awt.Dimension(93, 23));
@@ -165,7 +164,8 @@ class IngestMessageDetailsPanel extends javax.swing.JPanel {
         });
         jToolBar1.add(viewArtifactButton);
 
-        viewContentButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/ingest/goto_dir.png"))); // NOI18N NON-NLS
+        viewContentButton.setFont(viewContentButton.getFont().deriveFont(viewContentButton.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
+        viewContentButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/ingest/goto_dir.png"))); // NOI18N
         viewContentButton.setText(org.openide.util.NbBundle.getMessage(IngestMessageDetailsPanel.class, "IngestMessageDetailsPanel.viewContentButton.text")); // NOI18N
         viewContentButton.setIconTextGap(2);
         viewContentButton.setPreferredSize(new java.awt.Dimension(111, 23));
diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestMessagePanel.form b/Core/src/org/sleuthkit/autopsy/ingest/IngestMessagePanel.form
index 4a964d3b9d..7cc7f63a0e 100644
--- a/Core/src/org/sleuthkit/autopsy/ingest/IngestMessagePanel.form
+++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestMessagePanel.form
@@ -57,8 +57,10 @@
             <Property name="background" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
               <Color blue="eb" green="dd" red="dd" type="rgb"/>
             </Property>
-            <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
-              <Font name="Arial" size="12" style="0"/>
+            <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+              <FontInfo relative="true">
+                <Font bold="false" component="messageTable" property="font" relativeSize="false" size="12"/>
+              </FontInfo>
             </Property>
             <Property name="model" type="javax.swing.table.TableModel" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
               <Connection code="tableModel" type="code"/>
@@ -132,6 +134,11 @@
         </Component>
         <Component class="javax.swing.JComboBox" name="sortByComboBox">
           <Properties>
+            <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+              <FontInfo relative="true">
+                <Font bold="false" component="sortByComboBox" property="font" relativeSize="false" size="11"/>
+              </FontInfo>
+            </Property>
             <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>
@@ -148,6 +155,11 @@
         </Component>
         <Component class="javax.swing.JLabel" name="totalMessagesNameLabel">
           <Properties>
+            <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+              <FontInfo relative="true">
+                <Font bold="false" component="totalMessagesNameLabel" property="font" relativeSize="false" size="11"/>
+              </FontInfo>
+            </Property>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
               <ResourceString bundle="org/sleuthkit/autopsy/ingest/Bundle.properties" key="IngestMessagePanel.totalMessagesNameLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
             </Property>
@@ -155,6 +167,11 @@
         </Component>
         <Component class="javax.swing.JLabel" name="totalMessagesNameVal">
           <Properties>
+            <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+              <FontInfo relative="true">
+                <Font bold="false" component="totalMessagesNameVal" property="font" relativeSize="false" size="11"/>
+              </FontInfo>
+            </Property>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
               <ResourceString bundle="org/sleuthkit/autopsy/ingest/Bundle.properties" key="IngestMessagePanel.totalMessagesNameVal.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
             </Property>
@@ -162,6 +179,11 @@
         </Component>
         <Component class="javax.swing.JLabel" name="totalUniqueMessagesNameLabel">
           <Properties>
+            <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+              <FontInfo relative="true">
+                <Font bold="false" component="totalUniqueMessagesNameLabel" property="font" relativeSize="false" size="11"/>
+              </FontInfo>
+            </Property>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
               <ResourceString bundle="org/sleuthkit/autopsy/ingest/Bundle.properties" key="IngestMessagePanel.totalUniqueMessagesNameLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
             </Property>
@@ -169,6 +191,11 @@
         </Component>
         <Component class="javax.swing.JLabel" name="totalUniqueMessagesNameVal">
           <Properties>
+            <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+              <FontInfo relative="true">
+                <Font bold="false" component="totalUniqueMessagesNameVal" property="font" relativeSize="false" size="11"/>
+              </FontInfo>
+            </Property>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
               <ResourceString bundle="org/sleuthkit/autopsy/ingest/Bundle.properties" key="IngestMessagePanel.totalUniqueMessagesNameVal.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
             </Property>
diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestMessagePanel.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestMessagePanel.java
index 9e456f9c2e..af53abfd8b 100644
--- a/Core/src/org/sleuthkit/autopsy/ingest/IngestMessagePanel.java
+++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestMessagePanel.java
@@ -119,7 +119,7 @@ class IngestMessagePanel extends JPanel implements TableModelListener {
         messageTable = new javax.swing.JTable();
         controlPanel = new javax.swing.JPanel();
         sortByLabel = new javax.swing.JLabel();
-        sortByComboBox = new javax.swing.JComboBox<String>();
+        sortByComboBox = new javax.swing.JComboBox<>();
         totalMessagesNameLabel = new javax.swing.JLabel();
         totalMessagesNameVal = new javax.swing.JLabel();
         totalUniqueMessagesNameLabel = new javax.swing.JLabel();
@@ -132,7 +132,7 @@ class IngestMessagePanel extends JPanel implements TableModelListener {
         jScrollPane1.setPreferredSize(new java.awt.Dimension(32767, 32767));
 
         messageTable.setBackground(new java.awt.Color(221, 221, 235));
-        messageTable.setFont(messageTable.getFont().deriveFont(Font.PLAIN, 12));
+        messageTable.setFont(messageTable.getFont().deriveFont(messageTable.getFont().getStyle() & ~java.awt.Font.BOLD, 12));
         messageTable.setModel(tableModel);
         messageTable.setAutoResizeMode(javax.swing.JTable.AUTO_RESIZE_OFF);
         messageTable.setAutoscrolls(false);
@@ -148,9 +148,8 @@ 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<String>(new String[] {
-                NbBundle.getMessage(this.getClass(), "IngestMessagePanel.sortByComboBox.model.time"),
-                NbBundle.getMessage(this.getClass(), "IngestMessagePanel.sortByComboBox.model.priority") })); // NOI18N
+        sortByComboBox.setFont(sortByComboBox.getFont().deriveFont(sortByComboBox.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
+        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) {
@@ -158,12 +157,16 @@ class IngestMessagePanel extends JPanel implements TableModelListener {
             }
         });
 
+        totalMessagesNameLabel.setFont(totalMessagesNameLabel.getFont().deriveFont(totalMessagesNameLabel.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         totalMessagesNameLabel.setText(org.openide.util.NbBundle.getMessage(IngestMessagePanel.class, "IngestMessagePanel.totalMessagesNameLabel.text")); // NOI18N
 
+        totalMessagesNameVal.setFont(totalMessagesNameVal.getFont().deriveFont(totalMessagesNameVal.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         totalMessagesNameVal.setText(org.openide.util.NbBundle.getMessage(IngestMessagePanel.class, "IngestMessagePanel.totalMessagesNameVal.text")); // NOI18N
 
+        totalUniqueMessagesNameLabel.setFont(totalUniqueMessagesNameLabel.getFont().deriveFont(totalUniqueMessagesNameLabel.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         totalUniqueMessagesNameLabel.setText(org.openide.util.NbBundle.getMessage(IngestMessagePanel.class, "IngestMessagePanel.totalUniqueMessagesNameLabel.text")); // NOI18N
 
+        totalUniqueMessagesNameVal.setFont(totalUniqueMessagesNameVal.getFont().deriveFont(totalUniqueMessagesNameVal.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         totalUniqueMessagesNameVal.setText(org.openide.util.NbBundle.getMessage(IngestMessagePanel.class, "IngestMessagePanel.totalUniqueMessagesNameVal.text")); // NOI18N
 
         javax.swing.GroupLayout controlPanelLayout = new javax.swing.GroupLayout(controlPanel);

From 9298a622b5439228babc39dd3a903dbba60786b3 Mon Sep 17 00:00:00 2001
From: Nick Davis <nick.davis@narfindustries.com>
Date: Wed, 3 Feb 2016 15:07:47 -0500
Subject: [PATCH 32/68] fixed hard coded string in form combobox

---
 .../org/sleuthkit/autopsy/ingest/IngestMessagePanel.form | 3 ---
 .../org/sleuthkit/autopsy/ingest/IngestMessagePanel.java | 9 ++++++++-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestMessagePanel.form b/Core/src/org/sleuthkit/autopsy/ingest/IngestMessagePanel.form
index 7cc7f63a0e..719e9d6ce7 100644
--- a/Core/src/org/sleuthkit/autopsy/ingest/IngestMessagePanel.form
+++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestMessagePanel.form
@@ -139,9 +139,6 @@
                 <Font bold="false" component="sortByComboBox" property="font" relativeSize="false" size="11"/>
               </FontInfo>
             </Property>
-            <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;)"/>
             </Property>
diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestMessagePanel.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestMessagePanel.java
index af53abfd8b..c06f91a497 100644
--- a/Core/src/org/sleuthkit/autopsy/ingest/IngestMessagePanel.java
+++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestMessagePanel.java
@@ -149,7 +149,6 @@ class IngestMessagePanel extends JPanel implements TableModelListener {
         sortByLabel.setText(org.openide.util.NbBundle.getMessage(IngestMessagePanel.class, "IngestMessagePanel.sortByLabel.text")); // NOI18N
 
         sortByComboBox.setFont(sortByComboBox.getFont().deriveFont(sortByComboBox.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
-        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) {
@@ -241,6 +240,14 @@ class IngestMessagePanel extends JPanel implements TableModelListener {
         jScrollPane1.setOpaque(true);
         messageTable.setOpaque(false);
 
+        /**
+         * It is not possible to internationalize the list of options in a ComboBox
+         * inside of the generated form code. So, it is done here.
+         */
+        sortByComboBox.setModel(new javax.swing.DefaultComboBoxModel<String>(new String[] {
+            NbBundle.getMessage(this.getClass(), "IngestMessagePanel.sortByComboBox.model.time"), 
+            NbBundle.getMessage(this.getClass(), "IngestMessagePanel.sortByComboBox.model.priority")}));
+
         jScrollPane1.setWheelScrollingEnabled(true);
 
         messageTable.setAutoscrolls(false);

From 1d5db5578b3eedd900b7bf939be41aca965ba05d Mon Sep 17 00:00:00 2001
From: Nick Davis <nick.davis@narfindustries.com>
Date: Wed, 3 Feb 2016 15:14:59 -0500
Subject: [PATCH 33/68] merged translations into imagegallery module

---
 .../autopsy/imagegallery/Bundle_ja.properties | 32 +++++++++++++++++++
 .../imagegallery/actions/Bundle_ja.properties | 23 +++++++++++++
 .../datamodel/Bundle_ja.properties            | 23 +++++++++++++
 .../datamodel/grouping/Bundle_ja.properties   |  6 ++++
 .../imagegallery/gui/Bundle_ja.properties     |  4 +++
 .../gui/drawableviews/Bundle_ja.properties    | 10 ++++++
 .../gui/navpanel/Bundle_ja.properties         |  7 ++++
 7 files changed, 105 insertions(+)
 create mode 100644 ImageGallery/src/org/sleuthkit/autopsy/imagegallery/Bundle_ja.properties
 create mode 100644 ImageGallery/src/org/sleuthkit/autopsy/imagegallery/actions/Bundle_ja.properties
 create mode 100644 ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/Bundle_ja.properties
 create mode 100644 ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/grouping/Bundle_ja.properties
 create mode 100644 ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/Bundle_ja.properties
 create mode 100644 ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/drawableviews/Bundle_ja.properties
 create mode 100644 ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/navpanel/Bundle_ja.properties

diff --git a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/Bundle_ja.properties b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/Bundle_ja.properties
new file mode 100644
index 0000000000..de95d8c2e6
--- /dev/null
+++ b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/Bundle_ja.properties
@@ -0,0 +1,32 @@
+CopyAnalyzedFiles.committingDb.status=\u30A4\u30E1\u30FC\u30B8\uFF0F\u30D3\u30C7\u30AA\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u3092\u30B3\u30DF\u30C3\u30C8\u4E2D
+CopyAnalyzedFiles.errPopulating.errMsg=\u30A4\u30E1\u30FC\u30B8\u30AE\u30E3\u30E9\u30EA\u30FC\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u306B\u60C5\u5831\u3092\u5165\u529B\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F\u3002
+CopyAnalyzedFiles.populatingDb.status=\u89E3\u6790\u6E08\u307F\u306E\u30A4\u30E1\u30FC\u30B8\uFF0F\u30D3\u30C7\u30AA\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u306B\u60C5\u5831\u3092\u5165\u529B\u4E2D
+CopyAnalyzedFiles.stopCopy.status=Drawable DB\u30BF\u30B9\u30AF\u3078\u306E\u30B3\u30D4\u30FC\u3092\u505C\u6B62\u4E2D\u3002
+CTL_ImageGalleryAction=\u30A4\u30E1\u30FC\u30B8\uFF0F\u30D3\u30C7\u30AA\u30AE\u30E3\u30E9\u30EA\u30FC
+CTL_ImageGalleryTopComponent=\u30A4\u30E1\u30FC\u30B8\uFF0F\u30D3\u30C7\u30AA\u30AE\u30E3\u30E9\u30EA\u30FC
+HINT_ImageGalleryTopComponent=\u3053\u308C\u306F\u30A4\u30E1\u30FC\u30B8\uFF0F\u30D3\u30C7\u30AA\u30AE\u30E3\u30E9\u30EA\u30FC\u306E\u30A6\u30A3\u30F3\u30C9\u30A6\u3067\u3059
+ImageGalleryController.InnerTask.message.name=\u30B9\u30C6\u30FC\u30BF\u30B9
+ImageGalleryController.InnerTask.progress.name=\u9032\u884C\u72B6\u6CC1
+ImageGalleryController.noGroupsDlg.msg1=\u5B8C\u5168\u306B\u89E3\u6790\u6E08\u307F\u306E\u30B0\u30EB\u30FC\u30D7\u306F\u3042\u308A\u307E\u305B\u3093\u3002\u3057\u304B\u3057\u3001\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u306E\u30EA\u30B9\u30CB\u30F3\u30B0\u304C\u7121\u52B9\u306B\u306A\u3063\u3066\u3044\u307E\u3059\u3002\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u304C\u5B8C\u4E86\u3057\u3001\u30EA\u30B9\u30CB\u30F3\u30B0\u304C\u518D\u5EA6\u6709\u52B9\u5316\u3055\u308C\u306A\u3051\u308C\u3070\u30B0\u30EB\u30FC\u30D7\u304C\u4F7F\u3048\u307E\u305B\u3093\u3002
+ImageGalleryController.noGroupsDlg.msg2=\u5B8C\u5168\u306B\u89E3\u6790\u6E08\u307F\u306E\u30B0\u30EB\u30FC\u30D7\u306F\u307E\u3060\u3042\u308A\u307E\u305B\u3093\u304C\u3001\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u304C\u307E\u3060\u5B9F\u884C\u4E2D\u3067\u3059\u3002\u3057\u3070\u3089\u304F\u304A\u5F85\u3061\u304F\u3060\u3055\u3044\u3002
+ImageGalleryController.noGroupsDlg.msg3=\u5B8C\u5168\u306B\u89E3\u6790\u6E08\u307F\u306E\u30B0\u30EB\u30FC\u30D7\u306F\u307E\u3060\u3042\u308A\u307E\u305B\u3093\u304C\u3001\u30A4\u30E1\u30FC\u30B8\uFF0F\u30D3\u30C7\u30AA\u30C7\u30FC\u30BF\u306E\u60C5\u5831\u304C\u307E\u3060\u5165\u529B\u4E2D\u3067\u3059\u3002\u3057\u3070\u3089\u304F\u304A\u5F85\u3061\u304F\u3060\u3055\u3044\u3002
+ImageGalleryController.noGroupsDlg.msg4=\u8FFD\u52A0\u3055\u308C\u305F\u30C7\u30FC\u30BF\u30BD\u30FC\u30B9\u306B\u306F\u4F7F\u3048\u308B\u30A4\u30E1\u30FC\u30B8\uFF0F\u30D3\u30C7\u30AA\u306F\u3042\u308A\u307E\u305B\u3093\u3002\u3057\u304B\u3057\u3001\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u306E\u30EA\u30B9\u30CB\u30F3\u30B0\u304C\u7121\u52B9\u306B\u306A\u3063\u3066\u3044\u307E\u3059\u3002\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u304C\u5B8C\u4E86\u3057\u3001\u30EA\u30B9\u30CB\u30F3\u30B0\u304C\u518D\u5EA6\u6709\u52B9\u5316\u3055\u308C\u306A\u3051\u308C\u3070\u30B0\u30EB\u30FC\u30D7\u304C\u4F7F\u3048\u307E\u305B\u3093\u3002
+ImageGalleryController.noGroupsDlg.msg5=\u8FFD\u52A0\u3055\u308C\u305F\u30C7\u30FC\u30BF\u30BD\u30FC\u30B9\u306B\u30A4\u30E1\u30FC\u30B8\uFF0F\u30D3\u30C7\u30AA\u304C\u3042\u308A\u307E\u305B\u3093\u3002
+ImageGalleryController.noGroupsDlg.msg6=\u8868\u793A\u3067\u304D\u308B\u5B8C\u5168\u306B\u89E3\u6790\u6E08\u307F\u306E\u30B0\u30EB\u30FC\u30D7\u304C\u3042\u308A\u307E\u305B\u3093\uFF1A\u73FE\u5728\u306E\u30B0\u30EB\u30FC\u30D7by\u8A2D\u5B9A\u3067\u306F\u30B0\u30EB\u30FC\u30D7\u304C\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F\u3002\u307E\u305F\u306F\u5B8C\u5168\u306B\u89E3\u6790\u6E08\u307F\u306E\u30B0\u30EB\u30FC\u30D7\u304C\u306A\u3044\u3051\u308C\u3069\u3001\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u304C\u5B9F\u884C\u3057\u3066\u3044\u306A\u3044\u304B\u3082\u3057\u308C\u307E\u305B\u3093\u3002
+ImageGalleryModule.moduleName=\u30A4\u30E1\u30FC\u30B8\u30AE\u30E3\u30E9\u30EA\u30FC
+OpenIDE-Module-Long-Description=\
+    \u30A4\u30E1\u30FC\u30B8\u304C\u591A\u3044\u8ABF\u67FB\u3092\u3088\u308A\u52B9\u7387\u7684\u306B\u884C\u3048\u308B\u3088\u3046\u306B\u8A2D\u8A08\u3055\u308C\u305F\u3001\u65B0\u3057\u3044\u30A4\u30E1\u30FC\u30B8\u304A\u3088\u3073\u30D3\u30C7\u30AA\u30AE\u30E3\u30E9\u30EA\u30FC\u3067\u3059\u3002\
+    \u3053\u308C\u306FDHS S&T\u304C\u652F\u63F4\u3057\u3001\u03B2\u7248\u306E\u30EA\u30EA\u30FC\u30B9\u3067\u3059\u3002\
+    sleuthkit.org\u3067\u306F\u307E\u3060\u5165\u624B\u3067\u304D\u305A\u3001\u9650\u3089\u308C\u305F\u30E6\u30FC\u30B6\u30FC\u306B\u3057\u304B\u63D0\u4F9B\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
+OpenIDE-Module-Name=\u30A4\u30E1\u30FC\u30B8\u30AE\u30E3\u30E9\u30EA\u30FC
+OpenIDE-Module-Short-Description=\u30A2\u30C9\u30D0\u30F3\u30B9\u30A4\u30E1\u30FC\u30B8\u304A\u3088\u3073\u30D3\u30C7\u30AA\u30AE\u30E3\u30E9\u30EA\u30FC
+ImageGalleryOptionsPanel.enabledForCaseBox.text=\u4F5C\u696D\u4E2D\u306E\u30B1\u30FC\u30B9\u306E\u30A4\u30E1\u30FC\u30B8\u30AE\u30E3\u30E9\u30EA\u30FC\u306E\u66F4\u65B0\u3092\u6709\u52B9\u5316\u3059\u308B\u3002
+ImageGalleryOptionsPanel.enabledByDefaultBox.text=\u30C7\u30D5\u30A9\u30EB\u30C8\u8A2D\u5B9A\u3068\u3057\u3066\u65B0\u3057\u3044\u30B1\u30FC\u30B9\u306E\u30A4\u30E1\u30FC\u30B8\u30AE\u30E3\u30E9\u30EA\u30FC\u3092\u6709\u52B9\u5316\u3059\u308B\u3002
+ImageGalleryOptionsPanel.enabledForCaseBox.toolTipText=\u30A4\u30E1\u30FC\u30B8\u30AE\u30E3\u30E9\u30EA\u30FC\u304C\u7121\u52B9\u306A\u5834\u5408\u3001\u66F4\u65B0\u304C\u5FC5\u8981\u3068\u3044\u3046\u3053\u3068\u3060\u3051\u8A18\u9332\u3055\u308C\u307E\u3059\u3002\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u5F8C\u306B\u30A4\u30E1\u30FC\u30B8\u30AE\u30E3\u30E9\u30EA\u30FC\u304C\u6709\u52B9\u5316\u3055\u308C\u305F\u5834\u5408\u3001\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u306E\u7D50\u679C\u3092\u5143\u306B\u4E00\u5EA6\u306B\u307E\u3068\u3081\u3066\u66F4\u65B0\u3092\u3057\u307E\u3059\u3002\u30A4\u30E1\u30FC\u30B8\u30AE\u30E3\u30E9\u30EA\u30FC\u304C\u7121\u52B9\u306E\u5834\u5408\u3001\u30A4\u30E1\u30FC\u30B8\u30AE\u30E3\u30E9\u30EA\u30FC\u306E\u30A6\u30A3\u30F3\u30C9\u30A6\u3092\u958B\u3053\u3046\u3068\u3057\u305F\u969B\u306B\u6709\u52B9\u5316\u3059\u308B\u3088\u3046\u306B\u6307\u793A\u3055\u308C\u307E\u3059\u3002
+ImageGalleryOptionsPanel.descriptionLabel.text=<html>\u30B9\u30BF\u30FC\u30C8\u30A2\u30C3\u30D7\u6642\u9593\u3092\u6700\u5C0F\u9650\u306B\u3059\u308B\u305F\u3081\u3001\u30A4\u30E1\u30FC\u30B8\u30AE\u30E3\u30E9\u30EA\u30FC\u306F\u7D99\u7D9A\u7684\u306B\u5185\u90E8\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u3092\u66F4\u65B0\u3057\u307E\u3059\u3002<br />\u30A4\u30E1\u30FC\u30B8\u30AE\u30E3\u30E9\u30EA\u30FC\u304C\u5FC5\u8981\u3067\u306A\u3044\u5834\u5408\u3001\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u3092\u9045\u304F\u3059\u308B\u304B\u3082\u3057\u308C\u307E\u305B\u3093\u3002<br />\u30A4\u30E1\u30FC\u30B8\u30AE\u30E3\u30E9\u30EA\u30FC\u304C\u5FC5\u8981\u3067\u306A\u3044\u5834\u5408\u3001\u3053\u306E\u8A2D\u5B9A\u3092\u4F7F\u3044\u30A4\u30E1\u30FC\u30B8\u30AE\u30E3\u30E9\u30EA\u30FC\u3092\u7121\u52B9\u306B\u3057\u3066\u304F\u3060\u3055\u3044\u3002</html>
+ImageGalleryOptionsPanel.furtherDescriptionArea.text=\u30A4\u30E1\u30FC\u30B8\u30AE\u30E3\u30E9\u30EA\u30FC\u304C\u7121\u52B9\u306A\u5834\u5408\u3001\u66F4\u65B0\u304C\u5FC5\u8981\u3068\u3044\u3046\u3053\u3068\u3060\u3051\u8A18\u9332\u3055\u308C\u307E\u3059\u3002\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u5F8C\u306B\u30A4\u30E1\u30FC\u30B8\u30AE\u30E3\u30E9\u30EA\u30FC\u304C\u6709\u52B9\u5316\u3055\u308C\u305F\u5834\u5408\u3001\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u306E\u7D50\u679C\u3092\u5143\u306B\u4E00\u5EA6\u306B\u307E\u3068\u3081\u3066\u66F4\u65B0\u3092\u3057\u307E\u3059\u3002\u30A4\u30E1\u30FC\u30B8\u30AE\u30E3\u30E9\u30EA\u30FC\u304C\u7121\u52B9\u306E\u5834\u5408\u3001\u30A4\u30E1\u30FC\u30B8\u30AE\u30E3\u30E9\u30EA\u30FC\u306E\u30A6\u30A3\u30F3\u30C9\u30A6\u3092\u958B\u3053\u3046\u3068\u3057\u305F\u969B\u306B\u6709\u52B9\u5316\u3059\u308B\u3088\u3046\u306B\u6307\u793A\u3055\u308C\u307E\u3059\u3002
+ImageGalleryOptionsPanel.unavailableDuringInjestLabel.text=\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u4E2D\u306F\u3053\u306E\u8A2D\u5B9A\u306F\u4F7F\u3048\u307E\u305B\u3093\u3002
+OptionsCategory_Keywords_Options=\u30A4\u30E1\u30FC\u30B8\u30D3\u30C7\u30AA\u30AE\u30E3\u30E9\u30EA\u30FC\u30AB\u30C6\u30B4\u30EA\u30FC
+OptionsCategory_Name_Options=\u30A4\u30E1\u30FC\u30B8\uFF0F\u30D3\u30C7\u30AA\u30AE\u30E3\u30E9\u30EA\u30FC
+PrePopulateDataSourceFiles.committingDb.status=\u30A4\u30E1\u30FC\u30B8\uFF0F\u30D3\u30C7\u30AA\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u3092\u30B3\u30DF\u30C3\u30C8\u4E2D
+PrePopulateDataSourceFiles.prepopulatingDb.status=\u30A4\u30E1\u30FC\u30B8\uFF0F\u30D3\u30C7\u30AA\u30AE\u30E3\u30E9\u30EA\u30FC\u306B\u60C5\u5831\u3092\u4E8B\u524D\u306B\u5165\u529B\u4E2D
\ No newline at end of file
diff --git a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/actions/Bundle_ja.properties b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/actions/Bundle_ja.properties
new file mode 100644
index 0000000000..ed03d6166d
--- /dev/null
+++ b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/actions/Bundle_ja.properties
@@ -0,0 +1,23 @@
+AddDrawableTagAction.addTagsToFiles.alert={0}\u30D5\u30A1\u30A4\u30EB\u3092\u30BF\u30B0\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F\u3002
+AddDrawableTagAction.displayName.plural=\u30D5\u30A1\u30A4\u30EB\u3092\u30BF\u30B0
+AddDrawableTagAction.displayName.singular=\u30D5\u30A1\u30A4\u30EB\u3092\u30BF\u30B0
+AddTagAction.menuItem.newTag=\u65B0\u898F\u30BF\u30B0...
+AddTagAction.menuItem.noTags=\u30BF\u30B0\u7121\u3057
+AddTagAction.menuItem.quickTag=\u30AF\u30A4\u30C3\u30AF\u30BF\u30B0
+AddTagAction.menuItem.tagAndComment=\u30BF\u30B0\uFF0F\u30B3\u30E1\u30F3\u30C8\u3059\u308B...
+Back_diplayName=\u623B\u308B
+CategorizeAction.displayName=\u30AB\u30C6\u30B4\u30E9\u30A4\u30BA
+CategorizeTask.errorUnable.msg={0}\u3092\u30AB\u30C6\u30B4\u30E9\u30A4\u30BA\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F\u3002
+CategorizeTask.errorUnable.title=\u30AB\u30C6\u30B4\u30E9\u30A4\u30BA\u30A8\u30E9\u30FC
+CTL_OpenAction=\u30A4\u30E1\u30FC\u30B8\uFF0F\u30D3\u30C7\u30AA\u3092\u8868\u793A
+CTL_OpenHelpAction=\u30A4\u30E1\u30FC\u30B8\uFF0F\u30D3\u30C7\u30AA\u30AE\u30E3\u30E9\u30EA\u30FC\u30D8\u30EB\u30D7
+DeleteFollwUpTagAction.displayName=\u30D5\u30A9\u30ED\u30FC\u30A2\u30C3\u30D7\u30BF\u30B0\u3092\u524A\u9664
+Forward.displayName=\u9032\u3080
+MediaViewImagePanel.externalViewerButton.text=\u5916\u90E8\u30D3\u30E5\u30FC\u30A2\u30FC\u3067\u958B\u304F
+NextUnseenGroup.markGroupSeen=\u78BA\u8A8D\u6E08\u307F\u306E\u30B0\u30EB\u30FC\u30D7\u3092\u30DE\u30FC\u30AF\u3059\u308B
+NextUnseenGroup.nextUnseenGroup=\u6B21\u306E\u672A\u78BA\u8A8D\u306E\u30B0\u30EB\u30FC\u30D7
+OpenAction.stale.confDlg.msg=\u30A4\u30E1\u30FC\u30B8\uFF0F\u30D3\u30C7\u30AA\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u304C\u53E4\u3044\u304B\u3082\u3057\u308C\u307E\u305B\u3093\u3002\u66F4\u65B0\u3057\u3066\u3001\u65B0\u305F\u306A\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u7D50\u679C\u3092\u78BA\u8A8D\u3057\u307E\u3059\u304B\uFF1F\n\u300C\u306F\u3044\u300D\u3092\u9078\u629E\u3059\u308C\u3070\u3001\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u3092\u66F4\u65B0\u3057\u3001\u65B0\u305F\u306A\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u3092\u78BA\u8A8D\u3059\u308B\u3053\u3068\u304C\u53EF\u80FD\u306B\u306A\u308A\u307E\u3059\u3002
+OpenAction.stale.confDlg.title=\u30A4\u30E1\u30FC\u30B8\u30AE\u30E3\u30E9\u30EA\u30FC
+OpenExternalViewerAction.displayName=\u5916\u90E8\u30D3\u30E5\u30FC\u30A2\u30FC
+RedoAction.name=\u518D\u5B9F\u884C
+UndoAction.displayName=\u53D6\u308A\u6D88\u3057
\ No newline at end of file
diff --git a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/Bundle_ja.properties b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/Bundle_ja.properties
new file mode 100644
index 0000000000..dca1145fd0
--- /dev/null
+++ b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/Bundle_ja.properties
@@ -0,0 +1,23 @@
+Category.five=CAT-5\uFF1A\u95A2\u9023\u7121\u3057
+Category.four=CAT-4\uFF1A\u898B\u672C\uFF0F\u6BD4\u8F03\u5BFE\u8C61\uFF08\u5185\u90E8\u4F7F\u7528\u306E\u307F\uFF09
+Category.one=CAT-1\uFF1A\u5150\u7AE5\u643E\u53D6\uFF08\u9055\u6CD5\uFF09
+Category.three=CAT-3\uFF1ACGI/\u30A2\u30CB\u30E1\u30FC\u30B7\u30E7\u30F3\uFF08\u5150\u7AE5\u643E\u53D6\u7684\u306A\uFF09
+Category.two=CAT-2\uFF1A\u5150\u7AE5\u643E\u53D6\uFF08\u5408\u6CD5\uFF0F\u5E74\u9F62\u4E0D\u660E\uFF09
+Category.zero=CAT-0\uFF1A\u30AB\u30C6\u30B4\u30E9\u30A4\u30BA\u3055\u308C\u3066\u3044\u306A\u3044
+DrawableAttribute.analyzed=\u89E3\u6790\u6E08\u307F
+DrawableAttribute.cameraMake=\u30AB\u30E1\u30E9\u88FD\u9020\u8005
+DrawableAttribute.cameraModel=\u30AB\u30E1\u30E9\u578B\u756A
+DrawableAttribute.category=\u30AB\u30C6\u30B4\u30EA\u30FC
+DrawableAttribute.createdTime=\u4F5C\u6210\u65E5\u6642
+DrawableAttribute.hashSet=\u30CF\u30C3\u30B7\u30E5\u30BB\u30C3\u30C8
+DrawableAttribute.height=\u9AD8\u3055
+DrawableAttribute.intObjID=\u5185\u90E8\u30AA\u30D6\u30B8\u30A7\u30AF\u30C8ID
+DrawableAttribute.md5hash=MD\uFF15\u30CF\u30C3\u30B7\u30E5
+DrawableAttribute.mimeType=MIME\u30BF\u30A4\u30D7
+DrawableAttribute.modifiedTime=\u4FEE\u6B63\u65E5\u6642
+DrawableAttribute.name=\u540D\u524D
+DrawableAttribute.path=\u30D1\u30B9
+DrawableAttribute.tags=\u30BF\u30B0
+DrawableAttribute.width=\u5E45
+DrawableTagsManager.followUp=\u30D5\u30A9\u30ED\u30FC\u30A2\u30C3\u30D7
+VideoFile.getMedia.progress=\u30C7\u30A3\u30B9\u30AF\u306B\u4E00\u6642\u30D5\u30A1\u30A4\u30EB\u3092\u66F8\u304D\u8FBC\u307F\u4E2D
\ No newline at end of file
diff --git a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/grouping/Bundle_ja.properties b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/grouping/Bundle_ja.properties
new file mode 100644
index 0000000000..5dc38728de
--- /dev/null
+++ b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/grouping/Bundle_ja.properties
@@ -0,0 +1,6 @@
+GroupSortBy.groupName=\u30B0\u30EB\u30FC\u30D7\u540D
+GroupSortBy.groupSize=\u30B0\u30EB\u30FC\u30D7\u30B5\u30A4\u30BA
+GroupSortBy.none=\u7121\u3057
+GroupSortBy.priority=\u512A\u5148\u5EA6
+ReGroupTask.displayTitle={0}\u306B\u57FA\u3065\u3044\u3066\u30D5\u30A1\u30A4\u30EB\u3092\u518D\u5EA6\u30B0\u30EB\u30FC\u30D7\u5316\u3002{2}\u306E\u9806\u756A\u3067{1}\u306B\u3088\u308A\u30BD\u30FC\u30C8\u3002
+ReGroupTask.progressUpdate={0} \: {1}\u306B\u57FA\u3065\u3044\u3066\u30D5\u30A1\u30A4\u30EB\u3092\u518D\u5EA6\u30B0\u30EB\u30FC\u30D7\u5316
\ No newline at end of file
diff --git a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/Bundle_ja.properties b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/Bundle_ja.properties
new file mode 100644
index 0000000000..2e9f276d71
--- /dev/null
+++ b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/Bundle_ja.properties
@@ -0,0 +1,4 @@
+StatuBar.toolTip=\u4E00\u90E8\u306E\u30C7\u30FC\u30BF\u304C\u53E4\u3044\u304B\u3082\u3057\u308C\u307E\u305B\u3093\u3002\u30A4\u30E1\u30FC\u30B8\u30AE\u30E3\u30E9\u30EA\u30FC\u30C7\u30FC\u30BF\u3092\u66F4\u65B0\u3059\u308B\u305F\u3081\u3001\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u304C\u5B8C\u4E86\u5F8C\u30C4\u30FC\u30EB|\u30AA\u30D7\u30B7\u30E7\u30F3|\u30A4\u30E1\u30FC\u30B8\uFF0F\u30D3\u30C7\u30AA\u30AE\u30E3\u30E9\u30EA\u30FC\u3067\u30A4\u30E1\u30FC\u30B8\u30AE\u30E3\u30E9\u30EA\u30FC\u3092\u6709\u52B9\u5316\u3057\u3066\u304F\u3060\u3055\u3044\u3002
+StatusBar.bgTaskLabel.text=\u518D\u5EA6\u30B0\u30EB\u30FC\u30D7\u5316
+StatusBar.fileUpdateTaskLabel.text=\u30D5\u30A1\u30A4\u30EB\u66F4\u65B0\u30BF\u30B9\u30AF
+VideoPlayer.errNotice={0}\n\u8A73\u7D30\u3092\u30ED\u30B0\u3067\u78BA\u8A8D\u3057\u3066\u304F\u3060\u3055\u3044\u3002
\ No newline at end of file
diff --git a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/drawableviews/Bundle_ja.properties b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/drawableviews/Bundle_ja.properties
new file mode 100644
index 0000000000..bc42d476a1
--- /dev/null
+++ b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/drawableviews/Bundle_ja.properties
@@ -0,0 +1,10 @@
+DrawableTileBase.externalViewerAction.text=\u5916\u90E8\u30D3\u30E5\u30FC\u30A2\u30FC\u3067\u958B\u304F
+DrawableTileBase.menuItem.extractFiles=\u30D5\u30A1\u30A4\u30EB\u3092\u62BD\u51FA
+DrawableTileBase.menuItem.showContentViewer=\u30B3\u30F3\u30C6\u30F3\u30C4\u30D3\u30E5\u30FC\u30A2\u30FC\u3092\u8868\u793A
+DrawableUIBase.errorLabel.OOMText=\u30E1\u30E2\u30EA\u4E0D\u8DB3
+DrawableUIBase.errorLabel.text=\u30D5\u30A1\u30A4\u30EB\u3092\u8AAD\u307F\u53D6\u308C\u307E\u305B\u3093\u3067\u3057\u305F
+GroupPane.gridViewContextMenuItem.extractFiles=\u30D5\u30A1\u30A4\u30EB\u3092\u62BD\u51FA
+GroupPane.headerString={0} -- {1} \u30CF\u30C3\u30B7\u30E5\u30BB\u30C3\u30C8\u30D2\u30C3\u30C8\uFF0F{2}\u30D5\u30A1\u30A4\u30EB
+MediaLoadTask.messageText={0}\u30D3\u30C7\u30AA\u3092\u8AAD\u307F\u53D6\u308A\u4E2D
+MetaDataPane.tableView.placeholder=\u8A73\u7D30\u3092\u8868\u793A\u3059\u308B\u306B\u306F\u30D5\u30A1\u30A4\u30EB\u3092\u9078\u629E\u3057\u3066\u304F\u3060\u3055\u3044\u3002
+SlideShowView.supplementalText={1}\u306E\u3046\u3061{0}\u304C\u30B0\u30EB\u30FC\u30D7\u306B\u3042\u308A\u307E\u3059
\ No newline at end of file
diff --git a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/navpanel/Bundle_ja.properties b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/navpanel/Bundle_ja.properties
new file mode 100644
index 0000000000..3af7764c49
--- /dev/null
+++ b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/navpanel/Bundle_ja.properties
@@ -0,0 +1,7 @@
+GroupComparators.groupName=\u30B0\u30EB\u30FC\u30D7\u540D
+GroupComparators.groupSize=\u30B0\u30EB\u30FC\u30D7\u30B5\u30A4\u30BA
+GroupComparators.hitCount=\u30D2\u30C3\u30C8\u30AB\u30A6\u30F3\u30C8
+GroupComparators.hitDensity=\u30D2\u30C3\u30C8\u5BC6\u5EA6
+GroupComparators.uncategorizedCount=\u30AB\u30C6\u30B4\u30E9\u30A4\u30BA\u3055\u308C\u3066\u3044\u306A\u3044\u30AB\u30A6\u30F3\u30C8
+GroupTree.displayName.allGroups=\u5168\u3066\u306E\u30B0\u30EB\u30FC\u30D7
+HashHitGroupList.displayName.onlyHashHits=\u30CF\u30C3\u30B7\u30E5\u30D2\u30C3\u30C8\u306E\u307F
\ No newline at end of file

From f57a9846607dd8b99d625fc91ecdb8af2ac17440 Mon Sep 17 00:00:00 2001
From: Richard Cordovano <rcordovano@basistech.com>
Date: Wed, 3 Feb 2016 15:15:44 -0500
Subject: [PATCH 34/68] Fix data source processor reset

---
 .../autopsy/casemodule/ImageDSProcessor.java  | 46 +++++++++----------
 .../casemodule/LocalDiskDSProcessor.java      | 41 ++++++++---------
 2 files changed, 40 insertions(+), 47 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/ImageDSProcessor.java b/Core/src/org/sleuthkit/autopsy/casemodule/ImageDSProcessor.java
index 03065775e2..9a8cc96ca5 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/ImageDSProcessor.java
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/ImageDSProcessor.java
@@ -52,7 +52,7 @@ public class ImageDSProcessor implements DataSourceProcessor {
     private String imagePath;
     private String timeZone;
     private boolean ignoreFatOrphanFiles;
-    private boolean configured;
+    private boolean setDataSourceOptionsCalled;
     private AddImageTask addImageTask;
 
     static {
@@ -62,7 +62,7 @@ public class ImageDSProcessor implements DataSourceProcessor {
         filtersList.add(virtualMachineFilter);
         allExt.addAll(GeneralFilter.RAW_IMAGE_EXTS);
         allExt.addAll(GeneralFilter.ENCASE_IMAGE_EXTS);
-	allExt.addAll(GeneralFilter.VIRTUAL_MACHINE_EXTS);
+        allExt.addAll(GeneralFilter.VIRTUAL_MACHINE_EXTS);
     }
 
     /**
@@ -120,8 +120,8 @@ public class ImageDSProcessor implements DataSourceProcessor {
     }
 
     /**
-     * Runs the data source processor in a separate thread. Should only be
-     * called after further configuration has been completed.
+     * Runs the data source processor using the settings from the configuration
+     * panel.
      *
      * @param monitor Progress monitor to report progress during processing.
      * @param cbObj   Callback to call when processing is done.
@@ -131,24 +131,22 @@ public class ImageDSProcessor implements DataSourceProcessor {
         /*
          * TODO (AUT-1867): Configuration is not currently enforced. This code
          * assumes that the ingest panel is providing validated inputs.
+         *
+         * TODO: Remove the setDataSourceOptionsCalled when the deprecated
+         * methods setDataSourceOptions and reset are removed.
          */
-        if (!configured) {
+        if (!setDataSourceOptionsCalled) {
             configPanel.storeSettings();
-            if (null == dataSourceId) {
-                dataSourceId = UUID.randomUUID().toString();
-            }
+            dataSourceId = UUID.randomUUID().toString();
             imagePath = configPanel.getContentPaths();
             timeZone = configPanel.getTimeZone();
             ignoreFatOrphanFiles = configPanel.getNoFatOrphans();
-            configured = true;
         }
-        addImageTask = new AddImageTask(dataSourceId, imagePath, timeZone, ignoreFatOrphanFiles, monitor, cbObj);
-        new Thread(addImageTask).start();
+        run(dataSourceId, imagePath, timeZone, ignoreFatOrphanFiles, monitor, cbObj);
     }
 
     /**
-     * Runs the data source processor in a separate thread without requiring use
-     * the configuration panel.
+     * Runs the data source processor the given settings.
      *
      * @param dataSourceId         An ASCII-printable identifier for the data
      *                             source that is intended to be unique across
@@ -164,12 +162,8 @@ public class ImageDSProcessor implements DataSourceProcessor {
      * @param cbObj                Callback to call when processing is done.
      */
     public void run(String dataSourceId, String imagePath, String timeZone, boolean ignoreFatOrphanFiles, DataSourceProcessorProgressMonitor monitor, DataSourceProcessorCallback cbObj) {
-        this.dataSourceId = dataSourceId;
-        this.imagePath = imagePath;
-        this.timeZone = timeZone;
-        this.ignoreFatOrphanFiles = ignoreFatOrphanFiles;
-        configured = true;
-        run(monitor, cbObj);
+        addImageTask = new AddImageTask(dataSourceId, imagePath, timeZone, ignoreFatOrphanFiles, monitor, cbObj);
+        new Thread(addImageTask).start();
     }
 
     /**
@@ -183,7 +177,11 @@ public class ImageDSProcessor implements DataSourceProcessor {
     /**
      * Resets the configuration of this data source processor, including its
      * configuration panel.
+     *
+     * @deprecated Was only for use with setDataSourceOptions, use the
+     * appropriate overload of the run method instead.
      */
+    @Deprecated
     @Override
     public void reset() {
         dataSourceId = null;
@@ -191,14 +189,12 @@ public class ImageDSProcessor implements DataSourceProcessor {
         timeZone = null;
         ignoreFatOrphanFiles = false;
         configPanel.reset();
-        configured = false;
+        setDataSourceOptionsCalled = false;
     }
 
     /**
      * Sets the configuration of the data source processor without using the
-     * configuration panel. The data source processor will assign a UUID to the
-     * data source and will use the time zone of the machine executing this code
-     * when when processing dates and times for the image.
+     * configuration panel.
      *
      * @param imagePath            Path to the image file.
      * @param timeZone             The time zone to use when processing dates
@@ -207,7 +203,7 @@ public class ImageDSProcessor implements DataSourceProcessor {
      * @param ignoreFatOrphanFiles Whether to parse orphans if the image has a
      *                             FAT filesystem.
      *
-     * @deprecated Use the run method instead.
+     * @deprecated Use the appropriate overload of the run method instead.
      */
     @Deprecated
     public void setDataSourceOptions(String imagePath, String timeZone, boolean ignoreFatOrphanFiles) {
@@ -215,7 +211,7 @@ public class ImageDSProcessor implements DataSourceProcessor {
         this.imagePath = imagePath;
         this.timeZone = Calendar.getInstance().getTimeZone().getID();
         this.ignoreFatOrphanFiles = ignoreFatOrphanFiles;
-        this.configured = true;
+        setDataSourceOptionsCalled = true;
     }
 
 }
diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/LocalDiskDSProcessor.java b/Core/src/org/sleuthkit/autopsy/casemodule/LocalDiskDSProcessor.java
index 90fc238d32..dcc332e55b 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/LocalDiskDSProcessor.java
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/LocalDiskDSProcessor.java
@@ -43,7 +43,7 @@ public class LocalDiskDSProcessor implements DataSourceProcessor {
     private String drivePath;
     private String timeZone;
     private boolean ignoreFatOrphanFiles;
-    private boolean configured;
+    private boolean setDataSourceOptionsCalled;
     private AddImageTask addDiskTask;
 
     /**
@@ -101,7 +101,8 @@ public class LocalDiskDSProcessor implements DataSourceProcessor {
     }
 
     /**
-     * Runs the data source processor in a separate thread.
+     * Runs the data source processor using the settings from the configuration
+     * panel.
      *
      * @param progressMonitor Progress monitor to report progress during
      *                        processing.
@@ -112,23 +113,22 @@ public class LocalDiskDSProcessor implements DataSourceProcessor {
         /*
          * TODO (AUT-1867): Configuration is not currently enforced. This code
          * assumes that the ingest panel is providing validated inputs.
+         *
+         * TODO: Remove the setDataSourceOptionsCalled when the deprecated
+         * methods setDataSourceOptions and reset are removed.
          */
-        if (!configured) {
-            if (null == dataSourceId) {
-                dataSourceId = UUID.randomUUID().toString();
-            }
+        if (!setDataSourceOptionsCalled) {
+            dataSourceId = UUID.randomUUID().toString();
             drivePath = configPanel.getContentPaths();
             timeZone = configPanel.getTimeZone();
             ignoreFatOrphanFiles = configPanel.getNoFatOrphans();
-            configured = true;
         }
         addDiskTask = new AddImageTask(dataSourceId, drivePath, timeZone, ignoreFatOrphanFiles, progressMonitor, cbObj);
         new Thread(addDiskTask).start();
     }
 
     /**
-     * Runs the data source processor in a separate thread without requiring use
-     * the configuration panel.
+     * Runs the data source processor the given settings.
      *
      * @param dataSourceId         An ASCII-printable identifier for the data
      *                             source that is intended to be unique across
@@ -144,12 +144,8 @@ public class LocalDiskDSProcessor implements DataSourceProcessor {
      * @param cbObj                Callback to call when processing is done.
      */
     public void run(String dataSourceId, String drivePath, String timeZone, boolean ignoreFatOrphanFiles, DataSourceProcessorProgressMonitor monitor, DataSourceProcessorCallback cbObj) {
-        this.dataSourceId = dataSourceId;
-        this.drivePath = drivePath;
-        this.timeZone = timeZone;
-        this.ignoreFatOrphanFiles = ignoreFatOrphanFiles;
-        configured = true;
-        run(monitor, cbObj);
+        addDiskTask = new AddImageTask(dataSourceId, drivePath, timeZone, ignoreFatOrphanFiles, monitor, cbObj);
+        new Thread(addDiskTask).start();
     }
 
     /**
@@ -163,6 +159,9 @@ public class LocalDiskDSProcessor implements DataSourceProcessor {
     /**
      * Resets the configuration of this data source processor, including its
      * configuration panel.
+     *
+     * @deprecated Was only for use with setDataSourceOptions, use the
+     * appropriate overload of the run method instead.
      */
     @Override
     public void reset() {
@@ -171,23 +170,21 @@ public class LocalDiskDSProcessor implements DataSourceProcessor {
         drivePath = null;
         timeZone = null;
         ignoreFatOrphanFiles = false;
-        configured = false;
+        setDataSourceOptionsCalled = false;
     }
 
     /**
      * Sets the configuration of the data source processor without using the
-     * configuration panel. The data source processor will assign a UUID to the
-     * data source and will use the time zone of the machine executing this code
-     * when when processing dates and times for the image.
+     * configuration panel.
      *
-     * @param drivePath            Path to the local drive.
+     * @param imagePath            Path to the image file.
      * @param timeZone             The time zone to use when processing dates
      *                             and times for the image, obtained from
      *                             java.util.TimeZone.getID.
      * @param ignoreFatOrphanFiles Whether to parse orphans if the image has a
      *                             FAT filesystem.
      *
-     * @deprecated Use the run method instead.
+     * @deprecated Use the appropriate overload of the run method instead.
      */
     @Deprecated
     public void setDataSourceOptions(String drivePath, String timeZone, boolean ignoreFatOrphanFiles) {
@@ -195,7 +192,7 @@ public class LocalDiskDSProcessor implements DataSourceProcessor {
         this.drivePath = drivePath;
         this.timeZone = Calendar.getInstance().getTimeZone().getID();
         this.ignoreFatOrphanFiles = ignoreFatOrphanFiles;
-        configured = true;
+        setDataSourceOptionsCalled = true;
     }
 
 }

From 9eadc5e547b5803f290e09ca02b0f21240b492a0 Mon Sep 17 00:00:00 2001
From: Nick Davis <nick.davis@narfindustries.com>
Date: Wed, 3 Feb 2016 16:29:46 -0500
Subject: [PATCH 35/68] converted form fields to use derived fonts

---
 .../FileTypeIdGlobalSettingsPanel.form        | 111 +++++++++++++++++-
 .../FileTypeIdGlobalSettingsPanel.java        |  32 ++++-
 2 files changed, 136 insertions(+), 7 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/modules/filetypeid/FileTypeIdGlobalSettingsPanel.form b/Core/src/org/sleuthkit/autopsy/modules/filetypeid/FileTypeIdGlobalSettingsPanel.form
index 2b4647356c..91181f984d 100644
--- a/Core/src/org/sleuthkit/autopsy/modules/filetypeid/FileTypeIdGlobalSettingsPanel.form
+++ b/Core/src/org/sleuthkit/autopsy/modules/filetypeid/FileTypeIdGlobalSettingsPanel.form
@@ -184,6 +184,11 @@
       <SubComponents>
         <Component class="javax.swing.JList" name="typesList">
           <Properties>
+            <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+              <FontInfo relative="true">
+                <Font bold="false" component="typesList" property="font" relativeSize="false" size="11"/>
+              </FontInfo>
+            </Property>
             <Property name="model" type="javax.swing.ListModel" editor="org.netbeans.modules.form.editors2.ListModelEditor">
               <StringArray count="0"/>
             </Property>
@@ -207,6 +212,11 @@
     </Component>
     <Component class="javax.swing.JLabel" name="mimeTypeLabel">
       <Properties>
+        <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+          <FontInfo relative="true">
+            <Font bold="false" component="mimeTypeLabel" property="font" relativeSize="false" size="11"/>
+          </FontInfo>
+        </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
           <ResourceString bundle="org/sleuthkit/autopsy/modules/filetypeid/Bundle.properties" key="FileTypeIdGlobalSettingsPanel.mimeTypeLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
@@ -214,6 +224,11 @@
     </Component>
     <Component class="javax.swing.JTextField" name="mimeTypeTextField">
       <Properties>
+        <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+          <FontInfo relative="true">
+            <Font bold="false" component="mimeTypeTextField" property="font" relativeSize="false" size="11"/>
+          </FontInfo>
+        </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
           <ResourceString bundle="org/sleuthkit/autopsy/modules/filetypeid/Bundle.properties" key="FileTypeIdGlobalSettingsPanel.mimeTypeTextField.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
@@ -221,6 +236,11 @@
     </Component>
     <Component class="javax.swing.JLabel" name="signatureTypeLabel">
       <Properties>
+        <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+          <FontInfo relative="true">
+            <Font bold="false" component="signatureTypeLabel" property="font" relativeSize="false" size="11"/>
+          </FontInfo>
+        </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
           <ResourceString bundle="org/sleuthkit/autopsy/modules/filetypeid/Bundle.properties" key="FileTypeIdGlobalSettingsPanel.signatureTypeLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
@@ -228,6 +248,11 @@
     </Component>
     <Component class="javax.swing.JTextField" name="signatureTextField">
       <Properties>
+        <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+          <FontInfo relative="true">
+            <Font bold="false" component="signatureTextField" property="font" relativeSize="false" size="11"/>
+          </FontInfo>
+        </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
           <ResourceString bundle="org/sleuthkit/autopsy/modules/filetypeid/Bundle.properties" key="FileTypeIdGlobalSettingsPanel.signatureTextField.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
@@ -238,6 +263,11 @@
     </Component>
     <Component class="javax.swing.JLabel" name="offsetLabel">
       <Properties>
+        <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+          <FontInfo relative="true">
+            <Font bold="false" component="offsetLabel" property="font" relativeSize="false" size="11"/>
+          </FontInfo>
+        </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
           <ResourceString bundle="org/sleuthkit/autopsy/modules/filetypeid/Bundle.properties" key="FileTypeIdGlobalSettingsPanel.offsetLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
@@ -245,6 +275,11 @@
     </Component>
     <Component class="javax.swing.JTextField" name="offsetTextField">
       <Properties>
+        <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+          <FontInfo relative="true">
+            <Font bold="false" component="offsetTextField" property="font" relativeSize="false" size="11"/>
+          </FontInfo>
+        </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
           <ResourceString bundle="org/sleuthkit/autopsy/modules/filetypeid/Bundle.properties" key="FileTypeIdGlobalSettingsPanel.offsetTextField.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
@@ -252,6 +287,11 @@
     </Component>
     <Component class="javax.swing.JButton" name="newTypeButton">
       <Properties>
+        <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+          <FontInfo relative="true">
+            <Font bold="false" component="newTypeButton" property="font" relativeSize="false" size="11"/>
+          </FontInfo>
+        </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
           <ResourceString bundle="org/sleuthkit/autopsy/modules/filetypeid/Bundle.properties" key="FileTypeIdGlobalSettingsPanel.newTypeButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
@@ -262,6 +302,11 @@
     </Component>
     <Component class="javax.swing.JButton" name="deleteTypeButton">
       <Properties>
+        <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+          <FontInfo relative="true">
+            <Font bold="false" component="deleteTypeButton" property="font" relativeSize="false" size="11"/>
+          </FontInfo>
+        </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
           <ResourceString bundle="org/sleuthkit/autopsy/modules/filetypeid/Bundle.properties" key="FileTypeIdGlobalSettingsPanel.deleteTypeButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
@@ -272,6 +317,11 @@
     </Component>
     <Component class="javax.swing.JButton" name="saveTypeButton">
       <Properties>
+        <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+          <FontInfo relative="true">
+            <Font bold="false" component="saveTypeButton" property="font" relativeSize="false" size="11"/>
+          </FontInfo>
+        </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
           <ResourceString bundle="org/sleuthkit/autopsy/modules/filetypeid/Bundle.properties" key="FileTypeIdGlobalSettingsPanel.saveTypeButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
@@ -282,6 +332,11 @@
     </Component>
     <Component class="javax.swing.JLabel" name="hexPrefixLabel">
       <Properties>
+        <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+          <FontInfo relative="true">
+            <Font bold="false" component="hexPrefixLabel" property="font" relativeSize="false" size="11"/>
+          </FontInfo>
+        </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
           <ResourceString bundle="org/sleuthkit/autopsy/modules/filetypeid/Bundle.properties" key="FileTypeIdGlobalSettingsPanel.hexPrefixLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
@@ -289,6 +344,11 @@
     </Component>
     <Component class="javax.swing.JComboBox" name="signatureTypeComboBox">
       <Properties>
+        <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+          <FontInfo relative="true">
+            <Font bold="false" component="signatureTypeComboBox" property="font" relativeSize="false" size="11"/>
+          </FontInfo>
+        </Property>
         <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor">
           <StringArray count="0"/>
         </Property>
@@ -302,6 +362,11 @@
     </Component>
     <Component class="javax.swing.JLabel" name="signatureLabel">
       <Properties>
+        <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+          <FontInfo relative="true">
+            <Font bold="false" component="signatureLabel" property="font" relativeSize="false" size="11"/>
+          </FontInfo>
+        </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
           <ResourceString bundle="org/sleuthkit/autopsy/modules/filetypeid/Bundle.properties" key="FileTypeIdGlobalSettingsPanel.signatureLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
@@ -309,6 +374,11 @@
     </Component>
     <Component class="javax.swing.JCheckBox" name="postHitCheckBox">
       <Properties>
+        <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+          <FontInfo relative="true">
+            <Font bold="false" component="postHitCheckBox" property="font" relativeSize="false" size="11"/>
+          </FontInfo>
+        </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
           <ResourceString bundle="org/sleuthkit/autopsy/modules/filetypeid/Bundle.properties" key="FileTypeIdGlobalSettingsPanel.postHitCheckBox.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
@@ -319,6 +389,11 @@
     </Component>
     <Component class="javax.swing.JLabel" name="filesSetNameLabel">
       <Properties>
+        <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+          <FontInfo relative="true">
+            <Font bold="false" component="filesSetNameLabel" property="font" relativeSize="false" size="11"/>
+          </FontInfo>
+        </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
           <ResourceString bundle="org/sleuthkit/autopsy/modules/filetypeid/Bundle.properties" key="FileTypeIdGlobalSettingsPanel.filesSetNameLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
@@ -326,6 +401,11 @@
     </Component>
     <Component class="javax.swing.JTextField" name="filesSetNameTextField">
       <Properties>
+        <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+          <FontInfo relative="true">
+            <Font bold="false" component="filesSetNameTextField" property="font" relativeSize="false" size="11"/>
+          </FontInfo>
+        </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
           <ResourceString bundle="org/sleuthkit/autopsy/modules/filetypeid/Bundle.properties" key="FileTypeIdGlobalSettingsPanel.filesSetNameTextField.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
@@ -333,6 +413,11 @@
     </Component>
     <Component class="javax.swing.JLabel" name="ingestRunningWarningLabel">
       <Properties>
+        <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+          <FontInfo relative="true">
+            <Font bold="false" component="ingestRunningWarningLabel" property="font" relativeSize="false" size="11"/>
+          </FontInfo>
+        </Property>
         <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
           <Image iconType="3" name="/org/sleuthkit/autopsy/modules/filetypeid/warning16.png"/>
         </Property>
@@ -343,8 +428,10 @@
     </Component>
     <Component class="javax.swing.JLabel" name="jLabel1">
       <Properties>
-        <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
-          <Font name="Tahoma" size="11" style="1"/>
+        <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+          <FontInfo relative="true">
+            <Font bold="true" component="jLabel1" property="font" relativeSize="false" size="11"/>
+          </FontInfo>
         </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
           <ResourceString bundle="org/sleuthkit/autopsy/modules/filetypeid/Bundle.properties" key="FileTypeIdGlobalSettingsPanel.jLabel1.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
@@ -353,6 +440,11 @@
     </Component>
     <Component class="javax.swing.JLabel" name="jLabel2">
       <Properties>
+        <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+          <FontInfo relative="true">
+            <Font bold="false" component="jLabel2" property="font" relativeSize="false" size="11"/>
+          </FontInfo>
+        </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
           <ResourceString bundle="org/sleuthkit/autopsy/modules/filetypeid/Bundle.properties" key="FileTypeIdGlobalSettingsPanel.jLabel2.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
@@ -360,6 +452,11 @@
     </Component>
     <Component class="javax.swing.JLabel" name="jLabel3">
       <Properties>
+        <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+          <FontInfo relative="true">
+            <Font bold="false" component="jLabel3" property="font" relativeSize="false" size="11"/>
+          </FontInfo>
+        </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
           <ResourceString bundle="org/sleuthkit/autopsy/modules/filetypeid/Bundle.properties" key="FileTypeIdGlobalSettingsPanel.jLabel3.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
@@ -367,6 +464,11 @@
     </Component>
     <Component class="javax.swing.JComboBox" name="offsetRelativeToComboBox">
       <Properties>
+        <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+          <FontInfo relative="true">
+            <Font bold="false" component="offsetRelativeToComboBox" property="font" relativeSize="false" size="11"/>
+          </FontInfo>
+        </Property>
         <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor">
           <StringArray count="0"/>
         </Property>
@@ -377,6 +479,11 @@
     </Component>
     <Component class="javax.swing.JLabel" name="offsetRelativeToLabel">
       <Properties>
+        <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+          <FontInfo relative="true">
+            <Font bold="false" component="offsetRelativeToLabel" property="font" relativeSize="false" size="11"/>
+          </FontInfo>
+        </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
           <ResourceString bundle="org/sleuthkit/autopsy/modules/filetypeid/Bundle.properties" key="FileTypeIdGlobalSettingsPanel.offsetRelativeToLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
diff --git a/Core/src/org/sleuthkit/autopsy/modules/filetypeid/FileTypeIdGlobalSettingsPanel.java b/Core/src/org/sleuthkit/autopsy/modules/filetypeid/FileTypeIdGlobalSettingsPanel.java
index 0b277672a2..ef174b3155 100644
--- a/Core/src/org/sleuthkit/autopsy/modules/filetypeid/FileTypeIdGlobalSettingsPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/modules/filetypeid/FileTypeIdGlobalSettingsPanel.java
@@ -352,7 +352,7 @@ final class FileTypeIdGlobalSettingsPanel extends IngestModuleGlobalSettingsPane
     private void initComponents() {
 
         typesScrollPane = new javax.swing.JScrollPane();
-        typesList = new javax.swing.JList<FileType>();
+        typesList = new javax.swing.JList<>();
         separator = new javax.swing.JSeparator();
         mimeTypeLabel = new javax.swing.JLabel();
         mimeTypeTextField = new javax.swing.JTextField();
@@ -364,7 +364,7 @@ final class FileTypeIdGlobalSettingsPanel extends IngestModuleGlobalSettingsPane
         deleteTypeButton = new javax.swing.JButton();
         saveTypeButton = new javax.swing.JButton();
         hexPrefixLabel = new javax.swing.JLabel();
-        signatureTypeComboBox = new javax.swing.JComboBox<String>();
+        signatureTypeComboBox = new javax.swing.JComboBox<>();
         signatureLabel = new javax.swing.JLabel();
         postHitCheckBox = new javax.swing.JCheckBox();
         filesSetNameLabel = new javax.swing.JLabel();
@@ -373,24 +373,29 @@ final class FileTypeIdGlobalSettingsPanel extends IngestModuleGlobalSettingsPane
         jLabel1 = new javax.swing.JLabel();
         jLabel2 = new javax.swing.JLabel();
         jLabel3 = new javax.swing.JLabel();
-        offsetRelativeToComboBox = new javax.swing.JComboBox<String>();
+        offsetRelativeToComboBox = new javax.swing.JComboBox<>();
         offsetRelativeToLabel = new javax.swing.JLabel();
 
         setMaximumSize(new java.awt.Dimension(500, 300));
         setPreferredSize(new java.awt.Dimension(500, 300));
 
+        typesList.setFont(typesList.getFont().deriveFont(typesList.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         typesList.setMaximumSize(new java.awt.Dimension(150, 0));
         typesList.setMinimumSize(new java.awt.Dimension(150, 0));
         typesScrollPane.setViewportView(typesList);
 
         separator.setOrientation(javax.swing.SwingConstants.VERTICAL);
 
+        mimeTypeLabel.setFont(mimeTypeLabel.getFont().deriveFont(mimeTypeLabel.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         org.openide.awt.Mnemonics.setLocalizedText(mimeTypeLabel, org.openide.util.NbBundle.getMessage(FileTypeIdGlobalSettingsPanel.class, "FileTypeIdGlobalSettingsPanel.mimeTypeLabel.text")); // NOI18N
 
+        mimeTypeTextField.setFont(mimeTypeTextField.getFont().deriveFont(mimeTypeTextField.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         mimeTypeTextField.setText(org.openide.util.NbBundle.getMessage(FileTypeIdGlobalSettingsPanel.class, "FileTypeIdGlobalSettingsPanel.mimeTypeTextField.text")); // NOI18N
 
+        signatureTypeLabel.setFont(signatureTypeLabel.getFont().deriveFont(signatureTypeLabel.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         org.openide.awt.Mnemonics.setLocalizedText(signatureTypeLabel, org.openide.util.NbBundle.getMessage(FileTypeIdGlobalSettingsPanel.class, "FileTypeIdGlobalSettingsPanel.signatureTypeLabel.text")); // NOI18N
 
+        signatureTextField.setFont(signatureTextField.getFont().deriveFont(signatureTextField.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         signatureTextField.setText(org.openide.util.NbBundle.getMessage(FileTypeIdGlobalSettingsPanel.class, "FileTypeIdGlobalSettingsPanel.signatureTextField.text")); // NOI18N
         signatureTextField.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
@@ -398,10 +403,13 @@ final class FileTypeIdGlobalSettingsPanel extends IngestModuleGlobalSettingsPane
             }
         });
 
+        offsetLabel.setFont(offsetLabel.getFont().deriveFont(offsetLabel.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         org.openide.awt.Mnemonics.setLocalizedText(offsetLabel, org.openide.util.NbBundle.getMessage(FileTypeIdGlobalSettingsPanel.class, "FileTypeIdGlobalSettingsPanel.offsetLabel.text")); // NOI18N
 
+        offsetTextField.setFont(offsetTextField.getFont().deriveFont(offsetTextField.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         offsetTextField.setText(org.openide.util.NbBundle.getMessage(FileTypeIdGlobalSettingsPanel.class, "FileTypeIdGlobalSettingsPanel.offsetTextField.text")); // NOI18N
 
+        newTypeButton.setFont(newTypeButton.getFont().deriveFont(newTypeButton.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         org.openide.awt.Mnemonics.setLocalizedText(newTypeButton, org.openide.util.NbBundle.getMessage(FileTypeIdGlobalSettingsPanel.class, "FileTypeIdGlobalSettingsPanel.newTypeButton.text")); // NOI18N
         newTypeButton.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
@@ -409,6 +417,7 @@ final class FileTypeIdGlobalSettingsPanel extends IngestModuleGlobalSettingsPane
             }
         });
 
+        deleteTypeButton.setFont(deleteTypeButton.getFont().deriveFont(deleteTypeButton.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         org.openide.awt.Mnemonics.setLocalizedText(deleteTypeButton, org.openide.util.NbBundle.getMessage(FileTypeIdGlobalSettingsPanel.class, "FileTypeIdGlobalSettingsPanel.deleteTypeButton.text")); // NOI18N
         deleteTypeButton.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
@@ -416,6 +425,7 @@ final class FileTypeIdGlobalSettingsPanel extends IngestModuleGlobalSettingsPane
             }
         });
 
+        saveTypeButton.setFont(saveTypeButton.getFont().deriveFont(saveTypeButton.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         org.openide.awt.Mnemonics.setLocalizedText(saveTypeButton, org.openide.util.NbBundle.getMessage(FileTypeIdGlobalSettingsPanel.class, "FileTypeIdGlobalSettingsPanel.saveTypeButton.text")); // NOI18N
         saveTypeButton.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
@@ -423,16 +433,20 @@ final class FileTypeIdGlobalSettingsPanel extends IngestModuleGlobalSettingsPane
             }
         });
 
+        hexPrefixLabel.setFont(hexPrefixLabel.getFont().deriveFont(hexPrefixLabel.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         org.openide.awt.Mnemonics.setLocalizedText(hexPrefixLabel, org.openide.util.NbBundle.getMessage(FileTypeIdGlobalSettingsPanel.class, "FileTypeIdGlobalSettingsPanel.hexPrefixLabel.text")); // NOI18N
 
+        signatureTypeComboBox.setFont(signatureTypeComboBox.getFont().deriveFont(signatureTypeComboBox.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         signatureTypeComboBox.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
                 signatureTypeComboBoxActionPerformed(evt);
             }
         });
 
+        signatureLabel.setFont(signatureLabel.getFont().deriveFont(signatureLabel.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         org.openide.awt.Mnemonics.setLocalizedText(signatureLabel, org.openide.util.NbBundle.getMessage(FileTypeIdGlobalSettingsPanel.class, "FileTypeIdGlobalSettingsPanel.signatureLabel.text")); // NOI18N
 
+        postHitCheckBox.setFont(postHitCheckBox.getFont().deriveFont(postHitCheckBox.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         org.openide.awt.Mnemonics.setLocalizedText(postHitCheckBox, org.openide.util.NbBundle.getMessage(FileTypeIdGlobalSettingsPanel.class, "FileTypeIdGlobalSettingsPanel.postHitCheckBox.text")); // NOI18N
         postHitCheckBox.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
@@ -440,20 +454,28 @@ final class FileTypeIdGlobalSettingsPanel extends IngestModuleGlobalSettingsPane
             }
         });
 
+        filesSetNameLabel.setFont(filesSetNameLabel.getFont().deriveFont(filesSetNameLabel.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         org.openide.awt.Mnemonics.setLocalizedText(filesSetNameLabel, org.openide.util.NbBundle.getMessage(FileTypeIdGlobalSettingsPanel.class, "FileTypeIdGlobalSettingsPanel.filesSetNameLabel.text")); // NOI18N
 
+        filesSetNameTextField.setFont(filesSetNameTextField.getFont().deriveFont(filesSetNameTextField.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         filesSetNameTextField.setText(org.openide.util.NbBundle.getMessage(FileTypeIdGlobalSettingsPanel.class, "FileTypeIdGlobalSettingsPanel.filesSetNameTextField.text")); // NOI18N
 
-        ingestRunningWarningLabel.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/modules/filetypeid/warning16.png"))); // NOI18N NON-NLS
+        ingestRunningWarningLabel.setFont(ingestRunningWarningLabel.getFont().deriveFont(ingestRunningWarningLabel.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
+        ingestRunningWarningLabel.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/modules/filetypeid/warning16.png"))); // NOI18N
         org.openide.awt.Mnemonics.setLocalizedText(ingestRunningWarningLabel, org.openide.util.NbBundle.getMessage(FileTypeIdGlobalSettingsPanel.class, "FileTypeIdGlobalSettingsPanel.ingestRunningWarningLabel.text")); // NOI18N
 
-        jLabel1.setFont(jLabel1.getFont().deriveFont(Font.BOLD, 11)); // NOI18N
+        jLabel1.setFont(jLabel1.getFont().deriveFont(jLabel1.getFont().getStyle() | java.awt.Font.BOLD, 11));
         org.openide.awt.Mnemonics.setLocalizedText(jLabel1, org.openide.util.NbBundle.getMessage(FileTypeIdGlobalSettingsPanel.class, "FileTypeIdGlobalSettingsPanel.jLabel1.text")); // NOI18N
 
+        jLabel2.setFont(jLabel2.getFont().deriveFont(jLabel2.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         org.openide.awt.Mnemonics.setLocalizedText(jLabel2, org.openide.util.NbBundle.getMessage(FileTypeIdGlobalSettingsPanel.class, "FileTypeIdGlobalSettingsPanel.jLabel2.text")); // NOI18N
 
+        jLabel3.setFont(jLabel3.getFont().deriveFont(jLabel3.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         org.openide.awt.Mnemonics.setLocalizedText(jLabel3, org.openide.util.NbBundle.getMessage(FileTypeIdGlobalSettingsPanel.class, "FileTypeIdGlobalSettingsPanel.jLabel3.text")); // NOI18N
 
+        offsetRelativeToComboBox.setFont(offsetRelativeToComboBox.getFont().deriveFont(offsetRelativeToComboBox.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
+
+        offsetRelativeToLabel.setFont(offsetRelativeToLabel.getFont().deriveFont(offsetRelativeToLabel.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         org.openide.awt.Mnemonics.setLocalizedText(offsetRelativeToLabel, org.openide.util.NbBundle.getMessage(FileTypeIdGlobalSettingsPanel.class, "FileTypeIdGlobalSettingsPanel.offsetRelativeToLabel.text")); // NOI18N
 
         javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);

From 70f4a122c949d07390d963da83a6aaf2b029d16a Mon Sep 17 00:00:00 2001
From: Nick Davis <nick.davis@narfindustries.com>
Date: Wed, 3 Feb 2016 16:40:45 -0500
Subject: [PATCH 36/68] converted forms to use derived fonts

---
 .../hashdatabase/HashLookupSettingsPanel.form | 126 +++++++++++++++++-
 .../hashdatabase/HashLookupSettingsPanel.java |  34 ++++-
 .../modules/hashdatabase/ModalNoButtons.form  |  29 +++-
 .../modules/hashdatabase/ModalNoButtons.java  |   8 +-
 4 files changed, 184 insertions(+), 13 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashLookupSettingsPanel.form b/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashLookupSettingsPanel.form
index d45778f1db..5cd2c50c5e 100644
--- a/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashLookupSettingsPanel.form
+++ b/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashLookupSettingsPanel.form
@@ -4,6 +4,11 @@
   <NonVisualComponents>
     <Component class="javax.swing.JLabel" name="jLabel2">
       <Properties>
+        <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+          <FontInfo relative="true">
+            <Font bold="false" component="jLabel2" property="font" relativeSize="false" size="11"/>
+          </FontInfo>
+        </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
           <ResourceString bundle="org/sleuthkit/autopsy/modules/hashdatabase/Bundle.properties" key="HashLookupSettingsPanel.jLabel2.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
@@ -11,6 +16,11 @@
     </Component>
     <Component class="javax.swing.JLabel" name="jLabel4">
       <Properties>
+        <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+          <FontInfo relative="true">
+            <Font bold="false" component="jLabel4" property="font" relativeSize="false" size="11"/>
+          </FontInfo>
+        </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
           <ResourceString bundle="org/sleuthkit/autopsy/modules/hashdatabase/Bundle.properties" key="HashLookupSettingsPanel.jLabel4.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
@@ -18,6 +28,11 @@
     </Component>
     <Component class="javax.swing.JLabel" name="jLabel6">
       <Properties>
+        <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+          <FontInfo relative="true">
+            <Font bold="false" component="jLabel6" property="font" relativeSize="false" size="11"/>
+          </FontInfo>
+        </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
           <ResourceString bundle="org/sleuthkit/autopsy/modules/hashdatabase/Bundle.properties" key="HashLookupSettingsPanel.jLabel6.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
@@ -25,8 +40,10 @@
     </Component>
     <Component class="javax.swing.JButton" name="jButton3">
       <Properties>
-        <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
-          <Font name="Tahoma" size="14" style="0"/>
+        <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+          <FontInfo relative="true">
+            <Font bold="false" component="jButton3" property="font" relativeSize="false" size="14"/>
+          </FontInfo>
         </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
           <ResourceString bundle="org/sleuthkit/autopsy/modules/hashdatabase/Bundle.properties" key="HashLookupSettingsPanel.jButton3.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
@@ -239,6 +256,11 @@
           <SubComponents>
             <Component class="javax.swing.JLabel" name="ingestWarningLabel">
               <Properties>
+                <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+                  <FontInfo relative="true">
+                    <Font bold="false" component="ingestWarningLabel" property="font" relativeSize="false" size="11"/>
+                  </FontInfo>
+                </Property>
                 <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
                   <Image iconType="3" name="/org/sleuthkit/autopsy/modules/hashdatabase/warning16.png"/>
                 </Property>
@@ -256,6 +278,11 @@
               <SubComponents>
                 <Component class="javax.swing.JTable" name="hashSetTable">
                   <Properties>
+                    <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+                      <FontInfo relative="true">
+                        <Font bold="false" component="hashSetTable" property="font" relativeSize="false" size="11"/>
+                      </FontInfo>
+                    </Property>
                     <Property name="model" type="javax.swing.table.TableModel" editor="org.netbeans.modules.form.editors2.TableModelEditor">
                       <Table columnCount="0" rowCount="0"/>
                     </Property>
@@ -279,6 +306,11 @@
             </Container>
             <Component class="javax.swing.JButton" name="deleteDatabaseButton">
               <Properties>
+                <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+                  <FontInfo relative="true">
+                    <Font bold="false" component="deleteDatabaseButton" property="font" relativeSize="false" size="11"/>
+                  </FontInfo>
+                </Property>
                 <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
                   <Image iconType="3" name="/org/sleuthkit/autopsy/modules/hashdatabase/delete16.png"/>
                 </Property>
@@ -301,6 +333,11 @@
             </Component>
             <Component class="javax.swing.JButton" name="importDatabaseButton">
               <Properties>
+                <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+                  <FontInfo relative="true">
+                    <Font bold="false" component="importDatabaseButton" property="font" relativeSize="false" size="11"/>
+                  </FontInfo>
+                </Property>
                 <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
                   <Image iconType="3" name="/org/sleuthkit/autopsy/modules/hashdatabase/import16.png"/>
                 </Property>
@@ -323,6 +360,11 @@
             </Component>
             <Component class="javax.swing.JLabel" name="hashDatabasesLabel">
               <Properties>
+                <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+                  <FontInfo relative="true">
+                    <Font bold="false" component="hashDatabasesLabel" property="font" relativeSize="false" size="11"/>
+                  </FontInfo>
+                </Property>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
                   <ResourceString bundle="org/sleuthkit/autopsy/modules/hashdatabase/Bundle.properties" key="HashLookupSettingsPanel.hashDatabasesLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
@@ -330,6 +372,11 @@
             </Component>
             <Component class="javax.swing.JLabel" name="nameLabel">
               <Properties>
+                <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+                  <FontInfo relative="true">
+                    <Font bold="false" component="nameLabel" property="font" relativeSize="false" size="11"/>
+                  </FontInfo>
+                </Property>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
                   <ResourceString bundle="org/sleuthkit/autopsy/modules/hashdatabase/Bundle.properties" key="HashLookupSettingsPanel.nameLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
@@ -337,6 +384,11 @@
             </Component>
             <Component class="javax.swing.JLabel" name="hashDbNameLabel">
               <Properties>
+                <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+                  <FontInfo relative="true">
+                    <Font bold="false" component="hashDbNameLabel" property="font" relativeSize="false" size="11"/>
+                  </FontInfo>
+                </Property>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
                   <ResourceString bundle="org/sleuthkit/autopsy/modules/hashdatabase/Bundle.properties" key="HashLookupSettingsPanel.hashDbNameLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
@@ -344,6 +396,11 @@
             </Component>
             <Component class="javax.swing.JLabel" name="hashDbLocationLabel">
               <Properties>
+                <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+                  <FontInfo relative="true">
+                    <Font bold="false" component="hashDbLocationLabel" property="font" relativeSize="false" size="11"/>
+                  </FontInfo>
+                </Property>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
                   <ResourceString bundle="org/sleuthkit/autopsy/modules/hashdatabase/Bundle.properties" key="HashLookupSettingsPanel.hashDbLocationLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
@@ -351,6 +408,11 @@
             </Component>
             <Component class="javax.swing.JLabel" name="locationLabel">
               <Properties>
+                <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+                  <FontInfo relative="true">
+                    <Font bold="false" component="locationLabel" property="font" relativeSize="false" size="11"/>
+                  </FontInfo>
+                </Property>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
                   <ResourceString bundle="org/sleuthkit/autopsy/modules/hashdatabase/Bundle.properties" key="HashLookupSettingsPanel.locationLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
@@ -358,6 +420,11 @@
             </Component>
             <Component class="javax.swing.JLabel" name="typeLabel">
               <Properties>
+                <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+                  <FontInfo relative="true">
+                    <Font bold="false" component="typeLabel" property="font" relativeSize="false" size="11"/>
+                  </FontInfo>
+                </Property>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
                   <ResourceString bundle="org/sleuthkit/autopsy/modules/hashdatabase/Bundle.properties" key="HashLookupSettingsPanel.typeLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
@@ -365,6 +432,11 @@
             </Component>
             <Component class="javax.swing.JLabel" name="hashDbTypeLabel">
               <Properties>
+                <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+                  <FontInfo relative="true">
+                    <Font bold="false" component="hashDbTypeLabel" property="font" relativeSize="false" size="11"/>
+                  </FontInfo>
+                </Property>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
                   <ResourceString bundle="org/sleuthkit/autopsy/modules/hashdatabase/Bundle.properties" key="HashLookupSettingsPanel.hashDbTypeLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
@@ -372,6 +444,11 @@
             </Component>
             <Component class="javax.swing.JLabel" name="hashDbIndexStatusLabel">
               <Properties>
+                <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+                  <FontInfo relative="true">
+                    <Font bold="false" component="hashDbIndexStatusLabel" property="font" relativeSize="false" size="11"/>
+                  </FontInfo>
+                </Property>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
                   <ResourceString bundle="org/sleuthkit/autopsy/modules/hashdatabase/Bundle.properties" key="HashLookupSettingsPanel.hashDbIndexStatusLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
@@ -379,6 +456,11 @@
             </Component>
             <Component class="javax.swing.JLabel" name="indexLabel">
               <Properties>
+                <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+                  <FontInfo relative="true">
+                    <Font bold="false" component="indexLabel" property="font" relativeSize="false" size="11"/>
+                  </FontInfo>
+                </Property>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
                   <ResourceString bundle="org/sleuthkit/autopsy/modules/hashdatabase/Bundle.properties" key="HashLookupSettingsPanel.indexLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
@@ -386,6 +468,11 @@
             </Component>
             <Component class="javax.swing.JButton" name="indexButton">
               <Properties>
+                <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+                  <FontInfo relative="true">
+                    <Font bold="false" component="indexButton" property="font" relativeSize="false" size="11"/>
+                  </FontInfo>
+                </Property>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
                   <ResourceString bundle="org/sleuthkit/autopsy/modules/hashdatabase/Bundle.properties" key="HashLookupSettingsPanel.indexButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
@@ -397,6 +484,11 @@
             </Component>
             <Component class="javax.swing.JCheckBox" name="sendIngestMessagesCheckBox">
               <Properties>
+                <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+                  <FontInfo relative="true">
+                    <Font bold="false" component="sendIngestMessagesCheckBox" property="font" relativeSize="false" size="11"/>
+                  </FontInfo>
+                </Property>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
                   <ResourceString bundle="org/sleuthkit/autopsy/modules/hashdatabase/Bundle.properties" key="HashLookupSettingsPanel.sendIngestMessagesCheckBox.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
@@ -407,6 +499,11 @@
             </Component>
             <Component class="javax.swing.JLabel" name="informationLabel">
               <Properties>
+                <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+                  <FontInfo relative="true">
+                    <Font bold="false" component="informationLabel" property="font" relativeSize="false" size="11"/>
+                  </FontInfo>
+                </Property>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
                   <ResourceString bundle="org/sleuthkit/autopsy/modules/hashdatabase/Bundle.properties" key="HashLookupSettingsPanel.informationLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
@@ -414,6 +511,11 @@
             </Component>
             <Component class="javax.swing.JLabel" name="optionsLabel">
               <Properties>
+                <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+                  <FontInfo relative="true">
+                    <Font bold="false" component="optionsLabel" property="font" relativeSize="false" size="11"/>
+                  </FontInfo>
+                </Property>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
                   <ResourceString bundle="org/sleuthkit/autopsy/modules/hashdatabase/Bundle.properties" key="HashLookupSettingsPanel.optionsLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
@@ -425,6 +527,11 @@
             </Component>
             <Component class="javax.swing.JButton" name="createDatabaseButton">
               <Properties>
+                <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+                  <FontInfo relative="true">
+                    <Font bold="false" component="createDatabaseButton" property="font" relativeSize="false" size="11"/>
+                  </FontInfo>
+                </Property>
                 <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
                   <Image iconType="3" name="/org/sleuthkit/autopsy/modules/hashdatabase/new16.png"/>
                 </Property>
@@ -447,6 +554,11 @@
             </Component>
             <Component class="javax.swing.JLabel" name="indexPathLabelLabel">
               <Properties>
+                <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+                  <FontInfo relative="true">
+                    <Font bold="false" component="indexPathLabelLabel" property="font" relativeSize="false" size="11"/>
+                  </FontInfo>
+                </Property>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
                   <ResourceString bundle="org/sleuthkit/autopsy/modules/hashdatabase/Bundle.properties" key="HashLookupSettingsPanel.indexPathLabelLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
@@ -454,6 +566,11 @@
             </Component>
             <Component class="javax.swing.JLabel" name="indexPathLabel">
               <Properties>
+                <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+                  <FontInfo relative="true">
+                    <Font bold="false" component="indexPathLabel" property="font" relativeSize="false" size="11"/>
+                  </FontInfo>
+                </Property>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
                   <ResourceString bundle="org/sleuthkit/autopsy/modules/hashdatabase/Bundle.properties" key="HashLookupSettingsPanel.indexPathLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
@@ -461,6 +578,11 @@
             </Component>
             <Component class="javax.swing.JButton" name="addHashesToDatabaseButton">
               <Properties>
+                <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+                  <FontInfo relative="true">
+                    <Font bold="false" component="addHashesToDatabaseButton" property="font" relativeSize="false" size="11"/>
+                  </FontInfo>
+                </Property>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
                   <ResourceString bundle="org/sleuthkit/autopsy/modules/hashdatabase/Bundle.properties" key="HashLookupSettingsPanel.addHashesToDatabaseButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
diff --git a/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashLookupSettingsPanel.java b/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashLookupSettingsPanel.java
index 6d336b290b..b422ae048e 100644
--- a/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashLookupSettingsPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashLookupSettingsPanel.java
@@ -500,13 +500,16 @@ public final class HashLookupSettingsPanel extends IngestModuleGlobalSettingsPan
         indexPathLabel = new javax.swing.JLabel();
         addHashesToDatabaseButton = new javax.swing.JButton();
 
+        jLabel2.setFont(jLabel2.getFont().deriveFont(jLabel2.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         org.openide.awt.Mnemonics.setLocalizedText(jLabel2, org.openide.util.NbBundle.getMessage(HashLookupSettingsPanel.class, "HashLookupSettingsPanel.jLabel2.text")); // NOI18N
 
+        jLabel4.setFont(jLabel4.getFont().deriveFont(jLabel4.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         org.openide.awt.Mnemonics.setLocalizedText(jLabel4, org.openide.util.NbBundle.getMessage(HashLookupSettingsPanel.class, "HashLookupSettingsPanel.jLabel4.text")); // NOI18N
 
+        jLabel6.setFont(jLabel6.getFont().deriveFont(jLabel6.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         org.openide.awt.Mnemonics.setLocalizedText(jLabel6, org.openide.util.NbBundle.getMessage(HashLookupSettingsPanel.class, "HashLookupSettingsPanel.jLabel6.text")); // NOI18N
 
-        jButton3.setFont(jButton3.getFont().deriveFont(Font.PLAIN, 14));
+        jButton3.setFont(jButton3.getFont().deriveFont(jButton3.getFont().getStyle() & ~java.awt.Font.BOLD, 14));
         org.openide.awt.Mnemonics.setLocalizedText(jButton3, org.openide.util.NbBundle.getMessage(HashLookupSettingsPanel.class, "HashLookupSettingsPanel.jButton3.text")); // NOI18N
 
         setMinimumSize(new java.awt.Dimension(700, 430));
@@ -514,9 +517,11 @@ public final class HashLookupSettingsPanel extends IngestModuleGlobalSettingsPan
 
         jPanel1.setPreferredSize(new java.awt.Dimension(671, 430));
 
-        ingestWarningLabel.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/modules/hashdatabase/warning16.png"))); // NOI18N NON-NLS
+        ingestWarningLabel.setFont(ingestWarningLabel.getFont().deriveFont(ingestWarningLabel.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
+        ingestWarningLabel.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/modules/hashdatabase/warning16.png"))); // NOI18N
         org.openide.awt.Mnemonics.setLocalizedText(ingestWarningLabel, org.openide.util.NbBundle.getMessage(HashLookupSettingsPanel.class, "HashLookupSettingsPanel.ingestWarningLabel.text")); // NOI18N
 
+        hashSetTable.setFont(hashSetTable.getFont().deriveFont(hashSetTable.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         hashSetTable.setModel(new javax.swing.table.DefaultTableModel(
             new Object [][] {
 
@@ -534,7 +539,8 @@ public final class HashLookupSettingsPanel extends IngestModuleGlobalSettingsPan
         });
         jScrollPane1.setViewportView(hashSetTable);
 
-        deleteDatabaseButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/modules/hashdatabase/delete16.png"))); // NOI18N NON-NLS
+        deleteDatabaseButton.setFont(deleteDatabaseButton.getFont().deriveFont(deleteDatabaseButton.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
+        deleteDatabaseButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/modules/hashdatabase/delete16.png"))); // NOI18N
         org.openide.awt.Mnemonics.setLocalizedText(deleteDatabaseButton, org.openide.util.NbBundle.getMessage(HashLookupSettingsPanel.class, "HashLookupSettingsPanel.deleteDatabaseButton.text")); // NOI18N
         deleteDatabaseButton.setMaximumSize(new java.awt.Dimension(140, 25));
         deleteDatabaseButton.setMinimumSize(new java.awt.Dimension(140, 25));
@@ -545,7 +551,8 @@ public final class HashLookupSettingsPanel extends IngestModuleGlobalSettingsPan
             }
         });
 
-        importDatabaseButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/modules/hashdatabase/import16.png"))); // NOI18N NON-NLS
+        importDatabaseButton.setFont(importDatabaseButton.getFont().deriveFont(importDatabaseButton.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
+        importDatabaseButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/modules/hashdatabase/import16.png"))); // NOI18N
         org.openide.awt.Mnemonics.setLocalizedText(importDatabaseButton, org.openide.util.NbBundle.getMessage(HashLookupSettingsPanel.class, "HashLookupSettingsPanel.importDatabaseButton.text")); // NOI18N
         importDatabaseButton.setMaximumSize(new java.awt.Dimension(140, 25));
         importDatabaseButton.setMinimumSize(new java.awt.Dimension(140, 25));
@@ -556,24 +563,34 @@ public final class HashLookupSettingsPanel extends IngestModuleGlobalSettingsPan
             }
         });
 
+        hashDatabasesLabel.setFont(hashDatabasesLabel.getFont().deriveFont(hashDatabasesLabel.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         org.openide.awt.Mnemonics.setLocalizedText(hashDatabasesLabel, org.openide.util.NbBundle.getMessage(HashLookupSettingsPanel.class, "HashLookupSettingsPanel.hashDatabasesLabel.text")); // NOI18N
 
+        nameLabel.setFont(nameLabel.getFont().deriveFont(nameLabel.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         org.openide.awt.Mnemonics.setLocalizedText(nameLabel, org.openide.util.NbBundle.getMessage(HashLookupSettingsPanel.class, "HashLookupSettingsPanel.nameLabel.text")); // NOI18N
 
+        hashDbNameLabel.setFont(hashDbNameLabel.getFont().deriveFont(hashDbNameLabel.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         org.openide.awt.Mnemonics.setLocalizedText(hashDbNameLabel, org.openide.util.NbBundle.getMessage(HashLookupSettingsPanel.class, "HashLookupSettingsPanel.hashDbNameLabel.text")); // NOI18N
 
+        hashDbLocationLabel.setFont(hashDbLocationLabel.getFont().deriveFont(hashDbLocationLabel.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         org.openide.awt.Mnemonics.setLocalizedText(hashDbLocationLabel, org.openide.util.NbBundle.getMessage(HashLookupSettingsPanel.class, "HashLookupSettingsPanel.hashDbLocationLabel.text")); // NOI18N
 
+        locationLabel.setFont(locationLabel.getFont().deriveFont(locationLabel.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         org.openide.awt.Mnemonics.setLocalizedText(locationLabel, org.openide.util.NbBundle.getMessage(HashLookupSettingsPanel.class, "HashLookupSettingsPanel.locationLabel.text")); // NOI18N
 
+        typeLabel.setFont(typeLabel.getFont().deriveFont(typeLabel.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         org.openide.awt.Mnemonics.setLocalizedText(typeLabel, org.openide.util.NbBundle.getMessage(HashLookupSettingsPanel.class, "HashLookupSettingsPanel.typeLabel.text")); // NOI18N
 
+        hashDbTypeLabel.setFont(hashDbTypeLabel.getFont().deriveFont(hashDbTypeLabel.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         org.openide.awt.Mnemonics.setLocalizedText(hashDbTypeLabel, org.openide.util.NbBundle.getMessage(HashLookupSettingsPanel.class, "HashLookupSettingsPanel.hashDbTypeLabel.text")); // NOI18N
 
+        hashDbIndexStatusLabel.setFont(hashDbIndexStatusLabel.getFont().deriveFont(hashDbIndexStatusLabel.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         org.openide.awt.Mnemonics.setLocalizedText(hashDbIndexStatusLabel, org.openide.util.NbBundle.getMessage(HashLookupSettingsPanel.class, "HashLookupSettingsPanel.hashDbIndexStatusLabel.text")); // NOI18N
 
+        indexLabel.setFont(indexLabel.getFont().deriveFont(indexLabel.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         org.openide.awt.Mnemonics.setLocalizedText(indexLabel, org.openide.util.NbBundle.getMessage(HashLookupSettingsPanel.class, "HashLookupSettingsPanel.indexLabel.text")); // NOI18N
 
+        indexButton.setFont(indexButton.getFont().deriveFont(indexButton.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         org.openide.awt.Mnemonics.setLocalizedText(indexButton, org.openide.util.NbBundle.getMessage(HashLookupSettingsPanel.class, "HashLookupSettingsPanel.indexButton.text")); // NOI18N
         indexButton.setEnabled(false);
         indexButton.addActionListener(new java.awt.event.ActionListener() {
@@ -582,6 +599,7 @@ public final class HashLookupSettingsPanel extends IngestModuleGlobalSettingsPan
             }
         });
 
+        sendIngestMessagesCheckBox.setFont(sendIngestMessagesCheckBox.getFont().deriveFont(sendIngestMessagesCheckBox.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         org.openide.awt.Mnemonics.setLocalizedText(sendIngestMessagesCheckBox, org.openide.util.NbBundle.getMessage(HashLookupSettingsPanel.class, "HashLookupSettingsPanel.sendIngestMessagesCheckBox.text")); // NOI18N
         sendIngestMessagesCheckBox.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
@@ -589,11 +607,14 @@ public final class HashLookupSettingsPanel extends IngestModuleGlobalSettingsPan
             }
         });
 
+        informationLabel.setFont(informationLabel.getFont().deriveFont(informationLabel.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         org.openide.awt.Mnemonics.setLocalizedText(informationLabel, org.openide.util.NbBundle.getMessage(HashLookupSettingsPanel.class, "HashLookupSettingsPanel.informationLabel.text")); // NOI18N
 
+        optionsLabel.setFont(optionsLabel.getFont().deriveFont(optionsLabel.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         org.openide.awt.Mnemonics.setLocalizedText(optionsLabel, org.openide.util.NbBundle.getMessage(HashLookupSettingsPanel.class, "HashLookupSettingsPanel.optionsLabel.text")); // NOI18N
 
-        createDatabaseButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/modules/hashdatabase/new16.png"))); // NOI18N NON-NLS
+        createDatabaseButton.setFont(createDatabaseButton.getFont().deriveFont(createDatabaseButton.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
+        createDatabaseButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/modules/hashdatabase/new16.png"))); // NOI18N
         org.openide.awt.Mnemonics.setLocalizedText(createDatabaseButton, org.openide.util.NbBundle.getMessage(HashLookupSettingsPanel.class, "HashLookupSettingsPanel.createDatabaseButton.text")); // NOI18N
         createDatabaseButton.setMaximumSize(new java.awt.Dimension(140, 25));
         createDatabaseButton.setMinimumSize(new java.awt.Dimension(140, 25));
@@ -604,10 +625,13 @@ public final class HashLookupSettingsPanel extends IngestModuleGlobalSettingsPan
             }
         });
 
+        indexPathLabelLabel.setFont(indexPathLabelLabel.getFont().deriveFont(indexPathLabelLabel.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         org.openide.awt.Mnemonics.setLocalizedText(indexPathLabelLabel, org.openide.util.NbBundle.getMessage(HashLookupSettingsPanel.class, "HashLookupSettingsPanel.indexPathLabelLabel.text")); // NOI18N
 
+        indexPathLabel.setFont(indexPathLabel.getFont().deriveFont(indexPathLabel.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         org.openide.awt.Mnemonics.setLocalizedText(indexPathLabel, org.openide.util.NbBundle.getMessage(HashLookupSettingsPanel.class, "HashLookupSettingsPanel.indexPathLabel.text")); // NOI18N
 
+        addHashesToDatabaseButton.setFont(addHashesToDatabaseButton.getFont().deriveFont(addHashesToDatabaseButton.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         org.openide.awt.Mnemonics.setLocalizedText(addHashesToDatabaseButton, org.openide.util.NbBundle.getMessage(HashLookupSettingsPanel.class, "HashLookupSettingsPanel.addHashesToDatabaseButton.text")); // NOI18N
         addHashesToDatabaseButton.setEnabled(false);
         addHashesToDatabaseButton.addActionListener(new java.awt.event.ActionListener() {
diff --git a/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/ModalNoButtons.form b/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/ModalNoButtons.form
index d61d960949..7b77aaf054 100644
--- a/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/ModalNoButtons.form
+++ b/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/ModalNoButtons.form
@@ -73,10 +73,22 @@
   </Layout>
   <SubComponents>
     <Component class="javax.swing.JProgressBar" name="INDEXING_PROGBAR">
+      <Properties>
+        <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+          <FontInfo relative="true">
+            <Font bold="false" component="INDEXING_PROGBAR" property="font" relativeSize="false" size="11"/>
+          </FontInfo>
+        </Property>
+      </Properties>
     </Component>
     <Component class="javax.swing.JLabel" name="GO_GET_COFFEE_LABEL">
       <Properties>
         <Property name="displayedMnemonic" type="int" value="72"/>
+        <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+          <FontInfo relative="true">
+            <Font bold="false" component="GO_GET_COFFEE_LABEL" property="font" relativeSize="false" size="11"/>
+          </FontInfo>
+        </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
           <ResourceString bundle="org/sleuthkit/autopsy/modules/hashdatabase/Bundle.properties" key="ModalNoButtons.GO_GET_COFFEE_LABEL.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
@@ -84,8 +96,10 @@
     </Component>
     <Component class="javax.swing.JLabel" name="CURRENTLYON_LABEL">
       <Properties>
-        <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
-          <Font name="Tahoma" size="14" style="0"/>
+        <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+          <FontInfo relative="true">
+            <Font bold="false" component="CURRENTLYON_LABEL" property="font" relativeSize="false" size="14"/>
+          </FontInfo>
         </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
           <ResourceString bundle="org/sleuthkit/autopsy/modules/hashdatabase/Bundle.properties" key="ModalNoButtons.CURRENTLYON_LABEL.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
@@ -94,8 +108,10 @@
     </Component>
     <Component class="javax.swing.JLabel" name="CURRENTDB_LABEL">
       <Properties>
-        <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
-          <Font name="Tahoma" size="14" style="0"/>
+        <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+          <FontInfo relative="true">
+            <Font bold="false" component="CURRENTDB_LABEL" property="font" relativeSize="false" size="14"/>
+          </FontInfo>
         </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
           <ResourceString bundle="org/sleuthkit/autopsy/modules/hashdatabase/Bundle.properties" key="ModalNoButtons.CURRENTDB_LABEL.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
@@ -104,6 +120,11 @@
     </Component>
     <Component class="javax.swing.JButton" name="CANCEL_BUTTON">
       <Properties>
+        <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+          <FontInfo relative="true">
+            <Font bold="false" component="CANCEL_BUTTON" property="font" relativeSize="false" size="11"/>
+          </FontInfo>
+        </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
           <ResourceString bundle="org/sleuthkit/autopsy/modules/hashdatabase/Bundle.properties" key="ModalNoButtons.CANCEL_BUTTON.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
diff --git a/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/ModalNoButtons.java b/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/ModalNoButtons.java
index 64a4003c73..33f65488d2 100644
--- a/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/ModalNoButtons.java
+++ b/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/ModalNoButtons.java
@@ -104,15 +104,19 @@ class ModalNoButtons extends javax.swing.JDialog implements PropertyChangeListen
         setModal(true);
         setResizable(false);
 
+        INDEXING_PROGBAR.setFont(INDEXING_PROGBAR.getFont().deriveFont(INDEXING_PROGBAR.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
+
         GO_GET_COFFEE_LABEL.setDisplayedMnemonic('H');
+        GO_GET_COFFEE_LABEL.setFont(GO_GET_COFFEE_LABEL.getFont().deriveFont(GO_GET_COFFEE_LABEL.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         org.openide.awt.Mnemonics.setLocalizedText(GO_GET_COFFEE_LABEL, org.openide.util.NbBundle.getMessage(ModalNoButtons.class, "ModalNoButtons.GO_GET_COFFEE_LABEL.text")); // NOI18N
 
-        CURRENTLYON_LABEL.setFont(CURRENTLYON_LABEL.getFont().deriveFont(Font.PLAIN, 14));
+        CURRENTLYON_LABEL.setFont(CURRENTLYON_LABEL.getFont().deriveFont(CURRENTLYON_LABEL.getFont().getStyle() & ~java.awt.Font.BOLD, 14));
         org.openide.awt.Mnemonics.setLocalizedText(CURRENTLYON_LABEL, org.openide.util.NbBundle.getMessage(ModalNoButtons.class, "ModalNoButtons.CURRENTLYON_LABEL.text")); // NOI18N
 
-        CURRENTDB_LABEL.setFont(CURRENTDB_LABEL.getFont().deriveFont(Font.PLAIN, 14));
+        CURRENTDB_LABEL.setFont(CURRENTDB_LABEL.getFont().deriveFont(CURRENTDB_LABEL.getFont().getStyle() & ~java.awt.Font.BOLD, 14));
         org.openide.awt.Mnemonics.setLocalizedText(CURRENTDB_LABEL, org.openide.util.NbBundle.getMessage(ModalNoButtons.class, "ModalNoButtons.CURRENTDB_LABEL.text")); // NOI18N
 
+        CANCEL_BUTTON.setFont(CANCEL_BUTTON.getFont().deriveFont(CANCEL_BUTTON.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         org.openide.awt.Mnemonics.setLocalizedText(CANCEL_BUTTON, org.openide.util.NbBundle.getMessage(ModalNoButtons.class, "ModalNoButtons.CANCEL_BUTTON.text")); // NOI18N
         CANCEL_BUTTON.addMouseListener(new java.awt.event.MouseAdapter() {
             public void mouseClicked(java.awt.event.MouseEvent evt) {

From d68eda0ec1af099c7538ab4e43936fddeae68d07 Mon Sep 17 00:00:00 2001
From: Nick Davis <nick.davis@narfindustries.com>
Date: Wed, 3 Feb 2016 16:52:12 -0500
Subject: [PATCH 37/68] converted ui fonts to derived fonts

---
 .../InterestingItemDefsPanel.form             | 190 +++++++++++++++++-
 .../InterestingItemDefsPanel.java             |  59 +++++-
 2 files changed, 238 insertions(+), 11 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/modules/interestingitems/InterestingItemDefsPanel.form b/Core/src/org/sleuthkit/autopsy/modules/interestingitems/InterestingItemDefsPanel.form
index b5d9288bee..6b92c6b39f 100755
--- a/Core/src/org/sleuthkit/autopsy/modules/interestingitems/InterestingItemDefsPanel.form
+++ b/Core/src/org/sleuthkit/autopsy/modules/interestingitems/InterestingItemDefsPanel.form
@@ -5,6 +5,13 @@
     <Component class="javax.swing.ButtonGroup" name="fileNameButtonGroup">
     </Component>
   </NonVisualComponents>
+  <Properties>
+    <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+      <FontInfo relative="true">
+        <Font bold="false" component="Form" property="font" relativeSize="false" size="11"/>
+      </FontInfo>
+    </Property>
+  </Properties>
   <AuxValues>
     <AuxValue name="FormSettings_autoResourcing" type="java.lang.Integer" value="1"/>
     <AuxValue name="FormSettings_autoSetComponentName" type="java.lang.Boolean" value="false"/>
@@ -38,10 +45,24 @@
   </Layout>
   <SubComponents>
     <Container class="javax.swing.JScrollPane" name="jScrollPane1">
+      <Properties>
+        <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+          <FontInfo relative="true">
+            <Font bold="false" component="jScrollPane1" property="font" relativeSize="false" size="11"/>
+          </FontInfo>
+        </Property>
+      </Properties>
 
       <Layout class="org.netbeans.modules.form.compat2.layouts.support.JScrollPaneSupportLayout"/>
       <SubComponents>
         <Container class="javax.swing.JPanel" name="jPanel1">
+          <Properties>
+            <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+              <FontInfo relative="true">
+                <Font bold="false" component="jPanel1" property="font" relativeSize="false" size="11"/>
+              </FontInfo>
+            </Property>
+          </Properties>
 
           <Layout>
             <DimensionLayout dim="0">
@@ -198,6 +219,11 @@
           <SubComponents>
             <Component class="javax.swing.JLabel" name="jLabel6">
               <Properties>
+                <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+                  <FontInfo relative="true">
+                    <Font bold="false" component="jLabel6" property="font" relativeSize="false" size="11"/>
+                  </FontInfo>
+                </Property>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
                   <ResourceString bundle="org/sleuthkit/autopsy/modules/interestingitems/Bundle.properties" key="InterestingItemDefsPanel.jLabel6.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
@@ -205,6 +231,11 @@
             </Component>
             <Component class="javax.swing.JButton" name="newRuleButton">
               <Properties>
+                <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+                  <FontInfo relative="true">
+                    <Font bold="false" component="newRuleButton" property="font" relativeSize="false" size="11"/>
+                  </FontInfo>
+                </Property>
                 <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
                   <Image iconType="3" name="/org/sleuthkit/autopsy/images/add16.png"/>
                 </Property>
@@ -219,6 +250,11 @@
             </Component>
             <Component class="javax.swing.JRadioButton" name="filesRadioButton">
               <Properties>
+                <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+                  <FontInfo relative="true">
+                    <Font bold="false" component="filesRadioButton" property="font" relativeSize="false" size="11"/>
+                  </FontInfo>
+                </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/modules/interestingitems/Bundle.properties" key="InterestingItemDefsPanel.filesRadioButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
@@ -228,6 +264,11 @@
             </Component>
             <Component class="javax.swing.JButton" name="editRuleButton">
               <Properties>
+                <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+                  <FontInfo relative="true">
+                    <Font bold="false" component="editRuleButton" property="font" relativeSize="false" size="11"/>
+                  </FontInfo>
+                </Property>
                 <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
                   <Image iconType="3" name="/org/sleuthkit/autopsy/images/edit16.png"/>
                 </Property>
@@ -242,12 +283,24 @@
             </Component>
             <Component class="javax.swing.JLabel" name="rulesListLabel">
               <Properties>
+                <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+                  <FontInfo relative="true">
+                    <Font bold="false" component="rulesListLabel" property="font" relativeSize="false" size="11"/>
+                  </FontInfo>
+                </Property>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
                   <ResourceString bundle="org/sleuthkit/autopsy/modules/interestingitems/Bundle.properties" key="InterestingItemDefsPanel.rulesListLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
               </Properties>
             </Component>
             <Container class="javax.swing.JScrollPane" name="rulesListScrollPane">
+              <Properties>
+                <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+                  <FontInfo relative="true">
+                    <Font bold="false" component="rulesListScrollPane" property="font" relativeSize="false" size="11"/>
+                  </FontInfo>
+                </Property>
+              </Properties>
               <AuxValues>
                 <AuxValue name="autoScrollPane" type="java.lang.Boolean" value="true"/>
               </AuxValues>
@@ -256,6 +309,11 @@
               <SubComponents>
                 <Component class="javax.swing.JList" name="rulesList">
                   <Properties>
+                    <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+                      <FontInfo relative="true">
+                        <Font bold="false" component="rulesList" property="font" relativeSize="false" size="11"/>
+                      </FontInfo>
+                    </Property>
                     <Property name="selectionMode" type="int" value="0"/>
                   </Properties>
                   <AuxValues>
@@ -265,6 +323,13 @@
               </SubComponents>
             </Container>
             <Container class="javax.swing.JScrollPane" name="setDescScrollPanel">
+              <Properties>
+                <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+                  <FontInfo relative="true">
+                    <Font bold="false" component="setDescScrollPanel" property="font" relativeSize="false" size="11"/>
+                  </FontInfo>
+                </Property>
+              </Properties>
               <AuxValues>
                 <AuxValue name="autoScrollPane" type="java.lang.Boolean" value="true"/>
               </AuxValues>
@@ -278,6 +343,11 @@
                       <Color blue="f0" green="f0" red="f0" type="rgb"/>
                     </Property>
                     <Property name="columns" type="int" value="20"/>
+                    <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+                      <FontInfo relative="true">
+                        <Font bold="false" component="setDescriptionTextArea" property="font" relativeSize="false" size="13"/>
+                      </FontInfo>
+                    </Property>
                     <Property name="lineWrap" type="boolean" value="true"/>
                     <Property name="rows" type="int" value="2"/>
                   </Properties>
@@ -286,6 +356,11 @@
             </Container>
             <Component class="javax.swing.JButton" name="editSetButton">
               <Properties>
+                <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+                  <FontInfo relative="true">
+                    <Font bold="false" component="editSetButton" property="font" relativeSize="false" size="11"/>
+                  </FontInfo>
+                </Property>
                 <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
                   <Image iconType="3" name="/org/sleuthkit/autopsy/images/edit16.png"/>
                 </Property>
@@ -299,6 +374,13 @@
               </Events>
             </Component>
             <Container class="javax.swing.JScrollPane" name="setsListScrollPane">
+              <Properties>
+                <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+                  <FontInfo relative="true">
+                    <Font bold="false" component="setsListScrollPane" property="font" relativeSize="false" size="11"/>
+                  </FontInfo>
+                </Property>
+              </Properties>
               <AuxValues>
                 <AuxValue name="autoScrollPane" type="java.lang.Boolean" value="true"/>
               </AuxValues>
@@ -307,6 +389,11 @@
               <SubComponents>
                 <Component class="javax.swing.JList" name="setsList">
                   <Properties>
+                    <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+                      <FontInfo relative="true">
+                        <Font bold="false" component="setsList" property="font" relativeSize="false" size="11"/>
+                      </FontInfo>
+                    </Property>
                     <Property name="selectionMode" type="int" value="0"/>
                   </Properties>
                   <AuxValues>
@@ -320,6 +407,11 @@
                 <Property name="buttonGroup" type="javax.swing.ButtonGroup" editor="org.netbeans.modules.form.RADComponent$ButtonGroupPropertyEditor">
                   <ComponentRef name="fileNameButtonGroup"/>
                 </Property>
+                <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+                  <FontInfo relative="true">
+                    <Font bold="false" component="fileNameExtensionRadioButton" property="font" relativeSize="false" size="11"/>
+                  </FontInfo>
+                </Property>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
                   <ResourceString bundle="org/sleuthkit/autopsy/modules/interestingitems/Bundle.properties" key="InterestingItemDefsPanel.fileNameExtensionRadioButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
@@ -328,6 +420,11 @@
             </Component>
             <Component class="javax.swing.JLabel" name="jLabel3">
               <Properties>
+                <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+                  <FontInfo relative="true">
+                    <Font bold="false" component="jLabel3" property="font" relativeSize="false" size="11"/>
+                  </FontInfo>
+                </Property>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
                   <ResourceString bundle="org/sleuthkit/autopsy/modules/interestingitems/Bundle.properties" key="InterestingItemDefsPanel.jLabel3.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
@@ -336,6 +433,11 @@
             <Component class="javax.swing.JTextField" name="fileNameTextField">
               <Properties>
                 <Property name="editable" type="boolean" value="false"/>
+                <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+                  <FontInfo relative="true">
+                    <Font bold="false" component="fileNameTextField" property="font" relativeSize="false" size="11"/>
+                  </FontInfo>
+                </Property>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
                   <ResourceString bundle="org/sleuthkit/autopsy/modules/interestingitems/Bundle.properties" key="InterestingItemDefsPanel.fileNameTextField.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
@@ -343,6 +445,11 @@
             </Component>
             <Component class="javax.swing.JLabel" name="jLabel5">
               <Properties>
+                <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+                  <FontInfo relative="true">
+                    <Font bold="false" component="jLabel5" property="font" relativeSize="false" size="11"/>
+                  </FontInfo>
+                </Property>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
                   <ResourceString bundle="org/sleuthkit/autopsy/modules/interestingitems/Bundle.properties" key="InterestingItemDefsPanel.jLabel5.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
@@ -353,6 +460,11 @@
                 <Property name="buttonGroup" type="javax.swing.ButtonGroup" editor="org.netbeans.modules.form.RADComponent$ButtonGroupPropertyEditor">
                   <ComponentRef name="fileNameButtonGroup"/>
                 </Property>
+                <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+                  <FontInfo relative="true">
+                    <Font bold="false" component="fileNameRadioButton" property="font" relativeSize="false" size="11"/>
+                  </FontInfo>
+                </Property>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
                   <ResourceString bundle="org/sleuthkit/autopsy/modules/interestingitems/Bundle.properties" key="InterestingItemDefsPanel.fileNameRadioButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
@@ -362,6 +474,11 @@
             <Component class="javax.swing.JTextField" name="rulePathFilterTextField">
               <Properties>
                 <Property name="editable" type="boolean" value="false"/>
+                <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+                  <FontInfo relative="true">
+                    <Font bold="false" component="rulePathFilterTextField" property="font" relativeSize="false" size="11"/>
+                  </FontInfo>
+                </Property>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
                   <ResourceString bundle="org/sleuthkit/autopsy/modules/interestingitems/Bundle.properties" key="InterestingItemDefsPanel.rulePathFilterTextField.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
@@ -369,6 +486,11 @@
             </Component>
             <Component class="javax.swing.JCheckBox" name="ignoreKnownFilesCheckbox">
               <Properties>
+                <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+                  <FontInfo relative="true">
+                    <Font bold="false" component="ignoreKnownFilesCheckbox" property="font" relativeSize="false" size="11"/>
+                  </FontInfo>
+                </Property>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
                   <ResourceString bundle="org/sleuthkit/autopsy/modules/interestingitems/Bundle.properties" key="InterestingItemDefsPanel.ignoreKnownFilesCheckbox.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
@@ -380,6 +502,11 @@
             </Component>
             <Component class="javax.swing.JCheckBox" name="fileNameRegexCheckbox">
               <Properties>
+                <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+                  <FontInfo relative="true">
+                    <Font bold="false" component="fileNameRegexCheckbox" property="font" relativeSize="false" size="11"/>
+                  </FontInfo>
+                </Property>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
                   <ResourceString bundle="org/sleuthkit/autopsy/modules/interestingitems/Bundle.properties" key="InterestingItemDefsPanel.fileNameRegexCheckbox.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
@@ -393,6 +520,11 @@
             </Component>
             <Component class="javax.swing.JLabel" name="setsListLabel">
               <Properties>
+                <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+                  <FontInfo relative="true">
+                    <Font bold="false" component="setsListLabel" property="font" relativeSize="false" size="11"/>
+                  </FontInfo>
+                </Property>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
                   <ResourceString bundle="org/sleuthkit/autopsy/modules/interestingitems/Bundle.properties" key="InterestingItemDefsPanel.setsListLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
@@ -400,6 +532,11 @@
             </Component>
             <Component class="javax.swing.JRadioButton" name="bothRadioButton">
               <Properties>
+                <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+                  <FontInfo relative="true">
+                    <Font bold="false" component="bothRadioButton" property="font" relativeSize="false" size="11"/>
+                  </FontInfo>
+                </Property>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
                   <ResourceString bundle="org/sleuthkit/autopsy/modules/interestingitems/Bundle.properties" key="InterestingItemDefsPanel.bothRadioButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
@@ -408,6 +545,11 @@
             </Component>
             <Component class="javax.swing.JButton" name="deleteSetButton">
               <Properties>
+                <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+                  <FontInfo relative="true">
+                    <Font bold="false" component="deleteSetButton" property="font" relativeSize="false" size="11"/>
+                  </FontInfo>
+                </Property>
                 <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
                   <Image iconType="3" name="/org/sleuthkit/autopsy/images/delete16.png"/>
                 </Property>
@@ -422,6 +564,11 @@
             </Component>
             <Component class="javax.swing.JButton" name="deleteRuleButton">
               <Properties>
+                <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+                  <FontInfo relative="true">
+                    <Font bold="false" component="deleteRuleButton" property="font" relativeSize="false" size="11"/>
+                  </FontInfo>
+                </Property>
                 <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
                   <Image iconType="3" name="/org/sleuthkit/autopsy/images/delete16.png"/>
                 </Property>
@@ -436,6 +583,11 @@
             </Component>
             <Component class="javax.swing.JButton" name="newSetButton">
               <Properties>
+                <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+                  <FontInfo relative="true">
+                    <Font bold="false" component="newSetButton" property="font" relativeSize="false" size="11"/>
+                  </FontInfo>
+                </Property>
                 <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
                   <Image iconType="3" name="/org/sleuthkit/autopsy/images/add16.png"/>
                 </Property>
@@ -449,6 +601,11 @@
             </Component>
             <Component class="javax.swing.JLabel" name="jLabel2">
               <Properties>
+                <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+                  <FontInfo relative="true">
+                    <Font bold="false" component="jLabel2" property="font" relativeSize="false" size="11"/>
+                  </FontInfo>
+                </Property>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
                   <ResourceString bundle="org/sleuthkit/autopsy/modules/interestingitems/Bundle.properties" key="InterestingItemDefsPanel.jLabel2.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
@@ -456,6 +613,11 @@
             </Component>
             <Component class="javax.swing.JRadioButton" name="dirsRadioButton">
               <Properties>
+                <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+                  <FontInfo relative="true">
+                    <Font bold="false" component="dirsRadioButton" property="font" relativeSize="false" size="11"/>
+                  </FontInfo>
+                </Property>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
                   <ResourceString bundle="org/sleuthkit/autopsy/modules/interestingitems/Bundle.properties" key="InterestingItemDefsPanel.dirsRadioButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
@@ -467,6 +629,11 @@
             </Component>
             <Component class="javax.swing.JLabel" name="jLabel1">
               <Properties>
+                <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+                  <FontInfo relative="true">
+                    <Font bold="false" component="jLabel1" property="font" relativeSize="false" size="11"/>
+                  </FontInfo>
+                </Property>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
                   <ResourceString bundle="org/sleuthkit/autopsy/modules/interestingitems/Bundle.properties" key="InterestingItemDefsPanel.jLabel1.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
@@ -474,6 +641,11 @@
             </Component>
             <Component class="javax.swing.JLabel" name="jLabel4">
               <Properties>
+                <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+                  <FontInfo relative="true">
+                    <Font bold="false" component="jLabel4" property="font" relativeSize="false" size="11"/>
+                  </FontInfo>
+                </Property>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
                   <ResourceString bundle="org/sleuthkit/autopsy/modules/interestingitems/Bundle.properties" key="InterestingItemDefsPanel.jLabel4.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
@@ -481,6 +653,11 @@
             </Component>
             <Component class="javax.swing.JCheckBox" name="rulePathFilterRegexCheckBox">
               <Properties>
+                <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+                  <FontInfo relative="true">
+                    <Font bold="false" component="rulePathFilterRegexCheckBox" property="font" relativeSize="false" size="11"/>
+                  </FontInfo>
+                </Property>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
                   <ResourceString bundle="org/sleuthkit/autopsy/modules/interestingitems/Bundle.properties" key="InterestingItemDefsPanel.rulePathFilterRegexCheckBox.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
@@ -488,6 +665,13 @@
               </Properties>
             </Component>
             <Container class="javax.swing.JScrollPane" name="jScrollPane2">
+              <Properties>
+                <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+                  <FontInfo relative="true">
+                    <Font bold="false" component="jScrollPane2" property="font" relativeSize="false" size="11"/>
+                  </FontInfo>
+                </Property>
+              </Properties>
               <AuxValues>
                 <AuxValue name="autoScrollPane" type="java.lang.Boolean" value="true"/>
               </AuxValues>
@@ -501,8 +685,10 @@
                       <Color blue="f0" green="f0" red="f0" type="rgb"/>
                     </Property>
                     <Property name="columns" type="int" value="20"/>
-                    <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
-                      <Font name="Tahoma" size="11" style="0"/>
+                    <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+                      <FontInfo relative="true">
+                        <Font bold="false" component="jTextArea1" property="font" relativeSize="false" size="11"/>
+                      </FontInfo>
                     </Property>
                     <Property name="lineWrap" type="boolean" value="true"/>
                     <Property name="rows" type="int" value="3"/>
diff --git a/Core/src/org/sleuthkit/autopsy/modules/interestingitems/InterestingItemDefsPanel.java b/Core/src/org/sleuthkit/autopsy/modules/interestingitems/InterestingItemDefsPanel.java
index 6e4cd91148..caa6098f55 100755
--- a/Core/src/org/sleuthkit/autopsy/modules/interestingitems/InterestingItemDefsPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/modules/interestingitems/InterestingItemDefsPanel.java
@@ -388,12 +388,12 @@ final class InterestingItemDefsPanel extends IngestModuleGlobalSettingsPanel imp
         editRuleButton = new javax.swing.JButton();
         rulesListLabel = new javax.swing.JLabel();
         rulesListScrollPane = new javax.swing.JScrollPane();
-        rulesList = new javax.swing.JList<FilesSet.Rule>();
+        rulesList = new javax.swing.JList<>();
         setDescScrollPanel = new javax.swing.JScrollPane();
         setDescriptionTextArea = new javax.swing.JTextArea();
         editSetButton = new javax.swing.JButton();
         setsListScrollPane = new javax.swing.JScrollPane();
-        setsList = new javax.swing.JList<FilesSet>();
+        setsList = new javax.swing.JList<>();
         fileNameExtensionRadioButton = new javax.swing.JRadioButton();
         jLabel3 = new javax.swing.JLabel();
         fileNameTextField = new javax.swing.JTextField();
@@ -416,9 +416,17 @@ final class InterestingItemDefsPanel extends IngestModuleGlobalSettingsPanel imp
         jScrollPane2 = new javax.swing.JScrollPane();
         jTextArea1 = new javax.swing.JTextArea();
 
+        setFont(getFont().deriveFont(getFont().getStyle() & ~java.awt.Font.BOLD, 11));
+
+        jScrollPane1.setFont(jScrollPane1.getFont().deriveFont(jScrollPane1.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
+
+        jPanel1.setFont(jPanel1.getFont().deriveFont(jPanel1.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
+
+        jLabel6.setFont(jLabel6.getFont().deriveFont(jLabel6.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         org.openide.awt.Mnemonics.setLocalizedText(jLabel6, org.openide.util.NbBundle.getMessage(InterestingItemDefsPanel.class, "InterestingItemDefsPanel.jLabel6.text")); // NOI18N
 
-        newRuleButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/images/add16.png"))); // NOI18N NON-NLS
+        newRuleButton.setFont(newRuleButton.getFont().deriveFont(newRuleButton.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
+        newRuleButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/images/add16.png"))); // NOI18N
         org.openide.awt.Mnemonics.setLocalizedText(newRuleButton, org.openide.util.NbBundle.getMessage(InterestingItemDefsPanel.class, "InterestingItemDefsPanel.newRuleButton.text")); // NOI18N
         newRuleButton.setEnabled(false);
         newRuleButton.addActionListener(new java.awt.event.ActionListener() {
@@ -427,11 +435,13 @@ final class InterestingItemDefsPanel extends IngestModuleGlobalSettingsPanel imp
             }
         });
 
+        filesRadioButton.setFont(filesRadioButton.getFont().deriveFont(filesRadioButton.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         filesRadioButton.setSelected(true);
         org.openide.awt.Mnemonics.setLocalizedText(filesRadioButton, org.openide.util.NbBundle.getMessage(InterestingItemDefsPanel.class, "InterestingItemDefsPanel.filesRadioButton.text")); // NOI18N
         filesRadioButton.setEnabled(false);
 
-        editRuleButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/images/edit16.png"))); // NOI18N NON-NLS
+        editRuleButton.setFont(editRuleButton.getFont().deriveFont(editRuleButton.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
+        editRuleButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/images/edit16.png"))); // NOI18N
         org.openide.awt.Mnemonics.setLocalizedText(editRuleButton, org.openide.util.NbBundle.getMessage(InterestingItemDefsPanel.class, "InterestingItemDefsPanel.editRuleButton.text")); // NOI18N
         editRuleButton.setEnabled(false);
         editRuleButton.addActionListener(new java.awt.event.ActionListener() {
@@ -440,19 +450,27 @@ final class InterestingItemDefsPanel extends IngestModuleGlobalSettingsPanel imp
             }
         });
 
+        rulesListLabel.setFont(rulesListLabel.getFont().deriveFont(rulesListLabel.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         org.openide.awt.Mnemonics.setLocalizedText(rulesListLabel, org.openide.util.NbBundle.getMessage(InterestingItemDefsPanel.class, "InterestingItemDefsPanel.rulesListLabel.text")); // NOI18N
 
+        rulesListScrollPane.setFont(rulesListScrollPane.getFont().deriveFont(rulesListScrollPane.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
+
+        rulesList.setFont(rulesList.getFont().deriveFont(rulesList.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         rulesList.setSelectionMode(javax.swing.ListSelectionModel.SINGLE_SELECTION);
         rulesListScrollPane.setViewportView(rulesList);
 
+        setDescScrollPanel.setFont(setDescScrollPanel.getFont().deriveFont(setDescScrollPanel.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
+
         setDescriptionTextArea.setEditable(false);
         setDescriptionTextArea.setBackground(new java.awt.Color(240, 240, 240));
         setDescriptionTextArea.setColumns(20);
+        setDescriptionTextArea.setFont(setDescriptionTextArea.getFont().deriveFont(setDescriptionTextArea.getFont().getStyle() & ~java.awt.Font.BOLD, 13));
         setDescriptionTextArea.setLineWrap(true);
         setDescriptionTextArea.setRows(2);
         setDescScrollPanel.setViewportView(setDescriptionTextArea);
 
-        editSetButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/images/edit16.png"))); // NOI18N NON-NLS
+        editSetButton.setFont(editSetButton.getFont().deriveFont(editSetButton.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
+        editSetButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/images/edit16.png"))); // NOI18N
         org.openide.awt.Mnemonics.setLocalizedText(editSetButton, org.openide.util.NbBundle.getMessage(InterestingItemDefsPanel.class, "InterestingItemDefsPanel.editSetButton.text")); // NOI18N
         editSetButton.setEnabled(false);
         editSetButton.addActionListener(new java.awt.event.ActionListener() {
@@ -461,27 +479,37 @@ final class InterestingItemDefsPanel extends IngestModuleGlobalSettingsPanel imp
             }
         });
 
+        setsListScrollPane.setFont(setsListScrollPane.getFont().deriveFont(setsListScrollPane.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
+
+        setsList.setFont(setsList.getFont().deriveFont(setsList.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         setsList.setSelectionMode(javax.swing.ListSelectionModel.SINGLE_SELECTION);
         setsListScrollPane.setViewportView(setsList);
 
         fileNameButtonGroup.add(fileNameExtensionRadioButton);
+        fileNameExtensionRadioButton.setFont(fileNameExtensionRadioButton.getFont().deriveFont(fileNameExtensionRadioButton.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         org.openide.awt.Mnemonics.setLocalizedText(fileNameExtensionRadioButton, org.openide.util.NbBundle.getMessage(InterestingItemDefsPanel.class, "InterestingItemDefsPanel.fileNameExtensionRadioButton.text")); // NOI18N
         fileNameExtensionRadioButton.setEnabled(false);
 
+        jLabel3.setFont(jLabel3.getFont().deriveFont(jLabel3.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         org.openide.awt.Mnemonics.setLocalizedText(jLabel3, org.openide.util.NbBundle.getMessage(InterestingItemDefsPanel.class, "InterestingItemDefsPanel.jLabel3.text")); // NOI18N
 
         fileNameTextField.setEditable(false);
+        fileNameTextField.setFont(fileNameTextField.getFont().deriveFont(fileNameTextField.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         fileNameTextField.setText(org.openide.util.NbBundle.getMessage(InterestingItemDefsPanel.class, "InterestingItemDefsPanel.fileNameTextField.text")); // NOI18N
 
+        jLabel5.setFont(jLabel5.getFont().deriveFont(jLabel5.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         org.openide.awt.Mnemonics.setLocalizedText(jLabel5, org.openide.util.NbBundle.getMessage(InterestingItemDefsPanel.class, "InterestingItemDefsPanel.jLabel5.text")); // NOI18N
 
         fileNameButtonGroup.add(fileNameRadioButton);
+        fileNameRadioButton.setFont(fileNameRadioButton.getFont().deriveFont(fileNameRadioButton.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         org.openide.awt.Mnemonics.setLocalizedText(fileNameRadioButton, org.openide.util.NbBundle.getMessage(InterestingItemDefsPanel.class, "InterestingItemDefsPanel.fileNameRadioButton.text")); // NOI18N
         fileNameRadioButton.setEnabled(false);
 
         rulePathFilterTextField.setEditable(false);
+        rulePathFilterTextField.setFont(rulePathFilterTextField.getFont().deriveFont(rulePathFilterTextField.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         rulePathFilterTextField.setText(org.openide.util.NbBundle.getMessage(InterestingItemDefsPanel.class, "InterestingItemDefsPanel.rulePathFilterTextField.text")); // NOI18N
 
+        ignoreKnownFilesCheckbox.setFont(ignoreKnownFilesCheckbox.getFont().deriveFont(ignoreKnownFilesCheckbox.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         org.openide.awt.Mnemonics.setLocalizedText(ignoreKnownFilesCheckbox, org.openide.util.NbBundle.getMessage(InterestingItemDefsPanel.class, "InterestingItemDefsPanel.ignoreKnownFilesCheckbox.text")); // NOI18N
         ignoreKnownFilesCheckbox.setEnabled(false);
         ignoreKnownFilesCheckbox.addActionListener(new java.awt.event.ActionListener() {
@@ -490,17 +518,21 @@ final class InterestingItemDefsPanel extends IngestModuleGlobalSettingsPanel imp
             }
         });
 
+        fileNameRegexCheckbox.setFont(fileNameRegexCheckbox.getFont().deriveFont(fileNameRegexCheckbox.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         org.openide.awt.Mnemonics.setLocalizedText(fileNameRegexCheckbox, org.openide.util.NbBundle.getMessage(InterestingItemDefsPanel.class, "InterestingItemDefsPanel.fileNameRegexCheckbox.text")); // NOI18N
         fileNameRegexCheckbox.setEnabled(false);
 
         separator.setOrientation(javax.swing.SwingConstants.VERTICAL);
 
+        setsListLabel.setFont(setsListLabel.getFont().deriveFont(setsListLabel.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         org.openide.awt.Mnemonics.setLocalizedText(setsListLabel, org.openide.util.NbBundle.getMessage(InterestingItemDefsPanel.class, "InterestingItemDefsPanel.setsListLabel.text")); // NOI18N
 
+        bothRadioButton.setFont(bothRadioButton.getFont().deriveFont(bothRadioButton.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         org.openide.awt.Mnemonics.setLocalizedText(bothRadioButton, org.openide.util.NbBundle.getMessage(InterestingItemDefsPanel.class, "InterestingItemDefsPanel.bothRadioButton.text")); // NOI18N
         bothRadioButton.setEnabled(false);
 
-        deleteSetButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/images/delete16.png"))); // NOI18N NON-NLS
+        deleteSetButton.setFont(deleteSetButton.getFont().deriveFont(deleteSetButton.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
+        deleteSetButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/images/delete16.png"))); // NOI18N
         org.openide.awt.Mnemonics.setLocalizedText(deleteSetButton, org.openide.util.NbBundle.getMessage(InterestingItemDefsPanel.class, "InterestingItemDefsPanel.deleteSetButton.text")); // NOI18N
         deleteSetButton.setEnabled(false);
         deleteSetButton.addActionListener(new java.awt.event.ActionListener() {
@@ -509,7 +541,8 @@ final class InterestingItemDefsPanel extends IngestModuleGlobalSettingsPanel imp
             }
         });
 
-        deleteRuleButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/images/delete16.png"))); // NOI18N NON-NLS
+        deleteRuleButton.setFont(deleteRuleButton.getFont().deriveFont(deleteRuleButton.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
+        deleteRuleButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/images/delete16.png"))); // NOI18N
         org.openide.awt.Mnemonics.setLocalizedText(deleteRuleButton, org.openide.util.NbBundle.getMessage(InterestingItemDefsPanel.class, "InterestingItemDefsPanel.deleteRuleButton.text")); // NOI18N
         deleteRuleButton.setEnabled(false);
         deleteRuleButton.addActionListener(new java.awt.event.ActionListener() {
@@ -518,7 +551,8 @@ final class InterestingItemDefsPanel extends IngestModuleGlobalSettingsPanel imp
             }
         });
 
-        newSetButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/images/add16.png"))); // NOI18N NON-NLS
+        newSetButton.setFont(newSetButton.getFont().deriveFont(newSetButton.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
+        newSetButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/images/add16.png"))); // NOI18N
         org.openide.awt.Mnemonics.setLocalizedText(newSetButton, org.openide.util.NbBundle.getMessage(InterestingItemDefsPanel.class, "InterestingItemDefsPanel.newSetButton.text")); // NOI18N
         newSetButton.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
@@ -526,8 +560,10 @@ final class InterestingItemDefsPanel extends IngestModuleGlobalSettingsPanel imp
             }
         });
 
+        jLabel2.setFont(jLabel2.getFont().deriveFont(jLabel2.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         org.openide.awt.Mnemonics.setLocalizedText(jLabel2, org.openide.util.NbBundle.getMessage(InterestingItemDefsPanel.class, "InterestingItemDefsPanel.jLabel2.text")); // NOI18N
 
+        dirsRadioButton.setFont(dirsRadioButton.getFont().deriveFont(dirsRadioButton.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         org.openide.awt.Mnemonics.setLocalizedText(dirsRadioButton, org.openide.util.NbBundle.getMessage(InterestingItemDefsPanel.class, "InterestingItemDefsPanel.dirsRadioButton.text")); // NOI18N
         dirsRadioButton.setEnabled(false);
         dirsRadioButton.addActionListener(new java.awt.event.ActionListener() {
@@ -536,17 +572,22 @@ final class InterestingItemDefsPanel extends IngestModuleGlobalSettingsPanel imp
             }
         });
 
+        jLabel1.setFont(jLabel1.getFont().deriveFont(jLabel1.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         org.openide.awt.Mnemonics.setLocalizedText(jLabel1, org.openide.util.NbBundle.getMessage(InterestingItemDefsPanel.class, "InterestingItemDefsPanel.jLabel1.text")); // NOI18N
 
+        jLabel4.setFont(jLabel4.getFont().deriveFont(jLabel4.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         org.openide.awt.Mnemonics.setLocalizedText(jLabel4, org.openide.util.NbBundle.getMessage(InterestingItemDefsPanel.class, "InterestingItemDefsPanel.jLabel4.text")); // NOI18N
 
+        rulePathFilterRegexCheckBox.setFont(rulePathFilterRegexCheckBox.getFont().deriveFont(rulePathFilterRegexCheckBox.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         org.openide.awt.Mnemonics.setLocalizedText(rulePathFilterRegexCheckBox, org.openide.util.NbBundle.getMessage(InterestingItemDefsPanel.class, "InterestingItemDefsPanel.rulePathFilterRegexCheckBox.text")); // NOI18N
         rulePathFilterRegexCheckBox.setEnabled(false);
 
+        jScrollPane2.setFont(jScrollPane2.getFont().deriveFont(jScrollPane2.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
+
         jTextArea1.setEditable(false);
         jTextArea1.setBackground(new java.awt.Color(240, 240, 240));
         jTextArea1.setColumns(20);
-        jTextArea1.setFont(jTextArea1.getFont().deriveFont(Font.PLAIN, 11));
+        jTextArea1.setFont(jTextArea1.getFont().deriveFont(jTextArea1.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         jTextArea1.setLineWrap(true);
         jTextArea1.setRows(3);
         jTextArea1.setText(org.openide.util.NbBundle.getMessage(InterestingItemDefsPanel.class, "InterestingItemDefsPanel.jTextArea1.text")); // NOI18N

From 6428cf20b30426eef34331cba718f4409675ed49 Mon Sep 17 00:00:00 2001
From: Nick Davis <nick.davis@narfindustries.com>
Date: Wed, 3 Feb 2016 17:01:41 -0500
Subject: [PATCH 38/68] converted ui fonts to derived

---
 .../DefaultReportConfigurationPanel.form      | 13 +++++--
 .../DefaultReportConfigurationPanel.java      |  4 ++-
 .../autopsy/report/ReportGenerationPanel.form | 31 +++++++++++++++--
 .../autopsy/report/ReportGenerationPanel.java |  7 +++-
 .../autopsy/report/ReportProgressPanel.form   | 34 ++++++++++++++++---
 .../autopsy/report/ReportProgressPanel.java   |  9 +++--
 6 files changed, 86 insertions(+), 12 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/report/DefaultReportConfigurationPanel.form b/Core/src/org/sleuthkit/autopsy/report/DefaultReportConfigurationPanel.form
index e6863336df..2ece2224f5 100644
--- a/Core/src/org/sleuthkit/autopsy/report/DefaultReportConfigurationPanel.form
+++ b/Core/src/org/sleuthkit/autopsy/report/DefaultReportConfigurationPanel.form
@@ -1,6 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 
 <Form version="1.5" maxVersion="1.8" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">
+  <Properties>
+    <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+      <FontInfo relative="true">
+        <Font bold="false" component="Form" property="font" relativeSize="false" size="11"/>
+      </FontInfo>
+    </Property>
+  </Properties>
   <AuxValues>
     <AuxValue name="FormSettings_autoResourcing" type="java.lang.Integer" value="1"/>
     <AuxValue name="FormSettings_autoSetComponentName" type="java.lang.Boolean" value="false"/>
@@ -36,8 +43,10 @@
   <SubComponents>
     <Component class="javax.swing.JLabel" name="infoLabel">
       <Properties>
-        <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
-          <Font name="Tahoma" size="11" style="2"/>
+        <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+          <FontInfo relative="true">
+            <Font bold="false" component="infoLabel" italic="true" property="font" relativeSize="false" size="11"/>
+          </FontInfo>
         </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
           <ResourceString bundle="org/sleuthkit/autopsy/report/Bundle.properties" key="DefaultReportConfigurationPanel.infoLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
diff --git a/Core/src/org/sleuthkit/autopsy/report/DefaultReportConfigurationPanel.java b/Core/src/org/sleuthkit/autopsy/report/DefaultReportConfigurationPanel.java
index 2728abf784..ad1ce529dc 100644
--- a/Core/src/org/sleuthkit/autopsy/report/DefaultReportConfigurationPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/report/DefaultReportConfigurationPanel.java
@@ -43,7 +43,9 @@ public class DefaultReportConfigurationPanel extends javax.swing.JPanel {
 
         infoLabel = new javax.swing.JLabel();
 
-        infoLabel.setFont(infoLabel.getFont().deriveFont(Font.ITALIC, 11));
+        setFont(getFont().deriveFont(getFont().getStyle() & ~java.awt.Font.BOLD, 11));
+
+        infoLabel.setFont(infoLabel.getFont().deriveFont((infoLabel.getFont().getStyle() | java.awt.Font.ITALIC) & ~java.awt.Font.BOLD, 11));
         org.openide.awt.Mnemonics.setLocalizedText(infoLabel, org.openide.util.NbBundle.getMessage(DefaultReportConfigurationPanel.class, "DefaultReportConfigurationPanel.infoLabel.text")); // NOI18N
 
         javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportGenerationPanel.form b/Core/src/org/sleuthkit/autopsy/report/ReportGenerationPanel.form
index db7adcef79..f7da786aa4 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportGenerationPanel.form
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportGenerationPanel.form
@@ -2,6 +2,11 @@
 
 <Form version="1.5" maxVersion="1.8" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">
   <Properties>
+    <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+      <FontInfo relative="true">
+        <Font bold="false" component="Form" property="font" relativeSize="false" size="11"/>
+      </FontInfo>
+    </Property>
     <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
       <Dimension value="[700, 400]"/>
     </Property>
@@ -66,6 +71,11 @@
   <SubComponents>
     <Component class="javax.swing.JButton" name="closeButton">
       <Properties>
+        <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+          <FontInfo relative="true">
+            <Font bold="false" component="closeButton" property="font" relativeSize="false" size="11"/>
+          </FontInfo>
+        </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
           <ResourceString bundle="org/sleuthkit/autopsy/report/Bundle.properties" key="ReportGenerationPanel.closeButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
@@ -76,6 +86,11 @@
     </Component>
     <Component class="javax.swing.JButton" name="cancelButton">
       <Properties>
+        <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+          <FontInfo relative="true">
+            <Font bold="false" component="cancelButton" property="font" relativeSize="false" size="11"/>
+          </FontInfo>
+        </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
           <ResourceString bundle="org/sleuthkit/autopsy/report/Bundle.properties" key="ReportGenerationPanel.cancelButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
@@ -97,12 +112,22 @@
           </Border>
         </Property>
         <Property name="verticalScrollBarPolicy" type="int" value="22"/>
+        <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+          <FontInfo relative="true">
+            <Font bold="false" component="reportScrollPane" property="font" relativeSize="false" size="11"/>
+          </FontInfo>
+        </Property>
       </Properties>
 
       <Layout class="org.netbeans.modules.form.compat2.layouts.support.JScrollPaneSupportLayout"/>
       <SubComponents>
         <Container class="javax.swing.JPanel" name="reportPanel">
           <Properties>
+            <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+              <FontInfo relative="true">
+                <Font bold="false" component="reportPanel" property="font" relativeSize="false" size="11"/>
+              </FontInfo>
+            </Property>
             <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
               <Dimension value="[600, 400]"/>
             </Property>
@@ -125,8 +150,10 @@
     </Container>
     <Component class="javax.swing.JLabel" name="titleLabel">
       <Properties>
-        <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
-          <Font name="Tahoma" size="11" style="1"/>
+        <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+          <FontInfo relative="true">
+            <Font bold="true" component="titleLabel" property="font" relativeSize="false" size="11"/>
+          </FontInfo>
         </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
           <ResourceString bundle="org/sleuthkit/autopsy/report/Bundle.properties" key="ReportGenerationPanel.titleLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportGenerationPanel.java b/Core/src/org/sleuthkit/autopsy/report/ReportGenerationPanel.java
index 064f39f044..debc77e343 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportGenerationPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportGenerationPanel.java
@@ -122,8 +122,10 @@ class ReportGenerationPanel extends javax.swing.JPanel {
         titleSeparator = new javax.swing.JSeparator();
         optionSeparator = new javax.swing.JSeparator();
 
+        setFont(getFont().deriveFont(getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         setPreferredSize(new java.awt.Dimension(700, 400));
 
+        closeButton.setFont(closeButton.getFont().deriveFont(closeButton.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         org.openide.awt.Mnemonics.setLocalizedText(closeButton, org.openide.util.NbBundle.getMessage(ReportGenerationPanel.class, "ReportGenerationPanel.closeButton.text")); // NOI18N
         closeButton.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
@@ -131,6 +133,7 @@ class ReportGenerationPanel extends javax.swing.JPanel {
             }
         });
 
+        cancelButton.setFont(cancelButton.getFont().deriveFont(cancelButton.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         org.openide.awt.Mnemonics.setLocalizedText(cancelButton, org.openide.util.NbBundle.getMessage(ReportGenerationPanel.class, "ReportGenerationPanel.cancelButton.text")); // NOI18N
         cancelButton.setActionCommand(org.openide.util.NbBundle.getMessage(ReportGenerationPanel.class, "ReportGenerationPanel.cancelButton.actionCommand")); // NOI18N
         cancelButton.addActionListener(new java.awt.event.ActionListener() {
@@ -141,7 +144,9 @@ class ReportGenerationPanel extends javax.swing.JPanel {
 
         reportScrollPane.setBorder(javax.swing.BorderFactory.createLineBorder(java.awt.SystemColor.activeCaptionBorder));
         reportScrollPane.setVerticalScrollBarPolicy(javax.swing.ScrollPaneConstants.VERTICAL_SCROLLBAR_ALWAYS);
+        reportScrollPane.setFont(reportScrollPane.getFont().deriveFont(reportScrollPane.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
 
+        reportPanel.setFont(reportPanel.getFont().deriveFont(reportPanel.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         reportPanel.setPreferredSize(new java.awt.Dimension(600, 400));
 
         javax.swing.GroupLayout reportPanelLayout = new javax.swing.GroupLayout(reportPanel);
@@ -157,7 +162,7 @@ class ReportGenerationPanel extends javax.swing.JPanel {
 
         reportScrollPane.setViewportView(reportPanel);
 
-        titleLabel.setFont(titleLabel.getFont().deriveFont(Font.BOLD, 11));
+        titleLabel.setFont(titleLabel.getFont().deriveFont(titleLabel.getFont().getStyle() | java.awt.Font.BOLD, 11));
         org.openide.awt.Mnemonics.setLocalizedText(titleLabel, org.openide.util.NbBundle.getMessage(ReportGenerationPanel.class, "ReportGenerationPanel.titleLabel.text")); // NOI18N
 
         titleSeparator.setForeground(new java.awt.Color(0, 0, 0));
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportProgressPanel.form b/Core/src/org/sleuthkit/autopsy/report/ReportProgressPanel.form
index f45e8810a7..b490520e46 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportProgressPanel.form
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportProgressPanel.form
@@ -2,6 +2,11 @@
 
 <Form version="1.5" maxVersion="1.8" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">
   <Properties>
+    <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+      <FontInfo relative="true">
+        <Font bold="false" component="Form" property="font" relativeSize="false" size="11"/>
+      </FontInfo>
+    </Property>
     <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
       <Dimension value="[486, 68]"/>
     </Property>
@@ -61,11 +66,20 @@
   </Layout>
   <SubComponents>
     <Component class="javax.swing.JProgressBar" name="reportProgressBar">
+      <Properties>
+        <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+          <FontInfo relative="true">
+            <Font bold="false" component="reportProgressBar" property="font" relativeSize="false" size="11"/>
+          </FontInfo>
+        </Property>
+      </Properties>
     </Component>
     <Component class="javax.swing.JLabel" name="reportLabel">
       <Properties>
-        <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
-          <Font name="Tahoma" size="11" style="1"/>
+        <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+          <FontInfo relative="true">
+            <Font bold="true" component="reportLabel" property="font" relativeSize="false" size="11"/>
+          </FontInfo>
         </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
           <ResourceString bundle="org/sleuthkit/autopsy/report/Bundle.properties" key="ReportProgressPanel.reportLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
@@ -74,6 +88,11 @@
     </Component>
     <Component class="javax.swing.JLabel" name="pathLabel">
       <Properties>
+        <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+          <FontInfo relative="true">
+            <Font bold="false" component="pathLabel" property="font" relativeSize="false" size="11"/>
+          </FontInfo>
+        </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
           <ResourceString bundle="org/sleuthkit/autopsy/report/Bundle.properties" key="ReportProgressPanel.pathLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
@@ -81,8 +100,10 @@
     </Component>
     <Component class="javax.swing.JLabel" name="processingLabel">
       <Properties>
-        <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
-          <Font name="Tahoma" size="10" style="2"/>
+        <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+          <FontInfo relative="true">
+            <Font bold="false" component="processingLabel" italic="true" property="font" relativeSize="false" size="10"/>
+          </FontInfo>
         </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
           <ResourceString bundle="org/sleuthkit/autopsy/report/Bundle.properties" key="ReportProgressPanel.processingLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
@@ -91,6 +112,11 @@
     </Component>
     <Component class="javax.swing.JLabel" name="separationLabel">
       <Properties>
+        <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+          <FontInfo relative="true">
+            <Font bold="false" component="separationLabel" property="font" relativeSize="false" size="11"/>
+          </FontInfo>
+        </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
           <ResourceString bundle="org/sleuthkit/autopsy/report/Bundle.properties" key="ReportProgressPanel.separationLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportProgressPanel.java b/Core/src/org/sleuthkit/autopsy/report/ReportProgressPanel.java
index 26776ee02e..e51a62de0e 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportProgressPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportProgressPanel.java
@@ -306,16 +306,21 @@ public class ReportProgressPanel extends javax.swing.JPanel {
         processingLabel = new javax.swing.JLabel();
         separationLabel = new javax.swing.JLabel();
 
+        setFont(getFont().deriveFont(getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         setMinimumSize(new java.awt.Dimension(486, 68));
 
-        reportLabel.setFont(reportLabel.getFont().deriveFont(Font.BOLD, 11));
+        reportProgressBar.setFont(reportProgressBar.getFont().deriveFont(reportProgressBar.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
+
+        reportLabel.setFont(reportLabel.getFont().deriveFont(reportLabel.getFont().getStyle() | java.awt.Font.BOLD, 11));
         org.openide.awt.Mnemonics.setLocalizedText(reportLabel, org.openide.util.NbBundle.getMessage(ReportProgressPanel.class, "ReportProgressPanel.reportLabel.text")); // NOI18N
 
+        pathLabel.setFont(pathLabel.getFont().deriveFont(pathLabel.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         org.openide.awt.Mnemonics.setLocalizedText(pathLabel, org.openide.util.NbBundle.getMessage(ReportProgressPanel.class, "ReportProgressPanel.pathLabel.text")); // NOI18N
 
-        processingLabel.setFont(processingLabel.getFont().deriveFont(Font.ITALIC, 10));
+        processingLabel.setFont(processingLabel.getFont().deriveFont((processingLabel.getFont().getStyle() | java.awt.Font.ITALIC) & ~java.awt.Font.BOLD, 10));
         org.openide.awt.Mnemonics.setLocalizedText(processingLabel, org.openide.util.NbBundle.getMessage(ReportProgressPanel.class, "ReportProgressPanel.processingLabel.text")); // NOI18N
 
+        separationLabel.setFont(separationLabel.getFont().deriveFont(separationLabel.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         org.openide.awt.Mnemonics.setLocalizedText(separationLabel, org.openide.util.NbBundle.getMessage(ReportProgressPanel.class, "ReportProgressPanel.separationLabel.text")); // NOI18N
 
         javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);

From 5ec9df709fcc003a7b8f9db2f7190a31bb1c532e Mon Sep 17 00:00:00 2001
From: Nick Davis <nick.davis@narfindustries.com>
Date: Wed, 3 Feb 2016 17:10:37 -0500
Subject: [PATCH 39/68] converted ui fonts to derived

---
 .../ImageGalleryOptionsPanel.form             | 41 ++++++++++++++++---
 .../ImageGalleryOptionsPanel.java             | 16 +++++---
 2 files changed, 47 insertions(+), 10 deletions(-)

diff --git a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/ImageGalleryOptionsPanel.form b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/ImageGalleryOptionsPanel.form
index 52fed374cc..1a158a2ab7 100644
--- a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/ImageGalleryOptionsPanel.form
+++ b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/ImageGalleryOptionsPanel.form
@@ -1,6 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 
 <Form version="1.5" maxVersion="1.9" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">
+  <Properties>
+    <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+      <FontInfo relative="true">
+        <Font bold="false" component="Form" property="font" relativeSize="false" size="11"/>
+      </FontInfo>
+    </Property>
+  </Properties>
   <AuxValues>
     <AuxValue name="FormSettings_autoResourcing" type="java.lang.Integer" value="1"/>
     <AuxValue name="FormSettings_autoSetComponentName" type="java.lang.Boolean" value="false"/>
@@ -63,6 +70,11 @@
   <SubComponents>
     <Component class="javax.swing.JCheckBox" name="enabledByDefaultBox">
       <Properties>
+        <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+          <FontInfo relative="true">
+            <Font bold="false" component="enabledByDefaultBox" property="font" relativeSize="false" size="11"/>
+          </FontInfo>
+        </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
           <ResourceString bundle="org/sleuthkit/autopsy/imagegallery/Bundle.properties" key="ImageGalleryOptionsPanel.enabledByDefaultBox.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
@@ -73,6 +85,11 @@
     </Component>
     <Component class="javax.swing.JCheckBox" name="enabledForCaseBox">
       <Properties>
+        <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+          <FontInfo relative="true">
+            <Font bold="false" component="enabledForCaseBox" property="font" relativeSize="false" size="11"/>
+          </FontInfo>
+        </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
           <ResourceString bundle="org/sleuthkit/autopsy/imagegallery/Bundle.properties" key="ImageGalleryOptionsPanel.enabledForCaseBox.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
@@ -86,6 +103,11 @@
     </Component>
     <Component class="javax.swing.JLabel" name="descriptionLabel">
       <Properties>
+        <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+          <FontInfo relative="true">
+            <Font bold="false" component="descriptionLabel" property="font" relativeSize="false" size="11"/>
+          </FontInfo>
+        </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
           <ResourceString bundle="org/sleuthkit/autopsy/imagegallery/Bundle.properties" key="ImageGalleryOptionsPanel.descriptionLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
@@ -97,8 +119,10 @@
           <Color blue="f0" green="f0" red="f0" type="rgb"/>
         </Property>
         <Property name="columns" type="int" value="20"/>
-        <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
-          <Font name="Tahoma" size="11" style="0"/>
+        <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+          <FontInfo relative="true">
+            <Font bold="false" component="furtherDescriptionArea" property="font" relativeSize="false" size="11"/>
+          </FontInfo>
         </Property>
         <Property name="lineWrap" type="boolean" value="true"/>
         <Property name="rows" type="int" value="5"/>
@@ -106,13 +130,15 @@
           <ResourceString bundle="org/sleuthkit/autopsy/imagegallery/Bundle.properties" key="ImageGalleryOptionsPanel.furtherDescriptionArea.text" replaceFormat="NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
         <Property name="wrapStyleWord" type="boolean" value="true"/>
-        <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
-          <Dimension value="[378, 74]"/>
-        </Property>
       </Properties>
     </Component>
     <Component class="javax.swing.JLabel" name="infoIconLabel">
       <Properties>
+        <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+          <FontInfo relative="true">
+            <Font bold="false" component="infoIconLabel" property="font" relativeSize="false" size="11"/>
+          </FontInfo>
+        </Property>
         <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
           <Image iconType="3" name="/org/sleuthkit/autopsy/imagegallery/images/info-icon-16.png"/>
         </Property>
@@ -123,6 +149,11 @@
     </Component>
     <Component class="javax.swing.JLabel" name="unavailableDuringInjestLabel">
       <Properties>
+        <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+          <FontInfo relative="true">
+            <Font bold="false" component="unavailableDuringInjestLabel" property="font" relativeSize="false" size="11"/>
+          </FontInfo>
+        </Property>
         <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
           <Image iconType="3" name="/org/sleuthkit/autopsy/imagegallery/images/warning16.png"/>
         </Property>
diff --git a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/ImageGalleryOptionsPanel.java b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/ImageGalleryOptionsPanel.java
index bb44a60ec1..ee6e0e1b09 100644
--- a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/ImageGalleryOptionsPanel.java
+++ b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/ImageGalleryOptionsPanel.java
@@ -65,6 +65,9 @@ final class ImageGalleryOptionsPanel extends javax.swing.JPanel {
         infoIconLabel = new javax.swing.JLabel();
         unavailableDuringInjestLabel = new javax.swing.JLabel();
 
+        setFont(getFont().deriveFont(getFont().getStyle() & ~java.awt.Font.BOLD, 11));
+
+        enabledByDefaultBox.setFont(enabledByDefaultBox.getFont().deriveFont(enabledByDefaultBox.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         org.openide.awt.Mnemonics.setLocalizedText(enabledByDefaultBox, org.openide.util.NbBundle.getMessage(ImageGalleryOptionsPanel.class, "ImageGalleryOptionsPanel.enabledByDefaultBox.text")); // NOI18N
         enabledByDefaultBox.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
@@ -72,6 +75,7 @@ final class ImageGalleryOptionsPanel extends javax.swing.JPanel {
             }
         });
 
+        enabledForCaseBox.setFont(enabledForCaseBox.getFont().deriveFont(enabledForCaseBox.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         org.openide.awt.Mnemonics.setLocalizedText(enabledForCaseBox, org.openide.util.NbBundle.getMessage(ImageGalleryOptionsPanel.class, "ImageGalleryOptionsPanel.enabledForCaseBox.text")); // NOI18N
         enabledForCaseBox.setToolTipText(NbBundle.getMessage(ImageGalleryOptionsPanel.class, "ImageGalleryOptionsPanel.enabledForCaseBox.toolTipText")); // NOI18N
         enabledForCaseBox.addActionListener(new java.awt.event.ActionListener() {
@@ -80,21 +84,23 @@ final class ImageGalleryOptionsPanel extends javax.swing.JPanel {
             }
         });
 
+        descriptionLabel.setFont(descriptionLabel.getFont().deriveFont(descriptionLabel.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         org.openide.awt.Mnemonics.setLocalizedText(descriptionLabel, org.openide.util.NbBundle.getMessage(ImageGalleryOptionsPanel.class, "ImageGalleryOptionsPanel.descriptionLabel.text")); // NOI18N
 
         furtherDescriptionArea.setBackground(new java.awt.Color(240, 240, 240));
         furtherDescriptionArea.setColumns(20);
-        furtherDescriptionArea.setFont(furtherDescriptionArea.getFont().deriveFont(Font.PLAIN, 11)); // NOI18N
+        furtherDescriptionArea.setFont(furtherDescriptionArea.getFont().deriveFont(furtherDescriptionArea.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         furtherDescriptionArea.setLineWrap(true);
         furtherDescriptionArea.setRows(5);
         furtherDescriptionArea.setText(NbBundle.getMessage(ImageGalleryOptionsPanel.class, "ImageGalleryOptionsPanel.furtherDescriptionArea.text")); // NOI18N
         furtherDescriptionArea.setWrapStyleWord(true);
-        furtherDescriptionArea.setPreferredSize(new java.awt.Dimension(378, 74));
 
-        infoIconLabel.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/imagegallery/images/info-icon-16.png"))); // NOI18N NON-NLS
+        infoIconLabel.setFont(infoIconLabel.getFont().deriveFont(infoIconLabel.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
+        infoIconLabel.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/imagegallery/images/info-icon-16.png"))); // NOI18N
         org.openide.awt.Mnemonics.setLocalizedText(infoIconLabel, NbBundle.getMessage(ImageGalleryOptionsPanel.class, "ImageGalleryOptionsPanel.infoIconLabel.text")); // NOI18N
 
-        unavailableDuringInjestLabel.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/imagegallery/images/warning16.png"))); // NOI18N NON-NLS
+        unavailableDuringInjestLabel.setFont(unavailableDuringInjestLabel.getFont().deriveFont(unavailableDuringInjestLabel.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
+        unavailableDuringInjestLabel.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/imagegallery/images/warning16.png"))); // NOI18N
         org.openide.awt.Mnemonics.setLocalizedText(unavailableDuringInjestLabel, NbBundle.getMessage(ImageGalleryOptionsPanel.class, "ImageGalleryOptionsPanel.unavailableDuringInjestLabel.text")); // NOI18N
 
         javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
@@ -112,7 +118,7 @@ final class ImageGalleryOptionsPanel extends javax.swing.JPanel {
                             .addGap(21, 21, 21)
                             .addComponent(infoIconLabel)
                             .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                            .addComponent(furtherDescriptionArea, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+                            .addComponent(furtherDescriptionArea))
                         .addComponent(enabledByDefaultBox)
                         .addComponent(enabledForCaseBox)
                         .addComponent(descriptionLabel, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)))

From a19154e17a13fd23af12743109acfd0a110baeed Mon Sep 17 00:00:00 2001
From: Nick Davis <nick.davis@narfindustries.com>
Date: Wed, 3 Feb 2016 17:17:14 -0500
Subject: [PATCH 40/68] restored area size

---
 .../autopsy/imagegallery/ImageGalleryOptionsPanel.form         | 3 +++
 .../autopsy/imagegallery/ImageGalleryOptionsPanel.java         | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/ImageGalleryOptionsPanel.form b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/ImageGalleryOptionsPanel.form
index 1a158a2ab7..df041c5dab 100644
--- a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/ImageGalleryOptionsPanel.form
+++ b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/ImageGalleryOptionsPanel.form
@@ -130,6 +130,9 @@
           <ResourceString bundle="org/sleuthkit/autopsy/imagegallery/Bundle.properties" key="ImageGalleryOptionsPanel.furtherDescriptionArea.text" replaceFormat="NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
         <Property name="wrapStyleWord" type="boolean" value="true"/>
+        <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+          <Dimension value="[378, 74]"/>
+        </Property>
       </Properties>
     </Component>
     <Component class="javax.swing.JLabel" name="infoIconLabel">
diff --git a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/ImageGalleryOptionsPanel.java b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/ImageGalleryOptionsPanel.java
index ee6e0e1b09..885a10004f 100644
--- a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/ImageGalleryOptionsPanel.java
+++ b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/ImageGalleryOptionsPanel.java
@@ -94,6 +94,7 @@ final class ImageGalleryOptionsPanel extends javax.swing.JPanel {
         furtherDescriptionArea.setRows(5);
         furtherDescriptionArea.setText(NbBundle.getMessage(ImageGalleryOptionsPanel.class, "ImageGalleryOptionsPanel.furtherDescriptionArea.text")); // NOI18N
         furtherDescriptionArea.setWrapStyleWord(true);
+        furtherDescriptionArea.setPreferredSize(new java.awt.Dimension(378, 74));
 
         infoIconLabel.setFont(infoIconLabel.getFont().deriveFont(infoIconLabel.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         infoIconLabel.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/imagegallery/images/info-icon-16.png"))); // NOI18N
@@ -118,7 +119,7 @@ final class ImageGalleryOptionsPanel extends javax.swing.JPanel {
                             .addGap(21, 21, 21)
                             .addComponent(infoIconLabel)
                             .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                            .addComponent(furtherDescriptionArea))
+                            .addComponent(furtherDescriptionArea, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
                         .addComponent(enabledByDefaultBox)
                         .addComponent(enabledForCaseBox)
                         .addComponent(descriptionLabel, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)))

From 1e8b08a0676f73e3d816778f7e19d30e895d041d Mon Sep 17 00:00:00 2001
From: Nick Davis <nick.davis@narfindustries.com>
Date: Wed, 3 Feb 2016 17:22:13 -0500
Subject: [PATCH 41/68] converted ui to derived fonts

---
 .../DropdownListSearchPanel.form              | 52 ++++++++++++++++++-
 .../DropdownListSearchPanel.java              | 13 ++++-
 2 files changed, 62 insertions(+), 3 deletions(-)

diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/DropdownListSearchPanel.form b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/DropdownListSearchPanel.form
index d1b7828526..0e884ac7f3 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/DropdownListSearchPanel.form
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/DropdownListSearchPanel.form
@@ -1,6 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 
 <Form version="1.5" maxVersion="1.7" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">
+  <Properties>
+    <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+      <FontInfo relative="true">
+        <Font bold="false" component="Form" property="font" relativeSize="false" size="11"/>
+      </FontInfo>
+    </Property>
+  </Properties>
   <AuxValues>
     <AuxValue name="FormSettings_autoResourcing" type="java.lang.Integer" value="1"/>
     <AuxValue name="FormSettings_autoSetComponentName" type="java.lang.Boolean" value="false"/>
@@ -52,11 +59,23 @@
   </Layout>
   <SubComponents>
     <Container class="javax.swing.JSplitPane" name="jSplitPane1">
+      <Properties>
+        <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+          <FontInfo relative="true">
+            <Font bold="false" component="jSplitPane1" property="font" relativeSize="false" size="11"/>
+          </FontInfo>
+        </Property>
+      </Properties>
 
       <Layout class="org.netbeans.modules.form.compat2.layouts.support.JSplitPaneSupportLayout"/>
       <SubComponents>
         <Container class="javax.swing.JScrollPane" name="leftPane">
           <Properties>
+            <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+              <FontInfo relative="true">
+                <Font bold="false" component="leftPane" property="font" relativeSize="false" size="11"/>
+              </FontInfo>
+            </Property>
             <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
               <Dimension value="[150, 23]"/>
             </Property>
@@ -74,6 +93,11 @@
                 <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="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+                  <FontInfo relative="true">
+                    <Font bold="false" component="listsTable" property="font" relativeSize="false" size="11"/>
+                  </FontInfo>
+                </Property>
                 <Property name="model" type="javax.swing.table.TableModel" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
                   <Connection code="listsTableModel" type="code"/>
                 </Property>
@@ -87,6 +111,13 @@
           </SubComponents>
         </Container>
         <Container class="javax.swing.JScrollPane" name="rightPane">
+          <Properties>
+            <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+              <FontInfo relative="true">
+                <Font bold="false" component="rightPane" property="font" relativeSize="false" size="11"/>
+              </FontInfo>
+            </Property>
+          </Properties>
           <Constraints>
             <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JSplitPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JSplitPaneSupportLayout$JSplitPaneConstraintsDescription">
               <JSplitPaneConstraints position="right"/>
@@ -100,6 +131,11 @@
                 <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="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+                  <FontInfo relative="true">
+                    <Font bold="false" component="keywordsTable" property="font" relativeSize="false" size="11"/>
+                  </FontInfo>
+                </Property>
                 <Property name="model" type="javax.swing.table.TableModel" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
                   <Connection code="keywordsTableModel" type="code"/>
                 </Property>
@@ -113,6 +149,11 @@
     </Container>
     <Component class="javax.swing.JButton" name="manageListsButton">
       <Properties>
+        <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+          <FontInfo relative="true">
+            <Font bold="false" component="manageListsButton" property="font" relativeSize="false" size="11"/>
+          </FontInfo>
+        </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
           <ResourceString bundle="org/sleuthkit/autopsy/keywordsearch/Bundle.properties" key="KeywordSearchListsViewerPanel.manageListsButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
@@ -126,6 +167,11 @@
     </Component>
     <Component class="javax.swing.JButton" name="searchAddButton">
       <Properties>
+        <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+          <FontInfo relative="true">
+            <Font bold="false" component="searchAddButton" property="font" relativeSize="false" size="11"/>
+          </FontInfo>
+        </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
           <ResourceString bundle="org/sleuthkit/autopsy/keywordsearch/Bundle.properties" key="KeywordSearchListsViewerPanel.searchAddButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
@@ -136,8 +182,10 @@
     </Component>
     <Component class="javax.swing.JLabel" name="ingestIndexLabel">
       <Properties>
-        <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
-          <Font name="Tahoma" size="10" style="0"/>
+        <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+          <FontInfo relative="true">
+            <Font bold="false" component="ingestIndexLabel" property="font" relativeSize="false" size="10"/>
+          </FontInfo>
         </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
           <ResourceString bundle="org/sleuthkit/autopsy/keywordsearch/Bundle.properties" key="KeywordSearchListsViewerPanel.ingestIndexLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/DropdownListSearchPanel.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/DropdownListSearchPanel.java
index e3d7d6cc85..577703b2a0 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/DropdownListSearchPanel.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/DropdownListSearchPanel.java
@@ -198,9 +198,15 @@ class DropdownListSearchPanel extends KeywordSearchPanel {
         searchAddButton = new javax.swing.JButton();
         ingestIndexLabel = new javax.swing.JLabel();
 
+        setFont(getFont().deriveFont(getFont().getStyle() & ~java.awt.Font.BOLD, 11));
+
+        jSplitPane1.setFont(jSplitPane1.getFont().deriveFont(jSplitPane1.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
+
+        leftPane.setFont(leftPane.getFont().deriveFont(leftPane.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         leftPane.setMinimumSize(new java.awt.Dimension(150, 23));
 
         listsTable.setBackground(new java.awt.Color(240, 240, 240));
+        listsTable.setFont(listsTable.getFont().deriveFont(listsTable.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         listsTable.setModel(listsTableModel);
         listsTable.setShowHorizontalLines(false);
         listsTable.setShowVerticalLines(false);
@@ -209,7 +215,10 @@ class DropdownListSearchPanel extends KeywordSearchPanel {
 
         jSplitPane1.setLeftComponent(leftPane);
 
+        rightPane.setFont(rightPane.getFont().deriveFont(rightPane.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
+
         keywordsTable.setBackground(new java.awt.Color(240, 240, 240));
+        keywordsTable.setFont(keywordsTable.getFont().deriveFont(keywordsTable.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         keywordsTable.setModel(keywordsTableModel);
         keywordsTable.setShowHorizontalLines(false);
         keywordsTable.setShowVerticalLines(false);
@@ -217,6 +226,7 @@ class DropdownListSearchPanel extends KeywordSearchPanel {
 
         jSplitPane1.setRightComponent(rightPane);
 
+        manageListsButton.setFont(manageListsButton.getFont().deriveFont(manageListsButton.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         manageListsButton.setText(org.openide.util.NbBundle.getMessage(DropdownListSearchPanel.class, "KeywordSearchListsViewerPanel.manageListsButton.text")); // NOI18N
         manageListsButton.setToolTipText(org.openide.util.NbBundle.getMessage(DropdownListSearchPanel.class, "KeywordSearchListsViewerPanel.manageListsButton.toolTipText")); // NOI18N
         manageListsButton.addActionListener(new java.awt.event.ActionListener() {
@@ -225,6 +235,7 @@ class DropdownListSearchPanel extends KeywordSearchPanel {
             }
         });
 
+        searchAddButton.setFont(searchAddButton.getFont().deriveFont(searchAddButton.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         searchAddButton.setText(org.openide.util.NbBundle.getMessage(DropdownListSearchPanel.class, "KeywordSearchListsViewerPanel.searchAddButton.text")); // NOI18N
         searchAddButton.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
@@ -232,7 +243,7 @@ class DropdownListSearchPanel extends KeywordSearchPanel {
             }
         });
 
-        ingestIndexLabel.setFont(ingestIndexLabel.getFont().deriveFont(Font.PLAIN, 10));
+        ingestIndexLabel.setFont(ingestIndexLabel.getFont().deriveFont(ingestIndexLabel.getFont().getStyle() & ~java.awt.Font.BOLD, 10));
         ingestIndexLabel.setText(org.openide.util.NbBundle.getMessage(DropdownListSearchPanel.class, "KeywordSearchListsViewerPanel.ingestIndexLabel.text")); // NOI18N
 
         javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);

From ebe4afad64e4bfa6ea7be9fdfa6d3290156c0480 Mon Sep 17 00:00:00 2001
From: jmillman <jmillman@basistech.com>
Date: Wed, 3 Feb 2016 13:25:45 -0500
Subject: [PATCH 42/68] fix missing category items and refactor GroupPane using
 radiobuttons

more refactoring in GroupPane
---
 .../gui/drawableviews/GroupPane.fxml          | 198 +++++++----
 .../gui/drawableviews/GroupPane.java          | 322 ++++++++----------
 2 files changed, 266 insertions(+), 254 deletions(-)

diff --git a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/drawableviews/GroupPane.fxml b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/drawableviews/GroupPane.fxml
index 0844568c07..db5a61aaab 100644
--- a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/drawableviews/GroupPane.fxml
+++ b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/drawableviews/GroupPane.fxml
@@ -1,14 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import java.lang.*?>
-<?import javafx.geometry.*?>
-<?import javafx.scene.control.*?>
-<?import javafx.scene.image.*?>
-<?import javafx.scene.layout.*?>
-<?import javafx.scene.text.*?>
-<?import org.controlsfx.control.*?>
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.MenuItem?>
+<?import javafx.scene.control.RadioButton?>
+<?import javafx.scene.control.Separator?>
+<?import javafx.scene.control.SplitMenuButton?>
+<?import javafx.scene.control.ToggleGroup?>
+<?import javafx.scene.control.ToolBar?>
+<?import javafx.scene.image.Image?>
+<?import javafx.scene.image.ImageView?>
+<?import javafx.scene.layout.BorderPane?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.VBox?>
+<?import javafx.scene.text.Font?>
+<?import org.controlsfx.control.GridView?>
+<?import org.controlsfx.control.SegmentedButton?>
 
-<fx:root type="BorderPane" xmlns="http://javafx.com/javafx/8.0.40" xmlns:fx="http://javafx.com/fxml/1">
+<fx:root type="BorderPane" xmlns="http://javafx.com/javafx/8.0.65" xmlns:fx="http://javafx.com/fxml/1">
    
     <center>
         <GridView fx:id="gridView" BorderPane.alignment="CENTER" />
@@ -76,72 +86,20 @@
     <top>
         <VBox>
             <children>
-                <Label fx:id="groupLabel" wrapText="true">
-                    <font>
-                        <Font size="14.0" />
-                    </font>
+                <HBox alignment="CENTER" maxWidth="1.7976931348623157E308">
                     <VBox.margin>
                         <Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />
                     </VBox.margin>
-                </Label>
-     
-                <ToolBar id="headToolBar" fx:id="headerToolBar" maxHeight="-Infinity" maxWidth="-1.0" minHeight="-Infinity" minWidth="-1.0" prefHeight="-1.0" prefWidth="-1.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0" BorderPane.alignment="CENTER" VBox.vgrow="NEVER">
-                    <items>
-                        <Label text="Apply to Selected Files:" />
-                        <SplitMenuButton fx:id="tagSelectedSplitMenu" mnemonicParsing="false" text="Follow Up">
-                            <items>
-                                <MenuItem mnemonicParsing="false" text="Action 1" />
-                                <MenuItem mnemonicParsing="false" text="Action 2" />
-                            </items>
-                        </SplitMenuButton>
-                        <SplitMenuButton fx:id="catSelectedSplitMenu" mnemonicParsing="false" text="Cat-0">
-                            <items>
-                                <MenuItem mnemonicParsing="false" text="Action 1" />
-                                <MenuItem mnemonicParsing="false" text="Action 2" />
-                            </items>
-                        </SplitMenuButton>
-                  <HBox fx:id="catSegmentedContainer" alignment="CENTER" spacing="5.0">
-                     <children>
-                        <Label text="Category:">
-                           <graphic>
-                              <ImageView fitHeight="16.0" fitWidth="16.0" mouseTransparent="true" pickOnBounds="true" preserveRatio="true">
-                                 <image>
-                                    <Image url="@../../images/category-icon.png" />
-                                 </image>
-                              </ImageView>
-                           </graphic>
+                    <children>
+                        <Label fx:id="groupLabel" maxWidth="1.7976931348623157E308" wrapText="true" HBox.hgrow="ALWAYS">
+                            <font>
+                                <Font size="14.0" />
+                            </font>
                         </Label>
-                        <HBox id="HBox" alignment="CENTER" spacing="0.0" styleClass="segmented-button-bar">
-                           <children>
-                              <SegmentedButton fx:id="catSegmentedButton">
-                                 <buttons>
-                                    <ToggleButton fx:id="cat0Toggle" mnemonicParsing="false" text="0" HBox.hgrow="ALWAYS" />
-                                    <ToggleButton fx:id="cat1Toggle" mnemonicParsing="false" style="" styleClass="button" text="1" HBox.hgrow="ALWAYS" />
-                                    <ToggleButton id="Cat2Toggle" fx:id="cat2Toggle" mnemonicParsing="false" styleClass="button" text="2" HBox.hgrow="ALWAYS" />
-                                    <ToggleButton fx:id="cat3Toggle" mnemonicParsing="false" styleClass="button" text="3" HBox.hgrow="ALWAYS" />
-                                    <ToggleButton fx:id="cat4Toggle" mnemonicParsing="false" styleClass="button" text="4" HBox.hgrow="ALWAYS" />
-                                    <ToggleButton fx:id="cat5Toggle" mnemonicParsing="false" text="5" HBox.hgrow="ALWAYS">
-                                       <toggleGroup>
-                                          <ToggleGroup fx:id="cat" />
-                                       </toggleGroup>
-                                    </ToggleButton>
-                                 </buttons>
-                              </SegmentedButton>
-                           </children>
-                        </HBox>
-                     </children>
-                     <padding>
-                        <Insets left="5.0" />
-                     </padding>
-                  </HBox>
-                  <Separator prefWidth="30.0" />
-                  <Button fx:id="undoButton" mnemonicParsing="false" text="Undo" />
-                  <Button fx:id="redoButton" layoutX="10.0" layoutY="10.0" mnemonicParsing="false" text="Redo" />
-                        <Region fx:id="spacer" prefHeight="-1.0" prefWidth="-1.0" />
-                        <Separator prefWidth="30.0" />
-                        <SegmentedButton fx:id="segButton">
+                        <SegmentedButton fx:id="segButton" maxWidth="-Infinity" minWidth="-Infinity" HBox.hgrow="NEVER">
+                        
                             <buttons>
-                                <ToggleButton id="" fx:id="tileToggle" alignment="CENTER" contentDisplay="GRAPHIC_ONLY" graphicTextGap="0.0" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="32.0" mnemonicParsing="false" prefWidth="-1.0" scaleX="1.0" selected="true" text="" textAlignment="CENTER">
+                                <RadioButton fx:id="tileToggle" alignment="CENTER" contentDisplay="GRAPHIC_ONLY" graphicTextGap="0.0" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="32.0" mnemonicParsing="false" prefWidth="-1.0" scaleX="1.0" selected="true" text="" textAlignment="CENTER">
                                     <graphic>
                                         <ImageView fitHeight="16.0" fitWidth="16.0" mouseTransparent="true" pickOnBounds="true" preserveRatio="true" translateY="1.0">
                                             <image>
@@ -149,8 +107,12 @@
                                             </image>
                                         </ImageView>
                                     </graphic>
-                                </ToggleButton>
-                                <ToggleButton id="filmStripToggle" fx:id="slideShowToggle" contentDisplay="GRAPHIC_ONLY" graphicTextGap="0.0" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="32.0" mnemonicParsing="false" prefWidth="-1.0" text="">
+                           <toggleGroup>
+                                        <ToggleGroup fx:id="viewModeToggleGroup" />
+                           </toggleGroup>
+                     
+                                </RadioButton>
+                                <RadioButton id="filmStripToggle" fx:id="slideShowToggle" contentDisplay="GRAPHIC_ONLY" graphicTextGap="0.0" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="32.0" mnemonicParsing="false" prefWidth="-1.0" text="" toggleGroup="$viewModeToggleGroup">
                                     <graphic>
                                         <ImageView fitHeight="16.0" fitWidth="16.0" mouseTransparent="true" pickOnBounds="true" preserveRatio="true" rotate="90.0" translateY="1.0">
                                             <image>
@@ -158,10 +120,100 @@
                                             </image>
                                         </ImageView>
                                     </graphic>
-                                </ToggleButton>        
+                                </RadioButton>        
                             </buttons>       
                         </SegmentedButton>
-
+                    </children>
+                </HBox>
+     
+                <ToolBar id="headToolBar" fx:id="headerToolBar" maxHeight="-Infinity" minHeight="-Infinity" minWidth="-1.0" prefHeight="-1.0" prefWidth="-1.0" BorderPane.alignment="CENTER" VBox.vgrow="NEVER">
+                    <items>
+                        <HBox alignment="CENTER" spacing="5.0">
+                            <children>
+                                <Label text="Tag Selected Files:">
+                                    <graphic>
+                                        <ImageView fitHeight="16.0" fitWidth="16.0" pickOnBounds="true" preserveRatio="true">
+                                            <image>
+                                                <Image url="@../../images/tag_red.png" />
+                                            </image>
+                                        </ImageView>
+                                    </graphic>
+                                </Label>
+                                <SplitMenuButton fx:id="tagSelectedSplitMenu" mnemonicParsing="false" text="Follow Up">
+                                    <items>
+                                        <MenuItem mnemonicParsing="false" text="Action 1" />
+                                        <MenuItem mnemonicParsing="false" text="Action 2" />
+                                    </items>
+                                </SplitMenuButton>
+                            </children>
+                        </HBox>
+                        <Separator minWidth="-Infinity" prefWidth="10.0" />
+                        <HBox fx:id="catSplitMenuContainer" alignment="CENTER" maxWidth="-Infinity" spacing="5.0">
+                            <children>
+                                <Label text="Categorize Selected File:">
+                                    <graphic>
+                                        <ImageView fitHeight="16.0" fitWidth="16.0" mouseTransparent="true" pickOnBounds="true" preserveRatio="true">
+                                            <image>
+                                                <Image url="@../../images/category-icon.png" />
+                                            </image>
+                                        </ImageView>
+                                    </graphic>
+                                </Label>
+                                <SplitMenuButton fx:id="catSelectedSplitMenu" mnemonicParsing="false" text="Cat-0">
+                                    <items>
+                                        <MenuItem mnemonicParsing="false" text="Action 1" />
+                                        <MenuItem mnemonicParsing="false" text="Action 2" />
+                                    </items>
+                                </SplitMenuButton>
+                                <Button fx:id="undoButton" mnemonicParsing="false" text="Undo">
+                                    <graphic>
+                                        <ImageView fitHeight="16.0" fitWidth="16.0" pickOnBounds="true" preserveRatio="true">
+                                            <image>
+                                                <Image url="@../../images/undo.png" />
+                                            </image>
+                                        </ImageView>
+                                    </graphic>
+                                </Button>
+                                <Button fx:id="redoButton" mnemonicParsing="false" text="Redo">
+                                    <graphic>
+                                        <ImageView fitHeight="16.0" fitWidth="16.0" pickOnBounds="true" preserveRatio="true">
+                                            <image>
+                                                <Image url="@../../images/redo.png" />
+                                            </image>
+                                        </ImageView>
+                                    </graphic>
+                                </Button>
+                            </children>
+                        </HBox>
+                        <HBox fx:id="catSegmentedContainer" alignment="CENTER" maxWidth="-Infinity" spacing="5.0">
+                            <children>
+                                <Label text="Category:">
+                                    <graphic>
+                                        <ImageView fitHeight="16.0" fitWidth="16.0" mouseTransparent="true" pickOnBounds="true" preserveRatio="true">
+                                            <image>
+                                                <Image url="@../../images/category-icon.png" />
+                                            </image>
+                                        </ImageView>
+                                    </graphic>
+                                </Label>
+                                <SegmentedButton fx:id="catSegmentedButton">
+                                    <buttons>
+                                        <RadioButton fx:id="cat0Toggle" mnemonicParsing="false" text="0" HBox.hgrow="ALWAYS">
+                                 <toggleGroup>
+                                                <ToggleGroup fx:id="cat" />
+                                 </toggleGroup></RadioButton>
+                                        <RadioButton fx:id="cat1Toggle" mnemonicParsing="false" style="" styleClass="button" text="1" toggleGroup="$cat" HBox.hgrow="ALWAYS" />
+                                        <RadioButton id="Cat2Toggle" fx:id="cat2Toggle" mnemonicParsing="false" styleClass="button" text="2" toggleGroup="$cat" HBox.hgrow="ALWAYS" />
+                                        <RadioButton fx:id="cat3Toggle" mnemonicParsing="false" styleClass="button" text="3" toggleGroup="$cat" HBox.hgrow="ALWAYS" />
+                                        <RadioButton fx:id="cat4Toggle" mnemonicParsing="false" styleClass="button" text="4" toggleGroup="$cat" HBox.hgrow="ALWAYS" />
+                                        <RadioButton fx:id="cat5Toggle" mnemonicParsing="false" text="5" toggleGroup="$cat" HBox.hgrow="ALWAYS" />
+                                    </buttons>
+                                </SegmentedButton>
+                            </children>
+                            <padding>
+                                <Insets left="5.0" />
+                            </padding>
+                        </HBox>
                     </items>
                 </ToolBar>
             </children>
diff --git a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/drawableviews/GroupPane.java b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/drawableviews/GroupPane.java
index fb70931898..0df14b3a92 100644
--- a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/drawableviews/GroupPane.java
+++ b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/drawableviews/GroupPane.java
@@ -1,7 +1,7 @@
 /*
  * Autopsy Forensic Browser
  *
- * Copyright 2013-15 Basis Technology Corp.
+ * Copyright 2013-16 Basis Technology Corp.
  * Contact: carrier <at> sleuthkit <dot> org
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -39,10 +39,12 @@ import javafx.animation.Timeline;
 import javafx.application.Platform;
 import javafx.beans.InvalidationListener;
 import javafx.beans.Observable;
+import javafx.beans.binding.Bindings;
+import javafx.beans.binding.BooleanBinding;
+import javafx.beans.binding.DoubleBinding;
 import javafx.beans.property.ReadOnlyObjectProperty;
 import javafx.beans.property.ReadOnlyObjectWrapper;
 import javafx.beans.property.SimpleObjectProperty;
-import javafx.beans.value.ChangeListener;
 import javafx.beans.value.ObservableValue;
 import javafx.collections.ObservableList;
 import javafx.event.ActionEvent;
@@ -85,12 +87,8 @@ import javafx.scene.layout.BorderStrokeStyle;
 import javafx.scene.layout.BorderWidths;
 import javafx.scene.layout.CornerRadii;
 import javafx.scene.layout.HBox;
-import javafx.scene.layout.Priority;
-import javafx.scene.layout.Region;
 import javafx.scene.paint.Color;
 import javafx.util.Duration;
-
-import javax.ejb.MessageDriven;
 import javax.swing.Action;
 import javax.swing.SwingUtilities;
 import org.apache.commons.lang3.StringUtils;
@@ -116,6 +114,7 @@ import org.sleuthkit.autopsy.imagegallery.ImageGalleryTopComponent;
 import org.sleuthkit.autopsy.imagegallery.actions.AddDrawableTagAction;
 import org.sleuthkit.autopsy.imagegallery.actions.Back;
 import org.sleuthkit.autopsy.imagegallery.actions.CategorizeAction;
+import org.sleuthkit.autopsy.imagegallery.actions.CategorizeGroupAction;
 import org.sleuthkit.autopsy.imagegallery.actions.CategorizeSelectedFilesAction;
 import org.sleuthkit.autopsy.imagegallery.actions.Forward;
 import org.sleuthkit.autopsy.imagegallery.actions.NextUnseenGroup;
@@ -199,9 +198,6 @@ public class GroupPane extends BorderPane {
     @FXML
     private ToggleButton slideShowToggle;
 
-    @FXML
-    private Region spacer;
-
     @FXML
     private GridView<Long> gridView;
 
@@ -220,6 +216,11 @@ public class GroupPane extends BorderPane {
     @FXML
     private Label groupLabel;
 
+    @FXML
+    private HBox catSegmentedContainer;
+    @FXML
+    private HBox catSplitMenuContainer;
+
     private final KeyboardHandler tileKeyboardNavigationHandler = new KeyboardHandler();
 
     private final NextUnseenGroup nextGroupAction;
@@ -264,8 +265,6 @@ public class GroupPane extends BorderPane {
             groupLabel.setText(header);
         });
     };
-    @FXML
-    private HBox catSegmentedContainer;
 
     public GroupPane(ImageGalleryController controller) {
         this.controller = controller;
@@ -282,10 +281,7 @@ public class GroupPane extends BorderPane {
     @ThreadConfined(type = ThreadType.JFX)
     public void activateSlideShowViewer(Long slideShowFileID) {
         groupViewMode.set(GroupViewMode.SLIDE_SHOW);
-        catSelectedSplitMenu.setVisible(false);
-        catSelectedSplitMenu.setManaged(false);
-        catSegmentedContainer.setVisible(true);
-        catSegmentedContainer.setManaged(true);
+        slideShowToggle.setSelected(true);
         //make a new slideShowPane if necessary
         if (slideShowPane == null) {
             slideShowPane = new SlideShowView(this, controller);
@@ -309,10 +305,7 @@ public class GroupPane extends BorderPane {
 
     public void activateTileViewer() {
         groupViewMode.set(GroupViewMode.TILE);
-        catSelectedSplitMenu.setVisible(true);
-        catSelectedSplitMenu.setManaged(true);
-        catSegmentedContainer.setVisible(false);
-        catSegmentedContainer.setManaged(false);
+        tileToggle.setSelected(true);
         setCenter(gridView);
         gridView.requestFocus();
         if (slideShowPane != null) {
@@ -334,13 +327,13 @@ public class GroupPane extends BorderPane {
      * create the string to display in the group header
      */
     @NbBundle.Messages({"# {0} - default group name",
-            "# {1} - hashset hits count",
-            "# {2} - group size",
-            "GroupPane.headerString={0} -- {1} hash set hits / {2} files"})
+        "# {1} - hashset hits count",
+        "# {2} - group size",
+        "GroupPane.headerString={0} -- {1} hash set hits / {2} files"})
     protected String getHeaderString() {
         return isNull(getGroup()) ? ""
                 : Bundle.GroupPane_headerString(StringUtils.defaultIfBlank(getGroup().getGroupByValueDislpayName(), DrawableGroup.getBlankGroupName()),
-                getGroup().getHashSetHitsCount(), getGroup().getSize());
+                        getGroup().getHashSetHitsCount(), getGroup().getSize());
     }
 
     ContextMenu getContextMenu() {
@@ -370,27 +363,6 @@ public class GroupPane extends BorderPane {
         }
     }
 
-    private class CategorizeToggleHandler implements ChangeListener<Boolean> {
-
-        private final Category cat;
-
-        public CategorizeToggleHandler(Category cat) {
-            this.cat = cat;
-        }
-
-        @Override
-        public void changed(ObservableValue<? extends Boolean> ov, Boolean oldValue, Boolean newValue) {
-            if (slideShowPane != null) {
-                slideShowPane.getFileID().ifPresent(fileID -> {
-                    if (newValue) {
-                        selectionModel.clearAndSelect(fileID);
-                        new CategorizeAction(controller).addTag(controller.getTagsManager().getTagName(cat), "");
-                    }
-                });
-            }
-        }
-    }
-
     /**
      * called automatically during constructor by FXMLConstructor.
      *
@@ -413,54 +385,48 @@ public class GroupPane extends BorderPane {
         assert slideShowToggle != null : "fx:id=\"segButton\" was not injected: check your FXML file 'GroupHeader.fxml'.";
         assert tileToggle != null : "fx:id=\"tileToggle\" was not injected: check your FXML file 'GroupHeader.fxml'.";
 
-        //configure category toggles
-        cat0Toggle.setBorder(new Border(new BorderStroke(Category.ZERO.getColor(), BorderStrokeStyle.SOLID, new CornerRadii(1), new BorderWidths(1))));
-        cat1Toggle.setBorder(new Border(new BorderStroke(Category.ONE.getColor(), BorderStrokeStyle.SOLID, new CornerRadii(1), new BorderWidths(1))));
-        cat2Toggle.setBorder(new Border(new BorderStroke(Category.TWO.getColor(), BorderStrokeStyle.SOLID, new CornerRadii(1), new BorderWidths(1))));
-        cat3Toggle.setBorder(new Border(new BorderStroke(Category.THREE.getColor(), BorderStrokeStyle.SOLID, new CornerRadii(1), new BorderWidths(1))));
-        cat4Toggle.setBorder(new Border(new BorderStroke(Category.FOUR.getColor(), BorderStrokeStyle.SOLID, new CornerRadii(1), new BorderWidths(1))));
-        cat5Toggle.setBorder(new Border(new BorderStroke(Category.FIVE.getColor(), BorderStrokeStyle.SOLID, new CornerRadii(1), new BorderWidths(1))));
-
-        cat0Toggle.selectedProperty().addListener(new CategorizeToggleHandler(Category.ZERO));
-        cat1Toggle.selectedProperty().addListener(new CategorizeToggleHandler(Category.ONE));
-        cat2Toggle.selectedProperty().addListener(new CategorizeToggleHandler(Category.TWO));
-        cat3Toggle.selectedProperty().addListener(new CategorizeToggleHandler(Category.THREE));
-        cat4Toggle.selectedProperty().addListener(new CategorizeToggleHandler(Category.FOUR));
-        cat5Toggle.selectedProperty().addListener(new CategorizeToggleHandler(Category.FIVE));
-
-        cat0Toggle.toggleGroupProperty().addListener((o, oldGroup, newGroup) -> {
-            newGroup.selectedToggleProperty().addListener((ov, oldToggle, newToggle) -> {
-                if (newToggle == null) {
-                    oldToggle.setSelected(true);
+        for (Category cat : Category.values()) {
+            getToggleForCategory(cat).setBorder(new Border(new BorderStroke(cat.getColor(), BorderStrokeStyle.SOLID, new CornerRadii(1), new BorderWidths(1))));
+            getToggleForCategory(cat).getStyleClass().remove("radio-button");
+            getToggleForCategory(cat).getStyleClass().add("toggle-button");
+            getToggleForCategory(cat).selectedProperty().addListener((ov, wasSelected, toggleSelected) -> {
+                if (toggleSelected && slideShowPane != null) {
+                    slideShowPane.getFileID().ifPresent((fileID) -> {
+                        selectionModel.clearAndSelect(fileID);
+                        new CategorizeAction(controller).addTag(controller.getTagsManager().getTagName(cat), "");
+                    });
                 }
             });
-        });
+        }
 
         //configure flashing glow animation on next unseen group button
         flashAnimation.setCycleCount(Timeline.INDEFINITE);
         flashAnimation.setAutoReverse(true);
 
         //configure gridView cell properties
-        gridView.cellHeightProperty().bind(Toolbar.getDefault(controller).sizeSliderValue().add(75));
-        gridView.cellWidthProperty().bind(Toolbar.getDefault(controller).sizeSliderValue().add(75));
+        DoubleBinding cellSize = Toolbar.getDefault(controller).sizeSliderValue().add(75);
+        gridView.cellHeightProperty().bind(cellSize);
+        gridView.cellWidthProperty().bind(cellSize);
         gridView.setCellFactory((GridView<Long> param) -> new DrawableCell());
 
-        //configure toolbar properties
-        HBox.setHgrow(spacer, Priority.ALWAYS);
-        spacer.setMinWidth(Region.USE_PREF_SIZE);
+        BooleanBinding isSelectionEmpty = Bindings.isEmpty(selectionModel.getSelected());
+        catSelectedSplitMenu.disableProperty().bind(isSelectionEmpty);
+        tagSelectedSplitMenu.disableProperty().bind(isSelectionEmpty);
+//        selectionModel.getSelected().addListener((Observable o) -> {
+//            Platform.runLater(() -> {
+//                catSelectedSplitMenu.setDisable(selectionModel.getSelected().isEmpty());
+//                tagSelectedSplitMenu.setDisable(selectionModel.getSelected().isEmpty());
+//            });
+//        });
 
-        selectionModel.getSelected().addListener((Observable o) -> {
-            Platform.runLater(() -> {
-                catSelectedSplitMenu.setDisable(selectionModel.getSelected().isEmpty());
-                tagSelectedSplitMenu.setDisable(selectionModel.getSelected().isEmpty());
-            });
+        Platform.runLater(() -> {
+            try {
+                tagSelectedSplitMenu.setText(controller.getTagsManager().getFollowUpTagName().getDisplayName());
+            } catch (TskCoreException tskCoreException) {
+                LOGGER.log(Level.WARNING, "failed to load FollowUpTagName", tskCoreException); //NON-NLS
+            }
         });
 
-        try {
-            tagSelectedSplitMenu.setText(controller.getTagsManager().getFollowUpTagName().getDisplayName());
-        } catch (TskCoreException tskCoreException) {
-            LOGGER.log(Level.WARNING, "failed to load FollowUpTagName", tskCoreException); //NON-NLS
-        }
         tagSelectedSplitMenu.setOnAction(actionEvent -> {
             try {
                 new TagSelectedFilesAction(controller.getTagsManager().getFollowUpTagName(), controller).handle(actionEvent);
@@ -468,7 +434,6 @@ public class GroupPane extends BorderPane {
                 LOGGER.log(Level.WARNING, "failed to load FollowUpTagName", tskCoreException); //NON-NLS
             }
         });
-
         tagSelectedSplitMenu.setGraphic(new ImageView(DrawableAttribute.TAGS.getIcon()));
         tagSelectedSplitMenu.showingProperty().addListener(showing -> {
             if (tagSelectedSplitMenu.isShowing()) {
@@ -478,107 +443,46 @@ public class GroupPane extends BorderPane {
             }
         });
 
-        List<MenuItem> grpCategoryMenues = Lists.transform(Arrays.asList(Category.values()),
-                cat -> GuiUtils.createAutoAssigningMenuItem(catSelectedSplitMenu, new CategorizeSelectedFilesAction(cat, controller)));
-
+        catSelectedSplitMenu.setOnAction(new CategorizeGroupAction(Category.FIVE, controller));
         catSelectedSplitMenu.setText(Category.FIVE.getDisplayName());
         catSelectedSplitMenu.setGraphic(new ImageView(DrawableAttribute.CATEGORY.getIcon()));
-        catSelectedSplitMenu.getItems().setAll(grpCategoryMenues);
-        catSelectedSplitMenu.setOnAction(GuiUtils.createAutoAssigningMenuItem(catSelectedSplitMenu, new CategorizeSelectedFilesAction(Category.FIVE, controller)).getOnAction());
-
-        Runnable syncMode = () -> {
-            switch (groupViewMode.get()) {
-                case SLIDE_SHOW:
-                    slideShowToggle.setSelected(true);
-                    break;
-                case TILE:
-                    tileToggle.setSelected(true);
-                    break;
+        catSelectedSplitMenu.showingProperty().addListener(showing -> {
+            if (catSelectedSplitMenu.isShowing()) {
+                List<MenuItem> categoryMenues = Lists.transform(Arrays.asList(Category.values()),
+                        cat -> GuiUtils.createAutoAssigningMenuItem(catSelectedSplitMenu, new CategorizeSelectedFilesAction(cat, controller)));
+                catSelectedSplitMenu.getItems().setAll(categoryMenues);
             }
-        };
-        syncMode.run();
-        //make togle states match view state
-        groupViewMode.addListener(o -> syncMode.run());
-
-        slideShowToggle.toggleGroupProperty().addListener((o) -> {
-            slideShowToggle.getToggleGroup().selectedToggleProperty().addListener((observable, oldToggle, newToggle) -> {
-                if (newToggle == null) {
-                    oldToggle.setSelected(true);
-                }
-            });
         });
 
+        slideShowToggle.getStyleClass().remove("radio-button");
+        slideShowToggle.getStyleClass().add("toggle-button");
+        tileToggle.getStyleClass().remove("radio-button");
+        tileToggle.getStyleClass().add("toggle-button");
+
+        BooleanBinding equal = Bindings.equal(GroupViewMode.SLIDE_SHOW, groupViewMode);
+        catSegmentedContainer.visibleProperty().bind(equal);
+        catSegmentedContainer.managedProperty().bind(equal);
+        catSplitMenuContainer.visibleProperty().bind(equal.not());
+        catSplitMenuContainer.managedProperty().bind(equal.not());
+
         //listen to toggles and update view state
         slideShowToggle.setOnAction(onAction -> activateSlideShowViewer(selectionModel.lastSelectedProperty().get()));
-
         tileToggle.setOnAction(onAction -> activateTileViewer());
 
-        controller.viewState().addListener((observable, oldViewState, newViewState) -> {
-            setViewState(newViewState);
-        });
+        controller.viewState().addListener((observable, oldViewState, newViewState) -> setViewState(newViewState));
 
         addEventFilter(KeyEvent.KEY_PRESSED, tileKeyboardNavigationHandler);
-        gridView.addEventHandler(MouseEvent.MOUSE_CLICKED, new EventHandler<MouseEvent>() {
-
-            private ContextMenu buildContextMenu() {
-                ArrayList<MenuItem> menuItems = new ArrayList<>();
-
-                menuItems.add(new CategorizeAction(controller).getPopupMenu());
-                menuItems.add(new AddDrawableTagAction(controller).getPopupMenu());
-
-                Collection<? extends ContextMenuActionsProvider> menuProviders = Lookup.getDefault().lookupAll(ContextMenuActionsProvider.class);
-
-                for (ContextMenuActionsProvider provider : menuProviders) {
-                    for (final Action act : provider.getActions()) {
-                        if (act instanceof Presenter.Popup) {
-                            Presenter.Popup aact = (Presenter.Popup) act;
-                            menuItems.add(SwingMenuItemAdapter.create(aact.getPopupPresenter()));
-                        }
-                    }
-                }
-                final MenuItem extractMenuItem = new MenuItem(Bundle.GroupPane_gridViewContextMenuItem_extractFiles());
-                extractMenuItem.setOnAction((ActionEvent t) -> {
-                    SwingUtilities.invokeLater(() -> {
-                        TopComponent etc = WindowManager.getDefault().findTopComponent(ImageGalleryTopComponent.PREFERRED_ID);
-                        ExtractAction.getInstance().actionPerformed(new java.awt.event.ActionEvent(etc, 0, null));
-                    });
-                });
-                menuItems.add(extractMenuItem);
-
-                ContextMenu contextMenu = new ContextMenu(menuItems.toArray(new MenuItem[]{}));
-                contextMenu.setAutoHide(true);
-                return contextMenu;
-            }
-
-            @Override
-            public void handle(MouseEvent t) {
-                switch (t.getButton()) {
-                    case PRIMARY:
-                        if (t.getClickCount() == 1) {
-                            selectionModel.clearSelection();
-                            if (contextMenu != null) {
-                                contextMenu.hide();
-                            }
-                        }
-                        break;
-                    case SECONDARY:
-                        if (t.getClickCount() == 1) {
-                            selectAllFiles();
-                        }
-                        if (selectionModel.getSelected().isEmpty() == false) {
-                            if (contextMenu == null) {
-                                contextMenu = buildContextMenu();
-                            }
-
-                            contextMenu.hide();
-                            contextMenu.show(GroupPane.this, t.getScreenX(), t.getScreenY());
-                        }
-                        break;
-                }
-            }
-        });
+        gridView.addEventHandler(MouseEvent.MOUSE_CLICKED, new MouseHandler());
 
+        ActionUtils.configureButton(undoAction, undoButton);
+        ActionUtils.configureButton(redoAction, redoButton);
+        ActionUtils.configureButton(forwardAction, forwardButton);
+        ActionUtils.configureButton(backAction, backButton);
         ActionUtils.configureButton(nextGroupAction, nextButton);
+        /*
+         * the next button does stuff in the GroupPane that next action does'nt
+         * know about, so do that stuff and then delegate to nextGroupAction
+         */
         final EventHandler<ActionEvent> onAction = nextButton.getOnAction();
         nextButton.setOnAction(actionEvent -> {
             flashAnimation.stop();
@@ -586,24 +490,20 @@ public class GroupPane extends BorderPane {
             onAction.handle(actionEvent);
         });
 
-        ActionUtils.configureButton(undoAction, undoButton);
-        ActionUtils.configureButton(redoAction, redoButton);
-        ActionUtils.configureButton(forwardAction, forwardButton);
-        ActionUtils.configureButton(backAction, backButton);
-
-        nextGroupAction.disabledProperty().addListener((ObservableValue<? extends Boolean> observable, Boolean oldValue, Boolean newValue) -> {
+        nextGroupAction.disabledProperty().addListener((Observable observable) -> {
+            boolean newValue = nextGroupAction.isDisabled();
             nextButton.setEffect(newValue ? null : DROP_SHADOW);
-            if (newValue == false) {
-                flashAnimation.play();
-            } else {
+            if (newValue) {//stop on disabled
                 flashAnimation.stop();
+            } else { //play when enabled
+                flashAnimation.play();
             }
         });
 
         //listen to tile selection and make sure it is visible in scroll area
-        //TODO: make sure we are testing complete visability not just bounds intersection
         selectionModel.lastSelectedProperty().addListener((observable, oldFileID, newFileId) -> {
-            if (groupViewMode.get() == GroupViewMode.SLIDE_SHOW) {
+            if (groupViewMode.get() == GroupViewMode.SLIDE_SHOW
+                    && slideShowPane != null) {
                 slideShowPane.setFile(newFileId);
             } else {
                 scrollToFileID(newFileId);
@@ -613,6 +513,7 @@ public class GroupPane extends BorderPane {
         setViewState(controller.viewState().get());
     }
 
+    //TODO: make sure we are testing complete visability not just bounds intersection
     @ThreadConfined(type = ThreadType.JFX)
     private void scrollToFileID(final Long newFileID) {
         if (newFileID == null) {
@@ -785,12 +686,10 @@ public class GroupPane extends BorderPane {
         @Override
         protected void updateItem(Long item, boolean empty) {
             super.updateItem(item, empty);
-
             tile.setFile(item);
         }
 
         void resetItem() {
-//            updateItem(null, true);
             tile.setFile(null);
         }
     }
@@ -910,4 +809,65 @@ public class GroupPane extends BorderPane {
         }
     }
 
+    private class MouseHandler implements EventHandler<MouseEvent> {
+
+        private ContextMenu buildContextMenu() {
+            ArrayList<MenuItem> menuItems = new ArrayList<>();
+
+            menuItems.add(new CategorizeAction(controller).getPopupMenu());
+            menuItems.add(new AddDrawableTagAction(controller).getPopupMenu());
+
+            Collection<? extends ContextMenuActionsProvider> menuProviders = Lookup.getDefault().lookupAll(ContextMenuActionsProvider.class);
+
+            for (ContextMenuActionsProvider provider : menuProviders) {
+                for (final Action act : provider.getActions()) {
+                    if (act instanceof Presenter.Popup) {
+                        Presenter.Popup aact = (Presenter.Popup) act;
+                        menuItems.add(SwingMenuItemAdapter.create(aact.getPopupPresenter()));
+                    }
+                }
+            }
+            final MenuItem extractMenuItem = new MenuItem(Bundle.GroupPane_gridViewContextMenuItem_extractFiles());
+            extractMenuItem.setOnAction((ActionEvent t) -> {
+                SwingUtilities.invokeLater(() -> {
+                    TopComponent etc = WindowManager.getDefault().findTopComponent(ImageGalleryTopComponent.PREFERRED_ID);
+                    ExtractAction.getInstance().actionPerformed(new java.awt.event.ActionEvent(etc, 0, null));
+                });
+            });
+            menuItems.add(extractMenuItem);
+
+            ContextMenu contextMenu = new ContextMenu(menuItems.toArray(new MenuItem[]{}));
+            contextMenu.setAutoHide(true);
+            return contextMenu;
+        }
+
+        @Override
+        public void handle(MouseEvent t) {
+            switch (t.getButton()) {
+                case PRIMARY:
+                    if (t.getClickCount() == 1) {
+                        selectionModel.clearSelection();
+                        if (contextMenu != null) {
+                            contextMenu.hide();
+                        }
+                    }
+                    t.consume();
+                    break;
+                case SECONDARY:
+                    if (t.getClickCount() == 1) {
+                        selectAllFiles();
+                    }
+                    if (selectionModel.getSelected().isEmpty() == false) {
+                        if (contextMenu == null) {
+                            contextMenu = buildContextMenu();
+                        }
+
+                        contextMenu.hide();
+                        contextMenu.show(GroupPane.this, t.getScreenX(), t.getScreenY());
+                    }
+                    t.consume();
+                    break;
+            }
+        }
+    }
 }

From e71a77ad8c244acc50bf250136ca8099e23c8afa Mon Sep 17 00:00:00 2001
From: jmillman <jmillman@basistech.com>
Date: Thu, 4 Feb 2016 10:29:53 -0500
Subject: [PATCH 43/68] use Category symbols in the apply cat dropdowns

---
 .../actions/CategorizeGroupAction.java        |  5 +-
 .../CategorizeSelectedFilesAction.java        |  5 +-
 .../imagegallery/datamodel/Category.java      | 19 ++++--
 .../autopsy/imagegallery/gui/Toolbar.java     | 28 ++++-----
 .../gui/drawableviews/GroupPane.java          | 61 ++++++++-----------
 5 files changed, 55 insertions(+), 63 deletions(-)

diff --git a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/actions/CategorizeGroupAction.java b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/actions/CategorizeGroupAction.java
index e0861b9870..0afe49eade 100644
--- a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/actions/CategorizeGroupAction.java
+++ b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/actions/CategorizeGroupAction.java
@@ -20,11 +20,9 @@ package org.sleuthkit.autopsy.imagegallery.actions;
 
 import com.google.common.collect.ImmutableSet;
 import java.util.Set;
-import javafx.scene.image.ImageView;
 import org.controlsfx.control.action.Action;
 import org.sleuthkit.autopsy.imagegallery.ImageGalleryController;
 import org.sleuthkit.autopsy.imagegallery.datamodel.Category;
-import org.sleuthkit.autopsy.imagegallery.datamodel.DrawableAttribute;
 
 /**
  *
@@ -36,7 +34,6 @@ public class CategorizeGroupAction extends Action {
             Set<Long> fileIdSet = ImmutableSet.copyOf(controller.viewState().get().getGroup().getFileIDs());
             new CategorizeAction(controller).addTagsToFiles(controller.getTagsManager().getTagName(cat), "", fileIdSet);
         });
-        setGraphic(new ImageView(DrawableAttribute.CATEGORY.getIcon()));
+        setGraphic(cat.getGraphic());
     }
-
 }
diff --git a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/actions/CategorizeSelectedFilesAction.java b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/actions/CategorizeSelectedFilesAction.java
index 9c272c25cd..9125771d34 100644
--- a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/actions/CategorizeSelectedFilesAction.java
+++ b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/actions/CategorizeSelectedFilesAction.java
@@ -18,11 +18,9 @@
  */
 package org.sleuthkit.autopsy.imagegallery.actions;
 
-import javafx.scene.image.ImageView;
 import org.controlsfx.control.action.Action;
 import org.sleuthkit.autopsy.imagegallery.ImageGalleryController;
 import org.sleuthkit.autopsy.imagegallery.datamodel.Category;
-import org.sleuthkit.autopsy.imagegallery.datamodel.DrawableAttribute;
 
 /**
  *
@@ -31,7 +29,6 @@ public class CategorizeSelectedFilesAction extends Action {
 
     public CategorizeSelectedFilesAction(Category cat, ImageGalleryController controller) {
         super(cat.getDisplayName(), (javafx.event.ActionEvent actionEvent) -> new CategorizeAction(controller).addTag(controller.getTagsManager().getTagName(cat), ""));
-        setGraphic(new ImageView(DrawableAttribute.CATEGORY.getIcon()));
+        setGraphic(cat.getGraphic());
     }
-
 }
diff --git a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/Category.java b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/Category.java
index 5717828fe7..fd112e1ab3 100644
--- a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/Category.java
+++ b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/Category.java
@@ -23,18 +23,20 @@ import java.util.Map;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
+import javafx.scene.Node;
 import javafx.scene.paint.Color;
+import javafx.scene.shape.Rectangle;
 import org.openide.util.NbBundle;
 
 /**
  * Enum to represent the six categories in the DHS image categorization scheme.
  */
 @NbBundle.Messages({"Category.one=CAT-1: Child Exploitation (Illegal)",
-        "Category.two=CAT-2: Child Exploitation (Non-Illegal/Age Difficult)",
-        "Category.three=CAT-3: CGI/Animation (Child Exploitive)",
-        "Category.four=CAT-4: Exemplar/Comparison (Internal Use Only)",
-        "Category.five=CAT-5: Non-pertinent",
-        "Category.zero=CAT-0: Uncategorized"})
+    "Category.two=CAT-2: Child Exploitation (Non-Illegal/Age Difficult)",
+    "Category.three=CAT-3: CGI/Animation (Child Exploitive)",
+    "Category.four=CAT-4: Exemplar/Comparison (Internal Use Only)",
+    "Category.five=CAT-5: Non-pertinent",
+    "Category.zero=CAT-0: Uncategorized"})
 public enum Category {
 
     /*
@@ -104,4 +106,11 @@ public enum Category {
     public String toString() {
         return displayName;
     }
+
+    public Node getGraphic() {
+        Rectangle rectangle = new Rectangle(16d, 16d, getColor());
+        rectangle.setArcHeight(8);
+        rectangle.setArcWidth(8);
+        return rectangle;
+    }
 }
diff --git a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/Toolbar.java b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/Toolbar.java
index 5c68a94436..d8d743160e 100644
--- a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/Toolbar.java
+++ b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/Toolbar.java
@@ -37,7 +37,6 @@ import javafx.scene.control.Slider;
 import javafx.scene.control.SplitMenuButton;
 import javafx.scene.control.ToggleGroup;
 import javafx.scene.control.ToolBar;
-import javafx.scene.image.ImageView;
 import javafx.scene.layout.HBox;
 import javax.swing.SortOrder;
 import org.sleuthkit.autopsy.coreutils.Logger;
@@ -138,15 +137,14 @@ public class Toolbar extends ToolBar {
         });
         syncGroupControlsEnabledState(controller.viewState().get());
 
-        tagGroupMenuButton.setOnAction(actionEvent -> {
-            try {
-                new TagGroupAction(controller.getTagsManager().getFollowUpTagName(), controller).handle(actionEvent);
-            } catch (TskCoreException ex) {
-                LOGGER.log(Level.SEVERE, "Could create follow up tag menu item", ex); //NON-NLS
-            }
-        });
-
-        tagGroupMenuButton.setGraphic(new ImageView(DrawableAttribute.TAGS.getIcon()));
+        try {
+            TagGroupAction followUpGroupAction = new TagGroupAction(controller.getTagsManager().getFollowUpTagName(), controller);
+            tagGroupMenuButton.setOnAction(followUpGroupAction);
+            tagGroupMenuButton.setText(followUpGroupAction.getText());
+            tagGroupMenuButton.setGraphic(followUpGroupAction.getGraphic());
+        } catch (TskCoreException ex) {
+            LOGGER.log(Level.SEVERE, "Could create follow up tag menu item", ex); //NON-NLS
+        }
         tagGroupMenuButton.showingProperty().addListener(showing -> {
             if (tagGroupMenuButton.isShowing()) {
                 List<MenuItem> selTagMenues = Lists.transform(controller.getTagsManager().getNonCategoryTagNames(),
@@ -155,9 +153,10 @@ public class Toolbar extends ToolBar {
             }
         });
 
-        catGroupMenuButton.setOnAction(new CategorizeGroupAction(Category.FIVE, controller));
-        catGroupMenuButton.setText(Category.FIVE.getDisplayName());
-        catGroupMenuButton.setGraphic(new ImageView(DrawableAttribute.CATEGORY.getIcon()));
+        CategorizeGroupAction cat5GroupAction = new CategorizeGroupAction(Category.FIVE, controller);
+        catGroupMenuButton.setOnAction(cat5GroupAction);
+        catGroupMenuButton.setText(cat5GroupAction.getText());
+        catGroupMenuButton.setGraphic(cat5GroupAction.getGraphic());
         catGroupMenuButton.showingProperty().addListener(showing -> {
             if (catGroupMenuButton.isShowing()) {
                 List<MenuItem> categoryMenues = Lists.transform(Arrays.asList(Category.values()),
@@ -186,11 +185,8 @@ public class Toolbar extends ToolBar {
 
         });
         sortByBox.getSelectionModel().select(GroupSortBy.PRIORITY);
-//        ascRadio.disableProperty().bind(sortByBox.getSelectionModel().selectedItemProperty().isEqualTo(GroupSortBy.NONE));
-//        descRadio.disableProperty().bind(sortByBox.getSelectionModel().selectedItemProperty().isEqualTo(GroupSortBy.NONE));
 
         orderGroup.selectedToggleProperty().addListener(queryInvalidationListener);
-
     }
 
     private void syncGroupControlsEnabledState(GroupViewState newViewState) {
diff --git a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/drawableviews/GroupPane.java b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/drawableviews/GroupPane.java
index 0df14b3a92..1fb3f46022 100644
--- a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/drawableviews/GroupPane.java
+++ b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/drawableviews/GroupPane.java
@@ -60,7 +60,6 @@ import javafx.scene.control.SplitMenuButton;
 import javafx.scene.control.ToggleButton;
 import javafx.scene.control.ToolBar;
 import javafx.scene.effect.DropShadow;
-import javafx.scene.image.ImageView;
 import javafx.scene.input.KeyCode;
 import static javafx.scene.input.KeyCode.DIGIT0;
 import static javafx.scene.input.KeyCode.DIGIT1;
@@ -114,7 +113,6 @@ import org.sleuthkit.autopsy.imagegallery.ImageGalleryTopComponent;
 import org.sleuthkit.autopsy.imagegallery.actions.AddDrawableTagAction;
 import org.sleuthkit.autopsy.imagegallery.actions.Back;
 import org.sleuthkit.autopsy.imagegallery.actions.CategorizeAction;
-import org.sleuthkit.autopsy.imagegallery.actions.CategorizeGroupAction;
 import org.sleuthkit.autopsy.imagegallery.actions.CategorizeSelectedFilesAction;
 import org.sleuthkit.autopsy.imagegallery.actions.Forward;
 import org.sleuthkit.autopsy.imagegallery.actions.NextUnseenGroup;
@@ -123,7 +121,6 @@ import org.sleuthkit.autopsy.imagegallery.actions.SwingMenuItemAdapter;
 import org.sleuthkit.autopsy.imagegallery.actions.TagSelectedFilesAction;
 import org.sleuthkit.autopsy.imagegallery.actions.UndoAction;
 import org.sleuthkit.autopsy.imagegallery.datamodel.Category;
-import org.sleuthkit.autopsy.imagegallery.datamodel.DrawableAttribute;
 import org.sleuthkit.autopsy.imagegallery.datamodel.DrawableFile;
 import org.sleuthkit.autopsy.imagegallery.datamodel.grouping.DrawableGroup;
 import org.sleuthkit.autopsy.imagegallery.datamodel.grouping.GroupViewMode;
@@ -412,40 +409,30 @@ public class GroupPane extends BorderPane {
         BooleanBinding isSelectionEmpty = Bindings.isEmpty(selectionModel.getSelected());
         catSelectedSplitMenu.disableProperty().bind(isSelectionEmpty);
         tagSelectedSplitMenu.disableProperty().bind(isSelectionEmpty);
-//        selectionModel.getSelected().addListener((Observable o) -> {
-//            Platform.runLater(() -> {
-//                catSelectedSplitMenu.setDisable(selectionModel.getSelected().isEmpty());
-//                tagSelectedSplitMenu.setDisable(selectionModel.getSelected().isEmpty());
-//            });
-//        });
 
         Platform.runLater(() -> {
             try {
-                tagSelectedSplitMenu.setText(controller.getTagsManager().getFollowUpTagName().getDisplayName());
+                TagSelectedFilesAction followUpSelectedACtion = new TagSelectedFilesAction(controller.getTagsManager().getFollowUpTagName(), controller);
+                tagSelectedSplitMenu.setText(followUpSelectedACtion.getText());
+                tagSelectedSplitMenu.setGraphic(followUpSelectedACtion.getGraphic());
+                tagSelectedSplitMenu.setOnAction(followUpSelectedACtion);
             } catch (TskCoreException tskCoreException) {
                 LOGGER.log(Level.WARNING, "failed to load FollowUpTagName", tskCoreException); //NON-NLS
             }
+            tagSelectedSplitMenu.showingProperty().addListener(showing -> {
+                if (tagSelectedSplitMenu.isShowing()) {
+                    List<MenuItem> selTagMenues = Lists.transform(controller.getTagsManager().getNonCategoryTagNames(),
+                            tagName -> GuiUtils.createAutoAssigningMenuItem(tagSelectedSplitMenu, new TagSelectedFilesAction(tagName, controller)));
+                    tagSelectedSplitMenu.getItems().setAll(selTagMenues);
+                }
+            });
+
         });
 
-        tagSelectedSplitMenu.setOnAction(actionEvent -> {
-            try {
-                new TagSelectedFilesAction(controller.getTagsManager().getFollowUpTagName(), controller).handle(actionEvent);
-            } catch (TskCoreException tskCoreException) {
-                LOGGER.log(Level.WARNING, "failed to load FollowUpTagName", tskCoreException); //NON-NLS
-            }
-        });
-        tagSelectedSplitMenu.setGraphic(new ImageView(DrawableAttribute.TAGS.getIcon()));
-        tagSelectedSplitMenu.showingProperty().addListener(showing -> {
-            if (tagSelectedSplitMenu.isShowing()) {
-                List<MenuItem> selTagMenues = Lists.transform(controller.getTagsManager().getNonCategoryTagNames(),
-                        tagName -> GuiUtils.createAutoAssigningMenuItem(tagSelectedSplitMenu, new TagSelectedFilesAction(tagName, controller)));
-                tagSelectedSplitMenu.getItems().setAll(selTagMenues);
-            }
-        });
-
-        catSelectedSplitMenu.setOnAction(new CategorizeGroupAction(Category.FIVE, controller));
-        catSelectedSplitMenu.setText(Category.FIVE.getDisplayName());
-        catSelectedSplitMenu.setGraphic(new ImageView(DrawableAttribute.CATEGORY.getIcon()));
+        CategorizeSelectedFilesAction cat5SelectedAction = new CategorizeSelectedFilesAction(Category.FIVE, controller);
+        catSelectedSplitMenu.setOnAction(cat5SelectedAction);
+        catSelectedSplitMenu.setText(cat5SelectedAction.getText());
+        catSelectedSplitMenu.setGraphic(cat5SelectedAction.getGraphic());
         catSelectedSplitMenu.showingProperty().addListener(showing -> {
             if (catSelectedSplitMenu.isShowing()) {
                 List<MenuItem> categoryMenues = Lists.transform(Arrays.asList(Category.values()),
@@ -459,11 +446,17 @@ public class GroupPane extends BorderPane {
         tileToggle.getStyleClass().remove("radio-button");
         tileToggle.getStyleClass().add("toggle-button");
 
-        BooleanBinding equal = Bindings.equal(GroupViewMode.SLIDE_SHOW, groupViewMode);
-        catSegmentedContainer.visibleProperty().bind(equal);
-        catSegmentedContainer.managedProperty().bind(equal);
-        catSplitMenuContainer.visibleProperty().bind(equal.not());
-        catSplitMenuContainer.managedProperty().bind(equal.not());
+        //show categorization controls depending on group view mode
+        headerToolBar.getItems().remove(catSegmentedContainer);
+        groupViewMode.addListener((ObservableValue<? extends GroupViewMode> observable, GroupViewMode oldValue, GroupViewMode newValue) -> {
+            if (newValue == GroupViewMode.SLIDE_SHOW) {
+                headerToolBar.getItems().remove(catSplitMenuContainer);
+                headerToolBar.getItems().add(catSegmentedContainer);
+            } else {
+                headerToolBar.getItems().remove(catSegmentedContainer);
+                headerToolBar.getItems().add(catSplitMenuContainer);
+            }
+        });
 
         //listen to toggles and update view state
         slideShowToggle.setOnAction(onAction -> activateSlideShowViewer(selectionModel.lastSelectedProperty().get()));

From 7a7e5b41f5854aa8e701f6e660e3bc678ce5c084 Mon Sep 17 00:00:00 2001
From: jmillman <jmillman@basistech.com>
Date: Thu, 4 Feb 2016 11:22:53 -0500
Subject: [PATCH 44/68] fix copyright dates

---
 .../autopsy/imagegallery/actions/CategorizeGroupAction.java    | 2 +-
 .../imagegallery/actions/CategorizeSelectedFilesAction.java    | 2 +-
 .../src/org/sleuthkit/autopsy/imagegallery/gui/Toolbar.java    | 3 +--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/actions/CategorizeGroupAction.java b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/actions/CategorizeGroupAction.java
index 0afe49eade..b060b645c9 100644
--- a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/actions/CategorizeGroupAction.java
+++ b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/actions/CategorizeGroupAction.java
@@ -1,7 +1,7 @@
 /*
  * Autopsy Forensic Browser
  *
- * Copyright 2015 Basis Technology Corp.
+ * Copyright 2015-16 Basis Technology Corp.
  * Contact: carrier <at> sleuthkit <dot> org
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/actions/CategorizeSelectedFilesAction.java b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/actions/CategorizeSelectedFilesAction.java
index 9125771d34..04a2a93e9e 100644
--- a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/actions/CategorizeSelectedFilesAction.java
+++ b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/actions/CategorizeSelectedFilesAction.java
@@ -1,7 +1,7 @@
 /*
  * Autopsy Forensic Browser
  *
- * Copyright 2015 Basis Technology Corp.
+ * Copyright 2015-16 Basis Technology Corp.
  * Contact: carrier <at> sleuthkit <dot> org
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/Toolbar.java b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/Toolbar.java
index d8d743160e..e8c221ec91 100644
--- a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/Toolbar.java
+++ b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/Toolbar.java
@@ -1,7 +1,7 @@
 /*
  * Autopsy Forensic Browser
  *
- * Copyright 2013-15 Basis Technology Corp.
+ * Copyright 2013-16 Basis Technology Corp.
  * Contact: carrier <at> sleuthkit <dot> org
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -211,5 +211,4 @@ public class Toolbar extends ToolBar {
         this.controller = controller;
         FXMLConstructor.construct(this, "Toolbar.fxml"); //NON-NLS
     }
-
 }

From 10334f4d6ab8cd7ff3808b0abdaaf12e0e61ffa8 Mon Sep 17 00:00:00 2001
From: Brian Carrier <carrier@sleuthkit.org>
Date: Thu, 4 Feb 2016 11:35:38 -0500
Subject: [PATCH 45/68] Added links to tutorials and other minor updates

---
 docs/doxygen/main.dox         | 15 +++++++++++----
 docs/doxygen/modDevPython.dox |  7 ++++---
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/docs/doxygen/main.dox b/docs/doxygen/main.dox
index 9b4510f820..22bcd097ad 100755
--- a/docs/doxygen/main.dox
+++ b/docs/doxygen/main.dox
@@ -1,13 +1,19 @@
 /*! \mainpage Autopsy Forensic Browser Developer's Guide and API Reference
 
 <h3>Overview</h3>
-Autopsy has been designed as a platform for open source tools besides just The Sleuth Kit.  This document is for developers who want to add functionality into Autopsy.  This could be in the form of enhancing the existing functionality or by making a plug-in module.  Plug-in modules can be distributed from your own website (or contributed back).
+<a href="http://www.sleuthkit.org/autopsy/">Autopsy</a> has been designed as a digital forensics platform to incorporate third-party modules (either open or closed source).  This document is for developers who want to write add-on modules or modify the internal Autopsy framework. 
 
-If you are looking for documentation on using Autopsy, refer to http://sleuthkit.org/autopsy/docs/user-docs/.
+If you are a user and are looking for documentation on how to use Autopsy, refer to the <a href="http://sleuthkit.org/autopsy/docs/user-docs/">User Docs</a>.
 
-If these pages don't answer your question, then send the question to The Sleuth Kit Developer's List (https://lists.sourceforge.net/lists/listinfo/sleuthkit-developers). 
+If these pages don't answer your question, then send the question to the <a href="https://lists.sourceforge.net/lists/listinfo/sleuthkit-developers">Sleuth Kit Developer's List</a>. 
 
-If you want to write modules, then these pages are for you:
+<h3>Writing Python or Java Modules</h3>
+If you want to write Java or Python modules, then there are some tutorials and detailed pages in this document. The Python tutorials include:
+- File Ingest Modules: http://www.basistech.com/python-autopsy-module-tutorial-1-the-file-ingest-module/
+- Data Source Ingest Modules: http://www.basistech.com/python-autopsy-module-tutorial-2-the-data-source-ingest-module/
+- Report Modules: http://www.basistech.com/python-autopsy-module-tutorial-3-the-report-module/
+
+This document contains the following pages: 
 - \subpage platform_page
 - Setup
  - \subpage mod_dev_page
@@ -21,6 +27,7 @@ If you want to write modules, then these pages are for you:
 - <a class="el" href="http://sleuthkit.org/sleuthkit/docs/jni-docs/4.3/query_database_page.html">Query the Database</A>
 - \subpage mod_mobile_page
 
+<h3>Modifying Autopsy</h3>
 These pages are more detailed if you want to modify Autopsy code instead of writing add-on modules. 
 - \subpage workflow_page
 - \subpage regression_test_page 
diff --git a/docs/doxygen/modDevPython.dox b/docs/doxygen/modDevPython.dox
index 45c3fc30a2..2e459d6939 100755
--- a/docs/doxygen/modDevPython.dox
+++ b/docs/doxygen/modDevPython.dox
@@ -15,10 +15,11 @@ Using it is very easy though in Autopsy and it allows you to access all of the J
 
 To develop a module, you should follow this section to get your environment setup and then read the later sections on the different types of modules. 
 
-There are also a set of tutorials that Basis Technology published on their blog:
+There are also a set of tutorials that Basis Technology published on their blog.  While not as thorough as this documentation, they are an easy introduction to the general ideas. 
 
-* File Ingest Modules: http://www.basistech.com/python-autopsy-module-tutorial-1-the-file-ingest-module/
-* Data Source Ingest Modules: http://www.basistech.com/python-autopsy-module-tutorial-2-the-data-source-ingest-module/
+- File Ingest Modules: http://www.basistech.com/python-autopsy-module-tutorial-1-the-file-ingest-module/
+- Data Source Ingest Modules: http://www.basistech.com/python-autopsy-module-tutorial-2-the-data-source-ingest-module/
+- Report Modules: http://www.basistech.com/python-autopsy-module-tutorial-3-the-report-module/
 
 
 \section mod_dev_py_setup Basic Setup

From f0be8b10cf9d1d2deac73c70f74b0075670408cc Mon Sep 17 00:00:00 2001
From: Karl Mortensen <kmortensen@basistech.com>
Date: Thu, 4 Feb 2016 15:20:55 -0500
Subject: [PATCH 46/68] uppercase the drive name to check for UNC mapping

---
 Core/src/org/sleuthkit/autopsy/coreutils/UNCPathUtilities.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Core/src/org/sleuthkit/autopsy/coreutils/UNCPathUtilities.java b/Core/src/org/sleuthkit/autopsy/coreutils/UNCPathUtilities.java
index 103a94013c..9ba40b7a08 100644
--- a/Core/src/org/sleuthkit/autopsy/coreutils/UNCPathUtilities.java
+++ b/Core/src/org/sleuthkit/autopsy/coreutils/UNCPathUtilities.java
@@ -84,7 +84,7 @@ public class UNCPathUtilities {
                 String uncPath = null;
                 try {
                     String currentDrive = Paths.get(inputPath).getRoot().toString().substring(STARTING_OFFSET, REPLACEMENT_SIZE);
-                    String uncMapping = drives.get(currentDrive);
+                    String uncMapping = drives.get(currentDrive.toUpperCase());
                     if (uncMapping != null) {
                         uncPath = uncMapping + inputPath.substring(REPLACEMENT_SIZE, inputPath.length());
                     }

From d8752fcadc4d8a35c8fde92eea0bd15bf9757faa Mon Sep 17 00:00:00 2001
From: jmillman <jmillman@basistech.com>
Date: Thu, 4 Feb 2016 15:01:50 -0500
Subject: [PATCH 47/68] add follow up flag image to follow up action and in
 group list , improve category "icons"; cleanup toolbar labels to match group
 labels

---
 .../imagegallery/actions/TagGroupAction.java  |  6 +-
 .../actions/TagSelectedFilesAction.java       |  6 +-
 .../imagegallery/datamodel/Category.java      | 22 +++--
 .../datamodel/DrawableAttribute.java          | 44 +++++----
 .../datamodel/DrawableTagsManager.java        | 38 ++++++--
 .../datamodel/grouping/GroupKey.java          |  8 +-
 .../autopsy/imagegallery/gui/Toolbar.fxml     | 90 +++++++++++++------
 .../autopsy/imagegallery/gui/Toolbar.java     |  6 +-
 .../gui/drawableviews/GroupPane.java          | 11 ++-
 .../gui/navpanel/GroupListCell.java           | 19 ++--
 .../imagegallery/gui/navpanel/GroupTree.java  |  3 +-
 .../gui/navpanel/GroupTreeCell.java           | 25 ++++--
 .../gui/navpanel/HashHitGroupList.java        |  2 +-
 13 files changed, 187 insertions(+), 93 deletions(-)

diff --git a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/actions/TagGroupAction.java b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/actions/TagGroupAction.java
index dc7db4074c..c53d796a60 100644
--- a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/actions/TagGroupAction.java
+++ b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/actions/TagGroupAction.java
@@ -1,7 +1,7 @@
 /*
  * Autopsy Forensic Browser
  *
- * Copyright 2015 Basis Technology Corp.
+ * Copyright 2015-16 Basis Technology Corp.
  * Contact: carrier <at> sleuthkit <dot> org
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -20,10 +20,8 @@ package org.sleuthkit.autopsy.imagegallery.actions;
 
 import com.google.common.collect.ImmutableSet;
 import java.util.Set;
-import javafx.scene.image.ImageView;
 import org.controlsfx.control.action.Action;
 import org.sleuthkit.autopsy.imagegallery.ImageGalleryController;
-import org.sleuthkit.autopsy.imagegallery.datamodel.DrawableAttribute;
 import org.sleuthkit.datamodel.TagName;
 
 /**
@@ -36,6 +34,6 @@ public class TagGroupAction extends Action {
             Set<Long> fileIdSet = ImmutableSet.copyOf(controller.viewState().get().getGroup().getFileIDs());
             new AddDrawableTagAction(controller).addTagsToFiles(tagName, "", fileIdSet);
         });
-        setGraphic(new ImageView(DrawableAttribute.TAGS.getIcon()));
+        setGraphic(controller.getTagsManager().getGraphic(tagName));
     }
 }
diff --git a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/actions/TagSelectedFilesAction.java b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/actions/TagSelectedFilesAction.java
index 33bf74bb9b..3aafc804a1 100644
--- a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/actions/TagSelectedFilesAction.java
+++ b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/actions/TagSelectedFilesAction.java
@@ -1,7 +1,7 @@
 /*
  * Autopsy Forensic Browser
  *
- * Copyright 2015 Basis Technology Corp.
+ * Copyright 2015-16 Basis Technology Corp.
  * Contact: carrier <at> sleuthkit <dot> org
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,10 +18,8 @@
  */
 package org.sleuthkit.autopsy.imagegallery.actions;
 
-import javafx.scene.image.ImageView;
 import org.controlsfx.control.action.Action;
 import org.sleuthkit.autopsy.imagegallery.ImageGalleryController;
-import org.sleuthkit.autopsy.imagegallery.datamodel.DrawableAttribute;
 import org.sleuthkit.datamodel.TagName;
 
 /**
@@ -31,6 +29,6 @@ public class TagSelectedFilesAction extends Action {
 
     public TagSelectedFilesAction(final TagName tagName, ImageGalleryController controller) {
         super(tagName.getDisplayName(), actionEvent -> new AddDrawableTagAction(controller).addTag(tagName, ""));
-        setGraphic(new ImageView(DrawableAttribute.TAGS.getIcon()));
+        setGraphic(controller.getTagsManager().getGraphic(tagName));
     }
 }
diff --git a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/Category.java b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/Category.java
index fd112e1ab3..36d84f90e7 100644
--- a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/Category.java
+++ b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/Category.java
@@ -23,9 +23,17 @@ import java.util.Map;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
+import javafx.geometry.Insets;
 import javafx.scene.Node;
+import javafx.scene.layout.Background;
+import javafx.scene.layout.BackgroundFill;
+import javafx.scene.layout.Border;
+import javafx.scene.layout.BorderStroke;
+import javafx.scene.layout.BorderStrokeStyle;
+import javafx.scene.layout.BorderWidths;
+import javafx.scene.layout.CornerRadii;
+import javafx.scene.layout.Region;
 import javafx.scene.paint.Color;
-import javafx.scene.shape.Rectangle;
 import org.openide.util.NbBundle;
 
 /**
@@ -51,6 +59,9 @@ public enum Category {
     FIVE(Color.GREEN, 5, Bundle.Category_five()),
     ZERO(Color.LIGHTGREY, 0, Bundle.Category_zero());
 
+    private static final BorderWidths BORDER_WIDTHS_2 = new BorderWidths(2);
+    private static final CornerRadii CORNER_RADII_4 = new CornerRadii(4);
+
     public static ImmutableList<Category> getNonZeroCategories() {
         return nonZeroCategories;
     }
@@ -108,9 +119,10 @@ public enum Category {
     }
 
     public Node getGraphic() {
-        Rectangle rectangle = new Rectangle(16d, 16d, getColor());
-        rectangle.setArcHeight(8);
-        rectangle.setArcWidth(8);
-        return rectangle;
+        Region region = new Region();
+        region.setBackground(new Background(new BackgroundFill(getColor(), CORNER_RADII_4, Insets.EMPTY)));
+        region.setPrefSize(16, 16);
+        region.setBorder(new Border(new BorderStroke(getColor().darker(), BorderStrokeStyle.SOLID, CORNER_RADII_4, BORDER_WIDTHS_2)));
+        return region;
     }
 }
diff --git a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/DrawableAttribute.java b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/DrawableAttribute.java
index 8222c1effe..f0f956a304 100644
--- a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/DrawableAttribute.java
+++ b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/DrawableAttribute.java
@@ -25,7 +25,9 @@ import java.util.List;
 import java.util.function.Function;
 import javafx.beans.property.ReadOnlyStringWrapper;
 import javafx.beans.property.StringProperty;
+import javafx.scene.Node;
 import javafx.scene.image.Image;
+import javafx.scene.image.ImageView;
 import org.apache.commons.lang3.StringUtils;
 import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.datamodel.ContentUtils;
@@ -39,20 +41,20 @@ import org.sleuthkit.datamodel.TagName;
  * of type paramaters and multivalued attributes
  */
 @NbBundle.Messages({"DrawableAttribute.md5hash=MD5 Hash",
-        "DrawableAttribute.name=Name",
-        "DrawableAttribute.analyzed=Analyzed",
-        "DrawableAttribute.category=Category",
-        "DrawableAttribute.tags=Tags",
-        "DrawableAttribute.path=Path",
-        "DrawableAttribute.createdTime=Created Time",
-        "DrawableAttribute.modifiedTime=Modified Time",
-        "DrawableAttribute.cameraMake=Camera Make",
-        "DrawableAttribute.cameraModel=Camera Model",
-        "DrawableAttribute.hashSet=Hashset",
-        "DrawableAttribute.intObjID=Internal Object ID",
-        "DrawableAttribute.width=Width",
-        "DrawableAttribute.height=Height",
-        "DrawableAttribute.mimeType=MIME type"})
+    "DrawableAttribute.name=Name",
+    "DrawableAttribute.analyzed=Analyzed",
+    "DrawableAttribute.category=Category",
+    "DrawableAttribute.tags=Tags",
+    "DrawableAttribute.path=Path",
+    "DrawableAttribute.createdTime=Created Time",
+    "DrawableAttribute.modifiedTime=Modified Time",
+    "DrawableAttribute.cameraMake=Camera Make",
+    "DrawableAttribute.cameraModel=Camera Model",
+    "DrawableAttribute.hashSet=Hashset",
+    "DrawableAttribute.intObjID=Internal Object ID",
+    "DrawableAttribute.width=Width",
+    "DrawableAttribute.height=Height",
+    "DrawableAttribute.mimeType=MIME type"})
 public class DrawableAttribute<T extends Comparable<T>> {
 
     public final static DrawableAttribute<String> MD5_HASH =
@@ -82,10 +84,16 @@ public class DrawableAttribute<T extends Comparable<T>> {
      * advantage. move categories into DrawableDB?
      */
     public final static DrawableAttribute<Category> CATEGORY =
-            new DrawableAttribute<>(AttributeName.CATEGORY, Bundle.DrawableAttribute_category(),
+            new DrawableAttribute<Category>(AttributeName.CATEGORY, Bundle.DrawableAttribute_category(),
                     false,
                     "category-icon.png", //NON-NLS
-                    f -> Collections.singleton(f.getCategory()));
+                    f -> Collections.singleton(f.getCategory())) {
+
+                @Override
+                public Node getGraphicForValue(Category val) {
+                    return val.getGraphic();
+                }
+            };
 
     public final static DrawableAttribute<TagName> TAGS =
             new DrawableAttribute<>(AttributeName.TAGS, Bundle.DrawableAttribute_tags(),
@@ -195,8 +203,8 @@ public class DrawableAttribute<T extends Comparable<T>> {
      * TODO: override this to load per value icons form some attributes like
      * mime-type and category
      */
-    public Image getIconForValue(T val) {
-        return getIcon();
+    public Node getGraphicForValue(T val) {
+        return new ImageView(getIcon());
     }
 
     public static List<DrawableAttribute<?>> getGroupableAttrs() {
diff --git a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/DrawableTagsManager.java b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/DrawableTagsManager.java
index cdadb53b94..ea2f17f62e 100644
--- a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/DrawableTagsManager.java
+++ b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/DrawableTagsManager.java
@@ -1,7 +1,7 @@
 /*
  * Autopsy Forensic Browser
  *
- * Copyright 2013-15 Basis Technology Corp.
+ * Copyright 2013-16 Basis Technology Corp.
  * Contact: carrier <at> sleuthkit <dot> org
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -26,6 +26,9 @@ import java.util.Objects;
 import java.util.concurrent.Executors;
 import java.util.logging.Level;
 import java.util.stream.Collectors;
+import javafx.scene.Node;
+import javafx.scene.image.Image;
+import javafx.scene.image.ImageView;
 import javax.annotation.Nonnull;
 import org.apache.commons.lang3.concurrent.BasicThreadFactory;
 import org.openide.util.NbBundle;
@@ -40,7 +43,7 @@ import org.sleuthkit.datamodel.TskCoreException;
 
 /**
  * Manages Tags, Tagging, and the relationship between Categories and Tags in
- * the autopsy Db. delegates some, work to the backing {@link TagsManager}.
+ * the autopsy Db. Delegates some work to the backing {@link TagsManager}.
  */
 @NbBundle.Messages({"DrawableTagsManager.followUp=Follow Up"})
 public class DrawableTagsManager {
@@ -48,11 +51,14 @@ public class DrawableTagsManager {
     private static final Logger LOGGER = Logger.getLogger(DrawableTagsManager.class.getName());
 
     private static final String FOLLOW_UP = Bundle.DrawableTagsManager_followUp();
+    private static Image FOLLOW_UP_IMAGE;
 
     final private Object autopsyTagsManagerLock = new Object();
     private TagsManager autopsyTagsManager;
 
-    /** Used to distribute {@link TagsChangeEvent}s */
+    /**
+     * Used to distribute {@link TagsChangeEvent}s
+     */
     private final EventBus tagsEventBus = new AsyncEventBus(
             Executors.newSingleThreadExecutor(
                     new BasicThreadFactory.Builder().namingPattern("Tags Event Bus").uncaughtExceptionHandler((Thread t, Throwable e) -> { //NON-NLS
@@ -60,7 +66,9 @@ public class DrawableTagsManager {
                     }).build()
             ));
 
-    /** The tag name corresponding to the "built-in" tag "Follow Up" */
+    /**
+     * The tag name corresponding to the "built-in" tag "Follow Up"
+     */
     private TagName followUpTagName;
 
     public DrawableTagsManager(TagsManager autopsyTagsManager) {
@@ -137,8 +145,8 @@ public class DrawableTagsManager {
      * get all the TagNames that are not categories
      *
      * @return all the TagNames that are not categories, in alphabetical order
-     *         by displayName, or, an empty set if there was an exception looking them
-     *         up from the db.
+     *         by displayName, or, an empty set if there was an exception
+     *         looking them up from the db.
      */
     @Nonnull
     public List<TagName> getNonCategoryTagNames() {
@@ -228,4 +236,22 @@ public class DrawableTagsManager {
             autopsyTagsManager.deleteContentTag(ct);
         }
     }
+
+    public Node getGraphic(TagName tagname) {
+        try {
+            if (tagname.equals(getFollowUpTagName())) {
+                return new ImageView(getFollowUpImage());
+            }
+        } catch (TskCoreException ex) {
+            LOGGER.log(Level.SEVERE, "Failed to get \"Follow Up\" tag name from db.", ex);
+        }
+        return DrawableAttribute.TAGS.getGraphicForValue(tagname);
+    }
+
+    synchronized private static Image getFollowUpImage() {
+        if (FOLLOW_UP_IMAGE == null) {
+            FOLLOW_UP_IMAGE = new Image("/org/sleuthkit/autopsy/imagegallery/images/flag_red.png");
+        }
+        return FOLLOW_UP_IMAGE;
+    }
 }
diff --git a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/grouping/GroupKey.java b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/grouping/GroupKey.java
index 1073d587da..9945a72313 100644
--- a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/grouping/GroupKey.java
+++ b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/grouping/GroupKey.java
@@ -1,7 +1,7 @@
 /*
  * Autopsy Forensic Browser
  *
- * Copyright 2013 Basis Technology Corp.
+ * Copyright 2013-16 Basis Technology Corp.
  * Contact: carrier <at> sleuthkit <dot> org
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -20,7 +20,7 @@ package org.sleuthkit.autopsy.imagegallery.datamodel.grouping;
 
 import java.util.Map;
 import java.util.Objects;
-import javafx.scene.image.Image;
+import javafx.scene.Node;
 import javax.annotation.concurrent.Immutable;
 import org.sleuthkit.autopsy.imagegallery.datamodel.DrawableAttribute;
 import org.sleuthkit.datamodel.TagName;
@@ -89,7 +89,7 @@ public class GroupKey<T extends Comparable<T>> implements Comparable<GroupKey<T>
         return val.compareTo(o.val);
     }
 
-    public Image getIcon() {
-        return attr.getIconForValue(val);
+    public Node getGraphic() {
+        return attr.getGraphicForValue(val);
     }
 }
diff --git a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/Toolbar.fxml b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/Toolbar.fxml
index 1f71ff7974..4c7b95a273 100644
--- a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/Toolbar.fxml
+++ b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/Toolbar.fxml
@@ -1,11 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import java.lang.*?>
-<?import javafx.scene.control.*?>
-<?import javafx.scene.image.*?>
-<?import javafx.scene.layout.*?>
+<?import javafx.scene.control.ComboBox?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.MenuItem?>
+<?import javafx.scene.control.RadioButton?>
+<?import javafx.scene.control.Separator?>
+<?import javafx.scene.control.Slider?>
+<?import javafx.scene.control.SplitMenuButton?>
+<?import javafx.scene.control.ToggleGroup?>
+<?import javafx.scene.control.ToolBar?>
+<?import javafx.scene.image.Image?>
+<?import javafx.scene.image.ImageView?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.Region?>
+<?import javafx.scene.layout.VBox?>
 
-<fx:root minWidth="-1.0" orientation="HORIZONTAL" prefWidth="-1.0" type="javafx.scene.control.ToolBar" xmlns="http://javafx.com/javafx/8.0.40" xmlns:fx="http://javafx.com/fxml/1">
+<fx:root minWidth="-1.0" orientation="HORIZONTAL" prefWidth="-1.0" type="javafx.scene.control.ToolBar" xmlns="http://javafx.com/javafx/8.0.65" xmlns:fx="http://javafx.com/fxml/1">
   <items>
     <Label text="Group By:">
       <labelFor>
@@ -13,7 +23,7 @@
       </labelFor>
     </Label>
     <fx:reference source="groupByBox" />
-    <Region prefHeight="-1.0" prefWidth="20.0" />
+    <Region prefHeight="-1.0" prefWidth="10.0" />
     <Label text="Sort By:">
       <labelFor>
         <ComboBox fx:id="sortByBox" />
@@ -50,26 +60,54 @@
       </children>
     </HBox>
     <Separator orientation="VERTICAL" prefHeight="-1.0" prefWidth="20.0" />
-    <CheckBox fx:id="onlyAnalyzedCheckBox" allowIndeterminate="false" indeterminate="false" mnemonicParsing="false" prefWidth="16.0" selected="true" text="only analyzed groups" underline="false" visible="false" />
-    <Label contentDisplay="RIGHT" text="Apply to Group:" textOverrun="ELLIPSIS" />
-    <SplitMenuButton id="tagSplitMenu" fx:id="tagGroupMenuButton" disable="true" mnemonicParsing="false" text="Follow Up" textOverrun="ELLIPSIS">
-      <items>
-        <MenuItem mnemonicParsing="false" text="Action 1" />
-        <MenuItem mnemonicParsing="false" text="Action 2" />
-      </items>
-    </SplitMenuButton>
-    <SplitMenuButton id="catSplitMenu" fx:id="catGroupMenuButton" disable="true" mnemonicParsing="false" text="Cat-0">
-      <items>
-        <MenuItem mnemonicParsing="false" text="Action 1" />
-        <MenuItem mnemonicParsing="false" text="Action 2" />
-      </items>
-    </SplitMenuButton>
+      <HBox alignment="CENTER" spacing="5.0">
+         <children>
+            <Label text="Tag Group's Files:">
+               <graphic>
+                  <ImageView fitHeight="16.0" fitWidth="16.0" pickOnBounds="true" preserveRatio="true">
+                     <image>
+                        <Image url="@../images/tag_red.png" />
+                     </image>
+                  </ImageView>
+               </graphic>
+            </Label>
+          <SplitMenuButton id="tagSplitMenu" fx:id="tagGroupMenuButton" disable="true" mnemonicParsing="false" text="Follow Up" textOverrun="ELLIPSIS">
+            <items>
+              <MenuItem mnemonicParsing="false" text="Action 1" />
+              <MenuItem mnemonicParsing="false" text="Action 2" />
+            </items>
+          </SplitMenuButton>
+         </children>
+      </HBox>
+      <HBox alignment="CENTER" spacing="5.0">
+         <children>
+            <Label text="Categorize Group's Files:">
+               <graphic>
+                  <ImageView fitHeight="16.0" fitWidth="16.0" mouseTransparent="true" pickOnBounds="true" preserveRatio="true">
+                     <image>
+                        <Image url="@../images/category-icon.png" />
+                     </image>
+                  </ImageView>
+               </graphic>
+            </Label>
+          <SplitMenuButton id="catSplitMenu" fx:id="catGroupMenuButton" disable="true" mnemonicParsing="false" text="Cat-0">
+            <items>
+              <MenuItem mnemonicParsing="false" text="Action 1" />
+              <MenuItem mnemonicParsing="false" text="Action 2" />
+            </items>
+          </SplitMenuButton>
+         </children>
+      </HBox>
     <Separator orientation="VERTICAL" prefHeight="-1.0" prefWidth="20.0" />
-    <Label text="Thumbnail Size (px):">
-      <labelFor>
-        <Slider fx:id="sizeSlider" blockIncrement="100.0" majorTickUnit="100.0" max="300.0" min="100.0" minorTickCount="0" orientation="HORIZONTAL" prefHeight="-1.0" showTickLabels="true" showTickMarks="true" snapToTicks="true" value="100.0" />
-      </labelFor>
-    </Label>
-    <fx:reference source="sizeSlider" />
+      <HBox alignment="CENTER" spacing="5.0">
+         <children>
+          <Label text="Thumbnail Size (px):">
+            <labelFor>
+              <Slider fx:id="sizeSlider" blockIncrement="100.0" majorTickUnit="100.0" max="300.0" min="100.0" minorTickCount="0" orientation="HORIZONTAL" prefHeight="-1.0" showTickLabels="true" showTickMarks="true" snapToTicks="true" value="100.0" />
+            </labelFor>
+          </Label>
+          <fx:reference source="sizeSlider" />
+         </children>
+      </HBox>
   </items>
 </fx:root>
diff --git a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/Toolbar.java b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/Toolbar.java
index e8c221ec91..29a4a91e5f 100644
--- a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/Toolbar.java
+++ b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/Toolbar.java
@@ -29,7 +29,6 @@ import javafx.beans.property.DoubleProperty;
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.collections.FXCollections;
 import javafx.fxml.FXML;
-import javafx.scene.control.CheckBox;
 import javafx.scene.control.ComboBox;
 import javafx.scene.control.MenuItem;
 import javafx.scene.control.RadioButton;
@@ -62,9 +61,6 @@ public class Toolbar extends ToolBar {
     @FXML
     private ComboBox<DrawableAttribute<?>> groupByBox;
 
-    @FXML
-    private CheckBox onlyAnalyzedCheckBox;
-
     @FXML
     private Slider sizeSlider;
 
@@ -125,7 +121,7 @@ public class Toolbar extends ToolBar {
         assert catGroupMenuButton != null : "fx:id=\"catSelectedMenubutton\" was not injected: check your FXML file 'Toolbar.fxml'.";
         assert descRadio != null : "fx:id=\"descRadio\" was not injected: check your FXML file 'Toolbar.fxml'.";
         assert groupByBox != null : "fx:id=\"groupByBox\" was not injected: check your FXML file 'Toolbar.fxml'.";
-        assert onlyAnalyzedCheckBox != null : "fx:id=\"onlyAnalyzedCheckBox\" was not injected: check your FXML file 'Toolbar.fxml'.";
+
         assert orderGroup != null : "fx:id=\"orderGroup\" was not injected: check your FXML file 'Toolbar.fxml'.";
         assert sizeSlider != null : "fx:id=\"sizeSlider\" was not injected: check your FXML file 'Toolbar.fxml'.";
         assert sortByBox != null : "fx:id=\"sortByBox\" was not injected: check your FXML file 'Toolbar.fxml'.";
diff --git a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/drawableviews/GroupPane.java b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/drawableviews/GroupPane.java
index 1fb3f46022..bc5b1aec19 100644
--- a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/drawableviews/GroupPane.java
+++ b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/drawableviews/GroupPane.java
@@ -145,6 +145,8 @@ import org.sleuthkit.datamodel.TskCoreException;
 public class GroupPane extends BorderPane {
 
     private static final Logger LOGGER = Logger.getLogger(GroupPane.class.getName());
+    private static final BorderWidths BORDER_WIDTHS_2 = new BorderWidths(2);
+    private static final CornerRadii CORNER_RADII_2 = new CornerRadii(2);
 
     private static final DropShadow DROP_SHADOW = new DropShadow(10, Color.BLUE);
 
@@ -383,10 +385,11 @@ public class GroupPane extends BorderPane {
         assert tileToggle != null : "fx:id=\"tileToggle\" was not injected: check your FXML file 'GroupHeader.fxml'.";
 
         for (Category cat : Category.values()) {
-            getToggleForCategory(cat).setBorder(new Border(new BorderStroke(cat.getColor(), BorderStrokeStyle.SOLID, new CornerRadii(1), new BorderWidths(1))));
-            getToggleForCategory(cat).getStyleClass().remove("radio-button");
-            getToggleForCategory(cat).getStyleClass().add("toggle-button");
-            getToggleForCategory(cat).selectedProperty().addListener((ov, wasSelected, toggleSelected) -> {
+            ToggleButton toggleForCategory = getToggleForCategory(cat);
+            toggleForCategory.setBorder(new Border(new BorderStroke(cat.getColor(), BorderStrokeStyle.SOLID, CORNER_RADII_2, BORDER_WIDTHS_2)));
+            toggleForCategory.getStyleClass().remove("radio-button");
+            toggleForCategory.getStyleClass().add("toggle-button");
+            toggleForCategory.selectedProperty().addListener((ov, wasSelected, toggleSelected) -> {
                 if (toggleSelected && slideShowPane != null) {
                     slideShowPane.getFileID().ifPresent((fileID) -> {
                         selectionModel.clearAndSelect(fileID);
diff --git a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/navpanel/GroupListCell.java b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/navpanel/GroupListCell.java
index 37caa8bd78..6a48dc78b4 100644
--- a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/navpanel/GroupListCell.java
+++ b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/navpanel/GroupListCell.java
@@ -24,13 +24,17 @@ import javafx.application.Platform;
 import javafx.beans.InvalidationListener;
 import javafx.beans.Observable;
 import javafx.beans.property.ReadOnlyObjectProperty;
+import javafx.scene.Node;
 import javafx.scene.control.ListCell;
 import javafx.scene.control.OverrunStyle;
 import javafx.scene.control.Tooltip;
 import javafx.scene.image.Image;
 import javafx.scene.image.ImageView;
 import javax.annotation.Nonnull;
+import org.sleuthkit.autopsy.imagegallery.ImageGalleryController;
+import org.sleuthkit.autopsy.imagegallery.datamodel.DrawableAttribute;
 import org.sleuthkit.autopsy.imagegallery.datamodel.grouping.DrawableGroup;
+import org.sleuthkit.datamodel.TagName;
 
 /**
  *
@@ -66,9 +70,10 @@ class GroupListCell extends ListCell<DrawableGroup> {
     };
 
     private final ReadOnlyObjectProperty<GroupComparators<?>> sortOrder;
+    private final ImageGalleryController controller;
 
-    GroupListCell(ReadOnlyObjectProperty<GroupComparators<?>> sortOrderProperty) {
-
+    GroupListCell(ImageGalleryController controller, ReadOnlyObjectProperty<GroupComparators<?>> sortOrderProperty) {
+        this.controller = controller;
         this.sortOrder = sortOrderProperty;
         getStylesheets().add(GroupTreeCell.class.getResource("GroupTreeCell.css").toExternalForm()); //NON-NLS
         getStyleClass().add("groupTreeCell");        //reduce  indent to 5, default is 10 which uses up a lot of space. NON-NLS
@@ -102,10 +107,10 @@ class GroupListCell extends ListCell<DrawableGroup> {
         } else {
             final String text = getGroupName() + getCountsText();
             String style;
-            Image icon;
+            Node icon;
             if (isNull(group)) {
                 //"dummy" group in file system tree <=>  a folder with no drawables
-                icon = EMPTY_FOLDER_ICON;
+                icon = new ImageView(EMPTY_FOLDER_ICON);
                 style = "";
             } else {
                 //if number of files in this group changes (eg a file is recategorized), update counts via listener
@@ -117,13 +122,15 @@ class GroupListCell extends ListCell<DrawableGroup> {
                 group.seenProperty().addListener(seenListener);
 
                 //and use icon corresponding to group type
-                icon = group.getGroupKey().getIcon();
+                icon = (group.getGroupByAttribute() == DrawableAttribute.TAGS)
+                        ? controller.getTagsManager().getGraphic((TagName) group.getGroupByValue())
+                        : group.getGroupKey().getGraphic();
                 style = getSeenStyleClass();
             }
 
             Platform.runLater(() -> {
                 setTooltip(new Tooltip(text));
-                setGraphic(new ImageView(icon));
+                setGraphic(icon);
                 setText(text);
                 setStyle(style);
             });
diff --git a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/navpanel/GroupTree.java b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/navpanel/GroupTree.java
index ffe9df9a51..0813c91190 100644
--- a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/navpanel/GroupTree.java
+++ b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/navpanel/GroupTree.java
@@ -32,7 +32,6 @@ import javafx.scene.control.TreeItem;
 import javafx.scene.control.TreeView;
 import javafx.scene.image.ImageView;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.poi.util.Beta;
 import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.coreutils.ThreadConfined;
 import org.sleuthkit.autopsy.imagegallery.FXMLConstructor;
@@ -73,7 +72,7 @@ final public class GroupTree extends NavPanel<TreeItem<GroupTreeNode>> {
         getToolBar().visibleProperty().bind(groupedByPath.not());
         getToolBar().managedProperty().bind(groupedByPath.not());
 
-        groupTree.setCellFactory(treeView -> new GroupTreeCell(getSortByBox().getSelectionModel().selectedItemProperty()));
+        groupTree.setCellFactory(treeView -> new GroupTreeCell(getController(), getSortByBox().getSelectionModel().selectedItemProperty()));
         groupTree.setShowRoot(false);
 
         getGroupManager().getAnalyzedGroups().addListener((ListChangeListener.Change<? extends DrawableGroup> change) -> {
diff --git a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/navpanel/GroupTreeCell.java b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/navpanel/GroupTreeCell.java
index a26ec693c7..e81633ad16 100644
--- a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/navpanel/GroupTreeCell.java
+++ b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/navpanel/GroupTreeCell.java
@@ -24,6 +24,7 @@ import javafx.application.Platform;
 import javafx.beans.InvalidationListener;
 import javafx.beans.Observable;
 import javafx.beans.property.ReadOnlyObjectProperty;
+import javafx.scene.Node;
 import javafx.scene.control.OverrunStyle;
 import javafx.scene.control.Tooltip;
 import javafx.scene.control.TreeCell;
@@ -31,7 +32,10 @@ import javafx.scene.image.Image;
 import javafx.scene.image.ImageView;
 import javax.annotation.Nonnull;
 import org.apache.commons.lang3.StringUtils;
+import org.sleuthkit.autopsy.imagegallery.ImageGalleryController;
+import org.sleuthkit.autopsy.imagegallery.datamodel.DrawableAttribute;
 import org.sleuthkit.autopsy.imagegallery.datamodel.grouping.DrawableGroup;
+import org.sleuthkit.datamodel.TagName;
 
 /**
  * A cell in the NavPanel tree that listens to its associated group's fileids
@@ -72,8 +76,10 @@ class GroupTreeCell extends TreeCell<GroupTreeNode> {
         });
     };
     private final ReadOnlyObjectProperty<GroupComparators<?>> sortOrder;
+    private final ImageGalleryController controller;
 
-    GroupTreeCell(ReadOnlyObjectProperty<GroupComparators<?>> sortOrderProperty) {
+    GroupTreeCell(ImageGalleryController controller, ReadOnlyObjectProperty<GroupComparators<?>> sortOrderProperty) {
+        this.controller = controller;
         this.sortOrder = sortOrderProperty;
         getStylesheets().add(GroupTreeCell.class.getResource("GroupTreeCell.css").toExternalForm()); //NON-NLS
         getStyleClass().add("groupTreeCell");        //reduce  indent to 5, default is 10 which uses up a lot of space. NON-NLS
@@ -112,7 +118,8 @@ class GroupTreeCell extends TreeCell<GroupTreeNode> {
                 setStyle("");
             });
         } else {
-            if (isNull(treeNode.getGroup())) {
+            DrawableGroup group = treeNode.getGroup();
+            if (isNull(group)) {
                 final String text = getGroupName();
                 //"dummy" group in file system tree <=>  a folder with no drawables
                 Platform.runLater(() -> {
@@ -124,20 +131,22 @@ class GroupTreeCell extends TreeCell<GroupTreeNode> {
 
             } else {
                 //if number of files in this group changes (eg a file is recategorized), update counts via listener
-                treeNode.getGroup().getFileIDs().addListener(fileCountListener);
-                treeNode.getGroup().uncatCountProperty().addListener(fileCountListener);
-                treeNode.getGroup().hashSetHitsCountProperty().addListener(fileCountListener);
+                group.getFileIDs().addListener(fileCountListener);
+                group.uncatCountProperty().addListener(fileCountListener);
+                group.hashSetHitsCountProperty().addListener(fileCountListener);
                 sortOrder.addListener(fileCountListener);
                 //if the seen state of this group changes update its style
-                treeNode.getGroup().seenProperty().addListener(seenListener);
+                group.seenProperty().addListener(seenListener);
 
                 //and use icon corresponding to group type
-                final Image icon = treeNode.getGroup().getGroupKey().getIcon();
+                Node icon = (group.getGroupByAttribute() == DrawableAttribute.TAGS)
+                        ? controller.getTagsManager().getGraphic((TagName) group.getGroupByValue())
+                        : group.getGroupKey().getGraphic();
                 final String text = getGroupName() + getCountsText();
                 final String style = getSeenStyleClass();
                 Platform.runLater(() -> {
                     setTooltip(new Tooltip(text));
-                    setGraphic(new ImageView(icon));
+                    setGraphic(icon);
                     setText(text);
                     setStyle(style);
                 });
diff --git a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/navpanel/HashHitGroupList.java b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/navpanel/HashHitGroupList.java
index 03c6663369..790262b78e 100644
--- a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/navpanel/HashHitGroupList.java
+++ b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/navpanel/HashHitGroupList.java
@@ -79,7 +79,7 @@ final public class HashHitGroupList extends NavPanel<DrawableGroup> {
         getBorderPane().setCenter(groupList);
         sorted = getController().getGroupManager().getAnalyzedGroups().filtered((DrawableGroup t) -> t.getHashSetHitsCount() > 0).sorted(getDefaultComparator());
 
-        groupList.setCellFactory(treeView -> new GroupListCell(getSortByBox().getSelectionModel().selectedItemProperty()));
+        groupList.setCellFactory(treeView -> new GroupListCell(getController(), getSortByBox().getSelectionModel().selectedItemProperty()));
 
         groupList.setItems(sorted);
     }

From c3f90a1823b2284f58a7e0b28ecfe323e6deb25f Mon Sep 17 00:00:00 2001
From: Nick Davis <nick.davis@narfindustries.com>
Date: Thu, 4 Feb 2016 16:53:57 -0500
Subject: [PATCH 48/68] try to fix NullPointerException due to null getfont().

---
 .../autopsy/keywordsearch/DropdownListSearchPanel.form      | 6 ++----
 .../autopsy/keywordsearch/DropdownListSearchPanel.java      | 2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/DropdownListSearchPanel.form b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/DropdownListSearchPanel.form
index 0e884ac7f3..1f61e9255c 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/DropdownListSearchPanel.form
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/DropdownListSearchPanel.form
@@ -60,10 +60,8 @@
   <SubComponents>
     <Container class="javax.swing.JSplitPane" name="jSplitPane1">
       <Properties>
-        <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
-          <FontInfo relative="true">
-            <Font bold="false" component="jSplitPane1" property="font" relativeSize="false" size="11"/>
-          </FontInfo>
+        <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
+          <Connection component="leftPane" name="font" type="property"/>
         </Property>
       </Properties>
 
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/DropdownListSearchPanel.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/DropdownListSearchPanel.java
index 577703b2a0..d794acb1dc 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/DropdownListSearchPanel.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/DropdownListSearchPanel.java
@@ -200,7 +200,7 @@ class DropdownListSearchPanel extends KeywordSearchPanel {
 
         setFont(getFont().deriveFont(getFont().getStyle() & ~java.awt.Font.BOLD, 11));
 
-        jSplitPane1.setFont(jSplitPane1.getFont().deriveFont(jSplitPane1.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
+        jSplitPane1.setFont(leftPane.getFont());
 
         leftPane.setFont(leftPane.getFont().deriveFont(leftPane.getFont().getStyle() & ~java.awt.Font.BOLD, 11));
         leftPane.setMinimumSize(new java.awt.Dimension(150, 23));

From 1bc1b71866f29ba1c529a5a7cd534e7e17ff6262 Mon Sep 17 00:00:00 2001
From: Kay Bassi <kb@narfindustries.com>
Date: Thu, 4 Feb 2016 13:56:14 -0800
Subject: [PATCH 49/68] Translated one last string

---
 .../autopsy/modules/hashdatabase/Bundle_ja.properties          | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/Bundle_ja.properties b/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/Bundle_ja.properties
index d63bbe7d37..b53420e4ee 100644
--- a/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/Bundle_ja.properties
+++ b/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/Bundle_ja.properties
@@ -13,7 +13,7 @@ HashDbSearchPanel.titleLabel.text=\u6B21\u306EMD5\u30CF\u30C3\u30B7\u30E5\u4ED8\
 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=\u30C3\u30B7\u30E5\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u306E\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u30E2\u30B8\u30E5\u30FC\u30EB\u304A\u3088\u3073\u30CF\u30C3\u30B7\u30E5\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u30C4\u30FC\u30EB
+OpenIDE-Module-Short-Description=\u30CF\u30C3\u30B7\u30E5\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u306E\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\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\u540D\uFF1A
 HashDbImportDatabaseDialog.knownBadRadioButton.text=\u65E2\u77E5\u306E\u60AA\u8CEA
 HashDbImportDatabaseDialog.jLabel2.text=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u306E\u30BF\u30A4\u30D7\uFF1A
@@ -210,3 +210,4 @@ AddHashValuesToDatabaseProgressDialog.addHashValuesToDatabase.noHashesToAdd=\u8F
 AddHashValuesToDatabaseProgressDialog.addHashValuesToDatabase.success={0}\u30CF\u30C3\u30B7\u30E5\u304C\u6B63\u3057\u304F\u8FFD\u52A0\u3055\u308C\u307E\u3057\u305F\u3002
 AddHashValuesToDatabaseProgressDialog.addHashValuesToDatabase.errorAddingValidHash=\u6709\u52B9\u306A\u30CF\u30C3\u30B7\u30E5\u3092\u8FFD\u52A0\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F\u3002
 AddHashValuesToDatabaseProgressDialog.addHashValuesToDatabase.errorAddingValidHash.msg=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u306B\u6709\u52B9\u306A\u30CF\u30C3\u30B7\u30E5\u3092\u8FFD\u52A0\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F\u3002
+HashLookupSettingsPanel.addHashesToDatabaseButton.text=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u306B\u30CF\u30C3\u30B7\u30E5\u3092\u8FFD\u52A0

From c8a5367f7e1061c532a16f00c5dd658b3f328163 Mon Sep 17 00:00:00 2001
From: Nick Davis <nick.davis@narfindustries.com>
Date: Thu, 4 Feb 2016 17:28:58 -0500
Subject: [PATCH 50/68] extracted Thumbnail combobox values

---
 .../corecomponents/DataResultViewerThumbnail.form  |  5 -----
 .../corecomponents/DataResultViewerThumbnail.java  | 14 +++++++++-----
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/DataResultViewerThumbnail.form b/Core/src/org/sleuthkit/autopsy/corecomponents/DataResultViewerThumbnail.form
index f471d230a7..88d0657cf2 100644
--- a/Core/src/org/sleuthkit/autopsy/corecomponents/DataResultViewerThumbnail.form
+++ b/Core/src/org/sleuthkit/autopsy/corecomponents/DataResultViewerThumbnail.form
@@ -192,11 +192,6 @@
       </Events>
     </Component>
     <Component class="javax.swing.JComboBox" name="thumbnailSizeComboBox">
-      <Properties>
-        <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>
-      </Properties>
       <Events>
         <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="thumbnailSizeComboBoxActionPerformed"/>
       </Events>
diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/DataResultViewerThumbnail.java b/Core/src/org/sleuthkit/autopsy/corecomponents/DataResultViewerThumbnail.java
index 4f3910357d..778be9d120 100644
--- a/Core/src/org/sleuthkit/autopsy/corecomponents/DataResultViewerThumbnail.java
+++ b/Core/src/org/sleuthkit/autopsy/corecomponents/DataResultViewerThumbnail.java
@@ -87,11 +87,19 @@ final class DataResultViewerThumbnail extends AbstractDataResultViewer {
         initialize();
     }
 
+    @NbBundle.Messages({"DataResultViewerThumbnail.thumbnailSizeComboBox.small=Small Thumbnails",
+                "DataResultViewerThumbnail.thumbnailSizeComboBox.medium=Medium Thumbnails",
+                "DataResultViewerThumbnail.thumbnailSizeComboBox.large=Large Thumbnails"
+    })
     private void initialize() {
         initComponents();
 
         iconView.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
         em.addPropertyChangeListener(new ExplorerManagerNodeSelectionListener());
+        thumbnailSizeComboBox.setModel(new javax.swing.DefaultComboBoxModel<String>(
+                new String[] {  Bundle.DataResultViewerThumbnail_thumbnailSizeComboBox_small(),
+                                Bundle.DataResultViewerThumbnail_thumbnailSizeComboBox_medium(),
+                                Bundle.DataResultViewerThumbnail_thumbnailSizeComboBox_large() }));
 
         curPage = -1;
         totalPages = 0;
@@ -166,7 +174,6 @@ final class DataResultViewerThumbnail extends AbstractDataResultViewer {
             }
         });
 
-        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);
@@ -203,10 +210,7 @@ final class DataResultViewerThumbnail extends AbstractDataResultViewer {
                                 .addComponent(imagesRangeLabel, javax.swing.GroupLayout.PREFERRED_SIZE, 91, javax.swing.GroupLayout.PREFERRED_SIZE)
                                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                                 .addComponent(thumbnailSizeComboBox, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))))
-                    .addGroup(layout.createSequentialGroup()
-                        .addGap(0, 0, 0)
-                        .addComponent(iconView, javax.swing.GroupLayout.DEFAULT_SIZE, 563, Short.MAX_VALUE)
-                        .addGap(0, 0, 0)))
+                    .addComponent(iconView, javax.swing.GroupLayout.DEFAULT_SIZE, 563, Short.MAX_VALUE))
                 .addContainerGap())
         );
         layout.setVerticalGroup(

From 83b824b2c63e77a50feda48e44ad1eb699b2e86e Mon Sep 17 00:00:00 2001
From: Nick Davis <nick.davis@narfindustries.com>
Date: Thu, 4 Feb 2016 18:16:54 -0500
Subject: [PATCH 51/68] extract a string

---
 .../autopsy/imagegallery/gui/drawableviews/MetaDataPane.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/drawableviews/MetaDataPane.java b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/drawableviews/MetaDataPane.java
index 24e2072aec..5fb526f779 100644
--- a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/drawableviews/MetaDataPane.java
+++ b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/drawableviews/MetaDataPane.java
@@ -65,6 +65,8 @@ import org.sleuthkit.datamodel.TagName;
 /**
  * Shows details of the selected file.
  */
+@NbBundle.Messages({"MetaDataPane.tableView.placeholder=Select a file to show its details here.",
+        "MetaDataPane.copyMenuItem.text=Copy"})
 public class MetaDataPane extends DrawableUIBase {
 
     private static final Logger LOGGER = Logger.getLogger(MetaDataPane.class.getName());
@@ -80,7 +82,7 @@ public class MetaDataPane extends DrawableUIBase {
     @FXML
     private TableColumn<Pair<DrawableAttribute<?>, Collection<?>>, String> valueColumn;
 
-    private final MenuItem copyMenuItem = new MenuItem("Copy");
+    private final MenuItem copyMenuItem = new MenuItem(Bundle.MetaDataPane_copyMenuItem_text());
     private final ContextMenu contextMenu = new ContextMenu(copyMenuItem);
 
     public MetaDataPane(ImageGalleryController controller) {
@@ -89,7 +91,6 @@ public class MetaDataPane extends DrawableUIBase {
     }
 
     @FXML
-    @NbBundle.Messages({"MetaDataPane.tableView.placeholder=Select a file to show its details here."})
     void initialize() {
         assert attributeColumn != null : "fx:id=\"attributeColumn\" was not injected: check your FXML file 'MetaDataPane.fxml'.";
         assert imageView != null : "fx:id=\"imageView\" was not injected: check your FXML file 'MetaDataPane.fxml'.";

From e67d6db9fd448d92de92a8c8216503bdfa91faae Mon Sep 17 00:00:00 2001
From: Nick Davis <nick.davis@narfindustries.com>
Date: Thu, 4 Feb 2016 20:30:29 -0500
Subject: [PATCH 52/68] timeline: extracting hard coded strings

---
 .../autopsy/timeline/ui/NoEventsDialog.fxml          |  2 +-
 .../autopsy/timeline/ui/VisualizationPanel.java      | 12 +++++-------
 .../timeline/ui/filtering/FilterSetPanel.fxml        |  2 +-
 .../timeline/ui/filtering/FilterSetPanel.java        |  5 +++--
 4 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/timeline/ui/NoEventsDialog.fxml b/Core/src/org/sleuthkit/autopsy/timeline/ui/NoEventsDialog.fxml
index d4352a23b9..842bb0f301 100644
--- a/Core/src/org/sleuthkit/autopsy/timeline/ui/NoEventsDialog.fxml
+++ b/Core/src/org/sleuthkit/autopsy/timeline/ui/NoEventsDialog.fxml
@@ -10,7 +10,7 @@
 
 <fx:root alignment="TOP_RIGHT" maxHeight="-Infinity" maxWidth="-Infinity" type="StackPane" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1">
    <children>
-      <TitledPane collapsible="false" contentDisplay="RIGHT" text="No Visible Events">
+      <TitledPane fx:id="titledPane" collapsible="false" contentDisplay="RIGHT" text="No Visible Events">
       <content>
       <VBox alignment="CENTER_LEFT" spacing="5.0">
       <children>
diff --git a/Core/src/org/sleuthkit/autopsy/timeline/ui/VisualizationPanel.java b/Core/src/org/sleuthkit/autopsy/timeline/ui/VisualizationPanel.java
index afa2f7a895..47298b3879 100644
--- a/Core/src/org/sleuthkit/autopsy/timeline/ui/VisualizationPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/timeline/ui/VisualizationPanel.java
@@ -34,13 +34,7 @@ import javafx.beans.value.ObservableValue;
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
 import javafx.geometry.Insets;
-import javafx.scene.control.Button;
-import javafx.scene.control.Label;
-import javafx.scene.control.MenuButton;
-import javafx.scene.control.Toggle;
-import javafx.scene.control.ToggleButton;
-import javafx.scene.control.ToolBar;
-import javafx.scene.control.Tooltip;
+import javafx.scene.control.*;
 import javafx.scene.effect.Lighting;
 import javafx.scene.image.Image;
 import javafx.scene.image.ImageView;
@@ -537,8 +531,11 @@ final public class VisualizationPanel extends BorderPane {
         }
     }
 
+    @NbBundle.Messages("NoEventsDialog.titledPane.text=No Visible Events")
     private class NoEventsDialog extends StackPane {
 
+        @FXML
+        private TitledPane titledPane;
         @FXML
         private Button backButton;
         @FXML
@@ -563,6 +560,7 @@ final public class VisualizationPanel extends BorderPane {
             assert dismissButton != null : "fx:id=\"dismissButton\" was not injected: check your FXML file 'NoEventsDialog.fxml'."; // NON-NLS
             assert zoomButton != null : "fx:id=\"zoomButton\" was not injected: check your FXML file 'NoEventsDialog.fxml'."; // NON-NLS
 
+            titledPane.setText(Bundle.NoEventsDialog_titledPane_text());
             noEventsDialogLabel.setText(NbBundle.getMessage(NoEventsDialog.class, "VisualizationPanel.noEventsDialogLabel.text")); // NON-NLS
          
             dismissButton.setOnAction(actionEvent -> closeCallback.run());
diff --git a/Core/src/org/sleuthkit/autopsy/timeline/ui/filtering/FilterSetPanel.fxml b/Core/src/org/sleuthkit/autopsy/timeline/ui/filtering/FilterSetPanel.fxml
index 6f6d17b81a..b7427c6b2e 100644
--- a/Core/src/org/sleuthkit/autopsy/timeline/ui/filtering/FilterSetPanel.fxml
+++ b/Core/src/org/sleuthkit/autopsy/timeline/ui/filtering/FilterSetPanel.fxml
@@ -39,7 +39,7 @@
       <TreeTableView fx:constant="CONSTRAINED_RESIZE_POLICY" />
       </columnResizePolicy>
       </TreeTableView>
-            <TitledPane fx:id="hiddenDescriptionsPane" collapsible="false" disable="true" expanded="false" minHeight="25.0" text="Hidden Descriptions">
+            <TitledPane fx:id="hiddenDescriptionsPane" collapsible="false" disable="true" expanded="false" minHeight="25.0">
                <content>
                   <ListView fx:id="hiddenDescriptionsListView" />
                </content>
diff --git a/Core/src/org/sleuthkit/autopsy/timeline/ui/filtering/FilterSetPanel.java b/Core/src/org/sleuthkit/autopsy/timeline/ui/filtering/FilterSetPanel.java
index d5a0ecdad0..2c5f1276fa 100644
--- a/Core/src/org/sleuthkit/autopsy/timeline/ui/filtering/FilterSetPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/timeline/ui/filtering/FilterSetPanel.java
@@ -102,13 +102,14 @@ final public class FilterSetPanel extends BorderPane {
         "Timeline.ui.filtering.menuItem.others=others",
         "Timeline.ui.filtering.menuItem.select=select",
         "FilterSetPanel.hiddenDescriptionsListView.unhideAndRm=Unhide and remove from list",
-        "FilterSetPanel.hiddenDescriptionsListView.remove=Remove from list"})
+        "FilterSetPanel.hiddenDescriptionsListView.remove=Remove from list",
+        "FilsetSetPanel.hiddenDescriptionsPane.displayName=Hidden Descriptions"})
     void initialize() {
         assert applyButton != null : "fx:id=\"applyButton\" was not injected: check your FXML file 'FilterSetPanel.fxml'."; // NON-NLS
 
         ActionUtils.configureButton(new ApplyFiltersAction(), applyButton);
         defaultButton.setText(Bundle.FilterSetPanel_defaultButton_text());
-
+        hiddenDescriptionsPane.setText(Bundle.FilsetSetPanel_hiddenDescriptionsPane_displayName());
         //remove column headers via css.
         filterTreeTable.getStylesheets().addAll(FilterSetPanel.class.getResource("FilterTable.css").toExternalForm()); // NON-NLS
 

From 925e265796a2df9daa3b0fdee14ffb422fe426a5 Mon Sep 17 00:00:00 2001
From: Nick Davis <nick.davis@narfindustries.com>
Date: Thu, 4 Feb 2016 22:03:20 -0500
Subject: [PATCH 53/68] localized strings from fxml files

---
 .../imagegallery/gui/SummaryTablePane.java    |  5 +++
 .../autopsy/imagegallery/gui/Toolbar.fxml     |  8 ++---
 .../autopsy/imagegallery/gui/Toolbar.java     | 36 ++++++++++++++-----
 .../gui/drawableviews/DrawableTile.java       |  4 ++-
 .../gui/drawableviews/GroupPane.fxml          |  8 ++---
 .../gui/drawableviews/GroupPane.java          | 18 +++++++++-
 .../gui/drawableviews/MetaDataPane.fxml       |  2 +-
 .../gui/drawableviews/MetaDataPane.java       | 19 ++++++----
 .../imagegallery/gui/navpanel/NavPanel.fxml   |  2 +-
 .../imagegallery/gui/navpanel/NavPanel.java   | 17 +++++----
 10 files changed, 86 insertions(+), 33 deletions(-)

diff --git a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/SummaryTablePane.java b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/SummaryTablePane.java
index b9b1c04813..708568fe41 100644
--- a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/SummaryTablePane.java
+++ b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/SummaryTablePane.java
@@ -32,6 +32,7 @@ import javafx.scene.layout.Priority;
 import static javafx.scene.layout.Region.USE_COMPUTED_SIZE;
 import javafx.scene.layout.VBox;
 import javafx.util.Pair;
+import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.casemodule.Case;
 import org.sleuthkit.autopsy.imagegallery.FXMLConstructor;
 import org.sleuthkit.autopsy.imagegallery.ImageGalleryController;
@@ -53,6 +54,8 @@ public class SummaryTablePane extends AnchorPane {
     private final ImageGalleryController controller;
 
     @FXML
+    @NbBundle.Messages({"SummaryTablePane.catColumn=Category",
+            "SummaryTablePane.countColumn=# Files"})
     void initialize() {
         assert catColumn != null : "fx:id=\"catColumn\" was not injected: check your FXML file 'SummaryTablePane.fxml'.";
         assert countColumn != null : "fx:id=\"countColumn\" was not injected: check your FXML file 'SummaryTablePane.fxml'.";
@@ -66,9 +69,11 @@ public class SummaryTablePane extends AnchorPane {
         //set up columns
         catColumn.setCellValueFactory((TableColumn.CellDataFeatures<Pair<Category, Long>, String> p) -> new SimpleObjectProperty<>(p.getValue().getKey().getDisplayName()));
         catColumn.setPrefWidth(USE_COMPUTED_SIZE);
+        catColumn.setText(Bundle.SummaryTablePane_catColumn());
 
         countColumn.setCellValueFactory((TableColumn.CellDataFeatures<Pair<Category, Long>, Long> p) -> new SimpleObjectProperty<>(p.getValue().getValue()));
         countColumn.setPrefWidth(USE_COMPUTED_SIZE);
+        countColumn.setText(Bundle.SummaryTablePane_countColumn());
 
         tableView.getColumns().setAll(Arrays.asList(catColumn, countColumn));
 
diff --git a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/Toolbar.fxml b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/Toolbar.fxml
index 1f71ff7974..3e6a5ce414 100644
--- a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/Toolbar.fxml
+++ b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/Toolbar.fxml
@@ -7,14 +7,14 @@
 
 <fx:root minWidth="-1.0" orientation="HORIZONTAL" prefWidth="-1.0" type="javafx.scene.control.ToolBar" xmlns="http://javafx.com/javafx/8.0.40" xmlns:fx="http://javafx.com/fxml/1">
   <items>
-    <Label text="Group By:">
+    <Label fx:id="groupByLabel" text="Group By:">
       <labelFor>
         <ComboBox fx:id="groupByBox" editable="false" />
       </labelFor>
     </Label>
     <fx:reference source="groupByBox" />
     <Region prefHeight="-1.0" prefWidth="20.0" />
-    <Label text="Sort By:">
+    <Label fx:id="sortByLabel" text="Sort By:">
       <labelFor>
         <ComboBox fx:id="sortByBox" />
       </labelFor>
@@ -51,7 +51,7 @@
     </HBox>
     <Separator orientation="VERTICAL" prefHeight="-1.0" prefWidth="20.0" />
     <CheckBox fx:id="onlyAnalyzedCheckBox" allowIndeterminate="false" indeterminate="false" mnemonicParsing="false" prefWidth="16.0" selected="true" text="only analyzed groups" underline="false" visible="false" />
-    <Label contentDisplay="RIGHT" text="Apply to Group:" textOverrun="ELLIPSIS" />
+    <Label fx:id="applyToGroupLabel" contentDisplay="RIGHT" text="Apply to Group:" textOverrun="ELLIPSIS" />
     <SplitMenuButton id="tagSplitMenu" fx:id="tagGroupMenuButton" disable="true" mnemonicParsing="false" text="Follow Up" textOverrun="ELLIPSIS">
       <items>
         <MenuItem mnemonicParsing="false" text="Action 1" />
@@ -65,7 +65,7 @@
       </items>
     </SplitMenuButton>
     <Separator orientation="VERTICAL" prefHeight="-1.0" prefWidth="20.0" />
-    <Label text="Thumbnail Size (px):">
+    <Label fx:id="thumbnailSizeLabel" text="Thumbnail Size (px):">
       <labelFor>
         <Slider fx:id="sizeSlider" blockIncrement="100.0" majorTickUnit="100.0" max="300.0" min="100.0" minorTickCount="0" orientation="HORIZONTAL" prefHeight="-1.0" showTickLabels="true" showTickMarks="true" snapToTicks="true" value="100.0" />
       </labelFor>
diff --git a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/Toolbar.java b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/Toolbar.java
index e8c221ec91..26c331ad03 100644
--- a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/Toolbar.java
+++ b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/Toolbar.java
@@ -29,16 +29,11 @@ import javafx.beans.property.DoubleProperty;
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.collections.FXCollections;
 import javafx.fxml.FXML;
-import javafx.scene.control.CheckBox;
-import javafx.scene.control.ComboBox;
-import javafx.scene.control.MenuItem;
-import javafx.scene.control.RadioButton;
-import javafx.scene.control.Slider;
-import javafx.scene.control.SplitMenuButton;
-import javafx.scene.control.ToggleGroup;
-import javafx.scene.control.ToolBar;
+import javafx.scene.control.*;
 import javafx.scene.layout.HBox;
 import javax.swing.SortOrder;
+
+import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.coreutils.Logger;
 import org.sleuthkit.autopsy.imagegallery.FXMLConstructor;
 import org.sleuthkit.autopsy.imagegallery.ImageGalleryController;
@@ -89,6 +84,18 @@ public class Toolbar extends ToolBar {
     @FXML
     private SplitMenuButton tagGroupMenuButton;
 
+    @FXML
+    private Label groupByLabel;
+
+    @FXML
+    private Label sortByLabel;
+
+    @FXML
+    private Label applyToGroupLabel;
+
+    @FXML
+    private Label thumbnailSizeLabel;
+
     private static Toolbar instance;
 
     private final SimpleObjectProperty<SortOrder> orderProperty = new SimpleObjectProperty<>(SortOrder.ASCENDING);
@@ -120,6 +127,12 @@ public class Toolbar extends ToolBar {
     }
 
     @FXML
+    @NbBundle.Messages({"Toolbar.groupByLabel=Group By:",
+            "Toolbar.sortByLabel=Sort By:",
+            "Toolbar.ascRadio=Ascending",
+            "Toolbar.descRadio=Descending",
+            "Toolbar.applyToGroupLabel=Apply to Group:",
+            "Toolbar.thumbnailSizeLabel=Thumbnail Size (px):"})
     void initialize() {
         assert ascRadio != null : "fx:id=\"ascRadio\" was not injected: check your FXML file 'Toolbar.fxml'.";
         assert catGroupMenuButton != null : "fx:id=\"catSelectedMenubutton\" was not injected: check your FXML file 'Toolbar.fxml'.";
@@ -153,6 +166,13 @@ public class Toolbar extends ToolBar {
             }
         });
 
+        groupByLabel.setText(Bundle.Toolbar_groupByLabel());
+        sortByLabel.setText(Bundle.Toolbar_sortByLabel());
+        ascRadio.setText(Bundle.Toolbar_ascRadio());
+        descRadio.setText(Bundle.Toolbar_descRadio());
+        applyToGroupLabel.setText(Bundle.Toolbar_applyToGroupLabel());
+        thumbnailSizeLabel.setText(Bundle.Toolbar_thumbnailSizeLabel());
+
         CategorizeGroupAction cat5GroupAction = new CategorizeGroupAction(Category.FIVE, controller);
         catGroupMenuButton.setOnAction(cat5GroupAction);
         catGroupMenuButton.setText(cat5GroupAction.getText());
diff --git a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/drawableviews/DrawableTile.java b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/drawableviews/DrawableTile.java
index 528f5d9bab..23d65302b4 100644
--- a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/drawableviews/DrawableTile.java
+++ b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/drawableviews/DrawableTile.java
@@ -31,6 +31,7 @@ import javafx.scene.image.Image;
 import javafx.scene.input.MouseButton;
 import javafx.scene.input.MouseEvent;
 import javafx.scene.paint.Color;
+import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.coreutils.Logger;
 import org.sleuthkit.autopsy.imagegallery.FXMLConstructor;
 import org.sleuthkit.autopsy.imagegallery.ImageGalleryController;
@@ -57,6 +58,7 @@ public class DrawableTile extends DrawableTileBase {
 
     @FXML
     @Override
+    @NbBundle.Messages({"DrawableTile.nameLabel=file name"})
     protected void initialize() {
         super.initialize();
         assert imageView != null : "fx:id=\"imageView\" was not injected: check your FXML file 'DrawableTile.fxml'.";
@@ -65,7 +67,7 @@ public class DrawableTile extends DrawableTileBase {
         setCache(true);
         setCacheHint(CacheHint.SPEED);
         nameLabel.prefWidthProperty().bind(imageView.fitWidthProperty());
-
+        nameLabel.setText(Bundle.DrawableTile_nameLabel());
         imageView.fitHeightProperty().bind(Toolbar.getDefault(getController()).sizeSliderValue());
         imageView.fitWidthProperty().bind(Toolbar.getDefault(getController()).sizeSliderValue());
 
diff --git a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/drawableviews/GroupPane.fxml b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/drawableviews/GroupPane.fxml
index db5a61aaab..ec6e539f87 100644
--- a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/drawableviews/GroupPane.fxml
+++ b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/drawableviews/GroupPane.fxml
@@ -28,7 +28,7 @@
             <left>
                 <HBox alignment="CENTER_LEFT" spacing="5.0" BorderPane.alignment="TOP_LEFT">
                     <children>
-                        <Label text="Group Viewing History: " />
+                        <Label fx:id="bottomLabel" text="Group Viewing History: " />
                         <Button fx:id="backButton" mnemonicParsing="false" text="back">
                             <graphic>
                                 <ImageView fitHeight="16.0" fitWidth="16.0" pickOnBounds="true" preserveRatio="true">
@@ -130,7 +130,7 @@
                     <items>
                         <HBox alignment="CENTER" spacing="5.0">
                             <children>
-                                <Label text="Tag Selected Files:">
+                                <Label fx:id="headerLabel" text="Tag Selected Files:">
                                     <graphic>
                                         <ImageView fitHeight="16.0" fitWidth="16.0" pickOnBounds="true" preserveRatio="true">
                                             <image>
@@ -150,7 +150,7 @@
                         <Separator minWidth="-Infinity" prefWidth="10.0" />
                         <HBox fx:id="catSplitMenuContainer" alignment="CENTER" maxWidth="-Infinity" spacing="5.0">
                             <children>
-                                <Label text="Categorize Selected File:">
+                                <Label fx:id="catContainerLabel" text="Categorize Selected File:">
                                     <graphic>
                                         <ImageView fitHeight="16.0" fitWidth="16.0" mouseTransparent="true" pickOnBounds="true" preserveRatio="true">
                                             <image>
@@ -187,7 +187,7 @@
                         </HBox>
                         <HBox fx:id="catSegmentedContainer" alignment="CENTER" maxWidth="-Infinity" spacing="5.0">
                             <children>
-                                <Label text="Category:">
+                                <Label fx:id="catHeadingLabel" text="Category:">
                                     <graphic>
                                         <ImageView fitHeight="16.0" fitWidth="16.0" mouseTransparent="true" pickOnBounds="true" preserveRatio="true">
                                             <image>
diff --git a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/drawableviews/GroupPane.java b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/drawableviews/GroupPane.java
index 1fb3f46022..0def2ef771 100644
--- a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/drawableviews/GroupPane.java
+++ b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/drawableviews/GroupPane.java
@@ -212,6 +212,14 @@ public class GroupPane extends BorderPane {
 
     @FXML
     private Label groupLabel;
+    @FXML
+    private Label bottomLabel;
+    @FXML
+    private Label headerLabel;
+    @FXML
+    private Label catContainerLabel;
+    @FXML
+    private Label catHeadingLabel;
 
     @FXML
     private HBox catSegmentedContainer;
@@ -366,7 +374,11 @@ public class GroupPane extends BorderPane {
      * checks that FXML loading went ok and performs additional setup
      */
     @FXML
-    @NbBundle.Messages({"GroupPane.gridViewContextMenuItem.extractFiles=Extract File(s)"})
+    @NbBundle.Messages({"GroupPane.gridViewContextMenuItem.extractFiles=Extract File(s)",
+            "GroupPane.bottomLabel.displayText=Group Viewing History: ",
+            "GroupPane.hederLabel.displayText=Tag Selected Files:",
+            "GroupPane.catContainerLabel.displayText=Categorize Selected File:",
+            "GroupPane.catHeadingLabel.displayText=Category:"})
     void initialize() {
         assert cat0Toggle != null : "fx:id=\"cat0Toggle\" was not injected: check your FXML file 'SlideShowView.fxml'.";
         assert cat1Toggle != null : "fx:id=\"cat1Toggle\" was not injected: check your FXML file 'SlideShowView.fxml'.";
@@ -446,6 +458,10 @@ public class GroupPane extends BorderPane {
         tileToggle.getStyleClass().remove("radio-button");
         tileToggle.getStyleClass().add("toggle-button");
 
+        bottomLabel.setText(Bundle.GroupPane_bottomLabel_displayText());
+        headerLabel.setText(Bundle.GroupPane_hederLabel_displayText());
+        catContainerLabel.setText(Bundle.GroupPane_catContainerLabel_displayText());
+        catHeadingLabel.setText(Bundle.GroupPane_catHeadingLabel_displayText());
         //show categorization controls depending on group view mode
         headerToolBar.getItems().remove(catSegmentedContainer);
         groupViewMode.addListener((ObservableValue<? extends GroupViewMode> observable, GroupViewMode oldValue, GroupViewMode newValue) -> {
diff --git a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/drawableviews/MetaDataPane.fxml b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/drawableviews/MetaDataPane.fxml
index 7e0187d317..89a7713b73 100644
--- a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/drawableviews/MetaDataPane.fxml
+++ b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/drawableviews/MetaDataPane.fxml
@@ -7,7 +7,7 @@
 
 <fx:root id="AnchorPane" type="javafx.scene.layout.AnchorPane" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1">
   <children>
-    <TitledPane animated="false" collapsible="false" expanded="true" text="Details" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+    <TitledPane fx:id="titledPane" animated="false" collapsible="false" expanded="true" text="Details" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
       <content>
         <AnchorPane id="Content">
           <children>
diff --git a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/drawableviews/MetaDataPane.java b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/drawableviews/MetaDataPane.java
index 5fb526f779..521ca0e145 100644
--- a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/drawableviews/MetaDataPane.java
+++ b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/drawableviews/MetaDataPane.java
@@ -33,12 +33,7 @@ import javafx.beans.property.SimpleObjectProperty;
 import javafx.beans.property.SimpleStringProperty;
 import javafx.concurrent.Task;
 import javafx.fxml.FXML;
-import javafx.scene.control.ContextMenu;
-import javafx.scene.control.Label;
-import javafx.scene.control.MenuItem;
-import javafx.scene.control.TableCell;
-import javafx.scene.control.TableColumn;
-import javafx.scene.control.TableView;
+import javafx.scene.control.*;
 import javafx.scene.image.Image;
 import javafx.scene.image.ImageView;
 import javafx.scene.input.Clipboard;
@@ -66,13 +61,19 @@ import org.sleuthkit.datamodel.TagName;
  * Shows details of the selected file.
  */
 @NbBundle.Messages({"MetaDataPane.tableView.placeholder=Select a file to show its details here.",
-        "MetaDataPane.copyMenuItem.text=Copy"})
+        "MetaDataPane.copyMenuItem.text=Copy",
+        "MetaDataPane.titledPane.displayName=Details",
+        "MetaDataPane.attributeColumn.headingName=Attribute",
+        "MetaDataPane.valueColumn.headingName=Value"})
 public class MetaDataPane extends DrawableUIBase {
 
     private static final Logger LOGGER = Logger.getLogger(MetaDataPane.class.getName());
 
     private static final KeyCodeCombination COPY_KEY_COMBINATION = new KeyCodeCombination(KeyCode.C, KeyCombination.CONTROL_DOWN);
 
+    @FXML
+    private TitledPane titledPane;
+
     @FXML
     private TableColumn<Pair<DrawableAttribute<?>, Collection<?>>, DrawableAttribute<?>> attributeColumn;
 
@@ -123,6 +124,7 @@ public class MetaDataPane extends DrawableUIBase {
         tableView.getColumns().setAll(Arrays.asList(attributeColumn, valueColumn));
 
         attributeColumn.setPrefWidth(USE_COMPUTED_SIZE);
+        attributeColumn.setText(Bundle.MetaDataPane_attributeColumn_headingName());
         attributeColumn.setCellValueFactory(param -> new SimpleObjectProperty<>(param.getValue().getKey()));
         attributeColumn.setCellFactory(param -> new TableCell<Pair<DrawableAttribute<?>, Collection<?>>, DrawableAttribute<?>>() {
             @Override
@@ -139,6 +141,7 @@ public class MetaDataPane extends DrawableUIBase {
         });
 
         valueColumn.setPrefWidth(USE_COMPUTED_SIZE);
+        valueColumn.setText(Bundle.MetaDataPane_valueColumn_headingName());
         valueColumn.setCellValueFactory(p -> new SimpleStringProperty(getValueDisplayString(p.getValue())));
         valueColumn.setCellFactory(p -> new TableCell<Pair<DrawableAttribute<?>, Collection<?>>, String>() {
             @Override
@@ -153,6 +156,8 @@ public class MetaDataPane extends DrawableUIBase {
                 }
             }
         });
+
+        titledPane.setText(Bundle.MetaDataPane_titledPane_displayName());
     }
 
     @SuppressWarnings("unchecked")
diff --git a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/navpanel/NavPanel.fxml b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/navpanel/NavPanel.fxml
index 73e4b50f28..92a25b3421 100644
--- a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/navpanel/NavPanel.fxml
+++ b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/navpanel/NavPanel.fxml
@@ -21,7 +21,7 @@
             <top>
                 <ToolBar fx:id="toolBar" BorderPane.alignment="CENTER">
                     <items>
-                        <Label text="Sort By:" />
+                        <Label fx:id="sortByBoxLabel" text="Sort By:" />
                         <ComboBox fx:id="sortByBox" maxWidth="-Infinity" minWidth="-Infinity">
                             <items>
                                 <FXCollections fx:factory="observableArrayList">
diff --git a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/navpanel/NavPanel.java b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/navpanel/NavPanel.java
index aa5ed36773..8e37553255 100644
--- a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/navpanel/NavPanel.java
+++ b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/navpanel/NavPanel.java
@@ -23,13 +23,9 @@ import java.util.Comparator;
 import java.util.Optional;
 import java.util.function.Function;
 import javafx.fxml.FXML;
-import javafx.scene.control.ComboBox;
-import javafx.scene.control.RadioButton;
-import javafx.scene.control.SelectionModel;
-import javafx.scene.control.Tab;
-import javafx.scene.control.ToggleGroup;
-import javafx.scene.control.ToolBar;
+import javafx.scene.control.*;
 import javafx.scene.layout.BorderPane;
+import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.coreutils.ThreadConfined;
 import org.sleuthkit.autopsy.imagegallery.ImageGalleryController;
 import org.sleuthkit.autopsy.imagegallery.datamodel.CategoryManager;
@@ -60,6 +56,9 @@ abstract class NavPanel<X> extends Tab {
     @FXML
     private RadioButton descRadio;
 
+    @FXML
+    private Label sortByBoxLabel;
+
     private final ImageGalleryController controller;
     private final GroupManager groupManager;
     private final CategoryManager categoryManager;
@@ -71,6 +70,9 @@ abstract class NavPanel<X> extends Tab {
     }
 
     @FXML
+    @NbBundle.Messages({"NavPanel.ascRadio.text=Ascending",
+                "NavPanel.descRadio.text=Descending",
+                "NavPanel.sortByBoxLabel.text=Sort By:"})
     void initialize() {
         assert borderPane != null : "fx:id=\"borderPane\" was not injected: check your FXML file 'NavPanel.fxml'.";
         assert toolBar != null : "fx:id=\"toolBar\" was not injected: check your FXML file 'NavPanel.fxml'.";
@@ -92,6 +94,9 @@ abstract class NavPanel<X> extends Tab {
             }
         });
 
+        ascRadio.setText(Bundle.NavPanel_ascRadio_text());
+        descRadio.setText(Bundle.NavPanel_descRadio_text());
+        sortByBoxLabel.setText(Bundle.NavPanel_sortByBoxLabel_text());
         //keep selection in sync with controller
         controller.viewState().addListener(observable -> {
             Optional.ofNullable(controller.viewState().get())

From 26e7735a59708ce94bbf0803d38e3501630f9242 Mon Sep 17 00:00:00 2001
From: Nick Davis <nick.davis@narfindustries.com>
Date: Thu, 4 Feb 2016 22:17:58 -0500
Subject: [PATCH 54/68] more translations

---
 .../autopsy/corecomponents/Bundle_ja.properties  | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/Bundle_ja.properties b/Core/src/org/sleuthkit/autopsy/corecomponents/Bundle_ja.properties
index 594de9284c..2eb33f259a 100755
--- a/Core/src/org/sleuthkit/autopsy/corecomponents/Bundle_ja.properties
+++ b/Core/src/org/sleuthkit/autopsy/corecomponents/Bundle_ja.properties
@@ -19,12 +19,12 @@ 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
+DataContentViewerHex.selectAllMenuItem.text=\u5168\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.selectAllMenuItem.text=\u5168\u3066\u9078\u629E
 DataContentViewerArtifact.pageLabel.text=\u7D50\u679C\uFF1A
 AdvancedConfigurationDialog.applyButton.text=OK
 DataContentViewerString.goToPageLabel.text=\u6B21\u306E\u30DA\u30FC\u30B8\u3078\u79FB\u52D5\uFF1A
@@ -44,7 +44,7 @@ DataResultPanel.matchLabel.text=\u7D50\u679C
 MediaViewVideoPanel.pauseButton.text=\u25BA
 MediaViewVideoPanel.progressLabel.text=00\:00
 MediaViewVideoPanel.infoLabel.text=\u60C5\u5831
-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.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...
 DataContentViewerArtifact.errorText=\u7D50\u679C\u3092\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
@@ -119,7 +119,7 @@ AutopsyOptionsPanel.keepCurrentViewerRB.text=\u305D\u306E\u307E\u307E\u540C\u305
 AutopsyOptionsPanel.restartRequiredLabel.text=\u3053\u306E\u30B3\u30F3\u30D4\u30E5\u30FC\u30BF\u30FC\u3067\u306F\u6700\u5927{0}\u306E\u30D5\u30A1\u30A4\u30EB\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u30B9\u30EC\u30C3\u30C9\u3092\u4F7F\u7528\u3059\u3079\u304D\u3067\u3059\u3002\u6709\u52B9\u306B\u3059\u308B\u306B\u306F\u518D\u8D77\u52D5\u304C\u5FC5\u8981\u3067\u3059\u3002
 AutopsyOptionsPanel.jLabelSelectFile.text=\u30D5\u30A1\u30A4\u30EB\u3092\u9078\u629E\u3059\u308B\u5834\u5408\uFF1A
 AutopsyOptionsPanel.jLabelHideKnownFiles.text=\u65E2\u77E5\u30D5\u30A1\u30A4\u30EB\uFF08NIST NSRL\u5185\u306E\uFF09\u3092\u6B21\u306B\u96A0\u3059\uFF1A
-AutopsyOptionsPanel.jLabelTimeDisplay.text=\u30A2\u30A4\u30C6\u30E0\u3092\u8868\u793A\u3059\u308B\u5834\u5408\uFF1A
+AutopsyOptionsPanel.jLabelTimeDisplay.text=\u6642\u9593\u3092\u8868\u793A\u3059\u308B\u5834\u5408\uFF1A
 AutopsyOptionsPanel.jLabelNumThreads.text=\u30D5\u30A1\u30A4\u30EB\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u306B\u4F7F\u7528\u3059\u308B\u30B9\u30EC\u30C3\u30C9\u6570\uFF1A
 FXVideoPanel.progress.bufferingCancelled=\u30E1\u30C7\u30A3\u30A2\u306E\u30D0\u30C3\u30D5\u30A1\u30EA\u30F3\u30B0\u304C\u30AD\u30E3\u30F3\u30BB\u30EB\u3055\u308C\u307E\u3057\u305F
 FXVideoPanel.progress.bufferingInterrupted=\u30E1\u30C7\u30A3\u30A2\u306E\u30D0\u30C3\u30D5\u30A1\u30EA\u30F3\u30B0\u304C\u4E2D\u65AD\u3055\u308C\u307E\u3057\u305F
@@ -156,3 +156,11 @@ MultiUserSettingsPanel.tbMsgPassword.toolTipText=\u30D1\u30B9\u30EF\u30FC\u30C9\
 MultiUserSettingsPanel.tbMsgHostname.toolTipText=\u30DB\u30B9\u30C8\u540D\u307E\u305F\u306FIP\u30A2\u30C9\u30EC\u30B9
 MultiUserSettingsPanel.KeywordSearchNull=\u30AD\u30FC\u30EF\u30FC\u30C9\u691C\u7D22\u30B5\u30FC\u30D3\u30B9\u3092\u898B\u3064\u3051\u308C\u3089\u308C\u307E\u305B\u3093
 MultiUserSettingsPanel.InvalidPortNumber=\u7121\u52B9\u306A\u30DD\u30FC\u30C8\u756A\u53F7
+CTL_OfflineHelpAction=\u30AA\u30D5\u30E9\u30A4\u30F3Autopsy\u30C9\u30AD\u30E5\u30E1\u30F3\u30C6\u30FC\u30B7\u30E7\u30F3
+CTL_OnlineHelpAction=\u30AA\u30F3\u30E9\u30A4\u30F3Autopsy\u30C9\u30AD\u30E5\u30E1\u30F3\u30C6\u30FC\u30B7\u30E7\u30F3
+DataResultViewerThumbnail.thumbnailSizeComboBox.large=\u30B5\u30E0\u30CD\u30A4\u30EB\uFF08\u5927\uFF09
+DataResultViewerThumbnail.thumbnailSizeComboBox.medium=\u30B5\u30E0\u30CD\u30A4\u30EB\uFF08\u4E2D\uFF09
+DataResultViewerThumbnail.thumbnailSizeComboBox.small=\u30B5\u30E0\u30CD\u30A4\u30EB\uFF08\u5C0F\uFF09
+MediaViewImagePanel.errorLabel.OOMText=\u30D5\u30A1\u30A4\u30EB\u3092\u30E1\u30C7\u30A3\u30A2\u30D3\u30E5\u30FC\u306B\u8AAD\u307F\u8FBC\u3081\u307E\u305B\u3093\u3067\u3057\u305F\uFF1A\u30E1\u30E2\u30EA\u4E0D\u8DB3\u3002
+MediaViewImagePanel.errorLabel.text=\u30D5\u30A1\u30A4\u30EB\u3092\u30E1\u30C7\u30A3\u30A2\u30D3\u30E5\u30FC\u306B\u8AAD\u307F\u8FBC\u3081\u307E\u305B\u3093\u3067\u3057\u305F\u3002
+MediaViewImagePanel.externalViewerButton.text=\u5916\u90E8\u30D3\u30E5\u30FC\u30A2\u30FC\u3067\u958B\u304F

From 6d34bae045720afd97911e0c5e49d1a15f54183a Mon Sep 17 00:00:00 2001
From: Nick Davis <nick.davis@narfindustries.com>
Date: Fri, 5 Feb 2016 00:49:14 -0500
Subject: [PATCH 55/68] fixed content type meta tag in HTML report headers

---
 Core/src/org/sleuthkit/autopsy/report/ReportHTML.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportHTML.java b/Core/src/org/sleuthkit/autopsy/report/ReportHTML.java
index 4a57d802d7..7bc633a320 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportHTML.java
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportHTML.java
@@ -852,6 +852,7 @@ class ReportHTML implements TableReportModule {
                     NbBundle.getMessage(this.getClass(), "ReportHTML.writeIndex.title", currentCase.getName())).append(
                             "</title>\n"); //NON-NLS
             index.append("<link rel=\"icon\" type=\"image/ico\" href=\"favicon.ico\" />\n"); //NON-NLS
+            index.append("<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\">\n"); //NON-NLS
             index.append("</head>\n"); //NON-NLS
             index.append("<frameset cols=\"350px,*\">\n"); //NON-NLS
             index.append("<frame src=\"nav.html\" name=\"nav\">\n"); //NON-NLS
@@ -890,7 +891,8 @@ class ReportHTML implements TableReportModule {
             StringBuilder nav = new StringBuilder();
             nav.append("<html>\n<head>\n\t<title>").append( //NON-NLS
                     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"); //NON-NLS
+                    .append("</title>\n\t<link rel=\"stylesheet\" type=\"text/css\" href=\"index.css\" />\n"); //NON-NLS
+            nav.append("<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\">\n</head>\n<body>\n"); //NON-NLS
             nav.append("<div id=\"content\">\n<h1>").append( //NON-NLS
                     NbBundle.getMessage(this.getClass(), "ReportHTML.writeNav.h1")).append("</h1>\n"); //NON-NLS
             nav.append("<ul class=\"nav\">\n"); //NON-NLS
@@ -983,6 +985,7 @@ class ReportHTML implements TableReportModule {
             head.append("<html>\n<head>\n<title>").append( //NON-NLS
                     NbBundle.getMessage(this.getClass(), "ReportHTML.writeSum.title")).append("</title>\n"); //NON-NLS
             head.append("<style type=\"text/css\">\n"); //NON-NLS
+            head.append("<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\">"); //NON-NLS
             head.append("body { padding: 0px; margin: 0px; font: 13px/20px Arial, Helvetica, sans-serif; color: #535353; }\n"); //NON-NLS
             head.append("#wrapper { width: 90%; margin: 0px auto; margin-top: 35px; }\n"); //NON-NLS
             head.append("h1 { color: #07A; font-size: 36px; line-height: 42px; font-weight: normal; margin: 0px; border-bottom: 1px solid #81B9DB; }\n"); //NON-NLS

From 39d93ccb1d0cd1e45813494b138ceccf60493ddd Mon Sep 17 00:00:00 2001
From: Nick Davis <nick.davis@narfindustries.com>
Date: Fri, 5 Feb 2016 00:53:31 -0500
Subject: [PATCH 56/68] added newline after meta tag

---
 Core/src/org/sleuthkit/autopsy/report/ReportHTML.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportHTML.java b/Core/src/org/sleuthkit/autopsy/report/ReportHTML.java
index 7bc633a320..d7a7014022 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportHTML.java
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportHTML.java
@@ -985,7 +985,7 @@ class ReportHTML implements TableReportModule {
             head.append("<html>\n<head>\n<title>").append( //NON-NLS
                     NbBundle.getMessage(this.getClass(), "ReportHTML.writeSum.title")).append("</title>\n"); //NON-NLS
             head.append("<style type=\"text/css\">\n"); //NON-NLS
-            head.append("<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\">"); //NON-NLS
+            head.append("<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\">\n"); //NON-NLS
             head.append("body { padding: 0px; margin: 0px; font: 13px/20px Arial, Helvetica, sans-serif; color: #535353; }\n"); //NON-NLS
             head.append("#wrapper { width: 90%; margin: 0px auto; margin-top: 35px; }\n"); //NON-NLS
             head.append("h1 { color: #07A; font-size: 36px; line-height: 42px; font-weight: normal; margin: 0px; border-bottom: 1px solid #81B9DB; }\n"); //NON-NLS

From 5c2f65a07de1cd79a2e2e3f19d181a5415370042 Mon Sep 17 00:00:00 2001
From: jmillman <jmillman@basistech.com>
Date: Fri, 5 Feb 2016 10:54:51 -0500
Subject: [PATCH 57/68] internationalize TreeComparator

---
 .../ui/detailview/tree/EventsTree.java        | 19 ++++++++++++++++--
 .../ui/detailview/tree/TreeComparator.java    | 20 ++++++++++++++++---
 2 files changed, 34 insertions(+), 5 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/timeline/ui/detailview/tree/EventsTree.java b/Core/src/org/sleuthkit/autopsy/timeline/ui/detailview/tree/EventsTree.java
index 1eba76c5fc..e06b68e329 100644
--- a/Core/src/org/sleuthkit/autopsy/timeline/ui/detailview/tree/EventsTree.java
+++ b/Core/src/org/sleuthkit/autopsy/timeline/ui/detailview/tree/EventsTree.java
@@ -21,7 +21,6 @@ package org.sleuthkit.autopsy.timeline.ui.detailview.tree;
 import com.google.common.collect.ImmutableList;
 import java.util.Arrays;
 import java.util.Collection;
-import java.util.Comparator;
 import java.util.Objects;
 import javafx.beans.InvalidationListener;
 import javafx.beans.Observable;
@@ -30,6 +29,7 @@ import javafx.collections.ListChangeListener;
 import javafx.fxml.FXML;
 import javafx.scene.control.ComboBox;
 import javafx.scene.control.Label;
+import javafx.scene.control.ListCell;
 import javafx.scene.control.SelectionMode;
 import javafx.scene.control.Tooltip;
 import javafx.scene.control.TreeCell;
@@ -72,7 +72,7 @@ final public class EventsTree extends BorderPane {
     private Label eventsTreeLabel;
 
     @FXML
-    private ComboBox<Comparator<TreeItem<EventBundle<?>>>> sortByBox;
+    private ComboBox<TreeComparator> sortByBox;
 
     public EventsTree(TimeLineController controller) {
         this.controller = controller;
@@ -128,6 +128,8 @@ final public class EventsTree extends BorderPane {
 
         sortByBox.getItems().setAll(Arrays.asList(TreeComparator.Description, TreeComparator.Count));
         sortByBox.getSelectionModel().select(TreeComparator.Description);
+        sortByBox.setCellFactory(listView -> new TreeComparatorCell());
+        sortByBox.setButtonCell(new TreeComparatorCell());
         sortByBox.getSelectionModel().selectedItemProperty().addListener((Observable o) -> {
             getRoot().resort(TreeComparator.Type.reversed().thenComparing(sortByBox.getSelectionModel().getSelectedItem()), true);
         });
@@ -249,4 +251,17 @@ final public class EventsTree extends BorderPane {
             }
         }
     }
+
+    static private class TreeComparatorCell extends ListCell<TreeComparator> {
+
+        @Override
+        protected void updateItem(TreeComparator item, boolean empty) {
+            super.updateItem(item, empty);
+            if (empty || item == null) {
+                setText(null);
+            } else {
+                setText(item.getDisplayName());
+            }
+        }
+    }
 }
diff --git a/Core/src/org/sleuthkit/autopsy/timeline/ui/detailview/tree/TreeComparator.java b/Core/src/org/sleuthkit/autopsy/timeline/ui/detailview/tree/TreeComparator.java
index bbe7f32f1e..31fe8cf43a 100644
--- a/Core/src/org/sleuthkit/autopsy/timeline/ui/detailview/tree/TreeComparator.java
+++ b/Core/src/org/sleuthkit/autopsy/timeline/ui/detailview/tree/TreeComparator.java
@@ -20,27 +20,41 @@ package org.sleuthkit.autopsy.timeline.ui.detailview.tree;
 
 import java.util.Comparator;
 import javafx.scene.control.TreeItem;
+import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.timeline.datamodel.EventBundle;
 import org.sleuthkit.autopsy.timeline.datamodel.eventtype.EventType;
 
+@NbBundle.Messages({"TreeComparator.Description.displayName=Description",
+    "TreeComparator.Count.displayName=Count",
+    "TreeComparator.Type.displayName=Type"})
 enum TreeComparator implements Comparator<TreeItem<EventBundle<?>>> {
 
-    Description {
+    Description(Bundle.TreeComparator_Description_displayName()) {
                 @Override
                 public int compare(TreeItem<EventBundle<?>> o1, TreeItem<EventBundle<?>> o2) {
                     return o1.getValue().getDescription().compareTo(o2.getValue().getDescription());
                 }
             },
-    Count {
+    Count(Bundle.TreeComparator_Count_displayName()) {
                 @Override
                 public int compare(TreeItem<EventBundle<?>> o1, TreeItem<EventBundle<?>> o2) {
                     return Long.compare(o2.getValue().getCount(), o1.getValue().getCount());
                 }
             },
-    Type {
+    Type(Bundle.TreeComparator_Type_displayName()) {
                 @Override
                 public int compare(TreeItem<EventBundle<?>> o1, TreeItem<EventBundle<?>> o2) {
                     return EventType.getComparator().compare(o1.getValue().getEventType(), o2.getValue().getEventType());
                 }
             };
+
+    private final String displayName;
+
+    private TreeComparator(String displayName) {
+        this.displayName = displayName;
+    }
+
+    public String getDisplayName() {
+        return displayName;
+    }
 }

From 443ee552ce961336a37fb63e6ada8eb2336550dd Mon Sep 17 00:00:00 2001
From: Karl Mortensen <kmortensen@basistech.com>
Date: Fri, 5 Feb 2016 11:19:05 -0500
Subject: [PATCH 58/68] Update pipeline name

---
 Core/src/org/sleuthkit/autopsy/ingest/PipelineConfig.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Core/src/org/sleuthkit/autopsy/ingest/PipelineConfig.xml b/Core/src/org/sleuthkit/autopsy/ingest/PipelineConfig.xml
index 9a640f633f..8619c3d9fa 100644
--- a/Core/src/org/sleuthkit/autopsy/ingest/PipelineConfig.xml
+++ b/Core/src/org/sleuthkit/autopsy/ingest/PipelineConfig.xml
@@ -10,7 +10,7 @@ Contains only the core ingest modules that ship with Autopsy -->
     <PIPELINE type="FileAnalysis">
         <MODULE>org.sleuthkit.autopsy.modules.hashdatabase.HashLookupModuleFactory</MODULE>
         <MODULE>org.sleuthkit.autopsy.modules.filetypeid.FileTypeIdModuleFactory</MODULE>
-        <MODULE>org.sleuthkit.autopsy.modules.sevenzip.ArchiveFileExtractorModuleFactory</MODULE>
+        <MODULE>org.sleuthkit.autopsy.modules.embeddedfileextractor.EmbeddedFileExtractorModuleFactory</MODULE>
         <MODULE>org.sleuthkit.autopsy.modules.exif.ExifParserModuleFactory</MODULE>
         <MODULE>org.sleuthkit.autopsy.keywordsearch.KeywordSearchModuleFactory</MODULE>
         <MODULE>org.sleuthkit.autopsy.thunderbirdparser.EmailParserModuleFactory</MODULE>

From 17bf439b8d7fd115e37ab8ade6978fdcea19e181 Mon Sep 17 00:00:00 2001
From: Nick Davis <nick.davis@narfindustries.com>
Date: Fri, 5 Feb 2016 12:46:22 -0500
Subject: [PATCH 59/68] merged translations

---
 .../autopsy/timeline/Bundle_ja.properties     | 19 ++++++++--
 .../timeline/actions/Bundle_ja.properties     |  8 ++---
 .../datamodel/eventtype/Bundle_ja.properties  |  2 +-
 .../autopsy/timeline/db/Bundle_ja.properties  |  6 ++--
 .../autopsy/timeline/ui/Bundle_ja.properties  | 35 ++++++++++++++++---
 .../ui/countsview/Bundle_ja.properties        |  2 +-
 .../ui/detailview/Bundle_ja.properties        | 32 +++++++++++------
 .../ui/detailview/tree/Bundle_ja.properties   |  2 +-
 .../ui/filtering/Bundle_ja.properties         |  7 ++--
 9 files changed, 82 insertions(+), 31 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/timeline/Bundle_ja.properties b/Core/src/org/sleuthkit/autopsy/timeline/Bundle_ja.properties
index 9a728dc050..ba1ee4f94a 100644
--- a/Core/src/org/sleuthkit/autopsy/timeline/Bundle_ja.properties
+++ b/Core/src/org/sleuthkit/autopsy/timeline/Bundle_ja.properties
@@ -29,7 +29,20 @@ TimeLineController.errorTitle=\u30BF\u30A4\u30E0\u30E9\u30A4\u30F3\u30A8\u30E9\u
 TimeLineController.outOfDate.errorMessage=\u30BF\u30A4\u30E0\u30E9\u30A4\u30F3\u304C\u6700\u65B0\u304B\u78BA\u8A8D\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F\u3002\u66F4\u65B0\u304C\u5FC5\u8981\u3060\u3068\u60F3\u5B9A\u3057\u307E\u3059\u3002
 TimeLineController.rebuildReasons.incompleteOldSchema=\u30BF\u30A4\u30E0\u30E9\u30A4\u30F3\u30A4\u30D9\u30F3\u30C8\u306E\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u306B\u4E0D\u5B8C\u5168\u306A\u60C5\u5831\u304C\u4EE5\u524D\u5165\u529B\u3055\u308C\u3066\u3044\u307E\u3057\u305F\uFF1A\u30A4\u30D9\u30F3\u30C8\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u3092\u66F4\u65B0\u3057\u306A\u3044\u3068\u3001\u4E00\u90E8\u306E\u6A5F\u80FD\u304C\u5229\u7528\u3067\u304D\u306A\u3044\u3001\u307E\u305F\u306F\u6A5F\u80FD\u3057\u306A\u3044\u304B\u3082\u3057\u308C\u306A\u3044\u3067\u3059\u3002
 TimeLineController.rebuildReasons.ingestWasRunning=\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u304C\u5B9F\u884C\u4E2D\u306B\u30BF\u30A4\u30E0\u30E9\u30A4\u30F3\u30A4\u30D9\u30F3\u30C8\u306E\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u306B\u60C5\u5831\u304C\u5165\u529B\u3055\u308C\u3066\u3044\u307E\u3057\u305F\uFF1A\u30A4\u30D9\u30F3\u30C8\u304C\u6B20\u3051\u3066\u3044\u308B\u3001\u4E0D\u5B8C\u5168\u3001\u307E\u305F\u306F\u4E0D\u6B63\u78BA\u304B\u3082\u3057\u308C\u307E\u305B\u3093\u3002
-TimeLineController.rebuildReasons.outOfDate=\u30A4\u30D9\u30F3\u30C8\u30C7\u30FC\u30BF\u304C\u53E4\u3044\u3067\u3059\uFF1A\u898B\u308C\u306A\u3044\u30A4\u30D9\u30F3\u30C8\u304C\u3042\u308A\u307E\u3059\u3002
-TimeLineController.rebuildReasons.outOfDateError=\u30BF\u30A4\u30E0\u30E9\u30A4\u30F3\u30C7\u30FC\u30BF\u304C\u53E4\u3044\u304B\u78BA\u8A8D\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F\u3002
+TimeLineController.rebuildReasons.outOfDate=\u30A4\u30D9\u30F3\u30C8\u30C7\u30FC\u30BF\u304C\u6700\u65B0\u3067\u306F\u3042\u308A\u307E\u305B\u3093\uFF1A\u898B\u308C\u306A\u3044\u30A4\u30D9\u30F3\u30C8\u304C\u3042\u308A\u307E\u3059\u3002
+TimeLineController.rebuildReasons.outOfDateError=\u30BF\u30A4\u30E0\u30E9\u30A4\u30F3\u30C7\u30FC\u30BF\u304C\u6700\u65B0\u304B\u78BA\u8A8D\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F\u3002
 TimeLinecontroller.updateNowQuestion=\u30A4\u30D9\u30F3\u30C8\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u3092\u4ECA\u66F4\u65B0\u3057\u307E\u3059\u304B\uFF1F
-TimelinePanel.jButton13.text=\u5168\u3066
\ No newline at end of file
+TimelinePanel.jButton13.text=\u5168\u3066
+Timeline.yearBarChart.x.years=\u5E74
+TimelinePanel.jButton1.text=6\u30F6\u6708
+TimelinePanel.jButton10.text=1\u6642\u9593
+TimelinePanel.jButton9.text=12\u6642\u9593
+TimelinePanel.jButton11.text=5\u5E74
+TimelinePanel.jButton12.text=10\u5E74
+TimelinePanel.jButton6.text=1\u9031\u9593
+TimelinePanel.jButton5.text=1\u5E74
+TimelinePanel.jButton8.text=1\u65E5
+TimelinePanel.jButton7.text=3\u65E5
+TimelinePanel.jButton2.text=1\u30F6\u6708
+TimelinePanel.jButton3.text=3\u30F6\u6708
+TimelinePanel.jButton4.text=2\u9031\u9593
\ No newline at end of file
diff --git a/Core/src/org/sleuthkit/autopsy/timeline/actions/Bundle_ja.properties b/Core/src/org/sleuthkit/autopsy/timeline/actions/Bundle_ja.properties
index dc8dbf8829..af71283ca2 100644
--- a/Core/src/org/sleuthkit/autopsy/timeline/actions/Bundle_ja.properties
+++ b/Core/src/org/sleuthkit/autopsy/timeline/actions/Bundle_ja.properties
@@ -2,7 +2,7 @@ Back.longText=\u6700\u5F8C\u306E\u30D3\u30E5\u30FC\u8A2D\u5B9A\u306B\u623B\u308B
 Back.text=\u623B\u308B
 Forward.text=\u6B21\u3078
 OpenReportAction.DisplayName=\u30EC\u30DD\u30FC\u30C8\u3092\u958B\u304F
-OpenReportAction.MessageBoxTitle=\u30EC\u30DD\u30FC\u30C8\u3092\u958B\u3051\u307E\u305B\u3093\u3067\u3057\u305F
+OpenReportAction.MessageBoxTitle=\u30EC\u30DD\u30FC\u30C8\u3092\u958B\u304F\u306E\u3092\u5931\u6557\u3057\u307E\u3057\u305F
 OpenReportAction.MissingReportFileMessage=\u30EC\u30DD\u30FC\u30C8\u30D5\u30A1\u30A4\u30EB\u304C\u5B58\u5728\u3057\u307E\u305B\u3093\u3002
 OpenReportAction.NoAssociatedEditorMessage=\u3053\u306E\u30BF\u30A4\u30D7\u306E\u30EC\u30DD\u30FC\u30C8\u306E\u95A2\u9023\u30A8\u30C7\u30A3\u30BF\u30FC\u304C\u3042\u308A\u307E\u305B\u3093\u3002\u307E\u305F\u306F\u95A2\u9023\u306E\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u304C\u8D77\u52D5\u3057\u307E\u305B\u3093\u3067\u3057\u305F\u3002
 OpenReportAction.NoOpenInEditorSupportMessage=\u3053\u306E\u30D7\u30E9\u30C3\u30C8\u30D5\u30A9\u30FC\u30E0\uFF08\u30AA\u30DA\u30EC\u30FC\u30C6\u30A3\u30F3\u30B0\u30B7\u30B9\u30C6\u30E0\uFF09\u306F\u3053\u306E\u3088\u3046\u306B\u30D5\u30A1\u30A4\u30EB\u3092\u30A8\u30C7\u30A3\u30BF\u30FC\u3067\u958B\u304F\u306E\u3092\u30B5\u30DD\u30FC\u30C8\u3057\u3066\u3044\u307E\u305B\u3093\u3002
@@ -12,7 +12,7 @@ RestFilters.longText=\u5168\u3066\u306E\u30D5\u30A3\u30EB\u30BF\u30FC\u3092\u30C
 SaveSnapshot.action.longText=\u30EC\u30DD\u30FC\u30C8\u3068\u3057\u3066\u30D3\u30B8\u30E5\u30A2\u30E9\u30A4\u30BC\u30FC\u30B7\u30E7\u30F3\uFF08\u53EF\u8996\u5316\uFF09\u306E\u30B9\u30AF\u30EA\u30FC\u30F3\u30AD\u30E3\u30D7\u30C1\u30E3\u3092\u4FDD\u5B58\u3057\u307E\u3059\u3002
 SaveSnapshot.action.name.text=\u30B9\u30CA\u30C3\u30D7\u30B7\u30E7\u30C3\u30C8\u30EC\u30DD\u30FC\u30C8
 SaveSnapshot.fileChoose.title.text=\u6B21\u3078\u30B9\u30CA\u30C3\u30D7\u30B7\u30E7\u30C3\u30C8\u3092\u4FDD\u5B58
-SaveSnapShotAsReport.ErrorWritingReport=\u30EC\u30DD\u30FC\u30C8{0}\u3092\u30C7\u30A3\u30B9\u30AF\u3092\u66F8\u304D\u8FBC\u3081\u307E\u305B\u3093\u3067\u3057\u305F\u3002\u8A73\u7D30\u306F\u30ED\u30B0\u3092\u78BA\u8A8D\u3057\u3066\u304F\u3060\u3055\u3044\u3002
+SaveSnapShotAsReport.ErrorWritingReport=\u30EC\u30DD\u30FC\u30C8{0}\u3092\u30C7\u30A3\u30B9\u30AF\u306B\u66F8\u304D\u8FBC\u3081\u307E\u305B\u3093\u3067\u3057\u305F\u3002\u8A73\u7D30\u306F\u30ED\u30B0\u3092\u78BA\u8A8D\u3057\u3066\u304F\u3060\u3055\u3044\u3002
 SaveSnapShotAsReport.FailedToAddReport=\u30EC\u30DD\u30FC\u30C8\u3068\u3057\u3066\u30B9\u30CA\u30C3\u30D7\u30B7\u30E7\u30C3\u30C8\u3092\u8FFD\u52A0\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F\u3002\u8A73\u7D30\u306F\u30ED\u30B0\u3092\u78BA\u8A8D\u3057\u3066\u304F\u3060\u3055\u3044\u3002
 SaveSnapsHotAsReport.ReportName=\u30BF\u30A4\u30E0\u30E9\u30A4\u30F3\u30FC\u30EC\u30DD\u30FC\u30C8\u30FC{0}
 SaveSnapShotAsReport.ReportSavedAt=\u30EC\u30DD\u30FC\u30C8\u306F\u6B21\u3078\u4FDD\u5B58\u3055\u308C\u307E\u3057\u305F[{0}]
@@ -21,6 +21,6 @@ Timeline.ModuleName=\u30BF\u30A4\u30E0\u30E9\u30A4\u30F3
 ZoomIn.action.text=\u62E1\u5927
 ZoomIn.longText=\u304A\u3088\u305D\u534A\u5206\u306E\u6642\u9593\u3092\u8868\u793A\u3059\u308B\u3088\u3046\u306B\u62E1\u5927\u3057\u307E\u3059\u3002
 ZoomOut.action.text=\u7E2E\u5C0F
-ZoomOut.longText=\u304A\u3088\u305D50%\u591A\u304F\u3092\u8868\u793A\u3059\u308B\u3088\u3046\u306B\u7E2E\u5C0F\u3057\u307E\u3059\u3002
-ZoomToEvents.action.text=\u30A4\u30D9\u30F3\u30C8\u3078\u30BA\u30FC\u30E0
+ZoomOut.longText=\u304A\u3088\u305D50%\u591A\u304F\u8868\u793A\u3059\u308B\u3088\u3046\u306B\u7E2E\u5C0F\u3057\u307E\u3059\u3002
+ZoomToEvents.action.text=\u30A4\u30D9\u30F3\u30C8\u306B\u30BA\u30FC\u30E0
 ZoomToEvents.longText=\u4E00\u756A\u8FD1\u304F\u306E\u30A4\u30D9\u30F3\u30C8\u304C\u8868\u793A\u3055\u308C\u308B\u3088\u3046\u306B\u7E2E\u5C0F\u3057\u307E\u3059\u3002
diff --git a/Core/src/org/sleuthkit/autopsy/timeline/datamodel/eventtype/Bundle_ja.properties b/Core/src/org/sleuthkit/autopsy/timeline/datamodel/eventtype/Bundle_ja.properties
index 1e65f3c427..841dbb761a 100644
--- a/Core/src/org/sleuthkit/autopsy/timeline/datamodel/eventtype/Bundle_ja.properties
+++ b/Core/src/org/sleuthkit/autopsy/timeline/datamodel/eventtype/Bundle_ja.properties
@@ -4,7 +4,7 @@ BaseTypes.webActivity.name=\u30A6\u30A7\u30D6\u30A2\u30AF\u30C6\u30A3\u30D3\u30C
 FileSystemTypes.fileAccessed.name=\u30A2\u30AF\u30BB\u30B9\u3055\u308C\u305F\u30D5\u30A1\u30A4\u30EB
 FileSystemTypes.fileChanged.name=\u5909\u66F4\u3055\u308C\u305F\u30D5\u30A1\u30A4\u30EB
 FileSystemTypes.fileCreated.name=\u4F5C\u6210\u3055\u308C\u305F\u30D5\u30A1\u30A4\u30EB
-FileSystemTypes.fileModified.name=\u66F4\u65B0\u3055\u308C\u305F\u30D5\u30A1\u30A4\u30EB
+FileSystemTypes.fileModified.name=\u4FEE\u6B63\u3055\u308C\u305F\u30D5\u30A1\u30A4\u30EB
 MiscTypes.Calls.name=\u30B3\u30FC\u30EB
 MiscTypes.devicesAttached.name=\u63A5\u7D9A\u3055\u308C\u3066\u3044\u308B\u6A5F\u5668
 MiscTypes.Email.name=Email
diff --git a/Core/src/org/sleuthkit/autopsy/timeline/db/Bundle_ja.properties b/Core/src/org/sleuthkit/autopsy/timeline/db/Bundle_ja.properties
index 9b3adae0ba..b2bf6678a8 100644
--- a/Core/src/org/sleuthkit/autopsy/timeline/db/Bundle_ja.properties
+++ b/Core/src/org/sleuthkit/autopsy/timeline/db/Bundle_ja.properties
@@ -1,7 +1,7 @@
-msgdlg.problem.text=\u30BF\u30A4\u30E0\u30E9\u30A4\u30F3\u306B\u5165\u529B\u3059\u308B\u969B\u306B\u554F\u984C\u304C\u767A\u751F\u3057\u307E\u3057\u305F\u3002\u5168\u3066\u306E\u30A4\u30D9\u30F3\u30C8\u304C\u73FE\u5728\u306A\u3044\u304B\u6B63\u78BA\u3067\u306F\u306A\u3044\u304B\u3082\u3057\u308C\u307E\u305B\u3093\u3002
+msgdlg.problem.text=\u30BF\u30A4\u30E0\u30E9\u30A4\u30F3\u306B\u5165\u529B\u3059\u308B\u969B\u306B\u554F\u984C\u304C\u767A\u751F\u3057\u307E\u3057\u305F\u3002\u5168\u3066\u306E\u30A4\u30D9\u30F3\u30C8\u304C\u5B58\u5728\u3057\u306A\u3044\u304B\u6B63\u78BA\u3067\u306F\u306A\u3044\u304B\u3082\u3057\u308C\u307E\u305B\u3093\u3002
 progressWindow.msg.commitingDb=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u306B\u30A4\u30D9\u30F3\u30C8\u3092\u30B3\u30DF\u30C3\u30C8\u3057\u3066\u3044\u307E\u3059\u3002
 progressWindow.msg.gatheringData=\u30A4\u30D9\u30F3\u30C8\u30C7\u30FC\u30BF\u3092\u53CE\u96C6\u4E2D
-progressWindow.msg.populateMacEventsFiles=\u30D5\u30A1\u30A4\u30EB\u306EMAC\u30BF\u30A4\u30E0\u306B\u5165\u529B\u4E2D
+progressWindow.msg.populateMacEventsFiles=\u30D5\u30A1\u30A4\u30EB\u306EMAC\u30BF\u30A4\u30E0\u3092\u5165\u529B\u4E2D
 progressWindow.msg.refreshingFileTags=\u30D5\u30A1\u30A4\u30EB\u30BF\u30B0\u3092\u30EA\u30D5\u30EC\u30C3\u30B7\u30E5\u4E2D
 progressWindow.msg.refreshingResultTags=\u7D50\u679C\u30BF\u30B0\u3092\u30EA\u30D5\u30EC\u30C3\u30B7\u30E5\u4E2D
-progressWindow.populatingXevents={0}\u30A4\u30D9\u30F3\u30C8\u306B\u5165\u529B\u4E2D
+progressWindow.populatingXevents={0}\u30A4\u30D9\u30F3\u30C8\u3092\u5165\u529B\u4E2D
diff --git a/Core/src/org/sleuthkit/autopsy/timeline/ui/Bundle_ja.properties b/Core/src/org/sleuthkit/autopsy/timeline/ui/Bundle_ja.properties
index ad920536a4..f631b3f789 100644
--- a/Core/src/org/sleuthkit/autopsy/timeline/ui/Bundle_ja.properties
+++ b/Core/src/org/sleuthkit/autopsy/timeline/ui/Bundle_ja.properties
@@ -5,7 +5,7 @@ TimeLineResultView.startDateToEndDate.text={0}\u304B\u3089{1}
 VisualizationPanel.histogramTask.preparing=\u6E96\u5099\u4E2D
 VisualizationPanel.histogramTask.queryDb=DB\u3092\u30AF\u30A8\u30EA\u4E2D
 VisualizationPanel.histogramTask.resetUI=ui\u3092\u518D\u8A2D\u5B9A\u4E2D
-VisualizationPanel.histogramTask.title=\u30D2\u30B9\u30C8\u30B0\u30E9\u30E0\u3092\u518D\u4F5C\u6210
+VisualizationPanel.histogramTask.title=\u30D2\u30B9\u30C8\u30B0\u30E9\u30E0\u3092\u518D\u30D3\u30EB\u30C9
 VisualizationPanel.histogramTask.updateUI2=ui\u3092\u66F4\u65B0\u4E2D
 StatusBar.messageLabel.text=\u30E9\u30D9\u30EB
 StatusBar.refreshLabel.text=\u65B0\u898F\u30A4\u30D9\u30F3\u30C8\u304C\u3042\u308B\u304B\u3082\u3057\u308C\u307E\u305B\u3093\u3002\u30EA\u30D5\u30EC\u30C3\u30B7\u30E5\u3059\u308B\u306B\u306F\u30BF\u30A4\u30E0\u30E9\u30A4\u30F3\u3092\u518D\u5EA6\u958B\u3044\u3066\u304F\u3060\u3055\u3044\u3002
@@ -14,10 +14,35 @@ TimeZonePanel.localRadio.text=\u30ED\u30FC\u30AB\u30EB\u30BF\u30A4\u30E0\u30BE\u
 VisualizationPanel.countsToggle.text=\u30AB\u30A6\u30F3\u30C8
 VisualizationPanel.detailsToggle.text=\u8A73\u7D30
 VisualizationPanel.endLabel.text=\u30A8\u30F3\u30C9\uFF1A
-VisualizationPanel.noEventsDialogLabel.text=\u73FE\u5728\u306E\u30BA\u30FC\u30E0\uFF0F\u30D5\u30A3\u30EB\u30BF\u8A2D\u5B9A\u3067\u306F\u898B\u3048\u308B\u30A4\u30D9\u30F3\u30C8\u304C\u3042\u308A\u307E\u305B\u3093\u3002
-VisualizationPanel.resetFiltersButton.text=\u5168\u3066\u306E\u30D5\u30A3\u30EB\u30BF\u3092\u30EA\u30BB\u30C3\u30C8
-VisualizationPanel.snapShotButton.text=\u30B9\u30AF\u30EA\u30FC\u30F3\u30B7\u30E7\u30C3\u30C8
+VisualizationPanel.noEventsDialogLabel.text=\u73FE\u5728\u306E\u30BA\u30FC\u30E0\uFF0F\u30D5\u30A3\u30EB\u30BF\u30FC\u8A2D\u5B9A\u3067\u306F\u898B\u3048\u308B\u30A4\u30D9\u30F3\u30C8\u304C\u3042\u308A\u307E\u305B\u3093\u3002
+VisualizationPanel.resetFiltersButton.text=\u5168\u3066\u306E\u30D5\u30A3\u30EB\u30BF\u30FC\u3092\u30EA\u30BB\u30C3\u30C8
 VisualizationPanel.startLabel.text=\u30B9\u30BF\u30FC\u30C8\uFF1A
-VisualizationPanel.visualizationModeLabel.text=\u53EF\u8996\u5316\u30E2\u30FC\u30C9\uFF1A
+VisualizationPanel.visualizationModeLabel.text=\u30D3\u30B8\u30E5\u30A2\u30E9\u30A4\u30BC\u30FC\u30B7\u30E7\u30F3\u30E2\u30FC\u30C9\uFF1A
 VisualizationPanel.zoomButton.text=\u30A4\u30D9\u30F3\u30C8\u3078\u30BA\u30FC\u30E0
 VisualizationPanel.zoomMenuButton.text=\u4E0B\u8A18\u3078\u30BA\u30FC\u30E0\u30A4\u30F3\uFF0F\u30BA\u30FC\u30E0\u30A2\u30A6\u30C8
+*=Autopsy\u30D5\u30A9\u30EC\u30F3\u30B8\u30C3\u30AF\u30D6\u30E9\u30A6\u30B6
+AbstractVisualization.Default_Tooltip.text=\u30DE\u30A6\u30B9\u3092\u30C9\u30E9\u30C3\u30B0\u3057\u3066\u30BA\u30FC\u30E0\u3059\u308B\u30BF\u30A4\u30E0\u9593\u9694\u3092\u9078\u629E\u3057\u3066\u304F\u3060\u3055\u3044\u3002\n\u305D\u306E\u4ED6\u306E\u30A2\u30AF\u30B7\u30E7\u30F3\u306F\u53F3\u30AF\u30EA\u30C3\u30AF\u3057\u3066\u304F\u3060\u3055\u3044
+IntervalSelector.ClearSelectedIntervalAction.tooltTipText=\u9078\u629E\u3057\u305F\u9593\u9694\u3092\u30AF\u30EA\u30A2\u3059\u308B
+IntervalSelector.ZoomAction.name=\u30BA\u30FC\u30E0
+NoEventsDialog.titledPane.text=\u898B\u308C\u308B\u30A4\u30D9\u30F3\u30C8\u304C\u3042\u308A\u307E\u305B\u3093
+Timeline.ui.ZoomRanges.onemin.text=1\u5206
+Timeline.ui.ZoomRanges.fifteenmin.text=15\u5206
+Timeline.ui.ZoomRanges.onehour.text=1\u6642\u9593
+Timeline.ui.ZoomRanges.sixhours.text=6\u6642\u9593
+Timeline.ui.ZoomRanges.twelvehours.text=12\u6642\u9593
+Timeline.ui.ZoomRanges.oneday.text=1\u65E5
+Timeline.ui.ZoomRanges.threedays.text=3\u65E5
+Timeline.ui.ZoomRanges.oneweek.text=1\u9031\u9593
+Timeline.ui.ZoomRanges.twoweeks.text=2\u9031\u9593
+Timeline.ui.ZoomRanges.onemonth.text=1\u30F6\u6708
+Timeline.ui.ZoomRanges.threemonths.text=3\u30F6\u6708
+Timeline.ui.ZoomRanges.sixmonths.text=6\u30F6\u6708
+Timeline.ui.ZoomRanges.oneyear.text=1\u5E74
+Timeline.ui.ZoomRanges.threeyears.text=3\u5E74
+Timeline.ui.ZoomRanges.fiveyears.text=5\u5E74
+Timeline.ui.ZoomRanges.tenyears.text=10\u5E74
+TimeLineChart.zoomHistoryActionGroup.name=\u30BA\u30FC\u30E0\u5C65\u6B74
+TimeZonePanel.title=\u6642\u9593\u3092\u6B21\u3067\u8868\u793A\uFF1A
+VisualizationPanel.refresh=\u30EA\u30D5\u30EC\u30C3\u30B7\u30E5
+VisualizationPanel.tagsAddedOrDeleted=\u30BF\u30B0\u304C\u4F5C\u6210\u3055\u308C\u307E\u3057\u305F\u304A\u3088\u3073\u307E\u305F\u306F\u524A\u9664\u3055\u308C\u307E\u3057\u305F\u3002\u30D3\u30B8\u30E5\u30A2\u30E9\u30A4\u30BC\u30FC\u30B7\u30E7\u30F3\u304C\u6700\u65B0\u3067\u306F\u306A\u3044\u304B\u3082\u3057\u308C\u307E\u305B\u3093\u3002
+VisualizationUpdateTask.preparing=\u30BA\u30FC\u30E0\u304A\u3088\u3073\u30D5\u30A3\u30EB\u30BF\u30FC\u8A2D\u5B9A\u3092\u89E3\u6790\u4E2D
diff --git a/Core/src/org/sleuthkit/autopsy/timeline/ui/countsview/Bundle_ja.properties b/Core/src/org/sleuthkit/autopsy/timeline/ui/countsview/Bundle_ja.properties
index d372432159..9cbcb05152 100644
--- a/Core/src/org/sleuthkit/autopsy/timeline/ui/countsview/Bundle_ja.properties
+++ b/Core/src/org/sleuthkit/autopsy/timeline/ui/countsview/Bundle_ja.properties
@@ -6,7 +6,7 @@ Timeline.ui.countsview.menuItem.selectTimeandType=\u6642\u9593\u3068\u30BF\u30A4
 Timeline.ui.countsview.menuItem.selectTimeRange=\u6642\u9593\u7BC4\u56F2\u3092\u9078\u629E
 Timeline.ui.countsview.menuItem.zoomIntoTimeRange=\u6642\u9593\u7BC4\u56F2\u3078\u30BA\u30FC\u30E0\u30A4\u30F3
 CountsViewPane.loggedTask.name=\u30AB\u30A6\u30F3\u30C8\u30D3\u30E5\u30FC\u3092\u66F4\u65B0\u4E2D
-CountsViewPane.loggedTask.updatingCounts=\u30D3\u30B8\u30E5\u30A2\u30E9\u30A4\u30BC\u30FC\u30B7\u30E7\u30F3\uFF08\u53EF\u8996\u5316\uFF09\u306B\u5165\u529B\u4E2D
+CountsViewPane.loggedTask.updatingCounts=\u30D3\u30B8\u30E5\u30A2\u30E9\u30A4\u30BC\u30FC\u30B7\u30E7\u30F3\uFF08\u53EF\u8996\u5316\uFF09\u3092\u5165\u529B\u4E2D
 CountsViewPane.tooltip.text={0} {1} \u30A4\u30D9\u30F3\u30C8\n{2}\u3068\n{3}\u306E\u9593
 CountsViewPane.linearRadio.text=\u30EA\u30CB\u30A2
 CountsViewPane.logRadio.text=\u5BFE\u6570\u7684
diff --git a/Core/src/org/sleuthkit/autopsy/timeline/ui/detailview/Bundle_ja.properties b/Core/src/org/sleuthkit/autopsy/timeline/ui/detailview/Bundle_ja.properties
index 3673185403..bf305b6d72 100644
--- a/Core/src/org/sleuthkit/autopsy/timeline/ui/detailview/Bundle_ja.properties
+++ b/Core/src/org/sleuthkit/autopsy/timeline/ui/detailview/Bundle_ja.properties
@@ -1,18 +1,13 @@
-Timeline.ui.detailview.tooltip.text={0}\n\u53F3\u30AF\u30EA\u30C3\u30AF\u3067\u524A\u9664\u3002\n\u53F3\u30AF\u30EA\u30C3\u30AF\uFF06\u30C9\u30E9\u30C3\u30B0\u3067\u4F4D\u7F6E\u5909\u66F4\u3002
-AggregateEventNode.installTooltip.text={0} {1} \u30A4\u30D9\u30F3\u30C8\n{2}\n{3}\u3068{4}\u306E\u9593
-AggregateEventNode.loggedTask.name=\u30B5\u30D6\u30A4\u30D9\u30F3\u30C8\u3092\u30ED\u30FC\u30C9
-DetailViewPane.loggedTask.name=\u8A73\u7D30\u3092\u66F4\u65B0
-DetailViewPane.loggedTask.preparing=\u6E96\u5099\u4E2D
-DetailViewPane.loggedTask.queryDb=DB\u3092\u30AF\u30A8\u30EA\u4E2D
-DetailViewPane.loggedTask.updateUI=ui\u3092\u66F4\u65B0\u4E2D
+DetailViewPane.loggedTask.name=\u8A73\u7D30\u30D3\u30E5\u30FC\u3092\u66F4\u65B0
+DetailViewPane.loggedTask.queryDb=\u30A4\u30D9\u30F3\u30C8\u30C7\u30FC\u30BF\u3092\u53D6\u5F97\u4E2D
+DetailViewPane.loggedTask.updateUI=\u30D3\u30B8\u30E5\u30A2\u30E9\u30A4\u30BC\u30FC\u30B7\u30E7\u30F3\u306B\u60C5\u5831\u3092\u5165\u529B\u4E2D
 EventDetailChart.chartContextMenu.placeMarker.name=\u30DE\u30FC\u30AB\u30FC\u3092\u8A2D\u7F6E
-EventDetailChart.contextMenu.zoomHistory.name=\u30BA\u30FC\u30E0\u5C65\u6B74
 DetailViewPan.truncateAllBox.text=\u8AAC\u660E\u3092\u524A\u9664
 DetailViewPan.truncateAllBoxMenuItem.text=\u8AAC\u660E\u3092\u524A\u9664
 DetailViewPane.advancedLayoutOptionsButtonLabel.text=\u30A2\u30C9\u30D0\u30F3\u30B9\u30EC\u30A4\u30A2\u30A6\u30C8\u30AA\u30D7\u30B7\u30E7\u30F3
 DetailViewPane.countsRadio.text=\u30AB\u30A6\u30F3\u30C8\u306E\u307F\u8868\u793A
 DetailViewPane.countsRadioMenuItem.text=\u30AB\u30A6\u30F3\u30C8\u306E\u307F\u8868\u793A
-DetailViewPane.descVisSeparatorMenuItem.text=\u8AAC\u660E\u53EF\u8996\u6027
+DetailViewPane.descVisSeparatorMenuItem.text=\u8AAC\u660E\u30D3\u30B8\u30D3\u30EA\u30C6\u30A3\uFF08\u53EF\u8996\u6027\uFF09
 DetailViewPane.hiddenRadio.text=\u8AAC\u660E\u3092\u96A0\u3059
 DetailViewPane.hiddenRadioMenuItem.text=\u8AAC\u660E\u3092\u96A0\u3059
 DetailViewPane.oneEventPerRowBox.text=1\u5217\u306B\u3064\u304D1\u30A4\u30D9\u30F3\u30C8
@@ -21,5 +16,20 @@ DetailViewPane.showRadio.text=\u8A73\u7D30\u8AAC\u660E\u3092\u8868\u793A
 DetailViewPane.showRadioMenuItem.text=\u8A73\u7D30\u8AAC\u660E\u3092\u8868\u793A
 DetailViewPane.truncateSlideLabelMenuItem.text=\u8AAC\u660E\u306E\u6700\u5927\u5E45\uFF08px\uFF09
 DetailViewPane.truncateSliderLabel.text=\u8AAC\u660E\u306E\u6700\u5927\u5E45\uFF08px\uFF09\uFF1A
-DetailViewPane.bandByTypeBox.text=\u30BF\u30A4\u30D7\u306B\u5F93\u3044\u4E26\u3073\u66FF\u3048
-DetailViewPane.bandByTypeBoxMenuItem.text=\u30BF\u30A4\u30D7\u306B\u5F93\u3044\u4E26\u3073\u66FF\u3048
\ No newline at end of file
+DetailViewPane.bandByTypeBox.text=\u30D0\u30F3\u30C9\u30D0\u30A4\u30BF\u30A4\u30D7
+DetailViewPane.bandByTypeBoxMenuItem.text=\u30D0\u30F3\u30C9\u30D0\u30A4\u30BF\u30A4\u30D7
+CollapseClusterAction.text=\u30B3\u30E9\u30D7\u30B9
+DetailViewPane.loggedTask.backButton=\u623B\u308B\uFF08\u53D6\u6D88\uFF09
+DetailViewPane.loggedTask.continueButton=\u9032\u3080
+DetailViewPane.loggedTask.prompt={0}\u30A4\u30D9\u30F3\u30C8\u306E\u8A73\u7D30\u3092\u8868\u793A\u3057\u3088\u3046\u3068\u3057\u3066\u3044\u307E\u3059\u3002\u3053\u308C\u306F\u975E\u5E38\u306B\u6642\u9593\u304C\u304B\u304B\u308B\u3001\u307E\u305F\u306FAutopsy\u3092\u30AF\u30E9\u30C3\u30B7\u30E5\u3059\u308B\u304B\u3082\u3057\u308C\u307E\u305B\u3093\u3002\n\n\u5B9F\u884C\u3057\u307E\u3059\u304B\uFF1F
+EventBundleNodeBase.toolTip.hashSetHits=\n\n\u30CF\u30C3\u30B7\u30E5\u30BB\u30C3\u30C8\u30D2\u30C3\u30C8\n{0}
+EventBundleNodeBase.toolTip.loading=\u8AAD\u307F\u8FBC\u307F\u4E2D...
+EventBundleNodeBase.toolTip.loading2=\u30C4\u30FC\u30EB\u30C1\u30C3\u30D7\u3092\u8AAD\u307F\u8FBC\u307F\u4E2D
+EventBundleNodeBase.toolTip.tags=\n\n\u30BF\u30B0\n{0}
+EventBundleNodeBase.tooltip.text={0} {1} \u30A4\u30D9\u30F3\u30C8\n{2}\n{3}\u3068{4}\u306E\u9593
+EventStripeNode.loggedTask.name=\u30B5\u30D6\u30AF\u30E9\u30B9\u30BF\u3092\u8AAD\u307F\u8FBC\u307F\u4E2D
+ExpandClusterAction.text=\u30A8\u30AF\u30B9\u30D1\u30F3\u30C9
+GuideLine.tooltip.text={0}\n\u53F3\u30AF\u30EA\u30C3\u30AF\u3067\u524A\u9664\u3002\n\u30C9\u30E9\u30C3\u30B0\u3057\u3066\u4F4D\u7F6E\u5909\u66F4\u3002
+HideDescriptionAction.displayMsg=\u8A73\u7D30\u30D3\u30E5\u30FC\u304B\u3089\u3053\u306E\u30B0\u30EB\u30FC\u30D7\u3092\u96A0\u3059\u3002
+HideDescriptionAction.displayName=\u96A0\u3059
+UnhideDescriptionAction.displayName=\u96A0\u3057\u305F\u3082\u306E\u3092\u8868\u793A
\ No newline at end of file
diff --git a/Core/src/org/sleuthkit/autopsy/timeline/ui/detailview/tree/Bundle_ja.properties b/Core/src/org/sleuthkit/autopsy/timeline/ui/detailview/tree/Bundle_ja.properties
index 6c97e0d5b2..811ba13bea 100644
--- a/Core/src/org/sleuthkit/autopsy/timeline/ui/detailview/tree/Bundle_ja.properties
+++ b/Core/src/org/sleuthkit/autopsy/timeline/ui/detailview/tree/Bundle_ja.properties
@@ -1 +1 @@
-EventsTree.Label.text=\u4e0b\u8a18\u306b\u5f93\u3044\u4e26\u3079\u66ff\u3048\uff1a
\ No newline at end of file
+EventsTree.Label.text=\u30BD\u30FC\u30C8\u30D0\u30A4\uFF1A
\ No newline at end of file
diff --git a/Core/src/org/sleuthkit/autopsy/timeline/ui/filtering/Bundle_ja.properties b/Core/src/org/sleuthkit/autopsy/timeline/ui/filtering/Bundle_ja.properties
index 6678c8eb8f..bad4e2e9ca 100644
--- a/Core/src/org/sleuthkit/autopsy/timeline/ui/filtering/Bundle_ja.properties
+++ b/Core/src/org/sleuthkit/autopsy/timeline/ui/filtering/Bundle_ja.properties
@@ -4,6 +4,9 @@ Timeline.ui.filtering.menuItem.only=\u4E0B\u8A18\u306B\u9650\u5B9A
 Timeline.ui.filtering.menuItem.others=\u305D\u306E\u4ED6
 Timeline.ui.filtering.menuItem.select=\u9078\u629E
 Timeline.ui.filtering.promptText=\u30D5\u30A3\u30EB\u30BF\u30B9\u30C8\u30EA\u30F3\u30B0\u3092\u5165\u529B
-FilterSetPanel.eventTypeFilter.title=\u30A4\u30D9\u30F3\u30C8\u30BF\u30A4\u30D7\u30D5\u30A3\u30EB\u30BF
 FilterSetPanel.applyButton.text=\u9069\u7528
-FilterSetPanel.defaultButton.text=\u30C7\u30D5\u30A9\u30EB\u30C8
\ No newline at end of file
+FilterSetPanel.defaultButton.text=\u30C7\u30D5\u30A9\u30EB\u30C8
+FilsetSetPanel.hiddenDescriptionsPane.displayName=\u96A0\u3055\u308C\u305F\u8AAC\u660E
+FilterSetPanel.applyButton.longText=\u30D5\u30A3\u30EB\u30BF\u30FC\u3092\uFF08\u518D\uFF09\u9069\u7528
+FilterSetPanel.hiddenDescriptionsListView.remove=\u30EA\u30B9\u30C8\u304B\u3089\u524A\u9664
+FilterSetPanel.hiddenDescriptionsListView.unhideAndRm=\u96A0\u3057\u305F\u3082\u306E\u3092\u8868\u793A\u3057\u3001\u30EA\u30B9\u30C8\u304B\u3089\u524A\u9664
\ No newline at end of file

From cb2ef5523c6093f76d40c6c31e89fdaffe2e4201 Mon Sep 17 00:00:00 2001
From: Nick Davis <nick.davis@narfindustries.com>
Date: Fri, 5 Feb 2016 13:06:29 -0500
Subject: [PATCH 60/68] merged in translations

---
 .../autopsy/imagegallery/Bundle_ja.properties         |  6 +++---
 .../autopsy/imagegallery/actions/Bundle_ja.properties |  2 +-
 .../autopsy/imagegallery/gui/Bundle_ja.properties     | 10 +++++++++-
 .../gui/drawableviews/Bundle_ja.properties            | 11 ++++++++++-
 .../imagegallery/gui/navpanel/Bundle_ja.properties    |  5 ++++-
 5 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/Bundle_ja.properties b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/Bundle_ja.properties
index de95d8c2e6..e45f7f486f 100644
--- a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/Bundle_ja.properties
+++ b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/Bundle_ja.properties
@@ -9,10 +9,10 @@ ImageGalleryController.InnerTask.message.name=\u30B9\u30C6\u30FC\u30BF\u30B9
 ImageGalleryController.InnerTask.progress.name=\u9032\u884C\u72B6\u6CC1
 ImageGalleryController.noGroupsDlg.msg1=\u5B8C\u5168\u306B\u89E3\u6790\u6E08\u307F\u306E\u30B0\u30EB\u30FC\u30D7\u306F\u3042\u308A\u307E\u305B\u3093\u3002\u3057\u304B\u3057\u3001\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u306E\u30EA\u30B9\u30CB\u30F3\u30B0\u304C\u7121\u52B9\u306B\u306A\u3063\u3066\u3044\u307E\u3059\u3002\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u304C\u5B8C\u4E86\u3057\u3001\u30EA\u30B9\u30CB\u30F3\u30B0\u304C\u518D\u5EA6\u6709\u52B9\u5316\u3055\u308C\u306A\u3051\u308C\u3070\u30B0\u30EB\u30FC\u30D7\u304C\u4F7F\u3048\u307E\u305B\u3093\u3002
 ImageGalleryController.noGroupsDlg.msg2=\u5B8C\u5168\u306B\u89E3\u6790\u6E08\u307F\u306E\u30B0\u30EB\u30FC\u30D7\u306F\u307E\u3060\u3042\u308A\u307E\u305B\u3093\u304C\u3001\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u304C\u307E\u3060\u5B9F\u884C\u4E2D\u3067\u3059\u3002\u3057\u3070\u3089\u304F\u304A\u5F85\u3061\u304F\u3060\u3055\u3044\u3002
-ImageGalleryController.noGroupsDlg.msg3=\u5B8C\u5168\u306B\u89E3\u6790\u6E08\u307F\u306E\u30B0\u30EB\u30FC\u30D7\u306F\u307E\u3060\u3042\u308A\u307E\u305B\u3093\u304C\u3001\u30A4\u30E1\u30FC\u30B8\uFF0F\u30D3\u30C7\u30AA\u30C7\u30FC\u30BF\u306E\u60C5\u5831\u304C\u307E\u3060\u5165\u529B\u4E2D\u3067\u3059\u3002\u3057\u3070\u3089\u304F\u304A\u5F85\u3061\u304F\u3060\u3055\u3044\u3002
+ImageGalleryController.noGroupsDlg.msg3=\u5B8C\u5168\u306B\u89E3\u6790\u6E08\u307F\u306E\u30B0\u30EB\u30FC\u30D7\u306F\u307E\u3060\u3042\u308A\u307E\u305B\u3093\u304C\u3001\u30A4\u30E1\u30FC\u30B8\uFF0F\u30D3\u30C7\u30AA\u30C7\u30FC\u30BF\u306E\u60C5\u5831\u3092\u307E\u3060\u5165\u529B\u4E2D\u3067\u3059\u3002\u3057\u3070\u3089\u304F\u304A\u5F85\u3061\u304F\u3060\u3055\u3044\u3002
 ImageGalleryController.noGroupsDlg.msg4=\u8FFD\u52A0\u3055\u308C\u305F\u30C7\u30FC\u30BF\u30BD\u30FC\u30B9\u306B\u306F\u4F7F\u3048\u308B\u30A4\u30E1\u30FC\u30B8\uFF0F\u30D3\u30C7\u30AA\u306F\u3042\u308A\u307E\u305B\u3093\u3002\u3057\u304B\u3057\u3001\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u306E\u30EA\u30B9\u30CB\u30F3\u30B0\u304C\u7121\u52B9\u306B\u306A\u3063\u3066\u3044\u307E\u3059\u3002\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u304C\u5B8C\u4E86\u3057\u3001\u30EA\u30B9\u30CB\u30F3\u30B0\u304C\u518D\u5EA6\u6709\u52B9\u5316\u3055\u308C\u306A\u3051\u308C\u3070\u30B0\u30EB\u30FC\u30D7\u304C\u4F7F\u3048\u307E\u305B\u3093\u3002
 ImageGalleryController.noGroupsDlg.msg5=\u8FFD\u52A0\u3055\u308C\u305F\u30C7\u30FC\u30BF\u30BD\u30FC\u30B9\u306B\u30A4\u30E1\u30FC\u30B8\uFF0F\u30D3\u30C7\u30AA\u304C\u3042\u308A\u307E\u305B\u3093\u3002
-ImageGalleryController.noGroupsDlg.msg6=\u8868\u793A\u3067\u304D\u308B\u5B8C\u5168\u306B\u89E3\u6790\u6E08\u307F\u306E\u30B0\u30EB\u30FC\u30D7\u304C\u3042\u308A\u307E\u305B\u3093\uFF1A\u73FE\u5728\u306E\u30B0\u30EB\u30FC\u30D7by\u8A2D\u5B9A\u3067\u306F\u30B0\u30EB\u30FC\u30D7\u304C\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F\u3002\u307E\u305F\u306F\u5B8C\u5168\u306B\u89E3\u6790\u6E08\u307F\u306E\u30B0\u30EB\u30FC\u30D7\u304C\u306A\u3044\u3051\u308C\u3069\u3001\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u304C\u5B9F\u884C\u3057\u3066\u3044\u306A\u3044\u304B\u3082\u3057\u308C\u307E\u305B\u3093\u3002
+ImageGalleryController.noGroupsDlg.msg6=\u8868\u793A\u3067\u304D\u308B\u5B8C\u5168\u306B\u89E3\u6790\u6E08\u307F\u306E\u30B0\u30EB\u30FC\u30D7\u304C\u3042\u308A\u307E\u305B\u3093\uFF1A\u73FE\u5728\u306E\u30B0\u30EB\u30FC\u30D7\u30D0\u30A4\u8A2D\u5B9A\u3067\u306F\u30B0\u30EB\u30FC\u30D7\u304C\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F\u3002\u307E\u305F\u306F\u5B8C\u5168\u306B\u89E3\u6790\u6E08\u307F\u306E\u30B0\u30EB\u30FC\u30D7\u304C\u306A\u3044\u3051\u308C\u3069\u3001\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u304C\u5B9F\u884C\u3057\u3066\u3044\u306A\u3044\u304B\u3082\u3057\u308C\u307E\u305B\u3093\u3002
 ImageGalleryModule.moduleName=\u30A4\u30E1\u30FC\u30B8\u30AE\u30E3\u30E9\u30EA\u30FC
 OpenIDE-Module-Long-Description=\
     \u30A4\u30E1\u30FC\u30B8\u304C\u591A\u3044\u8ABF\u67FB\u3092\u3088\u308A\u52B9\u7387\u7684\u306B\u884C\u3048\u308B\u3088\u3046\u306B\u8A2D\u8A08\u3055\u308C\u305F\u3001\u65B0\u3057\u3044\u30A4\u30E1\u30FC\u30B8\u304A\u3088\u3073\u30D3\u30C7\u30AA\u30AE\u30E3\u30E9\u30EA\u30FC\u3067\u3059\u3002\
@@ -23,7 +23,7 @@ OpenIDE-Module-Short-Description=\u30A2\u30C9\u30D0\u30F3\u30B9\u30A4\u30E1\u30F
 ImageGalleryOptionsPanel.enabledForCaseBox.text=\u4F5C\u696D\u4E2D\u306E\u30B1\u30FC\u30B9\u306E\u30A4\u30E1\u30FC\u30B8\u30AE\u30E3\u30E9\u30EA\u30FC\u306E\u66F4\u65B0\u3092\u6709\u52B9\u5316\u3059\u308B\u3002
 ImageGalleryOptionsPanel.enabledByDefaultBox.text=\u30C7\u30D5\u30A9\u30EB\u30C8\u8A2D\u5B9A\u3068\u3057\u3066\u65B0\u3057\u3044\u30B1\u30FC\u30B9\u306E\u30A4\u30E1\u30FC\u30B8\u30AE\u30E3\u30E9\u30EA\u30FC\u3092\u6709\u52B9\u5316\u3059\u308B\u3002
 ImageGalleryOptionsPanel.enabledForCaseBox.toolTipText=\u30A4\u30E1\u30FC\u30B8\u30AE\u30E3\u30E9\u30EA\u30FC\u304C\u7121\u52B9\u306A\u5834\u5408\u3001\u66F4\u65B0\u304C\u5FC5\u8981\u3068\u3044\u3046\u3053\u3068\u3060\u3051\u8A18\u9332\u3055\u308C\u307E\u3059\u3002\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u5F8C\u306B\u30A4\u30E1\u30FC\u30B8\u30AE\u30E3\u30E9\u30EA\u30FC\u304C\u6709\u52B9\u5316\u3055\u308C\u305F\u5834\u5408\u3001\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u306E\u7D50\u679C\u3092\u5143\u306B\u4E00\u5EA6\u306B\u307E\u3068\u3081\u3066\u66F4\u65B0\u3092\u3057\u307E\u3059\u3002\u30A4\u30E1\u30FC\u30B8\u30AE\u30E3\u30E9\u30EA\u30FC\u304C\u7121\u52B9\u306E\u5834\u5408\u3001\u30A4\u30E1\u30FC\u30B8\u30AE\u30E3\u30E9\u30EA\u30FC\u306E\u30A6\u30A3\u30F3\u30C9\u30A6\u3092\u958B\u3053\u3046\u3068\u3057\u305F\u969B\u306B\u6709\u52B9\u5316\u3059\u308B\u3088\u3046\u306B\u6307\u793A\u3055\u308C\u307E\u3059\u3002
-ImageGalleryOptionsPanel.descriptionLabel.text=<html>\u30B9\u30BF\u30FC\u30C8\u30A2\u30C3\u30D7\u6642\u9593\u3092\u6700\u5C0F\u9650\u306B\u3059\u308B\u305F\u3081\u3001\u30A4\u30E1\u30FC\u30B8\u30AE\u30E3\u30E9\u30EA\u30FC\u306F\u7D99\u7D9A\u7684\u306B\u5185\u90E8\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u3092\u66F4\u65B0\u3057\u307E\u3059\u3002<br />\u30A4\u30E1\u30FC\u30B8\u30AE\u30E3\u30E9\u30EA\u30FC\u304C\u5FC5\u8981\u3067\u306A\u3044\u5834\u5408\u3001\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u3092\u9045\u304F\u3059\u308B\u304B\u3082\u3057\u308C\u307E\u305B\u3093\u3002<br />\u30A4\u30E1\u30FC\u30B8\u30AE\u30E3\u30E9\u30EA\u30FC\u304C\u5FC5\u8981\u3067\u306A\u3044\u5834\u5408\u3001\u3053\u306E\u8A2D\u5B9A\u3092\u4F7F\u3044\u30A4\u30E1\u30FC\u30B8\u30AE\u30E3\u30E9\u30EA\u30FC\u3092\u7121\u52B9\u306B\u3057\u3066\u304F\u3060\u3055\u3044\u3002</html>
+ImageGalleryOptionsPanel.descriptionLabel.text=<html>\u30B9\u30BF\u30FC\u30C8\u30A2\u30C3\u30D7\u6642\u9593\u3092\u6700\u5C0F\u9650\u306B\u3059\u308B\u305F\u3081\u3001\u30A4\u30E1\u30FC\u30B8\u30AE\u30E3\u30E9\u30EA\u30FC\u306F\u7D99\u7D9A\u7684\u306B\u5185\u90E8\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u3092\u66F4\u65B0\u3057\u307E\u3059\u3002<br />\u30A4\u30E1\u30FC\u30B8\u30AE\u30E3\u30E9\u30EA\u30FC\u306E\u6A5F\u80FD\u304C\u5FC5\u8981\u3067\u306A\u3044\u5834\u5408\u3001\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u3092\u9045\u304F\u3059\u308B\u304B\u3082\u3057\u308C\u307E\u305B\u3093\u3002<br />\u30A4\u30E1\u30FC\u30B8\u30AE\u30E3\u30E9\u30EA\u30FC\u304C\u5FC5\u8981\u3067\u306A\u3044\u5834\u5408\u3001\u3053\u306E\u8A2D\u5B9A\u3092\u4F7F\u3044\u30A4\u30E1\u30FC\u30B8\u30AE\u30E3\u30E9\u30EA\u30FC\u3092\u7121\u52B9\u306B\u3057\u3066\u304F\u3060\u3055\u3044\u3002</html>
 ImageGalleryOptionsPanel.furtherDescriptionArea.text=\u30A4\u30E1\u30FC\u30B8\u30AE\u30E3\u30E9\u30EA\u30FC\u304C\u7121\u52B9\u306A\u5834\u5408\u3001\u66F4\u65B0\u304C\u5FC5\u8981\u3068\u3044\u3046\u3053\u3068\u3060\u3051\u8A18\u9332\u3055\u308C\u307E\u3059\u3002\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u5F8C\u306B\u30A4\u30E1\u30FC\u30B8\u30AE\u30E3\u30E9\u30EA\u30FC\u304C\u6709\u52B9\u5316\u3055\u308C\u305F\u5834\u5408\u3001\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u306E\u7D50\u679C\u3092\u5143\u306B\u4E00\u5EA6\u306B\u307E\u3068\u3081\u3066\u66F4\u65B0\u3092\u3057\u307E\u3059\u3002\u30A4\u30E1\u30FC\u30B8\u30AE\u30E3\u30E9\u30EA\u30FC\u304C\u7121\u52B9\u306E\u5834\u5408\u3001\u30A4\u30E1\u30FC\u30B8\u30AE\u30E3\u30E9\u30EA\u30FC\u306E\u30A6\u30A3\u30F3\u30C9\u30A6\u3092\u958B\u3053\u3046\u3068\u3057\u305F\u969B\u306B\u6709\u52B9\u5316\u3059\u308B\u3088\u3046\u306B\u6307\u793A\u3055\u308C\u307E\u3059\u3002
 ImageGalleryOptionsPanel.unavailableDuringInjestLabel.text=\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u4E2D\u306F\u3053\u306E\u8A2D\u5B9A\u306F\u4F7F\u3048\u307E\u305B\u3093\u3002
 OptionsCategory_Keywords_Options=\u30A4\u30E1\u30FC\u30B8\u30D3\u30C7\u30AA\u30AE\u30E3\u30E9\u30EA\u30FC\u30AB\u30C6\u30B4\u30EA\u30FC
diff --git a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/actions/Bundle_ja.properties b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/actions/Bundle_ja.properties
index ed03d6166d..122bcaf610 100644
--- a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/actions/Bundle_ja.properties
+++ b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/actions/Bundle_ja.properties
@@ -16,7 +16,7 @@ Forward.displayName=\u9032\u3080
 MediaViewImagePanel.externalViewerButton.text=\u5916\u90E8\u30D3\u30E5\u30FC\u30A2\u30FC\u3067\u958B\u304F
 NextUnseenGroup.markGroupSeen=\u78BA\u8A8D\u6E08\u307F\u306E\u30B0\u30EB\u30FC\u30D7\u3092\u30DE\u30FC\u30AF\u3059\u308B
 NextUnseenGroup.nextUnseenGroup=\u6B21\u306E\u672A\u78BA\u8A8D\u306E\u30B0\u30EB\u30FC\u30D7
-OpenAction.stale.confDlg.msg=\u30A4\u30E1\u30FC\u30B8\uFF0F\u30D3\u30C7\u30AA\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u304C\u53E4\u3044\u304B\u3082\u3057\u308C\u307E\u305B\u3093\u3002\u66F4\u65B0\u3057\u3066\u3001\u65B0\u305F\u306A\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u7D50\u679C\u3092\u78BA\u8A8D\u3057\u307E\u3059\u304B\uFF1F\n\u300C\u306F\u3044\u300D\u3092\u9078\u629E\u3059\u308C\u3070\u3001\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u3092\u66F4\u65B0\u3057\u3001\u65B0\u305F\u306A\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u3092\u78BA\u8A8D\u3059\u308B\u3053\u3068\u304C\u53EF\u80FD\u306B\u306A\u308A\u307E\u3059\u3002
+OpenAction.stale.confDlg.msg=\u30A4\u30E1\u30FC\u30B8\uFF0F\u30D3\u30C7\u30AA\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u304C\u6700\u65B0\u3067\u306F\u306A\u3044\u304B\u3082\u3057\u308C\u307E\u305B\u3093\u3002\u66F4\u65B0\u3057\u3066\u3001\u65B0\u305F\u306A\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u7D50\u679C\u3092\u78BA\u8A8D\u3057\u307E\u3059\u304B\uFF1F\n\u300C\u306F\u3044\u300D\u3092\u9078\u629E\u3059\u308C\u3070\u3001\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u3092\u66F4\u65B0\u3057\u3001\u65B0\u305F\u306A\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u3092\u78BA\u8A8D\u3059\u308B\u3053\u3068\u304C\u53EF\u80FD\u306B\u306A\u308A\u307E\u3059\u3002
 OpenAction.stale.confDlg.title=\u30A4\u30E1\u30FC\u30B8\u30AE\u30E3\u30E9\u30EA\u30FC
 OpenExternalViewerAction.displayName=\u5916\u90E8\u30D3\u30E5\u30FC\u30A2\u30FC
 RedoAction.name=\u518D\u5B9F\u884C
diff --git a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/Bundle_ja.properties b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/Bundle_ja.properties
index 2e9f276d71..622288ba8d 100644
--- a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/Bundle_ja.properties
+++ b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/Bundle_ja.properties
@@ -1,4 +1,12 @@
-StatuBar.toolTip=\u4E00\u90E8\u306E\u30C7\u30FC\u30BF\u304C\u53E4\u3044\u304B\u3082\u3057\u308C\u307E\u305B\u3093\u3002\u30A4\u30E1\u30FC\u30B8\u30AE\u30E3\u30E9\u30EA\u30FC\u30C7\u30FC\u30BF\u3092\u66F4\u65B0\u3059\u308B\u305F\u3081\u3001\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u304C\u5B8C\u4E86\u5F8C\u30C4\u30FC\u30EB|\u30AA\u30D7\u30B7\u30E7\u30F3|\u30A4\u30E1\u30FC\u30B8\uFF0F\u30D3\u30C7\u30AA\u30AE\u30E3\u30E9\u30EA\u30FC\u3067\u30A4\u30E1\u30FC\u30B8\u30AE\u30E3\u30E9\u30EA\u30FC\u3092\u6709\u52B9\u5316\u3057\u3066\u304F\u3060\u3055\u3044\u3002
+StatuBar.toolTip=\u4E00\u90E8\u306E\u30C7\u30FC\u30BF\u304C\u6700\u65B0\u3067\u306F\u306A\u3044\u304B\u3082\u3057\u308C\u307E\u305B\u3093\u3002\u30A4\u30E1\u30FC\u30B8\u30AE\u30E3\u30E9\u30EA\u30FC\u30C7\u30FC\u30BF\u3092\u66F4\u65B0\u3059\u308B\u305F\u3081\u3001\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u304C\u5B8C\u4E86\u5F8C\u30C4\u30FC\u30EB|\u30AA\u30D7\u30B7\u30E7\u30F3|\u30A4\u30E1\u30FC\u30B8\uFF0F\u30D3\u30C7\u30AA\u30AE\u30E3\u30E9\u30EA\u30FC\u3067\u30A4\u30E1\u30FC\u30B8\u30AE\u30E3\u30E9\u30EA\u30FC\u3092\u6709\u52B9\u5316\u3057\u3066\u304F\u3060\u3055\u3044\u3002
 StatusBar.bgTaskLabel.text=\u518D\u5EA6\u30B0\u30EB\u30FC\u30D7\u5316
 StatusBar.fileUpdateTaskLabel.text=\u30D5\u30A1\u30A4\u30EB\u66F4\u65B0\u30BF\u30B9\u30AF
+SummaryTablePane.catColumn=\u30AB\u30C6\u30B4\u30EA\u30FC
+SummaryTablePane.countColumn=\#\u30D5\u30A1\u30A4\u30EB
+Toolbar.applyToGroupLabel=\u6B21\u306E\u30B0\u30EB\u30FC\u30D7\u306B\u9069\u7528\uFF1A
+Toolbar.ascRadio=\u30A2\u30BB\u30F3\u30C9\uFF08\u4E0B\u304B\u3089\u4E0A\u3078\uFF09
+Toolbar.descRadio=\u30C7\u30A3\u30BB\u30F3\u30C9\uFF08\u4E0A\u304B\u3089\u4E0B\u3078\uFF09
+Toolbar.groupByLabel=\u30B0\u30EB\u30FC\u30D7\u30D0\u30A4\uFF1A
+Toolbar.sortByLabel=\u30BD\u30FC\u30C8\u30D0\u30A4\uFF1A
+Toolbar.thumbnailSizeLabel=\u30B5\u30E0\u30CD\u30A4\u30EB\u30B5\u30A4\u30BA\uFF08px\uFF09\uFF1A
 VideoPlayer.errNotice={0}\n\u8A73\u7D30\u3092\u30ED\u30B0\u3067\u78BA\u8A8D\u3057\u3066\u304F\u3060\u3055\u3044\u3002
\ No newline at end of file
diff --git a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/drawableviews/Bundle_ja.properties b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/drawableviews/Bundle_ja.properties
index bc42d476a1..698a46d379 100644
--- a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/drawableviews/Bundle_ja.properties
+++ b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/drawableviews/Bundle_ja.properties
@@ -1,10 +1,19 @@
+DrawableTile.nameLabel=\u30D5\u30A1\u30A4\u30EB\u540D
 DrawableTileBase.externalViewerAction.text=\u5916\u90E8\u30D3\u30E5\u30FC\u30A2\u30FC\u3067\u958B\u304F
 DrawableTileBase.menuItem.extractFiles=\u30D5\u30A1\u30A4\u30EB\u3092\u62BD\u51FA
 DrawableTileBase.menuItem.showContentViewer=\u30B3\u30F3\u30C6\u30F3\u30C4\u30D3\u30E5\u30FC\u30A2\u30FC\u3092\u8868\u793A
 DrawableUIBase.errorLabel.OOMText=\u30E1\u30E2\u30EA\u4E0D\u8DB3
 DrawableUIBase.errorLabel.text=\u30D5\u30A1\u30A4\u30EB\u3092\u8AAD\u307F\u53D6\u308C\u307E\u305B\u3093\u3067\u3057\u305F
+GroupPane.bottomLabel.displayText=\u30B0\u30EB\u30FC\u30D7\u30D3\u30E5\u30FC\u30A4\u30F3\u30B0\u5C65\u6B74\uFF1A
+GroupPane.catContainerLabel.displayText=\u9078\u629E\u3057\u305F\u30D5\u30A1\u30A4\u30EB\u3092\u30AB\u30C6\u30B4\u30E9\u30A4\u30BA\uFF1A
+GroupPane.catHeadingLabel.displayText=\u30AB\u30C6\u30B4\u30EA\u30FC\uFF1A
 GroupPane.gridViewContextMenuItem.extractFiles=\u30D5\u30A1\u30A4\u30EB\u3092\u62BD\u51FA
 GroupPane.headerString={0} -- {1} \u30CF\u30C3\u30B7\u30E5\u30BB\u30C3\u30C8\u30D2\u30C3\u30C8\uFF0F{2}\u30D5\u30A1\u30A4\u30EB
+GroupPane.hederLabel.displayText=\u9078\u629E\u3057\u305F\u30D5\u30A1\u30A4\u30EB\u3092\u30BF\u30B0\uFF1A
 MediaLoadTask.messageText={0}\u30D3\u30C7\u30AA\u3092\u8AAD\u307F\u53D6\u308A\u4E2D
-MetaDataPane.tableView.placeholder=\u8A73\u7D30\u3092\u8868\u793A\u3059\u308B\u306B\u306F\u30D5\u30A1\u30A4\u30EB\u3092\u9078\u629E\u3057\u3066\u304F\u3060\u3055\u3044\u3002
+MetaDataPane.attributeColumn.headingName=\u5C5E\u6027
+MetaDataPane.copyMenuItem.text=\u30B3\u30D4\u30FC
+MetaDataPane.tableView.placeholder=\u3053\u3053\u306B\u8A73\u7D30\u3092\u8868\u793A\u3059\u308B\u30D5\u30A1\u30A4\u30EB\u3092\u9078\u629E\u3057\u3066\u304F\u3060\u3055\u3044\u3002
+MetaDataPane.titledPane.displayName=\u8A73\u7D30
+MetaDataPane.valueColumn.headingName=\u30D0\u30EA\u30E5\u30FC
 SlideShowView.supplementalText={1}\u306E\u3046\u3061{0}\u304C\u30B0\u30EB\u30FC\u30D7\u306B\u3042\u308A\u307E\u3059
\ No newline at end of file
diff --git a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/navpanel/Bundle_ja.properties b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/navpanel/Bundle_ja.properties
index 3af7764c49..fb9ee5293f 100644
--- a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/navpanel/Bundle_ja.properties
+++ b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/navpanel/Bundle_ja.properties
@@ -4,4 +4,7 @@ GroupComparators.hitCount=\u30D2\u30C3\u30C8\u30AB\u30A6\u30F3\u30C8
 GroupComparators.hitDensity=\u30D2\u30C3\u30C8\u5BC6\u5EA6
 GroupComparators.uncategorizedCount=\u30AB\u30C6\u30B4\u30E9\u30A4\u30BA\u3055\u308C\u3066\u3044\u306A\u3044\u30AB\u30A6\u30F3\u30C8
 GroupTree.displayName.allGroups=\u5168\u3066\u306E\u30B0\u30EB\u30FC\u30D7
-HashHitGroupList.displayName.onlyHashHits=\u30CF\u30C3\u30B7\u30E5\u30D2\u30C3\u30C8\u306E\u307F
\ No newline at end of file
+HashHitGroupList.displayName.onlyHashHits=\u30CF\u30C3\u30B7\u30E5\u30D2\u30C3\u30C8\u306E\u307F
+NavPanel.ascRadio.text=\u4E0B\u304B\u3089\u4E0A\u3078
+NavPanel.descRadio.text=\u4E0A\u304B\u3089\u4E0B\u3078
+NavPanel.sortByBoxLabel.text=\u30BD\u30FC\u30C8\u30D0\u30A4\uFF1A
\ No newline at end of file

From 92c073b9e2b9324c1258ff717043a43a868085c8 Mon Sep 17 00:00:00 2001
From: Nick Davis <nick.davis@narfindustries.com>
Date: Fri, 5 Feb 2016 13:29:06 -0500
Subject: [PATCH 61/68] updated after merge

---
 .../sleuthkit/autopsy/imagegallery/gui/Toolbar.java  | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/Toolbar.java b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/Toolbar.java
index fc6814392c..0dcd4b0a2e 100644
--- a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/Toolbar.java
+++ b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/Toolbar.java
@@ -95,7 +95,10 @@ public class Toolbar extends ToolBar {
     private Label sortByLabel;
 
     @FXML
-    private Label applyToGroupLabel;
+    private Label tagImageViewLabel;
+
+    @FXML
+    private Label categoryImageViewLabel;
 
     @FXML
     private Label thumbnailSizeLabel;
@@ -135,7 +138,8 @@ public class Toolbar extends ToolBar {
             "Toolbar.sortByLabel=Sort By:",
             "Toolbar.ascRadio=Ascending",
             "Toolbar.descRadio=Descending",
-            "Toolbar.applyToGroupLabel=Apply to Group:",
+            "Toolbar.tagImageViewLabel=Tag Group's Files:",
+            "Toolbar.categoryImageViewLabel=Categorize Group's Files:",
             "Toolbar.thumbnailSizeLabel=Thumbnail Size (px):"})
     void initialize() {
         assert ascRadio != null : "fx:id=\"ascRadio\" was not injected: check your FXML file 'Toolbar.fxml'.";
@@ -174,7 +178,9 @@ public class Toolbar extends ToolBar {
         sortByLabel.setText(Bundle.Toolbar_sortByLabel());
         ascRadio.setText(Bundle.Toolbar_ascRadio());
         descRadio.setText(Bundle.Toolbar_descRadio());
-        applyToGroupLabel.setText(Bundle.Toolbar_applyToGroupLabel());
+        tagImageViewLabel.setText(Bundle.Toolbar_tagImageViewLabel());
+        categoryImageViewLabel.setText(Bundle.Toolbar_categoryImageViewLabel());
+
         thumbnailSizeLabel.setText(Bundle.Toolbar_thumbnailSizeLabel());
 
         CategorizeGroupAction cat5GroupAction = new CategorizeGroupAction(Category.FIVE, controller);

From a5fb869bdc7fe0aedeedccb166a8e8ce384b72b0 Mon Sep 17 00:00:00 2001
From: Nick Davis <nick.davis@narfindustries.com>
Date: Fri, 5 Feb 2016 13:37:30 -0500
Subject: [PATCH 62/68] merged in translations

---
 .../autopsy/timeline/ui/detailview/tree/Bundle_ja.properties | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Core/src/org/sleuthkit/autopsy/timeline/ui/detailview/tree/Bundle_ja.properties b/Core/src/org/sleuthkit/autopsy/timeline/ui/detailview/tree/Bundle_ja.properties
index 811ba13bea..5252dcf4f3 100644
--- a/Core/src/org/sleuthkit/autopsy/timeline/ui/detailview/tree/Bundle_ja.properties
+++ b/Core/src/org/sleuthkit/autopsy/timeline/ui/detailview/tree/Bundle_ja.properties
@@ -1 +1,4 @@
-EventsTree.Label.text=\u30BD\u30FC\u30C8\u30D0\u30A4\uFF1A
\ No newline at end of file
+EventsTree.Label.text=\u30BD\u30FC\u30C8\u30D0\u30A4\uFF1A
+TreeComparator.Count.displayName=\u30AB\u30A6\u30F3\u30C8
+TreeComparator.Description.displayName=\u8AAC\u660E
+TreeComparator.Type.displayName=\u30BF\u30A4\u30D7
\ No newline at end of file

From 1cf82f3dbf83f44bc30ed577ca39ed2be80c837b Mon Sep 17 00:00:00 2001
From: Nick Davis <nick.davis@narfindustries.com>
Date: Fri, 5 Feb 2016 13:47:13 -0500
Subject: [PATCH 63/68] cleaned up

---
 .../autopsy/timeline/ui/VisualizationPanel.java          | 9 ++++++++-
 .../autopsy/timeline/ui/filtering/FilterSetPanel.fxml    | 2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/timeline/ui/VisualizationPanel.java b/Core/src/org/sleuthkit/autopsy/timeline/ui/VisualizationPanel.java
index 47298b3879..eb3cf09768 100644
--- a/Core/src/org/sleuthkit/autopsy/timeline/ui/VisualizationPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/timeline/ui/VisualizationPanel.java
@@ -34,7 +34,14 @@ import javafx.beans.value.ObservableValue;
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
 import javafx.geometry.Insets;
-import javafx.scene.control.*;
+import javafx.scene.control.Button;
+import javafx.scene.control.Label;
+import javafx.scene.control.MenuButton;
+import javafx.scene.control.TitledPane;
+import javafx.scene.control.Toggle;
+import javafx.scene.control.ToggleButton;
+import javafx.scene.control.ToolBar;
+import javafx.scene.control.Tooltip;
 import javafx.scene.effect.Lighting;
 import javafx.scene.image.Image;
 import javafx.scene.image.ImageView;
diff --git a/Core/src/org/sleuthkit/autopsy/timeline/ui/filtering/FilterSetPanel.fxml b/Core/src/org/sleuthkit/autopsy/timeline/ui/filtering/FilterSetPanel.fxml
index b7427c6b2e..6f6d17b81a 100644
--- a/Core/src/org/sleuthkit/autopsy/timeline/ui/filtering/FilterSetPanel.fxml
+++ b/Core/src/org/sleuthkit/autopsy/timeline/ui/filtering/FilterSetPanel.fxml
@@ -39,7 +39,7 @@
       <TreeTableView fx:constant="CONSTRAINED_RESIZE_POLICY" />
       </columnResizePolicy>
       </TreeTableView>
-            <TitledPane fx:id="hiddenDescriptionsPane" collapsible="false" disable="true" expanded="false" minHeight="25.0">
+            <TitledPane fx:id="hiddenDescriptionsPane" collapsible="false" disable="true" expanded="false" minHeight="25.0" text="Hidden Descriptions">
                <content>
                   <ListView fx:id="hiddenDescriptionsListView" />
                </content>

From b62e63f92decfac241ba61a03671403091484966 Mon Sep 17 00:00:00 2001
From: Nick Davis <nick.davis@narfindustries.com>
Date: Fri, 5 Feb 2016 13:51:40 -0500
Subject: [PATCH 64/68] merged in translations

---
 .../org/sleuthkit/autopsy/imagegallery/Bundle_ja.properties   | 2 +-
 .../sleuthkit/autopsy/imagegallery/gui/Bundle_ja.properties   | 3 ++-
 .../autopsy/imagegallery/gui/navpanel/Bundle_ja.properties    | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/Bundle_ja.properties b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/Bundle_ja.properties
index e45f7f486f..60018f7387 100644
--- a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/Bundle_ja.properties
+++ b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/Bundle_ja.properties
@@ -16,7 +16,7 @@ ImageGalleryController.noGroupsDlg.msg6=\u8868\u793A\u3067\u304D\u308B\u5B8C\u51
 ImageGalleryModule.moduleName=\u30A4\u30E1\u30FC\u30B8\u30AE\u30E3\u30E9\u30EA\u30FC
 OpenIDE-Module-Long-Description=\
     \u30A4\u30E1\u30FC\u30B8\u304C\u591A\u3044\u8ABF\u67FB\u3092\u3088\u308A\u52B9\u7387\u7684\u306B\u884C\u3048\u308B\u3088\u3046\u306B\u8A2D\u8A08\u3055\u308C\u305F\u3001\u65B0\u3057\u3044\u30A4\u30E1\u30FC\u30B8\u304A\u3088\u3073\u30D3\u30C7\u30AA\u30AE\u30E3\u30E9\u30EA\u30FC\u3067\u3059\u3002\
-    \u3053\u308C\u306FDHS S&T\u304C\u652F\u63F4\u3057\u3001\u03B2\u7248\u306E\u30EA\u30EA\u30FC\u30B9\u3067\u3059\u3002\
+    \u3053\u308C\u306FDHS S&T\u304C\u652F\u63F4\u3057\u3001\u30D9\u30FC\u30BF\u7248\u306E\u30EA\u30EA\u30FC\u30B9\u3067\u3059\u3002\
     sleuthkit.org\u3067\u306F\u307E\u3060\u5165\u624B\u3067\u304D\u305A\u3001\u9650\u3089\u308C\u305F\u30E6\u30FC\u30B6\u30FC\u306B\u3057\u304B\u63D0\u4F9B\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
 OpenIDE-Module-Name=\u30A4\u30E1\u30FC\u30B8\u30AE\u30E3\u30E9\u30EA\u30FC
 OpenIDE-Module-Short-Description=\u30A2\u30C9\u30D0\u30F3\u30B9\u30A4\u30E1\u30FC\u30B8\u304A\u3088\u3073\u30D3\u30C7\u30AA\u30AE\u30E3\u30E9\u30EA\u30FC
diff --git a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/Bundle_ja.properties b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/Bundle_ja.properties
index 622288ba8d..7a18ada46d 100644
--- a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/Bundle_ja.properties
+++ b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/Bundle_ja.properties
@@ -3,10 +3,11 @@ StatusBar.bgTaskLabel.text=\u518D\u5EA6\u30B0\u30EB\u30FC\u30D7\u5316
 StatusBar.fileUpdateTaskLabel.text=\u30D5\u30A1\u30A4\u30EB\u66F4\u65B0\u30BF\u30B9\u30AF
 SummaryTablePane.catColumn=\u30AB\u30C6\u30B4\u30EA\u30FC
 SummaryTablePane.countColumn=\#\u30D5\u30A1\u30A4\u30EB
-Toolbar.applyToGroupLabel=\u6B21\u306E\u30B0\u30EB\u30FC\u30D7\u306B\u9069\u7528\uFF1A
 Toolbar.ascRadio=\u30A2\u30BB\u30F3\u30C9\uFF08\u4E0B\u304B\u3089\u4E0A\u3078\uFF09
+Toolbar.categoryImageViewLabel=\u30B0\u30EB\u30FC\u30D7\u306E\u30D5\u30A1\u30A4\u30EB\u3092\u30AB\u30C6\u30B4\u30E9\u30A4\u30BA\uFF1A
 Toolbar.descRadio=\u30C7\u30A3\u30BB\u30F3\u30C9\uFF08\u4E0A\u304B\u3089\u4E0B\u3078\uFF09
 Toolbar.groupByLabel=\u30B0\u30EB\u30FC\u30D7\u30D0\u30A4\uFF1A
 Toolbar.sortByLabel=\u30BD\u30FC\u30C8\u30D0\u30A4\uFF1A
+Toolbar.tagImageViewLabel=\u30B0\u30EB\u30FC\u30D7\u306E\u30D5\u30A1\u30A4\u30EB\u3092\u30BF\u30B0\uFF1A
 Toolbar.thumbnailSizeLabel=\u30B5\u30E0\u30CD\u30A4\u30EB\u30B5\u30A4\u30BA\uFF08px\uFF09\uFF1A
 VideoPlayer.errNotice={0}\n\u8A73\u7D30\u3092\u30ED\u30B0\u3067\u78BA\u8A8D\u3057\u3066\u304F\u3060\u3055\u3044\u3002
\ No newline at end of file
diff --git a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/navpanel/Bundle_ja.properties b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/navpanel/Bundle_ja.properties
index fb9ee5293f..659092aa6d 100644
--- a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/navpanel/Bundle_ja.properties
+++ b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/navpanel/Bundle_ja.properties
@@ -5,6 +5,6 @@ GroupComparators.hitDensity=\u30D2\u30C3\u30C8\u5BC6\u5EA6
 GroupComparators.uncategorizedCount=\u30AB\u30C6\u30B4\u30E9\u30A4\u30BA\u3055\u308C\u3066\u3044\u306A\u3044\u30AB\u30A6\u30F3\u30C8
 GroupTree.displayName.allGroups=\u5168\u3066\u306E\u30B0\u30EB\u30FC\u30D7
 HashHitGroupList.displayName.onlyHashHits=\u30CF\u30C3\u30B7\u30E5\u30D2\u30C3\u30C8\u306E\u307F
-NavPanel.ascRadio.text=\u4E0B\u304B\u3089\u4E0A\u3078
-NavPanel.descRadio.text=\u4E0A\u304B\u3089\u4E0B\u3078
+NavPanel.ascRadio.text=\u30A2\u30BB\u30F3\u30C9\uFF08\u4E0B\u304B\u3089\u4E0A\u3078\uFF09
+NavPanel.descRadio.text=\u30C7\u30A3\u30BB\u30F3\u30C9\uFF08\u4E0A\u304B\u3089\u4E0B\u3078\uFF09
 NavPanel.sortByBoxLabel.text=\u30BD\u30FC\u30C8\u30D0\u30A4\uFF1A
\ No newline at end of file

From 3b184e0290a99003bdf9055e8727bb2894d4c243 Mon Sep 17 00:00:00 2001
From: Karl Mortensen <kmortensen@basistech.com>
Date: Fri, 5 Feb 2016 14:03:57 -0500
Subject: [PATCH 65/68] Brand Help, About right

---
 .../corecomponents/AboutWindowAction.java       |   2 +-
 .../corecomponents/AboutWindowPanel.java        |  11 ++++-------
 .../src/org/sleuthkit/autopsy/images/splash.png | Bin 0 -> 29939 bytes
 3 files changed, 5 insertions(+), 8 deletions(-)
 create mode 100755 Core/src/org/sleuthkit/autopsy/images/splash.png

diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/AboutWindowAction.java b/Core/src/org/sleuthkit/autopsy/corecomponents/AboutWindowAction.java
index 4a02720d5a..71b4c779e9 100644
--- a/Core/src/org/sleuthkit/autopsy/corecomponents/AboutWindowAction.java
+++ b/Core/src/org/sleuthkit/autopsy/corecomponents/AboutWindowAction.java
@@ -38,7 +38,7 @@ public class AboutWindowAction extends AboutAction {
 
     @Override
     public void performAction() {
-        AboutWindowPanel pip = new AboutWindowPanel();
+        AboutWindowPanel pip = new AboutWindowPanel("org/sleuthkit/autopsy/images/splash.png");
         DialogDescriptor descriptor = new DialogDescriptor(
                 pip,
                 NbBundle.getMessage(AboutWindowAction.class, "CTL_CustomAboutAction"),
diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/AboutWindowPanel.java b/Core/src/org/sleuthkit/autopsy/corecomponents/AboutWindowPanel.java
index 640cc45409..04501c4c5b 100644
--- a/Core/src/org/sleuthkit/autopsy/corecomponents/AboutWindowPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/corecomponents/AboutWindowPanel.java
@@ -19,13 +19,13 @@
 package org.sleuthkit.autopsy.corecomponents;
 
 import java.awt.Cursor;
+import java.awt.Image;
 import java.awt.Window;
 import java.io.File;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.text.MessageFormat;
 import java.util.Locale;
-import java.util.logging.Level;
 import org.sleuthkit.autopsy.coreutils.Logger;
 import javax.swing.Icon;
 import javax.swing.ImageIcon;
@@ -36,6 +36,7 @@ import javax.swing.event.HyperlinkListener;
 import org.netbeans.core.actions.HTMLViewAction;
 import org.openide.awt.HtmlBrowser;
 import org.openide.modules.Places;
+import org.openide.util.ImageUtilities;
 import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.coreutils.PlatformUtil;
 import org.sleuthkit.autopsy.coreutils.Version;
@@ -54,12 +55,8 @@ public final class AboutWindowPanel extends JPanel implements HyperlinkListener
 
     private boolean verboseLogging;
 
-    public AboutWindowPanel() {
-        try {
-            about = new ImageIcon(new URL("nbdocs:/org/netbeans/core/startup/splash.gif"));
-        } catch (MalformedURLException ex) {
-            Logger.log(Level.INFO, "failed to load about window image", ex); //NON-NLS
-        }
+    public AboutWindowPanel(String pathToBrandingImage) {
+        about = new ImageIcon(ImageUtilities.loadImage(pathToBrandingImage));
         initComponents();
         logoLabel.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
         description.setText(org.openide.util.NbBundle.getMessage(AboutWindowPanel.class,
diff --git a/Core/src/org/sleuthkit/autopsy/images/splash.png b/Core/src/org/sleuthkit/autopsy/images/splash.png
new file mode 100755
index 0000000000000000000000000000000000000000..e40eafcabdc90a7a5bcafea963021c775a2b9ff7
GIT binary patch
literal 29939
zcmdSA^+S{W_Xi9}NlC{DVRT9ikPwLt29jd~q!HACph%~5ON>;SF=_}1(jbVEqQFRL
zB&9nfpWXNU{rvDe|H1Rq>e_X^&v~EsIj?ih>%<u9Yf)1GC<q7$sI{SB7y$thfPjEd
zk(?C&jp5ZrJOP16vo=@_?lZOh`Nc<P&-bghx%!6!8*|<7yS-%O*6R4C*I}&HT1y?9
z3aS?;vM%2mR;7y@A9giwO-+Z!b-~M0BZamNsa=eR)qDy#?-l%Zp>lb~DqQa3IqKTn
zrtAF!tb0@vlkl!@vOVqZhpW|~n+b9Er#nA#2BQR}y?1`3ZKiJqjvuz|9&(-DTnF8_
z*s@02u|`T!a;)Y2_crFA&vvW=fdAL)JLJFD*`fdaG4g+}|G&8S|Fd@dnw{C&PL8W+
zcA7UC=2-p}w%cR@rS(SnY^>@{lX$~+2U)x1{hhNV3gyeajKEgvZ<4y8x4w%h-t$((
zzugB^{P!Z|uW<|47rWCY#IY_)jX^g1K7$YP_NC;hzDeRFS7ZEluPo`py>mZ)YCU}D
zc0Cd|kr6nZdlR~r#uuwqVt~I2e@BI|)Z1!4r@6CXpG$Vdcdt9#bNwe5$R3`}!9-=9
z?@V_eX3d{7-*x{cNyR{IKi9b85@bodc(n-*>oGP^aD3}3W}&zu-+tw(En(<%bh%M(
zv$*7f-zc=*4|WXWa7$1bhfZ0*(STCMGyk2-Gr?{rnObTCrPDH%x&NeYRr3QA{ymZz
z;Iee<AmN{kj{Q<IdS6w@Y(7O_;q^y*mo>Ain8XJBrpH89Gm&w?s>5ts<<3S-+n($V
zR=xRcIClT_8tbIl5wlU<r<yjwTtD;bofigvt^XPZ{y%B?Bj66!<o&$su7`Iylum{D
zCsjFzZi3Fe6UDc@S`Rs2%|mZ(E14-rA)|!?*IMRJ_T~Q5V7#fN|8_L=1NF<st;>#^
ztNlAPZC8Tw>0k{J!o*f@qXrF6wj?UL_<7$&Qrs^ZmzMt|8vb2Btpef$w4BgL1YI9e
zKyKB%UZNbhr)2abWCcj-%;upcqOas(q78!PW&3s)6p1>?{`<gsYS*7X=%~v8*bzet
zlCRasY1bakh77R%{NpIHk{!-ubfEufx+Ax_@Bi#UVQI%8NaPXdx<6-E6ebL0VKn>x
z${sgLC^niVr?AvYse^uf9b)xVkXoYPe+nlO0whuOcCWn(*d7{sF}NN9%a=%i7|SMb
zDk<t7eqf-Aj)V!)@_XXM{G`hNQ@c1%{|*PvXKOsGpF41M<Q@mJxx~AM$PJlNe!D9(
zgRvCD=fIlf-%kI@&m644y`kv)_feJbh=8)X;>*UpFNR(B1LhWnP;pwh>~Sfv`7VfK
zws#3Ro*gne=n%BgXyz86IKcXF%JkwLd!!xyxEvDS8U=%(GGKJalGe@dqNmNvd${L`
zV@_h~WU<aY2y#FSX+(ahv?<5jyZM7(_KD|>|NYTjX<@U&dvM7sbs%3DceYWNkufW1
z;M@Hv7C=7cqzbF|yD}06gAA>>0kkx9l#KBPtp|5Af?9r#Nm6|Se|yKkb-t+al>N_Z
z!7YgmHn3#)-S!h~NA-N5+rCQZeFt9il%PY4`I%vt{7NwR7Cj%j`o-GPBXof|!?4Pz
z+vSF7`_cY?C-7PP>5SiIB-=#g=d5T_S-?Zz5znx!gdF2>$0QY=q&TE=(ZdJ|HT$01
zUHKp8LsBMUC+hT^#z=mpU7Y<Vi%d6vhKjoe&P)(6-@2dn7`@-N=ImpXk7UGlC&Wu_
zSrpMq{;5E=KL~s^`I=}lm^Oy|^WHG;Qblv&dGg(>vnUm^|4#X1HQvSBy%D>ew_D;s
z8VN{cpPz@Z)te&q;4vYUhOUarGTzc?O<b&!dBeAoZ4nEvr*kCNd&fZwhhP5F3KM7v
z>{7rOW+Dt=45$C-y)$h?{5qNx8^RdB*1q6tQA5pQ8DR9d^!qs&ttJBT1eCJ1+F&D_
zVcZrfEdQ;6Z2|8bq>D)zBXXF)VWC4`4eW0oLueBr1^!xP<io6omO)eSB_SX3NW;vy
z_~JpVOU8D=7?Wq@#QbG3d!Pi~so?G6lL(qmbt%pW0wMq}RZrMF_%QOTu7P|JCi^Z`
z1YtkNyX<KEbL@F%sNws#uA{#8=JTeN`optBo68?-;s07QPH?CFrY-*bZ9Xyy7{kX)
zA8+va&#4Y1%$5fC>${05Q_aCuwTcEf3?9pv__cHsZ}eWX>N#vp5mV_i|7zn88>4zU
z@4_i3#~2dMKpiS`ql9;_{i>B{LpXJjkhSNxWB22mBp}0xfG}>T*(fgr+fmPmSwFM8
z5KXZO)c;SC2ce5UOG%MaWzmttg4LRZk~@lC9v=^9;$l??W*Eu<#QtRfn~QT(r3y+0
zgrh8f&bPw+c3<7;=QaUjX<5!a<<XjA<nfpox`W)HC;xfeQWg8R$hS};LNnn=4xBAu
z<8{<MkxdXcTM~6>i<7Lxo9>7eZ=)MkoWQ(xGijJ4BXQ`(BO5Qhf}}t0o<37e2I4UO
z0DV4<yfD6MY9K43EQPG{a}AWx(E@a{d|c(9Gf4Sw94NdO;F#)_-(~DlAVd!Y(8k^W
zj0kBeb!l`CL(&dGKt9Wdf;nza_I<jTGBT{hU4q5$Z^9yuu7G#wS`$GD&b`Lyj`}Va
zR7LX@=>Lp^F;o*>U~4S|*z~@leanI4zAx&TOdk)kV=dzirO@Z)W**fCOB-QqklLKW
zj6|D)Y3jj-d)FMde|xGJdvv~S);HU2<YY}^dRfX<^Xy-B98s<YL=!|KqdA7owYdcX
ziEs;2B7_+BT-R}9QKo;q_ELWnFG?tyyEHv?LP#|&nSSJcD_Q3t`MF9+`(x&LmUf$E
z$T3^(s)!4$e#6hX^*{T0h{hk5$ekUgq%@U|Ke05_B<sLgT60VLcuhX44QSa{-}Z)m
z%MlX@vmt0$BH7YZn~zgjtAmx7omX~AxJ0E|+C}=+?j5`)zk%(imqN%?Y>M?=d&7~v
z$?QQfAa0o^&$q~}DGLz>iWA^%RW5cEF-8Oe7Xe}Pc2nr-1EsLE2pX=j2e&2-T}Ws7
zr*dIG@7qaf&iv;yrfG;L%pMhdkwB}ShX;T7D^P8J3r(mHQ)~s3F_eZSqv~_&d1$O2
z@@BwL)F`g#$lmUM{A<@aOJzQ9p~Q6J|G6HbH>?!h7>-!QcvLkLHWD8cs9NjyPtEtQ
z-C{ROePk-~{^+n4tLcvI1*~bebSvu9WVf0mQM=sv(*A8N^j}R$-Re}}A$}Svs}sBd
zfR`JYdERZuHK~0L8x}{Ib!Jjpze+jz!yw%E`$G1<c>P!DKrhjrDg5K{$WN3oTdq(r
zqFLh!9X~}dX;M7NCWBnG=7;v7Ltpy0*=Qc5|92M-rq;#X-|qkCqTEk!6Do~65m2b5
zy)-OGzO3&x;T?Be?v1>Z6QcK2`Y)78k=fqiLQud2iCx&Nv?p0*<^XI?V?~-zqO@7i
z+_ix==X0PyAUMwRj-kxIF?lum^m;O?$J`16Bp--aM{u*#(vkQydCJx0bRX$(`U)wU
z(%67byk{@I?0nPep0ik)?bu8zakFe?!b7%yFw+Y-HHAi@9rIwCm!TizWX?*j4qc+D
z`1CmY)1bs^sio^a#GZL=KQQU8veeuK`a#&Km1iUC9P@1`Cr-%8P}7>{j>;LyUH|{?
zX5F}!JLvpF<*^`O)Hd5=YTds0F@XObnZac2M3F3zuoTE4Ms~0_xp{J@?KDy&tg7{V
zsJO$$Tu#8E!OC-L0hKktdikeYBaF-@@FO2Pf{!;dSU510q$RQCzdh4J9w~OPqK&A;
zECe}$Oc8^m8{OwG%3hS@vY4!H-q=TKD^iJT-ABem7+MAn^pW%t&_*X(U8E}Ge${#J
z%{|{0pW}sn-Hb}GY>lxbpyNaFkv28y|7+~ueh~%W@zop{1eRMooZ+C?gXvjl*NLex
zyii1+8z#kj676T0?uw>TsG9R>fy_uf`A)68^SJ>YoqH<7;?+M*h&9USivlso*44VI
zlm7wTcsxQ)7n`JomUL==kp3H+BivNIz2bAG3WK*3;#5)hYu2<$LbxN`wq{DGyz>0*
z%1k;3Rh^)9`Js{!xoaD2>}pQ%BZ<J(Uw(VNUgtjl9RT-k-o(qsbR;y#&>SohsaYeM
zWFH-I_(%NJ#gZN-Y_KymwwIKX&!dqsoX;Z#<5IK19mC)N33$RuiX{=I-!S+Hm{4ri
z{6E3fY4c^VpJSbc;?)-ts)P|Cbgcd7Qxolqjn`=tOd2!f=Q`!8q-be$CI#I)sMxRs
zQ<2u0#7|_5NTj*h-+?^k^WKG(d!LKVSb8IRX_mkBO#K^)eto4$RYVk02;+PPD;k);
zP5WFI-o0@(j^#(l4e#%X9O%Z7?uz#g^g2)thb;-ZTjU<j^vAB;wYr%TrP&pYA;oCT
zUxnQb82sP;D3YF)0s$hVX|ee)6GYJa9d}yWIlAjlkA7#<MXP=w!5wh3oLgWaFDX8Z
zCYqH3Hr2W1K9G5G_;WQBa*zbwT%D%v@<5jD|4RX!3Evz}+hoLQ=ztuIxHbjh<pt;Q
zzf^S2L)-5?*wzla5`0+Tqd(ExGJiaPUXbAjVSh)9e?0gCjUnwP#7B_DkADtBDM_mu
zPo|P}Ri&+c)=_RP7>{3UqyI^-j>MK*s`tQnwXeb{BzxeAsOG)BZ#EL?-XrnyX%4rZ
zhG|{5UH%<pZ{3L8d{k3_+QHsIT_DYsMGjui?7y(j;k$bgrxdr#EADn$a*Z{VbbSy3
z2a|NE{F8YK0J@3jsms{Ps=A6RQ;j4`Dvp%quTK_OZhn`9-D$lEj93i*PB7^+J^f0!
zeK%HA;w~@Ys5yMH;L*C!Y7X%r4Hu7i5@j^WF{}6NaZJreSrO1VSM!sA|4Zda`0+5@
zy1)KQLg?T3&pAYh6h&@P^xV1=&<0l|kkJBzQi*Wh8utwqFvwE!R4rk_eWejO^AJC3
zD9TACmL?5%-sLIvU+`35h_6-Q9gsvlhdjmo5qd{SOJT07Z4YLsNOcf$LDQtpr2aDd
zM90L;go;gF7^LHbl8`60B_758@5~D#GhaB~RRJ=5%Z#4Yz=s~zXSb7R=XgnoYq*h@
z0clhDPYZ27a?~{xhfQLkkXht8RN5zCQRbd#uuGGo!@o#ziAym-XaN%PHCcshD%CXb
zVRa(*Byo_}9#^$%#%hc8S-vb`$+u1bH28Wiy+?kK93?gXA)@d)jN7pDZ};<Uu9?g1
z*{*k9&r%5V%t<0bn3wIAxiaa)f6<HHP!_2z$8<=$Eu)=?1IPReYdV_uFS}W?ZGIRD
zPxww)v-^;6_-^>7371AAcBYI35ljJGY;mzlJB^=}4UE#Oc?diRH_QzRl(F?Oky6Il
z?kAH^*`4eJ-wgDHC4OG)3wt%==DPRGC8~RGcitbl_syF_<XI|h>w5!rf*y5_uiR?`
z9^tJ}EsvwO;x#VOn$Dg-6=JbwX`Ugrmp`-aFmCqyJv=A~>zZdQ-iYd%y%f3Y&6fE(
z>YGB+t(!Pbm2z^5>`AhJlHRP7JIgZ@wDxo%ukA+km}Fn*hz@GZO5)6nX0B0pUim!E
zKJV<vy9pa1n{W4J&AvGq2n*AC=x58|!x`;LJ9-Zf;Os>-nT(R|Xni2FbG2YkrYre!
zQ2P1=^@EnxNRlhyxFggO$zD5<B#4Sf<OKoayody7$`u%$#?Eu@$jX&hB3;#<1tHs2
zr9U89<H#q;YxVrUCnCp>UkCsmQBgHCvVPTf-0vjih|=fMj@$Da2(_qVBS<E63|3z5
zg@nVY$!`}<cl1;S>e!_t5ca5IRYR#KQIBeQUTJ^`@=z5`D*cKC<APeLKHK%>`l1gM
zOl0|k;eH$ED%@rw$YR>bq{TWcrxFVJ@!_J13{H}n8X#P7&QoLnFBD)hemU^fH)>Fr
zJQlx8q~;J|XE-;KNdNszSF8v0=lz}V*|1X;|5w`5hD6*9Fk;nAl@QB-%{-dhns87o
z=zG)8h@6tV*C)j$leI#%F-U?j|J3x=s6@uW_Jcv1RB+g~?KDAE;LUj0O6f(*!>h8i
zHdgIxQ-XN!O+URg76oetYJ9k^4k7B(E5432EM*R3H`*ez{s(Qtt#Z~riMh(*%z&;n
zm}PY1Ui_3s+<C<Et1$@qy}(IX{%?T;9So#*+JD=!B^iluGY~(uUJAkhiOC~Vspx2|
zS=PUlKI%eOoAB~eH#t^ssK>0ccxHE2(yM7&CsEHe`~&-^=umuIg$G~flM-JHJ}BaN
z)gHT+gn@-VhfBhe3-Yn<Ppu*L_@bE9-zI>u0Bsx`wd`%lc(XhCS$izsa1?Cc6?Y2H
zHm#3M4!v*pToj^FQ9=P|@uK0Bn}5CTm=#*R!S+W{!87$40hzwFXtQD4!N%*F{X+IA
zViNS%HEvGg0P<VmyjpTFNSHabXBBt_=x2{v2*lXxl;Dnc(V7}gq?-&A#@OyW<yV7A
z`CDe6RYTBS^?9DFZ1#=}p+Xmuq@(b$FB`L9d>(D4n{Q3ayZ8bK=uCwFg~q-At1KUj
z$8`ZjMZ~<x(N`JD{(DE|H+>6TLFc%Ry1YwM{<Ex!xZsC=RmGLx<uxGr#7~6TFf5h#
z55tFnmTFN`q~=!kd-`-^w2BW56`+ooa1HRSP_+h%b;dF_bwo&6DxgT!;gSA@$b8w8
zF^^d==nvK?ryJ|b!(FZ^tDzIQjM!R&fWhkU_ieEhNzw0P)$~AbArgD~L4{b{LeS_I
zVZ75q(EjK93WEpP_?@;zs=n(DnKJZ!(<QzOXkB%`Lo;{STSa<$_3FlV@AJ)p4cX0p
z`}ITqvx|=T>oxqb-3}6&JDmw~yNdiuXQ=|=hNpBKhJMMu4DTo_$p&dU`8*^^^K`i7
zsnL}I<T$7?RKyn$AVi2_K1zn*!G4$2b1Elo?0B5#lfY8F-&dz|7for3d4IU=Y_w!G
zVoB6wOME)fLzZ^?UR4ppyY~<v!_L)7f%xU0*IG}t3GH$l2#uM{5@!?#4rdC6vI1ds
zRrQ5*oO%SKiz_c-3Z_f4GUKnwh0^hx5G~)n-hBXMS@TzwoI6|DrMf-}x|*j{<=Z)*
zoM*u-23=m<l=E@Ceth}!X6`g1$h4HBhA7IJYIk5<=Y|T#N5aPTzWGZee?Rqvowu4C
zSJV1i^O}N8aylBA2#FmUDFavQ@8QkivY<zKB6VAz)sR1(f*4y(G!!^}h6jC>(_uod
zJ{=1!HaBMiDGV$>KW^(!u&y_{kOA`2CSoZ^F?E_Vfdy#SC=#KU#W(GV_FvtsZ<;64
z`k6}&`cSu;KT1k2sZ;+VQwH+)NMzSWk}MXVt{IBiUp+88FsR}DAW9hQd2b^R0F|Hr
z=4qcPQQ+Nn@t{lLYfUYuvS7Tqr}G~BZ^eSgnh0AP*B?#(xe@2#z#d<wpJbaSOq*Y=
z-b|nKw(&lAwe+|D<{T)M#6K``q`d0y^S}i+v76PA?zj=|^0w^D{Xf#z&&=9lx+!#K
zP!35F-24ZEH-}Y}p&`kHM;u@2c+z;S<f_^?+Wl|dH5<KqUU75Z#{F8@egyINclX`*
zy?0{2Jg=Iz8GYVqtAEukZ!KTx+<5|1xm6|%?MzszaW?^TO#x}V3d01nq~V?46;S|s
zT+`uFxdw>ueK*ihn5mjv*IR8vCnlVD39AyQ?DlSa34G{}O=|fhkRNB+)AI0oppGEU
z2jd+pj2W%YmguT2C4$Kmx{>`Zmo|IUr_|{{Kdea`KM|}xs~q^si$Z#{Y;p13+|P=;
zn_Q<Xn-fuw?scRPJWSW;Dsy!?W!gMGv3Tj2rsLu^x}EZNBGAB3%wtZAK0}mrZ2xI{
zkr&w~xQ`x)nd*BQBw6h{A=9m7LSSDKnkV2S<3>wO0C=5o<DTuRsycW4@G`50#@@cW
zubYH4l2U1vkMYqeDj!aazVeSvNJ&LrPG^uY{T>gq&t+z}W@aZTYYH_P*EU%(>M+DY
zlD-!xu}15{LENlnCFQ|PXf;0wOD2Ntu7T>1LJ^1{2}T$8s#1a{nSPe@SPf&;cg7Wr
z9qx%RXR#!aPp=@bS_u_Gclg)Ns$-ulH@jiEVLfis^zpR<qE;n}VX}dOdAQx!FYlOd
zjsGrYe<gAnk$$^FH|U-eZT;gOy-j%_XHvMfu_5YX_Y!BKRRUk}CJ<O;veSHQ<bVGH
zyjGcR?0k_s;=exhMBw&>?Dq7L@<2sl<<Iq9syg1Qz`H6g6RdyVdA@Fq=?-Ocg%lMu
z{^C%n;$v&L{PQrKk5>x>?Bh;Dd&I&-92FrB8dz17KbKX0+fi4PjvL*>p81-_&%eLk
z%8Ks3YJWIKTF$8Bv5xWQPmXuYe`=eja`JgIJj{;@o_WuzK@EhQWWt%HjmGRa!_q=0
z@bz7DN4soMzzR+MJv7~f7Ryjuv?i5Y^%6D)DP#sgBhnOOLIlW2?n2>N3k(*C$CJ&f
zY`6T+RZxs1NA*@3C?uvwvz?_(+<Xwe9@9&5(f9_&2yNFzw+hjgIDFK3+=og!vrgB}
zER8knIT`X$2t@7s*wZ#Vk|#xc<MG@PCBcWbw?{L^pLO`&ev(^}!I^yw<;t-Yxx^$H
z^A+m<r0s*=)&ygnRpnAOjVQ$i`zST}c{9pKNvOJ1g&9ZRrXow_fXURoWSzFKnvg}Q
z@z*spGkW$SQ4$PJa%WuQF{w1mx0p0<jh{Cv*`x!9zRrjh8e$|u6rRwBS+MvoJ>>-;
zjHAk7f>r~Q0%)}dWV>Oh%j7gwbVzt<Ir}Y=3y~+7n+C+*Ml|VK>_B{DE{v@9jg%EV
zBGO~F)_HcORvd}&W{fq%f*k!fH$bo=A%03lQ@8f`QcPzcqf%`#|B~amw2N#a1qAWv
zWVij#cTJ1eE<MVmdYMSEBw3H6&xXHCpqg+QIJtR|1K17kCpu_{)p1pq2fLK*u}DN5
z=e7Y?Am#)-wrsi@B_yk+dXp98flR43m5BKIf;Cc4M~<8AoMZi6tu?V**mKR--ZgF3
z1W%VL`%g2rE6OD;sh^5`MiN>vy30~F7h-kt;8wvIX~;b`i62$1I|xV;fpUqhp?9SM
zWGOSF{mGV$@X<rAX(6_CsqZBAA@-lvUMtCw43(-wlF?VwjBq!wMt=yX^d)~=vDduf
za<3*p)%b37bIX-90+l2Zco$5*5^)%FnAT(2fgLSr%n>u~+HG=w;Pt#{dZZ^`dRRcX
zkEv<7T8~Fqr)cy}g2IGi<(lQ4QZ3xc1d5p<-eu#QE$qR|cT!J>O@5a0vZ<fX>J)UE
zQ%4g&9B6JaWs0I7GNK}1JXnD~5Oe#aRhsdozfg2CnlEg3fGK!*6>Bo<Z|#=Pt-2sS
zIAdjPJKUlh+redi!}I1~rzK8FUP3yPQ)aV3<I|4y_aZ&=N<`j>YcVMB>tDJSc>OJ0
zDUq8S!vBTM%d)1H2@bWPw-liqYruJGAN`MpA_XrWC(muha=C+fsXe4*3!a#^<pp<N
z^Oq8ir_G}%Q0|-Q$??Tc7T|hNZBp60)k9Kb+n;9qx;)jMVw>6e6t=ntyVcLN^^V;x
zO8VUtxN0~IlwPh{<vl}JbJLEbXNLSXfy=<qxCjSu5H-&m`Q3~`%~Wc{S!W^(Fm-jG
zPa$PB#MX9KZ^2+JqV^VlGWCW~!j>;gTP{;scF`XTB^7!gGd|zrrzSb)+OgBYe=+`j
zdwFqo-0Jx6J)gPZ9AiZlM?3qh77Mz0kYp|DRRbmNU7cM<dY(Qmemz>^B78-StGqWd
zTGOh<B?pZfkK9w)NthN2OUlA}J{qi0L?^vyAAghSAaG~1s4~s0L@ft4yN3Bw93FMN
zn5j<p@@_jdO3}rhAqIP{=lYGjUZ+bIXO>?{;A!l-MmzQv3YscqQ%FXQKZBP6nuB{2
zOcdJhU)`%$TTj@!ywxH%<_yLo8S+sYC#7Xg5$OWOx7o2qwKe07so%5Xj(!+gTTg$f
zwByOpZCe&Zx5&C`4r>arc_!ce3oLag%k1ciONGrsqRz8xjrr+`c5EAz@Y0bq?UcHQ
zn1(z}zVx*cDK4|E*1<vhx-qi)>j&;-iCDPt)B~nOvRN*K>{Ba>;uc!w)X${{9%V&H
z>{yIE>C}A6d9@gkE{K`nNsnTI<QRQN@7VKbq^dL+G>je;Nj8GW?Oa{+K2@D?fD<vX
zD7r;9hId~d3cbe4qSDKL&1HTf7^I{2{E&Yi#1sgdP!qun<iO`in%MlpJ}_-JVwqXa
z=yo3jUe<Bc&SK!{>#f5%=9T`Kcm;z2e_ql|?cD@jQ1{qd5oyWz)(WK?_|&VK)GA(p
zk>|VOB*h0+Pbi(OwrRbW%iLYEK(-bETlaRhFtN+cO^YhUrEiia6^(w!u6<LEmD2;&
z3wPw3MO6k%IHo{BnWJy(H@~i>s@Oe1+Zj-u3lW^Z-qb2%d?ZFykr|QfmDhP={6U*S
zlT#Swpeo5qM26}U7Em~Lu&?iXO=1+w#i6j5tB96zp<7l)S=SB+&#k@`O-LOSw;xtT
zqH!}#lH0SQ!XcoEyyOT=$*M;=wH1X(_qV?WnwfDkuPS1ZAKwUN9O_eI%KEZ5Mpgp8
zRm*5?9S6LRo4~J=Rz%Kt3Jlhu$=5q(<92am!j&4!U>RweEzjQU9N6pdWOUQgg*Xdw
z8&Mi*fu6L8I>sLbF{WaX46uUTr6xu5jr1JmT<ijT?601FLX({NNAJ<^jk>X#M~YBR
zmA<<T!Vb$1pu_v2T)V)LNeThLHj1(qMSS%8MUoO3@O|I*rd(HkAY;esupdmek$Lsf
z$_>o>^3G=4So<eOxbX1Ux){)98dRo(PYZt>n06@nJ^zt{Ow9$@S-B-e1v|+ue;P#o
z#g1xQlrk|r#ivKJVo7i1`t@T-!&iq#azUC&!|3|Yg^W62I0z1I5R(P0bJ}O#+6CU(
zywrWVBNyS1Us9ZEzxr2BUxqrzmkuxpc3`(47J1|uu#sTAF_ApiF(RH!UwbqYdFl1u
zW;ny`9SxANOsgW-f!XL>DXXp^9gjYlLhJbfpP)Ix@^eS4$;f;pGAGrX+fYk3tcCu~
zC044STm21FN)pwjJjOEMPg6-oC+RRQ9f?_I^UTfH#f%_ZY~OcdN`w=SB+C0CqVjKD
zrgUx)f`H7_vRX|W;WC|1^_;#2q;2<HrYm)FM#uDZ%Skcw2vaf`Bw!4|JC@um70oEj
zI^aE;^cZ!=a|FCnDykj*9g5|s=NA<KXo`<+ei+r(0byg+cqe=7>gAZix^MQC>8U;6
zC5g73v9T}@7TTB1$Sx6^YzSeXpdv#zjlpHH%wl~oC=;s7#|8w{e!*%M8d{Av7;&+=
zDe_5b&0MV;Fm=n-Y-~%5K0(E*jw}#q!{v=wT(?FD?MI;N<@z9pcYNPUK$3meK_=gh
z&}5n$Whh<%F2-Yg{7j+$P$W%293DTN-cq(O^E}AVo+xI$e3gg(BK!Mr>Pb?CZzei>
zJO!V}_F7ZD8_F!l{VDv6z@Wbygst7@j77p{uk1fUL`6ule2iy2wz4~zqU7-qKVJkk
z1eW7wr6nWR<YQCr_A(u%9((!c!Ki!b94~VaMQh}2BUJ}Dw^-c4!lRVjutVxIQjfm(
z={X`TYR8<qeFMz<Su}C8m($m#u-pE^cP6rV)HDGpWGm<U$RlF3M&#*Qg3`;X&lgoS
zF9xagm!#I-YhWW@e65vd0Lr_JsM>P|oxYLCl6xN!>wvEQO8bcg2W`=BE;hh^=;3u^
zu<EZ&F={4$MfKi_Zj11kp5jF6?66IpWbzQx@!ZBEKY){{0JmTLhar^bSYtsZz{E-r
zi~ALHzz{2kNR5YTn#pMlx4rJ~K+9<?yh^XCK3&KBa@-1G;cVhoam@cY#(0FA$IB3=
z|H-*v2g<YYsfC-_YBgFDV7vJ&=g7+W{d7CNcy>gAb53h^tPtLhmNA13OF2$gu2#Xz
zWIWd;r))<K3(BY`@ojh?u83&O0j)y4b4&$^??5caUF!Ivj6}^3F@}%I6g6PU1Zqis
z`D)J;fT)WP)>_osR_ewjhUq^q_J)U^-<*FBBdJx+?RT<tWO%bDy*@Pn=AHPN&)t2~
zm;`)iUw2(Z>e|!iug#BA#E~einf-ctUL2#Di_Cv^l#@8f6z+upJu^~*tyoT{Bf)i=
zBpd7D<IT5gP{Cj=Lt%NVk&xFahMC{XGLtPQfaS-(8=j->j)-QZn5}3wS&l|%a_ain
zY8^|>IVWksl1JXUS)IOuqZYPfdbC<>1Q<1LHlz6bGnsJ%Re~e?l^_KeikG#N4+fqJ
zJud9$$8wmP9Q|JC@%OmW8nE)t3HstC{pOK-*ZyBj*GGi++Z0-2hInP%yV}U&7gD<z
zaA8$Kieky21Rkt$AEW9kds1VDz^YHSDRy_UV%qPaQ59pJ$TG=BC)h#FfSEMTZ11sP
z3dUe6AtuUlS+o1_lz-y$v$x26G1^NWD#mB@LnK9-J_)e}CnN9FV~zpBzoRk1D<vwN
zVks+ozHMQrs$3W^j5P~m!ND6CzfOuPZnY<l<9jweAM|m|D^oPe`VTCbZuh(yD31V<
zT9Y3DY2z2s^%$^*$y6Y|&)JeK=LsCc#%FEuIra0ErHH^t)|2ABDLkjZV}(xUJAAWT
zWqzqxh9;Vd8CSWw5rbjeQ?%Xa;y~gn-B;pMIGQ}ua;H&LyuepNbmo5By~~#B$D*EL
z-Q>#@TeJjFLRm&2dlD_RL`qCXZwyQfcqc%DpB1BQ#_Y%rXQa?9Ya+n+lx+WLkg??O
zF~;TkU7CB<lu!L_T;P8Eq+kGY;JBvZSy_l`K<g=TZd>!Sc|*o(rhW{*6U0IJw;+4~
zk;?dR*I^Lcf^66^RxNA!rfuruh3=T@IQgZnjesq~&`2g#n~eNMPP?oL&%|FC*$GOw
z!EMck5B1i)N=dGNC&vz59jpp8&KHZ@dg(hMfHuld*Y4Bg;{b9hch}zDEfC-ve-_+(
zM)_ig!TXtDxsF;iB%d|{9vB>uuLGv1?;~^~&Wo~Dl@Qv%6oPHH{I`UD%PLEMWEG6~
z>c*d!UcZ88XN}v9Qi)t`?ueyxdM<Srawv%}N>8(@{>(xyE3z@iBU>-5c0ahh3S0;o
z9BdtXe8G!2#YRWY&6lu1{06+<ODGHfwe{!eobmai$$#7)z2-5&CNc^iEdyY5uv7kp
zG8<ld1Ngf2UIHQ0F2dIdBb>@H*-J<B*QHZG<qxTODIssNS|*QRf#@%e`@R)?Y<}Tl
zLb61Ys(+E7ujYbxv4@6ATfFi)M#^Yg!z1Cnpt{;_FO%FQg4o&n7>$0-j(_`Nb8IsZ
z5l`td&l4bT&iT8nMg{8M(Rn||g8qD+5lC8#*0ebYknj-);0(p}rpAT)IP&7#h+fnt
z8BiLyQ$W(}Oz(ah#X=3ohT2A#?3q95V4bG~Il12XJ;7iNw}!s61&;mnlfp^*)vd$}
zr)p?PRC2K8CC9(hj0xwZPlQUt2>@wSbkzDjM4m65{dAOLy?$}}4pMH2adX!YvPkh1
zef1x^j*TVk2-X#nO)fU^(UV)FO(1IE;yA>yDuz_1T_n}sb|SqM=V6!C19298wu<pR
zV}%Qd6IF;({p_1{kw`*_HwIEMyr8g-Qw5DW(kd~6mwlFfjte;8MFJbeaVC$Gyb%@6
zQy+Vj{K`r#aP+y4>^v&o$E;(0XkwvmG#ebz6-^`c1zAYeoL#S20u?uk*`U5ppN;_v
zPjA(r=xMGK_--LI_;|;kVan*}Xs)9Gt{q)0Oo^er<ca5E4ys%%(#z_z`6opA*3g_J
z-qJmM|FysPc`D6s_jj&Enzpnwy^+td7H$eS#5e_s^DO30dhD^96EmCAKl;l6xm{M%
zuijj25)psY&L13~C9D_EH{Qs9b=rrW<O*b<{(1gBl4_aUXubkdYKeQ(8jmxdedj~+
zUB!tkbKvotay{^hV4})!R!#LqxUqcQD+3)67(MJK?7|M_1C$lr1dUNoylQF0XH9>E
zQ|Tt};|XowK{^(m8i`U?MEm)L{K-^Bx^QAZiz?_8+?7U0dq<eP`Aid`p=kvZ+ptvU
zVJqeGXv{aycM^K~^#)qFu!3TzyK5}`+FW$A(i4)bHD(z58#x%^VnM=`y5b~+buPYu
z84P2u>Y1k)|NK<XZQuIybkbx-B}P-1K~KivUXFF9v2O9YN}u>cmz*DTMIvZi$%NLH
zT$y6j21R|*=$^$+`Lpo)MdYWu6A|;jYR7lWsx<Z4vLSxo!QV<FRuiI~q1VN#@Qp}v
zEgd=VeP~866C)&Suq<8{A+<;%lmJak$aG?fx23^1mmiLrmE*h`0Ths<Z?tMWX+Tv;
zSd`J&3sp%W<{}x$%X|_Ai}qWEbxg33<^G)Tspy7BSubABoPfHVD<r;CZ2*dXP3asU
z<_MbxQ+6^>XqxUo!gdm8avW#H611;Wp8Q^@?a>cWHZ>lB(^{1vI|mIE>$B%AaWpx)
zw&H@hmF)=|W_5#%U+TC5lj5_9=vsmWcmi<keDaC>4<w9mSrf~T@xXX%vF!DVzZRA-
z(z=vhhyw@+WuzW+$Vcv}(7iQFDQHK5(}+<1&-eh<DPeJ{I{4BKuFH~Bh&C#f1M^8A
zw8VEj87*VDJWm(%XiF!=H9w$Jk@ke8>!rC?G&_swIKthsUgJDGKf5I^@2Sz_F-b8J
zUF_dYi2((cE>KdPc=WRWG9*bxBunlz$2g8LxVS=4`vt=7BE)5r-Ulq*-Ky|a#pJv&
z)?q>zu-^PTe{$tzo~Q8x)0gK?oFTlfFWTesH?C^Y`Y8jrq!v(GN$NgGL|ei$%`05b
zZ4Q5|WO&)TetC_?(`hg870WWEX>{Hi3oUSN?Y_x9`_bP$%vZz40_FgNJk*%`RGFa0
zA_1gD+{x5|)>u5N>vdzMCFHLXKdT6L+90Vgqauv^PHp8uX14ZUW!uM@M<QK<en^aC
z%CC(E&ge)?py$11QfWQlh5phc?&Re|`8MT*3lr}0gH&5iZX*vwCpYRvM@}Tt)w(3v
z&r*xXJ%N0vG9h$)wDM7sZblyI-RlXy68CI~r5j(N3*~FXgtng`mw3xVp9?KOOi^gl
zhdp=izguJ{S})lY2QDAFXpG5{@mIW16xBL8cWS5vE_*J!ObS4<kj@MN_!>%2abm2b
z>ixwRp23y`@jfhe`Q7T_JoTS6>%!U*s%#z4?Ii_W!Du3dq^ii(BzPH%^7l?rmzb{3
zN844xu$I?EEQG3?o%O%JlJ_kbZ5ChEZ*^NWDOIx)UwFAWyMZ_k36UR%6B5!Cyt|Q=
zohN&N|J0~R46$gpBF~}yZBb9y7*C1_yU5<RKKcXRD3gL6rA;U6BTm?Y&w!L*@b3wN
z_e)A?`lVR^=#US>;%WFAZasIga_xM7<wsG8dnYWi_qWIx!2@AtDTcBxb$u9}^>}Qp
zhBEU9viUrAk~_l7N@wlk;`}PF1B=(MOEc}0%L9K0j<UK;+{b&I1;g^xXw|Ln!IIHn
zjA1j08_GOj^Hr~!4&&%B;2zE8Lw@ci5Jga7aBAe^O$^Ue%GxO9XmqNjDl5p4x}63l
z<?%@s{KvB3X?l;F$Yui1;<;<J8Z~-4oH94mSj^9Am04QiowNIg)V!iKHLFdBF-Wua
zKmu_=tTUs?WA#%0&pitqE0>nsnW;#q?01)vaVci?p85D0{w#8vnT)2uf}N^nc1k_|
z3Lx8-jG}1f2K7d^nh|l6e&@o6`k$koGINYwk9nJxK3t7rxR7U<6RiYia1lRHeof1s
zV))BFvfnDh2?+UHpEf|!I7xxf9h0*V_o#tFC|HMk(aQR=Aj4Sqbcdan%klMdxGbK%
zMdfFHqaUkc58xN!g53d|psPq@i91zg*;Qrqx#`OKkyC^t;fqAg*MTrIZq_ZC-iZ9v
z+tZvGEkD*Ei2S^?ID00XHrbOp;rqH4P40wp$0ohhJ+NS-{Ls`*32FLwj#szcy#Fcy
zxrG+wsYkyHE1R3l4plKC>JMMfC;1^iZF_2r8JaE;^rpTQ8d{^ehEZO6L_fA@utrfA
z84YinOiAWAqSgBwa~0I5(mCo$%965;kuQU%ymCcc(AC8C%f!8<Djb|l3J2z5oqW*E
z9SW05g8t2jW#6+_DKzTE<FSJQ*1lboE~YH)S2Ykw%!3Nxibosr8%n71v62|wfBjsz
zZ}rC)hamlF>?mda{_gq9Wlsq+n3T_QXu;hY=-bhEPgUffY@oLZO4<tEbB-i&Vs7rc
z$UG-C;g|1$TOC<N3x~H!tWv1DOh_RZ49%zf{`~P@l*7!YT_|w|R=yxyZV_L1mJzUC
z&-Hk)nPB?z3T_cnr85EGX>zK0>tVA(<U64GFxk*$7sM%x7-}{_b*RJ-;Ys`hXSl>5
zGi`EWw@T$)sph!h#Jj6iCIe`u*EtRgU39yDZZB$SJlE7Mz(f?Za@}Nj74AXzp7|b3
z*#1ol$-bQtt?t3Ia(K>_e(T8FiMjZ+X5gQmHYA^?5f;b8AEwWs{dsC<cq%aRnDS8Z
zo}1i0w&Z<}s=%z(c!gG$FOw4v@j$bcL61kBeuQaXX;coo=%5D4NTH`rrO$Z;6WI`(
z9;qEfmE=x1Ez8dr677|8fcZ-()?YD1d@Sdfk3=FLlx4((7dqyp%8Mw;4L=we)yCmb
z66;vL+=U31t7y^x(tP(20b7yaSD&6#!qX;ilRaI5l6sO^4%zFGc%SSqOH5IpR^EKf
zePgEv^7w7MrxgOtV80z<?ga62i`C+z-w0#T9`bj8_=W^iI*x2fC8Yy#P=C25bO?!)
z#)Pi5-lM0ctN4X2C#d`JiTDXO_Pf^LHqmg>)M8`9v2-*fUeA`jFK8|HYC}c7!kc1^
zx{k(WB1IKysyVUS;Xr+0iMTK%d!v*TsttSY5~Jy?6hD6L@?|#%jwk<GQq1$&234zk
z(v^k%dGGajKRZht`o}BrsQ`eIYF15HmNrIJM{<}lBsv%-fT!k1W@|!du=v6U`-;_M
z=`UE7R*jL@x3_bT;<eyH7<JbYwz0Ug9A{n@anb@h-IYK!3gV#$=rx!aSkjDn@Hogh
zpiV-kAN<t*y|Li(Mc>tGa5BDGV&ECE`=f%P$`fH?#^sIWXoo67lofV#<tvQI&IYi7
zBc_2A9r5lUt!vcxGM4qia$zs+q&M29w+9g!;nJXZi*-IQFFj<GU|d6_d_1xJvA4>@
z?Q_{8_%GADJ~tN>iyfz2j~FfVJR&=*+YY6-MU`dsf4#5c+s#zO`xn1kEF-_HbzB8L
z?*4=~8dq@MYZYN!-r;=0BOBHe_?(k#Q#phdUi8$>k+DeDjZ*}sg7Mq?7VF9Qx=Bof
zg|L@|Md-~X%8(Y`_^uGP7o<wC2>jZm-v2}a<*@huS919=&g(^vBi&KcGu9CX>cTAl
zR~hPdcy#it*VnZ3OCP5(!rDLw3YP)ue5=Co9^WCp;J7g8BkfeP5<)m=tf$x)DpJz%
zkA*>-f;sYaqPbN;+_!}Qmk+nYW9rynbMgRz0#Z-u*K&F-h|mQIfb@0upZMvSXEA6M
zBnDgD#y8U3pNV8OepCz%>8&bdS58iRDI%0Y5A%3IEQ>Fei2blXC;nQ{9978VpwZ<C
zV5>S$5~<;VKwL_6uDG9L2h{NdUm>4|{h?H)v=VyNo$9~-q!pN$(8avl(dIO0h*K)X
zli$U(a;&CrH{*$EUo}Rw%SYdeAi{!mhbn>WC|80Nn<BYr=VgH}^k->A>bH#wkj_8j
z=kDsXgF};7JB&3XxE`N+D4f5wHX!R#s}GpN&(mnmM;kkhq?-$Kl-JzT1=Z7yI>L&c
zfe}miX`H!HR0vjeNWk`PIX63u6C>R@s*{}odn#Z;f}#_b*OFZ333b9PXVB#s{MCgk
z{E|P5DZSOjVu&9-`a^M|h3L4)r|~Ql!Qhe6bodke%}KND8Jvz<?bf)5_uw7%Pimzp
z_~LxEZXno+BVA_Z$zPODsnXNkUPH1_SQ?kMniSIGD%|1Y!1=zD1*SQgwQE;mDu7MD
z!G7t=MVSUqoc?wJ<&<bHc3ryVc$RT`wFzV@e=M(%T+se}d*%gx_y}Gss#_EKN|WjA
zp#xu?NE8&D#;qj+4GM+_;?vZ+npN5iqo~67@R)HauXjjxZpr;aTx!&n`#8y<Q2m4Y
zC79*rVK07+3WvP)J`M8iW9>!d%f{Kyr*B>son*vx%Z2E=Phr^*Z2-5Q@Hk;7HHp1P
z)xAYZ@Gu_v!Fnf1C39HlV0PX8#8L_2K4?@|*ZJG8f7U;I>+;f&tKB}oQN9wy3t_LI
z*373Es9A#h6sln7#8h?ltD&n2PkxfWB}k$>%%ewKC>-%M5h7lQH`0odQnDn*pGtjW
zrW_T}COC@ny$njg=;DQL#-7H?4USy{9OJnd^qRBKsgUS#G-))pTY5T~U2`7Ho74RQ
zU2WG^bT#~JPLE@}oBFrNjtss5NAOslK~ng@xe&kU8UogipEaFABbt-4;??_KIJ4{Z
z^sM!Q5!J#EJCVG(^i->v`Kb$QD2wNlsV{u1x8?MNAFQwqidY05t8nlI>az&|*xet2
z$MrywGS+bW4o|I5z8m?I5;ONJHr~kKehEOdiRW?zw>LgK!&eLL>u@frPpRYCFd?co
zPdAv18I=v<lvnaP?&!Pg5cfiy6u4&9{#vIqML9xb)hj+!SArq=KsB8#FggUQMi!g?
zNrY4}(#U%x`J0HRHYfybkQy(?={W;;IW2G$08Dc*O4U0$x`f8^8mFmtu+Xc{MhajK
z%;ECO)pVah-#xniR6?&=fE>b2(c??412+&!?1zE6fH{qyr2S);=};XvVSZ@$@4`U|
zCeA>z;^!(2ZxJN3w8ArKX=I;Zti9c>^p#z7LaK+EMNj@Qw{Byel8rk8{D3knDw#S|
z(HjqRQ}VesMbH*VxIA(CqdmbfG!O?>0W&VsQ@qxG-qJf~=}3p7qMk`^2C|=s$ns(V
z1hPmaD$D<f=YFzpQDdikkbF<9=7v9yv3MDKwHI$r3O(mT_x`wk#5pgJKAWQ>-vqp&
z?Hou_Bc4bBooz#53ruVRcLoxtGyk1cvG1bmsr42oa)HT$#oT0c$q%FlV2UJlVJ{h&
z{9t$K;#*(`L){9gr_uL2LDbjm&i)(pvGnNUgn3iEC%~(kkSE5at=ys1{@;-b2mdCf
z&JyjcQT!wo>v9&VSc98c8V9QuD!ao-ilTn+KBf>+ED~j@@s|n%oG>Z>I*6QMnzpJ7
zNJli-oZaQa%ZT0f+06_5wU+r0-Mrf=^b6p#%sDrk0z$)nyvPLE?BpyQA8B4~3wJ4Y
zV~EG#2~wp4>O&r8bKW5PkOAKLjPn=0AH}fz%Jn?9KtM3_FXSS`G;vV=A9{TJn38LO
z*OSbbDT)XULJKR7vfCNZC<>u<S`=BNB9t4<==&W^Im}b;mhbqnMr6Wc;^=}~G3j=C
z#(-jslcwcv{RL#5;mdrD)Ea7c@9)23B-OBJV{=MGK}oGPT-L#%DBtQiFOAgDvPqMl
zy2KN6hzOYjpQ3lM6NG7$zI-PY3W8^;1xAcFJbEoQEs7?Dy>M$NW&3Az=>y}RNfYr7
zjDVHPmzu&?5Kf-n$%I4l+qByG#YCOV<MsCyMWhi{czOT^3;q2b^NhdP!0<j0XVx`I
z{NGFjRp`sd_b1(__@3)k>Qf0b>jZglCNV$H9YRm7$^hkbvN}7QUcDKK@47J_Ol+1&
zky~frhCF`{kC*7yX*JkQJp1`7$f{*aaXG+x>Vp=$F~)!AukPmd_mJbn%@Hq~qTRBo
zSBMMrdSKH)vG%yA_lL~pVr-jIL!f7Wnd0+ij=bW-dyDviLo8w&K2q&8_0VNtzWyS6
z+iB`VZqosO3dS&x2tOv)k57Fa!kr577f8^KJ@#NrXO91z@N6}QgAyEmMB&K%I8E!t
z!OXHr#a&{%<SP_?yvM>68Vj&=<*{@;rP=O5EJxFgdAf83$Wf=ed`MsN4p_L_eUY75
zup&poqWHnp+<A&+x9NDi+cP!(<lCK~CLGDhBb$IypF6uNyA$m@o)sry=7q-=+conZ
zVw=%SJ+fEX)@uzT-HO>0XVi%#dj?mCZNHiz_YJ3MHM_0N;y~Q9$6JNP@4<T0!=qm-
zpIiuJ*uDvx0m*J3nthmC3BZSedW_*-0j?{N;8%V5695{;9C^SYt%?QLFFDC0Om#Bl
zLL|unekKu6F*kPuhaj#Ieyg~L<+L%H`eSCbQU?_2TXzJ`=znqfZ{dIo$Y&%Npy|@L
z>m^{>AVKaYjs(%L!o^uYKXBpDayNdV4wU401|NH4|G33qX3|NCN5UnV)KP(4_a$f0
z!5?1x-RIUMn;9+cV{-1N95y3ui%KBb_g8GEaVI2+fYA&K!7I-8)9r>CY3Exu^Y;+m
zqZ|!B0Y`v&$U@>~fuBTiRQIWURt~9WFZH3);<@8vrxJs{ZnB4a*W<>Ck4bNJFZyQe
zB+5C_U{V6-F@BvceK}Q#i;SCsxf-i`LF=+<^94)&=beEP>RpXzQ0!7u;k<-{T&}4V
zoRJ}($&hJuMRIp{+{)s&mejZNx0ZIL!wjR5U?z3(^6Ef@3M-I9h&Cx4o)ayOZJGcb
zhTna_qM4q^V>-{rTQSmG25{NIu2nd%>`0HOW{R*A-z9&NGW=!DerVf`j&DItjvQQS
zivWjx8Hq%Wx;($s-|=eM(jwA+nZ&gwhAGlJHBEbar+VElURBnv-F?TDM4{~-KhoJd
zZKL~5<QEVfHJsp06=IXrarUs0Gb^=R0vt9!T)Xy06kXjWE<~LomUoyQct@>Lscmbd
z*`?&LQi7>Qr#M&uz{$g0PSocc)XsOmxNZQe!b|q|QM9upmx3%V)C~HYpsc*qQbjfk
zEJFIwNn&F|gbpr={mcIv6tE?!-P3*w0im%4yXL9CVO^FP$4d3Zr;d5W;IOO7+JHcP
zaA8~tIg4G99?<c<EbdR{;&6Qz;~lj|akbL&c{<!5dR?f6c4dZnGB2Qnt6lB{5DU@&
zjQz?7)(G*&mmt+UHsbKgc*JR@we5XkG}hFkH!ir_=8xVz>k2w^e17l}UH#;kPRdiN
zYB%Ap>8zcBd7`8+lI<r`RPoXx@9!if<iL03okvX}2P%vVxofMry~m$kC8NqmqOp<V
z?Uk#xxsW_P-%HSEdTn)fbVrx+-1?`tpa;W8zN2sdJjr_VhAx`akRp8kU8tim_oh0i
z`2!_bqbIFrX3ZTh;;e^m2|s`%>_}!h9$6}(CC`X`j-9$|SuSA2j{)Feb5{Q1H&)OZ
z9sCK(LTn%#)AA&fQ76H<RE2k~j0gO+WBx)E3LZ$v4*YqrSn3n#oyS)gi-e9vFFTbF
zYLI-ZXDKrq5<;U^w~V<_<@tJ@t4i}%UM04)l#AR1j<HXe!G$hEk6z<Psae+eFN!GN
zJ8OWNX=|aNFaJ=q^p=ISK;)Lqav#O_eHsJ+qq2M?=;}9N^RKW@p8Nop1aBK~p_9c%
zKA`%DbuCt1At+6K&GOaM8oskFTBevxMbh^;M<_cwa{#b=Zcm$=k&H`o?u6@rb;~hc
z%Qbf&zHm^}x3&?l6;X~Ce%q$4$%$L=M_UN7{HRc78S@;Hi%+R^&q0S^%GF^x(*bt~
z-?bRU()y0NGX)eA3h@KX6IsC*0)T+LH-+X}szzK@@=U4vZij|ipkIQ{c_+p*uUZFG
z^mZeS(L79PO52SywI)FNV(7T`qwYa`r@i>XVAFhzZa59OoG^I(pd@2+iUl`R@4B_*
zy?(AIu8Y_+$k4lbRGFZ)pjZ)zxf=C|$GbbHAnw<DrdcN?+76Z|0Er3pU*MN=6Lezr
z-iQY}+F59Ct(Vk+ho2omd%N$i`<^-c;WI=Q3<6qa#@g$LYygD-F8tFRxCL3a9|vH%
z(E{3g^)S#G2a9G~o-GRwgY4X8Qd_JxK=U}>CE>Bs>Q$Y+hJC#6dSJdAOB$kLCHUYK
z3{?9PMX*0v%t+k-EU4T{Zab;`|7q?`+@bvb_<#Er8aspRdt_gRWEsrZvJDC$+Ymy8
zO4*IwFm}QiVk|`{OQP&$-?x(8$d*VXzk7OrzQ6Ck@V&0C=DJ*SU-v!docndo>vf*b
z$FWdUJ>IIL<RNE!cGF04#?hZ|GjzUqzG)lhWq0y-Ay|7XAn2xHjZ#pdXVLblgH4V%
z*4e7unC7AS)I;{pJGhnORO1`pGFUKc9eFE@D4N(vsZKM|+tnYfLCF=~sGk#qP*O10
zwXeyg0v+(?ir4(9hAGD%uL4c2IE#q(kgDoNq%HJ7jf1-mK2(R_)G|W1=9rEJ0dJ+G
zDMBSKs}-gMe)MH^Ts9S)+^}!vs%;3jp}d+t2=`JP$ohKp%cr-NMWPO*KIB01JB{VR
z?i1e@u0FOy;0?%J*DuTSAFCDgNHu4FcJubEaeIEEhu5o8a{>X+|7t)gN~<DVWlv|M
ze9Goq5{_HMCu&fFF9>xc`&yVwViX3a=9Q>W6}*n%NDGZPho9MxpN+MCQ{JgTkd_-w
z!`Vhh>V-G%D~*nvg3K&l*VPap{Y(tMUH2UbwwvGrmlh{xz`)Ku<=@H{rE}HIT1@`x
ztFV@DTV8sgUzzc-=Cqacl6Rt!#gd?XHVVFhRjsPeO>a33NnzX9CfX(L`7_Zo(UnQN
zzBZ9vFvK#|46N9*HkA#?H6(_G8p^wyR0}qP>WmU~IJzaQ)HYj|UMAj>i5V@cXaokp
zt$g(WnO)GZsK>}H=444ehN1UOn&3lzFkU;tss6^;-7n>=GV{!-y*OypT31+`1Bz-M
zp+~n|mn7X~a#nC|5%h%^L4>_1Id+i|k!@DVEjj`+LkrTC5H%_nvPxVCptQUz*xARR
zp6}5MpSDWqOaDF~*4YNv_qBgQU>|^NhSWW^^J)6nU597OI5d4OqUK>n_QVD&7w>EX
z$S189UtmYOYiyo!HSbtB_5Xg>AOdcA8mROgf6p%ELFCv^&ND?D{;LRO=59PVx#ixi
zz}HDb#XkMKP@xvLAq-N{+el_pB`A6Sv1KRzDN7*b+Hvz(1|o<TNaM>}^(z5&%jj|I
zfMW!U@zdXR>sZ^Vlw>Dkzt~rb=tRy5Js5io63R-@7hkBx&sXG+wWv&#e}2ub2aQsM
z4|N%Bu}ltK{ZOpLcE+UmmV}%s4X^$~@>y*8CAr`y6i>oZ`3;6b4mS260ifi)Q(<uZ
zx1ky#(YssK87;dcl!+}Q6B9v#M^#>h{Q3un6t$25-2tUHU*CSIXpL3(%woXxm9L7Z
zY(q`!w_1L@S#R6dkfy4c-zcCK6rC%={R!CP$fJ3}jU`2U8F}#=`3&in*#x%DY=|43
z`XGy36lYc+2nEcP9nC^r^4~NJ?B?@781sC=f#WY{!2DQ>?4o6*jU5y8qLlveXFGVa
zGGH`Iku_>a=eFA@V2M|Ep)A-Qp2r#Sb8T&`H}9$e+vJ+@q31QbI^QCP^?3d2s#-yZ
z?-iXI5SM=PGPRldC6eYQdRy{d8heo6`mG5VE}mfl+kL^6-I;5RTQc7`r^8e})wD>(
z6f;@nAKM9ot1ZV1m4des0}N*cTGe~}sP#xL3MoVZ4GzqdW;ea?sIH(TjB%DNH%b`s
zP6c}z+u1T8TbrEdGoKaIt{&txIdY@s#)fUaqD#IHAb%u9$wIN{FU~BsnL7QG4qCD&
z)qOFV<1zNDR#AFFoXu8r^Tvkacy7d^h(v!{fa35`)+6*(I{>(7pMKQT|BZWm#i(>n
zbnlYxYHiJfDnKNF0qh|{?=DS6TjttIOr{HQBpQR<5#o}=41>u2=6L;H%f5bVab*Nl
zsQl(h(Nv>}K<Q}e8)M6w=sJj2{H^GQGH0xu0+wm7VTCgYP5(Ew?Mu`8UADg1iR6kC
zv$zuU54r`zYd(nccpAOaMbG(r-VcrnGl_Yb{!1mWAee$D*JJCt`8!*;0P}gO{Ld=p
zVTrIF4Y9Fu*tS9dH0pvwNxoEY=~|<=&ws=eWo^Vv-L~*4k|+4joGnKJt$wS{=nNG%
zyvKSLZy=986m@=AMNmBTi~R>Yu{E!tl<>K~mSQcz%#yV0DrD2D?bBoZa7;@!z)PQP
zG)>;p;|DSE%t1CBkMe^g!?3-2_v8wLv-SBJxdXqO{b|mWU|~vzyqFB!jYsw1*nj?)
zC^0r~u{Euf7BeG~^}OZuoM#C^s)4J^@ie{G<mu*bWDvlD>tp#pzcV_BLYlTWQj)6-
zK9v-ga>VqC15M&t3%4vm3WE*L%vcFulm2C@fx<%mlnxDAl5a-zayI8Mkuw8FdF~eg
zwIEahas$841w1F<8NHPr(Mzr!Jx5w*xQVf~N;il7=B2I~^in4zNM>jL0c0?hEJ4qm
z7QcT@{nyaaoZqfw(xd5T<F3`;h;4Cd0SS~{axc-+Qe^jZtkZla1&%;A6lM^?NZ2~;
z2o%cpv}ZS6Pn4^ScIxzzsr(vd_!Gl}Ij02=r@dBXm)px3jMheM$#LFuZp2H>DMhb7
z4;+Zk=g|`Cw*?fQ4Ye6m<Eo!Z2O7L?jf;g<8xiOwu_gWoTdc<atjeWbi7#6MN@ax7
zlJt;lJ{Cf@1~rEbhuUMU$DT9>g`d`~aVF&=U<oGfmJe4{++XY_#{X*`Q9m&}dpE|_
z7~HUdzH3feL5Dc=YBnJ!C`x4N@q@#dp1*Yrx#F>aT&IocYA^oRsTilvuf{~^rowPW
z>uW;V1JLcll-j*~Z)4`_Gc)GXxh&1tnl%)aZykO-Wb0Gy0cAJQ_Ul4!WA7iTCfzWc
zmvoDI#+C#;-Fh>?Qct<XJ9{F!##-UDdKmOg=O97hHdOih3*hO1W(a=>?f+uVwyAI~
z`x4XNQ2AVWrywJZLE5EiObo&pR&LVJrWyt;{6|-QKlXh$$-(xooN%H1_LPv#8lk-v
zSL<%$LvH_7cW8`kL^Zf<FVLh`wc*k%XmlpwC*1y*=C<{OsMMLi1Y8iDZGUR)Xa!hv
ztqTFeg3y%e&)J^5Chg<3k7!GU)2kFa={lZ9{7nf+<8*>&>33x44?E}gQkht5o7QN+
zcwDVIda^|Q<wlmWHm{RaC|?95dpK^S&-h;6UWJ8%s2m}$0aSl4V)N=a%%{(s?<xP*
zF&<<kneOFo^}-)O(=1;~bmr`lWJyje^8Z%uo6$Zl>KXR|P$M%fT(>kxpYr(WKr<&2
zGsgOPW9J1LeD5esqwJ2~)fLTam@1}G)s643!<+$Qu`L370AO{p^o`KSpXf&wlEtgf
zK+&Epw*#jO%8lL4Y37t-ENrOd?qlVQlytjd&I_Mk(<|&b{f+w>?@<IadbRlI+l#+v
z%0c-*GapqP7NMjYG9W4IW1_DmDR%H)R+ZGBxpD!4VxqDKnkwUwdFE6){$MD$ZIOfH
zqihmF7##fU)G{BX&lgi16k!{B?wP3KazN0a({9Cs)#OLBv%7J);^8@rA|l<gVCwnL
zkbg)k>s+K+MRs1`k=!^=g5<@bU`AR#pkLlQjcda9XrS~F2`=oPFac<(D^tZvgE#6z
zvw_B<V@}@C_*Gx0GotxNA#e958xHC#iV$qdLmFefa8MWacERRIllHikIS;0asrQl&
znNyy`9rCaUVnZom1yp+5EiRh`|CSidard)h8=a99s#eD98!DQSxx=3<w?F^+);iQ<
zlhf~ez^5$#>}?|T#JT{PX0R89Y!Kj*Gb;-MJ0zM_p?WkDv|GI&SSbmPqSoDB3v%Hz
zbKLvvTaugaE=U3stpy=k*~`(1csUCB1nBLn<Dzt&84n8@M7ZeMw)h+1Fw+#|=c;!>
z=~m_`$X5)n!5)0~oXb6hOzm7B)N})x^Rz&{Aa{EQv4=pTZ?|i2vT|Gi?5{$+_-o%K
z+eO}|{swJV!bL@Bfhc)1v-mzjSKAI+nktjK@N4@F^E}UL4bJc$dc~r&0fH4sW#{-e
zW;sXS?lfIK8k?JoaV2RJPARzf*~!3h#rEQFWBj-n0Ft?7m-Y*;ST5Z@81{xn8{K5<
z_*c<0qu`s(?XG#NaJvE<A*?@<UZ&SWtm7eOM^xGlQk8F|28)2z`rBnPiLxbz6!j;g
zOJO#=SK5BfKE8xydjH;NDY+YGw^lZ4J!-z6`Z6AAJZEaJ=XZC&6&xcb<0wr2BVd8H
z_0r~BZC5->|2BxO`RKnpu+8*2o)fa8h!hy3vjaFve{wMpL87tu>$yW(61R-{v;B7}
zJm9vq+*TE)!lvzFodKTy%?Dj!MR?P^ShM5-VQ6u@E40yLER1QAW6}+n@pd~WHwrY~
zF7LOedshtM7)JdzfY{iR07@>pSoYwKDP{pBx3q*8U`hLD0Ff5;wYHyqOHwa20bEYG
z0@X{k3(VC~WGT!lInHq+a)d{~a$0}dD%Jb*{7Hs!o__kNyuQ4?VGm##ykYp*rve-V
z6-r4`83jV3Efcmgt%_$9$&y1Oxy8ePPHIsk+iTrxA&<!;t-byx581HQQy~OCl%d%%
zR8-s(VNO<7{)RBr7p4dkSD(8w+kKfWelhBO+oP{bb{9WKmfAjUB$eI7rywBme-SG7
zdx^jlC<?B6g)Tb^(NWBcj1>(krzn*HVcj(ja<dsUAMRLE-DvTL$(t$3%)SA@W`egW
z=rHn$ctM`S>hVoO#pTmP<m$19T{=3SPoXl8iTb?{z5cvI1t;WT@6%uXHSzj9T+aYl
z(3v1G-N*MxdgH2lZ(d)+)j8FW6x~AzrzugsluZ9eQOl(Fn_fFJdi`oqtl&1B9b3;d
z4cC?xf%~iHMSfMxS{Mf<&&+{owI}V<3u;1YWrUgvOsm{s{t`4FASL0p3m0e9>MY6i
ze$!AO#JdEcVv}0>@-0DgtF@IK3s$x{U;GnY&HltM$fO@6PxFF<3g~x+T{`fQ7)(Q-
zU+>&dJVEiqyNI&XAzt5#4|q%ID7SlDxB;xrsi|dt$$6<uz(Vc2s2dm5FF1M`^a!0c
zd^}V3(JNC8*Amx~CZy=lVI@G&fV$|--L68#MjBjg`;K+5I60iDEA8g>6Xsgr8gK4^
zXsk_$F%HeXf04HSYiH38u8M16CH15DTPp}|K1$YZ*vl1nK*df(+J@U9mS)}QeCNUx
z;`2&=>676ww2Rso$7^wP^)#c!L;3``4VKiH7;r{sdboc9un)j(SRY#}g%`GEu_9P7
zc^1dG_9+1JbTTq_PZk=g?Sq0SG5X!m{s^Xnnd|IrgejxpZInI`lKOM>Yz*zNB@-~?
z2d_*Wt}a*t7N5#Mgn|VbJDe(r3#3aU*n5pRS#VIf{^k9-B7h8K$MO$c*mTh25O!o_
zh&2yEPOw^*leYSx@7A7JHit!K{ZSyHSh@dqbpP32*ywX}EwJGa6TsVD>d9>z3`#UO
zyUMzAx3d;&!lbb?U;FwlMh5=oU1A;@&spZBi2nrY59c9puCpd9J7_|_{`;Lxa-%1k
zg~3@_D;iUkqz=1jmP+L55r-baTz$KsgyHs0txEUsVEae6xjthqo~^u&jgXP#LExf%
zkaLV=&h&j@c9=H;wBNJGHtw?a3CSUi6romQw}f=KTm6}m3Iwr1AJY<7n29c@F>rEu
zm=_U9SvMH3Uoc@ffUC(HEhAA(Ps))oAE3YrD7j1zeS?^}_H924TRSOKC^tj<iC2_G
zle-ny4!K^bEin<+K9V$$X$hIBscT>K<o4ypmK-m`;m&{}U^u~5YeDnp!njH$*N2by
zRo_-_<KQB|ZaV$PnI5RFFnIy6va6X)DqnbPDF2G%=De+*Jk4$MLC~x~v9=<~o;g_0
zizawj<%UP_E!jL~#$>+xMtONu;YSWd0_ocC=qQM0te*8&q$z+JLJ6(qH<={F5-jcl
zaEAgVLC&qeVCIO%yU!9_!)K&f(U2(Rhrj=UEWK}H{rBD#Nx@@fj<<M^gm?2K`e#CS
z_44Ozh5Ey_+P+2lE0Oa6u7VE&7*;wxY#P&-v$E~jqF%iH5igNK1Y?@HZrwXtHif(2
zJJNCrEPqitl_SDbZsrjchM9_$oN5Si3sSm|HAg<y*A0Acc=G9xmC5>lzWc_ELU`Zh
zWk^6%mMB8$=YoS6u;`voLdt%E?iMYS-Thp4Da_K$m#%MAOOny>6Pn&akU|C)ZAJg%
zY$6_1Y-VkEBiWpTE}Eh!ne#h84~1$wIrn$0ksHR^x!Gsi<kU3Zs*=mRzj!w~C@a16
zyeO}<UqJ{GhHovsG>S^lV`~<Ff6-OA_H=_Y-gN@#6e0<MbGENgMb6~oFP`fUCpfr>
zRL!g~aw6E%ZAr9P>fK1WuC4>vC-NR!KVbhPV;}z1EGm}5aw+^-EDS~wJoAK6M2MNO
zBe<BkFSWGRB-mQ77~vJ`g@DT2PCFAkfKg^;fG0E7m7Plm9ZwJOemwu|r+zzW+{M~J
z-l87Zi7<pq&<?_sLJtr&r~k!I`P!cVyeMS<x!rwUjh%%TS<U-7lAhza0{!pqr<ahK
zQ8vx{o|%o39<Hk_s%A|I(2!e5NgVKZ>u5o_%owPnqq1zvT*@m|wu}HzZbt=udM8BE
z?E_?;hUu)ZxS(li%E!o#QtVfAPRsI4*NVt$f>xDTg;HxztC@vJH~T8kCq^*E_QS>d
z9NPJb!Sn+-(K$TlX^~Y@i<YqyB41Q^rQBu1yPiF@Q!<^tapKE^VUM1sZ$yfy97F?>
znINvW%=9MJ*?R$=UGqvBrT_H{SJ1~5!G5je(bLJG-ib0*3+zbQ34#!#`64X-Hcn>&
z;~FRe_7>A?^?2@I5g1Z~CkJ%hz|81}E$OK4;AJB<xr>l2k?us&b>RE?)9z-PeDj$5
zFc<6k>I-6?(%G<IKN?WvLa<^6i^s>g%Kc@=%k~_s9FZ>x@?&#JLxxa(I-h&qW5cM1
zeqj^6H)=qU7g?dj8W3}#Z>T(AHMqI(<a?dL|3bUDz)@tPvNqR|PG_?TgMI;5dVWG4
zH<u|0fnV+Wee;@^P(Vr%6G4`#zXRRiIlsJlib1Zz;{LMBRaT8}W*~7A89DkNTy%m@
zZuiP`;}K8+9bt=3yS+iCh8e?Zt9X<XTYpY866NhD(=}zo7T>cnP|fRzB!+lfEuygh
zs?5YjLD+GK7tY=4)b{xkD{6ke_;N+Et%w}S(Zxr?Tn#1qY*FfNY{&#x+4T0o<MW?;
zSESx)HiVf(3sH?iuqD_}nsEIEm6NzM{nKyij0}I*2dVX+a&cEC@Q_X%#CHj%Q&SQk
zNJk|!y_fyws;3|)Fz?#Fi24;jmln6E{V|AX)@eQEnldqWzX~D(7wi9GWh(Ro1nz1_
zcnEX&5LhR?;Gng0!_10qj8(jbJXF5#x8)5cI2EoU@xBfuvFuWwRg~vFzz<(s8qLal
z78fQ2%*b|(>@`@lE5>UarKQD)R7r`BI4{fkT01`|e{`#CIKgT#g`wWuCUsP06tq7V
z9+;r0k99`;OXeseMQgKyTXVH<*VV`xT%Dt`{X*Su1}a;!l%(p!Y<SwxO2%4<IN7qQ
z-jWik%-wVX3gtQF+fXG*l1ObxeAwX!qg2ee=QfP0*I1&qX+EI8Y?!BQdG20fI6X{i
zv`lD!?%tg<!g5&iaAKQypXDcPv%C+D0UuO%Ae-*tucANEa`h1|HP=-CwFwFAx_AgQ
zoypEZOoV;QgQnOp!z{5xXSm`HG*WwCC(Gmftx<Nmc3J_(48ay{T1Cu6P$3bE8+UA(
z=|#u!EBeB^cLW5vMw=CxNm9fbmA?zobQSVlK$!w({}R!kdUTcd?kN<Nm2LnlxcBi-
zv;tgng1U3_lbZvO+ohvag5XNs9RU8A{NDq4D_sd$I&`T-71UYV+(iosQ<#xSP(<<5
zHKX*N`(L4rNWkha(UY}VC6(`{LqNh}Ciy@i6!hAbVxD3rf91GHN%i5bWr8U)P3-QJ
z02fK>Wpon8X~`$@K8-6@Dn5tx$uw{9!W~>KRu24>Bd5I4TxEG;3f?J?`|)aTY+?@B
z$DQTiB?eD+?LjSRlvj_i_1r88gdkj!gVxgW7ena|g}72tbw{r*1ofIaZTQ}zjH8%_
zlgGK&8{^#@f~b>)O$^N#L5YImd+N4<<~RynC9aFV?<AjS`1&oaHp)e6d##jQ(`;DV
z7>T<4v;@`&)r)ZHt*f?FQM~UC*0NsH1lv8mG&WvhHuJB{piinZ7OeQ#YaXBbrLfet
z;+QNT;*qw1(D68Ur4~a&iXzh?qX;<D*K(Aa5|HE!I4cNLhjVm+F>si^ot}`5;-|k9
z0dFYi@9Q=?e}zU0Jh@mG=;yrccb|1Da@#R<QRgAzl_}cq)w{IP7GF$xsF+VYRpV7a
zH=AoA0f`e2JdWulrb0kLBfa&=zRKP7*v5hM?P}zuo<2Rpt2EW1OYlXxaG{`HC&}Mu
zQG6lK<T`xvcC1V~aS|*MS!1g323ofS7sZ0)R_}>R$?%tkyeQYczxJLaO)gv(q&S43
z$}Cge^4ksLw(`o!@B;IVsAVB+&(qT9F%9`obi`jB{da$9D}?};MOt6Ay8_*j23D8o
zIJS5q?7K*GBq{D{lL`eln%6Cv+U%rzp_A&>gS*4ZC{}6mAcakO#;?tS%}#6zUbV7x
zIxTUX>3BxB%u&F4g!mw;_3VyPmL&HdpGg}9V|%|n<~cOF`FLz5=LDuKicp4SE^$g?
zJO4iZuAH3vRdu&I@tP*_rSXm+ub|JxZhUwZ<@C#pz*ouEdYMn6k1B!kh<)$z5T)Ky
zQV=_A6?BQspB=Xx?N44|FZ&+Azey!<3EX&X;UntlVZu;p<{4Z6$E*-V(D%L2HVk=B
zL$y^3Nsst`@h12R4`qMjkJj<u(w`{Ctdo4NS=gK%XGcqC>yJ__)~-9`yO&n8C}EPF
zNq25*y9@BNpAd^navn-9dle(~ZD&^&BUr?9B}hHB2yt4VtLS!@IG8Xe{`lG|At>@g
z{VxsQ-tvy*B$H_x>1-m})uX)zT%lYEfKPAo#y16T8n--7f|i|Kj%2c=G-+oN<ie4~
zreuHIE9%wEqZYSM-jW)sv6n21Pil-f7J0aH^0?yYVIG9<UwEUPpr3RH@uPnsZh$fq
zFjlxNw6nm*ZT~lhb}rxwT3OqCOFLPgnr>mIjx5&XK*c8<*b=TQWM_C-X%d|VT)VPE
zVcOF?_)TpGsxd^EYkts=Zqln%$hF2SKA;k#NkfgNlE5@vqPz)mj3&-BIRZ2%E)MkD
z+VWq*Y|sf4Fr#)xy+^_n?y%251+9@&?mb%<w${|;zJ>Q(3=&6*-oRP#yQ>9Quf@WR
z#8T;SU*8`&Y0I|*Xs#qSSzj9)qg#u*0gW~OAUof$Cg~OeK_8yRbg}7sh|LhCOf1RG
zByV8w8T;?^j2|qVCXvT?xr8XAux4a^f?uU~85HbW(&@)^47t~ijabxJ{+<p9SpDg9
zQ0WBKn~UqV#%`lFdLRBJMR^y?qr6|G*5%sd$rxy~fEa0dO8KsveRoXI6KZZ!Y9=PS
z3P06Q9QFx6<`_RL*A_Nek&$^(r4EE$`xs-#3v%#Ma^>ma_0NuQMnqGvMLG2^HbwIP
zc<S7z)Uxt?;wbQzx`pZ$Ps79(Iur*k>re*oBd+6PDG5?LRyYgUG^l^P%%%3PR4m=G
zaH$cj!)hizM`cKleycFCq>wC8<htHxt^E}2qi)7Z(wcOGqY`kN711QnB`vr~ox~$6
zKDx3wTy@!&D--~=+Ve6<h%jBYuob@|=o17bFN2+N-A~3kh3Z)e5o2jnwRn19{Euay
z$QLr}KO{QVxyDM=_ucYD(2wGPx|1=*V32{;q!TW9zMd(SLbo%uCCM`NE6vly&11ED
zeQ>MF8hoU~A7g%=G)h*{z9N`I<_Cc_aRb7_t`{*+PujgwIk<GURwKk=q*~rQU0OM&
z=u^|-%l1=|8hag=Ib6I`@tv-)7*E#VaX@IN{qkohCpw7;RJA##W_m$gm6?N~b&WKr
z<P6fC3%M@I!xI(w{>2&3^ex9U;uzah^XcGqu-vcCz?mx}ckHLQm?ttC%#{K?9Bg{i
zg<K9~TIjfavhS5Oo=9HsFJA>G=vD%b=i<4f!qfzdl-0_ZlZh1-LgIgqtAF`qjDrs>
z6<v*2tFV+?21yBfi)Q$899EP!z}foyZpEpf=_fC}x}17rZMA;LZIb-T?hAhqctAJ*
zHs?_9&jLg*@HOtCwApuoO8P(-UNTZ-wQaV;WInW9`fPnrrRmatPD4Wo5?aYruB3ao
z)sDa9t@is)rC7UI(|r2Wt@6C=TPz)t3NJ+`Yf|?6?V_5c3`;(LIQ;??BHU2130iC#
z2a<gbZSxKE>B{JFL7CJ~Pe8J4Rq_Y;ZDlxh_?j0fA#!2l{DJL4#olN&SJ(x<;ca=x
zlJxVc39mpAE_s3%gi*KZmotF?m{=z{M2SP-^havnqDYgu0>z}q(x2wf)Zc90pSo3w
zLJ<Ot=AX(;EOe$s9hlwDzL_;8JAqpz`MDvc&rVKn*!J`FE*AZ@a>;v{!usa=m9}f_
zv5y!Ni0=oB&I1!zzSCQ!oeAUEnmP?ky4wv<-a96fHmD+vj!AU2(E!eHu&>eox&Jzs
z)b%-y=dab?XO}m`voc(%nn<<<g8SA7Kq+jjC|a$D{4s>wZh#fLoq#``ZhgJpB+b~P
z=23LrnuDKA%g$}wsX>`n)Mp}zl|pkerMRtn?lK_Bu2T>X{$kB0oiUJpKfdED$z5^B
z40~sBCBb$rKx>Ds)AM8j!0JZpM4Tp)O+@_9`kVK6=Audj9{4{r%KVX`u!3)OF&%6^
z*6=l`$zv*U(O2n_<cJ-MrIRxfTP|;u&oB-~I3o)bK8EfjVu-(4+W%bYrId6p?Q_JU
zD8<Nvo}F*8ZR&#!6&_kgpKm5&1M&||G!(rqGJlMhIVr#J+LXDSwX&v>!S1CGe{@{^
z@XQU8EtWk%!1hd{lbyvTZ-@H6#3r~B-y&#tid=}bLq*kkpq7@IEL29>#Yb4}B^!zq
zlak^F;m1YXHAf=s+z@6`1zO}5-Q-H-EO<!bj{T|YWKI2iQ)~H9wNFWk0Ln=&Go+hp
zp4b9%Y>Lym99#B-+Khp>&9+j>bT%l1C{HwH#Uhv0w3cw!)22`O_A&zkrYh3>bMYq#
z)`3%-Mk~{RU)AdC^R<wg#yo8=%C3|g#CgfcEGr_pYFMp#bhJt8+YFS-Kmy~ohnFW-
zvDO_wIOL-A3qQK$9mc}61mEt<ztqh<)9MadAnlp<Z-JhVIJA;|thcXLx`<YvgM2yw
zeCni022665T=?;DD3pJGJ5-pj>W>TDV|*ev#KcflRli`|e{*is#UQMXc#l$_M5p;#
z(fZL8VL{04^7_|v>Po^%ftP}J@`SXL`|5EfbM*Q5j1-rj@=(1zZse-dk80@04{M|4
zUo6jvB1%2;e0gV=cx1dhH3A2T6Un1KhQP01-ZlEvAewzl_)J>GLrggCJ9MlhU6z?J
zWZ7&L;|enkqYbBcCEc)9&!bf*!B2Aj>Fn>3l@r(fwyi<8K{&T(yU9qpx|^D`B8b7u
z-B0K`@qCR|_uZM7p}(c5UWT3Xv2{0u2R#CC$CeW<BSG~Jx8ubqhYEeXka>g@i?S$F
z$?GqcxDck&eHO}iLWb(oidcH~1;*#{#D$KreNm?agkv2NS+bknqW%C4Fp)@e8QEcR
zS!GLx;21S#afu(IC##FW95qeBPyet)ssCMe$p<-J>=#}965%YAX*)aTy9#nVTiW5v
z1ryQyTpENiQ6IaA(t*Q$ZpM@{Ly}$!T^S4=4OQ2&^qaPtnLEc(X}g!si^BR3!cMjw
zuhGm5KRq}s^S$O91#ncuEU68F>Mb*)N$A?2HGB74)TUR&*l;bXz2+*LO$p&Bj1nB)
zJ1L9<xWq0J@jZk0!;Ee%z_dLaUac<o7ut{WKC)7JD{Gm`L`zQ>M^K3sg>45HtH-9R
z;P@Hxe6-Nz{DRDm`L4Ng$Wm~HRGg0&-o;ap8~@3P5BG6=?3>T`{1cTP=d{Zh1^|%w
z8O=bVoe(XR4%&TX{-phAanCoOFR7>R9?kQfzF+~awxUSn?Q8+MaExGA#9=184NQKC
z=cXm9&NTkwP}3{d7xK__>pj`YPV@CC*(9Hviu-rW{9PXX;vje9NiT2EHcni1hxyg9
zp*ybJ=6E8V&9B}tcZd7o&1&iiq61owzaW<LC&QG1C(A^3i*JT9W!!fo6qO`Z@IZ5u
z6WN%oIDo8pDy=?|49>3zT!rPJY<Nkvf6p-90H|9(^MGyK1$qobOP;?cjU1iOP@yIW
ziBAaW`WoJG0dHlM$Ts)s-3_Crc5MH3?Ma;iy$dC(=b%-^AuaR@Ek!4DdP(aeHeJb=
zh4-d~bDl%!(&QFNw9UhM{c=D4^2=^VLdh$fnoQ<|gX2Dz9y4@S?cb$|j!<83kmlUH
z&;R?m`gco(t|$m2>UL&}`3o|M^XRd<?>E3+h`Xn_$__P~u1j33*bBHYOPvgDy?`Ue
zHbYpb2|3cU4a!wzIN7~<o_Q?<IKJi?kl`%l+)gwqfjP(lybXU!ATHGP$;lM`(y>?0
zQlrnC5Nu$;9Fl4B<vkFLoQy%DqP1nA6N1g*W>)=s5)C)?G-AE_RJWFLrphew9cPHt
z`p<f0b?T^InXL?&np%JBgp_0yR0bjXp;PEtDd@_xf&Qq%vty3!c$4?n9s!SFhcy>b
zcwtD{Y2m=s%=&?I_U+M9Y{oKdJykmoLk1;RyA_d67e;p05X1&-@WPC`mfy=rXAmsH
ztu_xqRXoi|^;xCJu%xaVS0M{IG6^jaI&!qLBP;S3e#8?T3a=}*Fel^ZaQ2D8z6sZc
zZ@q*u+q}Ei2aFe(qD6)folf&vB8OY$Wy7L^XHGUdi(%e7tC3Z6DKnIys#5_Kf`;>T
zQQEZE!eHD3jB=&d#o(mdD<6W!5)+#sIKR?X))ZtCS6%kN+@fETnX%F&?;5#hKE``r
zZSK(<qhIj(73IPGMwnpWld9Vvf_Q$@Z@j-cXcKfN*_l&nBuJ+>Zb2OV%d)=nL8RF4
z4cj)@I~`%hIx5{Q_T9H-NG<V{^WBU@^(V4FM>t<9*$M-QFAv2<u0##=RPh>m0tGR)
zSQE^geV}#@xJzqaT0mS+MT8V@2f$+j5vY(Gz0SAhWj!~NuSgf%8)s%1dN#Bs;~J%7
zF%)Az+VIEY#29VC&4#Kau-^G7+axhs{Lb`<IxV@RYI)9V+422&q~DTIN9m6RLvmD(
z7Ei@=cp&TK>Gs|VdU(7E-b+g%)cDDCQTkRYhhvais10wcNRwdZhhS#hu*S+r&fGX_
z1uQcS9A8L>@Jy48zy9T@=NAjc3TCIL3RT8gl-xEkT$uUmc7A|7Q!AQ(NH@vE@VB@5
z>%?+lIs=O8ed^U&PF{}*88(yGU*;G0x@42sUh~I!dj}Tr*s#Y1#03rgy{?CchFc*`
z;VG*7bKk}vGF<x+!_(GkoG8ADPUt8wTDq@h-;?!e!mkSNa@Sfodg(Ky|17)}fYRNi
ztgKfT2$U4Ro-V}GyxiIF_=PDYoR)eo`&t}*d4)nQE<f(v6j%&QG2#@S%&{I!&8C$O
zF^q@bqx@a_;90T~w?^FCjCKGJN8n_%bZpJ`9VsTRE@}=MUp{MmRWJJHtD+<Mp`;h7
znE?Og-V|PG598Gic>z|mY@ezj`_~w^lj-+&IAP~EZ~XNql{|10sMVT<LQfS52}fLY
zpWMe5p0>>=>qSt!#k)Zx1rfTzGtISBlin3t4f}G<KXWa2E|tCZ^U0jw#AaNcQX10q
zRCle}J@GH#pR<77J+~+<qSu?qOR`t8iLv%WhwKxNP2tc6I+<e>wIuj!go95qf$-(L
zHkds)&Q?rnka=`f6YeB9ebb2`q$(hl5ye6KP5nfMO>VuqS4;$K@yN^#PllLA?@P=A
z)n$G%1p8hk2YDyMq##vKj<3MmN@e|&a-R3_>xTHx?IA<*0+9vR(mv|>w_=Pcnu_?p
zLKQ9ca#(rzD)s6*8UWaZUJ<KKuk}2}4^#7{^n=-P)wRg~0s+S=*OqCx0ja>!wY+3`
zS1JTW3{==Poy5owVZ%r;F@1D%{#k32ZURz^j$c0LwW|eNv=;RkKL>TAo`NEs?pd{C
z{A#J>TBcBO-mQ=R@d;TNW*Xrx)-k~Vi09x3DmmY;a#q2{YMK^e7Ma4o)Oc0U{S(hb
z*+Es7a6A?H@)IUSdY3g+Pkofrl>Rrf>6kGXP9Pwr*kLk>#~(Dhl=8+m)Zb91sKhip
z$mQMGFtIA<AupBq3qFSMcXHrC+2~mW=&rz0VQPtHEj~gFZ>L%gaa(V(qLqh|jXT4D
z#krB6IgO_JxQd_`QX~78JE&MI>%0|^Q9)he!`p5ydC{R3f>?e|T<Pz=!NDnd<bd*I
zghknF=9jnk41?av-n2w}waBz(9~(yI(*?jOrSlHG7PZ>oFeBq^IGQjPI%f4U0x!VQ
zQm`%FD<~qV$2%lVZR9Z{85A>3$MTYCl*qY1*qb6QpxnrUn|)Xrm>5h<Ya}TOdzRq%
zsPZ>sR0~#VoZIUBz;RaA=i2ssXs%lwRpP;8d6{mySJx+H+hnE=5Z%uKjHtpBiy)z=
zSz!9GT0;RAEaKg>H~)&FOlh<8%nY~f@+0Av**f`<WLxo>a(+2>PQ0vn@HQ}p-U3He
z?9uM@Cc2}Pjj-CJ)hH@Waet5##~72?zW#@_q5VqyZ>?{r7+g?yWt;WYXI89)pTH(O
z05^|rI-;dmRt2}$x;W4M=A@93V4;f+q7Y@Qwk!nD48p%K-k^oIQmO4?i4cKccTMrf
z$}rNi_^@Q1Zn;c+8f0FXEdjvUwGjmaua!9bLk(X*u_dP|$b?=w*F}E4q_mANqWR|U
z4xr(|)?GzD7UOdZrjyuq-7RlPXi=mgPz;M?8t9DUyt+(d75Di1sYqoWdC3X{v!P;(
zhgfI~yyW9bxV%7TjFXb-sTf6QeMumOivCAvpZ=e#&vbcgML(@y&whT4`_U@LB;+8f
zB{L8--}putR^j)*dr}lL1T$Y|h%|?si5Mu09*k>ccGMSWWta}v+<R?xPFa+BCKgO+
z#zI*$oSp3R=hB~Wp}`~O!Q`RQf%J*4D(*YQrl5VbD`^Te#jI&G_5rzK<Xj}(hb+Na
zMQcogfC+X#?9_PcxzV=`NQ1_$FHyh=a|O>@|8?D^eHY}ozaX}=@Vx~i1<$VWc<a2U
zm$K{inx6)>+$AY(T2_7;Ja{&4UQng$#rX}$1L4{GZ=-7swJS6<k=tt_nj6j8ZoJ+C
zd}(Cp)X4CHSC7es<cnM4c}~31yPWS-nCaSC$Vz@|nJk^3#GeEMG*rNaDGJV;gJ51w
z4`7WL@~Z@SnvZ+de{)U7#F%_akZ+Hj6PUmBhxZ=&abZx18=VfKN+3fv<+}2j>Y}^{
z^)l%J{`K(9&duN1?cejTBbZ#_tM^<!+*dHe*k1m;t189^n04g#Tb{lAS9^Q_FoVT~
zH6DH6oO!~*#EA1>TdT5SY`(6{mWT%_7J|4l;|&wHM@UIWM;1dE7yPUABb-_dw=ysx
zT98!>$?Zp0sl;<i0yg=&JKB0e!)bGPjH=wzoI+)$?P*YLTD}*3anzSJ_J1!w1JPcv
z1KZ}KGwVR|6FzxHqbfIiQ|1npE#a=#8q7|Nk||~LBMCoko2iWB&WmtXnoqcJvqE8n
z5;xf4%HoaujwW%CuZIrW^u*+iN{|Qw62ENpefT_|s5|($nY0O>ol?$Mchrosx<X4G
zdS0UQ%390v`Xq!F4!SF;OFluem+X_iLYZ)nGPIa#CE?>)Lc;)eky62ZvgW1xY-qzu
zeui*GzKH5)tJuWETVj8T)PL?^0ef$J;D{pxdCiouN1DAc^0(@Zv+m(@^?!HG;pv-i
zhQHj(37vK7orbEWP1AlEEfRRhh7u+zlZM52F)cAwa0+q_CUnh}uVsvlw($Q}xX`U6
zEu%J*)q=zajl!cXxDi<^h^YDHRVS)OZ9$lwF{A)U=z!mpQ?Z!&L7j|AJD$YBK#R4D
zg1`f-Vom7$ee-@{i&+9iB!4=8dS|_rl-A>#1h#`nq%M>n+}yDc^suju2095*LerQ$
zS(`CeA&s|fkofSgI;YRhdd5bv`t2GAsmZ#v1gW`s37NVCEsDB38h4eS76gKk6~ER7
zT#oDF>7f3kNcpe5KLq%3egR9Zh^X|cn=^D15={OU_pFi)nd{mw^aNE!t%ZQ17EqK6
zlapZ9Pz#H6E<7#KqEkbKe3HH|g`(-0CM~|JB~KvGHT)61NNgFt&(<&`S4JA|<Y*Dt
z|FjYOPs-?QMRF8X4A*vM32|hbd-61wpZVK^u7Aw{{0D?*;;}>j_w%13f>=xY_s9SL
zlPG>6{`=qO|1SDJU;aOz|GVh_jW4^f9bAyx1-^Q4Xf~4y9A-)a*E5CI>NrLIf1#HV
AhX4Qo

literal 0
HcmV?d00001


From 9d28f0fcd9ba51619647f9c099598b17441afa92 Mon Sep 17 00:00:00 2001
From: Nick Davis <nick.davis@narfindustries.com>
Date: Fri, 5 Feb 2016 14:06:44 -0500
Subject: [PATCH 66/68] cleaned up

---
 .../org/sleuthkit/autopsy/imagegallery/gui/Toolbar.java   | 1 -
 .../imagegallery/gui/drawableviews/Bundle_ja.properties   | 1 -
 .../imagegallery/gui/drawableviews/DrawableTile.java      | 2 --
 .../imagegallery/gui/drawableviews/MetaDataPane.java      | 8 +++++++-
 .../autopsy/imagegallery/gui/navpanel/NavPanel.java       | 8 +++++++-
 5 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/Toolbar.java b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/Toolbar.java
index 0dcd4b0a2e..f6ca84b3c7 100644
--- a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/Toolbar.java
+++ b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/Toolbar.java
@@ -180,7 +180,6 @@ public class Toolbar extends ToolBar {
         descRadio.setText(Bundle.Toolbar_descRadio());
         tagImageViewLabel.setText(Bundle.Toolbar_tagImageViewLabel());
         categoryImageViewLabel.setText(Bundle.Toolbar_categoryImageViewLabel());
-
         thumbnailSizeLabel.setText(Bundle.Toolbar_thumbnailSizeLabel());
 
         CategorizeGroupAction cat5GroupAction = new CategorizeGroupAction(Category.FIVE, controller);
diff --git a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/drawableviews/Bundle_ja.properties b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/drawableviews/Bundle_ja.properties
index 698a46d379..2d5f17cc1c 100644
--- a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/drawableviews/Bundle_ja.properties
+++ b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/drawableviews/Bundle_ja.properties
@@ -1,4 +1,3 @@
-DrawableTile.nameLabel=\u30D5\u30A1\u30A4\u30EB\u540D
 DrawableTileBase.externalViewerAction.text=\u5916\u90E8\u30D3\u30E5\u30FC\u30A2\u30FC\u3067\u958B\u304F
 DrawableTileBase.menuItem.extractFiles=\u30D5\u30A1\u30A4\u30EB\u3092\u62BD\u51FA
 DrawableTileBase.menuItem.showContentViewer=\u30B3\u30F3\u30C6\u30F3\u30C4\u30D3\u30E5\u30FC\u30A2\u30FC\u3092\u8868\u793A
diff --git a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/drawableviews/DrawableTile.java b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/drawableviews/DrawableTile.java
index 23d65302b4..cef4600bbe 100644
--- a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/drawableviews/DrawableTile.java
+++ b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/drawableviews/DrawableTile.java
@@ -58,7 +58,6 @@ public class DrawableTile extends DrawableTileBase {
 
     @FXML
     @Override
-    @NbBundle.Messages({"DrawableTile.nameLabel=file name"})
     protected void initialize() {
         super.initialize();
         assert imageView != null : "fx:id=\"imageView\" was not injected: check your FXML file 'DrawableTile.fxml'.";
@@ -67,7 +66,6 @@ public class DrawableTile extends DrawableTileBase {
         setCache(true);
         setCacheHint(CacheHint.SPEED);
         nameLabel.prefWidthProperty().bind(imageView.fitWidthProperty());
-        nameLabel.setText(Bundle.DrawableTile_nameLabel());
         imageView.fitHeightProperty().bind(Toolbar.getDefault(getController()).sizeSliderValue());
         imageView.fitWidthProperty().bind(Toolbar.getDefault(getController()).sizeSliderValue());
 
diff --git a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/drawableviews/MetaDataPane.java b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/drawableviews/MetaDataPane.java
index 521ca0e145..a14a777e6f 100644
--- a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/drawableviews/MetaDataPane.java
+++ b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/drawableviews/MetaDataPane.java
@@ -33,7 +33,13 @@ import javafx.beans.property.SimpleObjectProperty;
 import javafx.beans.property.SimpleStringProperty;
 import javafx.concurrent.Task;
 import javafx.fxml.FXML;
-import javafx.scene.control.*;
+import javafx.scene.control.ContextMenu;
+import javafx.scene.control.Label;
+import javafx.scene.control.MenuItem;
+import javafx.scene.control.TableCell;
+import javafx.scene.control.TableColumn;
+import javafx.scene.control.TableView;
+import javafx.scene.control.TitledPane;
 import javafx.scene.image.Image;
 import javafx.scene.image.ImageView;
 import javafx.scene.input.Clipboard;
diff --git a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/navpanel/NavPanel.java b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/navpanel/NavPanel.java
index 8e37553255..6a25953c49 100644
--- a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/navpanel/NavPanel.java
+++ b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/navpanel/NavPanel.java
@@ -23,7 +23,13 @@ import java.util.Comparator;
 import java.util.Optional;
 import java.util.function.Function;
 import javafx.fxml.FXML;
-import javafx.scene.control.*;
+import javafx.scene.control.ComboBox;
+import javafx.scene.control.Label;
+import javafx.scene.control.RadioButton;
+import javafx.scene.control.SelectionModel;
+import javafx.scene.control.Tab;
+import javafx.scene.control.ToggleGroup;
+import javafx.scene.control.ToolBar;
 import javafx.scene.layout.BorderPane;
 import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.coreutils.ThreadConfined;

From d8c951f15e56f2dfe3203d7374858195d5005daa Mon Sep 17 00:00:00 2001
From: Richard Cordovano <rcordovano@basistech.com>
Date: Sun, 7 Feb 2016 21:04:22 -0500
Subject: [PATCH 67/68] Add LocalFilesDataSource support

---
 .../autopsy/casemodule/AddLocalFilesTask.java |  91 +++----
 .../autopsy/casemodule/ImageDSProcessor.java  | 119 ++++-----
 .../casemodule/LocalDiskDSProcessor.java      | 118 ++++-----
 .../casemodule/LocalFilesDSProcessor.java     | 144 ++++++-----
 .../casemodule/services/FileManager.java      | 225 ++++++++++--------
 .../DataSourceProcessor.java                  |  85 ++++---
 .../vmextractor/VMExtractorIngestModule.java  |  31 ++-
 7 files changed, 440 insertions(+), 373 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/AddLocalFilesTask.java b/Core/src/org/sleuthkit/autopsy/casemodule/AddLocalFilesTask.java
index 53c433ff0b..b1a162980d 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/AddLocalFilesTask.java
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/AddLocalFilesTask.java
@@ -19,18 +19,16 @@
 package org.sleuthkit.autopsy.casemodule;
 
 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;
 import org.sleuthkit.datamodel.AbstractFile;
 import org.sleuthkit.datamodel.Content;
 import org.sleuthkit.autopsy.casemodule.services.FileManager;
+import org.sleuthkit.datamodel.LocalFilesDataSource;
 import org.sleuthkit.datamodel.TskCoreException;
-import org.sleuthkit.datamodel.VirtualDirectory;
+import org.sleuthkit.datamodel.TskDataException;
 
 /**
  * A runnable that adds a set of local/logical files and/or directories to the
@@ -39,37 +37,40 @@ import org.sleuthkit.datamodel.VirtualDirectory;
  */
 class AddLocalFilesTask implements Runnable {
 
-    private final Logger logger = Logger.getLogger(AddLocalFilesTask.class.getName());
     private final String deviceId;
-    private final List<String> paths;
-    private final DataSourceProcessorProgressMonitor progressMonitor;
+    private final String rootVirtualDirectoryName;
+    private final List<String> localFilePaths;
+    private final DataSourceProcessorProgressMonitor progress;
     private final DataSourceProcessorCallback callback;
-    private final List<Content> dataSources;
-    private final List<String> errors;
-    private volatile boolean cancelRequested;
 
     /**
      * Constructs a runnable that adds a set of local/logical files and/or
      * directories to the case database, grouped under a virtual directory that
      * serves as the data source.
      *
-     * @param deviceId    An ASCII-printable identifier for the device
-     *                        associated with the data source, in this case a
-     *                        gropu of local/logical files, that is intended to
-     *                        be unique across multiple cases (e.g., a UUID).
-     * @param paths           A list of paths of local/logical files and/or
-     *                        directories.
-     * @param progressMonitor Progress monitor to report progress during
-     *                        processing.
-     * @param callback        Callback to call when processing is done.
+     * @param deviceId                 An ASCII-printable identifier for the
+     *                                 device associated with the data source,
+     *                                 in this case a gropu of local/logical
+     *                                 files, that is intended to be unique
+     *                                 across multiple cases (e.g., a UUID).
+     * @param rootVirtualDirectoryName The name to give to the virtual directory
+     *                                 that will serve as the root for the
+     *                                 local/logical files and/or directories
+     *                                 that compose the data source. Pass the
+     *                                 empty string to get a default name of the
+     *                                 form: LogicalFileSet[N]
+     * @param localFilePaths           A list of localFilePaths of local/logical
+     *                                 files and/or directories.
+     * @param progressMonitor          Progress monitor to report progress
+     *                                 during processing.
+     * @param callback                 Callback to call when processing is done.
      */
-    AddLocalFilesTask(String deviceId, List<String> paths, DataSourceProcessorProgressMonitor progressMonitor, DataSourceProcessorCallback callback) {
+    AddLocalFilesTask(String deviceId, String rootVirtualDirectoryName, List<String> localFilePaths, DataSourceProcessorProgressMonitor progressMonitor, DataSourceProcessorCallback callback) {
         this.deviceId = deviceId;
-        this.paths = paths;
+        this.rootVirtualDirectoryName = rootVirtualDirectoryName;
+        this.localFilePaths = localFilePaths;
         this.callback = callback;
-        this.progressMonitor = progressMonitor;
-        this.errors = new ArrayList<>();
-        this.dataSources = Collections.synchronizedList(new ArrayList<Content>());
+        this.progress = progressMonitor;
     }
 
     /**
@@ -79,59 +80,43 @@ class AddLocalFilesTask implements Runnable {
      */
     @Override
     public void run() {
-        ProgressUpdater progressUpdater = new ProgressUpdater();
+        List<Content> newDataSources = new ArrayList<>();
+        List<String> errors = new ArrayList<>();
         try {
-            progressMonitor.setIndeterminate(true);
-            progressMonitor.setProgress(0);
+            progress.setIndeterminate(true);
             FileManager fileManager = Case.getCurrentCase().getServices().getFileManager();
-            VirtualDirectory dataSource = fileManager.addLocalFilesDirs(paths, progressUpdater);
-            dataSources.add(dataSource);
-        } catch (TskCoreException ex) {
-            logger.log(Level.SEVERE, String.format("Error adding logical files %s", paths), ex); //NON-NLS
+            LocalFilesDataSource newDataSource = fileManager.addLocalFilesDataSource(deviceId, rootVirtualDirectoryName, localFilePaths, new ProgressUpdater());
+            newDataSources.add(newDataSource.getRootDirectory());
+        } catch (TskDataException | TskCoreException ex) {
             errors.add(ex.getMessage());
-        }
-
-        if (!cancelRequested && errors.isEmpty()) {
-            progressMonitor.setProgress(100);
-            progressMonitor.setIndeterminate(false);
-        }
-
-        if (!cancelRequested) {
+        } finally {
             DataSourceProcessorCallback.DataSourceProcessorResult result;
             if (!errors.isEmpty()) {
                 result = DataSourceProcessorCallback.DataSourceProcessorResult.CRITICAL_ERRORS;
             } else {
                 result = DataSourceProcessorCallback.DataSourceProcessorResult.NO_ERRORS;
             }
-            callback.done(result, errors, dataSources);
+            callback.done(result, errors, newDataSources);
         }
     }
 
     /**
-     * Sets a cancel requested flag. Does not cancel adding the local/logical
-     * files and/or directories, but will cancel the return of the data source
-     * via the callback, if the flag is set before the run method completes.
-     */
-    public void cancelTask() {
-        cancelRequested = true;
-    }
-
-    /**
-     * Updates the progress progressMonitor with progress reported by the files
-     * manager.
+     * Updates task progress as the file manager adds the local/logical files
+     * and/or directories to the case database.
      */
     private class ProgressUpdater implements FileManager.FileAddProgressUpdater {
 
         private int count;
 
         /**
-         * @inheritDoc
+         * Updates task progress (called by the file manager after it adds each
+         * local file/directory to the case database).
          */
         @Override
         public void fileAdded(final AbstractFile file) {
             ++count;
             if (count % 10 == 0) {
-                progressMonitor.setProgressText(NbBundle.getMessage(this.getClass(),
+                progress.setProgressText(NbBundle.getMessage(this.getClass(),
                         "AddLocalFilesTask.localFileAdd.progress.text",
                         file.getParentPath(),
                         file.getName()));
diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/ImageDSProcessor.java b/Core/src/org/sleuthkit/autopsy/casemodule/ImageDSProcessor.java
index 09c8c7f7a5..be3c9466a7 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/ImageDSProcessor.java
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/ImageDSProcessor.java
@@ -31,15 +31,15 @@ import org.sleuthkit.autopsy.corecomponentinterfaces.DataSourceProcessorCallback
 import org.sleuthkit.autopsy.corecomponentinterfaces.DataSourceProcessor;
 
 /**
- * An image file data source processor with a configuration panel. This data source
- * processor implements the DataSourceProcessor service provider interface to
- * allow integration with the add data source wizard. It also provides a run
- * method overload to allow it to be used independently of the configuration UI.
+ * An image file data source processor that implements the DataSourceProcessor
+ * service provider interface to allow integration with the add data source
+ * wizard. It also provides a run method overload to allow it to be used
+ * independently of the wizard.
  */
 @ServiceProvider(service = DataSourceProcessor.class)
 public class ImageDSProcessor implements DataSourceProcessor {
 
-    private final static String dsType = NbBundle.getMessage(ImageDSProcessor.class, "ImageDSProcessor.dsType.text");
+    private final static String DATA_SOURCE_TYPE = NbBundle.getMessage(ImageDSProcessor.class, "ImageDSProcessor.dsType.text");
     private static final List<String> allExt = new ArrayList<>();
     private static final GeneralFilter rawFilter = new GeneralFilter(GeneralFilter.RAW_IMAGE_EXTS, GeneralFilter.RAW_IMAGE_DESC);
     private static final GeneralFilter encaseFilter = new GeneralFilter(GeneralFilter.ENCASE_IMAGE_EXTS, GeneralFilter.ENCASE_IMAGE_DESC);
@@ -48,12 +48,16 @@ public class ImageDSProcessor implements DataSourceProcessor {
     private static final GeneralFilter allFilter = new GeneralFilter(allExt, allDesc);
     private static final List<FileFilter> filtersList = new ArrayList<>();
     private final ImageFilePanel configPanel;
-    private String dataSourceId;
+    private AddImageTask addImageTask;
+    /*
+     * TODO: Remove the setDataSourceOptionsCalled flag and the settings fields
+     * when the deprecated method setDataSourceOptions is removed.
+     */
+    private String deviceId;
     private String imagePath;
     private String timeZone;
     private boolean ignoreFatOrphanFiles;
     private boolean setDataSourceOptionsCalled;
-    private AddImageTask addImageTask;
 
     static {
         filtersList.add(allFilter);
@@ -66,41 +70,43 @@ public class ImageDSProcessor implements DataSourceProcessor {
     }
 
     /**
-     * Constructs an image file data source processor with a configuration
-     * panel. This data source processor implements the DataSourceProcessor
-     * service provider interface to allow integration with the add data source
-     * wizard. It also provides a run method overload to allow it to be used
-     * independently of the configuration UI.
+     * Constructs an image file data source processor that implements the
+     * DataSourceProcessor service provider interface to allow integration with
+     * the add data source wizard. It also provides a run method overload to
+     * allow it to be used independently of the wizard.
      */
     public ImageDSProcessor() {
         configPanel = ImageFilePanel.createInstance(ImageDSProcessor.class.getName(), filtersList);
     }
 
     /**
-     * Gets the display name of the type of data source this type of data source
-     * processor is able to process.
+     * Gets a string that describes the type of data sources this processor is
+     * able to process.
      *
-     * @return The data source type display name.
+     * @return A string suitable for display in a data source processor
+     *         selection UI component (e.g., a combo box).
      */
     public static String getType() {
-        return dsType;
+        return DATA_SOURCE_TYPE;
     }
 
     /**
-     * Gets the display name of the type of data source this data source
-     * processor is able to process.
+     * Gets a string that describes the type of data sources this processor is
+     * able to process.
      *
-     * @return The data source type display name.
+     * @return A string suitable for display in a data source processor
+     *         selection UI component (e.g., a combo box).
      */
     @Override
     public String getDataSourceType() {
-        return dsType;
+        return DATA_SOURCE_TYPE;
     }
 
     /**
-     * Gets the a configuration panel for this data source processor.
+     * Gets the panel that allows a user to select a data source and do any
+     * configuration the data source processor may require.
      *
-     * @return JPanel The configuration panel.
+     * @return A JPanel less than 544 pixels wide and 173 pixels high.
      */
     @Override
     public JPanel getPanel() {
@@ -110,9 +116,10 @@ public class ImageDSProcessor implements DataSourceProcessor {
     }
 
     /**
-     * Indicates whether or not the inputs to the configuration panel are valid.
+     * Indicates whether the settings in the panel are valid and complete.
      *
-     * @return True or false.
+     * @return True if the settings are valid and complete and the processor is
+     *         ready to have its run method called; false otherwise.
      */
     @Override
     public boolean isPanelValid() {
@@ -120,54 +127,57 @@ public class ImageDSProcessor implements DataSourceProcessor {
     }
 
     /**
-     * Runs the data source processor using the settings from the configuration
-     * panel.
+     * Adds a data source to the case database using a separate thread and the
+     * settings provided by the panel. Returns as soon as the background task is
+     * started and uses the callback object to signal task completion and return
+     * results.
      *
-     * @param monitor Progress monitor to report progress during processing.
-     * @param cbObj   Callback to call when processing is done.
+     * NOTE: This method should not be called unless isPanelValid returns true.
+     *
+     * @param progressMonitor Progress monitor for reporting progress during
+     *                        processing.
+     * @param callback        Callback to call when processing is done.
      */
     @Override
-    public void run(DataSourceProcessorProgressMonitor monitor, DataSourceProcessorCallback cbObj) {
-        /*
-         * TODO (AUT-1867): Configuration is not currently enforced. This code
-         * assumes that the ingest panel is providing validated inputs.
-         *
-         * TODO: Remove the setDataSourceOptionsCalled when the deprecated
-         * methods setDataSourceOptions and reset are removed.
-         */
+    public void run(DataSourceProcessorProgressMonitor progressMonitor, DataSourceProcessorCallback callback) {
         if (!setDataSourceOptionsCalled) {
             configPanel.storeSettings();
-            dataSourceId = UUID.randomUUID().toString();
+            deviceId = UUID.randomUUID().toString();
             imagePath = configPanel.getContentPaths();
             timeZone = configPanel.getTimeZone();
             ignoreFatOrphanFiles = configPanel.getNoFatOrphans();
         }
-        run(dataSourceId, imagePath, timeZone, ignoreFatOrphanFiles, monitor, cbObj);
+        run(deviceId, imagePath, timeZone, ignoreFatOrphanFiles, progressMonitor, callback);
     }
 
     /**
-     * Runs the data source processor the given settings.
+     * Adds a data source to the case database using a separate thread and the
+     * given settings instead of those provided by the panel. Returns as soon as
+     * the background task is started and uses the callback object to signal
+     * task completion and return results.
      *
-     * @param dataSourceId         An ASCII-printable identifier for the data
-     *                             source that is intended to be unique across
-     *                             multiple cases (e.g., a UUID).
+     * @param deviceId             An ASCII-printable identifier for the device
+     *                             associated with the data source that is
+     *                             intended to be unique across multiple cases
+     *                             (e.g., a UUID).
      * @param imagePath            Path to the image file.
      * @param timeZone             The time zone to use when processing dates
      *                             and times for the image, obtained from
      *                             java.util.TimeZone.getID.
      * @param ignoreFatOrphanFiles Whether to parse orphans if the image has a
      *                             FAT filesystem.
-     * @param monitor              Progress monitor to report progress during
-     *                             processing.
-     * @param cbObj                Callback to call when processing is done.
+     * @param progressMonitor      Progress monitor for reporting progress
+     *                             during processing.
+     * @param callback             Callback to call when processing is done.
      */
-    public void run(String dataSourceId, String imagePath, String timeZone, boolean ignoreFatOrphanFiles, DataSourceProcessorProgressMonitor monitor, DataSourceProcessorCallback cbObj) {
-        addImageTask = new AddImageTask(dataSourceId, imagePath, timeZone, ignoreFatOrphanFiles, monitor, cbObj);
+    public void run(String deviceId, String imagePath, String timeZone, boolean ignoreFatOrphanFiles, DataSourceProcessorProgressMonitor progressMonitor, DataSourceProcessorCallback callback) {
+        addImageTask = new AddImageTask(deviceId, imagePath, timeZone, ignoreFatOrphanFiles, progressMonitor, callback);
         new Thread(addImageTask).start();
     }
 
     /**
-     * Cancels the processing of the data source.
+     * Requests cancellation of the data source processing task after it is
+     * started using the run method. Cancellation is not guaranteed.
      */
     @Override
     public void cancel() {
@@ -175,16 +185,11 @@ public class ImageDSProcessor implements DataSourceProcessor {
     }
 
     /**
-     * Resets the configuration of this data source processor, including its
-     * configuration panel.
-     *
-     * @deprecated Was only for use with setDataSourceOptions, use the
-     * appropriate overload of the run method instead.
+     * Resets the panel.
      */
-    @Deprecated
     @Override
     public void reset() {
-        dataSourceId = null;
+        deviceId = null;
         imagePath = null;
         timeZone = null;
         ignoreFatOrphanFiles = false;
@@ -203,11 +208,11 @@ public class ImageDSProcessor implements DataSourceProcessor {
      * @param ignoreFatOrphanFiles Whether to parse orphans if the image has a
      *                             FAT filesystem.
      *
-     * @deprecated Use the appropriate overload of the run method instead.
+     * @deprecated Use the provided overload of the run method instead.
      */
     @Deprecated
     public void setDataSourceOptions(String imagePath, String timeZone, boolean ignoreFatOrphanFiles) {
-        this.dataSourceId = UUID.randomUUID().toString();
+        this.deviceId = UUID.randomUUID().toString();
         this.imagePath = imagePath;
         this.timeZone = Calendar.getInstance().getTimeZone().getID();
         this.ignoreFatOrphanFiles = ignoreFatOrphanFiles;
diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/LocalDiskDSProcessor.java b/Core/src/org/sleuthkit/autopsy/casemodule/LocalDiskDSProcessor.java
index 47f257a047..cb80535e01 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/LocalDiskDSProcessor.java
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/LocalDiskDSProcessor.java
@@ -28,60 +28,65 @@ import org.sleuthkit.autopsy.corecomponentinterfaces.DataSourceProcessorProgress
 import org.sleuthkit.autopsy.corecomponentinterfaces.DataSourceProcessor;
 
 /**
- * A local drive data source processor with a configuration panel. This data
- * source processor implements the DataSourceProcessor service provider
- * interface to allow integration with the add data source wizard. It also
- * provides a run method overload to allow it to be used independently of the
- * configuration UI.
+ * A local drive data source processor that implements the DataSourceProcessor
+ * service provider interface to allow integration with the add data source
+ * wizard. It also provides a run method overload to allow it to be used
+ * independently of the wizard.
  */
 @ServiceProvider(service = DataSourceProcessor.class)
 public class LocalDiskDSProcessor implements DataSourceProcessor {
 
-    private static final String dsType = NbBundle.getMessage(LocalDiskDSProcessor.class, "LocalDiskDSProcessor.dsType.text");
+    private static final String DATA_SOURCE_TYPE = NbBundle.getMessage(LocalDiskDSProcessor.class, "LocalDiskDSProcessor.dsType.text");
     private final LocalDiskPanel configPanel;
-    private String dataSourceId;
+    private AddImageTask addDiskTask;
+    /*
+     * TODO: Remove the setDataSourceOptionsCalled flag and the settings fields
+     * when the deprecated method setDataSourceOptions is removed.
+     */
+    private String deviceId;
     private String drivePath;
     private String timeZone;
     private boolean ignoreFatOrphanFiles;
     private boolean setDataSourceOptionsCalled;
-    private AddImageTask addDiskTask;
 
     /**
-     * Constructs an image data source processor with a configuration panel.
-     * This data source processor implements the DataSourceProcessor service
-     * provider interface to allow integration with the add data source wizard.
-     * It also provides a run method overload to allow it to be used
-     * independently of the configuration UI.
+     * Constructs a local drive data source processor that implements the
+     * DataSourceProcessor service provider interface to allow integration with
+     * the add data source wizard. It also provides a run method overload to
+     * allow it to be used independently of the wizard.
      */
     public LocalDiskDSProcessor() {
         configPanel = LocalDiskPanel.getDefault();
     }
 
     /**
-     * Gets the display name of the type of data source this type of data source
-     * processor is able to process.
+     * Gets a string that describes the type of data sources this processor is
+     * able to process.
      *
-     * @return The data source type display name.
+     * @return A string suitable for display in a data source processor
+     *         selection UI component (e.g., a combo box).
      */
     public static String getType() {
-        return dsType;
+        return DATA_SOURCE_TYPE;
     }
 
     /**
-     * Gets the display name of the type of data source this data source
-     * processor is able to process.
+     * Gets a string that describes the type of data sources this processor is
+     * able to process.
      *
-     * @return The data source type display name.
+     * @return A string suitable for display in a data source processor
+     *         selection UI component (e.g., a combo box).
      */
     @Override
     public String getDataSourceType() {
-        return dsType;
+        return DATA_SOURCE_TYPE;
     }
 
     /**
-     * Gets the a configuration panel for this data source processor.
+     * Gets the JPanel that allows a user to select a data source and do any
+     * configuration the data source processor may require.
      *
-     * @return JPanel The configuration panel.
+     * @return A JPanel less than 544 pixels wide and 173 pixels high.
      */
     @Override
     public JPanel getPanel() {
@@ -90,9 +95,10 @@ public class LocalDiskDSProcessor implements DataSourceProcessor {
     }
 
     /**
-     * Indicates whether or not the inputs to the configuration panel are valid.
+     * Indicates whether the settings in the panel are valid and complete.
      *
-     * @return True or false.
+     * @return True if the settings are valid and complete and the processor is
+     *         ready to have its run method called; false otherwise.
      */
     @Override
     public boolean isPanelValid() {
@@ -100,55 +106,57 @@ public class LocalDiskDSProcessor implements DataSourceProcessor {
     }
 
     /**
-     * Runs the data source processor using the settings from the configuration
-     * panel.
+     * Adds a data source to the case database using a separate thread and the
+     * settings provided by the panel. Returns as soon as the background task is
+     * started and uses the callback object to signal task completion and return
+     * results.
      *
-     * @param progressMonitor Progress monitor to report progress during
+     * NOTE: This method should not be called unless isPanelValid returns true.
+     *
+     * @param progressMonitor Progress monitor for reporting progress during
      *                        processing.
-     * @param cbObj           Callback to call when processing is done.
+     * @param callback        Callback to call when processing is done.
      */
     @Override
-    public void run(DataSourceProcessorProgressMonitor progressMonitor, DataSourceProcessorCallback cbObj) {
-        /*
-         * TODO (AUT-1867): Configuration is not currently enforced. This code
-         * assumes that the ingest panel is providing validated inputs.
-         *
-         * TODO: Remove the setDataSourceOptionsCalled when the deprecated
-         * methods setDataSourceOptions and reset are removed.
-         */
+    public void run(DataSourceProcessorProgressMonitor progressMonitor, DataSourceProcessorCallback callback) {
         if (!setDataSourceOptionsCalled) {
-            dataSourceId = UUID.randomUUID().toString();
+            deviceId = UUID.randomUUID().toString();
             drivePath = configPanel.getContentPaths();
             timeZone = configPanel.getTimeZone();
             ignoreFatOrphanFiles = configPanel.getNoFatOrphans();
         }
-        addDiskTask = new AddImageTask(dataSourceId, drivePath, timeZone, ignoreFatOrphanFiles, progressMonitor, cbObj);
+        addDiskTask = new AddImageTask(deviceId, drivePath, timeZone, ignoreFatOrphanFiles, progressMonitor, callback);
         new Thread(addDiskTask).start();
     }
 
     /**
-     * Runs the data source processor the given settings.
+     * Adds a data source to the case database using a separate thread and the
+     * given settings instead of those provided by the panel. Returns as soon as
+     * the background task is started and uses the callback object to signal
+     * task completion and return results.
      *
-     * @param dataSourceId         An ASCII-printable identifier for the data
-     *                             source that is intended to be unique across
-     *                             multiple cases (e.g., a UUID).
+     * @param deviceId             An ASCII-printable identifier for the device
+     *                             associated with the data source that is
+     *                             intended to be unique across multiple cases
+     *                             (e.g., a UUID).
      * @param drivePath            Path to the local drive.
      * @param timeZone             The time zone to use when processing dates
      *                             and times for the image, obtained from
      *                             java.util.TimeZone.getID.
      * @param ignoreFatOrphanFiles Whether to parse orphans if the image has a
      *                             FAT filesystem.
-     * @param monitor              Progress monitor to report progress during
-     *                             processing.
-     * @param cbObj                Callback to call when processing is done.
+     * @param progressMonitor      Progress monitor for reporting progress
+     *                             during processing.
+     * @param callback             Callback to call when processing is done.
      */
-    public void run(String dataSourceId, String drivePath, String timeZone, boolean ignoreFatOrphanFiles, DataSourceProcessorProgressMonitor monitor, DataSourceProcessorCallback cbObj) {
-        addDiskTask = new AddImageTask(dataSourceId, drivePath, timeZone, ignoreFatOrphanFiles, monitor, cbObj);
+    public void run(String deviceId, String drivePath, String timeZone, boolean ignoreFatOrphanFiles, DataSourceProcessorProgressMonitor progressMonitor, DataSourceProcessorCallback callback) {
+        addDiskTask = new AddImageTask(deviceId, drivePath, timeZone, ignoreFatOrphanFiles, progressMonitor, callback);
         new Thread(addDiskTask).start();
     }
 
     /**
-     * Cancels the processing of the data source.
+     * Requests cancellation of the data source processing task after it is
+     * started using the run method. Cancellation is not guaranteed.
      */
     @Override
     public void cancel() {
@@ -156,16 +164,12 @@ public class LocalDiskDSProcessor implements DataSourceProcessor {
     }
 
     /**
-     * Resets the configuration of this data source processor, including its
-     * configuration panel.
-     *
-     * @deprecated Was only for use with setDataSourceOptions, use the
-     * appropriate overload of the run method instead.
+     * Resets the panel.
      */
     @Override
     public void reset() {
         configPanel.reset();
-        dataSourceId = null;
+        deviceId = null;
         drivePath = null;
         timeZone = null;
         ignoreFatOrphanFiles = false;
@@ -183,11 +187,11 @@ public class LocalDiskDSProcessor implements DataSourceProcessor {
      * @param ignoreFatOrphanFiles Whether to parse orphans if the image has a
      *                             FAT filesystem.
      *
-     * @deprecated Use the appropriate overload of the run method instead.
+     * @deprecated Use the provided overload of the run method instead.
      */
     @Deprecated
     public void setDataSourceOptions(String drivePath, String timeZone, boolean ignoreFatOrphanFiles) {
-        this.dataSourceId = UUID.randomUUID().toString();
+        this.deviceId = UUID.randomUUID().toString();
         this.drivePath = drivePath;
         this.timeZone = Calendar.getInstance().getTimeZone().getID();
         this.ignoreFatOrphanFiles = ignoreFatOrphanFiles;
diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/LocalFilesDSProcessor.java b/Core/src/org/sleuthkit/autopsy/casemodule/LocalFilesDSProcessor.java
index d03a3dbe33..6d5c028cbb 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/LocalFilesDSProcessor.java
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/LocalFilesDSProcessor.java
@@ -18,7 +18,6 @@
  */
 package org.sleuthkit.autopsy.casemodule;
 
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.UUID;
@@ -30,58 +29,62 @@ import org.sleuthkit.autopsy.corecomponentinterfaces.DataSourceProcessorProgress
 import org.sleuthkit.autopsy.corecomponentinterfaces.DataSourceProcessor;
 
 /**
- * A local/logical files and/or directories data source processor with a
- * configuration panel. This data source processor implements the
- * DataSourceProcessor service provider interface to allow integration with the
- * add data source wizard. It also provides a run method overload to allow it to
- * be used independently of the configuration UI.
+ * A local/logical files and/or directories data source processor that
+ * implements the DataSourceProcessor service provider interface to allow
+ * integration with the add data source wizard. It also provides a run method
+ * overload to allow it to be used independently of the wizard.
  */
 @ServiceProvider(service = DataSourceProcessor.class)
 public class LocalFilesDSProcessor implements DataSourceProcessor {
 
-    private static final String dsType = NbBundle.getMessage(LocalFilesDSProcessor.class, "LocalFilesDSProcessor.dsType");
+    private static final String DATA_SOURCE_TYPE = NbBundle.getMessage(LocalFilesDSProcessor.class, "LocalFilesDSProcessor.dsType");
     private final LocalFilesPanel configPanel;
+    /*
+     * TODO: Remove the setDataSourceOptionsCalled flag and the settings fields
+     * when the deprecated method setDataSourceOptions is removed.
+     */
     private String deviceId;
-    private List<String> paths;
-    private boolean configured;
-    private AddLocalFilesTask addFilesTask;
+    private List<String> localFilePaths;
+    private boolean setDataSourceOptionsCalled;
 
     /**
      * Constructs a local/logical files and/or directories data source processor
-     * with a configuration panel. This data source processor implements the
-     * DataSourceProcessor service provider interface to allow integration with
-     * the add data source wizard. It also provides a run method overload to
-     * allow it to be used independently of the configuration UI.
+     * that implements the DataSourceProcessor service provider interface to
+     * allow integration with the add data source wizard. It also provides a run
+     * method overload to allow it to be used independently of the wizard.
      */
     public LocalFilesDSProcessor() {
         configPanel = LocalFilesPanel.getDefault();
     }
 
     /**
-     * Gets the display name of the type of data source this type of data source
-     * processor is able to process.
+     * Gets a string that describes the type of data sources this processor is
+     * able to process.
      *
-     * @return The data source type display name.
+     * @return A string suitable for display in a data source processor
+     *         selection UI component (e.g., a combo box).
      */
     public static String getType() {
-        return dsType;
+        return DATA_SOURCE_TYPE;
     }
 
     /**
-     * Gets the display name of the type of data source this data source
-     * processor is able to process.
+     * Gets a string that describes the type of data sources this processor is
+     * able to process.
      *
-     * @return The data source type display name.
+     * @return A string suitable for display in a data source processor
+     *         selection UI component (e.g., a combo box).
      */
     @Override
     public String getDataSourceType() {
-        return dsType;
+        return DATA_SOURCE_TYPE;
     }
 
     /**
-     * Gets the a configuration panel for this data source processor.
+     * Gets the panel that allows a user to select a data source and do any
+     * configuration the data source processor may require.
      *
-     * @return JPanel The configuration panel.
+     * @return A JPanel less than 544 pixels wide and 173 pixels high.
      */
     @Override
     public JPanel getPanel() {
@@ -90,11 +93,10 @@ public class LocalFilesDSProcessor implements DataSourceProcessor {
     }
 
     /**
-     * Validates the data collected by the JPanel
-     *
-     * @return String returns NULL if success, error string if there is any
-     *         errors
+     * Indicates whether the settings in the panel are valid and complete.
      *
+     * @return True if the settings are valid and complete and the processor is
+     *         ready to have its run method called; false otherwise.
      */
     @Override
     public boolean isPanelValid() {
@@ -102,62 +104,71 @@ public class LocalFilesDSProcessor implements DataSourceProcessor {
     }
 
     /**
-     * Runs the data source processor in a separate thread. Should only be
-     * called after further configuration has been completed.
+     * Adds a data source to the case database using a separate thread and the
+     * settings provided by the panel. Returns as soon as the background task is
+     * started and uses the callback object to signal task completion and return
+     * results.
      *
-     * @param monitor Progress monitor to report progress during processing.
-     * @param cbObj   Callback to call when processing is done.
+     * NOTE: This method should not be called unless isPanelValid returns true.
+     *
+     * @param progressMonitor Progress monitor for reporting progress during
+     *                        processing.
+     * @param callback        Callback to call when processing is done.
      */
     @Override
-    public void run(DataSourceProcessorProgressMonitor monitor, DataSourceProcessorCallback cbObj) {
-        if (!configured) {
-            if (null == deviceId) {
-                deviceId = UUID.randomUUID().toString();
-            }
-            paths = Arrays.asList(configPanel.getContentPaths().split(LocalFilesPanel.FILES_SEP));
-            configured = true;
+    public void run(DataSourceProcessorProgressMonitor progressMonitor, DataSourceProcessorCallback callback) {
+        if (!setDataSourceOptionsCalled) {
+            deviceId = UUID.randomUUID().toString();
+            localFilePaths = Arrays.asList(configPanel.getContentPaths().split(LocalFilesPanel.FILES_SEP));
         }
-        addFilesTask = new AddLocalFilesTask(deviceId, paths, monitor, cbObj);
-        new Thread(addFilesTask).start();
+        run(deviceId, "", localFilePaths, progressMonitor, callback);
     }
 
     /**
-     * Runs the data source processor in a separate thread without requiring use
-     * the configuration panel.
+     * Adds a data source to the case database using a separate thread and the
+     * given settings instead of those provided by the panel. Returns as soon as
+     * the background task is started and uses the callback object to signal
+     * task completion and return results.
      *
-     * @param dataSourceId An ASCII-printable identifier for the device
-     *                     associated with the data source, in this case a group
-     *                     of local/logical files, that is intended to be unique
-     *                     across multiple cases (e.g., a UUID).
-     * @param paths        A list of local/logical file and/or directory paths.
-     * @param monitor      Progress monitor to report progress during
-     *                     processing.
-     * @param cbObj        Callback to call when processing is done.
+     * @param deviceId                 An ASCII-printable identifier for the
+     *                                 device associated with the data source
+     *                                 that is intended to be unique across
+     *                                 multiple cases (e.g., a UUID).
+     * @param rootVirtualDirectoryName The name to give to the virtual directory
+     *                                 that will serve as the root for the
+     *                                 local/logical files and/or directories
+     *                                 that compose the data source. Pass the
+     *                                 empty string to get a default name of the
+     *                                 form: LogicalFileSet[N]
+     * @param localFilePaths           A list of local/logical file and/or
+     *                                 directory localFilePaths.
+     * @param progressMonitor          Progress monitor for reporting progress
+     *                                 during processing.
+     * @param callback                 Callback to call when processing is done.
      */
-    public void run(String deviceId, List<String> paths, DataSourceProcessorProgressMonitor monitor, DataSourceProcessorCallback cbObj) {
-        this.deviceId = deviceId;
-        this.paths = new ArrayList<>(paths);
-        configured = true;
-        run(monitor, cbObj);
+    public void run(String deviceId, String rootVirtualDirectoryName, List<String> localFilePaths, DataSourceProcessorProgressMonitor progressMonitor, DataSourceProcessorCallback callback) {
+        new Thread(new AddLocalFilesTask(deviceId, rootVirtualDirectoryName, localFilePaths, progressMonitor, callback)).start();
     }
 
     /**
-     * Cancels the processing of the data source.
+     * Requests cancellation of the data source processing task after it is
+     * started using the run method. Cancellation is not guaranteed.
      */
     @Override
     public void cancel() {
-        addFilesTask.cancelTask();
+        /*
+         * Cancellation is not currently supported.
+         */
     }
 
     /**
-     * Resets the configuration of this data source processor, including its
-     * configuration panel.
+     * Resets the panel.
      */
     @Override
     public void reset() {
         configPanel.reset();
-        paths = null;
-        configured = false;
+        localFilePaths = null;
+        setDataSourceOptionsCalled = false;
     }
 
     /**
@@ -166,14 +177,15 @@ public class LocalFilesDSProcessor implements DataSourceProcessor {
      * data source and will use the time zone of the machine executing this code
      * when when processing dates and times for the image.
      *
-     * @param paths A list of local/logical file and/or directory paths.
+     * @param paths A list of local/logical file and/or directory
+     *              localFilePaths.
      *
-     * @deprecated Use the run method instead.
+     * @deprecated Use the provided overload of the run method instead.
      */
     @Deprecated
     public void setDataSourceOptions(String paths) {
-        this.paths = Arrays.asList(configPanel.getContentPaths().split(LocalFilesPanel.FILES_SEP));
-        configured = true;
+        this.localFilePaths = Arrays.asList(configPanel.getContentPaths().split(LocalFilesPanel.FILES_SEP));
+        setDataSourceOptionsCalled = true;
     }
 
 }
diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/services/FileManager.java b/Core/src/org/sleuthkit/autopsy/casemodule/services/FileManager.java
index 48f19e6581..b294e825a1 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/services/FileManager.java
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/services/FileManager.java
@@ -43,9 +43,11 @@ import org.sleuthkit.datamodel.TskCoreException;
 import org.sleuthkit.datamodel.TskFileRange;
 import org.sleuthkit.datamodel.VirtualDirectory;
 import org.sleuthkit.datamodel.CarvedFileContainer;
+import org.sleuthkit.datamodel.LocalFilesDataSource;
+import org.sleuthkit.datamodel.TskDataException;
 
 /**
- * Abstraction to facilitate access to files and directories.
+ * Abstraction to facilitate access to localFiles and directories.
  */
 public class FileManager implements Closeable {
 
@@ -77,19 +79,20 @@ public class FileManager implements Closeable {
         }
 
     }
-    
+
     /**
-     * Finds a set of files that meets the name criteria in all data sources in the current case.
+     * Finds a set of localFiles that meets the name criteria in all data
+     * sources in the current case.
      *
-     * @param fileName   Pattern of the name of the file or directory to match
-     *                   (case insensitive, used in LIKE SQL statement).
+     * @param fileName Pattern of the name of the file or directory to match
+     *                 (case insensitive, used in LIKE SQL statement).
      *
-     * @return a list of AbstractFile for files/directories whose name matches
-     *         the given fileName
+     * @return a list of AbstractFile for localFiles/directories whose name
+     *         matches the given fileName
      */
     public synchronized List<AbstractFile> findFiles(String fileName) throws TskCoreException {
         List<AbstractFile> result = new ArrayList<>();
-        
+
         if (tskCase == null) {
             throw new TskCoreException(NbBundle.getMessage(this.getClass(), "FileManager.findFiles.exception.msg"));
         }
@@ -101,20 +104,21 @@ public class FileManager implements Closeable {
     }
 
     /**
-     * Finds a set of files that meets the name criteria in all data sources in the current case.
+     * Finds a set of localFiles that meets the name criteria in all data
+     * sources in the current case.
      *
-     * @param fileName   Pattern of the name of the file or directory to match
-     *                   (case insensitive, used in LIKE SQL statement).
-     * @param dirName    Pattern of the name of the parent directory to use as
-     *                   the root of the search (case insensitive, used in LIKE
-     *                   SQL statement).
+     * @param fileName Pattern of the name of the file or directory to match
+     *                 (case insensitive, used in LIKE SQL statement).
+     * @param dirName  Pattern of the name of the parent directory to use as the
+     *                 root of the search (case insensitive, used in LIKE SQL
+     *                 statement).
      *
-     * @return a list of AbstractFile for files/directories whose name matches
-     *         fileName and whose parent directory contains dirName.
+     * @return a list of AbstractFile for localFiles/directories whose name
+     *         matches fileName and whose parent directory contains dirName.
      */
     public synchronized List<AbstractFile> findFiles(String fileName, String dirName) throws TskCoreException {
         List<AbstractFile> result = new ArrayList<>();
-        
+
         if (tskCase == null) {
             throw new TskCoreException(NbBundle.getMessage(this.getClass(), "FileManager.findFiles2.exception.msg"));
         }
@@ -126,39 +130,40 @@ public class FileManager implements Closeable {
     }
 
     /**
-     * Finds a set of files that meets the name criteria in all data sources in the current case.
+     * Finds a set of localFiles that meets the name criteria in all data
+     * sources in the current case.
      *
      * @param fileName   Pattern of the name of the file or directory to match
      *                   (case insensitive, used in LIKE SQL statement).
      * @param parentFile Object of root/parent directory to restrict search to.
      *
-     * @return a list of AbstractFile for files/directories whose name matches
-     *         fileName and that were inside a directory described by
+     * @return a list of AbstractFile for localFiles/directories whose name
+     *         matches fileName and that were inside a directory described by
      *         parentFsContent.
      */
     public synchronized List<AbstractFile> findFiles(String fileName, AbstractFile parentFile) throws TskCoreException {
         List<AbstractFile> result = new ArrayList<>();
-        
+
         if (tskCase == null) {
             throw new TskCoreException(NbBundle.getMessage(this.getClass(), "FileManager.findFiles3.exception.msg"));
         }
         List<Content> dataSources = tskCase.getRootObjects();
         for (Content dataSource : dataSources) {
-          result.addAll(findFiles(dataSource, fileName, parentFile));
+            result.addAll(findFiles(dataSource, fileName, parentFile));
         }
         return result;
     }
 
     /**
-     * Finds a set of files that meets the name criteria.
+     * Finds a set of localFiles that meets the name criteria.
      *
      * @param dataSource Root data source to limit search results to (Image,
      *                   VirtualDirectory, etc.).
      * @param fileName   Pattern of the name of the file or directory to match
      *                   (case insensitive, used in LIKE SQL statement).
      *
-     * @return a list of AbstractFile for files/directories whose name matches
-     *         the given fileName
+     * @return a list of AbstractFile for localFiles/directories whose name
+     *         matches the given fileName
      */
     public synchronized List<AbstractFile> findFiles(Content dataSource, String fileName) throws TskCoreException {
         if (tskCase == null) {
@@ -168,7 +173,7 @@ public class FileManager implements Closeable {
     }
 
     /**
-     * Finds a set of files that meets the name criteria.
+     * Finds a set of localFiles that meets the name criteria.
      *
      * @param dataSource Root data source to limit search results to (Image,
      *                   VirtualDirectory, etc.).
@@ -178,8 +183,8 @@ public class FileManager implements Closeable {
      *                   the root of the search (case insensitive, used in LIKE
      *                   SQL statement).
      *
-     * @return a list of AbstractFile for files/directories whose name matches
-     *         fileName and whose parent directory contains dirName.
+     * @return a list of AbstractFile for localFiles/directories whose name
+     *         matches fileName and whose parent directory contains dirName.
      */
     public synchronized List<AbstractFile> findFiles(Content dataSource, String fileName, String dirName) throws TskCoreException {
         if (tskCase == null) {
@@ -189,7 +194,7 @@ public class FileManager implements Closeable {
     }
 
     /**
-     * Finds a set of files that meets the name criteria.
+     * Finds a set of localFiles that meets the name criteria.
      *
      * @param dataSource Root data source to limit search results to (Image,
      *                   VirtualDirectory, etc.).
@@ -197,8 +202,8 @@ public class FileManager implements Closeable {
      *                   (case insensitive, used in LIKE SQL statement).
      * @param parentFile Object of root/parent directory to restrict search to.
      *
-     * @return a list of AbstractFile for files/directories whose name matches
-     *         fileName and that were inside a directory described by
+     * @return a list of AbstractFile for localFiles/directories whose name
+     *         matches fileName and that were inside a directory described by
      *         parentFsContent.
      */
     public synchronized List<AbstractFile> findFiles(Content dataSource, String fileName, AbstractFile parentFile) throws TskCoreException {
@@ -210,7 +215,7 @@ public class FileManager implements Closeable {
 
     /**
      * @param dataSource data source Content (Image, parent-less
-     *                   VirtualDirectory) where to find files
+     *                   VirtualDirectory) where to find localFiles
      * @param filePath   The full path to the file(s) of interest. This can
      *                   optionally include the image and volume names.
      *
@@ -292,14 +297,14 @@ public class FileManager implements Closeable {
     }
 
     /**
-     * Adds a collection of carved files to the VirtualDirectory '$CarvedFiles'
-     * in the volume or image given by systemId. Creates $CarvedFiles if it does
-     * not exist already.
+     * Adds a collection of carved localFiles to the VirtualDirectory
+     * '$CarvedFiles' in the volume or image given by systemId. Creates
+     * $CarvedFiles if it does not exist already.
      *
-     * @param filesToAdd a list of CarvedFileContainer files to add as carved
-     *                   files
+     * @param filesToAdd a list of CarvedFileContainer localFiles to add as
+     *                   carved localFiles
      *
-     * @return List<LayoutFile> This is a list of the files added to the
+     * @return List<LayoutFile> This is a list of the localFiles added to the
      *         database
      *
      * @throws org.sleuthkit.datamodel.TskCoreException
@@ -328,9 +333,10 @@ public class FileManager implements Closeable {
     }
 
     /**
-     * Add a set of local/logical files and dirs.
+     * Add a set of local/logical localFiles and dirs.
      *
-     * @param localAbsPaths      list of absolute paths to local files and dirs
+     * @param localAbsPaths      list of absolute paths to local localFiles and
+     *                           dirs
      * @param addProgressUpdater notifier to receive progress notifications on
      *                           folders added, or null if not used
      *
@@ -345,22 +351,15 @@ public class FileManager implements Closeable {
      *                          encountered.
      */
     public synchronized VirtualDirectory addLocalFilesDirs(List<String> localAbsPaths, FileAddProgressUpdater addProgressUpdater) throws TskCoreException {
-        final List<java.io.File> rootsToAdd = new ArrayList<>();
-        //first validate all the inputs before any additions
-        for (String absPath : localAbsPaths) {
-            java.io.File localFile = new java.io.File(absPath);
-            if (!localFile.exists() || !localFile.canRead()) {
-                String msg = NbBundle
-                        .getMessage(this.getClass(), "FileManager.addLocalFilesDirs.exception.notReadable.msg",
-                                localFile.getAbsolutePath());
-                logger.log(Level.SEVERE, msg);
-                throw new TskCoreException(msg);
-            }
-            rootsToAdd.add(localFile);
+        List<java.io.File> rootsToAdd;
+        try {
+            rootsToAdd = getFilesAndDirectories(localAbsPaths);
+        } catch (TskDataException ex) {
+            throw new TskCoreException(ex.getLocalizedMessage(), ex);
         }
 
         CaseDbTransaction trans = tskCase.beginTransaction();
-        // make a virtual top-level directory for this set of files/dirs
+        // make a virtual top-level directory for this set of localFiles/dirs
         final VirtualDirectory fileSetRootDir = addLocalFileSetRootDir(trans);
 
         try {
@@ -391,53 +390,93 @@ public class FileManager implements Closeable {
         return fileSetRootDir;
     }
 
-    public synchronized VirtualDirectory addLocalFilesAndDirs(List<String> localAbsPaths, FileAddProgressUpdater progressUpdater) throws TskCoreException {
-        final List<java.io.File> rootsToAdd = new ArrayList<>();
-        //first validate all the inputs before any additions
-        for (String absPath : localAbsPaths) {
-            java.io.File localFile = new java.io.File(absPath);
-            if (!localFile.exists() || !localFile.canRead()) {
-                String msg = NbBundle
-                        .getMessage(this.getClass(), "FileManager.addLocalFilesDirs.exception.notReadable.msg",
-                                localFile.getAbsolutePath());
-                logger.log(Level.SEVERE, msg);
-                throw new TskCoreException(msg);
-            }
-            rootsToAdd.add(localFile);
-        }
-
-        CaseDbTransaction trans = tskCase.beginTransaction();
-        // make a virtual top-level directory for this set of files/dirs
-        final VirtualDirectory fileSetRootDir = addLocalFileSetRootDir(trans);
-
+    /**
+     * Adds a set of local/logical files and/or directories to the case database
+     * as data source.
+     *
+     * @param deviceId                 An ASCII-printable identifier for the
+     *                                 device associated with the data source
+     *                                 that is intended to be unique across
+     *                                 multiple cases (e.g., a UUID).
+     * @param rootVirtualDirectoryName The name to give to the virtual directory
+     *                                 that will serve as the root for the
+     *                                 local/logical files and/or directories
+     *                                 that compose the data source. Pass the
+     *                                 empty string to get a default name of the
+     *                                 form: LogicalFileSet[N]
+     * @param localFilePaths           A list of local/logical file and/or
+     *                                 directory localFilePaths.
+     * @param progressUpdater          Called after each file/directory is added
+     *                                 to the case database.
+     *
+     * @return A local files data source object.
+     *
+     * @throws TskCoreException If there is a problem completing a database
+     *                          operation.
+     * @throws TskDataException if any of the local file paths is for a file or
+     *                          directory that does not exist or cannot be read.
+     */
+    public synchronized LocalFilesDataSource addLocalFilesDataSource(String deviceId, String rootVirtualDirectoryName, List<String> localFilePaths, FileAddProgressUpdater progressUpdater) throws TskCoreException, TskDataException {
+        List<java.io.File> localFiles = getFilesAndDirectories(localFilePaths);
+        CaseDbTransaction trans = null;
         try {
-            // recursively add each item in the set
-            for (java.io.File localRootToAdd : rootsToAdd) {
-                AbstractFile localFileAdded = addLocalDirInt(trans, fileSetRootDir, localRootToAdd, progressUpdater);
-
-                if (localFileAdded == null) {
-                    String msg = NbBundle
-                            .getMessage(this.getClass(), "FileManager.addLocalFilesDirs.exception.cantAdd.msg",
-                                    localRootToAdd.getAbsolutePath());
-                    logger.log(Level.SEVERE, msg);
-                    throw new TskCoreException(msg);
+            String rootDirectoryName = rootVirtualDirectoryName;
+            int newLocalFilesSetCount = curNumFileSets + 1;
+            if (rootVirtualDirectoryName.isEmpty()) {
+                rootDirectoryName = VirtualDirectoryNode.LOGICAL_FILE_SET_PREFIX + newLocalFilesSetCount;
+            }
+            trans = tskCase.beginTransaction();
+            LocalFilesDataSource dataSource = tskCase.addLocalFilesDataSource(deviceId, rootDirectoryName, trans);
+            VirtualDirectory rootDirectory = dataSource.getRootDirectory();
+            List<AbstractFile> filesAdded = new ArrayList<>();
+            for (java.io.File localFile : localFiles) {
+                AbstractFile fileAdded = addLocalDirInt(trans, rootDirectory, localFile, progressUpdater);
+                if (null != fileAdded) {
+                    filesAdded.add(fileAdded);
                 } else {
-                    //added.add(localFileAdded);
-                    //send new content event
-                    //for now reusing ingest events, in future this will be replaced by datamodel / observer sending out events
-                    // @@@ Is this the right place for this? A directory tree refresh will be triggered, so this may be creating a race condition
-                    // since the transaction is not yet committed.   
-                    IngestServices.getInstance().fireModuleContentEvent(new ModuleContentEvent(localFileAdded));
+                    throw new TskCoreException(NbBundle.getMessage(this.getClass(), "FileManager.addLocalFilesDirs.exception.cantAdd.msg", localFile.getAbsolutePath()));
                 }
             }
-
             trans.commit();
+            if (rootVirtualDirectoryName.isEmpty()) {
+                curNumFileSets = newLocalFilesSetCount;
+            }
+            for (AbstractFile fileAdded : filesAdded) {
+                IngestServices.getInstance().fireModuleContentEvent(new ModuleContentEvent(fileAdded));
+            }
+            return dataSource;
         } catch (TskCoreException ex) {
-            trans.rollback();
+            if (null != trans) {
+                trans.rollback();
+            }
+            throw ex;
         }
-        return fileSetRootDir;
-    }    
-    
+    }
+
+    /**
+     * Converts a list of local/logical file and/or directory paths to a list of
+     * file objects.
+     *
+     * @param localFilePaths A list of local/logical file and/or directory
+     *                       paths.
+     *
+     * @return A list of file objects.
+     *
+     * @throws TskDataException if any of the paths is for a file or directory
+     *                          that does not exist or cannot be read.
+     */
+    private List<java.io.File> getFilesAndDirectories(List<String> localFilePaths) throws TskDataException {
+        List<java.io.File> localFiles = new ArrayList<>();
+        for (String path : localFilePaths) {
+            java.io.File localFile = new java.io.File(path);
+            if (!localFile.exists() || !localFile.canRead()) {
+                throw new TskDataException(NbBundle.getMessage(this.getClass(), "FileManager.addLocalFilesDirs.exception.notReadable.msg", localFile.getAbsolutePath()));
+            }
+            localFiles.add(localFile);
+        }
+        return localFiles;
+    }
+
     /**
      * Adds a new virtual directory root object with FileSet X name and
      * consecutive sequence number characteristic to every add operation
diff --git a/Core/src/org/sleuthkit/autopsy/corecomponentinterfaces/DataSourceProcessor.java b/Core/src/org/sleuthkit/autopsy/corecomponentinterfaces/DataSourceProcessor.java
index f3fedd6be2..0d970049cf 100644
--- a/Core/src/org/sleuthkit/autopsy/corecomponentinterfaces/DataSourceProcessor.java
+++ b/Core/src/org/sleuthkit/autopsy/corecomponentinterfaces/DataSourceProcessor.java
@@ -1,7 +1,7 @@
 /*
  * Autopsy Forensic Browser
  *
- * Copyright 2011-2014 Basis Technology Corp.
+ * Copyright 2011-2016 Basis Technology Corp.
  * Contact: carrier <at> sleuthkit <dot> org
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -21,68 +21,91 @@ package org.sleuthkit.autopsy.corecomponentinterfaces;
 import javax.swing.JPanel;
 
 /**
- * Interface used by the Add DataSource wizard to allow different types of data
- * sources to be added to a case. Examples of data sources include disk images,
- * local files, etc.
+ * Interface implemented by classes that add data sources of a particular type
+ * (e.g., images, local disks, virtual directories of local/logical files, etc.)
+ * to a case database. A data source processor is NOT responsible for analyzing
+ * the data source (running ingest modules on the data source and its contents).
  *
- * The interface provides a uniform mechanism for the Autopsy UI to: - Collect
- * details from the user about the data source to be processed. - Process the
- * data source in the background and add data to the database - Provides
- * progress feedback to the user / UI.
+ * Data source processors plug in to the add data source wizard and should
+ * provide a JPanel to allow a user to select a data source and do any
+ * configuration the data source processor may require. The panel should support
+ * addition of the add data source wizard as a property change listener and
+ * should fire DSP_PANEL_EVENT property changes to communicate with the wizard.
+ *
+ * Data source processors should perform all processing on a separate thread,
+ * reporting results using a callback object.
  */
 public interface DataSourceProcessor {
 
     /**
-     * The DSP Panel may fire Property change events The caller must enure to
-     * add itself as a listener and then react appropriately to the events
+     * Property change events fired to communicate with the add data source
+     * wizard.
+     *
+     * TODO (AUT-1891): What is needed is a single PANEL_CHANGED event so that
+     * the wizard can call isPanelValid and set the enabling and focus of the
+     * next button based on the result.
      */
     enum DSP_PANEL_EVENT {
 
-        UPDATE_UI, ///< the content of JPanel has changed that MAY warrant updates to the caller UI
-        FOCUS_NEXT  ///< the caller UI may move focus the the next UI element, following the panel.
+        /**
+         * Fire this event when the user changes something in the panel to
+         * notify the add data source wizard that it should call isPanelValid.
+         */
+        UPDATE_UI,
+        /**
+         * Fire this event to make the add data source wizard move focus to the
+         * next button.
+         */
+        FOCUS_NEXT
     };
 
     /**
-     * Returns the type of Data Source it handles. This name gets displayed in
-     * the drop-down listbox
+     * Gets a string that describes the type of data sources this processor is
+     * able to process.
+     *
+     * @return A string suitable for display in a data source processor
+     *         selection UI component (e.g., a combo box).
      */
     String getDataSourceType();
 
     /**
-     * Returns the picker panel to be displayed along with any other runtime
-     * options supported by the data source handler. The DSP is responsible for
-     * storing the settings so that a later call to run() will have the
-     * user-specified settings.
+     * Gets the panel that allows a user to select a data source and do any
+     * configuration the data source processor may require.
      *
-     * Should be less than 544 pixels wide and 173 pixels high.
+     * @return A JPanel less than 544 pixels wide and 173 pixels high.
      */
     JPanel getPanel();
 
     /**
-     * Called to validate the input data in the panel. Returns true if no
-     * errors, or Returns false if there is an error.
+     * Indicates whether the settings in the panel are valid and complete.
+     *
+     * @return True if the settings are valid and complete and the processor is
+     *         ready to have its run method called; false otherwise.
      */
     boolean isPanelValid();
 
     /**
-     * Called to invoke the handling of data source in the background. Returns
-     * after starting the background thread.
+     * Adds a data source to the case database using a separate thread and the
+     * settings provided by the panel. Returns as soon as the background task is
+     * started and uses the callback object to signal task completion and return
+     * results.
      *
-     * @param progressPanel progress panel to be updated while processing
-     * @param dspCallback   Contains the callback method
-     *                      DataSourceProcessorCallback.done() that the DSP must
-     *                      call when the background thread finishes with errors
-     *                      and status.
+     * NOTE: This method should not be called unless isPanelValid returns true.
+     *
+     * @param progressMonitor Progress monitor for reporting progress during
+     *                        processing.
+     * @param callback        Callback to call when processing is done.
      */
-    void run(DataSourceProcessorProgressMonitor progressPanel, DataSourceProcessorCallback dspCallback);
+    void run(DataSourceProcessorProgressMonitor progressMonitor, DataSourceProcessorCallback callback);
 
     /**
-     * Called to cancel the background processing.
+     * Requests cancellation of the data source processing task after it is
+     * started using the run method. Cancellation is not guaranteed.
      */
     void cancel();
 
     /**
-     * Called to reset/reinitialize the DSP.
+     * Resets the panel.
      */
     void reset();
 }
diff --git a/Core/src/org/sleuthkit/autopsy/modules/vmextractor/VMExtractorIngestModule.java b/Core/src/org/sleuthkit/autopsy/modules/vmextractor/VMExtractorIngestModule.java
index 7e46777f8e..790e47410d 100644
--- a/Core/src/org/sleuthkit/autopsy/modules/vmextractor/VMExtractorIngestModule.java
+++ b/Core/src/org/sleuthkit/autopsy/modules/vmextractor/VMExtractorIngestModule.java
@@ -31,6 +31,7 @@ import java.util.List;
 import java.util.UUID;
 import java.util.logging.Level;
 import org.openide.util.NbBundle;
+import org.openide.util.NbBundle.Messages;
 import org.sleuthkit.autopsy.casemodule.Case;
 import org.sleuthkit.autopsy.casemodule.GeneralFilter;
 import org.sleuthkit.autopsy.casemodule.ImageDSProcessor;
@@ -52,6 +53,7 @@ import org.sleuthkit.datamodel.Content;
 import org.sleuthkit.datamodel.DataSource;
 import org.sleuthkit.datamodel.SleuthkitCase;
 import org.sleuthkit.datamodel.TskCoreException;
+import org.sleuthkit.datamodel.TskDataException;
 
 /**
  * An ingest module that extracts virtual machine files and adds them to a case
@@ -62,11 +64,12 @@ final class VMExtractorIngestModule extends DataSourceIngestModuleAdapter {
     private static final Logger logger = Logger.getLogger(VMExtractorIngestModule.class.getName());
     private IngestJobContext context;
     private Path ingestJobOutputDir;
-    private String parentDataSourceId = null;
+    private String parentDeviceId = null;
 
     private final HashMap<String, String> imageFolderToOutputFolder = new HashMap<>();
     private int folderId = 0;
 
+    @Messages({"# {0} - data source name", "deviceIdQueryErrMsg=Data source {0} missing device id"})
     @Override
     public void startUp(IngestJobContext context) throws IngestModuleException {
         this.context = context;
@@ -74,24 +77,19 @@ final class VMExtractorIngestModule extends DataSourceIngestModuleAdapter {
         try {
             Case currentCase = Case.getCurrentCase();
             SleuthkitCase caseDb = currentCase.getSleuthkitCase();
-            List<DataSource> dataSources = caseDb.getDataSources();
-            for (DataSource dataSource : dataSources) {
-                if (dataSource.getObjectId() == dataSourceObjId) {
-                    parentDataSourceId = dataSource.getUniqueId();
-                }
-            }
-            if (null == parentDataSourceId) {
-                throw new IngestModuleException(String.format("Data source %s missing unique id", context.getDataSource().getName())); //NON-NLS
-            }
+            DataSource dataSource = caseDb.getDataSource(dataSourceObjId);
+            parentDeviceId = dataSource.getDeviceId();
             SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy_MM_dd_HH_mm_ss");
             String timeStamp = dateFormat.format(Calendar.getInstance().getTime());
             String ingestJobOutputDirName = context.getDataSource().getName() + "_" + context.getDataSource().getId() + "_" + timeStamp;
             ingestJobOutputDir = Paths.get(Case.getCurrentCase().getModuleDirectory(), VMExtractorIngestModuleFactory.getModuleName(), ingestJobOutputDirName);
             // create module output folder to write extracted virtual machine files to
             Files.createDirectories(ingestJobOutputDir);
-        } catch (IOException | SecurityException | UnsupportedOperationException | TskCoreException ex) {
-            throw new IngestModule.IngestModuleException(NbBundle.getMessage(this.getClass(), "VMExtractorIngestModule.cannotCreateOutputDir.message", ex.getLocalizedMessage()));
-        }
+        } catch (IOException | SecurityException | UnsupportedOperationException ex) {
+            throw new IngestModule.IngestModuleException(NbBundle.getMessage(this.getClass(), "VMExtractorIngestModule.cannotCreateOutputDir.message", ex.getLocalizedMessage()), ex);
+        } catch (TskDataException | TskCoreException ex) {
+            throw new IngestModule.IngestModuleException(Bundle.deviceIdQueryErrMsg(context.getDataSource().getName()), ex);
+        } 
     }
 
     /**
@@ -183,7 +181,7 @@ final class VMExtractorIngestModule extends DataSourceIngestModuleAdapter {
                 
                     // for extracted virtual machines there is no manifest XML file to read data source ID from so use parent data source ID.
                     // ingest the data sources  
-                    ingestVirtualMachineImage(Paths.get(folder, file), parentDataSourceId);
+                    ingestVirtualMachineImage(Paths.get(folder, file), parentDeviceId);
                     logger.log(Level.INFO, "Ingest complete for virtual machine file {0} in folder {1}", new Object[]{file, folder}); //NON-NLS
                 } catch (InterruptedException ex) {
                     logger.log(Level.INFO, "Interrupted while ingesting virtual machine file "+file+" in folder "+folder, ex); //NON-NLS
@@ -249,8 +247,9 @@ final class VMExtractorIngestModule extends DataSourceIngestModuleAdapter {
      * with the ingest modules.
      *
      * @param vmFile A virtual machine file.
+     * @param deviceId The device id associated with the parent data source.
      */
-    private void ingestVirtualMachineImage(Path vmFile, String dataSourceID) throws InterruptedException, IOException {
+    private void ingestVirtualMachineImage(Path vmFile, String deviceID) throws InterruptedException, IOException {
 
         /*
          * Try to add the virtual machine file to the case as a data source.
@@ -260,7 +259,7 @@ final class VMExtractorIngestModule extends DataSourceIngestModuleAdapter {
         ImageDSProcessor dataSourceProcessor = new ImageDSProcessor();
         AddDataSourceCallback dspCallback = new AddDataSourceCallback(vmFile);
         synchronized (this) {
-            dataSourceProcessor.run(dataSourceID, vmFile.toString(), "", false, new AddDataSourceProgressMonitor(), dspCallback);
+            dataSourceProcessor.run(deviceID, vmFile.toString(), "", false, new AddDataSourceProgressMonitor(), dspCallback);
             /*
              * Block the ingest thread until the data source processor finishes.
              */

From 07173b6b5c04d36fecf858325e76914ed8380595 Mon Sep 17 00:00:00 2001
From: Richard Cordovano <rcordovano@basistech.com>
Date: Mon, 8 Feb 2016 11:03:56 -0500
Subject: [PATCH 68/68] Add VM to data type for image dsp

---
 Core/src/org/sleuthkit/autopsy/casemodule/Bundle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/Bundle.properties b/Core/src/org/sleuthkit/autopsy/casemodule/Bundle.properties
index 6149cf49bb..165f2d788a 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/Bundle.properties
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/Bundle.properties
@@ -167,7 +167,7 @@ CueBannerPanel.title.text=Open Recent Case
 GeneralFilter.rawImageDesc.text=Raw Images (*.img, *.dd, *.001, *.aa, *.raw, *.bin)
 GeneralFilter.encaseImageDesc.text=Encase Images (*.e01)
 GeneralFilter.virtualMachineImageDesc.text=Virtual Machines (*.vmdk, *.vhd)
-ImageDSProcessor.dsType.text=Image File
+ImageDSProcessor.dsType.text=Image or VM 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.