7895 CR data artifact ingest module

Core/src/org/sleuthkit/autopsy/actions/Bundle.properties-MERGED

@@ -6,19 +6,14 @@ AddBlackboardArtifactTagAction.unableToTag.msg=Unable to tag {0}.
 AddContentTagAction.cannotApplyTagErr=Cannot Apply Tag
 AddContentTagAction.pluralTagFile=Add File Tags
 AddContentTagAction.singularTagFile=Add File Tag
-# {0} - fileName
-# {1} - tagName
 AddContentTagAction.tagExists={0} has been tagged as {1}. Cannot reapply the same tag.
 AddContentTagAction.taggingErr=Tagging Error
-# {0} - fileName
 AddContentTagAction.unableToTag.msg=Unable to tag {0}, not a regular file.
-# {0} - fileName
 AddContentTagAction.unableToTag.msg2=Unable to tag {0}.
 CTL_DumpThreadAction=Thread Dump
 CTL_ShowIngestProgressSnapshotAction=Ingest Status Details
 DeleteBlackboardArtifactTagAction.deleteTag=Remove Selected Tag(s)
 DeleteBlackboardArtifactTagAction.tagDelErr=Tag Deletion Error
-# {0} - tagName
 DeleteBlackboardArtifactTagAction.unableToDelTag.msg=Unable to delete tag {0}.
 DeleteContentTagAction.deleteTag=Remove Selected Tag(s)
 DeleteContentTagAction.tagDelErr=Tag Deletion Error
@@ -84,8 +79,6 @@ CTL_OpenOutputFolder=Open Case Folder
 OpenOutputFolder.error1=Case Folder Not Found: {0}
 OpenOutputFolder.noCaseOpen=No open case, therefore no current case folder available.
 OpenOutputFolder.CouldNotOpenOutputFolder=Could not open case folder 
-# {0} - old tag name
-# {1} - artifactID
 ReplaceBlackboardArtifactTagAction.replaceTag.alert=Unable to replace tag {0} for artifact {1}.
 # {0} - old tag name
 # {1} - content obj id

Core/src/org/sleuthkit/autopsy/casemodule/Bundle.properties-MERGED

@@ -247,15 +247,10 @@ AddImageWizardIngestConfigPanel.dsProcDone.errs.text=*Errors encountered in addi
 AddImageWizardIngestConfigVisual.getName.text=Configure Ingest
 AddImageWizardIterator.stepXofN=Step {0} of {1}
 AddLocalFilesTask.localFileAdd.progress.text=Adding: {0}/{1}
-Case.getCurCase.exception.noneOpen=Cannot get the current case; there is no case open\!
+Case.getCurCase.exception.noneOpen=Cannot get the current case; there is no case open!
 Case.open.msgDlg.updated.msg=Updated case database schema.\nA backup copy of the database with the following path has been made:\n {0}
 Case.open.msgDlg.updated.title=Case Database Schema Update
-Case.checkImgExist.confDlg.doesntExist.msg=One of the images associated with \n\
+Case.checkImgExist.confDlg.doesntExist.msg=One of the images associated with \nthis case are missing. Would you like to search for them now?\nPreviously, the image was located at:\n{0}\nPlease note that you will still be able to browse directories and generate reports\nif you choose No, but you will not be able to view file content or run the ingest process.
-this case are missing. Would you like to search for them now?\n\
-Previously, the image was located at:\n\
-{0}\n\
-Please note that you will still be able to browse directories and generate reports\n\
-if you choose No, but you will not be able to view file content or run the ingest process.
 Case.checkImgExist.confDlg.doesntExist.title=Missing Image
 Case.addImg.exception.msg=Error adding image to the case
 Case.updateCaseName.exception.msg=Error while trying to update the case name.
@@ -274,12 +269,9 @@ Case.GetCaseTypeGivenPath.Failure=Unable to get case type
 Case.metaDataFileCorrupt.exception.msg=The case metadata file (.aut) is corrupted.
 Case.deleteReports.deleteFromDiskException.log.msg=Unable to delete the report from the disk.
 Case.deleteReports.deleteFromDiskException.msg=Unable to delete the report {0} from the disk.\nYou may manually delete it from {1}
-CaseDeleteAction.closeConfMsg.text=Are you sure want to close and delete this case? \n\
+CaseDeleteAction.closeConfMsg.text=Are you sure want to close and delete this case? \nCase Name: {0}\nCase Directory: {1}
-     Case Name: {0}\n\
-     Case Directory: {1}
 CaseDeleteAction.closeConfMsg.title=Warning: Closing the Current Case
-CaseDeleteAction.msgDlg.fileInUse.msg=The delete action cannot be fully completed because the folder or file in it is open by another program.\n\n\
+CaseDeleteAction.msgDlg.fileInUse.msg=The delete action cannot be fully completed because the folder or file in it is open by another program.\n\nClose the folder and file and try again or you can delete the case manually.
-Close the folder and file and try again or you can delete the case manually.
 CaseDeleteAction.msgDlg.fileInUse.title=Error: Folder In Use
 CaseDeleteAction.msgDlg.caseDelete.msg=Case {0} has been deleted.
 CaseOpenAction.autFilter.title={0} Case File ( {1})
@@ -311,8 +303,7 @@ NewCaseWizardAction.databaseProblem1.text=Cannot open database. Cancelling case
 NewCaseWizardAction.databaseProblem2.text=Error
 NewCaseWizardPanel1.validate.errMsg.invalidSymbols=The Case Name cannot contain any of the following symbols: \\ / : * ? " < > |
 NewCaseWizardPanel1.validate.errMsg.dirExists=Case directory ''{0}'' already exists.
-NewCaseWizardPanel1.validate.confMsg.createDir.msg=The base directory "{0}" does not exist. \n\n\
+NewCaseWizardPanel1.validate.confMsg.createDir.msg=The base directory "{0}" does not exist. \n\nDo you want to create that directory?
- Do you want to create that directory?
 NewCaseWizardPanel1.validate.confMsg.createDir.title=Create directory
 NewCaseWizardPanel1.validate.errMsg.cantCreateParDir.msg=Error: Could not create case parent directory {0}
 NewCaseWizardPanel1.validate.errMsg.prevCreateBaseDir.msg=Prevented from creating base directory {0}
@@ -341,7 +332,6 @@ OptionalCasePropertiesPanel.lbPointOfContactPhoneLabel.text=Phone:
 OptionalCasePropertiesPanel.orgainizationPanel.border.title=Organization
 RecentCases.exception.caseIdxOutOfRange.msg=Recent case index {0} is out of range.
 RecentCases.getName.text=Clear Recent Cases
-# {0} - case name
 RecentItems.openRecentCase.msgDlg.text=Case {0} no longer exists.
 SelectDataSourceProcessorPanel.name.text=Select Data Source Type
 StartupWindow.title.text=Welcome
@@ -354,7 +344,6 @@ StartupWindowProvider.openCase.noFile=Unable to open previously open case becaus
 UnpackagePortableCaseDialog.title.text=Unpackage Portable Case
 UnpackagePortableCaseDialog.UnpackagePortableCaseDialog.extensions=Portable case package (.zip, .zip.001)
 UnpackagePortableCaseDialog.validatePaths.badExtension=File extension must be .zip or .zip.001
-# {0} - case folder
 UnpackagePortableCaseDialog.validatePaths.caseFolderExists=Folder {0} already exists
 UnpackagePortableCaseDialog.validatePaths.caseIsNotFile=Selected path is not a file
 UnpackagePortableCaseDialog.validatePaths.caseNotFound=File does not exist
@@ -369,8 +358,8 @@ UnpackageWorker.doInBackground.previouslySeenCase=Case has been previously opene
 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
