From 1ad14e19acefcfe6d0e67cad2a85a02b0b2ed5d4 Mon Sep 17 00:00:00 2001
From: Greg DiCristofaro <gregd@basistech.com>
Date: Tue, 13 Apr 2021 11:54:31 -0400
Subject: [PATCH] removed placeholders for debugging

---
 Core/src/org/sleuthkit/autopsy/actions/Bundle.properties  | 2 +-
 .../sleuthkit/autopsy/actions/Bundle.properties-MERGED    | 2 +-
 .../org/sleuthkit/autopsy/casemodule/Bundle.properties    | 2 +-
 Core/src/org/sleuthkit/autopsy/core/Bundle.properties     | 8 ++++----
 .../org/sleuthkit/autopsy/core/Bundle.properties-MERGED   | 8 ++++----
 .../autopsy/corecomponents/AboutWindowAction.java         | 2 +-
 .../sleuthkit/autopsy/corecomponents/Bundle.properties    | 2 +-
 .../autopsy/corecomponents/Bundle.properties-MERGED       | 2 +-
 .../autopsy/directorytree/Bundle.properties-MERGED        | 2 +-
 .../autopsy/directorytree/DirectoryTreeTopComponent.java  | 2 +-
 .../org/sleuthkit/autopsy/geolocation/Bundle.properties   | 1 -
 .../autopsy/geolocation/Bundle.properties-MERGED          | 4 +---
 .../autopsy/geolocation/OpenGeolocationAction.java        | 8 ++------
 .../sleuthkit/autopsy/livetriage/Bundle.properties-MERGED | 2 +-
 .../autopsy/livetriage/CreateLiveTriageDriveAction.java   | 2 +-
 .../configuration/CreateLogicalImagerAction.java          | 4 ++--
 .../experimental/autoingest/Bundle.properties-MERGED      | 4 +++-
 17 files changed, 26 insertions(+), 31 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/actions/Bundle.properties b/Core/src/org/sleuthkit/autopsy/actions/Bundle.properties
index 4422d49917..4ca72069dc 100644
--- a/Core/src/org/sleuthkit/autopsy/actions/Bundle.properties
+++ b/Core/src/org/sleuthkit/autopsy/actions/Bundle.properties
@@ -45,4 +45,4 @@ OpenPythonModulesFolderAction.actionName.text=Python Plugins
 OpenPythonModulesFolderAction.errorMsg.folderNotFound=Python plugins folder not found: {0}
 CTL_OpenPythonModulesFolderAction=Python Plugins
 GetTagNameAndCommentDialog.tagCombo.toolTipText=Select tag to use
-CTL_ExitAction=Exit2
\ No newline at end of file
+CTL_ExitAction=Exit
\ No newline at end of file
diff --git a/Core/src/org/sleuthkit/autopsy/actions/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/actions/Bundle.properties-MERGED
index a26462a408..5c9a0ea3ac 100755
--- a/Core/src/org/sleuthkit/autopsy/actions/Bundle.properties-MERGED
+++ b/Core/src/org/sleuthkit/autopsy/actions/Bundle.properties-MERGED
@@ -96,4 +96,4 @@ OpenPythonModulesFolderAction.actionName.text=Python Plugins
 OpenPythonModulesFolderAction.errorMsg.folderNotFound=Python plugins folder not found: {0}
 CTL_OpenPythonModulesFolderAction=Python Plugins
 GetTagNameAndCommentDialog.tagCombo.toolTipText=Select tag to use
-CTL_ExitAction=Exit2
+CTL_ExitAction=Exit
diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/Bundle.properties b/Core/src/org/sleuthkit/autopsy/casemodule/Bundle.properties
index 5f03a648f4..1a6186b2c2 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/Bundle.properties
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/Bundle.properties
@@ -139,7 +139,7 @@ OpenRecentCasePanel.colName.path=Path
 RecentCases.exception.caseIdxOutOfRange.msg=Recent case index {0} is out of range.
 RecentCases.getName.text=Clear Recent Cases
 StartupWindow.title.text=Welcome
