Update bundle.properties-MERGED files

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

@@ -1,17 +1,3 @@
-AddAccountDialog.title.text=Add Account
-AddAccountDialog_dup_msg=This account is already added to the persona.
-AddAccountDialog_dup_Title=Account add failure
-AddAccountDialog_empty_msg=The identifier field cannot be empty.
-AddAccountDialog_empty_Title=Empty identifier
-AddAccountDialog_get_types_exception_msg=Failed to access central repository.
-AddAccountDialog_get_types_exception_Title=Central Repository failure
-AddAccountDialog_search_empty_msg=Account not found in the Central Repository for the given identifier and type.
-AddAccountDialog_search_empty_Title=Account not found
-AddAccountDialog_search_failure_msg=Central Repository account search failed.
-AddAccountDialog_search_failure_Title=Account add failure
-AddAliasDialog.title.text=Add Alias
-AddAliasDialog_dup_msg=This alias has already been added to this persona
-AddAliasDialog_dup_Title=Alias add failure
 AddMetadataDialog.title.text=Add Metadata
 AddMetadataDialog_dup_msg=A metadata entry with this name has already been added to this persona
 AddMetadataDialog_dup_Title=Metadata add failure
@@ -20,15 +6,15 @@ CTL_PersonaManagerTopComponentAction=Persona Manager
 CTL_PersonaDetailsTopComponent=Persona Details
 OpenPersonasAction.displayName=Persona Manager
 PersonaAccountDialog.title.text=Add Account
-PersonaAccountDialog_dup_msg=This account is already added to the persona
+PersonaAccountDialog_dup_msg=This account is already added to the persona.
 PersonaAccountDialog_dup_Title=Account add failure
-PersonaAccountDialog_get_types_exception_msg=Failed to access central repository
+PersonaAccountDialog_get_types_exception_msg=Failed to access central repository.
 PersonaAccountDialog_get_types_exception_Title=Central Repository failure
-PersonaAccountDialog_identifier_empty_msg=The identifier field cannot be empty
+PersonaAccountDialog_identifier_empty_msg=The identifier field cannot be empty.
 PersonaAccountDialog_identifier_empty_Title=Empty identifier
-PersonaAccountDialog_search_empty_msg=Account not found for given identifier and type
+PersonaAccountDialog_search_empty_msg=Account not found for given identifier and type.
 PersonaAccountDialog_search_empty_Title=Account not found
-PersonaAccountDialog_search_failure_msg=Central Repository account search failed
+PersonaAccountDialog_search_failure_msg=Central Repository account search failed.
 PersonaAccountDialog_search_failure_Title=Account add failure
 PersonaAliasDialog.title.text=Add Alias
 PersonaAliasDialog_dup_msg=This alias has already been added to this persona
@@ -38,10 +24,10 @@ PersonaDetailsDialogEditTitle=Edit Persona
 PersonaDetailsDialogViewTitle=View Persona
 PersonaDetailsPanel_CentralRepoErr_msg=Failure to write to Central Repository
 PersonaDetailsPanel_CentralRepoErr_Title=Central Repository failure
-PersonaDetailsPanel_EmptyComment_msg=Persona comment cannot be empty
-PersonaDetailsPanel_EmptyComment_Title=Empty persona comment
 PersonaDetailsPanel_empty_justification_msg=The justification field cannot be empty
 PersonaDetailsPanel_empty_justification_Title=Empty justification
+PersonaDetailsPanel_EmptyComment_msg=Persona comment cannot be empty
+PersonaDetailsPanel_EmptyComment_Title=Empty persona comment
 PersonaDetailsPanel_EmptyName_msg=Persona name cannot be empty
 PersonaDetailsPanel_EmptyName_Title=Empty persona name
 PersonaDetailsPanel_load_exception_msg=Failed to load persona
@@ -93,9 +79,6 @@ PersonaDetailsPanel.examinerLbl.text=Created by:
 PersonaDetailsPanel.examinerField.text=
 PersonaDetailsPanel.creationDateLbl.text=Created on:
 PersonaDetailsPanel.creationDateField.text=
-PMTopComponent_delete_confirmation_msg=Are you sure you want to delete this persona?
-PMTopComponent_delete_confirmation_Title=Are you sure?
-PMTopComponent_delete_exception_msg=Failed to delete persona.
 PersonaAccountDialog.confidenceLbl.text=Confidence:
 PersonaAccountDialog.justificationTextField.text=
 PersonaAccountDialog.justificationLbl.text=Justification:
@@ -120,7 +103,9 @@ PersonaMetadataDialog.nameTextField.text=
 PersonaMetadataDialog.nameLbl.text=Name:
 PersonaMetadataDialog.okBtn.text=OK
 PersonaMetadataDialog.cancelBtn.text=Cancel
-PMTopComponent_delete_exception_msg=Failed to delete persona
+PMTopComponent_delete_confirmation_msg=Are you sure you want to delete this persona?
+PMTopComponent_delete_confirmation_Title=Are you sure?
+PMTopComponent_delete_exception_msg=Failed to delete persona.
 PMTopComponent_delete_exception_Title=Delete failure
 PMTopComponent_Name=Persona Manager
 PMTopComponent_search_exception_msg=Failed to search personas.

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

@@ -37,11 +37,18 @@ ApplicationContentViewer.title=Application
 ApplicationContentViewer.toolTip=Displays file contents.
 CallLogArtifactViewer_number_from=From
 CallLogArtifactViewer_number_to=To
-CallLogArtifactViewer_persona_button_new=New
+CallLogArtifactViewer_persona_button_new=Create
 CallLogArtifactViewer_persona_button_view=View
-CallLogArtifactViewer_persona_label=\ Persona: 
+CallLogArtifactViewer_persona_label=\ Persona 
-CallLogArtifactViewer_persona_searching=\ Searching...
+CallLogArtifactViewer_persona_searching=Searching...
-CallLogArtifactViewer_persona_text_none=No Persona
+CallLogArtifactViewer_persona_text_none=None Found
+ContactArtifactViewer_missing_account_label=Missing Account: 
+ContactArtifactViewer_persona_account_justification=Account found in Contact artifact
+ContactArtifactViewer_persona_button_new=Create
+ContactArtifactViewer_persona_button_view=View
+ContactArtifactViewer_persona_label=Persona 
+ContactArtifactViewer_persona_searching=\ Searching...
+ContactArtifactViewer_persona_text_none=None found
 DataContentViewerArtifact.failedToGetAttributes.message=Failed to get some or all attributes from case database
 DataContentViewerArtifact.failedToGetSourcePath.message=Failed to get source file path from case database
 DefaultArtifactContentViewer.attrsTableHeader.sources=Source(s)
@@ -1080,3 +1087,4 @@ MessageArtifactViewer.htmlPane.TabConstraints.tabTitle=HTML
 CallLogArtifactViewer.localAccountPersonaLabel.text=Persona:
 CallLogArtifactViewer.localAccountPersonaNameLabel.text=jLabel1
 CallLogArtifactViewer.localAccountPersonaButton.text=jButton1
+ContactArtifactViewer.personasLabel.text=Personas

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

@@ -3,7 +3,13 @@ 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=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/
+OpenIDE-Module-Long-Description=\
+    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/coreutils/Bundle.properties-MERGED

