diff --git a/Core/src/org/sleuthkit/autopsy/centralrepository/persona/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/centralrepository/persona/Bundle.properties-MERGED
index 123bd71800..e8a7f9718a 100644
--- a/Core/src/org/sleuthkit/autopsy/centralrepository/persona/Bundle.properties-MERGED
+++ b/Core/src/org/sleuthkit/autopsy/centralrepository/persona/Bundle.properties-MERGED
@@ -6,10 +6,10 @@ AddMetadataDialog_empty_name_Title=Missing field(s)
 CreatePersonaAccountDialog.title.text=Create Account
 CreatePersonaAccountDialog_error_msg=Failed to create account.
 CreatePersonaAccountDialog_error_title=Account failure
-CreatePersonaAccountDialog_success_msg=Account added.
-CreatePersonaAccountDialog_success_title=Account added
 CreatePersonaAccountDialog_invalid_account_msg=Account identifier is not valid.
 CreatePersonaAccountDialog_invalid_account_Title=Invalid account identifier
+CreatePersonaAccountDialog_success_msg=Account added.
+CreatePersonaAccountDialog_success_title=Account added
 CTL_OpenPersonas=Personas
 CTL_PersonasTopComponentAction=Personas
 CTL_PersonaDetailsTopComponent=Persona Details
@@ -134,4 +134,4 @@ PersonasTopComponent_delete_exception_Title=Delete failure
 PersonasTopComponent_Name=Personas
 PersonasTopComponent_noCR_msg=Central Repository is not enabled.
 PersonasTopComponent_search_exception_msg=Failed to search personas.
-PersonasTopComponent_search_exception_Title=Search failure
+PersonasTopComponent_search_exception_Title=There was a failure during the search.  Try opening a case to fully initialize the central repository database.
diff --git a/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/Bundle.properties-MERGED
index 853a23d0db..dd5aa258cc 100755
--- a/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/Bundle.properties-MERGED
+++ b/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/Bundle.properties-MERGED
@@ -23,8 +23,6 @@ HashDbIngestModule.lookingUpKnownBadHashValueErr=Error encountered while looking
 HashDbIngestModule.lookingUpKnownHashValueErr=Error encountered while looking up known hash value for {0}.
 # {0} - fileName
 HashDbIngestModule.lookingUpNoChangeHashValueErr=Error encountered while looking up no change hash value for {0}.
-HashDbIngestModule.noChangeFileSearchWillNotExecuteWarn='No Change' file search will not be executed.
-HashDbIngestModule.noChangeHashDbSetMsg=No 'No Change' hash set.
 HashDbIngestModule.noKnownBadHashDbSetMsg=No notable hash set.
 HashDbIngestModule.noKnownHashDbSetMsg=No known hash set.
 HashDbManager.CentralRepoHashDb.orgError=Error loading organization
@@ -34,6 +32,8 @@ HashDbManager.knownBad.text=Notable
 HashDbManager.noChange.text=No Change
 # {0} - hash set name
 HashDbManager.noDbPath.message=Couldn't get valid hash set path for: {0}
+# {0} - hashSetName
+HashDbManager_handleNameConflict_conflictSuffix={0} (Custom)
 HashDbSearchAction.noOpenCase.errMsg=No open case available.
 HashDbSearchPanel.noOpenCase.errMsg=No open case available.
 HashLookupSettingsPanel.centralRepo=Central Repository
diff --git a/Core/src/org/sleuthkit/autopsy/modules/interestingitems/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/modules/interestingitems/Bundle.properties-MERGED
index 01660bb427..6fb258f014 100755
--- a/Core/src/org/sleuthkit/autopsy/modules/interestingitems/Bundle.properties-MERGED
+++ b/Core/src/org/sleuthkit/autopsy/modules/interestingitems/Bundle.properties-MERGED
@@ -12,7 +12,7 @@ FilesSetDefsPanel.exportButtonActionPerformed.fileExistPrompt=File {0} exists, o
 FilesSetDefsPanel.gigaBytes=Gigabytes
 # {0} - fileName
 # {1} - errorMessage
-FilesSetDefsPanel.importSetButtonActionPerformed.importError=The rules file "{0}" could not be read:\n"{1}."
+FilesSetDefsPanel.importSetButtonActionPerformed.importError=The rules file "{0}" could not be read:\n{1}.
 FilesSetDefsPanel.importSetButtonActionPerformed.noFiles=No files sets were found in the selected files.
 FilesSetDefsPanel.importSetButtonActionPerformed.noFilesSelected=No files sets were selected.
 # {0} - filter name
@@ -24,6 +24,7 @@ FilesSetDefsPanel.interesting.exportButtonAction.featureName=Interesting Files S
 FilesSetDefsPanel.interesting.ExportedMsg=Interesting files set exported
 FilesSetDefsPanel.interesting.exportSetButton.text=Export Set
 FilesSetDefsPanel.interesting.failExportMsg=Export of interesting files set failed
+FilesSetDefsPanel.interesting.failImportMsg=Interesting files set not imported
 FilesSetDefsPanel.interesting.fileExtensionFilterLbl=Autopsy Interesting File Set File (xml)
 FilesSetDefsPanel.interesting.importButtonAction.featureName=Interesting Files Set Import
 FilesSetDefsPanel.interesting.importOwConflict=Import Interesting files set conflict
@@ -33,7 +34,7 @@ FilesSetDefsPanel.interesting.newOwConflict=Interesting files set conflict
 FilesSetDefsPanel.interesting.overwriteSetPrompt=Interesting files set "{0}" already exists locally, overwrite?
 # {0} - FilesSet name
 # {1} - New FilesSet name
-FilesSetDefsPanel.interesting.standardFileConflict=A standard interesting file set already exists with the name "{0}."  Would you like to rename the set to "{1}?"
+FilesSetDefsPanel.interesting.standardFileConflict=A standard interesting file set already exists with the name "{0}."  Would you like to rename your set to "{1}?"
 FilesSetDefsPanel.Interesting.Title=Global Interesting Items Settings
 FilesSetDefsPanel.kiloBytes=Kilobytes
 FilesSetDefsPanel.loadError=Error loading interesting files sets from file.
@@ -64,7 +65,7 @@ FilesSetRulePanel.ZeroFileSizeError=File size condition value must not be 0 (Unl
 FilesSetsManager.allFilesAndDirectories=All Files and Directories (Not Unallocated Space)
 FilesSetsManager.allFilesDirectoriesAndUnallocated=All Files, Directories, and Unallocated Space
 # {0} - regex
-InterestingItemsFilesSetSettings.readDateCondition.failedCompiledRegex=Error detmining ''{0}'' number
+InterestingItemsFilesSetSettings.readDateCondition.failedCompiledRegex=Error determining ''{0}'' number
 # {0} - condition
 # {1} - rule
 InterestingItemsFilesSetSettings.readMetaTypeCondition.malformedXml=Files set is malformed for metatype condition, ''{0}'', in rule ''{1}''
@@ -180,3 +181,6 @@ FilesSetDefsPanel.mimeTypeLabel.text=MIME Type:
 FilesSetDefsPanel.fileSizeLabel.text=File Size:
 # {0} - filesSetName
 StandardInterestingFileSetsLoader.customSuffixed={0} (Custom)
+StandardInterestingFilesSetsLoader_cannotLoadStandard=Unable to properly read standard interesting files sets.
+StandardInterestingFilesSetsLoader_cannotLoadUserConfigured=Unable to properly read user-configured interesting files sets.
+StandardInterestingFilesSetsLoader_cannotUpdateInterestingFilesSets=Unable to write updated configuration for interesting files sets to config directory.