From 0931d785b13f224755340448d477e21541e1d33d Mon Sep 17 00:00:00 2001
From: Greg DiCristofaro <gregd@basistech.com>
Date: Tue, 13 Apr 2021 10:21:46 -0400
Subject: [PATCH] moving through process

---
 Core/src/org/sleuthkit/autopsy/actions/Bundle.properties  | 1 +
 .../sleuthkit/autopsy/actions/Bundle.properties-MERGED    | 1 +
 Core/src/org/sleuthkit/autopsy/actions/ExitAction.java    | 2 +-
 .../org/sleuthkit/autopsy/casemodule/Bundle.properties    | 3 +--
 .../sleuthkit/autopsy/casemodule/Bundle.properties-MERGED | 5 ++---
 Core/src/org/sleuthkit/autopsy/core/Bundle.properties     | 4 ++++
 .../org/sleuthkit/autopsy/core/Bundle.properties-MERGED   | 4 ++++
 Core/src/org/sleuthkit/autopsy/core/layer.xml             | 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   | 2 +-
 .../autopsy/geolocation/Bundle.properties-MERGED          | 2 +-
 .../sleuthkit/autopsy/livetriage/Bundle.properties-MERGED | 2 +-
 .../autopsy/livetriage/CreateLiveTriageDriveAction.java   | 2 +-
 .../logicalimager/configuration/Bundle.properties-MERGED  | 4 ++--
 .../configuration/CreateLogicalImagerAction.java          | 4 ++--
 .../modules/leappanalyzers/Bundle.properties-MERGED       | 4 ++++
 .../experimental/autoingest/Bundle.properties-MERGED      | 2 +-
 21 files changed, 37 insertions(+), 23 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/actions/Bundle.properties b/Core/src/org/sleuthkit/autopsy/actions/Bundle.properties
index a2feedc54f..4422d49917 100644
--- a/Core/src/org/sleuthkit/autopsy/actions/Bundle.properties
+++ b/Core/src/org/sleuthkit/autopsy/actions/Bundle.properties
@@ -45,3 +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
diff --git a/Core/src/org/sleuthkit/autopsy/actions/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/actions/Bundle.properties-MERGED
index 507e079cad..a26462a408 100755
--- a/Core/src/org/sleuthkit/autopsy/actions/Bundle.properties-MERGED
+++ b/Core/src/org/sleuthkit/autopsy/actions/Bundle.properties-MERGED
@@ -96,3 +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
diff --git a/Core/src/org/sleuthkit/autopsy/actions/ExitAction.java b/Core/src/org/sleuthkit/autopsy/actions/ExitAction.java
index 7240afca92..31162cc67b 100644
--- a/Core/src/org/sleuthkit/autopsy/actions/ExitAction.java
+++ b/Core/src/org/sleuthkit/autopsy/actions/ExitAction.java
@@ -40,7 +40,7 @@ import org.sleuthkit.autopsy.coreutils.MessageNotifyUtil;
  * The action associated with the Case/Exit menu item. It closes the current
  * case, if any, and shuts down the application.
  */