+NewCaseVisualPanel1.CaseFolderOnCDriveError.text=Warning: Path to multi-user case folder is on "C:" drive
-NewCaseVisualPanel1.CaseFolderOnInternalDriveWindowsError.text=Warning: Path to case folder is on \"C:\" drive. Case folder is created on the target system
+NewCaseVisualPanel1.CaseFolderOnInternalDriveWindowsError.text=Warning: Path to case folder is on "C:" drive. Case folder is created on the target system
 NewCaseVisualPanel1.CaseFolderOnInternalDriveLinuxError.text=Warning: Path to case folder is on the target system. Create case folder in mounted drive.
 NewCaseVisualPanel1.uncPath.error=Error: UNC paths are not allowed for Single-User cases
 CollaborationMonitor.addingDataSourceStatus.msg={0} adding data source
@@ -378,7 +367,7 @@ CollaborationMonitor.analyzingDataSourceStatus.msg={0} analyzing {1}
 MissingImageDialog.lbWarning.text=
 MissingImageDialog.lbWarning.toolTipText=
 NewCaseVisualPanel1.caseParentDirWarningLabel.text=
-NewCaseVisualPanel1.multiUserCaseRadioButton.text=Multi-User		
+NewCaseVisualPanel1.multiUserCaseRadioButton.text=Multi-User\t\t
 NewCaseVisualPanel1.singleUserCaseRadioButton.text=Single-User
 NewCaseVisualPanel1.caseTypeLabel.text=Case Type: 
 SingleUserCaseConverter.BadDatabaseFileName=Database file does not exist!

Core/src/org/sleuthkit/autopsy/centralrepository/Bundle.properties-MERGED

@@ -5,10 +5,7 @@ CentralRepoCommentDialog.title.addEditCentralRepoComment=Add/Edit Central Reposi
 OpenIDE-Module-Name=Central Repository
 OpenIDE-Module-Display-Category=Ingest Module
 OpenIDE-Module-Short-Description=Central Repository Ingest Module
-OpenIDE-Module-Long-Description=\
+OpenIDE-Module-Long-Description=Central Repository ingest module and central database.  \n\nThe Central Repository ingest module stores attributes of artifacts matching selected correlation types into a central database.\nStored attributes are used in future cases to correlate and analyzes files and artifacts during ingest.
-    Central Repository ingest module and central database.  \n\n\
-    The Central Repository ingest module stores attributes of artifacts matching selected correlation types into a central database.\n\
-    Stored attributes are used in future cases to correlate and analyzes files and artifacts during ingest.
 CentralRepoCommentDialog.commentLabel.text=Comment:
 CentralRepoCommentDialog.okButton.text=&OK
 CentralRepoCommentDialog.cancelButton.text=C&ancel

Core/src/org/sleuthkit/autopsy/centralrepository/contentviewer/Bundle.properties-MERGED

@@ -24,9 +24,6 @@ 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.

Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/CorrelationAttributeUtil.java

@@ -115,19 +115,20 @@ public class CorrelationAttributeUtil {
     }
 
     /**
-     * Gets the correlation attributes for an OS account.
+     * Gets the correlation attributes for an OS account instance represented as
+     * an OS account plus a data source.
      *
      * @param account    The OS account.
+     * @param dataSource The data source.
      *
      * @return The correlation attributes.
      */