@@ -30,7 +30,9 @@ 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{1}\nProcess Virtual Memory: {2}
+PlatformUtil.getAllMemUsageInfo.usageText={0}\n\
+{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/directorytree/Bundle.properties-MERGED

@@ -38,8 +38,6 @@ HINT_DirectoryTreeTopComponent=This is a DirectoryTree window
 OpenIDE-Module-Name=DirectoryTree
 FileSystemDetailsPanel.imgOffsetLabel.text=Image Offset:
 FileSystemDetailsPanel.fsTypeLabel.text=FileSystem Type:
-FileSystemDetailsPanel.jLabel2.text=bytes
-FileSystemDetailsPanel.jLabel3.text=bytes
 FileSystemDetailsPanel.fsTypeValue.text=...
 FileSystemDetailsPanel.imgOffsetValue.text=...
 FileSystemDetailsPanel.volumeIDValue.text=...
@@ -71,7 +69,6 @@ VolumeDetailsPanel.startLabel.text=Starting Sector:
 VolumeDetailsPanel.lengthLabel.text=Length in Sectors:
 VolumeDetailsPanel.descLabel.text=Description:
 VolumeDetailsPanel.flagsLabel.text=Flags:
-VolumeDetailsPanel.jLabel1.text=General Volume Information
 VolumeDetailsPanel.OKButton.text=OK
 ImageDetailsPanel.imageInfoLabel.text=Image Information
 ImageDetailsPanel.imgNameLabel.text=Name:
@@ -160,3 +157,6 @@ ExternalViewerGlobalSettingsPanel.jButton2.text=jButton2
 ExternalViewerGlobalSettingsPanel.browseHxDDirectory.text=Browse
 ExternalViewerGlobalSettingsPanel.HxDLabel.text=HxD Editor Path:
 ExternalViewerGlobalSettingsPanel.ContentViewerExtensionLabel.text=Add content viewer extensions:
+FileSystemDetailsPanel.bytesLabel1.text=bytes
+FileSystemDetailsPanel.bytesLabel2.text=bytes
+VolumeDetailsPanel.generalVolumeLabel.text=General Volume Information

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

@@ -14,11 +14,9 @@ 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.jLabel3.text=*The date format is mm/dd/yyyy
-DateSearchPanel.jLabel2.text=*Empty fields mean "No Limit"
 DateSearchPanel.createdCheckBox.text=Created
 DateSearchPanel.accessedCheckBox.text=Accessed
 DateSearchPanel.changedCheckBox.text=Changed
@@ -57,12 +55,11 @@ 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
 SizeSearchPanel.sizeCompareComboBox.lessThan=less than
-MimeTypePanel.jLabel1.text=*Note: Multiple MIME types can be selected
 FileSearchPanel.searchButton.text=Search
 MimeTypePanel.mimeTypeCheckBox.text=MIME Type:
 HashSearchPanel.md5CheckBox.text=MD5:
@@ -72,3 +69,6 @@ DataSourcePanel.dataSourceCheckBox.label=Data Source:
 DataSourcePanel.dataSourceCheckBox.actionCommand=Data Source:
 DataSourcePanel.dataSourceCheckBox.text=Data Source:
 DataSourcePanel.dataSourceNoteLabel.text=*Note: Multiple data sources can be selected
+DateSearchPanel.noLimitLabel.text=*Empty fields mean "No Limit"
+DateSearchPanel.dateFormatLabel.text=*The date format is mm/dd/yyyy
+MimeTypePanel.noteLabel.text=*Note: Multiple MIME types can be selected

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

@@ -140,7 +140,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/livetriage/Bundle.properties-MERGED

@@ -18,10 +18,10 @@ SelectDriveDialog.diskTable.column2.title=Disk Size
 SelectDriveDialog.errLabel.disksNotDetected.text=Disks were not detected. On some systems it requires admin privileges
 SelectDriveDialog.errLabel.disksNotDetected.toolTipText=Disks were not detected.
 SelectDriveDialog.lbSelectDrive.text=Select the drive to copy the application and script to:
-SelectDriveDialog.jLabel1.text=Select drive to use for live triage (may take time to load):
 SelectDriveDialog.errorLabel.text=jLabel2
 SelectDriveDialog.bnCancel.text=Cancel
-SelectDriveDialog.jTextArea1.text=This feature copies the application and a batch file to a removable drive,\nallowing systems to be analyzed without installing the software or\nimaging the drives.\n\nTo analyze a system, insert the drive and run "RunFromUSB.bat" as\nadministrator, then select the "Local Disk" option on the Add Data Source\npanel.
+SelectDriveDialog.descriptionTextArea.text=This feature copies the application and a batch file to a removable drive,\nallowing systems to be analyzed without installing the software or\nimaging the drives.\n\nTo analyze a system, insert the drive and run "RunFromUSB.bat" as\nadministrator, then select the "Local Disk" option on the Add Data Source\npanel.
 SelectDriveDialog.localDiskModel.loading.msg=
 SelectDriveDialog.localDiskModel.nodrives.msg=Executable could not be found
+SelectDriveDialog.selectDriveLabel.text=Select drive to use for live triage (may take time to load):
 SelectDriveDialog.title=Create Live Triage Drive

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

@@ -45,6 +45,6 @@ DataSourceIntegrityIngestModule.shutDown.resultLi=<li>Result:{0} </li>
 DataSourceIntegrityIngestModule.shutDown.calcHashLi=<li>Calculated hash: {0} </li>
 DataSourceIntegrityIngestModule.shutDown.storedHashLi=<li>Stored hash: {0} </li>
 DataSourceIntegrityIngestSettingsPanel.computeHashesCheckbox.text=Calculate data source hashes if none are present
-DataSourceIntegrityIngestSettingsPanel.jLabel1.text=Note that this module will not run on logical files
-DataSourceIntegrityIngestSettingsPanel.jLabel3.text=Ingest Settings
 DataSourceIntegrityIngestSettingsPanel.verifyHashesCheckbox.text=Verify existing data source hashes
+DataSourceIntegrityIngestSettingsPanel.ingestSettingsLabel.text=Ingest Settings
+DataSourceIntegrityIngestSettingsPanel.noteLabel.text=Note that this module will not run on logical files

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

@@ -11,7 +11,12 @@ 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=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.
+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).\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}
@@ -23,7 +28,6 @@ EmbeddedFileExtractorIngestModule.ArchiveExtractor.isZipBombCheck.warnMsg=Possib
 EmbeddedFileExtractorIngestModule.ArchiveExtractor.isZipBombCheck.warnDetails=Compression ratio is {0}, skipping items in {1}.
 EmbeddedFileExtractorIngestModule.ArchiveExtractor.unpack.warnMsg.zipBomb=Possible ZIP bomb detected: {0}
 EmbeddedFileExtractorIngestModule.ArchiveExtractor.unpack.warnDetails.zipBomb=The archive is {0} levels deep, skipping processing of {1}