-@ActionRegistration(displayName = "Exit", iconInMenu = true)
+@ActionRegistration(displayName = "#CTL_ExitAction", iconInMenu = true)
 @ActionReference(path = "Menu/Case", position = 1000, separatorBefore = 999)
 @ActionID(id = "org.sleuthkit.autopsy.casemodule.ExitAction", category = "Case")
 final public class ExitAction implements ActionListener {
diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/Bundle.properties b/Core/src/org/sleuthkit/autopsy/casemodule/Bundle.properties
index f3dfe72020..5f03a648f4 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/Bundle.properties
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/Bundle.properties
@@ -4,7 +4,6 @@ CTL_CaseCloseAct=Close Case
 CTL_CaseNewAction=New Case
 CTL_CaseDetailsAction=Case Details
 CTL_CaseDeleteAction=Delete Case
-Menu/Case/OpenRecentCase=Open Recent Case
 CTL_CaseDeleteAction=Delete Case
 OpenIDE-Module-Name=Case
 NewCaseVisualPanel1.caseNameLabel.text_1=Case Name:
@@ -140,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 Cases
+UpdateRecentCases.menuItem.clearRecentCases.text=Clear Recent Cases2
 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/casemodule/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/casemodule/Bundle.properties-MERGED
index f731913af5..3878776dd5 100755
--- a/Core/src/org/sleuthkit/autopsy/casemodule/Bundle.properties-MERGED
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/Bundle.properties-MERGED
@@ -128,6 +128,7 @@ CTL_CaseCloseAct=Close Case
 CTL_CaseNewAction=New Case
 CTL_CaseDetailsAction=Case Details
 CTL_CaseDeleteAction=Delete Case
+CTL_CaseDeleteAction=Delete Case
 CTL_CaseOpenAction=Open Case
 CTL_UnpackagePortableCaseAction=Unpack and Open Portable Case
 DeleteDataSourceAction.confirmationDialog.message=Are you sure you want to remove the selected data source from the case?\nNote that the case will be closed and re-opened during the removal.
@@ -186,8 +187,6 @@ LogicalEvidenceFilePanel.pathValidation.getOpenCase.Error=Warning: Exception whi
 LogicalEvidenceFilePanel.validatePanel.nonL01Error.text=Only files with the .l01 file extension are supported here.
 LogicalFilesDspPanel.subTypeComboBox.l01FileOption.text=Logical evidence file (L01)
 LogicalFilesDspPanel.subTypeComboBox.localFilesOption.text=Local files and folders
-Menu/Case/OpenRecentCase=Open Recent Case
-CTL_CaseDeleteAction=Delete Case
 OpenIDE-Module-Name=Case
 NewCaseVisualPanel1.caseNameLabel.text_1=Case Name:
 NewCaseVisualPanel1.caseDirLabel.text=Base Directory:
@@ -361,7 +360,7 @@ UnpackageWorker.doInBackground.canceled=Unpackaging canceled by user
 UnpackageWorker.doInBackground.errorCompressingCase=Error unpackaging case
 UnpackageWorker.doInBackground.errorFinding7zip=Could not locate 7-Zip executable
 UnpackageWorker.doInBackground.previouslySeenCase=Case has been previously opened. Open it again?
-UpdateRecentCases.menuItem.clearRecentCases.text=Clear Recent Cases
+UpdateRecentCases.menuItem.clearRecentCases.text=Clear Recent Cases2
 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 b106a1a123..9aabb68a0d 100644
--- a/Core/src/org/sleuthkit/autopsy/core/Bundle.properties
+++ b/Core/src/org/sleuthkit/autopsy/core/Bundle.properties
@@ -27,3 +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
diff --git a/Core/src/org/sleuthkit/autopsy/core/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/core/Bundle.properties-MERGED
index cd9d1002cd..9ff9f02aa9 100755
--- a/Core/src/org/sleuthkit/autopsy/core/Bundle.properties-MERGED
+++ b/Core/src/org/sleuthkit/autopsy/core/Bundle.properties-MERGED
@@ -31,3 +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
diff --git a/Core/src/org/sleuthkit/autopsy/core/layer.xml b/Core/src/org/sleuthkit/autopsy/core/layer.xml
index 923e8f5c5e..f9f537541d 100644
--- a/Core/src/org/sleuthkit/autopsy/core/layer.xml
+++ b/Core/src/org/sleuthkit/autopsy/core/layer.xml
@@ -40,6 +40,7 @@
     ====================================================== -->
     <folder name="Actions">
         <folder name="Case">
+            <attr name="SystemFileSystem.localizingBundle" stringvalue="org.sleuthkit.autopsy.core.Bundle"/>
             <file name="org-sleuthkit-autopsy-casemodule-AddImageAction.instance"/>
             <file name="org-sleuthkit-autopsy-casemodule-CaseCloseAction.instance"/>
             <file name="org-sleuthkit-autopsy-casemodule-CaseNewAction.instance">
@@ -140,13 +141,14 @@
         <file name="Edit_hidden"/>
         <file name="File_hidden"/>
         <folder name="Case">
+            <attr name="SystemFileSystem.localizingBundle" stringvalue="org.sleuthkit.autopsy.core.Bundle"/>
             <file name="org-sleuthkit-autopsy-casemodule-CaseNewAction.shadow">
                 <attr name="originalFile" stringvalue="Actions/Case/org-sleuthkit-autopsy-casemodule-CaseNewAction.instance"/>
                 <attr name="position" intvalue="100"/>
             </file>
-            <folder name="Open Recent Case">
+            <folder name="OpenRecentCase">
+                <attr name="SystemFileSystem.localizingBundle" stringvalue="org.sleuthkit.autopsy.core.Bundle"/>
                 <attr name="position" intvalue="101"/>
-                <attr name="SystemFileSystem.localizingBundle" stringvalue="org.sleuthkit.autopsy.casemodule.Bundle"/>
                 <file name="org-sleuthkit-autopsy-casemodule-RecentCasesAction.shadow">
                     <attr name="originalFile" stringvalue="Actions/Case/org-sleuthkit-autopsy-casemodule-RecentCases.instance"/>
                 </file>
@@ -281,7 +283,6 @@
         <folder name="Help">
             <file name="org-netbeans-core-actions-AboutAction.shadow_hidden"/>
             <file name="org-netbeans-modules-autoupdate-ui-actions-CheckForUpdatesAction.shadow_hidden"/>
-            <attr name="master-help.xml/org-sleuthkit-autopsy-corecomponents-CustomAboutAction.shadow" boolvalue="true"/>
         </folder>
     </folder>
 
@@ -378,6 +379,7 @@
         <file name="UndoRedo_hidden"/>
         <file name="File_hidden"/>
         <folder name="Case">
+            <attr name="SystemFileSystem.localizingBundle" stringvalue="org.sleuthkit.autopsy.core.Bundle"/>
             <attr name="position" intvalue="90"/>
             <!--<file name="org-sleuthkit-autopsy-casemodule-AddImageAction.instance">
                 <attr name="delegate" newvalue="org.sleuthkit.autopsy.casemodule.AddImageAction"/>
diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/AboutWindowAction.java b/Core/src/org/sleuthkit/autopsy/corecomponents/AboutWindowAction.java
index 00f0e7217a..3cdf7e354b 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 2deaab0d3b..d0ab1bf41d 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=About
+CTL_CustomAboutAction=About2
 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 16fa8d0e5f..b0bf308518 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=About
+CTL_CustomAboutAction=About2
 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 c648387016..500a7b8371 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=Listing
+DirectoryTreeTopComponent.resultsView.title=Listing2
 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 d2cd291de0..bb07ce3e4d 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=Listing"
+    "DirectoryTreeTopComponent.resultsView.title=Listing2"
 })
 @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 77a2b221ee..7354af0f0a 100755
