diff --git a/Core/src/org/sleuthkit/autopsy/centralrepository/contentviewer/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/centralrepository/contentviewer/Bundle.properties-MERGED
index cccefccf80..a97cc319da 100755
--- a/Core/src/org/sleuthkit/autopsy/centralrepository/contentviewer/Bundle.properties-MERGED
+++ b/Core/src/org/sleuthkit/autopsy/centralrepository/contentviewer/Bundle.properties-MERGED
@@ -24,6 +24,9 @@ OtherOccurrencesPanel.caseDetailsDialog.noCaseNameError=Error
OtherOccurrencesPanel.caseDetailsDialog.noDetails=No details for this case.
OtherOccurrencesPanel.caseDetailsDialog.noDetailsReference=No case details for Global reference properties.
OtherOccurrencesPanel.caseDetailsDialog.notSelected=No Row Selected
+# {0} - commonality percentage
+# {1} - correlation type
+# {2} - correlation value
OtherOccurrencesPanel.correlatedArtifacts.byType={0}% of data sources have {2} (type: {1})\n
OtherOccurrencesPanel.correlatedArtifacts.failed=Failed to get frequency details.
OtherOccurrencesPanel.correlatedArtifacts.isEmpty=There are no files or artifacts to correlate.
diff --git a/Core/src/org/sleuthkit/autopsy/centralrepository/ingestmodule/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/centralrepository/ingestmodule/Bundle.properties-MERGED
index de6d91c29f..cf2f2f4a12 100755
--- a/Core/src/org/sleuthkit/autopsy/centralrepository/ingestmodule/Bundle.properties-MERGED
+++ b/Core/src/org/sleuthkit/autopsy/centralrepository/ingestmodule/Bundle.properties-MERGED
@@ -1,21 +1,20 @@
-CentralRepoIngestModel_name_header=Name:
-CentralRepoIngestModel_previous_case_header=
Previous Cases:
-CentralRepoIngestModule.prevCaseComment.text=Previous Case:
-CentralRepoIngestModule.prevTaggedSet.text=Previously Tagged As Notable (Central Repository)
+CentralRepoIngestModule_artifact_type_inbox_msg_header=Artifact Type
CentralRepoIngestModule_cannotGetCrCaseErrMsg=Case not present in the central repository
CentralRepoIngestModule_cannotGetCrDataSourceErrMsg=Data source not present in the central repository
CentralRepoIngestModule_crDatabaseTypeMismatch=Mulit-user cases require a PostgreSQL central repository
CentralRepoIngestModule_crInaccessibleErrMsg=Error accessing central repository
CentralRepoIngestModule_crNotEnabledErrMsg=Central repository required, but not enabled
+CentralRepoIngestModule_filename_inbox_msg_header=File Name
+CentralRepoIngestModule_md5Hash_inbox_msg_header=MD5 Hash
CentralRepoIngestModule_missingFileCorrAttrTypeErrMsg=Correlation attribute type for files not found in the central repository
CentralRepoIngestModule_noCurrentCaseErrMsg=Error getting current case
-CentralRepoIngestModule_notable_message_header=A file in this data source was previously seen and tagged as Notable.
+CentralRepoIngestModule_notable_attr_inbox_msg_header=Notable Attribute
+# {0} - Name of item that is Notable
+CentralRepoIngestModule_notable_inbox_msg_subject=Notable: {0}
# {0} - list of cases
CentralRepoIngestModule_notableJustification=Previously marked as notable in cases {0}
CentralRepoIngestModule_notableSetName=Previously Tagged As Notable (Central Repository)
-CentralRepoIngestModule_osAcctMgrInaccessibleErrMsg=Error getting OS accounts manager
-# {0} - Name of file that is Notable
-CentralRepoIngestModule_postToBB_knownBadMsg=Notable: {0}
+CentralRepoIngestModule_prev_cases_inbox_msg_header=Previous Cases
# {0} - list of cases
CentralRepoIngestModule_prevSeenJustification=Previously seen in cases {0}
CentralRepoIngestModule_prevSeenOsAcctConfig=Previously Seen Users (Central Repository)
diff --git a/Core/src/org/sleuthkit/autopsy/centralrepository/ingestmodule/CentralRepoDataArtifactIngestModule.java b/Core/src/org/sleuthkit/autopsy/centralrepository/ingestmodule/CentralRepoDataArtifactIngestModule.java
index ff6393b638..74a42a3f43 100755
--- a/Core/src/org/sleuthkit/autopsy/centralrepository/ingestmodule/CentralRepoDataArtifactIngestModule.java
+++ b/Core/src/org/sleuthkit/autopsy/centralrepository/ingestmodule/CentralRepoDataArtifactIngestModule.java
@@ -20,7 +20,6 @@ package org.sleuthkit.autopsy.centralrepository.ingestmodule;
import java.util.ArrayList;
import java.util.HashSet;
-import java.util.LinkedHashSet;
import java.util.List;
import java.util.Set;
import java.util.logging.Level;
@@ -66,7 +65,6 @@ public class CentralRepoDataArtifactIngestModule implements DataArtifactIngestMo
private final boolean flagPrevSeenDevices;
private final boolean flagUniqueArtifacts;
private final boolean saveCorrAttrInstances;
- private final Set corrAttrsAnalyzed;
private CentralRepository centralRepo;
private IngestJobContext context;
@@ -84,7 +82,6 @@ public class CentralRepoDataArtifactIngestModule implements DataArtifactIngestMo
flagPrevSeenDevices = settings.isFlagPreviousDevices();
flagUniqueArtifacts = settings.isFlagUniqueArtifacts();
saveCorrAttrInstances = settings.shouldCreateCorrelationProperties();
- corrAttrsAnalyzed = new LinkedHashSet<>();
}
@NbBundle.Messages({
@@ -201,10 +198,6 @@ public class CentralRepoDataArtifactIngestModule implements DataArtifactIngestMo
}
for (CorrelationAttributeInstance corrAttr : corrAttrs) {
- if (!corrAttrsAnalyzed.add(corrAttr.toString())) {
- continue;
- }
-
if (artifact != null) {
makeAnalysisResults(artifact, corrAttr);
} else {