Merge branch 'develop' of github.com:sleuthkit/autopsy into CT-7161-fileUpload

Core/src/org/sleuthkit/autopsy/datamodel/Bundle.properties

@@ -101,7 +101,7 @@ ImageNode.createSheet.name.displayName=Name
 ImageNode.createSheet.name.desc=no description
 Installer.exception.tskVerStringNull.msg=Sleuth Kit JNI test call returned without error, but version string was null\!
 Installer.exception.taskVerStringBang.msg=Sleuth Kit JNI test call returned without error, but version string was ""\!
-Installer.tskLibErr.msg=Problem with Sleuth Kit JNI. Test call failed\!\n\nDetails: {0}
+Installer.tskLibErr.msg=Problem with Sleuth Kit JNI. Test call failed\!\n Is Autopsy or Cyber Triage already running?\n\nDetails: {0}
 Installer.tskLibErr.err=Fatal Error\!
 InterestingHits.interestingItems.text=INTERESTING ITEMS
 InterestingHits.displayName.text=Interesting Items

Core/src/org/sleuthkit/autopsy/datamodel/Bundle.properties-MERGED

@@ -315,7 +315,7 @@ ImageNode.createSheet.name.displayName=Name
 ImageNode.createSheet.name.desc=no description
 Installer.exception.tskVerStringNull.msg=Sleuth Kit JNI test call returned without error, but version string was null\!
 Installer.exception.taskVerStringBang.msg=Sleuth Kit JNI test call returned without error, but version string was ""\!
-Installer.tskLibErr.msg=Problem with Sleuth Kit JNI. Test call failed\!\n\nDetails: {0}
+Installer.tskLibErr.msg=Problem with Sleuth Kit JNI. Test call failed\!\n Is Autopsy or Cyber Triage already running?\n\nDetails: {0}
 Installer.tskLibErr.err=Fatal Error\!
 InterestingHits.interestingItems.text=INTERESTING ITEMS
 InterestingHits.displayName.text=Interesting Items
@@ -418,6 +418,7 @@ ScoreContent_createSheet_filterType_displayName=Type
 ScoreContent_createSheet_name_desc=no description
 ScoreContent_createSheet_name_displayName=Name
 ScoreContent_ScoreContentNode_name=Score
+ScoreContent_ScoreFileNode_type=File
 ScoreContent_susFilter_text=Suspicious Items
 SlackFileNode.getActions.viewInNewWin.text=View in New Window
 SlackFileNode.getActions.viewFileInDir.text=View File in Directory

Core/src/org/sleuthkit/autopsy/datamodel/Installer.java

@@ -70,8 +70,9 @@ public void validate() throws IllegalStateException {
                 logger.log(Level.CONFIG, "Sleuth Kit Version: {0}", skVersion); //NON-NLS
             }
 
-        } catch (Exception e) {
+        } catch (Exception | UnsatisfiedLinkError e) {
             logger.log(Level.SEVERE, "Error calling Sleuth Kit library (test call failed)", e); //NON-NLS
+            logger.log(Level.SEVERE, "Is Autopsy or Cyber Triage already running?)", e); //NON-NLS
 
             // Normal error box log handler won't be loaded yet, so show error here.
             final Component parentComponent = null; // Use default window frame.