-EmbeddedFileExtractorIngestModule.ArchiveExtractor.unpack.unknownPath.msg=Unknown item path in archive: {0}, will use: {1}
 EmbeddedFileExtractorIngestModule.ArchiveExtractor.unpack.notEnoughDiskSpace.msg=Not enough disk space to unpack archive item: {0}, {1}
 EmbeddedFileExtractorIngestModule.ArchiveExtractor.unpack.notEnoughDiskSpace.details=The archive item is too large to unpack, skipping unpacking this item.
 EmbeddedFileExtractorIngestModule.ArchiveExtractor.unpack.errUnpacking.msg=Error unpacking {0}

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

@@ -2,7 +2,9 @@ CannotRunFileTypeDetection=Cannot run file type detection.
 ExifParserFileIngestModule.indexError.message=Failed to post EXIF Metadata artifact(s).
 ExifParserFileIngestModule.userContent.description=EXIF metadata exists for this file.
 OpenIDE-Module-Display-Category=Ingest Module
-OpenIDE-Module-Long-Description=Exif metadata ingest module.  \n\nThe ingest module analyzes image files, extracts Exif information and posts the Exif data as results.
+OpenIDE-Module-Long-Description=\
+    Exif metadata ingest module.  \n\n\
+    The ingest module analyzes image files, extracts Exif information and posts the Exif data as results.
 OpenIDE-Module-Name=ExifParser
 OpenIDE-Module-Short-Description=Exif metadata ingest module
 ExifParserFileIngestModule.moduleName.text=Exif Parser

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/filetypeid/Bundle.properties-MERGED

@@ -51,7 +51,6 @@ FileTypeIdGlobalSettingsPanel.JOptionPane.loadFailed.title=Load Failed
 FileTypeIdGlobalSettingsPanel.loadFileTypes.errorMessage=Failed to load existing file type definitions.
 FileTypeIdGlobalSettingsPanel.saveFileTypes.errorMessage=Failed to save file type definitions.
 FileTypeIdGlobalSettingsPanel.newTypeButton.text=New Type
-FileTypeIdGlobalSettingsPanel.jLabel2.text=Custom MIME Types:
 FileTypeIdGlobalSettingsPanel.startUp.fileTypeDetectorInitializationException.msg=Error initializing the file type detector.
 AddFileTypeSignaturePanel.offsetLabel.text=Byte Offset
 AddFileTypeSignaturePanel.signatureTextField.text=
@@ -60,7 +59,6 @@ AddFileTypeSignaturePanel.signatureLabel.text=Signature
 AddFileTypeSignaturePanel.hexPrefixLabel.text=0x
 AddFileTypeSignaturePanel.offsetRelativeToLabel.text=Offset is relative to 
 AddFileTypeSignaturePanel.offsetTextField.text=
-FileTypeIdGlobalSettingsPanel.jLabel1.text=Signatures
 FileTypeIdGlobalSettingsPanel.editTypeButton.text=Edit Type
 AddFileTypePanel.mimeTypeTextField.text=
 AddFileTypePanel.mimeTypeLabel.text=MIME Type