-UpdateRecentCases.menuItem.clearRecentCases.text=Clear Recent Cases2
+UpdateRecentCases.menuItem.clearRecentCases.text=Clear Recent Cases
 UpdateRecentCases.menuItem.empty=-Empty-
 AddImageWizardIngestConfigPanel.CANCEL_BUTTON.text=Cancel
 NewCaseVisualPanel1.CaseFolderOnCDriveError.text=Warning: Path to multi-user case folder is on \"C:\" drive
diff --git a/Core/src/org/sleuthkit/autopsy/core/Bundle.properties b/Core/src/org/sleuthkit/autopsy/core/Bundle.properties
index 9aabb68a0d..0f6042fc60 100644
--- a/Core/src/org/sleuthkit/autopsy/core/Bundle.properties
+++ b/Core/src/org/sleuthkit/autopsy/core/Bundle.properties
@@ -27,7 +27,7 @@ ServicesMonitor.remoteKeywordSearch.displayName.text=Multi-user keyword search s
 ServicesMonitor.messaging.displayName.text=Messaging service
 ServicesMonitor.databaseConnectionInfo.error.msg=Error accessing case database connection info
 ServicesMonitor.messagingService.connErr.text=Error accessing messaging service connection info
-Actions/Case=Case2
-Menu/Case=Case2
-Toolbars/Case=Case2
-Menu/Case/OpenRecentCase=Open Recent Case2
\ No newline at end of file
+Actions/Case=Case
+Menu/Case=Case
+Toolbars/Case=Case
+Menu/Case/OpenRecentCase=Open Recent Case
\ No newline at end of file
diff --git a/Core/src/org/sleuthkit/autopsy/core/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/core/Bundle.properties-MERGED
index 9ff9f02aa9..1d50092e80 100755
--- a/Core/src/org/sleuthkit/autopsy/core/Bundle.properties-MERGED
+++ b/Core/src/org/sleuthkit/autopsy/core/Bundle.properties-MERGED
@@ -31,7 +31,7 @@ ServicesMonitor.remoteKeywordSearch.displayName.text=Multi-user keyword search s
 ServicesMonitor.messaging.displayName.text=Messaging service
 ServicesMonitor.databaseConnectionInfo.error.msg=Error accessing case database connection info
 ServicesMonitor.messagingService.connErr.text=Error accessing messaging service connection info
-Actions/Case=Case2
-Menu/Case=Case2
-Toolbars/Case=Case2
-Menu/Case/OpenRecentCase=Open Recent Case2
+Actions/Case=Case
+Menu/Case=Case
+Toolbars/Case=Case
+Menu/Case/OpenRecentCase=Open Recent Case
diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/AboutWindowAction.java b/Core/src/org/sleuthkit/autopsy/corecomponents/AboutWindowAction.java
index 3cdf7e354b..00f0e7217a 100644
--- a/Core/src/org/sleuthkit/autopsy/corecomponents/AboutWindowAction.java
+++ b/Core/src/org/sleuthkit/autopsy/corecomponents/AboutWindowAction.java
@@ -31,9 +31,9 @@ import org.openide.util.NbBundle;
  * Action to open custom implementation of the "About" window from the Help
  * menu.
  */
+@ActionID(id = "org.sleuthkit.autopsy.corecomponents.AboutWindowAction", category = "Help")
 @ActionRegistration(displayName = "#CTL_CustomAboutAction", iconInMenu = true, lazy = false)
 @ActionReference(path = "Menu/Help", position = 3000, separatorBefore = 2999)