--- a/Core/src/org/sleuthkit/autopsy/geolocation/Bundle.properties
+++ b/Core/src/org/sleuthkit/autopsy/geolocation/Bundle.properties
@@ -1,4 +1,4 @@
-CTL_OpenGeolocation=Geolocation
+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 ddec131b05..383ccdc62a 100755
--- a/Core/src/org/sleuthkit/autopsy/geolocation/Bundle.properties-MERGED
+++ b/Core/src/org/sleuthkit/autopsy/geolocation/Bundle.properties-MERGED
@@ -1,4 +1,4 @@
-CTL_OpenGeolocation=Geolocation
+CTL_OpenGeolocation=Geolocation2
 CTL_GeolocationTopComponentAction=GeolocationTopComponent
 CTL_GeolocationTopComponent=Geolocation
 GeoFilterPanel_ArtifactType_List_Title=Types
diff --git a/Core/src/org/sleuthkit/autopsy/livetriage/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/livetriage/Bundle.properties-MERGED
index 309a07d3da..94a7b13143 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 Drive
+CTL_CreateLiveTriageDriveAction=Make Live Triage Drive2
 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 b733f11dd9..ae4765f40e 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 Drive"})
+@NbBundle.Messages({"CTL_CreateLiveTriageDriveAction=Make Live Triage Drive2"})
 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/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/logicalimager/configuration/Bundle.properties-MERGED
