From 2284d42d4d972a4bdba9259b42c6c16d922ec7df Mon Sep 17 00:00:00 2001
From: Richard Cordovano <rcordovano@basistech.com>
Date: Wed, 13 Oct 2021 13:01:12 -0400
Subject: [PATCH] Update log messages in OsAccounts.java

---
 .../sleuthkit/autopsy/datamodel/Bundle.properties-MERGED  | 8 ++++----
 Core/src/org/sleuthkit/autopsy/datamodel/OsAccounts.java  | 4 ++--
 .../autopsy/discovery/search/Bundle.properties-MERGED     | 1 +
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/datamodel/Bundle.properties-MERGED
index 19a399957a..d753a6e329 100755
--- a/Core/src/org/sleuthkit/autopsy/datamodel/Bundle.properties-MERGED
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/Bundle.properties-MERGED
@@ -313,10 +313,10 @@ ImageNode.getActions.viewInNewWin.text=View in New Window
 ImageNode.createSheet.name.name=Name
 ImageNode.createSheet.name.displayName=Name
 ImageNode.createSheet.name.desc=no description
-Installer.exception.tskVerStringNull.msg=Sleuth Kit JNI test call returned without error, but version string was null!
-Installer.exception.taskVerStringBang.msg=Sleuth Kit JNI test call returned without error, but version string was ""!
-Installer.tskLibErr.msg=Problem with Sleuth Kit JNI. Test call failed!\n\nDetails: {0}
-Installer.tskLibErr.err=Fatal Error!
+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.err=Fatal Error\!
 InterestingHits.interestingItems.text=INTERESTING ITEMS
 InterestingHits.displayName.text=Interesting Items
 InterestingHits.createSheet.name.name=Name
diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/OsAccounts.java b/Core/src/org/sleuthkit/autopsy/datamodel/OsAccounts.java
index eabc5da47a..fbdb266e9b 100755
--- a/Core/src/org/sleuthkit/autopsy/datamodel/OsAccounts.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/OsAccounts.java
@@ -533,9 +533,9 @@ public final class OsAccounts implements AutopsyVisitableItem {
                     description = Bundle.OsAccounts_createSheet_count_hashLookupNotRun_description();
                 }
             } catch (CentralRepoException ex) {
-                logger.log(Level.SEVERE, "Error getting count of datasources with correlation attribute", ex);
+                logger.log(Level.SEVERE, String.format("Error getting count of data sources with %s correlation attribute %s", attributeInstance.getCorrelationType().getDisplayName(), attributeInstance.getCorrelationValue()), ex);
             } catch (CorrelationAttributeNormalizationException ex) {
-                logger.log(Level.SEVERE, "Unable to normalize data to get count of datasources with correlation attribute", ex);
+                logger.log(Level.WARNING, String.format("Unable to normalize %s correlation attribute %s", attributeInstance.getCorrelationType().getDisplayName(), attributeInstance.getCorrelationValue()), ex);
             }
             return Pair.of(count, description);
         }
diff --git a/Core/src/org/sleuthkit/autopsy/discovery/search/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/discovery/search/Bundle.properties-MERGED
index 2115f5256b..4b460ac88d 100644
--- a/Core/src/org/sleuthkit/autopsy/discovery/search/Bundle.properties-MERGED
+++ b/Core/src/org/sleuthkit/autopsy/discovery/search/Bundle.properties-MERGED
@@ -145,3 +145,4 @@ SearchFiltering.ScoreFilter.desc=Score(s) of : {0}
 # {0} - filters
 SearchFiltering.SizeFilter.desc=Size(s): {0}
 SearchFiltering.SizeFilter.or=, 
+SummaryHelper.documentSummary.unable.to.read=Error trying to extract text from file.