@@ -72,4 +70,6 @@ AddFileTypePanel.postHitCheckBox.text=Alert as an "Interesting File" when found
 AddFileTypePanel.setNameLabel.text=Set Name
 AddFileTypePanel.setNameTextField.text=
 FileTypeIdGlobalSettingsPanel.ingestRunningWarningLabel.text=Cannot make changes to file type definitions when ingest is running!
-FileTypeIdGlobalSettingsPanel.jLabel3.text=Autopsy can automatically detect many file types. Add your custom file types here.
+FileTypeIdGlobalSettingsPanel.descriptionLabel.text=Autopsy can automatically detect many file types. Add your custom file types here.
+FileTypeIdGlobalSettingsPanel.customTypesLabel.text=Custom MIME Types:
+FileTypeIdGlobalSettingsPanel.signaturesLabel.text=Signatures

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

@@ -83,8 +83,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
@@ -109,21 +109,14 @@ FilesSetDefsPanel.ingest.deleteSetButton.text=Delete Filter
 FilesSetDefsPanel.interesting.jLabel6.text=Set Details
 FilesSetDefsPanel.ingest.jLabel6.text=Filter Details
 FilesSetDefsPanel.newRuleButton.text=New Rule
-FilesSetDefsPanel.jLabel8.text=File Size:
-FilesSetDefsPanel.jLabel7.text=MIME Type:
 FilesSetDefsPanel.rulePathConditionRegexCheckBox.text=Regex
-FilesSetDefsPanel.jLabel4.text=Path Substring: 
-FilesSetDefsPanel.jLabel1.text=Rule Details
 FilesSetDefsPanel.dirsRadioButton.text=Directories
-FilesSetDefsPanel.jLabel2.text=File Type:
 FilesSetDefsPanel.deleteRuleButton.text=Delete Rule
 FilesSetDefsPanel.fileNameRegexCheckbox.text=Substring / Regex
 FilesSetDefsPanel.ignoreKnownFilesCheckbox.text=Ignore Known Files
 FilesSetDefsPanel.rulePathConditionTextField.text=
 FilesSetDefsPanel.fileNameRadioButton.text=Full Name
-FilesSetDefsPanel.jLabel5.text=Description:
 FilesSetDefsPanel.fileNameTextField.text=
-FilesSetDefsPanel.jLabel3.text=Name:
 FilesSetDefsPanel.fileNameExtensionRadioButton.text=Extension Only
 FilesSetDefsPanel.rulesListLabel.text=Rules:
 FilesSetDefsPanel.editRuleButton.text=Edit Rule
@@ -140,3 +133,10 @@ FilesSetDefsPanel.modifiedDateLabel.text=Modified Within:
 FilesSetDefsPanel.daysIncludedTextField.text=
 FilesSetDefsPanel.daysIncludedLabel.text=day(s)
 FilesSetRulePanel.daysIncludedLabel.text=day(s)
+FilesSetDefsPanel.nameLabel.text=Name:
+FilesSetDefsPanel.descriptionLabel.text=Description:
+FilesSetDefsPanel.fileTypeLabel.text=File Type:
+FilesSetDefsPanel.ruleLabel.text=Rule Details
+FilesSetDefsPanel.pathLabel.text=Path Substring: 
+FilesSetDefsPanel.mimeTypeLabel.text=MIME Type:
+FilesSetDefsPanel.fileSizeLabel.text=File Size:

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

@@ -21,7 +21,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="contentsummary.html">the summary page</a> for a case summary.
+ReportHTML.writeIndex.seeSum=and <a href\="content\summary.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

Core/src/org/sleuthkit/autopsy/texttranslation/ui/Bundle.properties-MERGED

@@ -19,3 +19,4 @@ TranslationContentPanel.ocrLabel.text=OCR:
 TranslationOptionsPanelController.moduleErr=Module Error
 TranslationOptionsPanelController.moduleErr.msg=A module caused an error listening to TranslationSettingsPanelController updates. See log to determine which module. Some data could be incomplete.
 TranslationContentPanel.showLabel.text=Show:
+TranslationContentPanel.jSepLarge1.AccessibleContext.accessibleName=

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