index ef1ca31571..0adc1b526a 100644
--- a/Core/src/org/sleuthkit/autopsy/logicalimager/configuration/Bundle.properties-MERGED
+++ b/Core/src/org/sleuthkit/autopsy/logicalimager/configuration/Bundle.properties-MERGED
@@ -62,8 +62,8 @@ ConfigVisualPanel3.failedToSaveExeMsg=Failed to save tsk_logical_imager.exe file
 # {0} - reason
 ConfigVisualPanel3.reason=\nReason: {0}
 ConfigVisualPanel3.saveConfigurationFile=Save imager
-CreateLogicalImagerAction.title=Create Logical Imager
-CTL_CreateLogicalImagerAction=Create Logical Imager
+CreateLogicalImagerAction.title=Create Logical Imager2
+CTL_CreateLogicalImagerAction=Create Logical Imager2
 EditFullPathsRulePanel.example=Example: 
 EditFullPathsRulePanel.fullPaths=Full paths
 EditNonFullPathsRulePanel.emptyExtensionException=Extensions cannot have an empty entry
diff --git a/Core/src/org/sleuthkit/autopsy/logicalimager/configuration/CreateLogicalImagerAction.java b/Core/src/org/sleuthkit/autopsy/logicalimager/configuration/CreateLogicalImagerAction.java
index 002b9a526e..d11e424a0e 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 Imager")
+@Messages("CTL_CreateLogicalImagerAction=Create Logical Imager2")
 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 Imager"
+        "CreateLogicalImagerAction.title=Create Logical Imager2"
     })
     @Override
     public void performAction() {
diff --git a/Core/src/org/sleuthkit/autopsy/modules/leappanalyzers/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/modules/leappanalyzers/Bundle.properties-MERGED
index f46304e2be..a07ed802be 100644
--- a/Core/src/org/sleuthkit/autopsy/modules/leappanalyzers/Bundle.properties-MERGED
+++ b/Core/src/org/sleuthkit/autopsy/modules/leappanalyzers/Bundle.properties-MERGED
@@ -34,7 +34,11 @@ ILeappAnalyzerIngestModule.running.iLeapp=Running iLeapp
 ILeappAnalyzerIngestModule.starting.iLeapp=Starting iLeapp
 ILeappAnalyzerModuleFactory_moduleDesc=Uses iLEAPP to analyze logical acquisitions of iOS devices.
 ILeappAnalyzerModuleFactory_moduleName=iOS Analyzer (iLEAPP)
+LeappFileProcessor.cannot.create.calllog.relationship=Cannot create TSK_CALLLOG Relationship.
+LeappFileProcessor.cannot.create.contact.relationship=Cannot create TSK_CONTACT Relationship.
 LeappFileProcessor.cannot.create.message.relationship=Cannot create TSK_MESSAGE Relationship.
+LeappFileProcessor.cannot.create.trackpoint.relationship=Cannot create TSK_TRACK_POINT artifact.
+LeappFileProcessor.cannot.create.waypoint.relationship=Cannot create TSK_WAYPOINT artifact.
 LeappFileProcessor.cannot.load.artifact.xml=Cannot load xml artifact file.
 LeappFileProcessor.cannotBuildXmlParser=Cannot buld an XML parser.
 LeappFileProcessor.completed=Leapp Processing Completed
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..25a647df8f 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 Dashboard
+CTL_AutoIngestDashboardOpenAction=Auto Ingest Dashboard2
 CTL_AutoIngestDashboardTopComponent=Auto Ingest Jobs
 CTL_CasesDashboardAction=Multi-User Cases Dashboard
 CTL_CasesDashboardTopComponent=Cases