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 80e72335b5650f39f91da572ca5f81e6baade49e..37430070390ac26d435dceede1ca477d4ee24980 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 fbba9211978d9f92f190bc9569b63e40bb667cdf..ae2f7b2242c2aaa23799891b82b5cb82f6cc67d3 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 56a675e256e41fb7f89b9aa01eb7059a07ec8096..823399e0d018c827352747704d53deb468de25ce 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 a842d76f7431114977ca0191bc2c1145756ae8d5..eba0804ed32747391a873d7a9ea2acd022bad78b 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 820ccd1cab3f183d6288975c1e256c8bfd579e7a..7173c853e67ceca2936b1cedac792d7732c310ff 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 bdb8b1a0b85323091647a65504f0c9f8c9e5543b..4fc73f3fd9867e656af9b75658f0c3d327c9997a 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