@@ -89,6 +89,10 @@ AutoIngestControlPanel.runningTable.toolTipText=The Running table displays the c
 AutoIngestControlPanel.SharedConfigurationDisabled=Shared configuration disabled
 AutoIngestControlPanel.ShowLogFailed.Message=Case log file does not exist
 AutoIngestControlPanel.ShowLogFailed.Title=Unable to display case log
+# {0} - case db status
+# {1} - search svc Status
+# {2} - coord svc Status
+# {3} - msg broker status
 AutoIngestControlPanel.tbServicesStatusMessage.Message=Case databases {0}, keyword search {1}, coordination {2}, messaging {3} 
 AutoIngestControlPanel.tbServicesStatusMessage.Message.Down=down
 AutoIngestControlPanel.tbServicesStatusMessage.Message.Unknown=unknown
@@ -182,16 +186,22 @@ DeleteCaseTask.progress.acquiringManifestLocks=Acquiring exclusive manifest file
 DeleteCaseTask.progress.connectingToCoordSvc=Connecting to the coordination service...
 DeleteCaseTask.progress.deletingCaseDirCoordSvcNode=Deleting case directory znode...
 DeleteCaseTask.progress.deletingCaseNameCoordSvcNode=Deleting case name znode...
+# {0} - data source path
 DeleteCaseTask.progress.deletingDataSource=Deleting data source {0}...
 DeleteCaseTask.progress.deletingJobLogLockNode=Deleting case auto ingest log znode...
+# {0} - manifest file path
 DeleteCaseTask.progress.deletingManifest=Deleting manifest file {0}...
+# {0} - manifest file path
 DeleteCaseTask.progress.deletingManifestFileNode=Deleting the manifest file znode for {0}...
 DeleteCaseTask.progress.deletingResourcesLockNode=Deleting case resources znode...
 DeleteCaseTask.progress.gettingManifestPaths=Getting manifest file paths...
+# {0} - manifest file path
 DeleteCaseTask.progress.lockingManifest=Locking manifest file {0}...
 DeleteCaseTask.progress.openingCaseDatabase=Opening the case database...
 DeleteCaseTask.progress.openingCaseMetadataFile=Opening case metadata file...
+# {0} - manifest file path
 DeleteCaseTask.progress.parsingManifest=Parsing manifest file {0}...
+# {0} - manifest file path
 DeleteCaseTask.progress.releasingManifestLock=Releasing lock on the manifest file {0}...
 DeleteCaseTask.progress.startMessage=Starting deletion...
 DeleteOrphanCaseNodesAction.progressDisplayName=Cleanup Case Znodes
@@ -207,6 +217,7 @@ DeleteOrphanCaseNodesTask.progress.lookingForOrphanedCaseZnodes=Looking for orph
 DeleteOrphanCaseNodesTask.progress.startMessage=Starting orphaned case znode cleanup
 DeleteOrphanManifestNodesAction.progressDisplayName=Cleanup Manifest File Znodes
 DeleteOrphanManifestNodesTask.progress.connectingToCoordSvc=Connecting to the coordination service
+# {0} - node path
 DeleteOrphanManifestNodesTask.progress.deletingOrphanedManifestNode=Deleting orphaned manifest file znode {0}
 DeleteOrphanManifestNodesTask.progress.gettingManifestNodes=Querying the coordination service for manifest file znodes
 DeleteOrphanManifestNodesTask.progress.lookingForOrphanedManifestFileZnodes=Looking for orphaned manifest file znodes
@@ -215,6 +226,7 @@ HINT_CasesDashboardTopComponent=This is an adminstrative dashboard for multi-use
 OpenAutoIngestLogAction.deletedLogErrorMsg=The case auto ingest log has been deleted.
 OpenAutoIngestLogAction.logOpenFailedErrorMsg=Failed to open case auto ingest log. See application log for details.
 OpenAutoIngestLogAction.menuItemText=Open Auto Ingest Log File
+# {0} - caseErrorMessage
 OpenCaseAction.errorMsg=Failed to open case: {0}
 OpenCaseAction.menuItemText=Open
 OpenIDE-Module-Long-Description=This module contains features that are being developed by Basis Technology and are not part of the default Autopsy distribution. You can enable this module to use the new features. The features should be stable, but their exact behavior and API are subject to change.\n\nWe make no guarantee that the API of this module will not change, so developers should be careful when relying on it.

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