-    public static List<CorrelationAttributeInstance> makeCorrAttrsToSave(OsAccount account) {
+    public static List<CorrelationAttributeInstance> makeCorrAttrsToSave(OsAccount account, Content dataSource) {
         List<CorrelationAttributeInstance> correlationAttrs = new ArrayList<>();
         if (CentralRepository.isEnabled()) {
             Optional<String> accountAddr = account.getAddr();
             if (accountAddr.isPresent() && !isSystemOsAccount(accountAddr.get())) {
                 try {
-                    Content dataSource = account.getDataSource();
                     CorrelationCase correlationCase = CentralRepository.getInstance().getCase(Case.getCurrentCaseThrows());
                     CorrelationAttributeInstance correlationAttributeInstance = new CorrelationAttributeInstance(
                             CentralRepository.getInstance().getCorrelationTypeById(CorrelationAttributeInstance.OSACCOUNT_TYPE_ID),
@@ -139,8 +140,6 @@ public class CorrelationAttributeUtil {
                             TskData.FileKnown.KNOWN,
                             account.getId());
                     correlationAttrs.add(correlationAttributeInstance);
-                } catch (TskCoreException ex) {
-                    logger.log(Level.SEVERE, String.format("Error getting data source for OS account '%s'", accountAddr.get()), ex);  //NON-NLS
                 } catch (CentralRepoException ex) {
                     logger.log(Level.SEVERE, String.format("Error querying central repository for OS account '%s'", accountAddr.get()), ex);  //NON-NLS
                 } catch (NoCurrentCaseException ex) {
@@ -832,8 +831,7 @@ public class CorrelationAttributeUtil {
         List<CorrelationAttributeInstance> correlationAttrs = new ArrayList<>();
         if (CentralRepository.isEnabled() && osAccountInst != null) {
             try {
-                OsAccount osAccount = osAccountInst.getOsAccount();
+                correlationAttrs.addAll(makeCorrAttrsToSave(osAccountInst.getOsAccount(), osAccountInst.getDataSource()));
-                correlationAttrs.addAll(makeCorrAttrsToSave(osAccount));
             } catch (TskCoreException ex) {
                 logger.log(Level.SEVERE, String.format("Error getting OS account from OS account instance '%s'", osAccountInst), ex);
             }

Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/CorrelationDataSource.java

@@ -106,7 +106,7 @@ public class CorrelationDataSource implements Serializable {
      *                        data aosurce.
      * @param dataSource      The case database data source.
      *
-     * @return The cnetral repository data source.
+     * @return The central repository data source.
      *
      * @throws CentralRepoException This exception is thrown if there is an
      *                              error creating the central repository data
@@ -114,7 +114,7 @@ public class CorrelationDataSource implements Serializable {
      */
     public static CorrelationDataSource fromTSKDataSource(CorrelationCase correlationCase, Content dataSource) throws CentralRepoException {
         if (!CentralRepository.isEnabled()) {
-            throw new CentralRepoException("Central repository is not enabled, cannot create central repository data source, ");
+            throw new CentralRepoException(String.format("Central repository is not enabled, cannot create central repository data source for '%s'", dataSource));
         }
 
         Case curCase;
@@ -142,7 +142,6 @@ public class CorrelationDataSource implements Serializable {
             } catch (TskDataException | TskCoreException ex) {
                 throw new CentralRepoException("Error getting data source info from case database", ex);
             }
-
             correlationDataSource = new CorrelationDataSource(correlationCase, deviceId, dataSource.getName(), dataSource.getId(), md5, sha1, sha256);
             correlationDataSource = CentralRepository.getInstance().newDataSource(correlationDataSource);
         }

Core/src/org/sleuthkit/autopsy/centralrepository/ingestmodule/CentralRepoDataArtifactIngestModule.java

@@ -209,7 +209,7 @@ public class CentralRepoDataArtifactIngestModule implements DataArtifactIngestMo
         try {
             List<OsAccount> osAccounts = osAccountMgr.getOsAccountsByDataSourceObjId(dataSource.getId());
             for (OsAccount osAccount : osAccounts) {
-                process(osAccount);
+                process(osAccount, dataSource);
             }
         } catch (TskCoreException ex) {
             LOGGER.log(Level.SEVERE, String.format("Error getting OS accounts for data source %s (job ID=%d)", dataSource, ingestJobId), ex);
@@ -217,15 +217,16 @@ public class CentralRepoDataArtifactIngestModule implements DataArtifactIngestMo
     }
 
     /**
-     * Translates the attributes of a OS account into central repository
+     * Translates the attributes of a OS account and its data source (an OS
-     * correlation attributes and uses them to create analysis results and new
+     * account instance) into central repository correlation attributes and uses
-     * central repository correlation attribute instances, depending on ingest
+     * them to create analysis results and new central repository correlation
-     * job settings.
+     * attribute instances, depending on ingest job settings.
      *
      * @param osAccount  The OS account.
+     * @param dataSource The data source.
      */
-    private void process(OsAccount osAccount) {
+    private void process(OsAccount osAccount, Content dataSource) {
-        List<CorrelationAttributeInstance> corrAttrs = CorrelationAttributeUtil.makeCorrAttrsToSave(osAccount);
+        List<CorrelationAttributeInstance> corrAttrs = CorrelationAttributeUtil.makeCorrAttrsToSave(osAccount, dataSource);
         for (CorrelationAttributeInstance corrAttr : corrAttrs) {
             if (!corrAttrsAlreadyCreated.add(corrAttr.toString())) {
                 /*

Core/src/org/sleuthkit/autopsy/contentviewers/Bundle.properties-MERGED

@@ -402,44 +402,29 @@ viewer.menu.help.about.label = About ICEpdf viewer...
 
 ## General error dialog
 viewer.dialog.error.exception.title=ICEsoft ICEpdf - Exception
-viewer.dialog.error.exception.msg =  \
+viewer.dialog.error.exception.msg=There was an error executing your command do to the following exception\n{0}.
-  There was an error executing your command do to the following exception\n\
-  {0}.
 
 ## Open File Dialog
 viewer.dialog.openFile.title=Open File
 viewer.dialog.openFile.error.title=ICEsoft ICEpdf - Open File Error
-viewer.dialog.openFile.error.msg = \
+viewer.dialog.openFile.error.msg=ICEpdf could not open the specified file at {0}\nThe file may be corrupt or not a supported file type.
-  ICEpdf could not open the specified file at {0}\n\
-  The file may be corrupt or not a supported file type.
 
 viewer.dialog.openDocument.pdfException.title=ICEsoft ICEpdf - PDF Exception
-viewer.dialog.openDocument.pdfException.msg =  \
+viewer.dialog.openDocument.pdfException.msg=ICEpdf could not open the specified file {0} \nThe file may be corrupt or not a supported file type.
-  ICEpdf could not open the specified file {0} \n\
-  The file may be corrupt or not a supported file type.
 
 viewer.dialog.openDocument.pdfSecurityException.title=ICEsoft ICEpdf - PDF Security Exception
-viewer.dialog.openDocument.pdfSecurityException.msg =  \
+viewer.dialog.openDocument.pdfSecurityException.msg=ICEpdf could not open the encrypted file at {0}\nThis may be the result of an invalid password or a missing JCE Security Provider.\n\nPlease refer to ICEpdf Developer's Guide for more information.
-  ICEpdf could not open the encrypted file at {0}\n\
-  This may be the result of an invalid password or a missing JCE Security Provider.\n\n\
-  Please refer to ICEpdf Developer's Guide for more information.
 
 viewer.dialog.openDocument.exception.title=ICEsoft ICEpdf - Exception
-viewer.dialog.openDocument.exception.msg =  \
+viewer.dialog.openDocument.exception.msg=ICEpdf could not open the specified file at {0}\nThe file may be corrupt or not a supported file type.
-  ICEpdf could not open the specified file at {0}\n\
-  The file may be corrupt or not a supported file type.
 
 viewer.dialog.openURL.exception.title=ICEsoft ICEpdf - URL Exception
-viewer.dialog.openURL.exception.msg = \
+viewer.dialog.openURL.exception.msg=ICEpdf could not open the specified file. {0} \nat URL: {1}
-  ICEpdf could not open the specified file. {0} \n\
-  at URL: {1}
 viewer.dialog.openURL.downloading.msg=Downloading {0}
 
 ## General error dialog
 viewer.dialog.information.copyAll.title=ICEsoft ICEpdf - Information
-viewer.dialog.information.copyAll.msg = \
+viewer.dialog.information.copyAll.msg=The document has more than {0} pages, please use\n"Export text..." to extract document text.
-  The document has more than {0} pages, please use\n\
-  "Export text..." to extract document text.
 
 ## Open URL Dialog
 viewer.dialog.security.title=Document Security
@@ -457,13 +442,11 @@ viewer.dialog.openURL.title = Open URL
 ### Save a Copy Dialog
 viewer.dialog.saveAs.title=Save As
 viewer.dialog.saveAs.extensionError.title=ICEsoft ICEpdf - Save Error
-viewer.dialog.saveAs.extensionError.msg = \
+viewer.dialog.saveAs.extensionError.msg=ICEpdf could not save to {0} because it is not a supported file type.
-  ICEpdf could not save to {0} because it is not a supported file type.
 viewer.dialog.saveAs.noExtensionError.title=ICEsoft ICEpdf - Save Error
 viewer.dialog.saveAs.noExtensionError.msg=Please specify a file extension.
 viewer.dialog.saveAs.noneUniqueName.title=ICEsoft ICEpdf - Save Error
-viewer.dialog.saveAs.noneUniqueName.msg = \
+viewer.dialog.saveAs.noneUniqueName.msg=The file named {0} already exists. Please specify a unique name.
-  The file named {0} already exists. Please specify a unique name.
 viewer.dialog.saveAs.noPermission.title=ICEpdf Viewer RI - Save Error
 viewer.dialog.saveAs.noPermission.msg=You do not have permission or the credentials to save this document.
 viewer.dialog.saveAs.noUpdates.title=ICEpdf Viewer RI
@@ -480,25 +463,19 @@ viewer.dialog.exportText.noExtensionError.msg = Please specify a file extension.
 viewer.exportText.fileStamp.msg=ICEsoft ICEpdf Viewer, (c) ICEsoft Technologies, Inc.
 viewer.exportText.pageStamp.msg=<!----- Page {0} Text ----> 
 # Completed x out of y page(s).
-viewer.exportText.fileStamp.progress.msg = \
+viewer.exportText.fileStamp.progress.msg=Completed {0} out of {1}.
-  Completed {0} out of {1}.
 viewer.exportText.fileStamp.progress.oneFile.msg={2} page
 viewer.exportText.fileStamp.progress.moreFile.msg={2} pages
 
 ## Export SVG Dialog
 viewer.dialog.exportSVG.title=Export to SVG
 viewer.dialog.exportSVG.status.exporting.msg=Exporting page {0} to SVG file {1} ...
-viewer.dialog.exportSVG.status.error.msg = \
+viewer.dialog.exportSVG.status.error.msg=Problem exporting page {0} to SVG file {1} : {2}
-  Problem exporting page {0} to SVG file {1} : {2}
+viewer.dialog.exportSVG.status.finished.msg=Finished exporting page {0} to SVG file {1}
-viewer.dialog.exportSVG.status.finished.msg = \
-  Finished exporting page {0} to SVG file {1}
 viewer.dialog.exportSVG.noExtensionError.title=ICEsoft ICEpdf - SVG Error
 viewer.dialog.exportSVG.noExtensionError.msg=Please specify a file extension.
 viewer.dialog.exportSVG.exportError.title=ICEsoft ICEpdf - SVG Error
-viewer.dialog.exportSVG.exportError.msg = \
+viewer.dialog.exportSVG.exportError.msg=ICEpdf could not export to {0} \nbecuase it is either not a supported file type or \nbecause the file has been corrupted.
-  ICEpdf could not export to {0} \n\
-  becuase it is either not a supported file type or \n\
-  because the file has been corrupted.
 
 # Printing Progress bar
 viewer.dialog.printing.status.progress.msg=Page {0} of {1}
@@ -547,10 +524,7 @@ viewer.dialog.goToPage.description.label = Page Number
 
 ## About Dialog
 viewer.dialog.about.title=About ICEpdf Viewer
-viewer.dialog.about.pageNumber.label = \n\
+viewer.dialog.about.pageNumber.label=\n\nCheck the ICEpdf web site for the latest news:\nhttp://www.icepdf.org/ \n\n
-\n\
-Check the ICEpdf web site for the latest news:\n\
-http://www.icepdf.org/ \n\n
 
 ## Font Properties Dialog
 viewer.dialog.fonts.title=Document Font Properties
@@ -575,8 +549,7 @@ viewer.utilityPane.attachments.column.size.title = Size
 viewer.utilityPane.attachments.column.compressedSize.title=Compressed size
 viewer.utilityPane.attachments.menu.saveAs.label=Save As...
 viewer.utilityPane.attachments.saveAs.replace.title=ICEsoft ICEpdf - Save Error
-viewer.utilityPane.attachments.saveAs.replace.msg = \
+viewer.utilityPane.attachments.saveAs.replace.msg=The file named {0} already exists. Do you want to replace It?
-  The file named {0} already exists. Do you want to replace It?
 
 ## Utility Pane Thumbnails
 viewer.utilityPane.thumbs.tab.title=Thumbnails
@@ -586,25 +559,20 @@ viewer.utilityPane.layers.tab.title = Layers
 
 ## Signature Pane
 viewer.utilityPane.signatures.tab.title=Signatures
-viewer.utilityPane.signatures.tab.certTree.error.label = \
+viewer.utilityPane.signatures.tab.certTree.error.label=Unsigned Signature Fields Signer certificate could not be validated {0} {1}
-  Unsigned Signature Fields Signer certificate could not be validated {0} {1}
 viewer.utilityPane.signatures.tab.certTree.rootSigned.label=Signed by {0} {1}
 viewer.utilityPane.signatures.tab.certTree.rootValidating.label=Validating signature {0} {1}
 viewer.utilityPane.signatures.tab.certTree.cert.invalid.label=Signature is invalid:
 viewer.utilityPane.signatures.tab.certTree.cert.unknown.label=Signature is valid:
 viewer.utilityPane.signatures.tab.certTree.cert.valid.label=Signature validity is unknown:
-viewer.utilityPane.signatures.tab.certTree.doc.modified.label = \
+viewer.utilityPane.signatures.tab.certTree.doc.modified.label=This version of the document is unaltered but subsequent changes have been made
-  This version of the document is unaltered but subsequent changes have been made
 viewer.utilityPane.signatures.tab.certTree.doc.unmodified.label=Document has not been modified since it was signed
 viewer.utilityPane.signatures.tab.certTree.doc.major.label=Document has been altered or corrupted since it was signed
-viewer.utilityPane.signatures.tab.certTree.signature.identity.unknown.label = \
+viewer.utilityPane.signatures.tab.certTree.signature.identity.unknown.label=Signer's identity is unknown because it could not be found in your keystore
-  Signer's identity is unknown because it could not be found in your keystore
+viewer.utilityPane.signatures.tab.certTree.signature.identity.unchecked.label=Signature is valid, but revocation of the signer's identity could not be checked
-viewer.utilityPane.signatures.tab.certTree.signature.identity.unchecked.label = \
-  Signature is valid, but revocation of the signer's identity could not be checked
 viewer.utilityPane.signatures.tab.certTree.signature.identity.valid.label=Signer's identity is valid
 viewer.utilityPane.signatures.tab.certTree.signature.time.local.label=Signing time is from the clock on this signer's computer
-viewer.utilityPane.signatures.tab.certTree.signature.time.embedded.label = \
+viewer.utilityPane.signatures.tab.certTree.signature.time.embedded.label=Signature included an embedded timestamp but it could not be validated
-  Signature included an embedded timestamp but it could not be validated
 viewer.utilityPane.signatures.tab.certTree.signature.details.label=Signature Details
 viewer.utilityPane.signatures.tab.certTree.signature.details.reason.label=Reason: {0}
 viewer.utilityPane.signatures.tab.certTree.signature.details.location.label=Location: {0}
@@ -629,13 +597,11 @@ viewer.utilityPane.signatures.cert.dialog.info.serialNumber.value = {0}
 viewer.utilityPane.signatures.cert.dialog.info.signatureAlgorithm.label=Signature Algorithm
 viewer.utilityPane.signatures.cert.dialog.info.signatureAlgorithm.value={0}
 viewer.utilityPane.signatures.cert.dialog.info.issuer.label=Issuer
-viewer.utilityPane.signatures.cert.dialog.info.issuer.value = \
+viewer.utilityPane.signatures.cert.dialog.info.issuer.value=Organization: {0} \nOrganization Unit: {1} \nCommon Name: {2} \nLocal: {3} \nState: {4} \nCountry: {5} \nEmail: {6}
-  Organization: {0} \nOrganization Unit: {1} \nCommon Name: {2} \nLocal: {3} \nState: {4} \nCountry: {5} \nEmail: {6}
 viewer.utilityPane.signatures.cert.dialog.info.validity.label=Validity
 viewer.utilityPane.signatures.cert.dialog.info.validity.value=From: {0}\n  To: {1}
 viewer.utilityPane.signatures.cert.dialog.info.subject.label=Subject
-viewer.utilityPane.signatures.cert.dialog.info.subject.value = \
+viewer.utilityPane.signatures.cert.dialog.info.subject.value=Organization: {0} \nOrganization Unit: {1} \nCommon Name: {2} \nLocal: {3} \nState: {4} \nCountry: {5} \nEmail: {6}
-  Organization: {0} \nOrganization Unit: {1} \nCommon Name: {2} \nLocal: {3} \nState: {4} \nCountry: {5} \nEmail: {6}
 viewer.utilityPane.signatures.cert.dialog.info.signature.label=Signature
 viewer.utilityPane.signatures.cert.dialog.info.md5.label=MD5 Fingerprint
 viewer.utilityPane.signatures.cert.dialog.info.md5.value={0}
@@ -847,8 +813,7 @@ viewer.utilityPane.search.showPagesCheckbox.label = Show Pages
 viewer.utilityPane.search.stopButton.label=Stop
 viewer.utilityPane.search.searching.msg=Search...
 # Searching x out of y page(s)
-viewer.utilityPane.search.searching1.msg = \
+viewer.utilityPane.search.searching1.msg=Searching {0} out of {1}
-  Searching {0} out of {1}
 viewer.utilityPane.search.searching1.oneFile.msg={2} page
 viewer.utilityPane.search.searching1.moreFile.msg={2} pages
 # Page x (y result(s))
@@ -856,8 +821,7 @@ viewer.utilityPane.search.result.msg = Page {0} ({1})
 viewer.utilityPane.search.result.oneFile.msg={2} result
 viewer.utilityPane.search.result.moreFile.msg={2} results
 # Searched x page(s) (y matches)
-viewer.utilityPane.search.progress.msg = \
+viewer.utilityPane.search.progress.msg=Searched {0} {1} ({2})
-  Searched {0} {1} ({2})
 viewer.utilityPane.search.progress.onePage.msg=page
 viewer.utilityPane.search.progress.morePage.msg=pages
 viewer.utilityPane.search.progress.oneMatch.msg={2} match
@@ -901,18 +865,14 @@ viewer.annotation.signature.validation.common.invalid.label = Signature is inval
 viewer.annotation.signature.validation.common.unknown.label=Signature is valid:
 viewer.annotation.signature.validation.common.valid.label=Signature validity is unknown:
 viewer.annotation.signature.validation.common.signedBy.label=- Signed by {0} {1}
-viewer.annotation.signature.validation.common.doc.modified.label = \
+viewer.annotation.signature.validation.common.doc.modified.label=- This version of the document is unaltered but subsequent changes have been made
-  - This version of the document is unaltered but subsequent changes have been made
 viewer.annotation.signature.validation.common.doc.unmodified.label=- Document has not been modified since it was signed
 viewer.annotation.signature.validation.common.doc.major.label=- Document has been altered or corrupted since it was signed
-viewer.annotation.signature.validation.common.identity.unknown.label = \
+viewer.annotation.signature.validation.common.identity.unknown.label=- Signer's identity is unknown because it could not be found in your keystore
-  - Signer's identity is unknown because it could not be found in your keystore
+viewer.annotation.signature.validation.common.identity.unchecked.label=- Signature is valid, but revocation of the signer's identity could not be checked
-viewer.annotation.signature.validation.common.identity.unchecked.label = \
-  - Signature is valid, but revocation of the signer's identity could not be checked
 viewer.annotation.signature.validation.common.identity.valid.label=- Signer's identity is valid
 viewer.annotation.signature.validation.common.time.local.label=- Signing time is from the clock on this signer's computer
-viewer.annotation.signature.validation.common.time.embedded.label = \
+viewer.annotation.signature.validation.common.time.embedded.label=- Signature included an embedded timestamp but it could not be validated
-  - Signature included an embedded timestamp but it could not be validated
 viewer.annotation.signature.validation.common.notAvailable.label=N/A
 
 ## Signatures properties Dialog.
@@ -945,16 +905,14 @@ pilot.title = ICEbrowser - ICEpdf Pilot Errror
 pilot.loading.msg=Opening document {0} ...
 pilot.display.msg=Displaying {0}
 pilot.loading.error.msg=PDF Pilot: Failed to load {0}.
-pilot.error.classLoading = Required class {0} not found. Required library \
+pilot.error.classLoading=Required class {0} not found. Required library 'icepdf.jar' may not be on the classpath - PDF Pilot disabled.";
-   'icepdf.jar' may not be on the classpath - PDF Pilot disabled.";
 
 ###
 # General Error Messages
 
 
 # Command Line Errors
-viewer.commandLin.error = \
+viewer.commandLin.error=Usage: java org.icepdf.ri.viewer.Main [-loadfile <value>] [-loadurl <value>]
-    Usage: java org.icepdf.ri.viewer.Main [-loadfile <value>] [-loadurl <value>]
 # Launcher errors
 viewer.launcher.URLError.dialog.title=ICEsoft ICEpdf
 viewer.launcher.URLError.dialog.message=ICEpdf could not open the specified file. {0} at URL: {1}.
@@ -975,40 +933,21 @@ parse.laf = Warning : look-and-feel {0} is not supported.
 manager.properties.title=ICEpdf Properties Manager
 fontManager.properties.title=ICEpdf Font Manager
 
-manager.properties.createNewDirectory = \
+manager.properties.createNewDirectory=To create the directory {0},\nwhere the ICEpdf Viewer will store changes to its setup, click Yes.\n\nIf you click "No", all changes you make to the ICEpdf Viewer setup\nwill be lost when you quit the application. \n\n
-    To create the directory {0},\n\
-    where the ICEpdf Viewer will store changes to its setup, click Yes.\n\n\
-    If you click "No", all changes you make to the ICEpdf Viewer setup\n\
-    will be lost when you quit the application. \n\n
 
-manager.properties.failedCreation = \
+manager.properties.failedCreation=ICEpdf Viewer directory to store user data can not be created:\n{0}\nICEpdf Viewer will not save changes to its default setup.
-    ICEpdf Viewer directory to store user data can not be created:\n\
-    {0}\n\
-    ICEpdf Viewer will not save changes to its default setup.
 
-manager.properties.session.nolock = \
+manager.properties.session.nolock=Error creating the lock file :\n{0}\n
-    Error creating the lock file :\n\
-    {0}\n
 
-manager.properties.session.readError = \
+manager.properties.session.readError=Error loading properties file: \n{0}
-    Error loading properties file: \n\
-    {0}
 
-manager.properties.deleted = Property file has been deleted\n\
+manager.properties.deleted=Property file has been deleted\n({0})\nRecreate it ?
-    ({0})\n\
-    Recreate it ?
 
-manager.properties.modified = Property file has been modified since last update\n\
+manager.properties.modified=Property file has been modified since last update\n({0,date,long})\nWould you like to merge changes in the file with the current properties?
-({0,date,long})\n\
-Would you like to merge changes in the file with the current properties?
 
-manager.properties.saveError = Impossible to save property file.\n\
+manager.properties.saveError=Impossible to save property file.\nEncountered the folowing error :\n{0}
-Encountered the folowing error :\n\
-{0}
 
-manager.properties.lafError  =\
+manager.properties.lafError=Look&Feel {0} given in the default properties is unsupported.\nUsing system default.
-  Look&Feel {0} given in the default properties is unsupported.\n\
-  Using system default.
 
 manager.properties.brokenProperty=Broken default property {0} value: {1}
 

Core/src/org/sleuthkit/autopsy/core/Bundle.properties-MERGED

@@ -3,13 +3,7 @@ Installer.closing.confirmationDialog.title=Ingest is Running
 # {0} - exception message
 Installer.closing.messageBox.caseCloseExceptionMessage=Error closing case: {0}
 OpenIDE-Module-Display-Category=Infrastructure
-OpenIDE-Module-Long-Description=\
+OpenIDE-Module-Long-Description=This is the core Autopsy module.\n\nThe module contains the core components needed for the bare application to run; the RCP platform, windowing GUI, sleuthkit bindings, datamodel /  storage, explorer, result viewers, content viewers, ingest framework, reporting, and core tools, such as the file search.\n\nThe framework included in the module contains APIs for developing modules for ingest, viewers and reporting.  The modules can be deployed as Plugins using the Autopsy plugin installer.\nThis module should not be uninstalled - without it, Autopsy will not run.\n\nFor more information, see http://www.sleuthkit.org/autopsy/
-    This is the core Autopsy module.\n\n\
-    The module contains the core components needed for the bare application to run; the RCP platform, windowing GUI, sleuthkit bindings, datamodel /  storage, explorer, result viewers, content viewers, ingest framework, reporting, and core tools, such as the file search.\n\n\
-    The framework included in the module contains APIs for developing modules for ingest, viewers and reporting.  \
-    The modules can be deployed as Plugins using the Autopsy plugin installer.\n\
-    This module should not be uninstalled - without it, Autopsy will not run.\n\n\
-    For more information, see http://www.sleuthkit.org/autopsy/
 OpenIDE-Module-Name=Autopsy-Core
 OpenIDE-Module-Short-Description=Autopsy Core Module
 org_sleuthkit_autopsy_core_update_center=http://sleuthkit.org/autopsy/updates.xml

Core/src/org/sleuthkit/autopsy/corecomponents/Bundle.properties-MERGED

@@ -75,9 +75,9 @@ DataContentViewerHex.totalPageLabel.text_1=100
 DataContentViewerHex.pageLabel2.text=Page
 
 # Product Information panel
-LBL_Description=<div style=\"font-size: 12pt; font-family: Verdana, 'Verdana CE',  Arial, 'Arial CE', 'Lucida Grande CE', lucida, 'Helvetica CE', sans-serif;\">\n    <b>Product Version:</b> {0} ({9}) <br><b>Sleuth Kit Version:</b> {7} <br><b>Netbeans RCP Build:</b> {8} <br> <b>Java:</b> {1}; {2}<br> <b>System:</b> {3}; {4}; {5}<br><b>Userdir:</b> {6}</div>
+LBL_Description=<div style="font-size: 12pt; font-family: Verdana, 'Verdana CE',  Arial, 'Arial CE', 'Lucida Grande CE', lucida, 'Helvetica CE', sans-serif;">\n    <b>Product Version:</b> {0} ({9}) <br><b>Sleuth Kit Version:</b> {7} <br><b>Netbeans RCP Build:</b> {8} <br> <b>Java:</b> {1}; {2}<br> <b>System:</b> {3}; {4}; {5}<br><b>Userdir:</b> {6}</div>
 Format_OperatingSystem_Value={0} version {1} running on {2}
-LBL_Copyright=<div style\="font-size: 12pt; font-family: Verdana, 'Verdana CE',  Arial, 'Arial CE', 'Lucida Grande CE', lucida, 'Helvetica CE', sans-serif; ">Autopsy&trade; is a digital forensics platform based on The Sleuth Kit&trade; and other tools. <br><ul><li>General Information: <a style\="color: \#1E2A60;" href\="http://www.sleuthkit.org">http://www.sleuthkit.org</a>.</li><li>Training: <a style\="color: \#1E2A60;" href\="https://www.autopsy.com/support/training/">https://www.autopsy.com/support/training/</a></li><li>Support: <a style\="color: \#1E2A60;" href\="https://www.sleuthkit.org/support.php">https://www.sleuthkit.org/support.php</a></li></ul>Copyright &copy; 2003-2020. </div>
+LBL_Copyright=<div style="font-size: 12pt; font-family: Verdana, 'Verdana CE',  Arial, 'Arial CE', 'Lucida Grande CE', lucida, 'Helvetica CE', sans-serif; ">Autopsy&trade; is a digital forensics platform based on The Sleuth Kit&trade; and other tools. <br><ul><li>General Information: <a style="color: #1E2A60;" href="http://www.sleuthkit.org">http://www.sleuthkit.org</a>.</li><li>Training: <a style="color: #1E2A60;" href="https://www.autopsy.com/support/training/">https://www.autopsy.com/support/training/</a></li><li>Support: <a style="color: #1E2A60;" href="https://www.sleuthkit.org/support.php">https://www.sleuthkit.org/support.php</a></li></ul>Copyright &copy; 2003-2020. </div>
 SortChooser.dialogTitle=Choose Sort Criteria
 ThumbnailViewChildren.progress.cancelling=(Cancelling)
 # {0} - file name
@@ -105,7 +105,7 @@ DataResultViewerThumbnail.pageNextButton.text=
 DataResultViewerThumbnail.imagesLabel.text=Images:
 DataResultViewerThumbnail.imagesRangeLabel.text=-
 DataResultViewerThumbnail.pageNumLabel.text=-
-DataResultViewerThumbnail.filePathLabel.text=\ \ \ 
+DataResultViewerThumbnail.filePathLabel.text=\   
 DataResultViewerThumbnail.goToPageLabel.text=Go to Page:
 DataResultViewerThumbnail.goToPageField.text=
 AdvancedConfigurationDialog.cancelButton.text=Cancel

Core/src/org/sleuthkit/autopsy/coreutils/Bundle.properties-MERGED

@@ -30,9 +30,7 @@ PlatformUtil.getProcVmUsed.sigarNotInit.msg=Cannot get virt mem used, sigar not
 PlatformUtil.getProcVmUsed.gen.msg=Cannot get virt mem used, {0}
 PlatformUtil.getJvmMemInfo.usageText=JVM heap usage: {0}, JVM non-heap usage: {1}
 PlatformUtil.getPhysicalMemInfo.usageText=Physical memory usage (max, total, free): {0}, {1}, {2}
-PlatformUtil.getAllMemUsageInfo.usageText={0}\n\
+PlatformUtil.getAllMemUsageInfo.usageText={0}\n{1}\nProcess Virtual Memory: {2}
-{1}\n\
-Process Virtual Memory: {2}
 # {0} - file name
 ReadImageTask.mesageText=Reading image: {0}
 StringExtract.illegalStateException.cannotInit.msg=Unicode table not properly initialized, cannot instantiate StringExtract

Core/src/org/sleuthkit/autopsy/datamodel/Bundle.properties-MERGED

@@ -313,10 +313,10 @@ ImageNode.getActions.viewInNewWin.text=View in New Window
 ImageNode.createSheet.name.name=Name
 ImageNode.createSheet.name.displayName=Name
 ImageNode.createSheet.name.desc=no description
-Installer.exception.tskVerStringNull.msg=Sleuth Kit JNI test call returned without error, but version string was null\!
+Installer.exception.tskVerStringNull.msg=Sleuth Kit JNI test call returned without error, but version string was null!
-Installer.exception.taskVerStringBang.msg=Sleuth Kit JNI test call returned without error, but version string was ""\!
+Installer.exception.taskVerStringBang.msg=Sleuth Kit JNI test call returned without error, but version string was ""!
-Installer.tskLibErr.msg=Problem with Sleuth Kit JNI. Test call failed\!\n\nDetails: {0}
+Installer.tskLibErr.msg=Problem with Sleuth Kit JNI. Test call failed!\n\nDetails: {0}
-Installer.tskLibErr.err=Fatal Error\!
+Installer.tskLibErr.err=Fatal Error!
 InterestingHits.interestingItems.text=INTERESTING ITEMS
 InterestingHits.displayName.text=Interesting Items
 InterestingHits.createSheet.name.name=Name

Core/src/org/sleuthkit/autopsy/filesearch/Bundle.properties-MERGED

@@ -19,7 +19,7 @@ KnownStatusSearchPanel.knownCheckBox.text=Known Status:
 KnownStatusSearchPanel.knownBadOptionCheckBox.text=Notable
 KnownStatusSearchPanel.knownOptionCheckBox.text=Known (NSRL or other)
 KnownStatusSearchPanel.unknownOptionCheckBox.text=Unknown
-DateSearchFilter.noneSelectedMsg.text=At least one date type must be selected\!
+DateSearchFilter.noneSelectedMsg.text=At least one date type must be selected!
 DateSearchPanel.dateCheckBox.text=Date:
 DateSearchPanel.jLabel4.text=Timezone:
 DateSearchPanel.createdCheckBox.text=Created
@@ -60,7 +60,7 @@ FileSearchPanel.search.results.details=Large number of matches may impact perfor
 FileSearchPanel.search.exception.noFilterSelected.msg=At least one filter must be selected.
 FileSearchPanel.search.validationErr.msg=Validation Error: {0}
 FileSearchPanel.emptyWhereClause.text=Invalid options, nothing to show.
-KnownStatusSearchFilter.noneSelectedMsg.text=At least one known status must be selected\!
+KnownStatusSearchFilter.noneSelectedMsg.text=At least one known status must be selected!
 NameSearchFilter.emptyNameMsg.text=Must enter something for name search.
 SizeSearchPanel.sizeCompareComboBox.equalTo=equal to
 SizeSearchPanel.sizeCompareComboBox.greaterThan=greater than

Core/src/org/sleuthkit/autopsy/ingest/Bundle.properties-MERGED

@@ -144,7 +144,7 @@ IngestJob.cancelReason.outOfDiskSpace.text=Out of disk space
 IngestJob.cancelReason.servicesDown.text=Services Down
 IngestJob.cancelReason.caseClosed.text=Case closed
 IngestJobSettingsPanel.globalSettingsButton.text=Global Settings
-gest
+gest=
 IngestJobSettingsPanel.globalSettingsButton.actionCommand=Advanced
 IngestJobSettingsPanel.globalSettingsButton.text=Global Settings
 IngestJobSettingsPanel.pastJobsButton.text=History

Core/src/org/sleuthkit/autopsy/modules/embeddedfileextractor/Bundle.properties-MERGED

@@ -12,12 +12,7 @@ ExtractArchiveWithPasswordAction.progress.text=Unpacking contents of archive: {0
 ExtractArchiveWithPasswordAction.prompt.text=Enter Password
 ExtractArchiveWithPasswordAction.prompt.title=Enter Password
 OpenIDE-Module-Display-Category=Ingest Module
-OpenIDE-Module-Long-Description=\
+OpenIDE-Module-Long-Description=Embedded File Extraction Ingest Module\n\nThe Embedded File Extraction Ingest Module processes document files (such as doc, docx, ppt, pptx, xls, xlsx) and archive files (such as zip and others archive types supported by the 7zip extractor).\nContents of these files are extracted and the derived files are added back to the current ingest to be processed by the configured ingest modules.\nIf the derived file happens to be an archive file, it will be re-processed by the 7zip extractor - the extractor will process archive files N-levels deep.\n\nThe extracted files are navigable in the directory tree.\n\nThe module is supported on Windows, Linux and Mac operating systems.
-    Embedded File Extraction Ingest Module\n\nThe Embedded File Extraction Ingest Module processes document files (such as doc, docx, ppt, pptx, xls, xlsx) and archive files (such as zip and others archive types supported by the 7zip extractor).\n\
-    Contents of these files are extracted and the derived files are added back to the current ingest to be processed by the configured ingest modules.\n\
-    If the derived file happens to be an archive file, it will be re-processed by the 7zip extractor - the extractor will process archive files N-levels deep.\n\n\
-    The extracted files are navigable in the directory tree.\n\n\
-    The module is supported on Windows, Linux and Mac operating systems.
 OpenIDE-Module-Name=Embedded File Extraction
 OpenIDE-Module-Short-Description=Embedded File Extraction Ingest Module
 EmbeddedFileExtractorIngestModule.SevenZipContentReadStream.seek.exception.invalidOrigin=Invalid seek origin: {0}

Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/Bundle.properties-MERGED

@@ -36,27 +36,27 @@ FileExtMismatchSettingsPanel.jLabel1.text=File Types:
 FileExtMismatchSettingsPanel.newExtButton.text=New Extension
 FileExtMismatchSettingsPanel.newMimePrompt.message=Add a new MIME file type:
 FileExtMismatchSettingsPanel.newMimePrompt.title=New MIME
-FileExtMismatchSettingsPanel.newMimePrompt.emptyMime.message=MIME type text is empty\!
+FileExtMismatchSettingsPanel.newMimePrompt.emptyMime.message=MIME type text is empty!
 FileExtMismatchSettingsPanel.newMimePrompt.emptyMime.title=Empty type
-FileExtMismatchSettingsPanel.newMimePrompt.mimeTypeNotSupported.message=MIME type not supported\!
+FileExtMismatchSettingsPanel.newMimePrompt.mimeTypeNotSupported.message=MIME type not supported!
 FileExtMismatchSettingsPanel.newMimePrompt.mimeTypeNotSupported.title=Type not supported
-FileExtMismatchSettingsPanel.newMimePrompt.mimeTypeExists.message=MIME type already exists\!
+FileExtMismatchSettingsPanel.newMimePrompt.mimeTypeExists.message=MIME type already exists!
 FileExtMismatchSettingsPanel.newMimePrompt.mimeTypeExists.title=Type already exists
 FileExtMismatchSettingsPanel.newMimePrompt.mimeTypeNotDetectable.message=MIME type is not detectable by this module.
 FileExtMismatchSettingsPanel.newMimePrompt.mimeTypeNotDetectable.title=Type not detectable
-FileExtMismatchSettingsPanel.removeTypeButton.noneSelected.message=No MIME type selected\!
+FileExtMismatchSettingsPanel.removeTypeButton.noneSelected.message=No MIME type selected!
 FileExtMismatchSettingsPanel.removeTypeButton.noneSelected.title=No type selected
 FileExtMismatchSettingsPanel.newExtPrompt.message=Add an allowed extension:
 FileExtMismatchSettingsPanel.newExtPrompt.title=New allowed extension
-FileExtMismatchSettingsPanel.newExtPrompt.empty.message=Extension text is empty\!
+FileExtMismatchSettingsPanel.newExtPrompt.empty.message=Extension text is empty!
 FileExtMismatchSettingsPanel.newExtPrompt.empty.title=Extension text empty
-FileExtMismatchSettingsPanel.newExtPrompt.noMimeType.message=No MIME type selected\!
+FileExtMismatchSettingsPanel.newExtPrompt.noMimeType.message=No MIME type selected!
 FileExtMismatchSettingsPanel.newExtPrompt.noMimeType.title=No MIME type selected
-FileExtMismatchSettingsPanel.newExtPrompt.extExists.message=Extension already exists\!
+FileExtMismatchSettingsPanel.newExtPrompt.extExists.message=Extension already exists!
 FileExtMismatchSettingsPanel.newExtPrompt.extExists.title=Extension already exists
-FileExtMismatchSettingsPanel.removeExtButton.noneSelected.message=No extension selected\!
+FileExtMismatchSettingsPanel.removeExtButton.noneSelected.message=No extension selected!
 FileExtMismatchSettingsPanel.removeExtButton.noneSelected.title=No extension selected
-FileExtMismatchSettingsPanel.removeExtButton.noMimeTypeSelected.message=No MIME type selected\!
+FileExtMismatchSettingsPanel.removeExtButton.noMimeTypeSelected.message=No MIME type selected!
 FileExtMismatchSettingsPanel.removeExtButton.noMimeTypeSelected.title=No MIME type selected
 FileExtMismatchSettingsPanel.removeTypeButton.toolTipText=
 FileExtMismatchModuleSettingsPanel.checkAllRadioButton.text=Check all file types

Core/src/org/sleuthkit/autopsy/modules/hashdatabase/Bundle.properties-MERGED

@@ -61,10 +61,7 @@ ImportCentralRepoDbProgressDialog.errorParsingFile.message=Error parsing hash se
 ImportCentralRepoDbProgressDialog.linesProcessed.message=\ hashes processed
 ImportCentralRepoDbProgressDialog.title.text=Central Repository Import Progress
 OpenIDE-Module-Display-Category=Ingest Module
-OpenIDE-Module-Long-Description=\
+OpenIDE-Module-Long-Description=Hash Set ingest module.  \n\nThe ingest module analyzes files in the disk image and marks them as "known" (based on NSRL hashset lookup for "known" files) and "bad / interesting" (based on one or more hash sets supplied by the user).\n\nThe module also contains additional non-ingest tools that are integrated in the GUI, such as file lookup by hash and hash set configuration.
-    Hash Set ingest module.  \n\n\
-    The ingest module analyzes files in the disk image and marks them as "known" (based on NSRL hashset lookup for "known" files) and "bad / interesting" (based on one or more hash sets supplied by the user).\n\n\
-    The module also contains additional non-ingest tools that are integrated in the GUI, such as file lookup by hash and hash set configuration.
 OpenIDE-Module-Name=HashDatabases
 OptionsCategory_Name_HashDatabase=Hash Sets
 OptionsCategory_Keywords_HashDatabase=Hash Sets
@@ -191,10 +188,7 @@ HashDbSearchThread.name.searching=Searching
 HashDbSearchThread.noMoreFilesWithMD5Msg=No other files with the same MD5 hash were found.
 ModalNoButtons.indexingDbsTitle=Indexing hash sets
 ModalNoButtons.indexingDbTitle=Indexing hash set
-ModalNoButtons.exitHashDbIndexingMsg=You are about to exit out of indexing your hash sets. \n\
+ModalNoButtons.exitHashDbIndexingMsg=You are about to exit out of indexing your hash sets. \nThe generated index will be left unusable. If you choose to continue,\nplease delete the corresponding -md5.idx file in the hash folder.\nExit indexing?
-The generated index will be left unusable. If you choose to continue,\n\
- please delete the corresponding -md5.idx file in the hash folder.\n\
-                                                Exit indexing?
 ModalNoButtons.dlgTitle.unfinishedIndexing=Unfinished Indexing
 ModalNoButtons.indexThis.currentlyIndexing1Db=Currently indexing 1 hash set
 ModalNoButtons.indexThese.currentlyIndexing1OfNDbs=Currently indexing 1 of {0}

Core/src/org/sleuthkit/autopsy/modules/interestingitems/Bundle.properties-MERGED

@@ -2,7 +2,6 @@ FilesIdentifierIngestJobSettingsPanel.getError=Error getting interesting files s
 FilesIdentifierIngestJobSettingsPanel.updateError=Error updating interesting files sets settings file.
 FilesIdentifierIngestModule.getFilesError=Error getting interesting files sets from file.
 FilesIdentifierIngestModule.indexError.message=Failed to index interesting file hit artifact for keyword search.
-# {0} - daysIncluded
 FilesSet.rule.dateRule.toString=(modified within {0} day(s))
 FilesSetDefsPanel.bytes=Bytes
 FilesSetDefsPanel.cancelImportMsg=Cancel import
@@ -122,8 +121,8 @@ FilesSetRulePanel.nameTextField.text=
 FilesSetRulePanel.ruleNameLabel.text=Rule Name (Optional):
 FilesSetRulePanel.messages.emptyNameCondition=You must specify a name pattern for this rule.
 FilesSetRulePanel.messages.invalidNameRegex=The name regular expression is not valid:\n\n{0}
-FilesSetRulePanel.messages.invalidCharInName=The name cannot contain \\, /, :, *, ?, \", <, or > unless it is a regular expression.
+FilesSetRulePanel.messages.invalidCharInName=The name cannot contain \\, /, :, *, ?, ", <, or > unless it is a regular expression.
-FilesSetRulePanel.messages.invalidCharInPath=The path cannot contain \\, :, *, ?, \", <, or > unless it is a regular expression.
+FilesSetRulePanel.messages.invalidCharInPath=The path cannot contain \\, :, *, ?, ", <, or > unless it is a regular expression.
 FilesSetRulePanel.messages.invalidPathRegex=The path regular expression is not valid:\n\n{0}
 FilesSetDefsPanel.doFileSetsDialog.duplicateRuleSet.text=Rule set with name {0} already exists.
 FilesSetRulePanel.pathSeparatorInfoLabel.text=Folder must be in parent path. Use '/' to give consecutive names

Core/src/org/sleuthkit/autopsy/modules/photoreccarver/Bundle.properties-MERGED

@@ -24,7 +24,7 @@ PhotoRecIngestModule.complete.totalParsetime=Total Parsing Time:
 PhotoRecIngestModule.complete.photoRecResults=PhotoRec Results
 PhotoRecIngestModule.NotEnoughDiskSpace.detail.msg=PhotoRec error processing {0} with {1} Not enough space on primary disk to save unallocated space.
 PhotoRecIngestModule.cancelledByUser=PhotoRec cancelled by user.
-PhotoRecIngestModule.error.exitValue=PhotoRec carver returned error exit value \= {0} when scanning {1}
+PhotoRecIngestModule.error.exitValue=PhotoRec carver returned error exit value = {0} when scanning {1}
 PhotoRecIngestModule.error.msg=Error processing {0} with PhotoRec carver.
 PhotoRecIngestModule.complete.numberOfErrors=Number of Errors while Carving:
 PhotoRecCarverIngestJobSettingsPanel.detectionSettingsLabel.text=PhotoRec Settings

Core/src/org/sleuthkit/autopsy/report/modules/html/Bundle.properties-MERGED

@@ -5,8 +5,8 @@ ReportHTML.getName.text=HTML Report
 ReportHTML.getDesc.text=A report about results and tagged items in HTML format.
 ReportHTML.writeIndex.title=for case {0}
 ReportHTML.writeIndex.noFrames.msg=Your browser is not compatible with our frame setup.
-ReportHTML.writeIndex.noFrames.seeNav=Please see <a href\="content\nav.html">the navigation page</a> for artifact links,
+ReportHTML.writeIndex.noFrames.seeNav=Please see <a href="content\nav.html">the navigation page</a> for artifact links,
-ReportHTML.writeIndex.seeSum=and <a href\="content\summary.html">the summary page</a> for a case summary.
+ReportHTML.writeIndex.seeSum=and <a href="contentsummary.html">the summary page</a> for a case summary.
 ReportHTML.writeNav.title=Report Navigation
 ReportHTML.writeNav.h1=Report Navigation
 ReportHTML.writeNav.summary=Case Summary
@@ -16,7 +16,7 @@ ReportHTML.writeSum.caseNumber=Case Number:
 ReportHTML.writeSum.caseNumImages=Number of data sources in case:
 ReportHTML.writeSum.examiner=Examiner:
 ReportHTML.writeSum.title=Case Summary
-ReportHTML.writeSum.warningMsg=<span>Warning, this report was run before ingest services completed\!</span>
+ReportHTML.writeSum.warningMsg=<span>Warning, this report was run before ingest services completed!</span>
 #
 # autopsy/test/scripts/regression.py._html_report_diff() uses reportGenOn.text, caseName, caseNum, 
 # examiner as a regex signature to skip report.html and summary.html

Experimental/src/org/sleuthkit/autopsy/experimental/configuration/Bundle.properties-MERGED

@@ -65,15 +65,19 @@ DayOfTheWeekRenderer_Tuesday_Label=Tuesday
 DayOfTheWeekRenderer_Wednesday_Label=Wednesday
 GeneralOptionsPanelController.moduleErr.msg=A module caused an error listening to GeneralOptionsPanelController updates. See log to determine which module. Some data could be incomplete.
 GeneralOptionsPanelController.moduleErr=Module Error
+# {0} - errorMessage
 MultiUserTestTool.criticalError=Critical error running data source processor on test data source: {0}
 MultiUserTestTool.errorStartingIngestJob=Ingest manager error while starting ingest job
+# {0} - cancellationReason
 MultiUserTestTool.ingestCancelled=Ingest cancelled due to {0}
 MultiUserTestTool.ingestSettingsError=Failed to analyze data source due to ingest settings errors
 MultiUserTestTool.noContent=Test data source failed to produce content
+# {0} - serviceName
 MultiUserTestTool.serviceDown=Multi User service is down: {0}
 MultiUserTestTool.startupError=Failed to analyze data source due to ingest job startup error
 MultiUserTestTool.unableAddFileAsDataSource=Unable to add test file as data source to case
 MultiUserTestTool.unableCreatFile=Unable to create a file in case output directory
+# {0} - serviceName
 MultiUserTestTool.unableToCheckService=Unable to check Multi User service state: {0}
 MultiUserTestTool.unableToCreateCase=Unable to create case
 MultiUserTestTool.unableToInitializeDatabase=Case database was not successfully initialized

branding/core/core.jar/org/netbeans/core/startup/Bundle.properties

@@ -1,5 +1,5 @@
 #Updated by build script
-#Thu, 30 Sep 2021 19:36:31 -0400
+#Thu, 04 Nov 2021 16:51:33 -0400
 LBL_splash_window_title=Starting Autopsy
 SPLASH_HEIGHT=314
 SPLASH_WIDTH=538

branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties

@@ -1,4 +1,4 @@
 #Updated by build script
-#Thu, 30 Sep 2021 19:36:31 -0400
+#Thu, 04 Nov 2021 16:51:33 -0400
 CTL_MainWindow_Title=Autopsy 4.19.2
 CTL_MainWindow_Title_No_Project=Autopsy 4.19.2