From 3201022fe51486545b538b3b405ca28b99e515bf Mon Sep 17 00:00:00 2001
From: Greg DiCristofaro <gregd@basistech.com>
Date: Wed, 21 Oct 2020 07:48:24 -0400
Subject: [PATCH] string fix
---
.../sleuthkit/autopsy/integrationtesting/DiffService.java | 4 ++--
.../autopsy/integrationtesting/MainTestRunner.java | 2 +-
.../experimental/autoingest/Bundle.properties-MERGED | 2 ++
.../autopsy/recentactivity/Bundle.properties-MERGED | 7 -------
.../core.jar/org/netbeans/core/startup/Bundle.properties | 2 +-
.../org/netbeans/core/windows/view/ui/Bundle.properties | 2 +-
6 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/Core/test/qa-functional/src/org/sleuthkit/autopsy/integrationtesting/DiffService.java b/Core/test/qa-functional/src/org/sleuthkit/autopsy/integrationtesting/DiffService.java
index 80e72335b5..3743007039 100644
--- a/Core/test/qa-functional/src/org/sleuthkit/autopsy/integrationtesting/DiffService.java
+++ b/Core/test/qa-functional/src/org/sleuthkit/autopsy/integrationtesting/DiffService.java
@@ -101,9 +101,9 @@ private String getFileDiffs(File orig, File cur, String identifier) {
if (!hasOrig && !hasCur) {
return null;
} else if (!hasOrig && hasCur) {
- return getHeaderWithDivider("MISSING FILE IN CURRENT: " + identifier);
- } else if (hasOrig && !hasCur) {
return getHeaderWithDivider("ADDITIONAL FILE IN CURRENT: " + identifier);
+ } else if (hasOrig && !hasCur) {
+ return getHeaderWithDivider("MISSING FILE IN CURRENT: " + identifier);
} else {
try {
return diffLines(Files.readAllLines(orig.toPath()), Files.readAllLines(cur.toPath()), getHeaderWithDivider(identifier + ":"));
diff --git a/Core/test/qa-functional/src/org/sleuthkit/autopsy/integrationtesting/MainTestRunner.java b/Core/test/qa-functional/src/org/sleuthkit/autopsy/integrationtesting/MainTestRunner.java
index fbba921197..ae2f7b2242 100644
--- a/Core/test/qa-functional/src/org/sleuthkit/autopsy/integrationtesting/MainTestRunner.java
+++ b/Core/test/qa-functional/src/org/sleuthkit/autopsy/integrationtesting/MainTestRunner.java
@@ -370,7 +370,7 @@ private void writeDiff(EnvConfig envConfig) {
logger.log(Level.WARNING, String.format("Gold does not exist at location: %s. Not creating diff.", goldDir.toString()));
}
- String outputPath = PathUtil.getAbsolutePath(envConfig.getWorkingDirectory(), envConfig.getRootCaseOutputPath());
+ String outputPath = PathUtil.getAbsolutePath(envConfig.getWorkingDirectory(), envConfig.getRootTestOutputPath());
File outputDir = new File(outputPath);
if (!outputDir.exists()) {
logger.log(Level.WARNING, String.format("Output path does not exist at location: %s. Not creating diff.", outputDir.toString()));
diff --git a/Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/Bundle.properties-MERGED b/Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/Bundle.properties-MERGED
index 56a675e256..823399e0d0 100755
--- a/Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/Bundle.properties-MERGED
+++ b/Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/Bundle.properties-MERGED
@@ -205,7 +205,9 @@ DeleteCaseTask.progress.parsingManifest=Parsing manifest file {0}...
DeleteCaseTask.progress.releasingManifestLock=Releasing lock on the manifest file {0}...
DeleteCaseTask.progress.startMessage=Starting deletion...
DeleteOrphanCaseNodesAction.progressDisplayName=Cleanup Case Znodes
+# {0} - item count
DeleteOrphanCaseNodesDialog.additionalInit.lblNodeCount.text=Znodes found: {0}
+# {0} - item count
DeleteOrphanCaseNodesDialog.additionalInit.znodesTextArea.countMessage=ZNODES FOUND: {0}
DeleteOrphanCaseNodesTask.progress.connectingToCoordSvc=Connecting to the coordination service
# {0} - node path
diff --git a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Bundle.properties-MERGED b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Bundle.properties-MERGED
index a842d76f74..eba0804ed3 100755
--- a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Bundle.properties-MERGED
+++ b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Bundle.properties-MERGED
@@ -87,13 +87,6 @@ OpenIDE-Module-Display-Category=Ingest Module
OpenIDE-Module-Long-Description=Recent Activity ingest module.\n\nThe module extracts useful information about the recent user activity on the disk image being ingested, such as:\n\n- Recently open documents,\n- Web activity (sites visited, stored cookies, book marked sites, search engine queries, file downloads),\n- Recently attached devices,\n- Installed programs.\n\nThe module currently supports Windows only disk images.\nThe plugin is also fully functional when deployed on Windows version of Autopsy.
OpenIDE-Module-Name=RecentActivity
OpenIDE-Module-Short-Description=Recent Activity finder ingest module
-Browser.name.Microsoft.Edge=Microsoft Edge
-Browser.name.Yandex=Yandex
-Browser.name.Opera=Opera
-Browser.name.SalamWeb=SalamWeb
-Browser.name.UC.Browser=UC Browser
-Browser.name.Brave=Brave
-Browser.name.Google.Chrome=Google Chrome
Chrome.moduleName=Chromium
Chrome.getHistory.errMsg.errGettingFiles=Error when trying to get Chrome history files.
Chrome.getHistory.errMsg.couldntFindAnyFiles=Could not find any allocated Chrome history files.
diff --git a/branding/core/core.jar/org/netbeans/core/startup/Bundle.properties b/branding/core/core.jar/org/netbeans/core/startup/Bundle.properties
index 820ccd1cab..7173c853e6 100644
--- a/branding/core/core.jar/org/netbeans/core/startup/Bundle.properties
+++ b/branding/core/core.jar/org/netbeans/core/startup/Bundle.properties
@@ -1,5 +1,5 @@
#Updated by build script
-#Fri, 25 Sep 2020 17:10:05 -0400
+#Tue, 20 Oct 2020 17:24:30 -0400
LBL_splash_window_title=Starting Autopsy
SPLASH_HEIGHT=314
SPLASH_WIDTH=538
diff --git a/branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties b/branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties
index bdb8b1a0b8..4fc73f3fd9 100644
--- a/branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties
+++ b/branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties
@@ -1,4 +1,4 @@
#Updated by build script
-#Fri, 25 Sep 2020 17:10:05 -0400
+#Tue, 20 Oct 2020 17:24:30 -0400
CTL_MainWindow_Title=Autopsy 4.17.0
CTL_MainWindow_Title_No_Project=Autopsy 4.17.0
--
GitLab