@@ -75,6 +75,7 @@ MultiUserTestTool.unableCreatFile=Unable to create a file in case output directo
 MultiUserTestTool.unableToCheckService=Unable to check Multi User service state: {0}
 MultiUserTestTool.unableToCreateCase=Unable to create case
 MultiUserTestTool.unableToInitializeDatabase=Case database was not successfully initialized
+MultiUserTestTool.unableToInitializeFilTypeDetector=Unable to initialize File Type Detector
 MultiUserTestTool.unableToReadDatabase=Unable to read from case database
 MultiUserTestTool.unableToReadTestFileFromDatabase=Unable to read test file info from case database
 MultiUserTestTool.unableToRunIngest=Unable to run ingest on test data source

KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Bundle.properties-MERGED

@@ -36,7 +36,7 @@ KeywordSearchResultFactory.createNodeForKey.noResultsFound.text=No results found
 KeywordSearchResultFactory.query.exception.msg=Could not perform the query 
 OpenIDE-Module-Display-Category=Ingest Module
 
-OpenIDE-Module-Long-Description=Keyword Search ingest module.\n\nThe module indexes files found in the disk image at ingest time.\nIt then periodically runs the search on the indexed files using one or more keyword lists (containing pure words and/or regular expressions) and posts results.\n\nThe module also contains additional tools integrated in the main GUI, such as keyword list configuration, keyword search bar in the top-right corner, extracted text viewer and search results viewer showing highlighted keywords found.
+OpenIDE-Module-Long-Description=Keyword Search ingest module.\n\nThe module indexes files found in the disk image at ingest time.\nIt then periodically runs the search on the indexed files using one or more keyword lists (containing pure words and/or regular expressions) and posts results.\n\n\The module also contains additional tools integrated in the main GUI, such as keyword list configuration, keyword search bar in the top-right corner, extracted text viewer and search results viewer showing highlighted keywords found.
 OpenIDE-Module-Name=KeywordSearch
 OptionsCategory_Name_KeywordSearchOptions=Keyword Search
 OptionsCategory_Keywords_KeywordSearchOptions=Keyword Search
@@ -360,24 +360,24 @@ DropdownListSearchPanel.jSaveSearchResults.text=Save search results
 GlobalEditListPanel.ingestWarningLabel.text=Ingest is ongoing, some settings will be unavailable until it finishes.
 KeywordSearchGlobalLanguageSettingsPanel.ingestWarningLabel.text=Ingest is ongoing, some settings will be unavailable until it finishes.
 KeywordSearchGlobalSearchSettingsPanel.ingestWarningLabel.text=Ingest is ongoing, some settings will be unavailable until it finishes.
-ExtractedContentPanel.hitCountLabel.text=-
+ExtractedContentPanel.AccessibleContext.accessibleName=
+ExtractedContentPanel.jLabel1.text=Text Source:
+ExtractedContentPanel.hitNextButton.text=
 ExtractedContentPanel.hitPreviousButton.text=
+ExtractedContentPanel.hitButtonsLabel.text=Match
 ExtractedContentPanel.hitTotalLabel.text=-
 ExtractedContentPanel.hitOfLabel.text=of
-ExtractedContentPanel.hitNextButton.text=
+ExtractedContentPanel.hitCountLabel.text=-
-ExtractedContentPanel.hitButtonsLabel.text=Match
 ExtractedContentPanel.hitLabel.toolTipText=
 ExtractedContentPanel.hitLabel.text=Matches on page:
-ExtractedContentPanel.pageCurLabel.text=-
+ExtractedContentPanel.pageNextButton.text=
 ExtractedContentPanel.pagePreviousButton.actionCommand=pagePreviousButton
 ExtractedContentPanel.pagePreviousButton.text=
-ExtractedContentPanel.pageNextButton.text=
-ExtractedContentPanel.pagesLabel.text=Page:
-ExtractedContentPanel.pageTotalLabel.text=-
 ExtractedContentPanel.pageButtonsLabel.text=Page
+ExtractedContentPanel.pageTotalLabel.text=-
 ExtractedContentPanel.pageOfLabel.text=of
-ExtractedContentPanel.jLabel1.text=Text Source:
+ExtractedContentPanel.pageCurLabel.text=-
-ExtractedContentPanel.AccessibleContext.accessibleName=
+ExtractedContentPanel.pagesLabel.text=Page:
 TextZoomPanel.zoomInButton.text=
 TextZoomPanel.zoomOutButton.text=
 TextZoomPanel.zoomResetButton.text=Reset

RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Bundle.properties-MERGED

@@ -5,10 +5,15 @@ ChromeCacheExtract_adding_artifacts_msg=Chrome Cache: Adding %d artifacts for an
 ChromeCacheExtract_adding_extracted_files_msg=Chrome Cache: Adding %d extracted files for analysis.
 ChromeCacheExtract_loading_files_msg=Chrome Cache: Loading files from %s.
 ChromeCacheExtractor.moduleName=ChromeCacheExtractor
+# {0} - module name
+# {1} - row number
+# {2} - table length
+# {3} - cache path
 ChromeCacheExtractor.progressMsg={0}: Extracting cache entry {1} of {2} entries from {3}
 DataSourceUsage_AndroidMedia=Android Media Card
 DataSourceUsage_DJU_Drone_DAT=DJI Internal SD Card
 DataSourceUsage_FlashDrive=Flash Drive
+# {0} - OS name
 DataSourceUsageAnalyzer.customVolume.label=OS Drive ({0})
 DataSourceUsageAnalyzer.parentModuleName=Recent Activity
 Extract.indexError.message=Failed to index artifact for keyword search.
@@ -71,7 +76,7 @@ ExtractZone_progress_Msg=Extracting :Zone.Identifer files
 ExtractZone_Restricted=Restricted Sites Zone
 ExtractZone_Trusted=Trusted Sites Zone
 OpenIDE-Module-Display-Category=Ingest Module
-OpenIDE-Module-Long-Description=Recent Activity ingest module.\n\nThe module extracts useful information about the recent user activity on the disk image being ingested, such as:\n\n- Recently open documents,\n- Web activity (sites visited, stored cookies, book marked sites, search engine queries, file downloads),\n- Recently attached devices,\n- Installed programs.\n\nThe module currently supports Windows only disk images.\nThe plugin is also fully functional when deployed on Windows version of Autopsy.
+OpenIDE-Module-Long-Description=Recent Activity ingest module.\n\n\The module extracts useful information about the recent user activity on the disk image being ingested, such as:\n\n- Recently open documents,\n- Web activity (sites visited, stored cookies, book marked sites, search engine queries, file downloads),\n- Recently attached devices,\n- Installed programs.\n\nThe module currently supports Windows only disk images.\nThe plugin is also fully functional when deployed on Windows version of Autopsy.
 OpenIDE-Module-Name=RecentActivity
 OpenIDE-Module-Short-Description=Recent Activity finder ingest module
 Chrome.moduleName=Chrome
@@ -202,6 +207,7 @@ Recently_Used_Artifacts_Officedocs=Recently opened according to Office MRU
 Recently_Used_Artifacts_Winrar=Recently opened according to WinRAR MRU
 RegRipperFullNotFound=Full version RegRipper executable not found.
 RegRipperNotFound=Autopsy RegRipper executable not found.
+# {0} - file name
 SearchEngineURLQueryAnalyzer.init.exception.msg=Unable to find {0}.
 SearchEngineURLQueryAnalyzer.moduleName.text=Search Engine
 SearchEngineURLQueryAnalyzer.engineName.none=NONE

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

@@ -1,5 +1,5 @@
 #Updated by build script
-#Tue, 12 Nov 2019 17:21:46 -0500
+#Fri, 12 Jun 2020 14:50:38 -0400
 LBL_splash_window_title=Starting Autopsy
 SPLASH_HEIGHT=314
 SPLASH_WIDTH=538
@@ -8,4 +8,4 @@ SplashRunningTextBounds=0,289,538,18
 SplashRunningTextColor=0x0
 SplashRunningTextFontSize=19
 
-currentVersion=Autopsy 4.13.0
+currentVersion=Autopsy 4.15.0

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

@@ -1,4 +1,4 @@
 #Updated by build script
-#Tue, 12 Nov 2019 17:21:46 -0500
+#Fri, 12 Jun 2020 14:50:38 -0400
-CTL_MainWindow_Title=Autopsy 4.13.0
+CTL_MainWindow_Title=Autopsy 4.15.0
-CTL_MainWindow_Title_No_Project=Autopsy 4.13.0
+CTL_MainWindow_Title_No_Project=Autopsy 4.15.0