-@ActionID(id = "org.sleuthkit.autopsy.corecomponents.AboutWindowAction", category = "Help")
 public class AboutWindowAction extends AboutAction {
 
     @Override
diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/Bundle.properties b/Core/src/org/sleuthkit/autopsy/corecomponents/Bundle.properties
index d0ab1bf41d..2deaab0d3b 100644
--- a/Core/src/org/sleuthkit/autopsy/corecomponents/Bundle.properties
+++ b/Core/src/org/sleuthkit/autopsy/corecomponents/Bundle.properties
@@ -1,6 +1,6 @@
 CTL_DataContentAction=DataContent
 CTL_DataContentTopComponent=Data Content
-CTL_CustomAboutAction=About2
+CTL_CustomAboutAction=About
 OptionsCategory_Name_General=Application
 OptionsCategory_Keywords_General=Autopsy Options
 HINT_DataContentTopComponent=This is a DataContent window
diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/corecomponents/Bundle.properties-MERGED
index b0bf308518..16fa8d0e5f 100755
--- a/Core/src/org/sleuthkit/autopsy/corecomponents/Bundle.properties-MERGED
+++ b/Core/src/org/sleuthkit/autopsy/corecomponents/Bundle.properties-MERGED
@@ -28,7 +28,7 @@ AutopsyOptionsPanel_tempDirectoryBrowseButtonActionPerformed_onInvalidPath_descr
 AutopsyOptionsPanel_tempDirectoryBrowseButtonActionPerformed_onInvalidPath_title=Path cannot be used
 CTL_DataContentAction=DataContent
 CTL_DataContentTopComponent=Data Content
-CTL_CustomAboutAction=About2
+CTL_CustomAboutAction=About
 CTL_OfflineHelpAction=Offline Autopsy Documentation
 CTL_OnlineHelpAction=Online Autopsy Documentation
 DataContentViewerArtifact.failedToGetAttributes.message=Failed to get some or all attributes from case database
diff --git a/Core/src/org/sleuthkit/autopsy/directorytree/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/directorytree/Bundle.properties-MERGED
index 500a7b8371..c648387016 100755
--- a/Core/src/org/sleuthkit/autopsy/directorytree/Bundle.properties-MERGED
+++ b/Core/src/org/sleuthkit/autopsy/directorytree/Bundle.properties-MERGED
@@ -9,7 +9,7 @@ DataResultFilterNode.viewSourceArtifact.text=View Source Result
 DirectoryTreeTopComponent.componentOpened.groupDataSources.text=This case contains {0} data sources. Would you like to group by data source for faster loading?
 DirectoryTreeTopComponent.componentOpened.groupDataSources.title=Group by data source?
 DirectoryTreeTopComponent.emptyMimeNode.text=Data not available. Run file type identification module.
-DirectoryTreeTopComponent.resultsView.title=Listing2
+DirectoryTreeTopComponent.resultsView.title=Listing
 ExportCSV.saveNodesToCSV.empty=No data to export
 # {0} - Output file
 ExportCSV.saveNodesToCSV.fileExists=File {0} already exists
diff --git a/Core/src/org/sleuthkit/autopsy/directorytree/DirectoryTreeTopComponent.java b/Core/src/org/sleuthkit/autopsy/directorytree/DirectoryTreeTopComponent.java
index bb07ce3e4d..d2cd291de0 100644
--- a/Core/src/org/sleuthkit/autopsy/directorytree/DirectoryTreeTopComponent.java
+++ b/Core/src/org/sleuthkit/autopsy/directorytree/DirectoryTreeTopComponent.java
@@ -103,7 +103,7 @@ import org.sleuthkit.datamodel.TskCoreException;
  */
 // Registered as a service provider for DataExplorer in layer.xml
 @Messages({
-    "DirectoryTreeTopComponent.resultsView.title=Listing2"
+    "DirectoryTreeTopComponent.resultsView.title=Listing"
 })
 @SuppressWarnings("PMD.SingularField") // UI widgets cause lots of false positives
 public final class DirectoryTreeTopComponent extends TopComponent implements DataExplorer, ExplorerManager.Provider {
diff --git a/Core/src/org/sleuthkit/autopsy/geolocation/Bundle.properties b/Core/src/org/sleuthkit/autopsy/geolocation/Bundle.properties
index 7354af0f0a..c6ba196646 100755
--- a/Core/src/org/sleuthkit/autopsy/geolocation/Bundle.properties
+++ b/Core/src/org/sleuthkit/autopsy/geolocation/Bundle.properties
@@ -1,4 +1,3 @@
-CTL_OpenGeolocation=Geolocation2
 CTL_GeolocationTopComponentAction=GeolocationTopComponent
 CTL_GeolocationTopComponent=Geolocation
 RefreshPanel.refreshLabel.text=The geolocation data has been updated, the visualization may be out of date.
diff --git a/Core/src/org/sleuthkit/autopsy/geolocation/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/geolocation/Bundle.properties-MERGED
index 383ccdc62a..578083986f 100755
--- a/Core/src/org/sleuthkit/autopsy/geolocation/Bundle.properties-MERGED
+++ b/Core/src/org/sleuthkit/autopsy/geolocation/Bundle.properties-MERGED
@@ -1,6 +1,6 @@
-CTL_OpenGeolocation=Geolocation2
 CTL_GeolocationTopComponentAction=GeolocationTopComponent
 CTL_GeolocationTopComponent=Geolocation
+CTL_OpenGeolocation=Geolocation
 GeoFilterPanel_ArtifactType_List_Title=Types
 GeoFilterPanel_DataSource_List_Title=Data Sources
 GeoFilterPanel_empty_artifactType=Unable to apply filter, please select one or more artifact types.
@@ -40,8 +40,6 @@ HidingPane_default_title=Filters
 MapPanel_connection_failure_message=Failed to connect to new geolocation map tile source.
 MapPanel_connection_failure_message_title=Connection Failure
 MayWaypoint_ExternalViewer_label=Open in ExternalViewer
-OpenGeolocationAction_displayName=Geolocation
-OpenGeolocationAction_name=Geolocation
 RefreshPanel.refreshLabel.text=The geolocation data has been updated, the visualization may be out of date.
 RefreshPanel.refreshButton.text=Refresh View
 RefreshPanel.closeButton.text=
diff --git a/Core/src/org/sleuthkit/autopsy/geolocation/OpenGeolocationAction.java b/Core/src/org/sleuthkit/autopsy/geolocation/OpenGeolocationAction.java
index d809f55e04..1eaac6f1be 100755
--- a/Core/src/org/sleuthkit/autopsy/geolocation/OpenGeolocationAction.java
+++ b/Core/src/org/sleuthkit/autopsy/geolocation/OpenGeolocationAction.java
@@ -46,17 +46,13 @@ import org.sleuthkit.autopsy.core.RuntimeProperties;
 @ActionReferences(value = {
     @ActionReference(path = "Menu/Tools", position = 103),
 @ActionReference(path = "Toolbars/Case", position = 103)})
+@Messages({"CTL_OpenGeolocation=Geolocation"})
 public class OpenGeolocationAction extends CallableSystemAction {
     
     private static final long serialVersionUID = 1L;
     private final JButton toolbarButton = new JButton(getName(),
             new ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/images/blueGeo24.png"))); //NON-NLS
     
-    @Messages({
-        "OpenGeolocationAction_name=Geolocation",
-        "OpenGeolocationAction_displayName=Geolocation"
-    })
-
     /**
      * Constructs the new action of opening the Geolocation window.
      */
@@ -98,7 +94,7 @@ public class OpenGeolocationAction extends CallableSystemAction {
 
     @Override
     public String getName() {
-        return Bundle.OpenGeolocationAction_displayName();
+        return Bundle.CTL_OpenGeolocation();
     }
 
     /**
diff --git a/Core/src/org/sleuthkit/autopsy/livetriage/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/livetriage/Bundle.properties-MERGED
index 94a7b13143..309a07d3da 100755
--- a/Core/src/org/sleuthkit/autopsy/livetriage/Bundle.properties-MERGED
+++ b/Core/src/org/sleuthkit/autopsy/livetriage/Bundle.properties-MERGED
@@ -10,7 +10,7 @@ CreateLiveTriageDriveAction.progressBar.text=Copying live triage files to {0}
 CreateLiveTriageDriveAction.progressBar.title=Please wait
 CreateLiveTriageDriveAction.success.message=Live triage drive created. Use RunFromUSB.bat to run the application
 CreateLiveTriageDriveAction.success.title=Success
-CTL_CreateLiveTriageDriveAction=Make Live Triage Drive2
+CTL_CreateLiveTriageDriveAction=Make Live Triage Drive
 SelectDriveDialog.bnOk.text=Ok
 SelectDriveDialog.bnRefresh.text=Refresh
 SelectDriveDialog.diskTable.column1.title=Disk Name
diff --git a/Core/src/org/sleuthkit/autopsy/livetriage/CreateLiveTriageDriveAction.java b/Core/src/org/sleuthkit/autopsy/livetriage/CreateLiveTriageDriveAction.java
index ae4765f40e..b733f11dd9 100644
--- a/Core/src/org/sleuthkit/autopsy/livetriage/CreateLiveTriageDriveAction.java
+++ b/Core/src/org/sleuthkit/autopsy/livetriage/CreateLiveTriageDriveAction.java
@@ -45,7 +45,7 @@ import org.sleuthkit.autopsy.progress.ModalDialogProgressIndicator;
 @ActionID(category = "Tools", id = "org.sleuthkit.autopsy.livetriage.CreateLiveTriageDriveAction")
 @ActionReference(path = "Menu/Tools", position = 1850, separatorBefore = 1849)
 @ActionRegistration(displayName = "#CTL_CreateLiveTriageDriveAction", lazy = false)
-@NbBundle.Messages({"CTL_CreateLiveTriageDriveAction=Make Live Triage Drive2"})
+@NbBundle.Messages({"CTL_CreateLiveTriageDriveAction=Make Live Triage Drive"})
 public final class CreateLiveTriageDriveAction extends CallableSystemAction implements PropertyChangeListener {
 
     private static final String DISPLAY_NAME = Bundle.CTL_CreateLiveTriageDriveAction();
diff --git a/Core/src/org/sleuthkit/autopsy/logicalimager/configuration/CreateLogicalImagerAction.java b/Core/src/org/sleuthkit/autopsy/logicalimager/configuration/CreateLogicalImagerAction.java
index d11e424a0e..002b9a526e 100644
--- a/Core/src/org/sleuthkit/autopsy/logicalimager/configuration/CreateLogicalImagerAction.java
+++ b/Core/src/org/sleuthkit/autopsy/logicalimager/configuration/CreateLogicalImagerAction.java
@@ -44,7 +44,7 @@ import org.openide.util.actions.CallableSystemAction;
 @ActionID(category = "Tools", id = "org.sleuthkit.autopsy.logicalimager.configuration.CreateLogicalImagerAction")
 @ActionRegistration(displayName = "#CTL_CreateLogicalImagerAction", lazy = false)
 @ActionReference(path = "Menu/Tools", position = 2000, separatorBefore = 1999)
-@Messages("CTL_CreateLogicalImagerAction=Create Logical Imager2")
+@Messages("CTL_CreateLogicalImagerAction=Create Logical Imager")
 public final class CreateLogicalImagerAction extends CallableSystemAction {
 
     private static final long serialVersionUID = 1L;
@@ -62,7 +62,7 @@ public final class CreateLogicalImagerAction extends CallableSystemAction {
     }
 
     @NbBundle.Messages({
-        "CreateLogicalImagerAction.title=Create Logical Imager2"
+        "CreateLogicalImagerAction.title=Create Logical Imager"
     })
     @Override
     public void performAction() {
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 25a647df8f..823399e0d0 100755
--- a/Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/Bundle.properties-MERGED
+++ b/Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/Bundle.properties-MERGED
@@ -160,7 +160,7 @@ ConfirmationDialog.ConfirmExitHeader=Confirm Exit
 CTL_AinStatusDashboardAction=Auto Ingest Nodes
 CTL_AinStatusDashboardTopComponent=Auto Ingest Nodes
 CTL_AutoIngestDashboardAction=Auto Ingest Jobs
-CTL_AutoIngestDashboardOpenAction=Auto Ingest Dashboard2
+CTL_AutoIngestDashboardOpenAction=Auto Ingest Dashboard
 CTL_AutoIngestDashboardTopComponent=Auto Ingest Jobs
 CTL_CasesDashboardAction=Multi-User Cases Dashboard
 CTL_CasesDashboardTopComponent=Cases
@@ -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