diff --git a/.gitattributes b/.gitattributes
index 6cd046f17b1933bc98ae425932bf5fbeae01ded3..70e247e5404c6644c0cf0ad4dd3c62297d097d4f 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -6,7 +6,6 @@
 *.xml                   text
 *.form                   text
 *.properties                   text
-*.properties-MERGED                  text
 *.html                   text diff=html
 *.dox                   text
 Doxyfile                text
diff --git a/Core/build.xml b/Core/build.xml
index 4b6c32d56d57c4bccd56e778daf8f16791717f16..9b6fb0b2afb686e3297cd5ceb4df5b7a52a4e637 100644
--- a/Core/build.xml
+++ b/Core/build.xml
@@ -127,20 +127,4 @@
         <delete dir="${basedir}/release/"/>
     </target>
     
-    <target name="compile" depends="projectized-common.compile">
-        <antcall target="copy-bundle" />
-    </target>
-
-    <target name="copy-bundle">
-        <!-- the externalized strings in 'src' are in both the java files as annotations and in the Bundle.property files.
-          The strings get merged during compilation.  This target copies that merged file into src so that it can be checked
-          in and used as a basis for translation efforts -->
-        <copy todir="src">
-            <fileset dir="build/classes">
-                <include name="**/Bundle.properties"/>
-            </fileset>
-            <globmapper from="*" to="*-MERGED"/>
-        </copy>
-    </target>
-    
 </project>
diff --git a/Core/src/org/sleuthkit/autopsy/actions/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/actions/Bundle.properties-MERGED
deleted file mode 100755
index 78a043315723ae7dda18e6f98ebd288a67923583..0000000000000000000000000000000000000000
--- a/Core/src/org/sleuthkit/autopsy/actions/Bundle.properties-MERGED
+++ /dev/null
@@ -1,97 +0,0 @@
-AddBlackboardArtifactTagAction.pluralTagResult=Add Result Tags
-AddBlackboardArtifactTagAction.singularTagResult=Add Result Tag
-AddBlackboardArtifactTagAction.taggingErr=Tagging Error
-# {0} - artifactName
-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_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
-# {0} - tagName
-DeleteContentTagAction.unableToDelTag.msg=Unable to delete tag {0}.
-DeleteFileBlackboardArtifactTagAction.deleteTag=Remove Result Tag
-# {0} - artifactID
-DeleteFileBlackboardArtifactTagAction.deleteTag.alert=Unable to untag artifact {0}.
-# {0} - artifactID
-DeleteFileBlackboardArtifactTagAction.deleteTags.alert=Unable to untag artifact {0}.
-DeleteFileContentTagAction.deleteTag=Remove File Tag
-# {0} - fileID
-DeleteFileContentTagAction.deleteTag.alert=Unable to untag file {0}.
-ExitAction.confirmationDialog.message=Ingest is running, are you sure you want to exit?
-ExitAction.confirmationDialog.title=Ingest is Running
-# {0} - exception message
-ExitAction.messageBox.caseCloseExceptionMessage=Error closing case: {0}
-GetTagNameDialog.descriptionLabel.text=Description:
-GetTagNameDialog.notableCheckbox.text=Tag indicates item is notable.
-GetTagNameDialog.tagDescriptionIllegalCharacters.message=Tag descriptions may not contain commas (,) or semicolons (;)
-GetTagNameDialog.tagDescriptionIllegalCharacters.title=Invalid character in tag description
-GetTagNameDialog.tagNameAlreadyExists.message=Tag name must be unique. A tag with this name already exists.
-GetTagNameDialog.tagNameAlreadyExists.title=Duplicate Tag Name
-GetTagNameDialog.tagNameField.text=
-GetTagNameDialog.cancelButton.text=Cancel
-GetTagNameDialog.okButton.text=OK
-GetTagNameDialog.preexistingLabel.text=Pre-existing Tag Names:
-GetTagNameDialog.newTagPanel.border.title=New Tag
-GetTagNameDialog.tagNameLabel.text=Tag Name:
-GetTagNameAndCommentDialog.newTagButton.text=New Tag
-GetTagNameAndCommentDialog.okButton.text=OK
-GetTagNameAndCommentDialog.commentText.toolTipText=Enter an optional tag comment or leave blank
-GetTagNameAndCommentDialog.commentText.text=
-GetTagNameAndCommentDialog.commentLabel.text=Comment: 
-# To change this template, choose Tools | Templates
-# and open the template in the editor.
-GetTagNameAndCommentDialog.cancelButton.text=Cancel
-GetTagNameAndCommentDialog.tagLabel.text=Tag:
-AddTagAction.bookmarkFile=Bookmark file
-AddTagAction.quickTag=Quick Tag
-AddTagAction.noTags=No tags
-AddTagAction.newTag=New Tag...
-AddTagAction.tagAndComment=Tag and Comment...
-AddBookmarkTagAction.bookmark.text=Bookmark
-GetTagNameAndCommentDialog.noTags=No Tags
-GetTagNameAndCommentDialog.selectTag=Select Tag
-GetTagNameAndCommentDialog.cancelName=cancel
-GetTagNameDialog.createTag=Create Tag
-GetTagNameDialog.cancelName=Cancel
-GetTagNameDialog.mustSupplyTtagName.msg=Must supply a tag name to continue.
-GetTagNameDialog.tagNameErr=Tag Name
-GetTagNameDialog.illegalChars.msg=The tag name contains illegal characters.\nCannot contain any of the following symbols\: \\ \: * ? " < > | , ;
-GetTagNameDialog.illegalCharsErr=Illegal Characters
-GetTagNameDialog.unableToAddTagNameToCase.msg=Unable to add the {0} tag name to the case.
-GetTagNameDialog.taggingErr=Tagging Error
-GetTagNameDialog.tagNameAlreadyDef.msg=A {0} tag name has already been defined.
-GetTagNameDialog.dupTagErr=Duplicate Tag Error
-GetTagNameDialog.tagNameExistsTskCore.msg=The {0} tag name already exists in the database but an error occurred in retrieving it.
-OpenLogFolder.error1=Log File Not Found: {0}
-OpenLogFolder.CouldNotOpenLogFolder=Could not open log folder 
-CTL_OpenLogFolder=Open Log Folder
-CTL_OpenOutputFolder=Open Output Folder
-OpenOutputFolder.error1=Output Folder Not Found\: {0}
-OpenOutputFolder.noCaseOpen=No open case, therefore no current output folder available.
-OpenOutputFolder.CouldNotOpenOutputFolder=Could not open output 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
-ReplaceContentTagAction.replaceTag.alert=Unable to replace tag {0} for {1}.
-ReplaceTagAction.replaceTag=Replace Selected Tag(s) With
-ShowIngestProgressSnapshotAction.actionName.text=Get Ingest Progress Snapshot
-OpenPythonModulesFolderAction.actionName.text=Python Plugins
-OpenPythonModulesFolderAction.errorMsg.folderNotFound=Python plugins folder not found: {0}
-CTL_OpenPythonModulesFolderAction=Python Plugins
-GetTagNameAndCommentDialog.tagCombo.toolTipText=Select tag to use
diff --git a/Core/src/org/sleuthkit/autopsy/allcasessearch/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/allcasessearch/Bundle.properties-MERGED
deleted file mode 100755
index 57f8219cd15015cbebc17b52793b2c696e68a33f..0000000000000000000000000000000000000000
--- a/Core/src/org/sleuthkit/autopsy/allcasessearch/Bundle.properties-MERGED
+++ /dev/null
@@ -1,46 +0,0 @@
-
-AllCasesSearchAction.getName.text=Search All Cases
-# {0} - number of cases
-AllCasesSearchDialog.caseLabel.text=The current Central Repository contains {0} case(s).
-AllCasesSearchDialog.correlationValueTextField.domainExample=Example: "domain.com"
-AllCasesSearchDialog.correlationValueTextField.emailExample=Example: "user@host.com"
-AllCasesSearchDialog.correlationValueTextField.filesExample=Example: "f0e1d2c3b4a5968778695a4b3c2d1e0f"
-AllCasesSearchDialog.correlationValueTextField.iccidExample=Example: "89 91 19 1299 99 329451 0"
-AllCasesSearchDialog.correlationValueTextField.imeiExample=Example: "351756061523999"
-AllCasesSearchDialog.correlationValueTextField.imsiExample=Example: "310150123456789"
-AllCasesSearchDialog.correlationValueTextField.macExample=Example: "0C-14-F2-01-AF-45"
-AllCasesSearchDialog.correlationValueTextField.phoneExample=Example: "(800)123-4567"
-AllCasesSearchDialog.correlationValueTextField.ssidExample=Example: "WirelessNetwork-5G"
-AllCasesSearchDialog.correlationValueTextField.usbExample=Example: "4&1234567&0"
-AllCasesSearchDialog.descriptionLabel.text=<html>Search the Central Repository for correlation properties with a specified value. The search is case insensitive.</html>
-AllCasesSearchDialog.dialogTitle.text=Search All Cases
-AllCasesSearchDialog.emptyNode.text=No results found.
-AllCasesSearchDialog.errorLabel.text=\ 
-AllCasesSearchDialog.correlationTypeLabel.text=Correlation Property Type:
-AllCasesSearchDialog.resultsDescription.text=All Cases Search
-AllCasesSearchDialog.resultsTitle.text=All Cases
-AllCasesSearchDialog.searchButton.AccessibleContext.accessibleDescription=
-AllCasesSearchDialog.searchButton.AccessibleContext.accessibleName=Search
-AllCasesSearchDialog.searchButton.text=Search
-AllCasesSearchDialog.correlationValueTextField.text=
-AllCasesSearchDialog.correlationValueLabel.text=Correlation Property Value:
-AllCasesSearchDialog.casesLabel.text=\ 
-AllCasesSearchDialog.validation.genericMessage=The supplied value is not valid.
-AllCasesSearchDialog.validation.invalidDomain=The supplied value is not a valid domain.
-AllCasesSearchDialog.validation.invalidEmail=The supplied value is not a valid e-mail address.
-AllCasesSearchDialog.validation.invalidHash=The supplied value is not a valid MD5 hash.
-AllCasesSearchDialog.validation.invalidIccid=The supplied value is not a valid ICCID number.
-AllCasesSearchDialog.validation.invalidImei=The supplied value is not a valid IMEI number.
-AllCasesSearchDialog.validation.invalidImsi=The supplied value is not a valid IMSI number.
-AllCasesSearchDialog.validation.invalidMac=The supplied value is not a valid MAC address.
-AllCasesSearchDialog.validation.invalidPhone=The supplied value is not a valid phone number.
-AllCasesSearchDialog.validation.invalidSsid=The supplied value is not a valid wireless network.
-AllCasesSearchNode.getName.text=Other Cases Search
-CorrelationAttributeInstanceNode.columnName.case=Case
-CorrelationAttributeInstanceNode.columnName.comment=Comment
-CorrelationAttributeInstanceNode.columnName.dataSource=Data Source
-CorrelationAttributeInstanceNode.columnName.device=Device
-CorrelationAttributeInstanceNode.columnName.known=Known
-CorrelationAttributeInstanceNode.columnName.name=Name
-CorrelationAttributeInstanceNode.columnName.path=Path
-CTL_AllCasesSearchAction=Search All Cases
diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/casemodule/Bundle.properties-MERGED
deleted file mode 100755
index fd65838d7cb8540e70d699e2757893ae5c29a1d3..0000000000000000000000000000000000000000
--- a/Core/src/org/sleuthkit/autopsy/casemodule/Bundle.properties-MERGED
+++ /dev/null
@@ -1,425 +0,0 @@
-AddImageWizardIngestConfigPanel.name.text=Configure Ingest Modules
-AddImageWizardSelectDspVisual.multiUserWarning.text=This type of Data Source Processor is not available in multi-user mode
-# {0} - exception message
-Case.closeException.couldNotCloseCase=Error closing case: {0}
-Case.creationException.couldNotAcquireDirLock=Failed to get lock on case directory
-Case.creationException.couldNotAcquireResourcesLock=Failed to get lock on case resources
-Case.deleteCaseConfirmationDialog.message=Are you sure you want to close and delete the current case?
-Case.deleteCaseConfirmationDialog.title=Delete Current Case?
-# {0} - exception message
-Case.deleteCaseFailureMessageBox.message=Error deleting case: {0}
-Case.deleteCaseFailureMessageBox.title=Failed to Delete Case
-Case.exceptionMessage.cancelledByUser=Cancelled by user.
-Case.exceptionMessage.cannotDeleteCurrentCase=Cannot delete current case, it must be closed first.
-Case.exceptionMessage.cannotGetLockToDeleteCase=Cannot delete case because it is open for another user or there is a problem with the coordination service.
-Case.exceptionMessage.cannotLocateMainWindow=Cannot locate main application window
-Case.exceptionMessage.cannotOpenMultiUserCaseNoSettings=Multi-user settings are missing (see Tools, Options, Multi-user tab), cannot open a multi-user case.
-# {0} - exception message
-Case.exceptionMessage.couldNotCreatCollaborationMonitor=Failed to create collaboration monitor:\n{0}.
-# {0} - exception message
-Case.exceptionMessage.couldNotCreateCaseDatabase=Failed to create case database:\n{0}.
-# {0} - exception message
-Case.exceptionMessage.couldNotCreateCaseNodeData=Failed to create coordination service node data:\n{0}.
-# {0} - exception message
-Case.exceptionMessage.couldNotGetDbServerConnectionInfo=Failed to get case database server conneciton info:\n{0}.
-# {0} - exception message
-Case.exceptionMessage.couldNotOpenCaseDatabase=Failed to open case database:\n{0}.
-# {0} - exception message
-Case.exceptionMessage.couldNotOpenRemoteEventChannel=Failed to open remote events channel:\n{0}.
-# {0} - exception message
-Case.exceptionMessage.couldNotSaveCaseMetadata=Failed to save case metadata:\n{0}.
-# {0} - exception message
-Case.exceptionMessage.couldNotSaveDbNameToMetadataFile=Failed to save case database name to case metadata file:\n{0}.
-# {0} - exception message
-Case.exceptionMessage.couldNotUpdateCaseNodeData=Failed to update coordination service node data:\n{0}.
-Case.exceptionMessage.emptyCaseDir=Must specify a case directory path.
-Case.exceptionMessage.emptyCaseName=Must specify a case name.
-Case.exceptionMessage.errorsDeletingCase=Errors occured while deleting the case. See the application log for details
-# {0} - exception message
-Case.exceptionMessage.execExceptionWrapperMessage={0}
-Case.exceptionMessage.failedToDeleteCoordinationServiceNodes=Failed to delete the coordination service nodes for the case.
-# {0} - exception message
-Case.exceptionMessage.failedToReadMetadata=Failed to read case metadata:\n{0}.
-Case.exceptionMessage.metadataUpdateError=Failed to update case metadata
-# {0} - exception message
-Case.exceptionMessage.unsupportedSchemaVersionMessage=Unsupported case database schema version:\n{0}.
-Case.open.exception.multiUserCaseNotEnabled=Cannot open a multi-user case if multi-user cases are not enabled. See Tools, Options, Multi-User.
-Case.progressIndicatorCancelButton.label=Cancel
-Case.progressIndicatorTitle.closingCase=Closing Case
-Case.progressIndicatorTitle.creatingCase=Creating Case
-Case.progressIndicatorTitle.deletingCase=Deleting Case
-Case.progressIndicatorTitle.openingCase=Opening Case
-Case.progressMessage.cancelling=Cancelling...
-Case.progressMessage.checkingForOtherUser=Checking to see if another user has the case open...
-Case.progressMessage.clearingTempDirectory=Clearing case temp directory...
-Case.progressMessage.closingApplicationServiceResources=Closing case-specific application service resources...
-Case.progressMessage.closingCaseDatabase=Closing case database...
-Case.progressMessage.closingCaseLevelServices=Closing case-level services...
-Case.progressMessage.creatingCaseDatabase=Creating case database...
-Case.progressMessage.creatingCaseDirectory=Creating case directory...
-Case.progressMessage.creatingCaseNodeData=Creating coordination service node data...
-Case.progressMessage.deletingCaseDatabase=Deleting case database...
-Case.progressMessage.deletingCaseDirectory=Deleting case directory...
-Case.progressMessage.deletingCoordinationServiceNodes=Deleting coordination service nodes...
-Case.progressMessage.deletingTextIndex=Deleting text index...
-Case.progressMessage.openingApplicationServiceResources=Opening application service case resources...
-Case.progressMessage.openingCaseDatabase=Opening case database...
-Case.progressMessage.openingCaseLevelServices=Opening case-level services...
-Case.progressMessage.preparing=Preparing...
-Case.progressMessage.preparingToOpenCaseResources=<html>Preparing to open case resources.<br>This may take time if another user is upgrading the case.</html>
-Case.progressMessage.savingCaseMetadata=Saving case metadata to file...
-Case.progressMessage.settingUpNetworkCommunications=Setting up network communications...
-Case.progressMessage.shuttingDownNetworkCommunications=Shutting down network communications...
-Case.progressMessage.switchingLogDirectory=Switching log directory...
-Case.progressMessage.updatingCaseNodeData=Updating coordination service node data...
-# {0} - serviceName
-Case.serviceCloseResourcesProgressIndicator.title={0} Closing Case Resources
-# {0} - service name
-Case.serviceOpenCaseResourcesProgressIndicator.cancellingMessage=Cancelling opening case resources by {0}...
-# {0} - service name
-Case.serviceOpenCaseResourcesProgressIndicator.title={0} Opening Case Resources
-# {0} - service name
-Case.servicesException.notificationTitle={0} Error
-# {0} - service name
-# {1} - exception message
-Case.servicesException.serviceResourcesCloseError=Could not close case resources for {0} service: {1}
-Case_caseType_multiUser=Multi-user case
-Case_caseType_singleUser=Single-user case
-CaseInformationPanel.caseDetails.header=Details
-CaseInformationPanel.editDetailsButton.text=Edit Details
-CaseInformationPanel.editDetailsDialog.title=Edit Case Details
-CaseInformationPanel.ingestJobInfo.header=Ingest History
-CaseOpenAction.msgDlg.cantOpenCase.title=Error Opening Case
-CasePropertiesPanel.casePanel.border.title=Case
-CasePropertiesPanel.examinerLabel.text=Name:
-CasePropertiesPanel.examinerPanel.border.title=Examiner
-CasePropertiesPanel.lbCaseUUIDLabel.text=Case UUID:
-CasePropertiesPanel.lbExaminerEmailLabel.text=Email:
-CasePropertiesPanel.lbExaminerPhoneLabel.text=Phone:
-CasePropertiesPanel.lbNotesLabel.text=Notes:
-CasePropertiesPanel.lbOrganizationNameLabel.text=Name:
-CasePropertiesPanel.lbPointOfContactEmailLabel.text=Email:
-CasePropertiesPanel.lbPointOfContactNameLabel.text=Point of Contact:
-CasePropertiesPanel.lbPointOfContactPhoneLabel.text=Phone:
-CasePropertiesPanel.pnOrganization.border.title=Organization
-CTL_AddImage=Add Data Source
-CTL_AddImageButton=Add Data Source
-CTL_CaseCloseAct=Close Case
-CTL_CaseNewAction=New Case
-CTL_CaseOpenAction=Open Case
-CTL_CasePropertiesAction=Case Properties
-CTL_CaseDeleteAction=Delete Case
-EditOptionalCasePropertiesPanel.cancelButton.text=Cancel
-EditOptionalCasePropertiesPanel.saveButton.text=Save
-GeneralFilter.encaseImageDesc.text=Encase Images (*.e01)
-GeneralFilter.executableDesc.text=Executables (*.exe)
-GeneralFilter.graphicImageDesc.text=Images (*.png, *.jpg, *.jpeg, *.gif, *.bmp)
-GeneralFilter.rawImageDesc.text=Raw Images (*.img, *.dd, *.001, *.aa, *.raw, *.bin)
-GeneralFilter.virtualMachineImageDesc.text=Virtual Machines (*.vmdk, *.vhd)
-ImageFilePanel.000.confirmationMessage=The selected file has extenson .001 but there is a .000 file in the sequence of raw images.\nShould the .000 file be used as the start, instead of the selected .001 file?\n
-ImageFilePanel.moduleErr=Module Error
-ImageFilePanel.moduleErr.msg=A module caused an error listening to ImageFilePanel updates. See log to determine which module. Some data could be incomplete.\n
-ImageFilePanel.validatePanel.dataSourceOnCDriveError=Warning: Path to multi-user data source is on "C:" drive
-ImageFilePanel.validatePanel.invalidMD5=Invalid MD5 hash
-ImageFilePanel.validatePanel.invalidSHA1=Invalid SHA1 hash
-ImageFilePanel.validatePanel.invalidSHA256=Invalid SHA256 hash
-IngestJobInfoPanel.IngestJobTableModel.DataSource.header=Data Source
-IngestJobInfoPanel.IngestJobTableModel.EndTime.header=End Time
-IngestJobInfoPanel.IngestJobTableModel.IngestStatus.header=Ingest Status
-IngestJobInfoPanel.IngestJobTableModel.StartTime.header=Start Time
-IngestJobInfoPanel.IngestModuleTableModel.ModuleName.header=Module Name
-IngestJobInfoPanel.IngestModuleTableModel.ModuleVersion.header=Module Version
-IngestJobInfoPanel.loadIngestJob.error.text=Failed to load ingest jobs.
-IngestJobInfoPanel.loadIngestJob.error.title=Load Failure
-LocalDiskPanel.errorMessage.noOpenCaseBody=LocalDiskPanel listener couldn't get the open case.
-LocalDiskPanel.errorMessage.noOpenCaseTitle=No open case available
-LocalDiskPanel.imageWriterError.directoryNotExist=Error - directory does not exist
-LocalDiskPanel.imageWriterError.emptyPath=Error - enter path for VHD
-LocalDiskPanel.imageWriterError.fileExists=Error - VHD path already exists
-LocalDiskPanel.imageWriterError.isDirectory=Error - VHD path is a directory
-LocalDiskPanel.localDiskMessage.unspecified=Unspecified
-LocalDiskPanel.moduleErrorMessage.body=A module caused an error listening to LocalDiskPanel updates. See log to determine which module. Some data could be incomplete.
-LocalDiskPanel.moduleErrorMessage.title=Module Error
-LocalDiskSelectionDialog.columnName.diskName=Disk Name
-LocalDiskSelectionDialog.columnName.diskSize=Disk Size
-LocalDiskSelectionDialog.errorMessage.disksNotDetected=Disks were not detected. On some systems it requires admin privileges (or "Run as administrator").
-LocalDiskSelectionDialog.errorMessage.drivesNotDetected=Local drives were not detected. Auto-detection not supported on this OS  or admin privileges required
-LocalDiskSelectionDialog.errorMessage.someDisksNotDetected=Some disks were not detected. On some systems it requires admin privileges (or "Run as administrator").
-LocalDiskSelectionDialog.moduleErrorMessage.body=A module caused an error listening to LocalDiskPanel updates. See log to determine which module. Some data could be incomplete.
-LocalDiskSelectionDialog.moduleErrorMessage.title=Module Error
-LocalDiskSelectionDialog.tableMessage.loading=Loading local disks...
-LocalDiskSelectionDialog.tableMessage.noDrives=No Accessible Drives
-LocalFilesDSProcessor.logicalEvidenceFilter.desc=Logical Evidence Files (L01)
-LocalFilesPanel.pathValidation.dataSourceOnCDriveError=Warning: Path to multi-user data source is on "C:" drive
-LocalFilesPanel.pathValidation.getOpenCase=WARNING: Exception while gettting open case.
-LogicalEvidenceFilePanel.moduleErr.msg=A module caused an error listening to LogicalEvidenceFilePanel updates. See log to determine which module. Some data could be incomplete.
-LogicalEvidenceFilePanel.moduleErr.name=Module Error
-LogicalEvidenceFilePanel.pathValidation.dataSourceOnCDriveError=Warning: Path to multi-user data source is on "C:" drive
-LogicalEvidenceFilePanel.pathValidation.getOpenCase.Error=Warning: Exception while getting open case.
-LogicalEvidenceFilePanel.validatePanel.nonL01Error.text=Only files with the .l01 file extension are supported here.
-LogicalFilesDspPanel.subTypeComboBox.l01FileOption.text=Logical evidence file (L01)
-LogicalFilesDspPanel.subTypeComboBox.localFilesOption.text=Local files and folders
-Menu/Case/OpenRecentCase=Open Recent Case
-CTL_CaseDeleteAction=Delete Case
-MultiUserCaseNode.column.createTime=Create Time
-MultiUserCaseNode.column.name=Name
-MultiUserCaseNode.column.path=Path
-MultiUserCasesBrowserPanel.waitNode.message=Please Wait...
-OpenCaseAutoIngestLogAction.deletedLogErrorMsg=The case auto ingest log has been deleted.
-OpenCaseAutoIngestLogAction.logOpenFailedErrorMsg=Failed to open case auto ingest log. See application log for details.
-OpenCaseAutoIngestLogAction.menuItemText=Open Auto Ingest Log File
-OpenIDE-Module-Name=Case
-NewCaseVisualPanel1.caseNameLabel.text_1=Case Name:
-NewCaseVisualPanel1.caseDirLabel.text=Base Directory:
-NewCaseVisualPanel1.caseDirBrowseButton.text=Browse
-NewCaseVisualPanel1.caseNameTextField.text_1=
-NewCaseVisualPanel1.jLabel2.text_1=Case data will be stored in the following directory:
-NewCaseVisualPanel1.caseParentDirTextField.text=
-NewCaseVisualPanel1.caseDirTextField.text_1=
-CueBannerPanel.autopsyLogo.text=
-CueBannerPanel.closeButton.text=Close
-# {0} - caseErrorMessage
-OpenMultiUserCaseAction.caseOpeningErrorErrorMsg=Failed to open case: {0}
-OpenMultiUserCaseAction.menuItemText=Open Case
-OpenMultiUserCaseDialog.title=Open Multi-User Case
-OpenRecentCasePanel.cancelButton.text=Cancel
-OpenRecentCasePanel.jLabel1.text=Recent Cases
-AddImageErrorsDialog.title=Add Image Log
-AddImageErrorsDialog.copyButton.toolTipText=Copy errors to clipboard
-AddImageErrorsDialog.copyButton.text=Copy
-AddImageErrorsDialog.closeButton.toolTipText=Close this window
-AddImageErrorsDialog.closeButton.text=Close
-OpenRecentCasePanel.openButton.text=Open
-ImageFilePanel.pathLabel.text=Path:
-ImageFilePanel.browseButton.text=Browse
-ImageFilePanel.pathTextField.text=
-MissingImageDialog.selectButton.text=Select Image
-MissingImageDialog.titleLabel.text=Search for missing image
-MissingImageDialog.cancelButton.text=Cancel
-AddImageWizardAddingProgressVisual.statusLabel.text=Data source has been added to the local database. Files are being analyzed.
-AddImageWizardAddingProgressVisual.progressLabel.text=<progress>
-AddImageWizardAddingProgressVisual.viewLogButton.text=View Log
-AddImageWizardAddingProgressVisual.subTitle1Label.text=Processing data source and adding it to a local database. File analysis will start when this finishes.
-ImageFilePanel.timeZoneLabel.text=Time zone:
-ImageFilePanel.noFatOrphansCheckbox.text=Ignore orphan files in FAT file systems
-ImageFilePanel.noFatOrphansCheckbox.toolTipText=
-ImageFilePanel.descLabel.text=(faster results, although some data will not be searched)
-LocalDiskPanel.timeZoneLabel.text=Timezone:
-LocalDiskPanel.noFatOrphansCheckbox.toolTipText=
-LocalDiskPanel.noFatOrphansCheckbox.text=Ignore orphan files in FAT file systems
-LocalDiskPanel.descLabel.text=(faster results, although some data will not be searched)
-MissingImageDialog.browseButton.text=Browse
-MissingImageDialog.pathNameTextField.text=
-AddImageWizardAddingProgressVisual.progressTextArea.border.title=Status
-AddImageAction.wizard.title=Add Data Source
-AddImageAction.ingestConfig.ongoingIngest.msg=<html>Ingest is ongoing on another data source. Adding a new source now might slow down the current ingest.<br />Do you want to proceed and add a new data source now?</html>
-AddImageAction.ingestConfig.ongoingIngest.title=Ingest in progress
-AddImageTask.run.progress.adding=Adding\: {0}
-AddImageTask.interrupt.exception.msg=Error stopping add-image process.
-AddImageWizardAddingProgressPanel.isValid.focusNext=Next >
-AddImageWizardAddingProgressPanel.stateStarted.progressBarText=*This process may take some time for large data sources.
-AddImageWizardAddingProgressVisual.addingDsComplete.text=Adding Data Source - Complete
-AddImageWizardAddingProgressVisual.getName.text=Add Data Source
-AddImageWizardAddingProgressVisual.showErrors.critText=*Failed to add data source (critical errors encountered). Click below to view the log.
-AddImageWizardAddingProgressVisual.showErrors.nonCritText=*Data Source added (non-critical errors encountered). Click below to view the log.
-AddImageWizardChooseDataSourcePanel.moveFocusNext=Next >
-AddImageWizardChooseDataSourceVisual.getName.text=Select Data Source
-AddImageWizardIngestConfigPanel.dsProcDone.noErrs.text=*Data Source added.
-AddImageWizardIngestConfigPanel.dsProcDone.errs.text=*Errors encountered in adding Data Source.
-AddImageWizardIngestConfigVisual.getName.text=Configure Ingest Modules
-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.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\
-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.
-Case.updateExaminer.exception.msg=Error while trying to update the examiner.
-Case.updateCaseNum.exception.msg=Error while trying to update the case number.
-Case.exception.errGetRootObj=Error getting root objects.
-Case.createCaseDir.exception.existNotDir=Cannot create case directory, it already exists and is not a directory\: {0}
-Case.createCaseDir.exception.existCantRW=Cannot create case directory, it already exists and cannot read/write\: {0}
-Case.createCaseDir.exception.cantCreate=Cannot create case directory or it already exists\: {0}
-Case.createCaseDir.exception.cantCreateCaseDir=Could not create case directory\: {0}
-Case.createCaseDir.exception.cantCreateModDir=Could not create modules output directory\: {0}
-Case.createCaseDir.exception.cantCreateReportsDir=Could not create reports output directory\: {0}
-Case.CollaborationSetup.FailNotify.ErrMsg=Failed to connect to any other nodes that may be collaborating on this case.
-Case.CollaborationSetup.FailNotify.Title=Connection Failure
-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\
-     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\
-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})
-CaseCreateAction.msgDlg.cantCreateCase.msg=Cannot create case
-IntervalErrorReport.NewIssues=new issue(s)
-IntervalErrorReport.TotalIssues=total issue(s)
-IntervalErrorReport.ErrorText=Database Connection Error
-CasePropertiesAction.window.title=Case Properties
-CueBannerPanel.title.text=Open Recent Case
-ImageDSProcessor.dsType.text=Disk Image or VM File
-ImageDSProcessor.allDesc.text=All Supported Types
-LocalDiskDSProcessor.dsType.text=Local Disk
-LocalFilesDSProcessor.dsType=Logical Files
-LocalFilesDSProcessor.toString.text=Logical Files
-LocalFilesPanel.contentType.text=LOCAL
-LocalFilesPanel.moduleErr=Module Error
-LocalFilesPanel.moduleErr.msg=A module caused an error listening to LocalFilesPanel updates. See log to determine which module. Some data could be incomplete.
-MissingImageDialog.display.title=Search for Missing Image
-MissingImageDialog.confDlg.noFileSel.msg=No image file has been selected. Are you sure you\nwould like to exit without finding the image?
-MissingImageDialog.confDlg.noFileSel.title=Missing Image
-MissingImageDialog.ErrorSettingImage=Error setting image path. Please try again.
-NewCaseVisualPanel1.getName.text=Case Information
-NewCaseVisualPanel1.caseDirBrowse.selectButton.text=Select
-NewCaseVisualPanel1.badCredentials.text=Bad multi-user settings (see Tools, Options, Multi-user) or services are down.
-NewCaseVisualPanel2.getName.text=Optional Information
-NewCaseWizardAction.newCase.windowTitle.text=New Case Information
-NewCaseWizardAction.getName.text=New Case Wizard
-NewCaseWizardAction.databaseProblem1.text=Cannot open database. Cancelling case creation.
-NewCaseWizardAction.databaseProblem2.text=Error
-NewCaseWizardPanel1.validate.errMsg.invalidSymbols=The Case Name cannot contain any of the following symbols\: \\ / \: * ? " &lt; > |
-NewCaseWizardPanel1.validate.errMsg.dirExists=Case directory ''{0}'' already exists.
-NewCaseWizardPanel1.validate.confMsg.createDir.msg=The base directory "{0}" does not exist. \n\n\
- 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}
-NewCaseWizardPanel1.validate.errMsg.cantCreateDir=Error\: Could not create directory.
-NewCaseWizardPanel1.validate.errMsg.invalidBaseDir.msg=ERROR\: The Base Directory that you entered is not valid.\nPlease enter a valid Base Directory.
-NewCaseWizardPanel1.createDir.errMsg.cantCreateDir.msg=ERROR\: Could not create the case directory. \nPlease enter a valid Case Name and Directory.
-NewCaseWizardPanel2.validate.errCreateCase.msg=Error creating case
-OpenRecentCasePanel.colName.caseName=Case Name
-OpenRecentCasePanel.colName.path=Path
-OptionalCasePropertiesPanel.bnNewOrganization.text=Manage Organizations
-OptionalCasePropertiesPanel.caseDisplayNameLabel.text=Name:
-OptionalCasePropertiesPanel.caseNumberLabel.text=Number:
-OptionalCasePropertiesPanel.casePanel.border.title=Case
-OptionalCasePropertiesPanel.errorDialog.emptyCaseNameMessage=No case name entered.
-OptionalCasePropertiesPanel.errorDialog.invalidCaseNameMessage=Case names cannot include the following symbols: \\, /, :, *, ?, ", <, >, |
-OptionalCasePropertiesPanel.errorDialog.noOpenCase.errMsg=Exception while getting open case.
-OptionalCasePropertiesPanel.examinerLabel.text=Name:
-OptionalCasePropertiesPanel.examinerPanel.border.title=Examiner
-OptionalCasePropertiesPanel.lbExaminerEmailLabel.text=Email:
-OptionalCasePropertiesPanel.lbExaminerPhoneLabel.text=Phone:
-OptionalCasePropertiesPanel.lbNotesLabel.text=Notes:
-OptionalCasePropertiesPanel.lbOrganizationNameLabel.text=Organization analysis is being done for:
-OptionalCasePropertiesPanel.lbPointOfContactEmailLabel.text=Email:
-OptionalCasePropertiesPanel.lbPointOfContactNameLabel.text=Point of Contact:
-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 Type of Data Source To Add
-StartupWindow.title.text=Welcome
-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.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.
-CollaborationMonitor.addingDataSourceStatus.msg={0} adding data source
-CollaborationMonitor.analyzingDataSourceStatus.msg={0} analyzing {1}
-MissingImageDialog.lbWarning.text=
-MissingImageDialog.lbWarning.toolTipText=
-NewCaseVisualPanel1.caseParentDirWarningLabel.text=
-NewCaseVisualPanel1.multiUserCaseRadioButton.text=Multi-user		
-NewCaseVisualPanel1.singleUserCaseRadioButton.text=Single-user
-NewCaseVisualPanel1.caseTypeLabel.text=Case Type: 
-SingleUserCaseConverter.BadDatabaseFileName=Database file does not exist!
-SingleUserCaseConverter.AlreadyMultiUser=Case is already multi-user!
-SingleUserCaseConverter.NonUniqueDatabaseName=Database name not unique.
-SingleUserCaseConverter.UnableToCopySourceImages=Unable to copy source images
-SingleUserCaseConverter.CanNotOpenDatabase=Unable to open database
-CloseCaseWhileIngesting.Warning=Ingest is running. Are you sure you want to close the case?
-CloseCaseWhileIngesting.Warning.title=Warning\: This will close the current case
-CasePropertiesForm.imagesTable.columnModel.title1=Remove
-CasePropertiesForm.imagesTable.columnModel.title0=Path
-IngestJobInfoPanel.jLabel1.text=Ingest Modules
-IngestJobInfoPanel.jLabel2.text=Ingest Jobs
-CaseInformationPanel.closeButton.text=Close
-LocalDiskPanel.copyImageCheckbox.text=Make a VHD image of the drive while it is being analyzed
-LocalDiskPanel.jLabel1.text=Note that at least one ingest module must be run to create a complete copy
-LocalDiskPanel.pathTextField.text=
-LocalDiskPanel.browseButton.text=Browse
-CasePropertiesPanel.caseDirLabel.text=Case Directory:
-CasePropertiesPanel.crDateLabel.text=Created Date:
-CasePropertiesPanel.caseNameLabel.text=Case Name:
-CasePropertiesPanel.lbDbName.text=Database Name:
-CasePropertiesPanel.lbDbType.text=Case Type:
-CasePropertiesPanel.caseNumberLabel.text=Case Number:
-LocalDiskPanel.changeDatabasePathCheckbox.text=Update case to use VHD file upon completion
-CueBannerPanel.openRecentCaseButton.text=
-CueBannerPanel.openRecentCaseLabel.text=Open Recent Case
-ReviewModeCasePanel.cannotOpenCase=Cannot Open Case
-ReviewModeCasePanel.casePathNotFound=Case path not found
-ReviewModeCasePanel.caseIsLocked=Single-user case is locked.
-ReviewModeCasePanel.CaseHeaderText=Case
-ReviewModeCasePanel.CreatedTimeHeaderText=Created Time
-ReviewModeCasePanel.StatusIconHeaderText=Status
-ReviewModeCasePanel.OutputFolderHeaderText=Output Folder
-ReviewModeCasePanel.LastAccessedTimeHeaderText=Last Accessed Time
-ReviewModeCasePanel.MetadataFileHeaderText=Metadata File
-CueBannerPanel.newCaseLabel.text=New Case
-CueBannerPanel.openCaseButton.text=
-CueBannerPanel.openCaseLabel.text=Open Case
-CueBannerPanel.newCaseButton.text=
-ImageFilePanel.sectorSizeLabel.text=Sector size:
-LocalDiskPanel.sectorSizeLabel.text=Sector Size:
-LocalFilesPanel.displayNameLabel.text=Logical File Set Display Name: Default
-LocalFilesPanel.errorLabel.text=Error Label
-LocalFilesPanel.selectedPaths.toolTipText=
-LocalFilesPanel.clearButton.toolTipText=Clears currently selected local file paths
-LocalFilesPanel.clearButton.text=Clear
-LocalFilesPanel.selectButton.actionCommand=Add
-LocalFilesPanel.selectButton.toolTipText=Add local files and folders as logical files
-LocalFilesPanel.selectButton.text=Add
-LocalFilesPanel.localFileChooser.dialogTitle=Select Local Files or Folders
-LocalFilesPanel.localFileChooser.approveButtonToolTipText=
-LocalFilesPanel.localFileChooser.approveButtonText=Select
-LogicalEvidenceFilePanel.selectButton.actionCommand=Add
-LogicalEvidenceFilePanel.selectButton.toolTipText=Add local files and folders as logical files
-LogicalEvidenceFilePanel.selectButton.text=Select
-LogicalEvidenceFilePanel.errorLabel.text=Error Label
-LogicalEvidenceFilePanel.logicalEvidenceFileChooser.dialogTitle=Select Local Files or Folders
-LogicalEvidenceFilePanel.logicalEvidenceFileChooser.approveButtonToolTipText=
-LogicalEvidenceFilePanel.logicalEvidenceFileChooser.approveButtonText=Select
-LogicalEvidenceFilePanel.logicalEvidencePathField.text=
-LocalFilesPanel.changeNameButton.text=Change
-LocalDiskPanel.selectDiskButton.text=Select Disk
-LocalDiskSelectionDialog.refreshLocalDisksButton.text=Refresh Local Disks
-LocalDiskSelectionDialog.errorLabel.text=Error Label
-LocalDiskSelectionDialog.selectLocalDiskLabel.text=Select a local disk:
-LocalDiskSelectionDialog.cancelButton.text=Cancel
-LocalDiskSelectionDialog.okButton.text=OK
-LocalDiskPanel.localDiskLabel.text=Local Disk:
-LocalDiskPanel.imageWriterErrorLabel.text=Error Label
-LocalDiskSelectionDialog.title=Select Local Disk
-ImageFilePanel.md5HashLabel.text=MD5:
-ImageFilePanel.sha1HashLabel.text=SHA-1:
-ImageFilePanel.sha256HashLabel.text=SHA-256:
-ImageFilePanel.sha256HashTextField.text=
-ImageFilePanel.sha1HashTextField.text=
-ImageFilePanel.md5HashTextField.text=
-ImageFilePanel.errorLabel.text=Error Label
-ImageFilePanel.hashValuesNoteLabel.text=NOTE: These values will not be validated when the data source is added.
-ImageFilePanel.hashValuesLabel.text=Hash Values (optional):
-OpenMultiUserCasePanel.searchLabel.text=Select any case and start typing to search by case name
-OpenMultiUserCasePanel.cancelButton.text=Cancel
-OpenMultiUserCasePanel.openSelectedCaseButton.text=Open Selected Case
-OpenMultiUserCasePanel.openSingleUserCaseButton.text=Open Single-User Case...
diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/datasourceSummary/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/casemodule/datasourceSummary/Bundle.properties-MERGED
deleted file mode 100755
index 726f1a59c43aee389759ab10c10fa0a7bc4f7793..0000000000000000000000000000000000000000
--- a/Core/src/org/sleuthkit/autopsy/casemodule/datasourceSummary/Bundle.properties-MERGED
+++ /dev/null
@@ -1,27 +0,0 @@
-CTL_DataSourceSummaryAction=Data Source Summary
-DataSourceSummaryPanel.DataSourceTableModel.dataSourceName.header=Data Source Name
-DataSourceSummaryPanel.DataSourceTableModel.files.header=Files
-DataSourceSummaryPanel.DataSourceTableModel.results.header=Results
-DataSourceSummaryPanel.DataSourceTableModel.tags.header=Tags
-DataSourceSummaryPanel.DataSourceTableModel.type.header=Type
-DataSourceSummaryPanel.fileCountsLabel.text=Files (based on MIME type)
-DataSourceSummaryPanel.FilesTableModel.audio.row=Audio
-DataSourceSummaryPanel.FilesTableModel.count.header=Count
-DataSourceSummaryPanel.FilesTableModel.documents.row=Documents
-DataSourceSummaryPanel.FilesTableModel.executables.row=Executables
-DataSourceSummaryPanel.FilesTableModel.images.row=Images
-DataSourceSummaryPanel.FilesTableModel.type.header=File Type
-DataSourceSummaryPanel.FilesTableModel.videos.row=Videos
-DataSourceSummaryPanel.getDataSources.error.text=Failed to get the list of datasources for the current case.
-DataSourceSummaryPanel.getDataSources.error.title=Load Failure
-DataSourceSummaryPanel.ingestJobsLabel.text=Ingest Jobs
-DataSourceSummaryPanel.closeButton.text=Close
-DataSourceSummaryPanel.gotoDataSourceButton.text=Goto Data Source
-DataSourceSummaryPanel.IngestJobTableModel.EndTime.header=End Time
-DataSourceSummaryPanel.IngestJobTableModel.IngestStatus.header=Ingest Status
-DataSourceSummaryPanel.IngestJobTableModel.StartTime.header=Start Time
-DataSourceSummaryPanel.loadIngestJob.error.text=Failed to load ingest jobs.
-DataSourceSummaryPanel.loadIngestJob.error.title=Load Failure
-DataSourceSummaryPanel.operatingSystemLabel.text=OS:
-ViewSummaryInformationAction.name.text=View Summary Information
-ViewSummaryInformationAction.window.title=Data Source Summary
diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/services/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/casemodule/services/Bundle.properties-MERGED
deleted file mode 100755
index 3f175c430fccee9e4a55aba65ceafd4422df75e7..0000000000000000000000000000000000000000
--- a/Core/src/org/sleuthkit/autopsy/casemodule/services/Bundle.properties-MERGED
+++ /dev/null
@@ -1,31 +0,0 @@
-OptionsCategory_Name_TagNamesOptions=Tags
-OptionsCategory_TagNames=TagNames
-TagNameDefinition.predefTagNames.bookmark.text=Bookmark
-TagNameDefinition.predefTagNames.followUp.text=Follow Up
-TagNameDefinition.predefTagNames.notableItem.text=Notable Item
-TagNameDialog.descriptionLabel.text=Description:
-TagNameDialog.editTitle.text=Edit Tag
-TagNameDialog.JOptionPane.tagDescriptionIllegalCharacters.message=Tag descriptions may not contain commas (,) or semicolons (;)
-TagNameDialog.JOptionPane.tagDescriptionIllegalCharacters.title=Invalid character in tag description
-TagNameDialog.notableCheckbox.text=Tag indicates item is notable.
-TagNameDialog.title.text=New Tag
-TagNameDialog.JOptionPane.tagNameIllegalCharacters.message=Tag name may not contain any of the following symbols\: \\ \: * ? " < > | , ;
-TagNameDialog.JOptionPane.tagNameIllegalCharacters.title=Invalid character in tag name
-TagNameDialog.JOptionPane.tagNameEmpty.message=The tag name cannot be empty
-TagNameDialog.JOptionPane.tagNameEmpty.title=Empty tag name
-TagOptionsPanel.descriptionLabel.text=Tag Description:
-TagOptionsPanel.editTagNameButton.text=Edit Tag
-TagOptionsPanel.ingestRunningWarningLabel.text=Cannot make changes to existing tags when ingest is running!
-TagOptionsPanel.isNotableLabel.text=Tag indicates item is notable: 
-TagOptionsPanel.notableYesOrNoLabel.text=
-TagOptionsPanel.panelDescriptionTextArea.text=Create and manage tags. Tags can be applied to files and results in the case. Notable tags will cause items tagged with them to be flagged as notable when using a central repository. Changing the status of a tag will only effect items in the current case.
-TagOptionsPanel.TagNameDialog.tagNameAlreadyExists.message=Tag name must be unique. A tag with this name already exists.
-TagOptionsPanel.TagNameDialog.tagNameAlreadyExists.title=Duplicate Tag Name
-TagOptionsPanel.tagTypesListLabel.text=Tag Names:
-TagOptionsPanel.deleteTagNameButton.text=Delete Tag
-TagOptionsPanel.newTagNameButton.text=New Tag
-TagNameDialog.okButton.text=OK
-TagNameDialog.cancelButton.text=Cancel
-TagNameDialog.tagNameTextField.text=
-TagNameDialog.newTagNameLabel.text=Name:
-TagsManager.notableTagEnding.text=\ (Notable)
diff --git a/Core/src/org/sleuthkit/autopsy/centralrepository/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/centralrepository/Bundle.properties-MERGED
deleted file mode 100755
index 007af703c54796eefca975f6bb3063d23f78d89e..0000000000000000000000000000000000000000
--- a/Core/src/org/sleuthkit/autopsy/centralrepository/Bundle.properties-MERGED
+++ /dev/null
@@ -1,14 +0,0 @@
-AddEditCentralRepoCommentAction.menuItemText.addEditCentralRepoComment=Add/Edit Central Repository Comment
-AddEditCentralRepoCommentAction.menuItemText.addEditCentralRepoCommentEmptyFile=Add/Edit Central Repository Comment (Empty File)
-AddEditCentralRepoCommentAction.menuItemText.addEditCentralRepoCommentNoMD5=Add/Edit Central Repository Comment (No MD5 Hash)
-CentralRepoCommentDialog.title.addEditCentralRepoComment=Add/Edit Central Repository Comment
-OpenIDE-Module-Name=Central Repository
-OpenIDE-Module-Display-Category=Ingest Module
-OpenIDE-Module-Short-Description=Correlation Engine Ingest Module
-OpenIDE-Module-Long-Description=\
-    Correlation Engine ingest module and central database.  \n\n\
-    The Correlation Engine 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
diff --git a/Core/src/org/sleuthkit/autopsy/centralrepository/contentviewer/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/centralrepository/contentviewer/Bundle.properties-MERGED
deleted file mode 100755
index 68904ecb93f8ada34b8630fa5b63d373fb13b888..0000000000000000000000000000000000000000
--- a/Core/src/org/sleuthkit/autopsy/centralrepository/contentviewer/Bundle.properties-MERGED
+++ /dev/null
@@ -1,35 +0,0 @@
-DataContentViewerOtherCases.caseDetailsDialog.noCaseNameError=Error
-DataContentViewerOtherCases.caseDetailsDialog.noDetails=No details for this case.
-DataContentViewerOtherCases.caseDetailsDialog.noDetailsReference=No case details for Global reference properties.
-DataContentViewerOtherCases.caseDetailsDialog.notSelected=No Row Selected
-# {0} - commonality percentage
-# {1} - correlation type
-# {2} - correlation value
-DataContentViewerOtherCases.correlatedArtifacts.byType={0}% of data sources have {2} (type: {1})\n
-DataContentViewerOtherCases.correlatedArtifacts.failed=Failed to get frequency details.
-DataContentViewerOtherCases.correlatedArtifacts.isEmpty=There are no files or artifacts to correlate.
-DataContentViewerOtherCases.correlatedArtifacts.title=Attribute Frequency
-DataContentViewerOtherCases.earliestCaseNotAvailable=\ Not Enabled.
-DataContentViewerOtherCases.noOpenCase.errMsg=No open case available.
-DataContentViewerOtherCases.selectAllMenuItem.text=Select All
-DataContentViewerOtherCases.showCaseDetailsMenuItem.text=Show Case Details
-DataContentViewerOtherCases.table.noArtifacts=Item has no attributes with which to search.
-DataContentViewerOtherCases.table.nodbconnection=Cannot connect to central repository database.
-DataContentViewerOtherCases.table.noResultsFound=No results found.
-DataContentViewerOtherCases.table.toolTip.text=Click column name to sort. Right-click on the table for more options.
-DataContentViewerOtherCases.exportToCSVMenuItem.text=Export Selected Rows to CSV
-DataContentViewerOtherCases.showCommonalityMenuItem.text=Show Frequency
-DataContentViewerOtherCases.earliestCaseDate.text=Earliest Case Date
-DataContentViewerOtherCases.earliestCaseLabel.toolTipText=
-DataContentViewerOtherCases.earliestCaseLabel.text=Central Repository Starting Date:
-DataContentViewerOtherCases.title=Other Occurrences
-DataContentViewerOtherCases.toolTip=Displays instances of the selected file/artifact from other occurrences.
-DataContentViewerOtherCasesTableModel.attribute=Matched Attribute
-DataContentViewerOtherCasesTableModel.case=Case
-DataContentViewerOtherCasesTableModel.comment=Comment
-DataContentViewerOtherCasesTableModel.dataSource=Data Source
-DataContentViewerOtherCasesTableModel.device=Device
-DataContentViewerOtherCasesTableModel.known=Known
-DataContentViewerOtherCasesTableModel.noData=No Data.
-DataContentViewerOtherCasesTableModel.path=Path
-DataContentViewerOtherCasesTableModel.value=Attribute Value
diff --git a/Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/Bundle.properties-MERGED
deleted file mode 100755
index 26b5dd6887fe9ab94abdb10f65cb1caec59d4904..0000000000000000000000000000000000000000
--- a/Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/Bundle.properties-MERGED
+++ /dev/null
@@ -1,26 +0,0 @@
-AbstractSqlEamDb.upgradeSchema.incompatible=The selected Central Repository is not compatible with the current version of the application, please upgrade the application if you wish to use this Central Repository.
-CorrelationType.DOMAIN.displayName=Domains
-CorrelationType.EMAIL.displayName=Email Addresses
-CorrelationType.FILES.displayName=Files
-CorrelationType.ICCID.displayName=ICCID Number
-CorrelationType.IMEI.displayName=IMEI Number
-CorrelationType.IMSI.displayName=IMSI Number
-CorrelationType.MAC.displayName=MAC Addresses
-CorrelationType.PHONE.displayName=Phone Numbers
-CorrelationType.SSID.displayName=Wireless Networks
-CorrelationType.USBID.displayName=USB Devices
-DataSourceUpdateService.serviceName.text=Update Central Repository Data Sources
-EamArtifactInstances.knownStatus.bad=Bad
-EamArtifactInstances.knownStatus.known=Known
-EamArtifactInstances.knownStatus.unknown=Unknown
-EamArtifactUtil.emailaddresses.text=Email Addresses
-EamCase.title.caseDisplayName=Case Name: 
-EamCase.title.caseNumber=Case Number: 
-EamCase.title.caseUUID=Case UUID: 
-EamCase.title.creationDate=Creation Date: 
-EamCase.title.examinerEmail=Examiner Email: 
-EamCase.title.examinerName=Examiner Name: 
-EamCase.title.examinerPhone=Examiner Phone: 
-EamCase.title.notes=Notes: 
-EamCase.title.org=Organization: 
-EamDbUtil.centralRepoUpgradeFailed.message=Failed to upgrade central repository. It has been disabled.
diff --git a/Core/src/org/sleuthkit/autopsy/centralrepository/eventlisteners/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/centralrepository/eventlisteners/Bundle.properties-MERGED
deleted file mode 100755
index c5f64a70ebe96db239b0cf8120219c63bc2d309c..0000000000000000000000000000000000000000
--- a/Core/src/org/sleuthkit/autopsy/centralrepository/eventlisteners/Bundle.properties-MERGED
+++ /dev/null
@@ -1,9 +0,0 @@
-caseeventlistener.evidencetag=Evidence
-IngestEventsListener.ingestmodule.name=Correlation Engine
-IngestEventsListener.prevCaseComment.text=Previous Case: 
-# {0} - typeName
-# {1} - count
-IngestEventsListener.prevCount.text=Number of previous {0}: {1}
-IngestEventsListener.prevExists.text=Previously Seen Devices (Central Repository)
-IngestEventsListener.prevTaggedSet.text=Previously Tagged As Notable (Central Repository)
-Installer.centralRepoUpgradeFailed.title=Central repository upgrade failed
diff --git a/Core/src/org/sleuthkit/autopsy/centralrepository/ingestmodule/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/centralrepository/ingestmodule/Bundle.properties-MERGED
deleted file mode 100755
index 876bfe7086d77726ab41bafc36bfea42ac3e8abb..0000000000000000000000000000000000000000
--- a/Core/src/org/sleuthkit/autopsy/centralrepository/ingestmodule/Bundle.properties-MERGED
+++ /dev/null
@@ -1,16 +0,0 @@
-CentralRepoIngestModule.errorMessage.isNotEnabled=Central repository settings are not initialized, cannot run Correlation Engine ingest module.
-CentralRepoIngestModule.notfyBubble.title=Central Repository Not Initialized
-CentralRepoIngestModule.postToBB.eamHit=Central Repository
-CentralRepoIngestModule.postToBB.fileName=File Name
-CentralRepoIngestModule.postToBB.hashSetSource=Source of Hash
-# {0} - Name of file that is Notable
-CentralRepoIngestModule.postToBB.knownBadMsg=Notable: {0}
-CentralRepoIngestModule.postToBB.md5Hash=MD5 Hash
-CentralRepoIngestModule.prevCaseComment.text=Previous Case: 
-CentralRepoIngestModule.prevTaggedSet.text=Previously Tagged As Notable (Central Repository)
-CentralRepoIngestModuleFactory.ingestmodule.desc=Saves properties to the central repository for later correlation
-CentralRepoIngestModuleFactory.ingestmodule.name=Correlation Engine
-IngestSettingsPanel.ingestSettingsLabel.text=Ingest Settings
-IngestSettingsPanel.flagTaggedNotableItemsCheckbox.text=Flag items previously tagged as notable
-IngestSettingsPanel.flagPreviouslySeenDevicesCheckbox.text=Flag previously seen devices
-IngestSettingsPanel.createCorrelationPropertiesCheckbox.text=Save items to the Central Repository
diff --git a/Core/src/org/sleuthkit/autopsy/centralrepository/optionspanel/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/centralrepository/optionspanel/Bundle.properties-MERGED
deleted file mode 100755
index 454cb29e3923c5d7af88fe6d4a604cf0ba08d4c4..0000000000000000000000000000000000000000
--- a/Core/src/org/sleuthkit/autopsy/centralrepository/optionspanel/Bundle.properties-MERGED
+++ /dev/null
@@ -1,145 +0,0 @@
-AddNewOrganizationDialog.addNewOrg.msg=Add New Organization
-AddNewOrganizationDialog.bnOk.addFailed.text=Failed to add new organization.
-AddNewOrganizationDialog.validation.incompleteFields=Organization Name is required.
-CasesTableModel.case=Case Name
-CasesTableModel.creationDate=Creation Date
-CasesTableModel.noData=No Cases
-DataSourcesTableModel.dataSource=Data Source Name
-DataSourcesTableModel.deviceId=Device ID
-DataSourcesTableModel.noData=No Data Sources
-EamDbSettingsDialog.chooserPath.failedToGetDbPathMsg=Selected database path is invalid. Try again.
-EamDbSettingsDialog.fcDatabasePath.title=Select location for central_repository.db
-EamDbSettingsDialog.lbDatabaseType.text=Database Type :
-EamDbSettingsDialog.lbSingleUserSqLite.text=SQLite should only be used by one examiner at a time.
-EamDbSettingsDialog.okButton.connectionErrorMsg.text=Failed to connect to central repository database.
-EamDbSettingsDialog.okButton.corruptDatabaseExists.message=Database exists but is not the right format. Manually delete it or choose a different path (if applicable).
-EamDbSettingsDialog.okButton.corruptDatabaseExists.title=Error Loading Database
-EamDbSettingsDialog.okButton.createDbDialog.message=Database does not exist, would you like to create it?
-EamDbSettingsDialog.okButton.createDbDialog.title=Database Does Not Exist
-EamDbSettingsDialog.okButton.createDbError.title=Unable to Create Database
-EamDbSettingsDialog.okButton.createPostgresDbError.message=Unable to create Postgres Database, please ensure address, port, and login credentials are correct for Postgres server and try again.
-EamDbSettingsDialog.okButton.createSQLiteDbError.message=Unable to create SQLite Database, please ensure location exists and you have write permissions and try again.
-EamDbSettingsDialog.okButton.databaseConnectionFailed.message=Unable to connect to database please check your settings and try again.
-EamDbSettingsDialog.okButton.databaseConnectionFailed.title=Database Connection Failed
-EamDbSettingsDialog.okButton.errorMsg.text=Please restart Autopsy to begin using the new database platform.
-EamDbSettingsDialog.okButton.errorTitle.text=Restart Required.
-EamDbSettingsDialog.textPrompt.dbName=Database Name
-EamDbSettingsDialog.textPrompt.hostnameOrIP=Hostname or IP Address
-EamDbSettingsDialog.textPrompt.password=Database User's Password
-EamDbSettingsDialog.textPrompt.port=Port Number
-EamDbSettingsDialog.textPrompt.user=Database User
-EamDbSettingsDialog.title.text=Central Repository Database Configuration
-EamDbSettingsDialog.validation.finished=Click OK to save your database settings and return to the Options. Or select a different database type.
-EamDbSettingsDialog.validation.incompleteFields=Fill in all values for the selected database.
-EamOptionsController.moduleErr=Error processing value changes.
-EamOptionsController.moduleErr.msg=Value change processing failed.
-GlobalSettingsPanel.updateFailed.title=Central repository upgrade failed
-GlobalSettingsPanel.validationErrMsg.ingestRunning=You cannot change settings while ingest is running.
-GlobalSettingsPanel.validationerrMsg.mustConfigure=Configure the database to enable this module.
-ManageCasesDialog.title.text=Manage Cases
-ManageCorrelationPropertiesDialog.noneSelected=There are no correlation properties enabled.
-ManageCorrelationPropertiesDialog.okbutton.failure=Error saving updated selections.
-ManageCorrelationPropertiesDialog.title=Manage Correlation Properties
-ManageOrganizationsDialog.closeButton.text=Close
-ManageOrganizationsDialog.confirmDeletion.message=Are you sure you want to delete the selected organization from the central repo?
-ManageOrganizationsDialog.confirmDeletion.title=Confirm Deletion
-ManageOrganizationsDialog.deleteButton.text=Delete
-ManageOrganizationsDialog.editButton.text=Edit
-ManageOrganizationsDialog.newButton.text=New
-ManageOrganizationsDialog.orgDescriptionTextArea.text=Organizations are used to provide additional contact information for the content they are associated with.
-ManageOrganizationsDialog.orgDetailsLabel.text=Organization Details
-ManageOrganizationsDialog.orgListLabel.text=Organizations
-ManageOrganizationsDialog.orgNameLabel.text=Organization Name:
-ManageOrganizationsDialog.pocEmailLabel.text=Point of Contact Email:
-ManageOrganizationsDialog.pocNameLabel.text=Point of Contact Name:
-ManageOrganizationsDialog.pocPhoneLabel.text=Point of Contact Phone:
-ManageOrganizationsDialog.title.text=Manage Organizations
-ManageOrganizationsDialog.unableToDeleteOrg.message=Unable to delete selected organizaiton.
-ManageOrganizationsDialog.unableToDeleteOrg.title=Unable to Delete
-OptionsCategory_Name_Central_Repository_Options=Central Repository
-OptionsCategory_Keywords_Central_Repository_Options=Central Repository Settings
-ImportHashDatabaseDialog.known.text=Known
-ImportHashDatabaseDialog.knownBad.text=Notable
-EamPostgresSettingsDialog.lbUserPassword.text=User Password :
-EamPostgresSettingsDialog.lbUserName.text=User Name :
-EamPostgresSettingsDialog.bnCancel.text=Cancel
-EamPostgresSettingsDialog.lbPort.text=Port :
-EamPostgresSettingsDialog.lbHostName.text=Host Name / IP :
-EamPostgresSettingsDialog.bnTestConnection.text=Test Connection
-EamPostgresSettingsDialog.lbDatabaseName.text=Database Name :
-EamSqliteSettingsDialog.bnCancel.text=Cancel
-EamSqliteSettingsDialog.lbTestDatabase.text=
-EamSqliteSettingsDialog.bnTestDatabase.text=Test Connection
-EamSqliteSettingsDialog.lbTestDatabaseWarning.text=
-EamSqliteSettingsDialog.bnDatabasePathFileOpen.text=Browse...
-EamSqliteSettingsDialog.tfDatabasePath.toolTipText=Filename and path to store SQLite db file
-EamSqliteSettingsDialog.tfDatabasePath.text=
-EamSqliteSettingsDialog.lbDatabasePath.text=Database Path :
-ImportHashDatabaseDialog.tfDatabaseName.tooltip=Name for this hash set 
-ImportHashDatabaseDialog.tfDatabaseVersion.tooltip.text=Hash Set Version Number
-ImportHashDatabaseDialog.tfDatabaseName.tooltip=Name for this hash set
-ImportHashDatabaseDialog.tfDatabaseVersion.tooltip.text=Hash Set Version Number
-GlobalSettingsPanel.tbOops.text=
-GlobalSettingsPanel.lbDatabaseSettings.text=Database Settings
-GlobalSettingsPanel.bnImportDatabase.label=Import Hash Set 
-AddNewOrganizationDialog.lbPocPhone.text=Phone:
-AddNewOrganizationDialog.lbPocEmail.text=Email:
-AddNewOrganizationDialog.lbPocName.text=Name:
-AddNewOrganizationDialog.lbPocHeading.text=Point of Contact:
-AddNewOrganizationDialog.lbOrganizationName.text=Organization Name:
-AddNewOrganizationDialog.bnCancel.text=Cancel
-AddNewOrganizationDialog.bnOK.text=OK
-AddNewOrganizationDialog.tfName.tooltip=POC Name
-ManageTagsDialog.okButton.text=OK
-ManageTagsDialog.cancelButton.text=Cancel
-ManageArtifactTypesDialog.taInstructionsMsg.text=Enable one or more correlation properties to use for correlation during ingest. Note, these properties are global and impact all users of the Central Repository.
-EamSqliteSettingsDialog.bnOk.text=OK
-EamPostgresSettingsDialog.bnSave.text=Save
-EamDbSettingsDialog.bnDatabasePathFileOpen.text=Browse...
-EamDbSettingsDialog.tfDatabasePath.toolTipText=Filename and path to store SQLite db file
-EamDbSettingsDialog.tfDatabasePath.text=
-EamDbSettingsDialog.lbDatabasePath.text=Database Path :
-EamDbSettingsDialog.bnCancel.text=Cancel
-EamDbSettingsDialog.bnOk.text=OK
-EamDbSettingsDialog.lbHostName.text=Host Name / IP :
-EamDbSettingsDialog.lbUserPassword.text=User Password :
-EamDbSettingsDialog.lbUserName.text=User Name :
-EamDbSettingsDialog.lbPort.text=Port :
-GlobalSettingsPanel.pnDatabaseConfiguration.title=Database Configuration
-GlobalSettingsPanel.lbDbPlatformTypeLabel.text=Type:
-GlobalSettingsPanel.lbDbNameLabel.text=Name:
-GlobalSettingsPanel.bnDbConfigure.text=Configure
-GlobalSettingsPanel.lbDbLocationLabel.text=Location:
-ManageCorrelationPropertiesDialog.lbWarningMsg.text=Warning Message
-ManageCorrelationPropertiesDialog.cancelButton.text=Cancel
-ManageCorrelationPropertiesDialog.okButton.text=OK
-GlobalSettingsPanel.bnManageProperties.text=Manage Correlation Properties
-EamDbSettingsDialog.lbDatabaseDesc.text=Database File:
-EamDbSettingsDialog.lbFullDbPath.text=
-GlobalSettingsPanel.cbUseCentralRepo.text=Use a Central Repository
-GlobalSettingsPanel.organizationTextArea.text=Organization information can be tracked in the Central Repository.
-GlobalSettingsPanel.manageOrganizationButton.text=Manage Organizations
-GlobalSettingsPanel.lbCentralRepository.text=A Central Repository allows you to correlate files and results between cases. Central Repository configuration can not be modified while a case is open.
-GlobalSettingsPanel.pnCorrelationProperties.border.title=Correlation Properties
-GlobalSettingsPanel.organizationPanel.border.title=Organizations
-GlobalSettingsPanel.casesPanel.border.title=Case Details
-GlobalSettingsPanel.showCasesButton.text=Manage Cases
-ShowCasesDialog.closeButton.AccessibleContext.accessibleName=Close
-ShowCasesDialog.closeButton.actionCommand=Close
-ShowCasesDialog.closeButton.text=Close
-ShowCasesDialog.caseDetailsTable.toolTipText=Click column name to sort. Right-click on the table for more options.
-ShowCasesDialog.title=Case Details
-GlobalSettingsPanel.Case\ Details.AccessibleContext.accessibleName=Cases Details
-ShowCasesDialog.caseDetailsTable.AccessibleContext.accessibleDescription=Click column name to sort.
-GlobalSettingsPanel.casesTextArea.text=Display table that lists Central Repository case details.
-GlobalSettingsPanel.ingestRunningWarningLabel.text=Cannot make changes to Central Repository settings when ingest is running!
-GlobalSettingsPanel.correlationPropertiesTextArea.text=Choose which file and result properties to store in the Central Repository for later correlation.\n
-ManageCasesDialog.examinerPhoneLabel.text=Examiner Phone:
-ManageCasesDialog.examinerNameLabel.text=Examiner Name:
-ManageCasesDialog.examinerEmailLabel.text=Examiner Email:
-ManageCasesDialog.caseNumberLabel.text=Case Number:
-ManageCasesDialog.orgLabel.text=Organization:
-ManageCasesDialog.closeButton.text=Close
-ManageCasesDialog.notesLabel.text=Notes:
-ManageCasesDialog.dataSourcesLabel.text=Data Sources:
-ManageCasesDialog.caseInfoLabel.text=Case Info:
diff --git a/Core/src/org/sleuthkit/autopsy/commonpropertiessearch/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/commonpropertiessearch/Bundle.properties-MERGED
deleted file mode 100755
index 10370577d7eda9ef6330c9149dd69a5a78bb3513..0000000000000000000000000000000000000000
--- a/Core/src/org/sleuthkit/autopsy/commonpropertiessearch/Bundle.properties-MERGED
+++ /dev/null
@@ -1,116 +0,0 @@
-AbstractCommonFilesMetadataBuilder.buildCategorySelectionString.all=All File Categories
-AbstractCommonFilesMetadataBuilder.buildCategorySelectionString.doc=Documents
-AbstractCommonFilesMetadataBuilder.buildCategorySelectionString.media=Media
-# {0} - threshold percent
-AbstractCommonFilesMetadataBuilder.getPercentFilter.thresholdPercent=, Threshold {0}%
-# {0} - attr type
-# {1} - threshold string
-AllInterCaseCommonAttributeSearcher.buildTabTitle.titleInterAll=Common Properties (All Central Repository Cases, {0}{1})
-# {0} - build category
-# {1} - threshold string
-AllIntraCaseCommonAttributeSearcher.buildTabTitle.titleIntraAll=Common Properties (All Data Sources, {0}{1})
-# {0} - number of datasources
-CommonAttributePanel.dataSourcesLabel.text=The current Central Repository contains {0} data source(s).
-CommonAttributePanel.exception=Unexpected Exception loading DataSources.
-CommonAttributePanel.frame.title=Find Common Properties
-CommonAttributePanel.incompleteResults.continueText=\n\n Continue with search anyway?
-CommonAttributePanel.incompleteResults.introText=Results may be incomplete. Not all data sources in the current case were ingested into the current Central Repository. The following data sources have not been processed:
-CommonAttributePanel.incompleteResults.title=Search may be incomplete
-CommonAttributePanel.intraCasePanel.title=Curren Case Options
-CommonAttributePanel.search.done.exception=Unexpected exception running Find Common Properties.
-CommonAttributePanel.search.done.interupted=Something went wrong finding common properties.
-CommonAttributePanel.search.done.noCurrentCaseException=Unable to open case file.
-CommonAttributePanel.search.done.noResults=No results found.
-CommonAttributePanel.search.done.searchProgressDisplay=Displaying Common Properties Results.
-CommonAttributePanel.search.done.searchProgressGathering=Gathering Common Properties Results.
-CommonAttributePanel.search.done.sqlException=Unable to query db for properties or data sources.
-CommonAttributePanel.search.done.tskCoreException=Unable to run query against DB.
-CommonAttributePanel.search.results.pathText=Common Properties Results
-CommonAttributePanel.setupCases.done.exeutionException=Unexpected exception loading cases.
-CommonAttributePanel.setupCases.done.interruptedException=Something went wrong building the Common Files Search dialog box.
-CommonAttributePanel.setupDataSources.done.exception=Unexpected exception loading data sources.
-CommonAttributePanel.setupDataSources.done.interupted=Something went wrong building the Common Files Search dialog box.
-CommonAttributePanel.setupDataSources.done.noCurrentCaseException=Unable to open case file.
-CommonAttributePanel.setupDataSources.done.sqlException=Unable to query db for data sources.
-CommonAttributePanel.setupDataSources.done.tskCoreException=Unable to run query against DB.
-CommonAttributePanel.setupDataSources.updateUi.noDataSources=No data sources were found.
-CommonAttributePanel.title=Common Property Panel
-CommonAttributeSearchAction.getName.text=Find Common Properties
-CommonAttributeSearchAction.openPanel.caseNotInCentralRepo=\n  - The current case is not in the Central Repository.
-CommonAttributeSearchAction.openPanel.centralRepoDisabled=\n  - The Central Repository is disabled.
-CommonAttributeSearchAction.openPanel.centralRepoInvalid=\n  - The Central Repository configuration is invalid.
-CommonAttributeSearchAction.openPanel.intro=The find common properties feature is not available because:
-CommonAttributeSearchAction.openPanel.noCaseOpen=\n  - No case is open.
-CommonAttributeSearchAction.openPanel.notEnoughCases=\n  - Fewer than 2 cases exist in the Central Repository.
-CommonAttributeSearchAction.openPanel.notEnoughDataSources=\n  - There are not multiple data sources in the current case.
-CommonAttributeSearchAction.openPanel.resolution=\n\nAddress one of these issues to enable this feature.
-CommonAttributeValueNode.CommonAttributeValueNode.format=Value: %s
-CommonFilesNode.getName.text=Common Files
-CommonFilesPanel.commonFilesSearchLabel.text=<html>Find files in multiple data sources in the current case.</html>
-CommonFilesPanel.text=Indicate which data sources to consider while searching for duplicates:
-CommonFilesPanel.jRadioButton1.text=jRadioButton1
-CommonFilesPanel.jRadioButton2.text=Between current case and cases in Central Repository
-CommonFilesPanel.intraCaseRadio.label=Correlate within current case only
-CommonFilesPanel.interCaseRadio.label=Correlate amongst all known cases (uses Central Repo)
-CommonFilesSearchResultsViewerTable.caseColLbl=Case
-CommonFilesSearchResultsViewerTable.dataSourceColLbl=Data Source
-CommonFilesSearchResultsViewerTable.instancesColLbl=Instances
-CommonFilesSearchResultsViewerTable.localPath=Parent Path in Current Case
-CommonFilesSearchResultsViewerTable.noDescText=\ 
-CommonFilesSearchResultsViewerTable.pathColLbl=Parent Path
-CommonFilesSearchResultsViewerTable.valueColLbl=Value
-InstanceCountNode.createSheet.noDescription=\ 
-InstanceCountNode.displayName=Files with %s instances (%s)
-IntraCasePanel.selectDataSourceComboBox.actionCommand=
-CommonAttributePanel.jCheckBox1.text=Hide files found in over
-CommonAttributePanel.jLabel1.text=%  of data sources in central repository.
-CommonAttributePanel.percentageThresholdCheck.text_1=Hide files found in over
-CommonAttributePanel.jCheckBox1.text=Hide files found in over
-CommonAttributePanel.jLabel1.text=%  of data sources in central repository.
-CommonAttributePanel.percentageThreshold.text=20
-CommonAttributePanel.jLabel1.text_1=% of data sources in central repository.
-InterCasePanel.correlationTypeComboBox.toolTipText=Selected Correlation Type
-IntraCasePanel.selectedFileCategoriesButton.text=Only the selected file types:
-IntraCasePanel.categoriesLabel.text=File Types to Show:
-IntraCasePanel.allFileCategoriesRadioButton.toolTipText=No filtering applied to results...
-IntraCasePanel.allFileCategoriesRadioButton.text=All file types
-IntraCasePanel.documentsCheckbox.text=Documents
-IntraCasePanel.pictureVideoCheckbox.text=Pictures and Videos
-IntraCasePanel.selectedFileCategoriesButton.toolTipText=Select from the options below...
-CommonAttributePanel.percentageThresholdTextTwo.text_1=% of data sources in Central Repository.
-CommonAttributePanel.percentageThresholdCheck.text_1_1=Hide items found in over
-CommonAttributePanel.intraCaseRadio.text=Between data sources in current case
-CommonAttributePanel.errorText.text=<html>In order to search, you must select a file category.</html>
-CommonAttributePanel.searchButton.text=Search
-InterCasePanel.categoriesLabel.text=File Types To Show:
-InterCasePanel.documentsCheckbox.text=Documents
-InterCasePanel.pictureVideoCheckbox.text=Pictures and Videos
-InterCasePanel.selectedFileCategoriesButton.toolTipText=Select from the options below...
-InterCasePanel.selectedFileCategoriesButton.text=Only the selected file types:
-InterCasePanel.allFileCategoriesRadioButton.toolTipText=No filtering applied to results...
-InterCasePanel.allFileCategoriesRadioButton.text=All file types
-InterCasePanel.specificCentralRepoCaseCheckbox.text=Common items need to exist in a specific case:
-IntraCasePanel.onlySpecificDataSourceCheckbox.text=Common items need to exist in a specific data source:
-CommonAttributePanel.interCasePanel.border.title=Central Repository Options
-CommonAttributePanel.intraCasePanel.border.title=Current Case Options
-CommonAttributePanel.commonItemSearchDescription.text=<html>Find items that exist in multiple data sources or cases</html>
-CommonAttributePanel.scopeLabel.text=Scope of Search:
-InterCasePanel.correlationComboBoxLabel.text=Property Type to Match:
-CommonAttributePanel.percentageThresholdInputBox.text=20
-CommonAttributePanel.resultsDisplayLabel.text_2=Display results organized by:
-CommonAttributePanel.organizeByCaseRadio.text=Case
-CommonAttributePanel.organizeByCountRadio.text=Number of occurrences
-CommonAttributePanel.caseResultsRadioButton.text=Case
-CommonAttributePanel.countResultsRadioButton.text=Number of occurrences
-CommonAttributePanel.displayResultsLabel.text_2=Display results organized by:
-# {0} - case name
-# {1} - attr type
-# {2} - threshold string
-SingleInterCaseCommonAttributeSearcher.buildTabTitle.titleInterSingle=Common Properties (Central Repository Case: {0}, {1}{2})
-# {0} - data source name
-# {1} - build category
-# {2} - threshold string
-SingleIntraCaseCommonAttributeSearcher.buildTabTitle.titleIntraSingle=Common Properties (Data Source: {0}, {1}{2})
-UserInputErrorManager.categories=No file categories are included in the search.
-UserInputErrorManager.frequency=Invalid Frequency Percentage: 0 < % < 100.
-ValueNode.createSheet.noDescription=\ 
diff --git a/Core/src/org/sleuthkit/autopsy/communications/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/communications/Bundle.properties-MERGED
deleted file mode 100755
index 381ec7b337a915628f8886fd8e463739041ce798..0000000000000000000000000000000000000000
--- a/Core/src/org/sleuthkit/autopsy/communications/Bundle.properties-MERGED
+++ /dev/null
@@ -1,67 +0,0 @@
-AccountNode.accountName=Account
-AccountNode.accountType=Type
-AccountNode.device=Device
-AccountNode.messageCount=Msgs
-applyText=Apply
-CTL_OpenCVTAction=Communications
-CVTTopComponent.name=\ Communications Visualization
-CVTTopComponent.TabConstraints.tabTitle=Visualize
-CVTTopComponent.accountsBrowser.TabConstraints.tabTitle=Browse
-FiltersPanel.applyFiltersButton.text=Apply
-FiltersPanel.devicesLabel.text=Devices:
-FiltersPanel.accountTypesLabel.text=Account Types:
-FiltersPanel.filtersTitleLabel.text=Filters
-FiltersPanel.unCheckAllAccountTypesButton.text=Uncheck All
-FiltersPanel.checkAllAccountTypesButton.text=Check All
-FiltersPanel.unCheckAllDevicesButton.text=Uncheck All
-FiltersPanel.checkAllDevicesButton.text=Check All
-FiltersPanel.dateRangeLabel.text=Date Range:
-FiltersPanel.startCheckBox.text=Start:
-FiltersPanel.endCheckBox.text=End:
-FiltersPanel.refreshButton.text=Refresh
-FiltersPanel.deviceRequiredLabel.text=Select at least one.
-FiltersPanel.accountTypeRequiredLabel.text=Select at least one.
-FiltersPanel.needsRefreshLabel.text=Displayed data is out of date. Press Refresh.
-MessageBrowser.DataResultViewerTable.title=Messages
-OpenCVTAction.displayName=Communications
-PinAccountsAction.pluralText=Add Selected Accounts to Visualization
-PinAccountsAction.singularText=Add Selected Account to Visualization
-refreshText=Refresh Results
-ResetAndPinAccountsAction.pluralText=Visualize Only Selected Accounts
-ResetAndPinAccountsAction.singularText=Visualize Only Selected Account
-UnpinAccountsAction.pluralText=Remove Selected Accounts
-UnpinAccountsAction.singularText=Remove Selected Account
-VisalizationPanel.paintingError=Problem painting visualization.
-VisualizationPanel.cancelButton.text=Cancel
-VisualizationPanel.computingLayout=Computing Layout
-VisualizationPanel.jButton1.text=Fast Organic 
-CVTTopComponent.vizPanel.TabConstraints.tabTitle=Visualize
-CVTTopComponent.accountsBrowser.TabConstraints.tabTitle_1=Browse
-CVTTopComponent.browseVisualizeTabPane.AccessibleContext.accessibleName=Visualize
-CVTTopComponent.vizPanel.TabConstraints.tabTitle_1=Visualize
-VisualizationPanel.fitGraphButton.text=
-VisualizationPanel.jTextArea1.text=Right-click an account in the Browse Accounts table, and select 'Visualize' to begin.
-VisualizationPanel.jLabel1.text=Layouts:
-# {0} -  layout name
-VisualizationPanel.layoutFail.text={0} layout failed. Try a different layout.
-# {0} - layout name
-VisualizationPanel.layoutFailWithLockedVertices.text={0} layout failed with locked vertices. Unlock some vertices or try a different layout.
-VisualizationPanel.lockAction.pluralText=Lock Selected Accounts
-VisualizationPanel.lockAction.singularText=Lock Selected Account
-VisualizationPanel.unlockAction.pluralText=Unlock Selected Accounts
-VisualizationPanel.unlockAction.singularText=Unlock Selected Account
-VisualizationPanel.zoomLabel.text=100%
-VisualizationPanel.jLabel2.text=Zoom:
-VisualizationPanel.fitZoomButton.toolTipText=fit visualization
-VisualizationPanel.fitZoomButton.text=
-VisualizationPanel.zoomActualButton.toolTipText=reset zoom
-VisualizationPanel.zoomActualButton.text=
-VisualizationPanel.zoomInButton.toolTipText=Zoom in
-VisualizationPanel.zoomInButton.text=
-VisualizationPanel.zoomOutButton.toolTipText=Zoom out
-VisualizationPanel.zoomOutButton.text=
-VisualizationPanel.circleLayoutButton.text=Circle
-VisualizationPanel.organicLayoutButton.text=Organic
-VisualizationPanel.fastOrganicLayoutButton.text=Fast Organic
-VisualizationPanel.hierarchyLayoutButton.text=Hierarchical
-VisualizationPanel.clearVizButton.text_1=Clear Viz.
diff --git a/Core/src/org/sleuthkit/autopsy/contentviewers/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/contentviewers/Bundle.properties-MERGED
deleted file mode 100755
index b894fb1053de802212e3329ff68ff38d8cd1a1fe..0000000000000000000000000000000000000000
--- a/Core/src/org/sleuthkit/autopsy/contentviewers/Bundle.properties-MERGED
+++ /dev/null
@@ -1,146 +0,0 @@
-
-AnnotationsContentViewer.centralRepositoryEntryDataLabel.case=Case:
-AnnotationsContentViewer.centralRepositoryEntryDataLabel.comment=Comment:
-AnnotationsContentViewer.centralRepositoryEntryDataLabel.path=Path:
-AnnotationsContentViewer.centralRepositoryEntryDataLabel.type=Type:
-AnnotationsContentViewer.tagEntryDataLabel.comment=Comment:
-AnnotationsContentViewer.tagEntryDataLabel.tag=Tag:
-AnnotationsContentViewer.tagEntryDataLabel.tagUser=Tag User:
-AnnotationsContentViewer.title=Annotations
-AnnotationsContentViewer.toolTip=Displays tags and comments associated with the selected content.
-ApplicationContentViewer.title=Application
-ApplicationContentViewer.toolTip=Displays file contents.
-FXVideoPanel.pauseButton.infoLabel.playbackErr=Unable to play video.
-FXVideoPanel.progress.bufferingCancelled=media buffering was canceled
-FXVideoPanel.progress.bufferingInterrupted=media buffering was interrupted
-FXVideoPanel.progress.errorWritingVideoToDisk=Error writing video to disk
-FXVideoPanel.mediaPane.infoLabel=Playback of deleted videos is not supported, use an external player.
-FXVideoPanel.progress.bufferingFile=Buffering {0}
-FXVideoPanel.progressLabel.buffering=Buffering...
-FXVideoPanel.media.unsupportedFormat=Unsupported Format.
-GstVideoPanel.cannotProcFile.err=The media player cannot process this file.
-GstVideoPanel.initGst.gstException.msg=Error initializing gstreamer for audio/video viewing and frame extraction capabilities.  Video and audio viewing will be disabled.
-GstVideoPanel.initGst.otherException.msg=Error initializing gstreamer for audio/video viewing frame extraction capabilities.  Video and audio viewing will be disabled.
-GstVideoPanel.noOpenCase.errMsg=No open case available.
-GstVideoPanel.setupVideo.infoLabel.text=Playback of deleted videos is not supported, use an external player.
-GstVideoPanel.exception.problemFile.msg=Cannot capture frames from this file ({0}).
-GstVideoPanel.exception.problemPlay.msg=Problem with video file; problem when attempting to play while obtaining duration.
-GstVideoPanel.exception.problemPause.msg=Problem with video file; problem when attempting to pause while obtaining duration.
-GstVideoPanel.exception.problemPauseCaptFrame.msg=Problem with video file; problem when attempting to pause while capturing a frame.
-GstVideoPanel.exception.problemPlayCaptFrame.msg=Problem with video file; problem when attempting to play while capturing a frame.
-GstVideoPanel.exception.problemStopCaptFrame.msg=Problem with video file; problem when attempting to stop while capturing a frame.
-GstVideoPanel.progress.buffering=Buffering...
-GstVideoPanel.progressLabel.bufferingErr=Error buffering file
-GstVideoPanel.progress.infoLabel.updateErr=Error updating video progress\: {0}
-GstVideoPanel.ExtractMedia.progress.buffering=Buffering {0}
-MediaFileViewer.AccessibleContext.accessibleDescription=
-MediaFileViewer.title=Media
-MediaFileViewer.toolTip=Displays supported multimedia files (images, videos, audio)
-MediaViewImagePanel.errorLabel.OOMText=Could not load file into Media View: insufficent memory.
-MediaViewImagePanel.errorLabel.text=Could not load file into Media View.
-MediaViewImagePanel.externalViewerButton.text=Open in External Viewer
-MediaViewVideoPanel.pauseButton.text=\u25ba
-MediaViewVideoPanel.progressLabel.text=00:00
-MediaViewVideoPanel.infoLabel.text=info
-MediaViewImagePanel.imgFileTooLarge.msg=Could not load image file (too large)\: {0}
-
-MessageContentViewer.AtrachmentsPanel.title=Attachments
-MessageContentViewer.showImagesToggleButton.hide.text=Hide Images
-MessageContentViewer.showImagesToggleButton.text=Show Images
-MessageContentViewer.title=Message
-MessageContentViewer.toolTip=Displays messages.
-Metadata.nodeText.none=None
-Metadata.nodeText.truncated=(results truncated)
-Metadata.nodeText.unknown=Unknown
-Metadata.tableRowTitle.acquisitionDetails=Acquisition Details
-Metadata.tableRowTitle.deviceId=Device ID
-Metadata.tableRowTitle.imageType=Type
-Metadata.tableRowTitle.mimeType=MIME Type
-Metadata.tableRowTitle.name=Name
-Metadata.tableRowTitle.sectorSize=Sector Size
-Metadata.tableRowTitle.sha1=SHA1
-Metadata.tableRowTitle.sha256=SHA256
-Metadata.tableRowTitle.size=Size
-Metadata.tableRowTitle.fileNameAlloc=File Name Allocation
-Metadata.tableRowTitle.metadataAlloc=Metadata Allocation
-Metadata.tableRowTitle.modified=Modified
-Metadata.tableRowTitle.accessed=Accessed
-Metadata.tableRowTitle.created=Created
-Metadata.tableRowTitle.changed=Changed
-Metadata.tableRowContent.md5notCalc=Not calculated
-Metadata.tableRowTitle.md5=MD5
-Metadata.tableRowTitle.hashLookupResults=Hash Lookup Results
-Metadata.tableRowTitle.internalid=Internal ID
-Metadata.tableRowTitle.localPath=Local Path
-Metadata.tableRowTitle.timezone=Time Zone
-Metadata.tableRowTitle.type=Type
-Metadata.title=File Metadata
-Metadata.toolTip=Displays metadata about the file.
-Metadata.nodeText.nonFilePassedIn=Non-file passed in
-Metadata.nodeText.text=From The Sleuth Kit istat Tool\:
-Metadata.nodeText.exceptionNotice.text=Error getting file metadata\:
-MessageContentViewer.rtfbodyScrollPane.TabConstraints.tabTitle=RTF
-MessageContentViewer.headersScrollPane.TabConstraints.tabTitle=Headers
-MessageContentViewer.textbodyScrollPane.TabConstraints.tabTitle=Text
-MessageContentViewer.htmlPane.TabConstraints.tabTitle=HTML
-MessageContentViewer.fromText.text=from address goes here
-MessageContentViewer.fromLabel.text=From:
-MessageContentViewer.datetimeText.text=date goes here
-MessageContentViewer.toText.text=to list goes here
-MessageContentViewer.toLabel.text=To:
-MessageContentViewer.ccText.text=cc list goes here
-MessageContentViewer.subjectLabel.text=Subject:
-MessageContentViewer.subjectText.text=subject goes here
-MessageContentViewer.directionText.text=direction
-MessageContentViewer.ccLabel.text=CC:
-MessageContentViewer.attachmentsPanel.TabConstraints.tabTitle=Attachments
-MessageContentViewer.viewInNewWindowButton.text=View in New Window
-JPEGViewerDummy.jLabel1.text=You are looking at a JPEG file:
-JPEGViewerDummy.jTextField1.text=jTextField1
-PListNode.KeyCol=Key
-PListNode.TypeCol=Type
-PListNode.ValueCol=Value
-PListViewer.DataType.message=Binary Data value not shown
-PListViewer.ExportFailed.message=Plist file export failed.
-PListViewer.ExportSuccess.message=Plist file exported successfully
-PListViewer.processPlist.errorMessage=Error while parsing/displaying plist file.
-PListViewer.processPlist.interruptedMessage=Interrupted while parsing/displaying plist file.
-SQLiteTableView.DisplayAs.text=Display as
-SQLiteTableView.DisplayAsMenuItem.Date=Date
-SQLiteTableView.DisplayAsMenuItem.RawData=Raw Data
-SQLiteViewer.comboBox.noTableEntry=No tables found
-SQLiteViewer.csvExport.confirm.msg=Do you want to overwrite the existing file?
-SQLiteViewer.csvExport.fileName.empty=Please input a file name for exporting.
-SQLiteViewer.csvExport.title=Export to csv file
-SQLiteViewer.errorMessage.failedToExtractFile=The file could not be extracted from the data source.
-SQLiteViewer.errorMessage.failedToinitJDBCDriver=The JDBC driver for SQLite could not be loaded.
-SQLiteViewer.errorMessage.failedToQueryDatabase=The database tables in the file could not be read.
-SQLiteViewer.errorMessage.interrupted=The processing of the file was interrupted.
-SQLiteViewer.errorMessage.noCurrentCase=The case has been closed.
-# {0} - exception message
-SQLiteViewer.errorMessage.unexpectedError=An unexpected error occurred:\n{0).
-SQLiteViewer.exportTableToCsv.FileName=File name: 
-SQLiteViewer.exportTableToCsv.TableName=Table name: 
-SQLiteViewer.exportTableToCsv.write.errText=Failed to export table content to csv file.
-SQLiteViewer.nextPageButton.text=
-SQLiteViewer.prevPageButton.text=
-SQLiteViewer.numPagesLabel.text=N
-SQLiteViewer.jLabel3.text=of
-SQLiteViewer.currPageLabel.text=x
-SQLiteViewer.jLabel2.text=Page
-SQLiteViewer.numEntriesField.text=num Entries
-SQLiteViewer.jLabel1.text=Table
-PListViewer.exportButton.text=Export
-SQLiteViewer.exportCsvButton.text=Export to CSV
-MediaViewImagePanel.rotateLeftButton.text=
-MediaViewImagePanel.zoomInButton.text=
-MediaViewImagePanel.rotateRightButton.text=
-MediaViewImagePanel.zoomOutButton.text=
-MediaViewImagePanel.zoomResetButton.text=Reset
-MediaViewImagePanel.zoomTextField.text=
-MediaViewImagePanel.rotationTextField.text=
-MediaViewImagePanel.rotateLeftButton.toolTipText=
-# {0} - tableName
-SQLiteViewer.readTable.errorText=Error getting rows for table: {0}
-# {0} - tableName
-SQLiteViewer.selectTable.errorText=Error getting row count for table: {0}
diff --git a/Core/src/org/sleuthkit/autopsy/core/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/core/Bundle.properties-MERGED
deleted file mode 100755
index 087eaec31467cab061c140ec0b5f1e43d47f9371..0000000000000000000000000000000000000000
--- a/Core/src/org/sleuthkit/autopsy/core/Bundle.properties-MERGED
+++ /dev/null
@@ -1,33 +0,0 @@
-Installer.closing.confirmationDialog.message=Ingest is running, are you sure you want to exit?
-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\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
-Services/AutoupdateType/org_sleuthkit_autopsy_core_update_center.settings=Autopsy Update Center
-Installer.errorInitJavafx.msg=Error initializing JavaFX.
-Installer.errorInitJavafx.details=\ Some features will not be available.  Check that you have the right JRE installed (Oracle JRE > 1.7.10).
-ServicesMonitor.failedService.notify.title=Service Is Down
-ServicesMonitor.failedService.notify.msg=Connection to {0} is down
-ServicesMonitor.restoredService.notify.title=Service Is Up
-ServicesMonitor.restoredService.notify.msg=Connection to {0} is up
-ServicesMonitor.statusChange.notify.title=Service Status Update
-ServicesMonitor.statusChange.notify.msg=Status for {0} is {1}
-ServicesMonitor.nullServiceName.excepton.txt=Requested service name is null
-ServicesMonitor.unknownServiceName.excepton.txt=Requested service name {0} is unknown
-ServicesMonitor.KeywordSearchNull=Cannot find Keyword Search service
-ServicesMonitor.InvalidPortNumber=Invalid port number.
-ServicesMonitor.remoteCaseDatabase.displayName.text=Multi-user case database service
-ServicesMonitor.remoteKeywordSearch.displayName.text=Multi-user keyword search service
-ServicesMonitor.messaging.displayName.text=Messaging service
-ServicesMonitor.databaseConnectionInfo.error.msg=Error accessing case database connection info
-ServicesMonitor.messagingService.connErr.text=Error accessing messaging service connection info
diff --git a/Core/src/org/sleuthkit/autopsy/corecomponentinterfaces/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/corecomponentinterfaces/Bundle.properties-MERGED
deleted file mode 100755
index 18bd4ca85ca8eccdfa814affdedf3f50f5d76cd6..0000000000000000000000000000000000000000
--- a/Core/src/org/sleuthkit/autopsy/corecomponentinterfaces/Bundle.properties-MERGED
+++ /dev/null
@@ -1,3 +0,0 @@
-CoreComponentControl.CTL_DirectoryTreeTopComponent=Directory Tree
-CoreComponentControl.CTL_FavoritesTopComponent=Favorites
-OpenIDE-Module-Name=CoreComponentInterfaces
diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/corecomponents/Bundle.properties-MERGED
deleted file mode 100755
index 4823c66440f220ca8ad4f61e6ebca0bd4dfbc836..0000000000000000000000000000000000000000
--- a/Core/src/org/sleuthkit/autopsy/corecomponents/Bundle.properties-MERGED
+++ /dev/null
@@ -1,276 +0,0 @@
-AutopsyOptionsPanel.agencyLogoPathFieldValidationLabel.invalidImageSpecified.text=Invalid image file specified.
-AutopsyOptionsPanel.agencyLogoPathFieldValidationLabel.invalidPath.text=Path is not valid.
-AutopsyOptionsPanel.agencyLogoPathFieldValidationLabel.pathNotSet.text=Agency logo path must be set.
-AutopsyOptionsPanel.invalidImageFile.msg=The selected file was not able to be used as an agency logo.
-AutopsyOptionsPanel.invalidImageFile.title=Invalid Image File
-AutopsyOptionsPanel.logNumAlert.invalidInput.text=A positive integer is required here.
-AutopsyOptionsPanel.memFieldValidationLabel.developerMode.text=Memory settings are not available while running in developer mode
-AutopsyOptionsPanel.memFieldValidationLabel.invalidCharacters.text=Invalid characters, value must be a positive integer
-AutopsyOptionsPanel.memFieldValidationLabel.not64BitInstall.text=JVM memory settings only enabled for 64 bit version
-AutopsyOptionsPanel.memFieldValidationLabel.noValueEntered.text=No value entered
-# {0} - systemMemory
-AutopsyOptionsPanel.memFieldValidationLabel.overMaxMemory.text=Value must be less than the total system memory of {0}GB
-# {0} - minimumMemory
-AutopsyOptionsPanel.memFieldValidationLabel.underMinMemory.text=Value must be at least {0}GB
-CTL_DataContentAction=DataContent
-CTL_DataContentTopComponent=Data Content
-CTL_CustomAboutAction=About
-CTL_OfflineHelpAction=Offline Autopsy Documentation
-CTL_OnlineHelpAction=Online Autopsy Documentation
-DataContentViewerArtifact.attrsTableHeader.sources=Source(s)
-DataContentViewerArtifact.attrsTableHeader.type=Type
-DataContentViewerArtifact.attrsTableHeader.value=Value
-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
-DataContentViewerHex.copyingFile=Copying file to open in HxD...
-DataContentViewerHex.launchError=Unable to launch HxD Editor. Please specify the HxD install location in Tools -> Options -> External Viewer
-DataResultViewerTable.commentRender.name=C
-DataResultViewerTable.commentRender.toolTip=C(omments) indicates whether the item has a comment
-DataResultViewerTable.commentRenderer.crAndTagComment.toolTip=Comments exist both in Central Repository and on associated tag(s)
-DataResultViewerTable.commentRenderer.crComment.toolTip=Comment exists in Central Repository
-DataResultViewerTable.commentRenderer.noComment.toolTip=No comments found
-DataResultViewerTable.commentRenderer.tagComment.toolTip=Comment exists on associated tag(s)
-DataResultViewerTable.countRender.name=O
-DataResultViewerTable.countRender.toolTip=O(ccurrences) indicates the number of data sources containing the item in the Central Repository
-DataResultViewerTable.firstColLbl=Name
-DataResultViewerTable.scoreRender.name=S
-DataResultViewerTable.scoreRender.toolTip=S(core) indicates whether the item is interesting or notable
-DataResultViewerTable.title=Table
-DataResultViewerThumbnail.sortLabel.text=Sorted by: ---
-# {0} - sort criteria
-DataResultViewerThumbnail.sortLabel.textTemplate=Sorted by: {0}
-DataResultViewerThumbnail.thumbnailSizeComboBox.large=Large Thumbnails
-DataResultViewerThumbnail.thumbnailSizeComboBox.medium=Medium Thumbnails
-DataResultViewerThumbnail.thumbnailSizeComboBox.small=Small Thumbnails
-OptionsCategory_Name_General=Application
-OptionsCategory_Keywords_General=Autopsy Options
-HINT_DataContentTopComponent=This is a DataContent window
-HINT_NodeTableTopComponent=This is a DataResult window
-OpenIDE-Module-Name=CoreComponents
-DataContentViewerHex.prevPageButton.text=
-DataContentViewerHex.nextPageButton.text=
-DataContentViewerString.prevPageButton.text=
-DataContentViewerString.nextPageButton.text=
-DataContentViewerHex.pageLabel.text_1=Page:
-DataContentViewerHex.currentPageLabel.text_1=1
-DataContentViewerHex.ofLabel.text_1=of
-DataContentViewerHex.totalPageLabel.text_1=100
-DataContentViewerString.pageLabel.text_1=Page:
-DataContentViewerString.currentPageLabel.text_1=1
-DataContentViewerString.ofLabel.text_1=of
-DataContentViewerString.totalPageLabel.text_1=100
-DataContentViewerHex.pageLabel2.text=Page
-DataContentViewerString.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>
-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\="http://www.basistech.com/autopsy-training">http://www.basistech.com/autopsy-training</a></li><li>Commercial Support: <a style\="color\: \#1E2A60;" href\="http://www.basistech.com/digital-forensics/autopsy/support/">http://www.basistech.com/digital-forensics/autopsy/support/</a></li></ul>Copyright &copy; 2003-2018. </div>
-SortChooser.dialogTitle=Choose Sort Criteria
-ThumbnailViewChildren.progress.cancelling=(Cancelling)
-# {0} - file name
-ThumbnailViewNode.progressHandle.text=Generating thumbnail for {0}
-URL_ON_IMG=http://www.sleuthkit.org/
-FILE_FOR_LOCAL_HELP=file:///
-INDEX_FOR_LOCAL_HELP=/docs/index.html
-LBL_Close=Close
-DataContentViewerString.copyMenuItem.text=Copy
-DataContentViewerHex.copyMenuItem.text=Copy
-DataContentViewerString.selectAllMenuItem.text=Select All
-DataContentViewerHex.selectAllMenuItem.text=Select All
-DataContentViewerArtifact.totalPageLabel.text=100
-DataContentViewerArtifact.prevPageButton.text=
-DataContentViewerArtifact.pageLabel2.text=Result
-DataContentViewerArtifact.nextPageButton.text=
-DataContentViewerArtifact.currentPageLabel.text=1
-DataContentViewerArtifact.ofLabel.text=of
-DataContentViewerArtifact.copyMenuItem.text=Copy
-DataContentViewerArtifact.selectAllMenuItem.text=Select All
-DataContentViewerArtifact.pageLabel.text=Result:
-AdvancedConfigurationDialog.applyButton.text=OK
-DataContentViewerString.goToPageLabel.text=Go to Page: 
-DataContentViewerString.goToPageTextField.text=
-DataContentViewerHex.goToPageTextField.text=
-DataContentViewerHex.goToPageLabel.text=Go to Page: 
-DataContentViewerString.languageLabel.toolTipText=
-DataContentViewerString.languageLabel.text=Script:
-DataContentViewerString.languageCombo.toolTipText=Language to attempt when interpreting (extracting and decoding) strings from binary data
-DataResultViewerThumbnail.pageLabel.text=Page:
-DataResultViewerThumbnail.pagesLabel.text=Pages:
-DataResultViewerThumbnail.pagePrevButton.text=
-DataResultViewerThumbnail.pageNextButton.text=
-DataResultViewerThumbnail.imagesLabel.text=Images:
-DataResultViewerThumbnail.imagesRangeLabel.text=-
-DataResultViewerThumbnail.pageNumLabel.text=-
-DataResultViewerThumbnail.filePathLabel.text=\ \ \ 
-DataResultViewerThumbnail.goToPageLabel.text=Go to Page:
-DataResultViewerThumbnail.goToPageField.text=
-AdvancedConfigurationDialog.cancelButton.text=Cancel
-DataContentViewerArtifact.waitText=Retrieving and preparing data, please wait...
-DataContentViewerArtifact.errorText=Error retrieving result
-DataContentViewerArtifact.title=Results
-DataContentViewerArtifact.toolTip=Displays Results associated with the file
-DataContentViewerHex.goToPageTextField.msgDlg=Please enter a valid page number between 1 and {0}
-DataContentViewerHex.goToPageTextField.err=Invalid page number
-DataContentViewerHex.setDataView.errorText=(offset {0}-{1} could not be read)
-DataContentViewerHex.title=Hex
-DataContentViewerHex.toolTip=Displays the binary contents of a file as hexidecimal, with bytes that are displayable as ASCII characters on the right.
-DataContentViewerString.goToPageTextField.msgDlg=Please enter a valid page number between 1 and {0}
-DataContentViewerString.goToPageTextField.err=Invalid page number
-DataContentViewerString.setDataView.errorText=(offset {0}-{1} could not be read)
-DataContentViewerString.setDataView.errorNoText=(offset {0}-{1} contains no text)
-DataContentViewerString.title=Strings
-DataContentViewerString.toolTip=Displays ASCII and Unicode strings extracted from the file.
-DataResultPanel.pleasewaitNodeDisplayName=Please Wait...
-DataResultViewerTable.illegalArgExc.noChildFromParent=Could not get a child Node from the given parent.
-DataResultViewerTable.illegalArgExc.childWithoutPropertySet=Child Node does not have the regular PropertySet.
-DataResultViewerThumbnail.title=Thumbnail
-DataResultViewerThumbnail.goToPageTextField.msgDlg=Please enter a valid page number between 1 and {0}
-DataResultViewerThumbnail.goToPageTextField.err=Invalid page number
-DataResultViewerThumbnail.genThumbs=Generating Thumbnails...
-DataResultViewerThumbnail.pageNumbers.curOfTotal={0} of {1}
-GeneralOptionsPanelController.moduleErr=Module Error
-GeneralOptionsPanelController.moduleErr.msg=A module caused an error listening to GeneralOptionsPanelController updates. See log to determine which module. Some data could be incomplete.
-ProductInformationPanel.verbLoggingEnabled.text=Verbose logging enabled
-ProductInformationPanel.propertyUnknown.text=unknown
-ProductInformationPanel.getVMValue.text={0} {1}
-TableFilterNode.displayName.text=Name
-DataResultViewerThumbnail.comboBox.smallThumbnails=Small Thumbnails
-DataResultViewerThumbnail.comboBox.mediumThumbnails=Medium Thumbnails
-DataResultViewerThumbnail.comboBox.largeThumbnails=Large Thumbnails
-DataResultViewerThumbnail.switchPage.done.errMsg=Error making thumbnails\: {0}
-AboutWindowPanel.actVerboseLogging.text=Activate verbose logging
-OptionsCategory_Name_Multi_User_Settings=Multi-User
-OptionsCategory_Keywords_Multi_User_Options=Multi-User Settings
-MultiUserSettingsPanel.lbSolrSettings.text=Solr Settings
-MultiUserSettingsPanel.cbEnableMultiUser.text=Enable multi-user cases
-MultiUserSettingsPanel.lbDatabaseSettings.text=Database Settings
-MultiUserSettingsPanel.validationErrMsg.incomplete=Fill in all values
-MultiUserSettingsPanel.nonWindowsOs.msg=Multi-user cases are only available on Windows platforms
-MultiUserSettingsPanel.validationErrMsg.invalidDatabasePort=Invalid database port number
-MultiUserSettingsPanel.validationErrMsg.invalidMessageServicePort=Invalid message service port number
-MultiUserSettingsPanel.validationErrMsg.invalidIndexingServerPort=Invalid Solr server port number
-MultiUserSettingsPanel.validationErrMsg.invalidMessgeServiceURI=Message service host and/or port not valid
-DataContentViewerHex.goToOffsetLabel.text=Jump to Offset
-DataContentViewerHex.goToOffsetTextField.text=
-DataContentViewerHex.goToOffsetTextField.msgDlg=Invalid Offset\: {0}
-DataContentViewerHex.setDataView.invalidOffset.negativeOffsetValue=Cannot jump to the resultant offset
-MultiUserSettingsPanel.tbOops.text=
-MultiUserSettingsPanel.lbTestDatabase.text=
-MultiUserSettingsPanel.bnTestDatabase.text=Test
-MultiUserSettingsPanel.tbDbHostname.toolTipText=Hostname or IP Address
-MultiUserSettingsPanel.tbDbHostname.text=
-MultiUserSettingsPanel.tbDbPort.toolTipText=Port Number
-MultiUserSettingsPanel.tbDbPort.text=
-MultiUserSettingsPanel.tbDbUsername.toolTipText=User Name
-MultiUserSettingsPanel.tbDbUsername.text=
-MultiUserSettingsPanel.tbDbPassword.toolTipText=Password
-MultiUserSettingsPanel.tbDbPassword.text=
-MultiUserSettingsPanel.lbTestSolr.text=
-MultiUserSettingsPanel.bnTestSolr.text=Test
-MultiUserSettingsPanel.tbSolrHostname.toolTipText=Hostname or IP Address
-MultiUserSettingsPanel.tbSolrPort.toolTipText=Port Number
-MultiUserSettingsPanel.lbTestMessageService.text=
-MultiUserSettingsPanel.bnTestMessageService.text=Test
-MultiUserSettingsPanel.lbMessageServiceSettings.text=ActiveMQ Message Service Settings
-MultiUserSettingsPanel.tbMsgPort.toolTipText=Port Number
-MultiUserSettingsPanel.tbMsgPort.text=
-MultiUserSettingsPanel.tbMsgUsername.toolTipText=User Name (optional)
-MultiUserSettingsPanel.tbMsgUsername.text=
-MultiUserSettingsPanel.tbMsgPassword.toolTipText=Password (optional)
-MultiUserSettingsPanel.tbMsgPassword.text=
-MultiUserSettingsPanel.tbMsgHostname.toolTipText=Hostname or IP Address
-MultiUserSettingsPanel.tbMsgHostname.text=
-MultiUserSettingsPanel.lbTestMessageWarning.text=
-MultiUserSettingsPanel.lbTestSolrWarning.text=
-MultiUserSettingsPanel.lbTestDbWarning.text=
-MultiUserSettingsPanel.KeywordSearchNull=Cannot find keyword search service
-MultiUserSettingsPanel.InvalidPortNumber=Invalid port number
-AutopsyOptionsPanel.agencyLogoImageLabel.toolTipText=
-AutopsyOptionsPanel.agencyLogoPathField.text=
-SortChooserDialog.label=remove
-SortChooser.addCriteriaButton.text=Add Sort Criteria
-DataResultViewerThumbnail.sortButton.text=Sort
-CriterionChooser.ascendingRadio.text=\u25b2 Ascending\n
-CriterionChooser.removeButton.text=Remove
-CriterionChooser.descendingRadio.text=\u25bc Descending
-AutopsyOptionsPanel.agencyLogoPathFieldValidationLabel.text=
-AutopsyOptionsPanel.logNumAlert.text=
-AutopsyOptionsPanel.totalMemoryLabel.text=Total System Memory:
-AutopsyOptionsPanel.maxMemoryLabel.text=Maximum JVM Memory:
-AutopsyOptionsPanel.maxLogFileCount.text=Maximum Log Files:
-AutopsyOptionsPanel.maxMemoryUnitsLabel.text=GB
-AutopsyOptionsPanel.restartNecessaryWarning.text=A restart is necessary for any memory changes to take effect.
-AutopsyOptionsPanel.browseLogosButton.text=Browse
-AutopsyOptionsPanel.defaultLogoRB.text=Use default
-AutopsyOptionsPanel.specifyLogoRB.text=Specify a logo
-AutopsyOptionsPanel.agencyLogoPreview.text=<html><div style='text-align: center;'>No logo<br>selected</div></html>
-AutopsyOptionsPanel.logoPanel.border.title=Logo
-AutopsyOptionsPanel.runtimePanel.border.title=Runtime
-DataResultPanel.matchLabel.text=Results
-DataResultPanel.numberOfChildNodesLabel.text=0
-DataResultPanel.descriptionLabel.text=directoryPath
-ViewOptionsController.moduleErr=Error processing value changes.
-ViewOptionsController.moduleErr.msg=Value change processing failed.
-ViewPreferencesPanel.groupByDataSourceCheckbox.text=Group by data source
-ViewPreferencesPanel.currentCaseSettingsPanel.border.title=Current Case Settings
-OptionsCategory_Name_View=View
-OptionsCategory_Keywords_View=View
-ViewPreferencesPanel.currentSessionSettingsPanel.border.title=Current Session Settings
-ViewPreferencesPanel.hideRejectedResultsCheckbox.text=Hide rejected results
-ViewPreferencesPanel.selectFileLabel.text=When selecting a file:
-ViewPreferencesPanel.globalSettingsPanel.border.title=Global Settings
-ViewPreferencesPanel.commentsOccurencesColumnWrapAroundText.text=to reduce loading times
-ViewPreferencesPanel.translateTextLabel.text=Translate text:
-ViewPreferencesPanel.commentsOccurencesColumnsCheckbox.text=C(omments) and O(ccurences) columns
-ViewPreferencesPanel.centralRepoLabel.text=Do not use Central Repository for:
-ViewPreferencesPanel.hideOtherUsersTagsLabel.text=Hide other users' tags in the:
-ViewPreferencesPanel.hideOtherUsersTagsCheckbox.text=Tags area in the tree
-ViewPreferencesPanel.useAnotherTimeRadioButton.text=Use another time zone
-ViewPreferencesPanel.useLocalTimeRadioButton.text=Use local time zone
-ViewPreferencesPanel.displayTimeLabel.text=When displaying times:
-ViewPreferencesPanel.viewsHideSlackCheckbox.text=Views area
-ViewPreferencesPanel.dataSourcesHideSlackCheckbox.text=Data Sources area (the directory hierarchy)
-ViewPreferencesPanel.hideSlackFilesLabel.text=Hide slack files in the:
-ViewPreferencesPanel.viewsHideKnownCheckbox.text=Views area
-ViewPreferencesPanel.dataSourcesHideKnownCheckbox.text=Data Sources area (the directory hierarchy)
-ViewPreferencesPanel.hideKnownFilesLabel.text=Hide known files (i.e. those in the NIST NSRL) in the:
-ViewPreferencesPanel.keepCurrentViewerRadioButton.toolTipText=For example, stay in Hex view when a JPEG is selected.
-ViewPreferencesPanel.keepCurrentViewerRadioButton.text=Stay on the same file viewer
-ViewPreferencesPanel.useBestViewerRadioButton.toolTipText=For example, change from Hex to Media when a JPEG is selected.
-ViewPreferencesPanel.useBestViewerRadioButton.text=Change to the most specific file viewer
-ViewPreferencesPanel.fileNameTranslationColumnCheckbox.text=Add column in result viewer for file name translation
-DataContentViewerHex.launchHxDButton.text=Launch in HxD
-ExternalViewerGlobalSettingsPanel.jButton2.text=jButton2
-ExternalViewerGlobalSettingsPanel.newRuleButton1.text=New Rule
-ExternalViewerGlobalSettingsPanel.newRuleButton.text=New Rule
-ExternalViewerGlobalSettingsPanel.browseHxDDirectory.text=Browse
-ExternalViewerGlobalSettingsPanel.jLabel2.text=Set launchable content viewer extensions
-ExternalViewerGlobalSettingsPanel.jLabel1.text=HxD Editor Path:
-ExternalViewerGlobalSettingsPanel.editRuleButton.text=Edit Rule
-ExternalViewerGlobalSettingsPanel.deleteRuleButton.text=Delete Rule
-ExternalViewerGlobalSettingsPanel.externalViewerTitleLabel.text=Set aplication viewer to use for files with specific mime types/extensions:
-ExternalViewerGlobalSettingsPanel.jTable1.columnModel.title1=Application
-ExternalViewerGlobalSettingsPanel.jTable1.columnModel.title0=Mime type/Extension
-AddExternalViewerRulePanel.nameLabel.text=MIME type or extension
-AddExternalViewerRulePanel.browseButton.text=Browse
-AddExternalViewerRulePanel.exePathTextField.text=
-AddExternalViewerRulePanel.exePathLabel.text=Path of the program to use for files with this type or extension
-AddExternalViewerRulePanel.extRadioButton.text=Extension
-AddExternalViewerRulePanel.mimeRadioButton.text=MIME type
-AddExternalViewerRulePanel.nameTextField.text=
-ExternalViewerGlobalSettingsPanel.jButton2.text_1=jButton2
-ExternalViewerGlobalSettingsPanel.newRuleButton1.text_1=New Rule
-ExternalViewerGlobalSettingsPanel.newRuleButton.text_1=New Rule
-ExternalViewerGlobalSettingsPanel.browseHxDDirectory.text_1=Browse
-ExternalViewerGlobalSettingsPanel.jLabel2.text_1=Set launchable content viewer extensions
-ExternalViewerGlobalSettingsPanel.jLabel1.text_1=HxD Editor Path:
-ExternalViewerGlobalSettingsPanel.HxDPath.text=C:/Program Files/HxD/HxD.exe
-ExternalViewerGlobalSettingsPanel.editRuleButton.text_1=Edit Rule
-ExternalViewerGlobalSettingsPanel.deleteRuleButton.text_1=Delete Rule
-ExternalViewerGlobalSettingsPanel.externalViewerTitleLabel.text_1=Set aplication viewer to use for files with specific mime types/extensions:
-ExternalViewerGlobalSettingsPanel.jTable1.columnModel.title1_1=Application
-ExternalViewerGlobalSettingsPanel.jTable1.columnModel.title0_1=Mime type/Extension
-AutopsyOptionsPanel.maxSolrMemoryLabel.text=Maximum Solr JVM Memory:
-AutopsyOptionsPanel.maxMemoryUnitsLabel2.text=MB
-AutopsyOptionsPanel.solrJVMHeapWarning.text=NOTE:  Setting this too large may impact overall performance.
diff --git a/Core/src/org/sleuthkit/autopsy/coreutils/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/coreutils/Bundle.properties-MERGED
deleted file mode 100755
index 015d9ae7f73d368b2c6cec28dbec9b16c3e78452..0000000000000000000000000000000000000000
--- a/Core/src/org/sleuthkit/autopsy/coreutils/Bundle.properties-MERGED
+++ /dev/null
@@ -1,35 +0,0 @@
-# {0} - file name
-GetOrGenerateThumbnailTask.generatingPreviewFor=Generating preview for {0}
-# {0} - file name
-GetOrGenerateThumbnailTask.loadingThumbnailFor=Loading thumbnail for {0}
-ImageUtils.ffmpegLoadedError.msg=OpenCV FFMpeg library failed to load, see log for more details
-ImageUtils.ffmpegLoadedError.title=OpenCV FFMpeg
-OpenIDE-Module-Name=CoreUtils
-JLNK.noPrefPath.text=No preferred path found
-PlatformUtil.nameUnknown=unknown
-PlatformUtil.verUnknown=unknown
-PlatformUtil.archUnknown=unknown
-PlatformUtil.jrePath.jreDir.msg=Embedded jre directory found in\: {0}
-PlatformUtil.jrePath.usingJavaPath.msg=Using java binary path\: {0}
-PlatformUtil.getPID.sigarNotInit.msg=Cannot get PID, sigar not initialized
-PlatformUtil.getPID.gen.msg=Cannot get PID,{0}
-PlatformUtil.getJavaPID.sigarNotInit.msg=Cannot get PID of a java process, sigar not initialized
-PlatformUtil.getJavaPID.gen.msg=Cannot get PID for query\: {0}, {1}
-PlatformUtil.getJavaPIDs.sigarNotInit=Cannot get PIDs of a java process, sigar not initialized
-PlatformUtil.getJavaPIDs.gen.msg=Cannot get PIDs for query\: {0}, {1}
-PlatformUtil.killProcess.sigarNotInit.msg=Cannot kill process by pid, sigar not initialized.
-PlatformUtil.killProcess.gen.msg=Cannot kill process\: {0}, {1}
-PlatformUtil.getProcVmUsed.sigarNotInit.msg=Cannot get virt mem used, sigar not initialized.
-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}\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
-TextConverter.convert.exception.txt=Unable to convert text {0} to hex text
-TextConverter.convertFromHex.exception.txt=Unable to convert hex text to text
-# {0} - file name
-VideoUtils.genVideoThumb.progress.text=extracting temporary file {0}
diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/datamodel/Bundle.properties-MERGED
deleted file mode 100755
index a714ccd67424159c896aea29fb88d44b7544350a..0000000000000000000000000000000000000000
--- a/Core/src/org/sleuthkit/autopsy/datamodel/Bundle.properties-MERGED
+++ /dev/null
@@ -1,395 +0,0 @@
-AbstractAbstractFileNode.accessTimeColLbl=Access Time
-AbstractAbstractFileNode.addFileProperty.desc=no description
-AbstractAbstractFileNode.attrAddrColLbl=Attr. Addr.
-AbstractAbstractFileNode.changeTimeColLbl=Change Time
-AbstractAbstractFileNode.createdTimeColLbl=Created Time
-AbstractAbstractFileNode.createSheet.comment.displayName=C
-AbstractAbstractFileNode.createSheet.comment.name=C
-# {0} - occuranceCount
-AbstractAbstractFileNode.createSheet.count.description=There were {0} datasource(s) found with occurances of the correlation value
-AbstractAbstractFileNode.createSheet.count.displayName=O
-AbstractAbstractFileNode.createSheet.count.hashLookupNotRun.description=Hash lookup had not been run on this file when the column was populated
-AbstractAbstractFileNode.createSheet.count.name=O
-AbstractAbstractFileNode.createSheet.count.noCentralRepo.description=Central repository was not enabled when this column was populated
-AbstractAbstractFileNode.createSheet.interestingResult.description=File has interesting result associated with it.
-AbstractAbstractFileNode.createSheet.noScore.description=No score
-AbstractAbstractFileNode.createSheet.notableFile.description=File recognized as notable.
-AbstractAbstractFileNode.createSheet.notableTaggedFile.description=File tagged with notable tag.
-AbstractAbstractFileNode.createSheet.score.displayName=S
-AbstractAbstractFileNode.createSheet.score.name=S
-AbstractAbstractFileNode.createSheet.taggedFile.description=File has been tagged.
-AbstractAbstractFileNode.extensionColLbl=Extension
-AbstractAbstractFileNode.flagsDirColLbl=Flags(Dir)
-AbstractAbstractFileNode.flagsMetaColLbl=Flags(Meta)
-AbstractAbstractFileNode.groupidColLbl=GroupID
-AbstractAbstractFileNode.knownColLbl=Known
-AbstractAbstractFileNode.locationColLbl=Location
-AbstractAbstractFileNode.md5HashColLbl=MD5 Hash
-AbstractAbstractFileNode.metaAddrColLbl=Meta Addr.
-AbstractAbstractFileNode.mimeType=MIME Type
-AbstractAbstractFileNode.modeColLbl=Mode
-AbstractAbstractFileNode.modifiedTimeColLbl=Modified Time
-AbstractAbstractFileNode.nameColLbl=Name
-AbstractAbstractFileNode.objectId=Object ID
-AbstractAbstractFileNode.originalName=Original Name
-AbstractAbstractFileNode.sizeColLbl=Size
-AbstractAbstractFileNode.tagsProperty.displayName=Tags
-AbstractAbstractFileNode.typeDirColLbl=Type(Dir)
-AbstractAbstractFileNode.typeMetaColLbl=Type(Meta)
-AbstractAbstractFileNode.useridColLbl=UserID
-AbstractFsContentNode.noDesc.text=no description
-ArtifactStringContent.attrsTableHeader.sources=Source(s)
-ArtifactStringContent.attrsTableHeader.type=Type
-ArtifactStringContent.attrsTableHeader.value=Value
-ArtifactStringContent.failedToGetAttributes.message=Failed to get some or all attributes from case database
-ArtifactStringContent.failedToGetSourcePath.message=Failed to get source file path from case database
-BlackboardArtifactNode.createSheet.artifactDetails.displayName=Result Details
-BlackboardArtifactNode.createSheet.artifactDetails.name=Result Details
-BlackboardArtifactNode.createSheet.artifactMD5.displayName=MD5 Hash
-BlackboardArtifactNode.createSheet.artifactMD5.name=MD5 Hash
-BlackboardArtifactNode.createSheet.artifactType.displayName=Result Type
-BlackboardArtifactNode.createSheet.artifactType.name=Result Type
-BlackboardArtifactNode.createSheet.comment.displayName=C
-BlackboardArtifactNode.createSheet.comment.name=C
-# {0} - occuranceCount
-BlackboardArtifactNode.createSheet.count.description=There were {0} datasource(s) found with occurances of the correlation value
-BlackboardArtifactNode.createSheet.count.displayName=O
-BlackboardArtifactNode.createSheet.count.hashLookupNotRun.description=Hash lookup had not been run on this artifact's associated file when the column was populated
-BlackboardArtifactNode.createSheet.count.name=O
-BlackboardArtifactNode.createSheet.count.noCentralRepo.description=Central repository was not enabled when this column was populated
-BlackboardArtifactNode.createSheet.fileSize.displayName=Size
-BlackboardArtifactNode.createSheet.fileSize.name=Size
-BlackboardArtifactNode.createSheet.interestingResult.description=Result has an interesting result associated with it.
-BlackboardArtifactNode.createSheet.noScore.description=No score
-BlackboardArtifactNode.createSheet.notableFile.description=Associated file recognized as notable.
-BlackboardArtifactNode.createSheet.notableTaggedItem.description=Result or associated file tagged with notable tag.
-BlackboardArtifactNode.createSheet.path.displayName=Path
-BlackboardArtifactNode.createSheet.path.name=Path
-BlackboardArtifactNode.createSheet.score.displayName=S
-BlackboardArtifactNode.createSheet.score.name=S
-BlackboardArtifactNode.createSheet.taggedItem.description=Result or associated file has been tagged.
-BlackboardArtifactNode.createSheet.tags.displayName=Tags
-# {0} - artifactDisplayName
-BlackboardArtifactNode.displayName.artifact={0} Artifact
-BlackboardArtifactNode.getAction.errorTitle=Error getting actions
-BlackboardArtifactNode.getAction.linkedFileMessage=There was a problem getting actions for the selected result.  The 'View File in Timeline' action will not be available.
-BlackboardArtifactNode.getAction.resultErrorMessage=There was a problem getting actions for the selected result.  The 'View Result in Timeline' action will not be available.
-BlackboardArtifactTagNode.createSheet.userName.text=User Name
-BlackboardArtifactTagNode.viewSourceArtifact.text=View Source Result
-Category.five=CAT-5: Non-pertinent
-Category.four=CAT-4: Exemplar/Comparison (Internal Use Only)
-Category.one=CAT-1: Child Exploitation (Illegal)
-Category.three=CAT-3: CGI/Animation (Child Exploitive)
-Category.two=CAT-2: Child Exploitation (Non-Illegal/Age Difficult)
-Category.zero=CAT-0: Uncategorized
-ContentTagNode.createSheet.artifactMD5.displayName=MD5 Hash
-ContentTagNode.createSheet.artifactMD5.name=MD5 Hash
-ContentTagNode.createSheet.userName.text=User Name
-DeletedContent.allDelFilter.text=All
-DeletedContent.createSheet.filterType.desc=no description
-DeletedContent.createSheet.filterType.displayName=Type
-DeletedContent.createSheet.name.desc=no description
-DeletedContent.createSheet.name.displayName=Name
-DeletedContent.deletedContentsNode.name=Deleted Files
-DeletedContent.fsDelFilter.text=File System
-DeleteReportAction.showConfirmDialog.errorMsg=An error occurred while deleting the reports.
-DeleteReportAction.showConfirmDialog.multiple.explanation=The reports will remain on disk.
-DeleteReportAction.showConfirmDialog.single.explanation=The report will remain on disk.
-FileNode.getActions.openInExtViewer.text=Open in External Viewer
-FileNode.getActions.searchFilesSameMD5.text=Search for files with the same MD5 hash
-FileNode.getActions.viewFileInDir.text=View File in Directory
-FileNode.getActions.viewInNewWin.text=View in New Window
-FileTypeExtensionFilters.tskDatabaseFilter.text=Databases
-FileTypes.bgCounting.placeholder=\ (counting...)
-FileTypes.createSheet.name.desc=no description
-FileTypes.createSheet.name.displayName=Name
-FileTypes.createSheet.name.name=Name
-FileTypes.name.text=File Types
-FileTypesByMimeType.name.text=By MIME Type
-FileTypesByMimeTypeNode.createSheet.mediaSubtype.desc=no description
-FileTypesByMimeTypeNode.createSheet.mediaSubtype.displayName=Subtype
-FileTypesByMimeTypeNode.createSheet.mediaSubtype.name=Subtype
-FileTypesByMimeTypeNode.createSheet.mediaType.desc=no description
-FileTypesByMimeTypeNode.createSheet.mediaType.displayName=Type
-FileTypesByMimeTypeNode.createSheet.mediaType.name=Type
-ImageNode.action.runIngestMods.text=Run Ingest Modules
-ImageNode.createSheet.deviceId.desc=Device ID of the image
-ImageNode.createSheet.deviceId.displayName=Device ID
-ImageNode.createSheet.deviceId.name=Device ID
-ImageNode.createSheet.sectorSize.desc=Sector size of the image in bytes.
-ImageNode.createSheet.sectorSize.displayName=Sector Size (Bytes)
-ImageNode.createSheet.sectorSize.name=Sector Size (Bytes)
-ImageNode.createSheet.size.desc=Size of the data source in bytes.
-ImageNode.createSheet.size.displayName=Size (Bytes)
-ImageNode.createSheet.size.name=Size (Bytes)
-ImageNode.createSheet.timezone.desc=Timezone of the image
-ImageNode.createSheet.timezone.displayName=Timezone
-ImageNode.createSheet.timezone.name=Timezone
-ImageNode.createSheet.type.desc=Type of the image.
-ImageNode.createSheet.type.displayName=Type
-ImageNode.createSheet.type.name=Type
-ImageNode.createSheet.type.text=Image
-ImageNode.getActions.openFileSearchByAttr.text=Open File Search by Attributes
-KeyValueNode.menuItemText.viewFileInDir=View Source File in Directory
-KeywordHits.createNodeForKey.accessTime.desc=Access Time
-KeywordHits.createNodeForKey.accessTime.displayName=Access Time
-KeywordHits.createNodeForKey.accessTime.name=AccessTime
-KeywordHits.createNodeForKey.chgTime.desc=Change Time
-KeywordHits.createNodeForKey.chgTime.displayName=Change Time
-KeywordHits.createNodeForKey.chgTime.name=ChangeTime
-KeywordHits.createNodeForKey.modTime.desc=Modified Time
-KeywordHits.createNodeForKey.modTime.displayName=Modified Time
-KeywordHits.createNodeForKey.modTime.name=ModifiedTime
-KeywordHits.createSheet.filesWithHits.desc=no description
-KeywordHits.createSheet.filesWithHits.displayName=Files with Hits
-KeywordHits.createSheet.filesWithHits.name=Files with Hits
-KeywordHits.createSheet.listName.desc=no description
-KeywordHits.createSheet.listName.displayName=List Name
-KeywordHits.createSheet.listName.name=List Name
-KeywordHits.createSheet.name.desc=no description
-KeywordHits.createSheet.name.displayName=Name
-KeywordHits.createSheet.name.name=Name
-KeywordHits.createSheet.numChildren.desc=no description
-KeywordHits.createSheet.numChildren.displayName=Number of Children
-KeywordHits.createSheet.numChildren.name=Number of Children
-KeywordHits.kwHits.text=Keyword Hits
-KeywordHits.simpleLiteralSearch.text=Single Literal Keyword Search
-KeywordHits.singleRegexSearch.text=Single Regular Expression Search
-OpenIDE-Module-Name=DataModel
-AbstractContentChildren.CreateTSKNodeVisitor.exception.noNodeMsg=No Node defined for the given SleuthkitItem
-AbstractContentChildren.createAutopsyNodeVisitor.exception.noNodeMsg=No Node defined for the given DisplayableItem
-AbstractContentNode.exception.cannotChangeSysName.msg=Cannot change the system name.
-ArtifactStringContent.getStr.srcFilePath.text=Source File Path
-ArtifactStringContent.getStr.err=Error getting content
-ArtifactTypeNode.createSheet.artType.name=Artifact Type
-ArtifactTypeNode.createSheet.artType.displayName=Artifact Type
-ArtifactTypeNode.createSheet.artType.desc=no description
-ArtifactTypeNode.createSheet.childCnt.name=Child Count
-ArtifactTypeNode.createSheet.childCnt.displayName=Child Count
-ArtifactTypeNode.createSheet.childCnt.desc=no description
-BlackboardArtifactNode.noDesc.text=no description
-BlackboardArtifactNode.createSheet.srcFile.name=Source File
-BlackboardArtifactNode.createSheet.srcFile.displayName=Source File
-BlackboardArtifactNode.createSheet.ext.name=Extension
-BlackboardArtifactNode.createSheet.ext.displayName=Extension
-BlackboardArtifactNode.createSheet.mimeType.name=MIME Type
-BlackboardArtifactNode.createSheet.mimeType.displayName=MIME Type
-BlackboardArtifactNode.createSheet.filePath.name=File Path
-BlackboardArtifactNode.createSheet.filePath.displayName=File Path
-BlackboardArtifactNode.createSheet.dataSrc.name=Data Source
-BlackboardArtifactNode.createSheet.dataSrc.displayName=Data Source
-BlackboardArtifactTagNode.createSheet.srcFile.text=Source File
-BlackboardArtifactTagNode.createSheet.unavail.text=Unavailable
-BlackboardArtifactTagNode.createSheet.srcFilePath.text=Source File Path
-BlackboardArtifactTagNode.createSheet.resultType.text=Result Type
-BlackboardArtifactTagNode.createSheet.comment.text=Comment
-BlackboardArtifactTagTypeNode.displayName.text=Result Tags
-BlackboardArtifactTagTypeNode.createSheet.name.name=Name
-BlackboardArtifactTagTypeNode.createSheet.name.displayName=Name
-ContentTagNode.createSheet.file.name=File
-ContentTagNode.createSheet.file.displayName=File
-ContentTagNode.createSheet.unavail.path=Unavailable
-ContentTagNode.createSheet.filePath.name=File Path
-ContentTagNode.createSheet.filePath.displayName=File Path
-ContentTagNode.createSheet.comment.name=Comment
-ContentTagNode.createSheet.comment.displayName=Comment
-ContentTagNode.createSheet.fileModifiedTime.name=Modified Time
-ContentTagNode.createSheet.fileModifiedTime.displayName=Modified Time
-ContentTagNode.createSheet.fileChangedTime.name=Changed Time
-ContentTagNode.createSheet.fileChangedTime.displayName=Changed Time
-ContentTagNode.createSheet.fileAccessedTime.name=Accessed Time
-ContentTagNode.createSheet.fileAccessedTime.displayName=Accessed Time
-ContentTagNode.createSheet.fileCreatedTime.name=Created Time
-ContentTagNode.createSheet.fileCreatedTime.displayName=Created Time
-ContentTagNode.createSheet.fileSize.name=Size
-ContentTagNode.createSheet.fileSize.displayName=Size
-ContentTagTypeNode.displayName.text=File Tags
-ContentTagTypeNode.createSheet.name.name=Name
-ContentTagTypeNode.createSheet.name.displayName=Name
-ContentUtils.exception.msg=Cannot extract a {0}
-DataModelActionsFactory.srcFileInDir.text=View Source File in Directory
-DataModelActionsFactory.fileInDir.text=View File in Directory
-DataModelActionsFactory.viewNewWin.text=View in New Window
-DataModelActionsFactory.openExtViewer.text=Open in External Viewer
-DataSourcesNode.name=Data Sources
-DataSourcesNode.group_by_datasource.name=Data Source Files
-DataSourcesNode.createSheet.name.name=Name
-DataSourcesNode.createSheet.name.displayName=Name
-DataSourcesNode.createSheet.name.desc=no description
-DirectoryNode.parFolder.text=[parent folder]
-DirectoryNode.curFolder.text=[current folder]
-DirectoryNode.getActions.viewFileInDir.text=View File in Directory
-DirectoryNode.viewInNewWin.text=View in New Window
-EmailExtracted.mailAccount.text=Account
-EmailExtracted.mailFolder.text=Folder
-EmailExtracted.defaultAcct.text=Default
-EmailExtracted.defaultFolder.text=Default
-EmailExtracted.createSheet.name.name=Name
-EmailExtracted.createSheet.name.displayName=Name
-EmailExtracted.createSheet.name.desc=no description
-ExtractedContentNode.name.text=Extracted Content
-ExtractedContentNode.createSheet.name.name=Name
-ExtractedContentNode.createSheet.name.displayName=Name
-ExtractedContentNode.createSheet.name.desc=no description
-LocalFileNode.viewFileInDir.text=View File in Directory
-FileSize.fileSizeRootNode.name=File Size
-FileSize.createSheet.name.name=Name
-FileSize.createSheet.name.displayName=Name
-FileSize.createSheet.name.desc=no description
-FileSize.createSheet.filterType.name=Size Range
-FileSize.createSheet.filterType.displayName=Size Range
-FileSize.createSheet.filterType.desc=no description
-FileSize.exception.notSupported.msg=Not supported for this type of Displayable Item\: {0}
-FileTypeChildren.exception.notSupported.msg=Not supported for this type of Displayable Item\: {0}
-FileTypesByExtNode.createSheet.filterType.name=File Type
-FileTypesByExtNode.createSheet.filterType.displayName=File Type
-FileTypesByExtNode.createSheet.filterType.desc=no description
-FileTypesByExtNode.createSheet.fileExt.name=File Extensions
-FileTypesByExtNode.createSheet.fileExt.displayName=File Extensions
-FileTypesByExtNode.createSheet.fileExt.desc=no description
-FileTypesByExtNode.fname.text=By Extension
-FileTypesByExtNode.createSheet.name.name=Name
-FileTypesByExtNode.createSheet.name.displayName=Name
-FileTypesByExtNode.createSheet.name.desc=no description
-HashsetHits.createSheet.name.name=Name
-HashsetHits.createSheet.name.displayName=Name
-HashsetHits.createSheet.name.desc=no description
-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.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.err=Fatal Error\!
-InterestingHits.interestingItems.text=INTERESTING ITEMS
-InterestingHits.displayName.text=Interesting Items
-InterestingHits.createSheet.name.name=Name
-InterestingHits.createSheet.name.displayName=Name
-InterestingHits.createSheet.name.desc=no description
-KeyValueNode.createSheet.name.name=Name
-KeyValueNode.createSheet.name.displayName=Name
-KeyValueNode.createSheet.name.desc=n/a
-KeyValueNode.createSheet.map.desc=n/a
-LayoutFileNode.propertyType.parts=Parts
-LayoutFileNode.createSheet.name.name=Name
-LayoutFileNode.createSheet.name.displayName=Name
-LayoutFileNode.createSheet.name.desc=no description
-LayoutFileNode.createSheet.noDescr.text=no description
-LayoutFileNode.getActions.viewInNewWin.text=View in New Window
-LayoutFileNode.getActions.openInExtViewer.text=Open in External Viewer
-LocalFileNode.createSheet.name.name=Name
-LocalFileNode.createSheet.name.displayName=Name
-LocalFileNode.createSheet.name.desc=no description
-LocalFileNode.createSheet.noDescr.text=no description
-LocalFileNode.getActions.viewInNewWin.text=View in New Window
-LocalFileNode.getActions.openInExtViewer.text=Open in External Viewer
-LocalFileNode.getActions.searchFilesSameMd5.text=Search for files with the same MD5 hash
-OpenReportAction.actionDisplayName=Open Report
-OpenReportAction.actionPerformed.MessageBoxTitle=Open Report Failure
-OpenReportAction.actionPerformed.NoAssociatedEditorMessage=There is no associated editor for reports of this type or the associated application failed to launch.
-OpenReportAction.actionPerformed.NoOpenInEditorSupportMessage=This platform (operating system) does not support opening a file in an editor this way.
-OpenReportAction.actionPerformed.MissingReportFileMessage=The report file no longer exists.
-OpenReportAction.actionPerformed.ReportFileOpenPermissionDeniedMessage=Permission to open the report file was denied.
-RecentFiles.aut0DayFilter.displayName.text=Final Day
-RecentFiles.aut1dayFilter.displayName.text=Final Day - 1
-RecentFiles.aut2dayFilter.displayName.text=Final Day - 2
-RecentFiles.aut3dayFilter.displayName.text=Final Day - 3
-RecentFiles.aut4dayFilter.displayName.text=Final Day - 4
-RecentFiles.aut5dayFilter.displayName.text=Final Day - 5
-RecentFiles.aut6dayFilter.displayName.text=Final Day - 6
-RecentFilesFilterChildren.exception.defaultVisit.msg=Not supported for this type of Displayable Item\: {0}
-RecentFilesFilterNode.createSheet.filterType.name=Filter Type
-RecentFilesFilterNode.createSheet.filterType.displayName=Filter Type
-RecentFilesFilterNode.createSheet.filterType.desc=no description
-RecentFilesNode.createSheet.name.name=Name
-RecentFilesNode.createSheet.name.displayName=Name
-RecentFilesNode.createSheet.name.desc=no description
-RecentFilesNode.name.text=Recent Files
-ReportNode.sourceModuleNameProperty.name=Source Module Name
-ReportNode.sourceModuleNameProperty.displayName=Source Module Name
-ReportNode.sourceModuleNameProperty.desc=Name of the module that created the report
-ReportNode.createdTimeProperty.name=Created Time
-ReportNode.createdTimeProperty.displayName=Created Time
-ReportNode.createdTimeProperty.desc=Time report was created
-ReportNode.pathProperty.name=Report File Path
-ReportNode.pathProperty.displayName=Report File Path
-ReportNode.pathProperty.desc=Local path of the report file
-ReportNode.reportNameProperty.name=Report Name
-ReportNode.reportNameProperty.displayName=Report Name
-ReportNode.reportNameProperty.desc=Name of the report
-ReportsListNode.displayName=Reports
-ResultsNode.createSheet.name.desc=no description
-ResultsNode.createSheet.name.displayName=Name
-ResultsNode.createSheet.name.name=Name
-ResultsNode.name.text=Results
-SlackFileNode.getActions.viewInNewWin.text=View in New Window
-SlackFileNode.getActions.viewFileInDir.text=View File in Directory
-SpecialDirectoryNode.getActions.viewInNewWin.text=View in New Window
-TagNameNode.namePlusTags.text={0} Tags
-TagNameNode.contentTagTypeNodeKey.text=Content Tags
-TagNameNode.bbArtTagTypeNodeKey.text=Result Tags
-TagNameNode.bookmark.text=Bookmark
-TagNameNode.createSheet.name.name=Name
-TagNameNode.createSheet.name.displayName=Name
-TagsNode.displayName.text=Tags
-TagsNode.createSheet.name.name=Name
-TagsNode.createSheet.name.displayName=Name
-ViewsNode.name.text=Views
-ViewsNode.createSheet.name.name=Name
-ViewsNode.createSheet.name.displayName=Name
-ViewsNode.createSheet.name.desc=no description
-VirtualDirectoryNode.createSheet.deviceId.desc=Device ID of the image
-VirtualDirectoryNode.createSheet.deviceId.displayName=Device ID
-VirtualDirectoryNode.createSheet.deviceId.name=Device ID
-VirtualDirectoryNode.createSheet.size.desc=Size of the data source in bytes.
-VirtualDirectoryNode.createSheet.size.displayName=Size (Bytes)
-VirtualDirectoryNode.createSheet.size.name=Size (Bytes)
-VirtualDirectoryNode.createSheet.timezone.desc=Timezone of the image
-VirtualDirectoryNode.createSheet.timezone.displayName=Timezone
-VirtualDirectoryNode.createSheet.timezone.name=Timezone
-VirtualDirectoryNode.createSheet.type.desc=Type of the image.
-VirtualDirectoryNode.createSheet.type.displayName=Type
-VirtualDirectoryNode.createSheet.type.name=Type
-VirtualDirectoryNode.createSheet.type.text=Logical File Set
-VirtualDirectoryNode.getActions.viewInNewWin.text=View in New Window
-VirtualDirectoryNode.createSheet.name.name=Name
-VirtualDirectoryNode.createSheet.name.displayName=Name
-VirtualDirectoryNode.createSheet.name.desc=no description
-VirtualDirectoryNode.createSheet.noDesc=no description
-VolumeNode.getActions.viewInNewWin.text=View in New Window
-VolumeNode.createSheet.name.name=Name
-VolumeNode.createSheet.name.displayName=Name
-VolumeNode.createSheet.name.desc=no description
-VolumeNode.createSheet.id.name=ID
-VolumeNode.createSheet.id.displayName=ID
-VolumeNode.createSheet.id.desc=no description
-VolumeNode.createSheet.startSector.name=Starting Sector
-VolumeNode.createSheet.startSector.displayName=Starting Sector
-VolumeNode.createSheet.startSector.desc=no description
-VolumeNode.createSheet.lenSectors.name=Length in Sectors
-VolumeNode.createSheet.lenSectors.displayName=Length in Sectors
-VolumeNode.createSheet.lenSectors.desc=no description
-VolumeNode.createSheet.description.name=Description
-VolumeNode.createSheet.description.displayName=Description
-VolumeNode.createSheet.description.desc=no description
-VolumeNode.createSheet.flags.name=Flags
-VolumeNode.createSheet.flags.displayName=Flags
-VolumeNode.createSheet.flags.desc=no description
-ArtifactStringContent.getStr.artifactId.text=Artifact ID
-DeleteReportAction.actionDisplayName.singleReport=Delete Report
-DeleteReportAction.actionDisplayName.multipleReports=Delete Reports
-DeleteReportAction.actionPerformed.showConfirmDialog.title=Confirm Deletion
-DeleteReportAction.actionPerformed.showConfirmDialog.single.msg=Do you want to delete 1 report from the case?
-DeleteReportAction.actionPerformed.showConfirmDialog.multiple.msg=Do you want to delete {0} reports from the case?
-FileTypeExtensionFilters.tskImgFilter.text=Images
-FileTypeExtensionFilters.tskVideoFilter.text=Videos
-FileTypeExtensionFilters.tskAudioFilter.text=Audio
-FileTypeExtensionFilters.tskArchiveFilter.text=Archives
-FileTypeExtensionFilters.tskDocumentFilter.text=Documents
-FileTypeExtensionFilters.tskExecFilter.text=Executable
-FileTypeExtensionFilters.autDocHtmlFilter.text=HTML
-FileTypeExtensionFilters.autDocOfficeFilter.text=Office
-FileTypeExtensionFilters.autoDocPdfFilter.text=PDF
-FileTypeExtensionFilters.autDocTxtFilter.text=Plain Text
-FileTypeExtensionFilters.autDocRtfFilter.text=Rich Text
diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/accounts/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/datamodel/accounts/Bundle.properties-MERGED
deleted file mode 100755
index 3f5cc586e210fe5c29b0f25db0916f1817d08c6c..0000000000000000000000000000000000000000
--- a/Core/src/org/sleuthkit/autopsy/datamodel/accounts/Bundle.properties-MERGED
+++ /dev/null
@@ -1,28 +0,0 @@
-Accounts.BINNode.accountsProperty.displayName=Accounts
-Accounts.BINNode.bankCityProperty.displayName=Bank City
-Accounts.BINNode.bankCountryProperty.displayName=Bank Country
-Accounts.BINNode.bankPhoneProperty.displayName=Bank Phone #
-Accounts.BINNode.bankProperty.displayName=Bank
-Accounts.BINNode.bankURLProperty.displayName=Bank URL
-Accounts.BINNode.binProperty.displayName=Bank Identifier Number
-Accounts.BINNode.brandProperty.displayName=Brand
-Accounts.BINNode.cardTypeProperty.displayName=Payment Card Type
-Accounts.BINNode.noDescription=no description
-Accounts.BINNode.schemeProperty.displayName=Credit Card Scheme
-# {0} - number of children
-Accounts.ByBINNode.displayName=By BIN ({0})
-Accounts.ByBINNode.name=By BIN
-# {0} - number of children
-Accounts.ByFileNode.displayName=By File ({0})
-Accounts.FileWithCCNNode.accountsProperty.displayName=Accounts
-Accounts.FileWithCCNNode.nameProperty.displayName=File
-Accounts.FileWithCCNNode.noDescription=no description
-Accounts.FileWithCCNNode.statusProperty.displayName=Status
-# {0} - raw file name
-# {1} - solr chunk id
-Accounts.FileWithCCNNode.unallocatedSpaceFile.displayName={0}_chunk_{1}
-Accounts.RootNode.displayName=Accounts
-AccountsRootNode.name=Accounts
-ApproveAccountsAction.name=Approve Accounts
-RejectAccountsAction.name=Reject Accounts
-ToggleShowRejected.name=Show Rejected Results
diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/utils/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/datamodel/utils/Bundle.properties-MERGED
deleted file mode 100755
index adfec95fa3ca0398f0ce7e44f5ace04ff49a7cb9..0000000000000000000000000000000000000000
--- a/Core/src/org/sleuthkit/autopsy/datamodel/utils/Bundle.properties-MERGED
+++ /dev/null
@@ -1,7 +0,0 @@
-FileTypeCategory.Audio.displayName=Audio
-FileTypeCategory.Documents.displayName=Documents
-FileTypeCategory.Executables.displayName=Executables
-FileTypeCategory.Image.displayName=Image
-FileTypeCategory.Media.displayName=Media
-FileTypeCategory.Video.displayName=Video
-FileTypeCategory.Visual.displayName=Visual
diff --git a/Core/src/org/sleuthkit/autopsy/datasourceprocessors/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/datasourceprocessors/Bundle.properties-MERGED
deleted file mode 100755
index 06f0c5e13a2c36e54974e69034af4a513156c17b..0000000000000000000000000000000000000000
--- a/Core/src/org/sleuthkit/autopsy/datasourceprocessors/Bundle.properties-MERGED
+++ /dev/null
@@ -1,21 +0,0 @@
-# To change this license header, choose License Headers in Project Properties.
-# To change this template file, choose Tools | Templates
-# and open the template in the editor.
-
-AddRawImageTask.for.device=for device 
-AddRawImageTask.image.critical.error.adding=Critical error adding 
-AddRawImageTask.image.noncritical.error.adding=Non-critical error adding 
-AddRawImageTask.image.notExisting=is not existing.
-AddRawImageTask.noOpenCase.errMsg=No open case available.
-AddRawImageTask.progress.add.text=Adding raw image: 
-RawDSInputPanel.error.text=Path to multi-user data source is on "C:" drive
-RawDSInputPanel.noOpenCase.errMsg=Exception while getting open case.
-RawDSInputPanel.pathLabel.text=Browse for an unallocated space image file:
-RawDSInputPanel.errorLabel.text=Error Label
-RawDSInputPanel.browseButton.text=Browse
-RawDSInputPanel.pathTextField.text=
-RawDSInputPanel.jBreakFileUpLabel.text=Break image up into:
-RawDSInputPanel.jNoBreakupRadioButton.text=Do not break up
-RawDSInputPanel.j2GBBreakupRadioButton.text=2GB chunks
-RawDSInputPanel.timeZoneLabel.text=Please select the input timezone:
-RawDSProcessor.dataSourceType=Unallocated Space Image File
diff --git a/Core/src/org/sleuthkit/autopsy/diagnostics/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/diagnostics/Bundle.properties-MERGED
deleted file mode 100755
index 90ad7a3ffe375a5725eeba6cc8bb952a615c2374..0000000000000000000000000000000000000000
--- a/Core/src/org/sleuthkit/autopsy/diagnostics/Bundle.properties-MERGED
+++ /dev/null
@@ -1,29 +0,0 @@
-CTL_PerformancePanelAction=Performance Diagnostics
-PerformancePanel.jLabel1.text=Image Reading:
-PerformancePanel.jLabel2.text=Database Reading:
-PerformancePanel.jLabel3.text=CPU:
-PerformancePanel.imgReadLabel.text=\ 
-PerformancePanel.dbReadLabel.text=\ 
-PerformancePanel.cpuTimeLabel.text=\ 
-PerformancePanel.startButton.text=Start
-PerformancePanel.statusLabel.text=\ 
-PerformancePanel.jLabel4.text=File Reading: 
-PerformancePanel.fileReadLabel.text=\ 
-PerformancePanel.jLabel5.text=This panel performs a series of tests to help identify bottlenecks in the system.
-PerformancePanel.title=Performance Diagnostics
-PerformancePanel.cpuTest.basemsg=Running CPU Test
-PerformancePanel.cpuTest.cpuLabel.md5AlgNotFound.text=MD5 Algorithm not found
-PerformancePanel.cpuTest.cpuLabel.MBHashedPerSec.text={0} MB hashed / sec
-PerformancePanel.imgTest.statusMsg.runningImgReadTest.text=Running Image Reading Test
-PerformancePanel.label.caseNotOpen.text=Case Not Open
-PerformancePanel.label.noImgInCase.text=No Images In Case
-PerformancePanel.ImgTest.imgLabel.MBReadPerSec.text={0} MB read / sec ({1})
-PerformancePanel.FileReadTest.fileReadLabel.skipped.text=Skipped
-PerformancePanel.FileReadTest.statusMsg.runningFileReadTest.text=Running File Reading Test
-PerformancePanel.fileReadLabel.imgPathNotExist.text=Image Path Doesn't Exist
-PerformancePanel.fileReadLabel.errMakeFileReader.text=Error making file reader
-PerformancePanel.ImgTest.fileReadLabel.MBReadPerSec.text={0} MB read / sec ({1})
-PerformancePanel.dbTest.status.running=Running DB Test
-PerformancePanel.dbTest.dbLabel.recordsPerSec.text={0} records / sec
-PerformancePanel.dbTest.dbLabel.errPerformQuery.text=Error Performing Query
-PerformancePanel.done.statusMsg.err.text=Error\: {0}
diff --git a/Core/src/org/sleuthkit/autopsy/directorytree/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/directorytree/Bundle.properties-MERGED
deleted file mode 100755
index 5571878ccc04819bc490632804fd131d669331a2..0000000000000000000000000000000000000000
--- a/Core/src/org/sleuthkit/autopsy/directorytree/Bundle.properties-MERGED
+++ /dev/null
@@ -1,160 +0,0 @@
-CTL_DirectoryTreeTopComponent=Directory Tree
-DataResultFilterNode.viewSourceArtifact.text=View Source Result
-# {0} - dataSourceCount
-DirectoryTreeTopComponent.componentOpened.groupDataSources.text=This case contains {0} data sources. Would you like to group by data source for faster loading?
-DirectoryTreeTopComponent.componentOpened.groupDataSources.title=Group by data source?
-DirectoryTreeTopComponent.emptyMimeNode.text=Data not available. Run file type identification module.
-DirectoryTreeTopComponent.resultsView.title=Listing
-ExternalViewerAction.actionPerformed.failure.IO.message=There is no associated editor for files of this type or the associated application failed to launch.
-ExternalViewerAction.actionPerformed.failure.missingFile.message=The file no longer exists.
-ExternalViewerAction.actionPerformed.failure.open.url=Cannot open URL
-ExternalViewerAction.actionPerformed.failure.permission.message=Permission to open the file was denied.
-ExternalViewerAction.actionPerformed.failure.support.message=This platform (operating system) does not support opening a file in an editor this way.
-ExternalViewerAction.actionPerformed.failure.title=Open File Failure
-ExtractAction.noOpenCase.errMsg=No open case available.
-ExtractUnallocAction.imageError=Error extracting unallocated space from image
-ExtractUnallocAction.noFiles=No unallocated files found on volume
-ExtractUnallocAction.noOpenCase.errMsg=No open case available.
-ExtractUnallocAction.volumeError=Error extracting unallocated space from volume
-# {0} - fileName
-ExtractUnallocAction.volumeInProgress=Already extracting unallocated space into {0} - will skip this volume
-FileSystemDetailsAction.title.text=File System Details
-# {0} - dataSourceCount
-GroupDataSourcesDialog.groupDataSources.text=This case contains {0} data sources.
-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=...
-FileSystemDetailsPanel.blockSizeValue.text=...
-FileSystemDetailsPanel.blockCountValue.text=...
-FileSystemDetailsPanel.rootInumValue.text=...
-FileSystemDetailsPanel.firstInumValue.text=...
-FileSystemDetailsPanel.lastInumValue.text=...
-FileSystemDetailsPanel.volumeIDLabel.text=Volume ID:
-FileSystemDetailsPanel.blockSizeLabel.text=Block Size:
-FileSystemDetailsPanel.blockCountLabel.text=Block Count:
-FileSystemDetailsPanel.rootInumLabel.text=Root Metadata Entry:
-FileSystemDetailsPanel.firstInumLabel.text=First Metadata Entry:
-FileSystemDetailsPanel.lastInumLabel.text=Last Metadata Entry:
-FileSystemDetailsPanel.OKButton.text=OK
-SelectionContext.dataSourceFiles=Data Source Files
-SelectionContext.dataSources=Data Sources
-SelectionContext.views=Views
-ViewContextAction.errorMessage.cannotFindDirectory=Failed to locate directory.
-ViewContextAction.errorMessage.cannotFindNode=Failed to locate data source node in tree.
-ViewContextAction.errorMessage.cannotSelectDirectory=Failed to select directory in tree.
-VolumeDetailsPanel.volumeIDLabel.text=Volume ID:
-VolumeDetailsPanel.volumeIDValue.text=...
-VolumeDetailsPanel.startValue.text=...
-VolumeDetailsPanel.lengthValue.text=...
-VolumeDetailsPanel.descValue.text=...
-VolumeDetailsPanel.flagsValue.text=...
-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:
-ImageDetailsPanel.imgNameValue.text=...
-ImageDetailsPanel.imgTypeLabel.text=Type:
-ImageDetailsPanel.imgTypeValue.text=...
-ImageDetailsPanel.OKButton.text=OK
-ImageDetailsPanel.imgSectorSizeLabel.text=Sector Size:
-ImageDetailsPanel.imgSectorSizeValue.text=...
-DirectoryTreeTopComponent.backButton.text=
-DirectoryTreeTopComponent.forwardButton.text=
-ImageDetailsPanel.imgTotalSizeValue.text=...
-ImageDetailsPanel.imgTotalSizeLabel.text=Total Size:
-ImageDetailsPanel.imgHashValue.text=...
-ImageDetailsPanel.imgHashLabel.text=Hash Value:
-ChangeViewAction.menuItem.view=View
-ChangeViewAction.menuItem.view.hex=Hex
-ChangeViewAction.menuItem.view.string=String
-DataResultFilterNode.action.viewFileInDir.text=View File in Directory
-DataResultFilterNode.action.viewSrcFileInDir.text=View Source File in Directory
-DataResultFilterNode.action.viewInNewWin.text=View in New Window
-DataResultFilterNode.action.openInExtViewer.text=Open in External Viewer
-DataResultFilterNode.action.searchFilesSameMd5.text=Search for files with the same MD5 hash
-DataResultFilterNode.action.viewInDir.text=View in Directory
-DirectoryTreeFilterNode.action.collapseAll.text=Collapse All
-DirectoryTreeFilterNode.action.openFileSrcByAttr.text=Open File Search by Attributes
-DirectoryTreeFilterNode.action.runIngestMods.text=Run Ingest Modules
-DirectoryTreeTopComponent.action.viewArtContent.text=View Artifact Content
-ExplorerNodeActionVisitor.action.imgDetails.title=Image Details
-ExplorerNodeActionVisitor.action.extUnallocToSingleFiles=Extract Unallocated Space to Single Files
-ExplorerNodeActionVisitor.action.fileSystemDetails.title=File System Details
-ExplorerNodeActionVisitor.action.volumeDetails.title=Volume Details
-ExplorerNodeActionVisitor.action.extUnallocToSingleFile=Extract Unallocated Space to Single File
-ExplorerNodeActionVisitor.volDetail.noVolMatchErr=Error\: No Volume Matches.
-ExplorerNodeActionVisitor.imgDetail.noVolMatchesErr=Error\: No Volume Matches.
-ExplorerNodeActionVisitor.exception.probGetParent.text=Problem getting parent from {0}\: {1}
-ExtractAction.title.extractFiles.text=Extract File(s)
-ExtractAction.extractFiles.cantCreateFolderErr.msg=Could not create selected folder.
-ExtractAction.confDlg.destFileExist.msg=Destination file {0} already exists, overwrite?
-ExtractAction.confDlg.destFileExist.title=File Exists
-ExtractAction.msgDlg.cantOverwriteFile.msg=Could not overwrite existing file {0}
-ExtractAction.notifyDlg.noFileToExtr.msg=No file(s) to extract.
-ExtractAction.progress.extracting=Extracting
-ExtractAction.progress.cancellingExtraction={0} (Cancelling...)
-ExtractAction.done.notifyMsg.fileExtr.text=File(s) extracted.
-ExtractUnallocAction.notifyMsg.unallocAlreadyBeingExtr.msg=Unallocated Space is already being extracted on this Image. Please select a different Image.
-ExtractUnallocAction.msgDlg.folderDoesntExist.msg=Folder does not exist. Please choose a valid folder before continuing
-ExtractUnallocAction.dlgTitle.selectDirToSaveTo.msg=Select directory to save to
-ExtractUnallocAction.confDlg.unallocFileAlreadyExist.msg=The Unalloc File for this volume, {0} already exists, do you want to replace it?
-ExtractUnallocAction.progress.extractUnalloc.title=Extracting Unallocated Space
-ExtractUnallocAction.progress.displayName.cancelling.text=Extracting Unallocated Space (Cancelling...)
-ExtractUnallocAction.processing.counter.msg=processing {0} of {1} MBs
-ExtractUnallocAction.done.notifyMsg.completedExtract.title=Completed extraction of unallocated space.
-ExtractUnallocAction.done.notifyMsg.completedExtract.msg=Files were extracted to {0}
-ExtractUnallocAction.done.errMsg.title=Error Extracting
-ExtractUnallocAction.done.errMsg.msg=Error extracting unallocated space\: {0}
-ExtractAction.done.notifyMsg.extractErr=Error extracting files\: {0}
-OptionsCategory_Name_ExternalViewer=External Viewer
-OptionsCategory_Keywords_ExternalViewer=ExternalViewer
-ExternalViewerGlobalSettingsPanel.exePathLabel.MIME.text=Program associated with this MIME type
-ExternalViewerGlobalSettingsPanel.exePathLabel.EXT.text=Program associated with this extension
-ExternalViewerGlobalSettingsPanel.exePathLabel.empty.text=No MIME type or extension selected
-AddExternalViewerRuleDialog.saveButton.title=Save
-AddExternalViewerRuleDialog.cancelButton.title=Cancel
-AddExternalViewerRuleDialog.title=External Viewer Rule
-ExternalViewerGlobalSettingsPanel.JOptionPane.invalidMime.message=The MIME type is invalid. Add your custom types in the File Types options panel.
-ExternalViewerGlobalSettingsPanel.JOptionPane.invalidMime.title=Invalid MIME type
-ExternalViewerGlobalSettingsPanel.JOptionPane.invalidExt.message=The extension is invalid.
-ExternalViewerGlobalSettingsPanel.JOptionPane.invalidExt.title=Invalid extension
-ExternalViewerGlobalSettingsPanel.JOptionPane.invalidExePath.message=The path to the program executable is invalid
-ExternalViewerGlobalSettingsPanel.JOptionPane.invalidExePath.title=Invalid Path
-ExternalViewerGlobalSettingsPanel.JOptionPane.ruleAlreadyExists.message=A rule already exists with this MIME type or extension. Please edit that one.
-ExternalViewerGlobalSettingsPanel.JOptionPane.ruleAlreadyExists.title=Rule not added
-AddExternalViewerRulePanel.mimeRadioButton.text=MIME type
-AddExternalViewerRulePanel.nameTextField.text=
-AddExternalViewerRulePanel.nameLabel.text=MIME type or extension
-AddExternalViewerRulePanel.browseButton.text=Browse
-AddExternalViewerRulePanel.exePathTextField.text=
-AddExternalViewerRulePanel.exePathLabel.text=Path of the program to use for files with this type or extension
-AddExternalViewerRulePanel.extRadioButton.text=Extension
-GroupDataSourcesDialog.dataSourceCountLabel.text=jLabel1
-GroupDataSourcesDialog.queryLabel.text=Would you like to group by data source for faster loading?
-GroupDataSourcesDialog.yesButton.text=Yes
-GroupDataSourcesDialog.noButton.text=No
-GroupDataSourcesDialog.title=Group by Data Source?
-DirectoryTreeTopComponent.openViewPreferencesButton.text=
-ExternalViewerGlobalSettingsPanel.jTable1.columnModel.title3=Title 4
-ExternalViewerGlobalSettingsPanel.jTable1.columnModel.title2=Title 3
-ExternalViewerGlobalSettingsPanel.jTable1.columnModel.title3_1=Title 4
-ExternalViewerGlobalSettingsPanel.jTable1.columnModel.title2_1=Title 3
-ExternalViewerGlobalSettingsPanel.newRuleButton1.text=New Rule
-ExternalViewerGlobalSettingsPanel.editRuleButton.text=Edit Rule
-ExternalViewerGlobalSettingsPanel.deleteRuleButton.text=Delete Rule
-ExternalViewerGlobalSettingsPanel.externalViewerTitleLabel.text=Add your custom rules for external viewers:
-ExternalViewerGlobalSettingsPanel.newRuleButton.text=New Rule
-ExternalViewerGlobalSettingsPanel.jButton2.text=jButton2
-ExternalViewerGlobalSettingsPanel.browseHxDDirectory.text=Browse
-ExternalViewerGlobalSettingsPanel.HxDLabel.text=HxD Editor Path:
-ExternalViewerGlobalSettingsPanel.ContentViewerExtensionLabel.text=Add content viewer extensions:
diff --git a/Core/src/org/sleuthkit/autopsy/events/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/events/Bundle.properties-MERGED
deleted file mode 100755
index 4c869740bddada63dbe7921b2d8121cacf7c6ef5..0000000000000000000000000000000000000000
--- a/Core/src/org/sleuthkit/autopsy/events/Bundle.properties-MERGED
+++ /dev/null
@@ -1,10 +0,0 @@
-MessageServiceConnectionInfo.ConnectionCheck.Everything=Invalid hostname, port number, username, and/or password.
-MessageServiceConnectionInfo.ConnectionCheck.Hostname=Invalid hostname.
-MessageServiceConnectionInfo.ConnectionCheck.Port=Invalid port number.
-MessageServiceConnectionInfo.ConnectionCheck.Username=Invalid username.
-MessageServiceConnectionInfo.ConnectionCheck.Password=Invalid password.
-MessageServiceConnectionInfo.ConnectionCheck.UsernameAndPassword=Invalid username and/or password.
-MessageServiceConnectionInfo.ConnectionCheck.HostnameOrPort=Invalid hostname and/or port number.
-MessageServiceConnectionInfo.MissingHostname=Missing hostname.
-MessageServiceConnectionInfo.MissingUsername=Missing username.
-MessageServiceConnectionInfo.MissingPassword=Missing password.
\ No newline at end of file
diff --git a/Core/src/org/sleuthkit/autopsy/examples/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/examples/Bundle.properties-MERGED
deleted file mode 100755
index 53be459ae2941ca55c35d4f3277621e68772bdbf..0000000000000000000000000000000000000000
--- a/Core/src/org/sleuthkit/autopsy/examples/Bundle.properties-MERGED
+++ /dev/null
@@ -1,6 +0,0 @@
-SampleContentViewer.jLabel1.text=jLabel1
-SampleIngestModuleFactory.moduleName=Sample Ingest Module
-SampleIngestModuleFactory.moduleDescription=This module serves as a sample ingest module for software developers.
-SampleIngestModuleIngestJobSettingsPanel.skipKnownFilesCheckBox.text=Skip Known Files (NSRL)
-SampleExecutableIngestModuleFactory.moduleName=Sample Executable Ingest Module
-SampleExecutableIngestModuleFactory.moduleDescription=This module serves as a sample executable ingest module for software developers.
diff --git a/Core/src/org/sleuthkit/autopsy/filesearch/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/filesearch/Bundle.properties-MERGED
deleted file mode 100755
index 468050cc5212a028bbb5cfa19709419b78845397..0000000000000000000000000000000000000000
--- a/Core/src/org/sleuthkit/autopsy/filesearch/Bundle.properties-MERGED
+++ /dev/null
@@ -1,74 +0,0 @@
-DataSourceFilter.errorMessage.emptyDataSource=At least one data source must be selected.
-DateSearchFilter.errorMessage.endDateBeforeStartDate=The end date should be after the start date.
-DateSearchFilter.errorMessage.noCheckboxSelected=At least one date type checkbox must be selected.
-FileSearchPanel.emptyNode.display.text=No results found.
-HashSearchFilter.errorMessage.emptyHash=Hash data is empty.
-HashSearchFilter.errorMessage.wrongCharacter=MD5 contains invalid hex characters.
-# {0} - hash data length
-HashSearchFilter.errorMessage.wrongLength=Input length({0}), doesn''t match the MD5 length(32).
-KnownStatusSearchFilter.errorMessage.noKnownStatusCheckboxSelected=At least one known status checkbox must be selected.
-MimeTypeFilter.errorMessage.emptyMimeType=At least one MIME type must be selected.
-NameSearchFilter.errorMessage.emtpyName=Please input a name to search.
-OpenIDE-Module-Name=FileSearch
-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\!
-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
-DateSearchPanel.modifiedCheckBox.text=Modified
-DateSearchPanel.jLabel1.text=to
-NameSearchPanel.nameCheckBox.text=Name:
-NameSearchPanel.noteNameLabel.text=<html>*Note: Name match is case insensitive and matches any part of the file name. Regular expressions are not currently supported.</html>
-NameSearchPanel.searchTextField.text=
-SizeSearchFilter.errorMessage.nonNegativeNumber=Input size data is a negative number.
-SizeSearchFilter.errorMessage.notANumber=Input size data is not a number.
-SizeSearchPanel.sizeCheckBox.text=Size:
-NameSearchPanel.cutMenuItem.text=Cut
-NameSearchPanel.copyMenuItem.text=Copy
-NameSearchPanel.pasteMenuItem.text=Paste
-NameSearchPanel.selectAllMenuItem.text=Select All
-SizeSearchPanel.selectAllMenuItem.text=Select All
-SizeSearchPanel.pasteMenuItem.text=Paste
-SizeSearchPanel.copyMenuItem.text=Copy
-SizeSearchPanel.cutMenuItem.text=Cut
-DateSearchPanel.cutMenuItem.text=Cut
-DateSearchPanel.selectAllMenuItem.text=Select All
-DateSearchPanel.pasteMenuItem.text=Paste
-DateSearchPanel.copyMenuItem.text=Copy
-FileSearchAction.getName.text=File Search by Attributes
-FileSearchDialog.frame.title=File Search by Attributes
-FileSearchDialog.frame.msg=File Search by Attributes
-FileSearchPanel.custComp.label.text=Search for files that match the following criteria\:
-FileSearchPanel.filterTitle.name=Name
-FileSearchPanel.filterTitle.metadata=Metadata
-FileSearchPanel.filterTitle.knownStatus=Known Status
-FileSearchPanel.search.results.title=File Search Results {0}
-FileSearchPanel.search.results.pathText=Filename Search Results\:
-FileSearchPanel.search.results.msg=File Search\: {0} matches found
-FileSearchPanel.search.results.details=Large number of matches may impact performance on some operations
-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\!
-NameSearchFilter.emptyNameMsg.text=Must enter something for name search.
-SearchNode.getName.text=Search Result
-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:
-HashSearchPanel.emptyHashMsg.text=Must enter something for hash search.
-FileSearchPanel.errorLabel.text=\ 
-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
diff --git a/Core/src/org/sleuthkit/autopsy/guiutils/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/guiutils/Bundle.properties-MERGED
deleted file mode 100755
index d01a4381df1efdaac9e4715c1fcc2113f67fb24b..0000000000000000000000000000000000000000
--- a/Core/src/org/sleuthkit/autopsy/guiutils/Bundle.properties-MERGED
+++ /dev/null
@@ -1,3 +0,0 @@
-StatusIconCellRenderer.tooltiptext.error=An error occurred
-StatusIconCellRenderer.tooltiptext.ok=OK
-StatusIconCellRenderer.tooltiptext.warning=A warning occurred
diff --git a/Core/src/org/sleuthkit/autopsy/healthmonitor/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/healthmonitor/Bundle.properties-MERGED
deleted file mode 100755
index 5a7e3390f9d38d663b17be8d323a4871f56e449e..0000000000000000000000000000000000000000
--- a/Core/src/org/sleuthkit/autopsy/healthmonitor/Bundle.properties-MERGED
+++ /dev/null
@@ -1,28 +0,0 @@
-HealthMonitorDashboard.createAdminPanel.disableButton=Disable monitor
-HealthMonitorDashboard.createAdminPanel.enableButton=Enable monitor
-HealthMonitorDashboard.createTimingControlPanel.filterByHost=Filter by host
-HealthMonitorDashboard.createTimingControlPanel.maxDays=Max days to display
-HealthMonitorDashboard.createTimingControlPanel.showTrendLine=Show trend line
-HealthMonitorDashboard.createTimingControlPanel.skipOutliers=Do not plot outliers
-HealthMonitorDashboard.createTimingPanel.noData=No data to display - monitor is not enabled
-HealthMonitorDashboard.createTimingPanel.timingMetricsTitle=Timing Metrics
-HealthMonitorDashboard.createUserControlPanel.maxDays=Max days to display
-HealthMonitorDashboard.createUserPanel.noData=No data to display - monitor is not enabled
-HealthMonitorDashboard.createUserPanel.userMetricsTitle=User Metrics
-HealthMonitorDashboard.DateRange.oneDay=One day
-HealthMonitorDashboard.DateRange.oneMonth=One month
-HealthMonitorDashboard.DateRange.oneWeek=One week
-HealthMonitorDashboard.DateRange.twoWeeks=Two weeks
-HealthMonitorDashboard.display.dashboardTitle=Health Monitor
-HealthMonitorDashboard.display.errorCreatingDashboard=Error creating health monitor dashboard
-HealthMonitorDashboard.updateTimingMetricGraphs.noData=No data to display
-HealthMonitorDashboard.updateUserMetricGraphs.noData=No data to display
-TimingMetricGraphPanel.paintComponent.displayingTime=displaying time in 
-TimingMetricGraphPanel.paintComponent.hours=hours
-TimingMetricGraphPanel.paintComponent.microseconds=microseconds
-TimingMetricGraphPanel.paintComponent.milliseconds=milliseconds
-TimingMetricGraphPanel.paintComponent.minutes=minutes
-TimingMetricGraphPanel.paintComponent.nanoseconds=nanoseconds
-TimingMetricGraphPanel.paintComponent.seconds=seconds
-UserMetricGraphPanel.constructor.casesOpen=Cases open
-UserMetricGraphPanel.constructor.loggedIn=Users logged in - examiner nodes in blue, auto ingest nodes in green
diff --git a/Core/src/org/sleuthkit/autopsy/imagewriter/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/imagewriter/Bundle.properties-MERGED
deleted file mode 100755
index aaaa94cd30de9ba2f4ed8978922f5d9e8da9eeae..0000000000000000000000000000000000000000
--- a/Core/src/org/sleuthkit/autopsy/imagewriter/Bundle.properties-MERGED
+++ /dev/null
@@ -1,10 +0,0 @@
-# To change this license header, choose License Headers in Project Properties.
-# To change this template file, choose Tools | Templates
-# and open the template in the editor.
-
-# {0} - data source name
-ImageWriter.progressBar.message=Finishing acquisition of {0} (unplug device to cancel)
-ImageWriterService.serviceName=Image Writer
-ImageWriterService.waitingForVHDs=Waiting for VHD(s) to complete
-ImageWriterService.shouldWait=Wait for VHD(s) in progress to complete?
-ImageWriterService.localDisk=Local disk image copy
diff --git a/Core/src/org/sleuthkit/autopsy/ingest/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/ingest/Bundle.properties-MERGED
deleted file mode 100755
index 06515242490458506e04c674dd0ad67b2278df57..0000000000000000000000000000000000000000
--- a/Core/src/org/sleuthkit/autopsy/ingest/Bundle.properties-MERGED
+++ /dev/null
@@ -1,157 +0,0 @@
-CTL_RunIngestAction=Run Ingest
-IngestJobSettingsPanel.IngestModulesTableRenderer.info.message=A previous version of this ingest module has been run before on this data source.
-IngestJobSettingsPanel.IngestModulesTableRenderer.warning.message=This ingest module has been run before on this data source.
-IngestJobSettingsPanel.noPerRunSettings=The selected module has no per-run settings.
-IngestJobSettingsPanel.pastJobsButton.action.frame.title=Ingest History
-IngestManager.startupErr.dlgErrorList=Errors:
-IngestManager.startupErr.dlgMsg=Unable to start up one or more ingest modules, ingest cancelled.
-IngestManager.startupErr.dlgSolution=Please disable the failed modules or fix the errors before restarting ingest.
-IngestManager.startupErr.dlgTitle=Ingest Module Startup Failure
-IngestOptionsPanel.fileFiltersTab.text=File Filters
-IngestOptionsPanel.fileFiltersTab.toolTipText=Settings for creating and editing ingest file filters.
-IngestOptionsPanel.profilesTab.text=Profiles
-IngestOptionsPanel.profilesTab.toolTipText=Settings for creating and editing profiles.
-IngestOptionsPanel.settingsTab.text=Settings
-IngestOptionsPanel.settingsTab.toolTipText=Settings regarding resources available to ingest.
-OpenIDE-Module-Name=Ingest
-Menu/Tools/RunIngestModules=Run Ingest Modules
-CTL_IngestMessageTopComponent=Messages
-HINT_IngestMessageTopComponent=Messages windows
-IngestMessageDetailsPanel.backButton.text=
-IngestMessageDetailsPanel.viewArtifactButton.text=Go to Result
-IngestMessageDetailsPanel.viewContentButton.text=Go to Directory
-IngestMessagePanel.sortByLabel.text=Sort by:
-IngestMessagePanel.sortByComboBox.toolTipText=Sort messages by time (chronological order) or message priority
-IngestMessageDetailsPanel.messageDetailsPane.contentType=text/html
-IngestMessageDetailsPanel.messageDetailsPane.toolTipText=
-IngestMessagesToolbar.toolTipText=
-IngestMessageDetailsPanel.copyMenuItem.text=Copy
-IngestMessageDetailsPanel.selectAllMenuItem.text=Select All
-IngestMessageTopComponent.displayName=Ingest Inbox
-IngestMessagePanel.totalMessagesNameLabel.text=Total:
-IngestMessagePanel.totalMessagesNameVal.text=-
-IngestMessagePanel.totalUniqueMessagesNameLabel.text=Unique:
-IngestMessagePanel.totalUniqueMessagesNameVal.text=-
-IngestJob.progress.dataSourceIngest.initialDisplayName=Analyzing {0}
-IngestJob.progress.dataSourceIngest.displayName={0} for {1}
-IngestJob.progress.fileIngest.displayName=Analyzing files from {0}
-IngestJob.progress.cancelling=Cancelling...
-IngestJob.cancellationDialog.title=Cancel Ingest
-IngestDialog.startButton.title=Start
-IngestDialog.closeButton.title=Close
-IngestManager.moduleErr=Module Error
-IngestManager.moduleErr.errListenToUpdates.msg=A module caused an error listening to Ingest Manager updates. See log to determine which module. Some data could be incomplete.
-IngestMessage.toString.type.text=type\: {0}
-IngestMessage.toString.date.text=\ date\: {0}
-IngestMessage.toString.subject.text=\ subject\: {0}
-IngestMessage.toString.details.text=\ details\: {0}
-IngestMessage.toString.data.text=\ data\: {0}
-IngestMessage.exception.typeSrcSubjNotNull.msg=message type, source and subject cannot be null
-IngestMessage.exception.srcSubjNotNull.msg=source and subject cannot be null
-IngestMessage.exception.srcSubjDetailsDataNotNull.msg=source, subject, details and data cannot be null
-IngestMessagePanel.moduleErr=Module Error
-IngestMessagePanel.moduleErr.errListenUpdates.text=A module caused an error listening to IngestMessagePanel updates. See log to determine which module. Some data could be incomplete.
-IngestMessagePanel.MsgTableMod.colNames.module=Module
-IngestMessagePanel.MsgTableMod.colNames.num=Num
-IngestMessagePanel.MsgTableMod.colNames.new=New?
-IngestMessagePanel.MsgTableMod.colNames.subject=Subject
-IngestMessagePanel.MsgTableMod.colNames.timestamp=Timestamp
-IngestMessagePanel.BooleanRenderer.exception.nonBoolVal.msg=Tried to use BooleanRenderer on non-boolean value.
-IngestMessagePanel.DateRenderer.exception.nonDateVal.text=Tried to use DateRenderer on non-Date value.
-IngestMessageTopComponent.displayReport.option.OK=OK
-IngestMessageTopComponent.displayReport.option.GenRpt=Generate Report
-IngestMessageTopComponent.msgDlg.ingestRpt.text=Ingest Report
-IngestMonitor.mgrErrMsg.lowDiskSpace.title=Ingest stopped - low disk space on {0}
-IngestMonitor.mgrErrMsg.lowDiskSpace.msg=Stopping ingest due to low disk space on disk {0}. \nEnsure the Case drive has at least 1GB free space and restart ingest.
-IngestManager.StartIngestJobsTask.run.displayName=Starting ingest
-IngestManager.StartIngestJobsTask.run.cancelling={0} (Cancelling...)
-IngestMessagePanel.sortByComboBox.model.time=Time
-IngestMessagePanel.sortByComboBox.model.priority=Priority
-IngestMessagesToolbar.customizeButton.toolTipText=Ingest Messages
-IngestMessageTopComponent.initComponents.name=Ingest Inbox
-IngestManager.OpenEventChannel.Fail.ErrMsg=Analysis process failed to connect to any other nodes that may be collaborating on case.
-IngestManager.OpenEventChannel.Fail.Title=Connection Failure
-IngestJobSettings.createModuleSettingsFolder.warning=Failed to create ingest module settings folder, cannot save settings.
-IngestJobSettings.missingModule.warning=Previously loaded {0} module could not be found.
-IngestJobSettings.save.warning=Failed to save ingest job settings for {0} module.
-IngestJobSettings.moduleSettingsLoad.warning=Error loading ingest job settings for {0} module for {1} context, using defaults.
-IngestJobSettings.moduleSettingsSave.warning=Error saving ingest job settings for {0} module for {1} context.
-IngestProgressSnapshotDialog.title.text=Ingest Progress Snapshot
-IngestProgressSnapshotPanel.refreshButton.text=Refresh
-IngestProgressSnapshotPanel.closeButton.text=Close
-IngestProgressSnapshotPanel.SnapshotsTableModel.colNames.threadID=Thread ID
-IngestProgressSnapshotPanel.SnapshotsTableModel.colNames.dataSource=Data Source
-IngestProgressSnapshotPanel.SnapshotsTableModel.colNames.activity=Activity
-IngestProgressSnapshotPanel.SnapshotsTableModel.colNames.file=File
-IngestProgressSnapshotPanel.SnapshotsTableModel.colNames.startTime=Start Time
-IngestProgressSnapshotPanel.SnapshotsTableModel.colNames.elapsedTime=Elapsed Time (H\:M\:S)
-IngestManager.IngestThreadActivitySnapshot.idleThread=IDLE
-IngestManager.IngestMessage.ErrorMessageLimitReached.subject=Maximum Errors Posted
-IngestManager.IngestMessage.ErrorMessageLimitReached.msg=Maximum number ({0}) of error and/or warning messages posted. See log for additional errors/warnings (Help -> Open Log Folder).
-IngestManager.IngestMessage.ErrorMessageLimitReached.title=Ingest Manager
-IngestModuleFactoryLoader.errorMessages.duplicateDisplayName=Found module named {0}, duplicating the name of another module, module will not be used.
-DataSourceIngestCancellationPanel.cancelCurrentModuleRadioButton.text=Cancel current ingest module only
-FileIngestCancellationPanel.cancelIngestJobRadioButton.text=Cancel data source ingest and file ingest
-FileIngestCancellationPanel.cancelFileIngestRadioButton.text=Cancel file ingest only
-DataSourceIngestCancellationPanel.cancelAllModulesRadioButton.text=Cancel all ingest modules
-IngestProgressSnapshotPanel.SnapshotsTableModel.colNames.jobID=Job ID
-IngestJobTableModel.colName.jobID=Job ID
-IngestJobTableModel.colName.dataSource=Data Source
-IngestJobTableModel.colName.start=Start
-IngestJobTableModel.colName.numProcessed=Num Processed
-IngestJobTableModel.colName.filesPerSec=Files/Sec
-IngestJobTableModel.colName.inProgress=In Progress
-IngestJobTableModel.colName.filesQueued=Files Queued
-IngestJobTableModel.colName.dirQueued=Dir Queued
-IngestJobTableModel.colName.rootQueued=Root Queued
-IngestJobTableModel.colName.dsQueued=DS Queued
-ModuleTableModel.colName.module=Module
-ModuleTableModel.colName.duration=Duration
-IngestJobSettingsPanel.jButtonSelectAll.text=Select All
-IngestJobSettingsPanel.jButtonDeselectAll.text=Deselect All
-IngestManager.cancellingIngest.msgDlg.text=Cancelling all currently running ingest jobs
-IngestManager.serviceIsDown.msgDlg.text={0} is down
-ProfilePanel.messages.profileNameContainsIllegalCharacter=Profile name contains an illegal character
-ProfilePanel.messages.profilesMustBeNamed=Ingest profile must be named.
-ProfilePanel.newProfileText=NewEmptyProfile
-ProfilePanel.profileDescLabel.text=Description:
-ProfilePanel.profileNameLabel.text=Profile Name:
-ProfilePanel.title.text=Profile
-ProfileSettingsPanel.deleteProfileButton.text=Delete Profile
-# {0} - profile name
-ProfileSettingsPanel.doFileSetsDialog.duplicateProfile.text=Profile with name {0} already exists.
-ProfileSettingsPanel.editProfileButton.text=Edit Profile
-ProfileSettingsPanel.filterNameLabel.text=Filter:
-ProfileSettingsPanel.infoTextArea.text=An Ingest Profile runs a preconfigured set of ingest modules on some or all of the files in a data source. Create a profile if you frequently run the same set of modules on a subset of the files.
-ProfileSettingsPanel.messages.filterLoadFailed=Failed to load file ingest filter
-ProfileSettingsPanel.newProfileButton.text=New Profile
-ProfileSettingsPanel.profileDescLabel.text=Profile Description:
-ProfileSettingsPanel.profileListLabel.text=Profiles:
-ProfileSettingsPanel.selectedModulesLabel.text=Selected Ingest Modules:
-ProfileSettingsPanel.title=Profile Settings
-RunIngestSubMenu.menuItem.empty=-Empty-
-RunIngestModulesMenu.getName.text=Run Ingest Modules
-DataSourceIngestPipeline.moduleError.title.text={0} Error
-FileIngestPipeline.moduleError.title.text={0} Error
-IngestJob.cancelReason.notCancelled.text=Not cancelled
-IngestJob.cancelReason.cancelledByUser.text=Cancelled by user
-IngestJob.cancelReason.ingestModStartFail.text=Ingest modules startup failed
-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
-IngestJobSettingsPanel.globalSettingsButton.actionCommand=Advanced
-IngestJobSettingsPanel.globalSettingsButton.text=Global Settings
-IngestJobSettingsPanel.pastJobsButton.text=History
-IngestJobSettingsPanel.fileIngestFilterLabel.text=Run ingest modules on:
-OptionsCategory_Name_IngestOptions=Ingest
-OptionsCategory_Keywords_IngestOptions=Ingest
-IngestSettingsPanel.jLabelProcessTimeOutUnits.text=hour(s)
-IngestSettingsPanel.jFormattedTextFieldProcTimeOutHrs.text=60
-IngestSettingsPanel.jCheckBoxEnableProcTimeout.text=
-IngestSettingsPanel.jLabelSetProcessTimeOut.text=Enable timeout to allow modules to automatically terminate after a set amount of time:
-IngestSettingsPanel.restartRequiredLabel.text=For this computer, a maximum of {0} file ingest threads should be used. Application restart required to take effect.
-IngestSettingsPanel.jLabelNumThreads.text=Number of threads to use for file ingest:
-IngestSettingsPanel.ingestWarningLabel.text=Ingest is ongoing, some settings will be unavailable until it finishes.
-ProfileSettingsPanel.ingestWarningLabel.text=Ingest is ongoing, some settings will be unavailable until it finishes.
diff --git a/Core/src/org/sleuthkit/autopsy/ingest/runIngestModuleWizard/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/ingest/runIngestModuleWizard/Bundle.properties-MERGED
deleted file mode 100755
index 168104e1affae4685f07f1a65028976dd6b7bb0c..0000000000000000000000000000000000000000
--- a/Core/src/org/sleuthkit/autopsy/ingest/runIngestModuleWizard/Bundle.properties-MERGED
+++ /dev/null
@@ -1,8 +0,0 @@
-IngestModulesConfigWizardPanel.name.text=Configure Ingest Modules
-IngestProfileSelectionPanel.customSettings.description=configure individual module settings in next step of wizard
-IngestProfileSelectionPanel.customSettings.name=Custom Settings
-IngestProfileSelectionPanel.ingestSettingsButton.text=Ingest Settings
-IngestProfileSelectionPanel.profileListLabel.text=Select Profile:
-IngestProfileWizardPanel.panelName=Ingest Profile Selection
-RunIngestModulesAction.actionPerformed.errorMessage=Error querying the case database for the selected item.
-RunIngestModulesAction.name=Run Ingest Modules
diff --git a/Core/src/org/sleuthkit/autopsy/livetriage/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/livetriage/Bundle.properties-MERGED
deleted file mode 100755
index e0a2ab0413ef874dd9ba878b41b7acdeac75f069..0000000000000000000000000000000000000000
--- a/Core/src/org/sleuthkit/autopsy/livetriage/Bundle.properties-MERGED
+++ /dev/null
@@ -1,27 +0,0 @@
-CopyFilesWorker.done.text=Finished creating live triage disk
-CopyFilesWorker.error.text=Error copying live triage files
-CreateLiveTriageDriveAction.appPathError.message=Could not location application directory
-CreateLiveTriageDriveAction.batchFileError.message=Error creating batch file
-CreateLiveTriageDriveAction.copyError.message=Could not copy application. Only works on installed version.
-CreateLiveTriageDriveAction.error.title=Error creating live triage disk
-CreateLiveTriageDriveAction.exenotfound.message=Executable could not be found
-# {0} - drivePath
-CreateLiveTriageDriveAction.progressBar.text=Copying live triage files to {0}
-CreateLiveTriageDriveAction.progressBar.title=Please wait
-CreateLiveTriageDriveAction.success.message=Live triage drive created. Use RunFromUSB.bat to run the application
-CreateLiveTriageDriveAction.success.title=Success
-CTL_CreateLiveTriageDriveAction=Make Live Triage Drive
-SelectDriveDialog.bnOk.text=Ok
-SelectDriveDialog.bnRefresh.text=Refresh
-SelectDriveDialog.diskTable.column1.title=Disk Name
-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.localDiskModel.loading.msg=
-SelectDriveDialog.localDiskModel.nodrives.msg=Executable could not be found
-SelectDriveDialog.title=Create Live Triage Drive
diff --git a/Core/src/org/sleuthkit/autopsy/menuactions/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/menuactions/Bundle.properties-MERGED
deleted file mode 100755
index 27a95765fe2208ce5cb136e2c9cd4f5ce16648dd..0000000000000000000000000000000000000000
--- a/Core/src/org/sleuthkit/autopsy/menuactions/Bundle.properties-MERGED
+++ /dev/null
@@ -1,7 +0,0 @@
-OpenIDE-Module-Name=MenuActions
-DataContentDynamicMenu.menu.dataContentWin.text=Data Content Windows
-DataContentMenu.getName.text=DataContent Menu
-DataExplorerMenu.getName.text=DataExplorer Tools
-DataResultMenu.menu.dataResWin.text=DataResult Windows
-DataResultMenu.getName.text=DataResult Menu
-SearchResultMenu.menu.dataRes.text=Data Results
diff --git a/Core/src/org/sleuthkit/autopsy/modules/case_uco/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/modules/case_uco/Bundle.properties-MERGED
deleted file mode 100755
index f67ec867d398ae212cd778e5ad617cb2049848e4..0000000000000000000000000000000000000000
--- a/Core/src/org/sleuthkit/autopsy/modules/case_uco/Bundle.properties-MERGED
+++ /dev/null
@@ -1,13 +0,0 @@
-OpenIDE-Module-Name=CaseUcoModule
-ReportCaseUco.getName.text=CASE-UCO
-ReportCaseUco.getDesc.text=CASE-UCO format report with basic property fields for every file.
-ReportCaseUco.ingestWarning=Warning, this report will be created before ingest services completed
-ReportCaseUco.initializing=Creating directories...
-ReportCaseUco.noCaseOpen=Unable to open currect case
-ReportCaseUco.noDataSourceSelected=No data source selected for CASE-UCO report
-ReportCaseUco.notInitialized=CASE-UCO settings panel has not been initialized
-ReportCaseUco.processing=Saving files in CASE-UCO format...
-ReportCaseUco.querying=Querying files...
-ReportCaseUco.srcModuleName.text=CASE-UCO Report
-ReportCaseUco.unableToCreateDirectories=Unable to create directory for CASE-UCO report
-ReportCaseUcoConfigPanel.jLabelSelectDataSource.text=Select a data source for the CASE-UCO report
diff --git a/Core/src/org/sleuthkit/autopsy/modules/dataSourceIntegrity/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/modules/dataSourceIntegrity/Bundle.properties-MERGED
deleted file mode 100755
index 9ce034d1ff5cff6dc87403304fcbf928ae5b7fce..0000000000000000000000000000000000000000
--- a/Core/src/org/sleuthkit/autopsy/modules/dataSourceIntegrity/Bundle.properties-MERGED
+++ /dev/null
@@ -1,51 +0,0 @@
-# {0} - hashName
-# {1} - calculatedHashValue
-DataSourceIntegrityIngestModule.process.calcHashWithType=<li>Calculated {0} hash: {1} </li>
-# {0} - imageName
-DataSourceIntegrityIngestModule.process.calculateHashDone=<p>Data Source Hash Calculation Results for {0} </p>
-# {0} - imageName
-DataSourceIntegrityIngestModule.process.errorLoadingHashes=\ Error loading hashes for image {0} from the database
-# {0} - imageName
-DataSourceIntegrityIngestModule.process.errorSavingHashes=\ Error saving hashes for image {0} to the database
-# {0} - hashName
-DataSourceIntegrityIngestModule.process.hashAlgorithmError=Error creating message digest for {0} algorithm
-DataSourceIntegrityIngestModule.process.hashesCalculated=\ hashes calculated
-# {0} - hashAlgorithm
-# {1} - calculatedHashValue
-# {2} - storedHashValue
-DataSourceIntegrityIngestModule.process.hashFailedForArtifact={0} hash verification failed:\n  Calculated hash: {1}\n  Stored hash: {2}\n
-# {0} - calculatedHashValue
-# {1} - storedHashValue
-DataSourceIntegrityIngestModule.process.hashList=<ul><li>Calculated hash: {0} </li><li>Stored hash: {1} </li></ul>
-# {0} - hashName
-DataSourceIntegrityIngestModule.process.hashMatch=<li>{0} hash verified </li>
-# {0} - hashName
-DataSourceIntegrityIngestModule.process.hashNonMatch=<li>{0} hash not verified </li>
-# {0} - imageName
-DataSourceIntegrityIngestModule.process.skipCompute=Not computing new hashes for {0} since the option was disabled
-# {0} - imageName
-DataSourceIntegrityIngestModule.process.skipVerify=Not verifying existing hashes for {0} since the option was disabled
-# {0} - imageName
-DataSourceIntegrityIngestModule.process.verificationFailure={0} failed integrity verification
-# {0} - imageName
-DataSourceIntegrityIngestModule.process.verificationSuccess=Integrity of {0} verified
-DataSourceIntegrityIngestModule.startup.noCheckboxesSelected=At least one of the checkboxes must be selected
-OpenIDE-Module-Name=ewfVerify
-DataSourceIntegrityModuleFactory.moduleName.text=Data Source Integrity
-DataSourceIntegrityModuleFactory.moduleDesc.text=Calculates and validates hashes of data sources.
-DataSourceIntegrityIngestModule.process.errProcImg=Error processing {0}
-DataSourceIntegrityIngestModule.process.skipNonEwf=Skipping non-disk image data source {0}
-DataSourceIntegrityIngestModule.process.noStoredHash=Image {0} does not have stored hash.
-DataSourceIntegrityIngestModule.process.startingImg=Starting {0}
-DataSourceIntegrityIngestModule.process.errGetSizeOfImg=Error getting size of {0}. Image will not be processed.
-DataSourceIntegrityIngestModule.process.errReadImgAtChunk=Error reading {0} at chunk {1}
-DataSourceIntegrityIngestModule.shutDown.verified=\ verified 
-DataSourceIntegrityIngestModule.shutDown.notVerified=\ not verified 
-DataSourceIntegrityIngestModule.shutDown.verifyResultsHeader=<p>Data Source Verification Results for {0} </p>
-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
diff --git a/Core/src/org/sleuthkit/autopsy/modules/embeddedfileextractor/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/modules/embeddedfileextractor/Bundle.properties-MERGED
deleted file mode 100755
index 03854d83007897a154acbbc4ffb37b0ab4a9befb..0000000000000000000000000000000000000000
--- a/Core/src/org/sleuthkit/autopsy/modules/embeddedfileextractor/Bundle.properties-MERGED
+++ /dev/null
@@ -1,55 +0,0 @@
-CannotCreateOutputFolder=Unable to create output folder.
-CannotRunFileTypeDetection=Unable to run file type detection.
-EmbeddedFileExtractorIngestModule.ArchiveExtractor.moduleDesc.text=Extracts embedded files (doc, docx, ppt, pptx, xls, xlsx, zip, rar, arj, 7z, gzip, bzip2, tar), schedules them for ingestion, and populates the directory tree with them.
-EmbeddedFileExtractorIngestModule.ArchiveExtractor.moduleName=Embedded File Extractor
-EmbeddedFileExtractorIngestModule.NoOpenCase.errMsg=No open case available.
-EmbeddedFileExtractorIngestModule.UnableToGetMSOfficeExtractor.errMsg=Unable to get MSOfficeEmbeddedContentExtractor.
-ExtractArchiveWithPasswordAction.extractFailed.title=Failed to Unpack Files, with Password
-ExtractArchiveWithPasswordAction.name.text=Unzip contents with password
-# {0} - archiveFile
-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).\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}
-EmbeddedFileExtractorIngestModule.SevenZipContentReadStream.read.exception.errReadStream=Error reading content stream.
-EmbeddedFileExtractorIngestModule.ArchiveExtractor.encryptionFileLevel=Content-only Encryption (Archive File)
-EmbeddedFileExtractorIngestModule.ArchiveExtractor.encryptionFull=Full Encryption (Archive File)
-EmbeddedFileExtractorIngestModule.ArchiveExtractor.init.errInitModule.details=Error initializing output dir\: {0}\: {1}
-EmbeddedFileExtractorIngestModule.ArchiveExtractor.isZipBombCheck.warnMsg=Possible ZIP bomb detected in archive\: {0}, item\: {1}
-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}
-EmbeddedFileExtractorIngestModule.ArchiveExtractor.unpack.errUnpacking.details=Error unpacking  {0}. {1}
-EmbeddedFileExtractorIngestModule.ArchiveExtractor.unpack.encrFileDetected.msg=Encrypted files in archive detected.
-EmbeddedFileExtractorIngestModule.ArchiveExtractor.unpack.encrFileDetected.details=Some files in archive\: {0} are encrypted. {1} extractor was unable to extract all files from this archive.
-EmbeddedFileExtractorIngestModule.ArchiveExtractor.UnpackStream.write.exception.msg=Error writing unpacked file to\: {0}
-EmbeddedFileExtractorIngestModule.ArchiveExtractor.UnpackedTree.exception.msg=Error adding a derived file to db\:{0}
-EmbeddedFileExtractorIngestModule.ImageExtractor.docContainer.init.err=Doc container could not be initialized while reading 
-EmbeddedFileExtractorIngestModule.ImageExtractor.docxContainer.init.err=Docx container could not be initialized while reading\: {0}
-EmbeddedFileExtractorIngestModule.ImageExtractor.pptContainer.init.err=Ppt container could not be initialized while reading: {0}
-EmbeddedFileExtractorIngestModule.ImageExtractor.pptxContainer.init.err=Pptx container could not be initialized while reading: {0}
-EmbeddedFileExtractorIngestModule.ImageExtractor.xlsContainer.init.err=Xls container could not be initialized while reading: {0}
-EmbeddedFileExtractorIngestModule.ImageExtractor.xlsxContainer.init.err=Xlsx container could not be initialized while reading: {0}
-EmbeddedFileExtractorIngestModule.ImageExtractor.extractImage.addToDB.exception.msg=Unable to add the derived files to the database.
-EmbeddedFileExtractorIngestModule.ImageExtractor.getOutputFolderPath.exception.msg=Could not get path for image extraction from Abstract File\: {0}
-EmbeddedFileExtractorIngestModule.ImageExtractor.getOutputFolderPath.exception.msg=Could not get path for image extraction from Abstract File: {0}
-EmbeddedFileExtractorIngestModule.ArchiveExtractor.UnpackStream.write.noSpace.msg=Unable to write content to disk. Not enough space.
-SevenZipContentReadStream.seek.exception.invalidOrigin=Invalid origin {0}
-SevenZipContentReadStream.read.exception.errReadStream=Error reading stream
-SevenZipExtractor.indexError.message=Failed to index encryption detected artifact for keyword search.
-# {0} -  rootArchive
-SevenZipExtractor.zipBombArtifactCreation.text=Zip Bomb Detected {0}
-UnableToInitializeLibraries=Unable to initialize 7Zip libraries.
diff --git a/Core/src/org/sleuthkit/autopsy/modules/encryptiondetection/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/modules/encryptiondetection/Bundle.properties-MERGED
deleted file mode 100755
index cf18d1efb34281a1cd600049331e558cfe7974e3..0000000000000000000000000000000000000000
--- a/Core/src/org/sleuthkit/autopsy/modules/encryptiondetection/Bundle.properties-MERGED
+++ /dev/null
@@ -1,16 +0,0 @@
-EncryptionDetectionDataSourceIngestModule.artifactComment.bitlocker=Bitlocker encryption detected.
-EncryptionDetectionDataSourceIngestModule.artifactComment.suspected=Suspected encryption due to high entropy (%f).
-EncryptionDetectionFileIngestModule.artifactComment.password=Password protection detected.
-EncryptionDetectionFileIngestModule.artifactComment.suspected=Suspected encryption due to high entropy (%f).
-EncryptionDetectionFileIngestModule.getDesc.text=Looks for files with the specified minimum entropy.
-EncryptionDetectionFileIngestModule.moduleName.text=Encryption Detection
-EncryptionDetectionIngestJobSettingsPanel.minimumEntropyLabel.text=Minimum Entropy:
-EncryptionDetectionIngestJobSettingsPanel.minimumFileSizeLabel.text=Minimum File Size:
-EncryptionDetectionIngestJobSettingsPanel.fileSizeMultiplesEnforcedCheckbox.text=Consider only file sizes that are multiples of 512.
-EncryptionDetectionIngestJobSettingsPanel.slackFilesAllowedCheckbox.text=Consider slack space files.
-EncryptionDetectionIngestJobSettingsPanel.mbLabel.text=MB
-EncryptionDetectionIngestJobSettingsPanel.detectionSettingsLabel.text=Detection Settings
-EncryptionDetectionIngestJobSettingsPanel.minimumFileSizeTextbox.text=
-EncryptionDetectionIngestJobSettingsPanel.minimumEntropyTextbox.text=
-EncryptionDetectionTools.errorMessage.minimumEntropyInput=Minimum entropy input must be a number between 6.0 and 8.0.
-EncryptionDetectionTools.errorMessage.minimumFileSizeInput=Minimum file size input must be an integer (in megabytes) of 1 or greater.
diff --git a/Core/src/org/sleuthkit/autopsy/modules/exif/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/modules/exif/Bundle.properties-MERGED
deleted file mode 100755
index 9905159d9986641d05f33c44e66871089a4f2ee8..0000000000000000000000000000000000000000
--- a/Core/src/org/sleuthkit/autopsy/modules/exif/Bundle.properties-MERGED
+++ /dev/null
@@ -1,10 +0,0 @@
-CannotRunFileTypeDetection=Cannot run file type detection.
-ExifParserFileIngestModule.indexError.message=Failed to index EXIF Metadata artifact for keyword search.
-OpenIDE-Module-Display-Category=Ingest Module
-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
-ExifParserFileIngestModule.getDesc.text=Ingests JPEG files and retrieves their EXIF metadata.
diff --git a/Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/Bundle.properties-MERGED
deleted file mode 100755
index cfaadf1635652515dc990b581f77947bb1dae701..0000000000000000000000000000000000000000
--- a/Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/Bundle.properties-MERGED
+++ /dev/null
@@ -1,64 +0,0 @@
-AddFileExtensionAction.writeError.message=Could not write file extension settings.
-CannotRunFileTypeDetection=Unable to run file type detection.
-FileExtMismatchIngestModule.indexError.message=Failed to index file extension mismatch artifact for keyword search.
-FileExtMismatchIngestModule.readError.message=Could not read settings.
-FileExtMismatchSettingsPanel.Title=Global File Extension Mismatch Identification Settings
-OpenIDE-Module-Name=FileExtMismatch
-OptionsCategory_Name_FileExtMismatchOptions=File Extension Mismatch
-OptionsCategory_FileExtMismatch=File Extension Mismatch
-AddFileExtensionAction.msgDlg.msg2=File extension mismatch settings could not be read, extensions update not available.
-AddFileExtensionAction.msgDlg.title=Add Mismatch Extension Error
-AddFileExtensionAction.extHeaderLbl.text=Allowed Extensions for 
-FileExtMismatchConfigPanel.store.msg=Saved.
-FileExtMismatchConfigPanel.store.msgDlg.msg=File extension mismatch settings could not be saved.
-FileExtMismatchConfigPanel.save.msgDlg.title=Save Error
-FileExtMismatchConfigPanel.ok.confDlg.msg=Would you like to save configuration changes?
-FileExtMismatchConfigPanel.confDlg.title=Unsaved Changes
-FileExtMismatchConfigPanel.mimeTableModel.colName=MIME Type
-FileExtMismatchConfigPanel.extTableModel.colName=Extension
-FileExtMismatchContextMenuActionsProvider.menuItemStr=Add extension {0} as matching MIME type {1}
-FileExtMismatchIngestModule.moduleName=Extension Mismatch Detector
-FileExtMismatchIngestModule.moduleDesc.text=Flags files that have a non-standard extension based on their file type.
-FileExtMismatchIngestModule.complete.totalProcTime=Total Processing Time
-FileExtMismatchIngestModule.complete.totalFiles=Total Files Processed
-FileExtMismatchIngestModule.complete.svcMsg.text=File Extension Mismatch Results
-FileExtMismatchOptionsPanelController.moduleErr=Module Error
-FileExtMismatchOptionsPanelController.moduleErr.msg=A module caused an error listening to FileExtMismatchOptionsPanelController updates. See log to determine which module. Some data could be incomplete.
-FileExtMismatchModuleSettingsPanel.skipNoExtCheckBox.text=Skip files without extensions
-FileExtMismatchSettingsPanel.extHeaderLabel.text=Allowed Extensions:
-FileExtMismatchSettingsPanel.removeExtButton.text=Delete Extension
-FileExtMismatchDetectorModuleFactory.getIngestJobSettingsPanel.exception.msg=Expected settings argument to be instanceof FileExtMismatchDetectorModuleSettings
-FileExtMismatchDetectorModuleFactory.createFileIngestModule.exception.msg=Expected settings argument to be instanceof FileExtMismatchDetectorModuleSettings
-FileExtMismatchModuleSettingsPanel.skipKnownFiles.text=Skip known files
-FileExtMismatchSettingsPanel.removeTypeButton.text=Delete Type
-FileExtMismatchSettingsPanel.newTypeButton.text=New Type
-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.title=Empty type
-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.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.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.title=Extension text empty
-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.title=Extension already exists
-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.title=No MIME type selected
-FileExtMismatchSettingsPanel.removeTypeButton.toolTipText=
-FileExtMismatchModuleSettingsPanel.checkAllRadioButton.text=Check all file types
-FileExtMismatchModuleSettingsPanel.checkNoTextRadioButton.text=Check all file types except text files
-FileExtMismatchModuleSettingsPanel.checkMediaExeRadioButton.text=Check only multimedia and executable files
diff --git a/Core/src/org/sleuthkit/autopsy/modules/filetypeid/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/modules/filetypeid/Bundle.properties-MERGED
deleted file mode 100755
index ccc55e18b035ad9b32018d43453a704e086bdaf4..0000000000000000000000000000000000000000
--- a/Core/src/org/sleuthkit/autopsy/modules/filetypeid/Bundle.properties-MERGED
+++ /dev/null
@@ -1,75 +0,0 @@
-# {0} - type name
-AddFileTypePanel.containsIllegalCharacter.message=Invalid character in MIME type, {0} has been suggested instead
-AddFileTypePanel.containsIllegalCharacter.title=Invalid Character in MIME Type
-AddFileTypePanel.mimeFormatLabel.text=Form of MIME type should be: media type/media subtype
-# {0} - media subtype
-AddFileTypePanel.nonStandardMIMEType.message=MIME type must be of form: media type/media subtype. Custom/{0} has been suggested instead.
-AddFileTypePanel.nonStandardMIMEType.title=Non-standard MIME Type
-AddFileTypeSignatureDialog.addButton.title=OK
-AddFileTypeSignatureDialog.cancelButton.title=Cancel
-AddFileTypeSignatureDialog.invalidSignature.message=Invalid signature
-AddFileTypeSignaturePanel.signatureStringFail.text=Couldn't get signatures string
-AddMimeTypeDialog.addButton.title=OK
-AddMimeTypeDialog.cancelButton.title=Cancel
-AddMimeTypedialog.title=File Type
-AddMimeTypePanel.emptySetName.message=Interesting files set name is required if alert is requested.
-AddMimeTypePanel.emptySetName.title=Missing Interesting Files Set Name
-AddMimeTypePanel.emptySigList.message=Must have at least one signature.
-AddMimeTypePanel.emptySigList.title=Invalid Signature List
-CannotRunFileTypeDetection=Unable to run file type detection.
-FileTypeIdGlobalSettingsPanel.Title=Global File Type Identification Settings
-OptionsCategory_Name_FileTypeId=File Types
-OptionsCategory_Keywords_FileTypeId=FileTypeId
-OpenIDE-Module-Name=FileTypeId
-FileTypeIdIngestModule.moduleName.text=File Type Identification
-FileTypeIdIngestModule.moduleDesc.text=Matches file types based on binary signatures.
-FileTypeIdIngestModule.complete.totalProcTime=Total Processing Time
-FileTypeIdIngestModule.complete.totalFiles=Total Files Processed
-FileTypeIdIngestModule.complete.srvMsg.text=File Type Id Results
-FileTypeIdModuleFactory.getIngestJobSettingsPanel.exception.msg=Expected settings argument to be instanceof FileTypeIdModuleSettings
-FileTypeIdModuleFactory.createFileIngestModule.exception.msg=Expected settings argument to be instanceof FileTypeIdModuleSettings
-FileTypeIdIngestJobSettingsPanel.skipKnownCheckBox.toolTipText=Depending on how many files have known hashes, checking this box will improve the speed of file type identification.
-FileTypeIdIngestJobSettingsPanel.skipKnownCheckBox.text=Skip known files (NSRL)
-FileTypeIdGlobalSettingsPanel.deleteTypeButton.text=Delete Type
-FileTypeIdGlobalSettingsPanel.signatureComboBox.rawItem=Bytes (Hex)
-FileTypeIdGlobalSettingsPanel.signatureComboBox.asciiItem=String (ASCII)
-FileTypeIdGlobalSettingsPanel.offsetComboBox.startItem=Start
-FileTypeIdGlobalSettingsPanel.offsetComboBox.endItem=End
-FileTypeIdGlobalSettingsPanel.JOptionPane.invalidMIMEType.message=MIME type is required.
-FileTypeIdGlobalSettingsPanel.JOptionPane.invalidMIMEType.title=Missing MIME Type
-FileTypeIdGlobalSettingsPanel.JOptionPane.invalidSignature.message=Signature is required.
-FileTypeIdGlobalSettingsPanel.JOptionPane.invalidSignature.title=Missing Signature
-FileTypeIdGlobalSettingsPanel.JOptionPane.invalidOffset.length=Offset must not be smaller than signature size.
-FileTypeIdGlobalSettingsPanel.JOptionPane.invalidOffset.message=Offset must be a positive integer.
-FileTypeIdGlobalSettingsPanel.JOptionPane.invalidOffset.title=Invalid Offset
-FileTypeIdGlobalSettingsPanel.JOptionPane.invalidRawSignatureBytes.message=The signature has one or more invalid hexadecimal digits.
-FileTypeIdGlobalSettingsPanel.JOptionPane.invalidSignatureBytes.title=Invalid Signature
-FileTypeIdGlobalSettingsPanel.JOptionPane.invalidInterestingFilesSetName.message=
-FileTypeIdGlobalSettingsPanel.JOptionPane.invalidInterestingFilesSetName.title=Missing Interesting Files Set Name
-FileTypeIdGlobalSettingsPanel.JOptionPane.storeFailed.title=Save Failed
-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=
-AddFileTypeSignaturePanel.signatureTypeLabel.text=Signature Type
-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
-AddFileTypePanel.deleteSigButton.text=Delete Signature
-AddFileTypePanel.jLabel1.text=Signatures
-AddFileTypePanel.editSigButton.text=Edit Signature
-AddFileTypePanel.addSigButton.text=Add Signature
-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.
diff --git a/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/Bundle.properties-MERGED
deleted file mode 100755
index c550846ccf3d6349af5552cc007ddb6c106b947d..0000000000000000000000000000000000000000
--- a/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/Bundle.properties-MERGED
+++ /dev/null
@@ -1,288 +0,0 @@
-HashDbCreateDatabaseDialog.databaseCreationError=Error creating new hash set
-HashDbCreateDatabaseDialog.databaseLookupError=Error accessing central repository
-HashDbCreateDatabaseDialog.duplicateName=A hashset with this name already exists
-HashDbCreateDatabaseDialog.missingOrg=An organization must be selected
-HashDbCreateDatabaseDialog.populateOrgsError.message=Failure loading organizations.
-HashDbImportDatabaseDialog.databaseLookupError=Error accessing central repository
-HashDbImportDatabaseDialog.duplicateName=A hashset with this name and version already exists
-HashDbImportDatabaseDialog.missingOrg=An organization must be selected
-HashDbImportDatabaseDialog.missingVersion=A version must be entered
-HashDbImportDatabaseDialog.mustEnterHashSetNameMsg=A hash set name must be entered.
-HashDbImportDatabaseDialog.populateOrgsError.message=Failure loading organizations.
-# {0} - File name
-HashDbIngestModule.dialogTitle.errorFindingArtifacts=Error Finding Artifacts: {0}
-# {0} - File name
-HashDbIngestModule.errorMessage.lookingForFileArtifacts=Error encountered while looking for existing artifacts for {0}.
-HashDbIngestModule.indexError.message=Failed to index hashset hit artifact for keyword search.
-HashDbIngestModule.knownBadFileSearchWillNotExecuteWarn=Notable file search will not be executed.
-HashDbIngestModule.knownFileSearchWillNotExecuteWarn=Known file search will not be executed.
-HashDbIngestModule.noKnownBadHashDbSetMsg=No notable hash set.
-HashDbIngestModule.noKnownHashDbSetMsg=No known hash set.
-HashDbManager.CentralRepoHashDb.orgError=Error loading organization
-HashDbManager.centralRepoLoadError.message=Error loading central repository hash sets
-# {0} - hash set name
-HashDbManager.noDbPath.message=Couldn't get valid hash set path for: {0}
-HashDbSearchAction.noOpenCase.errMsg=No open case available.
-HashDbSearchPanel.noOpenCase.errMsg=No open case available.
-HashLookupSettingsPanel.centralRepo=Central Repository
-HashLookupSettingsPanel.editable=Editable
-HashLookupSettingsPanel.notApplicable=N/A
-HashLookupSettingsPanel.promptMessage.deleteHashDb=This will make the hash database unavailable for lookup. Do you want to proceed?\n\nNote: The hash database can still be re-imported later.
-HashLookupSettingsPanel.promptTitle.deleteHashDb=Delete Hash Database from Configuration
-HashLookupSettingsPanel.readOnly=Read only
-# {0} - hash lookup name
-HashLookupSettingsPanel.removeDatabaseFailure.message=Failed to remove hash lookup: {0}
-HashLookupSettingsPanel.saveFail.message=Couldn't save hash set settings.
-HashLookupSettingsPanel.saveFail.title=Save Fail
-HashLookupSettingsPanel.Title=Global Hash Lookup Settings
-HashLookupSettingsPanel.updateStatusError=Error reading status
-ImportCentralRepoDbProgressDialog.errorParsingFile.message=Error parsing hash set file
-ImportCentralRepoDbProgressDialog.linesProcessed.message=\ hashes processed
-ImportCentralRepoDbProgressDialog.title.text=Central Repository Import Progress
-OpenIDE-Module-Display-Category=Ingest Module
-OpenIDE-Module-Long-Description=\
-    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
-HashDbSearchPanel.hashTable.columnModel.title0=MD5 Hashes
-HashDbSearchPanel.addButton.text=Add Hash
-HashDbSearchPanel.hashField.text=
-HashDbSearchPanel.hashLabel.text=MD5 hash:
-HashDbSearchPanel.searchButton.text=Search
-HashDbSearchPanel.removeButton.text=Remove Selected
-HashDbSearchPanel.titleLabel.text=Search for files with the following MD5 hash(es):
-HashDbSearchPanel.errorField.text=Error: Not all files have been hashed.
-HashDbSearchPanel.saveBox.text=Remember Hashes
-HashDbSearchPanel.cancelButton.text=Cancel
-OpenIDE-Module-Short-Description=Hash Set Ingest Module and hash set tools
-HashDbImportDatabaseDialog.jLabel1.text=Name:
-HashDbImportDatabaseDialog.databasePathTextField.text=
-HashDbImportDatabaseDialog.knownBadRadioButton.text=Notable
-HashDbImportDatabaseDialog.jLabel2.text=Type of hash set\:
-HashDbImportDatabaseDialog.okButton.text=OK
-HashDbImportDatabaseDialog.cancelButton.text=Cancel
-HashDbCreateDatabaseDialog.jLabel2.text=Type:
-HashDbCreateDatabaseDialog.knownBadRadioButton.text=Notable
-HashDbCreateDatabaseDialog.cancelButton.text=Cancel
-ModalNoButtons.CURRENTDB_LABEL.text=(CurrentDb)
-ModalNoButtons.CURRENTLYON_LABEL.text=Currently Indexing x of y
-ModalNoButtons.GO_GET_COFFEE_LABEL.text=Hash sets are currently being indexed, this may take some time.
-ModalNoButtons.CANCEL_BUTTON.text=Cancel
-HashDbImportDatabaseDialog.knownRadioButton.text=Known (NSRL or other)
-HashDbCreateDatabaseDialog.knownRadioButton.text=Known
-HashDbCreateDatabaseDialog.saveAsButton.text=Save As...
-HashDbCreateDatabaseDialog.hashSetNameTextField.text=
-HashDbImportDatabaseDialog.jLabel3.text=Hash Set Path:
-HashDbCreateDatabaseDialog.sendIngestMessagesCheckbox.text=Send ingest inbox messages for each hit
-HashDbImportDatabaseDialog.sendIngestMessagesCheckbox.text=Send ingest inbox message for each hit
-HashDbImportDatabaseDialog.hashSetNameTextField.text=
-HashDbImportDatabaseDialog.openButton.text=Open...
-HashDbCreateDatabaseDialog.jLabel3.text=Name:
-HashDbCreateDatabaseDialog.okButton.text=OK
-HashDbCreateDatabaseDialog.databasePathTextField.text=
-AddContentToHashDbAction.ContentMenu.noHashDbsConfigd=No hash sets configured
-AddContentToHashDbAction.ContentMenu.createDbItem=Create hash set...
-AddContentToHashDbAction.addFilesToHashSet.addToHashDbErr1.text=Add to Hash Set Error
-AddContentToHashDbAction.addFilesToHashSet.addToHashDbErr2.text=Add to Hash Set Error
-AddContentToHashDbAction.addFilesToHashSet.addToHashDbErr3.text=Add to Hash Set Error
-AddContentToHashDbAction.addFilesToHashSet.unableToAddFileMsg=Unable to add {0} to the hash set.
-AddContentToHashDbAction.addFilesToHashSet.unableToAddFileEmptyMsg=Unable to add {0} to the hash set. File has no content.
-AddContentToHashDbAction.addFilesToHashSet.unableToAddFileSzMsg=Unable to add the {0} to the hash set. Hashes have not been calculated. Please configure and run an appropriate ingest module.
-HashDatabaseOptionsPanelController.moduleErr=Module Error
-HashDatabaseOptionsPanelController.moduleErrMsg=A module caused an error listening to HashDatabaseOptionsPanelController updates. See log to determine which module. Some data could be incomplete.
-HashDbConfigPanel.noSelectionText=
-HashDbConfigPanel.errorGettingPathText=Error occurred getting path
-HashDbConfigPanel.errorGettingIndexStatusText=Error occurred getting status
-HashDbConfigPanel.indexButtonText.index=Index
-HashDbConfigPanel.indexButtonText.indexing=Indexing
-HashDbConfigPanel.indexStatusText.indexGen=Index is currently being generated
-HashDbConfigPanel.indexStatusText.indexOnly=Index only
-HashDbConfigPanel.indexStatusText.indexed=Indexed
-HashDbConfigPanel.indexButtonText.reIndex=Re-Index
-HashDbConfigPanel.indexStatusText.noIndex=No index
-HashDbConfigPanel.dbsNotIndexedMsg=The following hash sets are not indexed, would you like to index them now? \n {0}
-HashDbConfigPanel.dbNotIndexedMsg=The following hash set is not indexed, would you like to index it now? \n{0}
-HashDbConfigPanel.unindexedDbsMsg=Unindexed hash sets
-HashDbConfigPanel.allUnindexedDbsRmFromListMsg=All unindexed hash sets will be removed from the list
-HashDbConfigPanel.nameColLbl=Name
-HashDbConfigPanel.editingCellsNotSupportedMsg=Editing of cells is not supported
-HashDbCreateDatabaseDialog.defaultFileName=hashset
-HashDbCreateDatabaseDialog.createHashDbMsg=Create Hash Set
-HashDbCreateDatabaseDialog.hashDbMustHaveFileExtensionMsg=The hash set file must have a .{0} extension.
-HashDbCreateDatabaseDialog.fileNameErr=File Name Error
-HashDbCreateDatabaseDialog.fileNameAlreadyExistsMsg=A file with this name already exists. Please choose a new file name.
-HashDbCreateDatabaseDialog.fileExistsErr=File Already Exists Error
-HashDbCreateDatabaseDialog.mustEnterHashSetNameMsg=A hash set name must be entered.
-HashDbCreateDatabaseDialog.createHashDbErr=Create Hash Set Error
-HashDbCreateDatabaseDialog.mustEnterHashDbPathMsg=A hash set path must be entered.
-HashDbCreateDatabaseDialog.errMsg.hashDbCreationErr=Hash set creation error
-HashDbCreateDatabaseDialog.cannotCreateFileAtLocMsg=Cannot create a hash set file at the selected location.
-HashDbCreateDatabaseDialog.failedToCreateHashDbMsg=Failed to create the hash set.
-HashDbImportDatabaseDialog.importHashDbMsg=Import Hash Set
-HashDbImportDatabaseDialog.fileNameExtFilter.text=Hash Set File
-HashDbImportDatabaseDialog.failedToGetDbPathMsg=Failed to get the path of the selected hash set.
-HashDbImportDatabaseDialog.importHashDbErr=Import Hash Set Error
-HashDbImportDatabaseDialog.mustSelectHashDbFilePathMsg=A hash set file path must be selected.
-HashDbImportDatabaseDialog.hashDbDoesNotExistMsg=The selected hash set does not exist.
-HashDbImportDatabaseDialog.unableToCopyToUserDirMsg=Unable to copy the hash set to user configuration directory {0}.
-HashDbImportDatabaseDialog.errorMessage.failedToOpenHashDbMsg=Failed to open hash set at {0}.
-HashLookupModuleFactory.moduleName.text=Hash Lookup
-HashLookupModuleFactory.moduleDescription.text=Identifies known and notable files using supplied hash sets, such as a standard NSRL hash set.
-HashDbIngestModule.fileReadErrorMsg=Read Error\: {0}
-HashDbIngestModule.calcHashValueErr=Error encountered while calculating the hash value for {0} ({1}).
-HashDbIngestModule.hashLookupErrorMsg=Hash Lookup Error\: {0}
-HashDbIngestModule.settingKnownBadStateErr=Error encountered while setting notable state for {0}.
-HashDbIngestModule.lookingUpKnownBadHashValueErr=Error encountered while looking up notable hash value for {0}.
-HashDbIngestModule.lookingUpKnownHashValueErr=Error encountered while looking up known hash value for {0}.
-HashDbIngestModule.postToBB.fileName=File Name
-HashDbIngestModule.postToBB.md5Hash=MD5 Hash
-HashDbIngestModule.postToBB.hashsetName=Hash Set Name
-HashDbIngestModule.postToBB.knownBadMsg=Notable\: {0}
-HashDbIngestModule.complete.knownBadsFound=Notables found\:
-HashDbIngestModule.complete.totalCalcTime=Total Calculation Time
-HashDbIngestModule.complete.totalLookupTime=Total Lookup Time
-HashDbIngestModule.complete.databasesUsed=Hash Sets Used\:
-HashDbIngestModule.complete.hashLookupResults=Hash Lookup Results
-HashDbManager.moduleErrorListeningToUpdatesMsg=A module caused an error listening to HashDbManager updates. See log to determine which module. Some data could be incomplete.
-HashDbManager.replacingDuplicateHashsetNameMsg=Duplicate hash set name {0} found.\nReplacing with {1}.
-HashDbManager.openHashDbErr=Open Hash Set Error
-HashDbManager.unableToOpenHashDbMsg=Unable to open {0} hash set.
-HashDbManager.savedBackupOfOldConfigMsg={0}\nA backup copy of the old configuration has been saved as\n{1}
-HashDbManager.baseMessage.updatedFormatHashDbConfig=The format of the hash set configuration file has been updated.
-HashDbManager.msgBoxTitle.confFileFmtChanged=Configuration File Format Changed
-HashDbManager.dlgMsg.dbNotFoundAtLoc=Hash set {0} could not be found at location\n{1}\nWould you like to search for the file?
-HashDbManager.dlgTitle.MissingDb=Missing Hash Set
-HashDbManager.progress.indexingHashSet=Indexing {0}
-HashDbManager.dlgMsg.errorIndexingHashSet=Error indexing {0} hash set.
-HashDbManager.hashDbIndexingErr=Hash Set Indexing Error
-HashDbPanelSearchAction.actionName=File Search by MD5 Hash
-HashDbSearchAction.dlgMsg.noFilesHaveMD5Calculated=No files currently have an MD5 hash calculated, run HashDB ingest first.
-HashDbSearchManager.MD5HashSearch=MD5 Hash Search
-HashDbSearchManager.noResultsFoundMsg=No results were found.
-HashDbSearchPanel.titleText.ingestOngoing=Ingest is ongoing; this service will be unavailable until it finishes.
-HashDbSearchPanel.noFilesHaveMD5HashMsg=No files currently have an MD5 hash.
-HashDbSearchPanel.errorText.noHashesAddedMsg=Error\: No hashes have been added.
-HashDbSearchPanel.errorText.hashAlreadyAddedMsg=Error\: Hash has already been added.
-HashDbSearchPanel.errorText.invalidMD5HashMsg=Error\: That is not a valid MD5 hash.
-HashDbSearchThread.progress.cancellingSearch={0} (Cancelling...)
-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\
-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}
-ModalNoButtons.propChg.currentlyIndexingXofN=Currently indexing {0} of {1}
-HashDbManager.duplicateHashSetNameExceptionMsg=The hash set name ''{0}'' has already been used for another hash set.
-HashDbManager.hashDbDoesNotExistExceptionMsg=No hash set found at\n{0}
-HashDbManager.hashDbFileExistsExceptionMsg=A file already exists at\n{0}
-HashDbManager.hashDbAlreadyAddedExceptionMsg=The hash set at\n{0}\nhas already been created or imported.
-HashDbManager.illegalHashDbFileNameExtensionMsg=The hash set file name must have a .{0} extension.
-HashDbManager.moduleErr=Module Error
-HashDbManager.knownBad.text=Notable
-HashDbManager.known.text=Known
-HashDbManager.fileNameExtensionFilter.title=Hash Set File
-HashDbSearchAction.dlgMsg.title=File Search by MD5 Hash
-HashDbSearchAction.getName.text=Hash Search
-HashDbSearchPanel.dlgMsg.title=File Search by MD5 Hash
-AddContentToHashDbAction.singleSelectionName=Add File to Hash Set
-AddContentToHashDbAction.multipleSelectionName=Add Files to Hash Set
-AddContentToHashDbAction.singleSelectionNameDuringIngest=Add File to Hash Set (Ingest is running)
-AddContentToHashDbAction.multipleSelectionNameDuringIngest=Add Files to Hash Set (Ingest is running)
-AddContentToHashDbAction.singleSelectionNameNoMD5=Add File to Hash Set (No MD5 Hash)
-AddContentToHashDbAction.multipleSelectionNameNoMD5=Add Files to Hash Set (No MD5 Hash)
-AddContentToHashDbAction.singleSelectionNameEmpty=Add File to Hash Set (Empty File)
-AddContentToHashDbAction.multipleSelectionNameEmpty=Add Files to Hash Set (Empty File)
-HashDbManager.ingestRunningExceptionMsg=Ingest is ongoing; this service will be unavailable until it finishes.
-HashDbManager.saveErrorExceptionMsg=Error saving hash configuration
-HashLookupSettingsPanel.jButton3.text=Import Hash Set
-HashLookupSettingsPanel.jLabel6.text=Type:
-HashLookupSettingsPanel.jLabel4.text=Location:
-HashLookupSettingsPanel.jLabel2.text=Name:
-HashLookupModuleSettingsPanel.alwaysCalcHashesCheckbox.text=Calculate MD5 even if no hash set is selected
-HashLookupModuleSettingsPanel.knownHashDbsLabel.text=Select known hash sets to use:
-HashLookupModuleSettingsPanel.knownBadHashDbsLabel.text=Select notable hash sets to use:
-AddContentToHashDbAction.addFilesToHashSet.files=files
-AddContentToHashDbAction.addFilesToHashSet.file=file
-HashDbManager.errCreatingIndex.title=Error creating index
-HashDbManager.errCreatingIndex.msg=Error creating index\: {0}
-HashLookupModuleFactory.getIngestJobSettingsPanel.exception.msg=Expected settings argument to be instanceof HashLookupModuleSettings
-HashLookupModuleFactory.createFileIngestModule.exception.msg=Expected settings argument to be instanceof HashLookupModuleSettings
-HashLookupModuleSettingsPanel.alwaysCalcHashesCheckbox.toolTipText=Calculate MD5 even if no hash set is selected
-HashDbSearchPanel.hashTable.defaultModel.title.text=MD5 Hashes
-AddHashValuesToDatabaseDialog.JDialog.Title=Add Hashes to Hash Set
-AddHashValuesToDatabaseDialog.instructionLabel.text_1=Paste MD5 hash values (one per line) below:
-AddHashValuesToDatabaseDialog.cancelButton.text_2=Cancel
-AddHashValuesToDatabaseDialog.pasteFromClipboardButton.text_2=Paste From Clipboard
-AddHashValuesToDatabaseProgressDialog.okButton.text=OK
-AddHashValuesToDatabaseProgressDialog.statusLabel.text=status
-AddHashValuesToDatabaseProgressDialog.title=Add Hashes to Hash Set Progress
-AddHashValuesToDatabaseDialog.title=Add Hashes to Hash Set
-AddHashValuesToDatabaseProgressDialog.showErrorsButton.text=Show Errors
-AddHashValuesToDatabaseProgressDialog.addHashValuesToDatabase.parsing=Parsing text for MD5 hashes...
-AddHashValuesToDatabaseProgressDialog.addHashValuesToDatabase.invalidHash=The input contains invalid hash.
-AddHashValuesToDatabaseProgressDialog.addHashValuesToDatabase.invaliHash.msg=Invalid Hashes:
-AddHashValuesToDatabaseProgressDialog.addHashValuesToDatabase.noHashesToAdd=There are no hashes to add.
-AddHashValuesToDatabaseProgressDialog.addHashValuesToDatabase.success={0} Hashes added successfully.
-AddHashValuesToDatabaseProgressDialog.addHashValuesToDatabase.errorAddingValidHash=There is an error adding valid hashes.
-AddHashValuesToDatabaseProgressDialog.addHashValuesToDatabase.errorAddingValidHash.msg=Error adding valid hashes to the hash set:
-HashLookupSettingsPanel.ingestWarningLabel.text=Ingest is ongoing, some settings will be unavailable until it finishes.
-HashLookupSettingsPanel.addHashesToDatabaseButton.text=Add Hashes to Hash Set
-HashLookupSettingsPanel.indexPathLabelLabel.text=Index Path:
-HashLookupSettingsPanel.createDatabaseButton.toolTipText=
-HashLookupSettingsPanel.createDatabaseButton.text=New Hash Set
-HashLookupSettingsPanel.informationLabel.text=Hash Set Details
-HashLookupSettingsPanel.sendIngestMessagesCheckBox.text=Send ingest inbox message for each hit
-HashLookupSettingsPanel.indexButton.text=Index
-HashLookupSettingsPanel.indexLabel.text=Index Status:
-HashLookupSettingsPanel.hashDbIndexStatusLabel.text=
-HashLookupSettingsPanel.hashDbTypeLabel.text=
-HashLookupSettingsPanel.typeLabel.text=Type:
-HashLookupSettingsPanel.locationLabel.text=Hash Set Path:
-HashLookupSettingsPanel.hashDbLocationLabel.text=
-HashLookupSettingsPanel.hashDbNameLabel.text=
-HashLookupSettingsPanel.nameLabel.text=Name:
-HashLookupSettingsPanel.hashDatabasesLabel.text=Hash Sets:
-HashLookupSettingsPanel.importDatabaseButton.toolTipText=
-HashLookupSettingsPanel.importDatabaseButton.text=Import Hash Set
-HashLookupSettingsPanel.deleteDatabaseButton.text=Delete Hash Set
-ImportHashDatabaseDialog.lbFilePath.text=Hash Set Path:
-ImportHashDatabaseDialog.tfDatabaseName.tooltip=Name for this hash set
-ImportHashDatabaseDialog.tfDatabaseVersion.tooltip.text=Hash Set Version Number
-ImportHashDatabaseDialog.tfDatabaseName.tooltip=Name for this hash set
-ImportHashDatabaseDialog.tfDatabaseVersion.tooltip.text=Hash Set Version Number
-ImportCentralRepoDbProgressDialog.lbProgress.text=Starting import...
-ImportCentralRepoDbProgressDialog.bnOk.text=OK
-ImportCentralRepoDbProgressDialog.bnCancel.text=Cancel
-HashLookupSettingsPanel.versionLabel.text_1=Version:
-HashLookupSettingsPanel.hashDbVersionLabel.text_1=
-HashLookupSettingsPanel.orgLabel.text_1=Organization:
-HashLookupSettingsPanel.hashDbOrgLabel.text_1=
-HashLookupSettingsPanel.readOnlyLabel.text_1=Read only:
-HashLookupSettingsPanel.hashDbReadOnlyLabel.text_1=
-ImportCentralRepoDbProgressDialog.jLabel1.text=Importing hash set into the central repository
-HashDbImportDatabaseDialog.lbVersion.text=Version:
-HashDbImportDatabaseDialog.lbOrg.text=Source Organization:
-HashDbImportDatabaseDialog.readOnlyCheckbox.text=Make hash set read-only
-HashDbImportDatabaseDialog.orgButton.text=Manage Organizations
-HashDbImportDatabaseDialog.versionTextField.text=1.0
-HashDbImportDatabaseDialog.fileTypeRadioButton.text=Local
-HashDbImportDatabaseDialog.centralRepoRadioButton.text=Remote (Central Repository)
-HashDbImportDatabaseDialog.jLabel4.text=Destination:
-HashDbCreateDatabaseDialog.jLabel4.text=Destination:
-HashDbCreateDatabaseDialog.fileTypeRadioButton.text=Local
-HashDbCreateDatabaseDialog.centralRepoRadioButton.text=Remote (Central Repository)
-HashDbCreateDatabaseDialog.lbOrg.text=Source Organization:
-HashDbCreateDatabaseDialog.orgButton.text=Manage Organizations
-HashDbCreateDatabaseDialog.databasePathLabel.text=Hash Set Path:
-AddHashValuesToDatabaseDialog.okButton.text_2=OK
-HashDbImportDatabaseDialog.saveInUserConfigFolderCheckbox.text=Copy hash set into user configuration folder
-HashDbImportDatabaseDialog.saveInUserConfigFolderCheckbox.toolTipText=In Live Triage situations, this option ensures that path to the hash set will be valid
-HashLookupSettingsPanel.indexPathLabel.text=
diff --git a/Core/src/org/sleuthkit/autopsy/modules/iOS/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/modules/iOS/Bundle.properties-MERGED
deleted file mode 100755
index 33c0a3ed0839a680f9dc91ff7cabce711132a17d..0000000000000000000000000000000000000000
--- a/Core/src/org/sleuthkit/autopsy/modules/iOS/Bundle.properties-MERGED
+++ /dev/null
@@ -1,8 +0,0 @@
-CallLogAnalyzer.indexError.message=Failed to index call log artifact for keyword search.
-ContactAnalyzer.indexError.message=Failed to index contact artifact for keyword search.
-iOSModuleFactory.moduleName=iOS Analyzer
-iOSModuleFactory.moduleDescription=Extracts system and 3rd party app data
-TextMessageAnalyzer.bbAttribute.incoming=Incoming
-TextMessageAnalyzer.bbAttribute.outgoing=Outgoing
-TextMessageAnalyzer.bbAttribute.smsMessage=SMS Message
-TextMessageAnalyzer.indexError.message=Failed to index text message artifact for keyword search.
diff --git a/Core/src/org/sleuthkit/autopsy/modules/interestingitems/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/modules/interestingitems/Bundle.properties-MERGED
deleted file mode 100755
index 7ca4901b1b1dedf4695953eca0c01a91d9aa4169..0000000000000000000000000000000000000000
--- a/Core/src/org/sleuthkit/autopsy/modules/interestingitems/Bundle.properties-MERGED
+++ /dev/null
@@ -1,140 +0,0 @@
-FilesIdentifierIngestJobSettingsPanel.getError=Error getting interesting files sets from settings file.
-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
-# {0} - file name
-FilesSetDefsPanel.exportButtonActionPerformed.fileExistPrompt=File {0} exists, overwrite?
-FilesSetDefsPanel.gigaBytes=Gigabytes
-# {0} - filter name
-# {1} - profile name
-FilesSetDefsPanel.ingest.fileFilterInUseError=The selected file filter, {0}, is being used by a profile, {1}, and cannot be deleted while any profile uses it.
-FilesSetDefsPanel.Ingest.Title=File Filter Settings
-FilesSetDefsPanel.interesting.copySetButton.text=Copy Set
-FilesSetDefsPanel.interesting.exportButtonAction.featureName=Interesting Files Set Export
-FilesSetDefsPanel.interesting.ExportedMsg=Interesting files set exported
-FilesSetDefsPanel.interesting.exportSetButton.text=Export Set
-FilesSetDefsPanel.interesting.failExportMsg=Export of interesting files set failed
-FilesSetDefsPanel.interesting.failImportMsg=Interesting files set not imported
-FilesSetDefsPanel.interesting.fileExtensionFilterLbl=Autopsy Interesting File Set File (xml)
-FilesSetDefsPanel.interesting.importButtonAction.featureName=Interesting Files Set Import
-FilesSetDefsPanel.interesting.importOwConflict=Import Interesting files set conflict
-FilesSetDefsPanel.interesting.importSetButton.text=Import Set
-# {0} - FilesSet name
-FilesSetDefsPanel.interesting.overwriteSetPrompt=Interesting files set <{0}> already exists locally, overwrite?
-FilesSetDefsPanel.Interesting.Title=Global Interesting Items Settings
-FilesSetDefsPanel.kiloBytes=Kilobytes
-FilesSetDefsPanel.loadError=Error loading interesting files sets from file.
-FilesSetDefsPanel.megaBytes=Megabytes
-FilesSetDefsPanel.noSkipMsg=No, skip
-FilesSetDefsPanel.saveError=Error saving interesting files sets to file.
-FilesSetDefsPanel.yesOwMsg=Yes, overwrite
-FilesSetPanel.filter.title=File Filter
-FilesSetPanel.ingest.createNewFilter=Create/edit file ingest filters...
-FilesSetPanel.ingest.messages.filtersMustBeNamed=File ingest filters must be named.
-FilesSetPanel.rule.title=File Filter Rule
-FilesSetRulePanel.bytes=Bytes
-FilesSetRulePanel.DaysIncludedEmptyError=Number of days included cannot be empty.
-FilesSetRulePanel.DaysIncludedInvalidError=Number of days included must be a positive integer.
-FilesSetRulePanel.gigaBytes=Gigabytes
-FilesSetRulePanel.kiloBytes=Kilobytes
-FilesSetRulePanel.megaBytes=Megabytes
-FilesSetRulePanel.nameTextField.extensionExample=Examples: "jpg" or "jpg,jpeg,gif"
-FilesSetRulePanel.nameTextField.fullNameExample=Example: "file.exe"
-FilesSetRulePanel.NoConditionError=Must have at least one condition to make a rule.
-FilesSetRulePanel.NoMimeTypeError=Please select a valid MIME type.
-FilesSetRulePanel.NoNameError=Name cannot be empty
-FilesSetRulePanel.NoPathError=Path cannot be empty
-FilesSetRulePanel.ZeroFileSizeError=File size condition value must not be 0 (Unless = is selected).
-FilesSetsManager.allFilesAndDirectories=All Files and Directories (Not Unallocated Space)
-FilesSetsManager.allFilesDirectoriesAndUnallocated=All Files, Directories, and Unallocated Space
-InterestingItemsIngestModuleFactory.defaultSettingsError=Error getting default interesting files settings from file.
-OpenIDE-Module-Display-Category=Ingest Module
-OpenIDE-Module-Long-Description=Interesting Files Identifier ingest module. \n\n Identifies interesting files as defined by interesting files rule sets.
-OpenIDE-Module-Short-Description=Interesting Files Identifier ingest module.
-OpenIDE-Module-Name=Interesting Files Identifier
-OptionsCategory_Name_InterestingItemDefinitions=Interesting Files
-OptionsCategory_Keywords_InterestingItemDefinitions=InterestingItemDefinitions
-InterestingItemsIdentifierIngestModule.moduleName=Interesting Files Identifier
-InterestingItemsIdentifierIngestModule.moduleDescription=Identifies interesting items as defined by interesting item rule sets.
-FilesSetPanel.interesting.title=Interesting Files Set
-FilesSetPanel.interesting.messages.filesSetsMustBeNamed=Interesting files sets must be named.
-FilesSetPanel.messages.filesSetsReservedName=You have chosen a name reserved by the software, please choose a different name.
-FilesSetPanel.ignoreKnownFilesCheckbox.text=Ignore Known Files
-FilesSetPanel.descriptionPanel.border.title=Description
-FilesSetPanel.interesting.nameLabel.text=Set Name:
-FilesSetPanel.ingest.nameLabel.text=Filter Name:
-FilesSetPanel.descPanel.border.title=Description
-FilesSetPanel.ignoreUnallocCheckbox.toolTipText=Ignores unallocated space, such as deleted files. May run faster but produce less complete results.
-FilesSetPanel.ignoreUnallocCheckbox.text=Ignore Unallocated Space
-FilesSetRulePanel.title=Interesting Files Set Rule
-FilesSetRulePanel.extensionRadioButton.text=Extension Only
-FilesSetRulePanel.pathRegexCheckBox.text=Regex
-FilesSetRulePanel.pathTextField.text=
-FilesSetRulePanel.fullNameRadioButton.text=Full Name
-FilesSetRulePanel.nameRegexCheckbox.text=Substring / Regex
-FilesSetRulePanel.ruleNameTextField.text=
-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.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=Use /  as path separator
-FilesIdentifierIngestJobSettingsPanel.border.title=Select interesting files sets to enable during ingest:
-FilesSetRulePanel.jLabel1.text=Type:
-FilesSetRulePanel.interesting.jLabel5.text=Enter information about files that you want to find.
-FilesSetRulePanel.ingest.jLabel5.text=Enter information about files that you want to run ingest on.
-FilesSetRulePanel.nameCheck.text=Name:
-FilesSetRulePanel.pathCheck.text=Path Substring:
-FilesSetRulePanel.filesRadioButton.text=Files
-FilesSetRulePanel.dirsRadioButton.text=Directories
-FilesSetDefsPanel.interesting.setsListLabel.text=Rule Sets:
-FilesSetDefsPanel.ingest.setsListLabel.text=File Filters:
-FilesSetDefsPanel.interesting.jTextArea1.text=This module allows you to find files that match specified criteria. Each set has a list of rules, which will match on their chosen file characteristics. A file need only match one rule to be found.
-FilesSetDefsPanel.ingest.jTextArea1.text=Add rules so that only a subset of the files in a data source are analyzed. Rules are organized into sets and only one set can be used at a time. A file need only match one rule to be analyzed.
-FilesSetDefsPanel.interesting.editSetButton.text=Edit Set
-FilesSetDefsPanel.ingest.editSetButton.text=Edit Filter
-FilesSetDefsPanel.interesting.newSetButton.text=New Set
-FilesSetDefsPanel.ingest.newSetButton.text=New Filter
-FilesSetDefsPanel.interesting.deleteSetButton.text=Delete Set
-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
-FilesSetDefsPanel.filesRadioButton.text=Files
-FilesSetRulePanel.allRadioButton.text=All
-FilesSetDefsPanel.ingoreUnallocCheckbox.text=Ignore Unallocated Space
-FilesSetDefsPanel.ingoreUnallocCheckbox.toolTipText=Ignores unallocated space, such as deleted files. May run faster but produce less complete results.
-FilesSetDefsPanel.ingestWarningLabel.text=Ingest is ongoing, some settings will be unavailable until it finishes.
-FilesSetDefsPanel.allRadioButton.text=All
-FilesSetRulePanel.dateCheck.text=Modified Within:
-FilesSetRulePanel.fileSizeCheck.text=File Size:
-FilesSetRulePanel.mimeCheck.text=MIME Type:
-FilesSetDefsPanel.modifiedDateLabel.text=Modified Within:
-FilesSetDefsPanel.daysIncludedTextField.text=
-FilesSetDefsPanel.daysIncludedLabel.text=day(s)
-FilesSetRulePanel.daysIncludedLabel.text=day(s)
diff --git a/Core/src/org/sleuthkit/autopsy/modules/photoreccarver/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/modules/photoreccarver/Bundle.properties-MERGED
deleted file mode 100755
index eafb65f2f3343033b46fa97336f7d4d657de6dd8..0000000000000000000000000000000000000000
--- a/Core/src/org/sleuthkit/autopsy/modules/photoreccarver/Bundle.properties-MERGED
+++ /dev/null
@@ -1,30 +0,0 @@
-# {0} - output directory name
-cannotCreateOutputDir.message=Unable to create output directory: {0}.
-cannotRunExecutable.message=Unable to execute PhotoRec.
-missingExecutable.message=Unable to locate PhotoRec executable.
-OpenIDE-Module-Name=PhotoRec Carver Ingest Module
-OpenIDE-Module-Display-Category=Ingest Module
-OpenIDE-Module-Long-Description=PhotoRec Carver ingest module. \n\n Carves unallocated space and feeds the resulting carved files back into the system for processing.
-OpenIDE-Module-Short-Description=Carves unallocated space and feeds carved files back into the system for processing.
-moduleDisplayName.text=PhotoRec Carver
-moduleDescription.text=Runs PhotoRec carver against unallocated space in the data source.
-PhotoRecIngestModule.nonHostnameUNCPathUsed=PhotoRec cannot operate with a UNC path containing IP addresses.
-PhotoRecIngestModule.PermissionsNotSufficient=Insufficient permissions accessing
-PhotoRecIngestModule.PermissionsNotSufficientSeeReference=See 'Shared Drive Authentication' in Autopsy help.
-PhotoRecIngestModule.processTerminated=PhotoRec Carver ingest module was terminated due to exceeding max allowable run time when scanning
-PhotoRecIngestModule.moduleError=PhotoRec Carver Module Error
-PhotoRecIngestModule.UnableToCarve=Unable to carve file\: {0}
-PhotoRecIngestModule.NotEnoughDiskSpace=Not enough disk space to save unallocated file. Carving will be skipped.
-PhotoRecIngestModule.complete.numberOfCarved=Number of Files Carved\:
-PhotoRecIngestModule.complete.totalWritetime=Total Time To Write To Disk\:
-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.msg=Error processing {0} with PhotoRec carver.
-PhotoRecIngestModule.complete.numberOfErrors=Number of Errors while Carving\:
-PhotoRecCarverIngestJobSettingsPanel.detectionSettingsLabel.text=PhotoRec Settings
-PhotoRecCarverIngestJobSettingsPanel.keepCorruptedFilesCheckbox.text=Keep corrupted files
-unallocatedSpaceProcessingSettingsError.message=The selected file ingest filter ignores unallocated space. This module carves unallocated space. Please choose a filter which does not ignore unallocated space or disable this module.
-unsupportedOS.message=PhotoRec module is supported on Windows platforms only.
diff --git a/Core/src/org/sleuthkit/autopsy/modules/stix/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/modules/stix/Bundle.properties-MERGED
deleted file mode 100755
index ff848993521e11db097cd117290ab82079508621..0000000000000000000000000000000000000000
--- a/Core/src/org/sleuthkit/autopsy/modules/stix/Bundle.properties-MERGED
+++ /dev/null
@@ -1,18 +0,0 @@
-OpenIDE-Module-Name=stixModule
-StixArtifactData.indexError.message=Failed to index STIX interesting file hit artifact for keyword search.
-StixArtifactData.noOpenCase.errMsg=No open case available.
-STIXReportModule.getName.text=STIX
-STIXReportModule.getDesc.text=Generate a report by running a collection of STIX (Structured Threat Information eXpression) files against the data sources. Also creates artifacts under Interesting Files.
-STIXReportModule.progress.readSTIX=Parsing STIX files
-STIXReportModule.srcModuleName.text=STIX Report
-STIXReportModuleConfigPanel.jLabel2.text=Select a STIX file or directory of STIX files
-STIXReportModuleConfigPanel.jTextField1.text=
-STIXReportModuleConfigPanel.jButton1.text=Choose file
-STIXReportModuleConfigPanel.jCheckBox1.text=Include results for false indicators in output file
-STIXReportModule.notifyMsg.unableToOpenReportFile=Unable to complete STIX report.
-STIXReportModule.progress.completedWithErrors=Completed with errors
-STIXReportModule.notifyMsg.unableToOpenFileDir=Unable to open STIX file/directory {0}
-STIXReportModule.progress.couldNotOpenFileDir=Could not open file/directory {0}
-STIXReportModule.notifyMsg.tooManyArtifactsgt1000=Too many STIX-related artifacts generated for "{0}". Only saving first 1000.
-STIXReportModule.notifyErr.noFildDirProvided=No STIX file/directory provided
-STIXReportModule.progress.noFildDirProvided=No STIX file/directory provided
diff --git a/Core/src/org/sleuthkit/autopsy/modules/vmextractor/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/modules/vmextractor/Bundle.properties-MERGED
deleted file mode 100755
index 75c8f577b4771da8d4a547aafaad6900927f69cf..0000000000000000000000000000000000000000
--- a/Core/src/org/sleuthkit/autopsy/modules/vmextractor/Bundle.properties-MERGED
+++ /dev/null
@@ -1,15 +0,0 @@
-# {0} - data source name
-deviceIdQueryErrMsg=Data source {0} missing Device ID
-# {0} - output directory name
-VMExtractorIngestModule.cannotCreateOutputDir.message=Unable to create output directory: {0}.
-VMExtractorIngestModule.noOpenCase.errMsg=No open case available.
-VMExtractorIngestModuleFactory.moduleDisplayName=Virtual Machine Extractor
-VMExtractorIngestModuleFactory.moduleDescription=Extracts virtual machine files and adds them to a case as data sources.
-VMExtractorIngestModule.addedVirtualMachineImage.message=Added virtual machine image {0}
-VMExtractorIngestModule.searchingImage.message=Searching image for virtual machine files
-VMExtractorIngestModule.exportingToDisk.message=Exporting virtual machine files to disk
-VMExtractorIngestModule.queuingIngestJobs.message=Queuing ingest jobs for extracted virtual machines
-VMExtractorIngestModule.msgNotify.failedExtractVM.title.txt=Failed to extract virtual machine file
-VMExtractorIngestModule.msgNotify.failedExtractVM.msg.txt=Failed to write virtual machine file {0} to disk.
-VMExtractorIngestModule.msgNotify.failedIngestVM.title.txt=Failed to ingest virtual machine
-VMExtractorIngestModule.msgNotify.failedIngestVM.msg.txt=Failed to ingest virtual machine file {0}
diff --git a/Core/src/org/sleuthkit/autopsy/progress/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/progress/Bundle.properties-MERGED
deleted file mode 100755
index 7fcb87097c82e8b26157bfcd911031663c40e151..0000000000000000000000000000000000000000
--- a/Core/src/org/sleuthkit/autopsy/progress/Bundle.properties-MERGED
+++ /dev/null
@@ -1,5 +0,0 @@
-# To change this license header, choose License Headers in Project Properties.
-# To change this template file, choose Tools | Templates
-# and open the template in the editor.
-
-ProgressPanel.progressMessage.text=Message
diff --git a/Core/src/org/sleuthkit/autopsy/python/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/python/Bundle.properties-MERGED
deleted file mode 100755
index 482419af18712fcb330867e63db3f1018d81282a..0000000000000000000000000000000000000000
--- a/Core/src/org/sleuthkit/autopsy/python/Bundle.properties-MERGED
+++ /dev/null
@@ -1,4 +0,0 @@
-JythonModuleLoader.errorMessages.failedToOpenModule=Failed to open {0}. See log for details.
-JythonModuleLoader.errorMessages.failedToLoadModule=Failed to load {0}.  {1}.  See log for details.
-JythonModuleLoader.pythonInterpreterError.msg=Failed to load python modules, See log for more details
-JythonModuleLoader.pythonInterpreterError.title=Python Modules
diff --git a/Core/src/org/sleuthkit/autopsy/report/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/report/Bundle.properties-MERGED
deleted file mode 100755
index 1c548583716a6ccdcf78b89a8882a9133d587478..0000000000000000000000000000000000000000
--- a/Core/src/org/sleuthkit/autopsy/report/Bundle.properties-MERGED
+++ /dev/null
@@ -1,272 +0,0 @@
-OpenIDE-Module-Name=Report
-CTL_ReportWizardAction=Run Report
-ArtifactSelectionDialog.titleLabel.text=Select which artifacts you would like to report on:
-ArtifactSelectionDialog.okButton.text=OK
-ReportExcel.exceptionMessage.dataTooLarge=Value is too long to fit into an Excel cell. 
-ReportExcel.exceptionMessage.errorText=Error showing data into an Excel cell.
-ReportExcel.writeSummary.caseName=Case Name:
-ReportExcel.writeSummary.caseNotes=Case Notes:
-ReportExcel.writeSummary.caseNum=Case Number:
-ReportExcel.writeSummary.examiner=Examiner:
-ReportExcel.writeSummary.numImages=Number of Images:
-ReportExcel.writeSummary.sheetName=Summary
-ReportExcel.writeSummary.summary=Summary
-ReportGenerator.artTableColHdr.comment=Comment
-ReportGenerator.errList.noOpenCase=No open case available.
-ReportGenerator.tagTable.header.userName=User Name
-ReportHTML.writeSum.case=Case:
-ReportHTML.writeSum.caseNotes=Notes:
-ReportHTML.writeSum.caseNumber=Case Number:
-ReportHTML.writeSum.caseNumImages=Number of Images:
-ReportHTML.writeSum.examiner=Examiner:
-ReportVisualPanel1.reportModulesLabel.text=Report Modules:
-ReportVisualPanel1.invalidModuleWarning=Encountered an invalid Report Module ({0})
-DefaultReportConfigurationPanel.infoLabel.text=This report will be configured on the next screen.
-ReportVisualPanel2.dataLabel.text=Select which data to report on:
-ReportVisualPanel2.deselectAllButton.text=Deselect All
-ReportVisualPanel2.selectAllButton.text=Select All
-ReportVisualPanel2.advancedButton.text=Data Types
-ArtifactSelectionDialog.deselectAllButton.text=Deselect All
-ArtifactSelectionDialog.selectAllButton.text=Select All
-ReportGenerationPanel.closeButton.text=Close
-ReportProgressPanel.reportLabel.text=reportLabel
-ReportProgressPanel.pathLabel.text=pathLabel
-ReportProgressPanel.separationLabel.text=:
-ReportProgressPanel.statusMessageLabel.text=processingLabel
-ReportGenerationPanel.titleLabel.text=Report Generation Progress
-ReportVisualPanel2.taggedResultsRadioButton.text=Tagged Results
-ReportVisualPanel2.allResultsRadioButton.text=All Results
-ReportWizardFileOptionsVisualPanel.selectAllButton.text=Select All
-ReportWizardFileOptionsVisualPanel.deselectAllButton.text=Deselect All
-ReportWizardFileOptionsVisualPanel.jLabel1.text=Select items to include in File Report:
-ArtifactSelectionDialog.dlgTitle.text=Advanced Artifact Selection
-FileReportDataTypes.filename.text=Name
-FileReportDataTypes.fileExt.text=File Extension
-FileReportDataTypes.fileType.text=File Type
-FileReportDataTypes.isDel.text=Is Deleted
-FileReportDataTypes.aTime.text=Last Accessed
-FileReportDataTypes.crTime.text=File Created
-FileReportDataTypes.mTime.text=Last Modified
-FileReportDataTypes.size.text=Size
-FileReportDataTypes.address.text=Address
-FileReportDataTypes.hash.text=Hash Value
-FileReportDataTypes.knownStatus.text=Known Status
-FileReportDataTypes.perms.text=Permissions
-FileReportDataTypes.path.text=Full Path
-FileReportText.getName.text=Files - Text
-FileReportText.getDesc.text=A tab delimited text file containing information about individual files in the case.
-ReportBodyFile.progress.querying=Querying files...
-ReportBodyFile.ingestWarning.text=Warning, this report was run before ingest services completed\!
-ReportBodyFile.progress.loading=Loading files...
-ReportBodyFile.progress.processing=Now processing {0}...
-ReportBodyFile.getName.text=TSK Body File
-ReportBodyFile.getDesc.text=Body file format report with MAC times for every file. This format can be used for a timeline view.
-ReportBodyFile.getFilePath.text=BodyFile.txt
-ReportKML.progress.querying=Querying files...
-ReportKML.progress.loading=Loading files...
-ReportKML.getName.text=Google Earth KML
-ReportKML.getDesc.text=KML format report with coordinates for relevant files. This format can be used for google earth views.
-ReportKML.getFilePath.text=ReportKML.kml
-ReportBranding.defaultReportTitle.text=Autopsy Forensic Report
-ReportBranding.defaultReportFooter.text=Powered by Autopsy Open Source Digital Forensics Platform - www.sleuthkit.org
-ReportExcel.numAartifacts.text=Number of artifacts\:
-ReportExcel.getName.text=Excel Report
-ReportExcel.getDesc.text=A report about results and tagged items in Excel (XLS) format.
-ReportExcel.sheetName.text=Summary
-ReportExcel.cellVal.summary=Summary
-ReportExcel.cellVal.caseName=Case Name\:
-ReportExcel.cellVal.caseNum=Case Number\:
-ReportExcel.cellVal.examiner=Examiner\:
-ReportExcel.cellVal.numImages=Number of Images\:
-ReportGenerationPanel.confDlg.sureToClose.msg=Are you sure you'd like to close the dialog?\nAll reports will be canceled.
-ReportGenerationPanel.confDlg.title.closing=Closing
-ReportGenerationPanel.confDlg.cancelReport.msg=Are you sure you'd like to cancel the report?
-ReportGenerator.displayProgress.title.text=Report Generation Progress...
-ReportGenerator.progress.queryingDb.text=Querying database...
-ReportGenerator.progress.processingFile.text=Now processing {0}
-ReportGenerator.artifactTable.taggedResults.text=Contains results that were tagged with one of the following\:
-ReportGenerator.progress.processing=Now processing {0}...
-ReportGenerator.msgShow.skippingArtType.title=Skipping artifact type {0} in reports
-ReportGenerator.msgShow.skippingArtType.msg=Unknown columns to report on
-ReportGenerator.makeContTagTab.taggedFiles.msg=Contains files that were tagged with one of the following\:
-ReportGenerator.makeBbArtTagTab.taggedRes.msg=This report only includes results tagged with\:
-ReportGenerator.tagTable.header.resultType=Result Type
-ReportGenerator.tagTable.header.tag=Tag
-ReportGenerator.tagTable.header.comment=Comment
-ReportGenerator.tagTable.header.srcFile=Source File
-ReportGenerator.progress.createdThumb.text=Creating thumbnails...
-ReportGenerator.htmlOutput.header.file=File
-ReportGenerator.htmlOutput.header.tag=Tag
-ReportGenerator.htmlOutput.header.comment=Comment
-ReportGenerator.htmlOutput.header.timeModified=Modified Time
-ReportGenerator.htmlOutput.header.timeChanged=Changed Time
-ReportGenerator.htmlOutput.header.timeAccessed=Accessed Time
-ReportGenerator.htmlOutput.header.timeCreated=Created Time
-ReportGenerator.htmlOutput.header.size=Size (Bytes)
-ReportGenerator.htmlOutput.header.hash=Hash
-ReportGenerator.thumbnailTable.name=Tagged Images
-ReportGenerator.thumbnailTable.desc=Contains thumbnails of images that are associated with tagged files and results.
-ReportGenerator.writeKwHits.userSrchs=User Searches
-ReportGenerator.progress.processingList=Now processing {0} ({1})...
-ReportGenerator.artTableColHdr.url=URL
-ReportGenerator.artTableColHdr.title=Title
-ReportGenerator.artTableColHdr.dateCreated=Date Created
-ReportGenerator.artTableColHdr.program=Program
-ReportGenerator.artTableColHdr.urlDomainDecoded=URL Domain
-ReportGenerator.artTableColHdr.srcFile=Source File
-ReportGenerator.artTableColHdr.dateTime=Date/Time
-ReportGenerator.artTableColHdr.name=Name
-ReportGenerator.artTableColHdr.value=Value
-ReportGenerator.artTableColHdr.dateAccessed=Date Accessed
-ReportGenerator.artTableColHdr.referrer=Referrer
-ReportGenerator.artTableColHdr.dest=Destination
-ReportGenerator.artTableColHdr.sourceUrl=Source URL
-ReportGenerator.artTableColHdr.path=Path
-ReportGenerator.artTableColHdr.progName=Program Name
-ReportGenerator.artTableColHdr.instDateTime=Install Date/Time
-ReportGenerator.artTableColHdr.preview=Preview
-ReportGenerator.artTableColHdr.file=File
-ReportGenerator.artTableColHdr.size=Size
-ReportGenerator.artTableColHdr.deviceId=Device ID
-ReportGenerator.artTableColHdr.text=Text
-ReportGenerator.artTableColHdr.domain=Domain
-ReportGenerator.artTableColHdr.dateTaken=Date Taken
-ReportGenerator.artTableColHdr.devManufacturer=Device Manufacturer
-ReportGenerator.artTableColHdr.devMake=Device Make
-ReportGenerator.artTableColHdr.devModel=Device Model
-ReportGenerator.artTableColHdr.latitude=Latitude
-ReportGenerator.artTableColHdr.longitude=Longitude
-ReportGenerator.artTableColHdr.latitudeStart=Starting Latitude
-ReportGenerator.artTableColHdr.longitudeStart=Starting Longitude
-ReportGenerator.artTableColHdr.latitudeEnd=Ending Latitude
-ReportGenerator.artTableColHdr.longitudeEnd=Ending Longitude
-ReportGenerator.artTableColHdr.associatedArtifact=Associated Artifact
-ReportGenerator.artTableColHdr.count=Count
-ReportGenerator.artTableColHdr.personName=Person Name
-ReportGenerator.artTableColHdr.phoneNumber=Phone Number
-ReportGenerator.artTableColHdr.phoneNumHome=Phone Number (Home)
-ReportGenerator.artTableColHdr.phoneNumOffice=Phone Number (Office)
-ReportGenerator.artTableColHdr.phoneNumMobile=Phone Number (Mobile)
-ReportGenerator.artTableColHdr.email=Email
-ReportGenerator.artTableColHdr.msgType=Message Type
-ReportGenerator.artTableColHdr.direction=Direction
-ReportGenerator.artTableColHdr.readStatus=Read Status
-ReportGenerator.artTableColHdr.fromPhoneNum=From Phone Number
-ReportGenerator.artTableColHdr.fromEmail=From Email
-ReportGenerator.artTableColHdr.toPhoneNum=To Phone Number
-ReportGenerator.artTableColHdr.toEmail=To Email
-ReportGenerator.artTableColHdr.subject=Subject
-ReportGenerator.artTableColHdr.tskEmailTo=E-Mail To
-ReportGenerator.artTableColHdr.tskEmailCc=E-Mail CC
-ReportGenerator.artTableColHdr.tskEmailBcc=E-Mail BCC
-ReportGenerator.artTableColHdr.tskEmailFrom=E-Mail From
-ReportGenerator.artTableColHdr.tskMsgId=Message ID
-ReportGenerator.artTableColHdr.tskDateTimeRcvd=Date Received
-ReportGenerator.artTableColHdr.tskDateTimeSent=Date Sent
-ReportGenerator.artTableColHdr.tskSubject=Subject
-ReportGenerator.artTableColHdr.tskSetName=Set Name
-ReportGenerator.artTableColHdr.tskInterestingFilesCategory=Rule
-ReportGenerator.artTableColHdr.tskGpsRouteCategory=Category
-ReportGenerator.artTableColHdr.tskPath=Path
-ReportGenerator.artTableColHdr.calendarEntryType=Calendar Entry Type
-ReportGenerator.artTableColHdr.description=Description
-ReportGenerator.artTableColHdr.startDateTime=Start Date/Time
-ReportGenerator.artTableColHdr.endDateTime=End Date/Time
-ReportGenerator.artTableColHdr.location=Location
-ReportGenerator.artTableColHdr.shortCut=Short Cut
-ReportGenerator.artTableColHdr.deviceName=Device Name
-ReportGenerator.artTableColHdr.deviceAddress=Device Address
-ReportGenerator.artTableColHdr.altitude=Altitude
-ReportGenerator.artTableColHdr.locationAddress=Location Address
-ReportGenerator.artTableColHdr.category=Category
-ReportGenerator.artTableColHdr.userId=User ID
-ReportGenerator.artTableColHdr.userName=User Name
-ReportGenerator.artTableColHdr.password=Password
-ReportGenerator.artTableColHdr.appName=App Name
-ReportGenerator.artTableColHdr.appPath=App Path
-ReportGenerator.artTableColHdr.replytoAddress=ReplyTo Address
-ReportGenerator.artTableColHdr.mailServer=Mail Server
-ReportGenerator.artTableColHdr.tags=Tags
-ReportGenerator.artTableColHdr.localPath=Local path
-ReportGenerator.artTableColHdr.remotePath=Remote path
-ReportGenerator.errors.reportErrorTitle=Error generating report
-ReportGenerator.errors.reportErrorText=Error generating report: 
-ReportHTML.addThumbRows.dataType.title=Tagged Images - {0}
-ReportHTML.addThumbRows.dataType.msg=Tagged Results and Contents that contain images.
-ReportHTML.thumbLink.tags=Tags\:
-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.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
-ReportHTML.writeSum.title=Case Summary
-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
-#
-ReportHTML.writeSum.reportGenOn.text=HTML Report Generated on {0}
-ReportHTML.writeSum.imageInfoHeading=<h2>Image Information\:</h2>
-ReportHTML.writeSum.softwareInfoHeading=<h2>Software Information\:</h2>
-ReportHTML.writeSum.ingestHistoryHeading=<h2>Ingest History\:</h2>
-ReportHTML.writeSum.modulesEnabledHeading=Enabled Modules\:
-ReportHTML.writeSum.autopsyVersion=Autopsy Version\:
-ReportHTML.writeSum.timezone=Timezone\:
-ReportHTML.writeSum.path=Path\:
-ReportProgressPanel.progress.queuing=Queuing...
-ReportProgressPanel.initPathLabel.noFile=<html><u>No report file</u></html>
-ReportProgressPanel.start.cancelButton.text=Cancel
-ReportProgressPanel.start.progress.text=Starting report...
-ReportProgressPanel.complete.processLbl.text=Complete
-ReportProgressPanel.complete.processLb2.text=Completed with error
-ReportProgressPanel.complete.cancelButton.text=Complete
-ReportProgressPanel.cancel.cancelButton.toolTipText=Canceled
-ReportProgressPanel.cancel.procLbl.text=Canceled
-ReportVisualPanel1.getName.text=Select and Configure Report Modules
-ReportVisualPanel2.getName.text=Configure Artifact Reports
-ReportWizardAction.actionName.text=Generate Report
-ReportWizardAction.reportWiz.title=Generate Report
-ReportWizardAction.toolBarButton.text=Generate Report
-ReportWizardFileOptionsPanel.finishButton.text=Finish
-ReportWizardFileOptionsVisualPanel.getName.text=Configure File Report
-ReportWizardPanel1.nextButton.text=Next >
-ReportWizardPanel1.finishButton.text=Finish
-ReportWizardPanel2.finishButton.text=Finish
-ReportWizardPanel2.nextButton.text=Next >
-ReportBodyFile.generateReport.srcModuleName.text=TSK Body File
-ReportExcel.endReport.srcModuleName.text=Excel Report
-ReportHTML.writeIndex.srcModuleName.text=HTML Report
-ReportKML.genReport.srcModuleName.text=Geospatial Data
-ReportKML.genReport.reportName=KML Report
-ReportGenerator.artTableColHdr.extension.text=Extension
-ReportGenerator.artTableColHdr.mimeType.text=MIME Type
-ReportGenerator.artTableColHdr.processorArchitecture.text=Processor Architecture
-ReportGenerator.artTableColHdr.osName.text=Operating System Name
-ReportGenerator.artTableColHdr.osInstallDate.text=Install Date
-ReportGenerator.errList.failedMakeRptFolder=Failed to make report folder, may be unable to generate reports.
-ReportGenerator.notifyErr.errsDuringRptGen=Errors during report generation\:
-ReportGenerator.errList.failedGetContentTags=Failed to get content tags.
-ReportGenerator.errList.failedGetBBArtifactTags=Failed to get blackboard artifact tags.
-ReportGenerator.errList.errGetContentFromBBArtifact=Error while getting content from a blackboard artifact to report on.
-ReportGenerator.errList.failedGetBBAttribs=Failed to get Blackboard Attributes when generating report.
-ReportGenerator.errList.failedGetBBArtifacts=Failed to get Blackboard Artifacts when generating report.
-ReportGenerator.errList.failedQueryKWLists=Failed to query keyword lists.
-ReportGenerator.errList.failedGetAbstractFileByID=Failed to get Abstract File by ID.
-ReportGenerator.errList.failedQueryKWs=Failed to query keywords.
-ReportGenerator.errList.failedQueryHashsetLists=Failed to query hashset lists.
-ReportGenerator.errList.failedGetAbstractFileFromID=Failed to get Abstract File from ID.
-ReportGenerator.errList.failedQueryHashsetHits=Failed to query hashsets hits.
-ReportGenerator.errList.coreExceptionWhileGenRptRow=Core exception while generating row data for artifact report.
-ReportKML.latLongStartPoint={0};{1};;{2} (Start)\n
-ReportKML.latLongEndPoint={0};{1};;{2} (End)\n
-ReportGenerationPanel.cancelButton.actionCommand=Cancel
-ReportGenerationPanel.cancelButton.text=Cancel
-ReportHTMLConfigurationPanel.headerTextField.text=
-ReportHTMLConfigurationPanel.footerTextField.text=
-ReportHTMLConfigurationPanel.headerLabel.text=Header:
-ReportHTMLConfigurationPanel.footerLabel.text=Footer:
-TableReportGenerator.StatusColumn.Header=Review Status
diff --git a/Core/src/org/sleuthkit/autopsy/report/taggedhashes/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/report/taggedhashes/Bundle.properties-MERGED
deleted file mode 100755
index fc867774348e791d4d8aa58dafc14bb595d65983..0000000000000000000000000000000000000000
--- a/Core/src/org/sleuthkit/autopsy/report/taggedhashes/Bundle.properties-MERGED
+++ /dev/null
@@ -1,9 +0,0 @@
-AddTaggedHashesToHashDb.error.noHashSetsSelected=No hash set selected for export.
-AddTaggedHashesToHashDb.error.noTagsSelected=No tags selected for export.
-HashDbConfigDialog.okButton.text=OK
-HashDbConfigDialog.cancelButton.text=Cancel
-AddTaggedHashesToHashDbConfigPanel.selectAllButton.text=Select All
-AddTaggedHashesToHashDbConfigPanel.jLabel2.text=Export to hash set:
-AddTaggedHashesToHashDbConfigPanel.configureHashDatabasesButton.text=Configure Hash Sets...
-AddTaggedHashesToHashDbConfigPanel.jLabel1.text=Export hashes of files tagged as:
-AddTaggedHashesToHashDbConfigPanel.deselectAllButton.text=Deselect All
diff --git a/Core/src/org/sleuthkit/autopsy/test/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/test/Bundle.properties-MERGED
deleted file mode 100755
index 07ddb416b931459e1bab96abcd9aefe69c2076a0..0000000000000000000000000000000000000000
--- a/Core/src/org/sleuthkit/autopsy/test/Bundle.properties-MERGED
+++ /dev/null
@@ -1,3 +0,0 @@
-CustomArtifactsCreatorDataSourceIngestModule.exceptionMessage.errorCreatingCustomType=Error creating custom artifact type.
-CustomArtifactsCreatorFileIngestModule.exceptionMessage.errorCreatingCustomType=Error creating custom artifact type.
-InterestingArtifactCreatorIngestModule.exceptionMessage.errorCreatingCustomType=Error creating custom artifact type.
diff --git a/Core/src/org/sleuthkit/autopsy/textextractors/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/textextractors/Bundle.properties-MERGED
deleted file mode 100755
index b2b9a6846dacb75452a1ab642733ab3f1eedcbdc..0000000000000000000000000000000000000000
--- a/Core/src/org/sleuthkit/autopsy/textextractors/Bundle.properties-MERGED
+++ /dev/null
@@ -1,2 +0,0 @@
-AbstractFileTikaTextExtract.index.tikaParseTimeout.text=Exception\: Tika parse timeout for content\: {0}, {1}
-AbstractFileTikaTextExtract.index.exception.tikaParse.msg=Exception\: Unexpected exception from Tika parse task execution for file\: {0}, {1}
\ No newline at end of file
diff --git a/Core/src/org/sleuthkit/autopsy/timeline/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/timeline/Bundle.properties-MERGED
deleted file mode 100755
index a495fd5daf6f7474b16cf87aa929c07b93e315dd..0000000000000000000000000000000000000000
--- a/Core/src/org/sleuthkit/autopsy/timeline/Bundle.properties-MERGED
+++ /dev/null
@@ -1,66 +0,0 @@
-CTL_MakeTimeline=Timeline
-CTL_TimeLineTopComponentAction=TimeLineTopComponent
-CTL_TimeLineTopComponent=Timeline
-
-OpenTimelineAction.displayName=Timeline
-OpenTimeLineAction.msgdlg.text=Could not create timeline, there are no data sources.
-OpenTimelineAction.settingsErrorMessage=Failed to initialize timeline settings.
-PrompDialogManager.buttonType.continueNoUpdate=Continue Without Updating
-PrompDialogManager.buttonType.showTimeline=Continue
-PrompDialogManager.buttonType.update=Update DB
-PromptDialogManager.confirmDuringIngest.contentText=Do you want to continue?
-PromptDialogManager.confirmDuringIngest.headerText=You are trying to update the Timeline DB before ingest has been completed.  The Timeline DB may be incomplete.
-PromptDialogManager.progressDialog.title=Populating Timeline Data
-PromptDialogManager.rebuildPrompt.details=Details
-PromptDialogManager.rebuildPrompt.headerText=The Timeline DB is incomplete and/or out of date.  Some events may be missing or inaccurate and some features may be unavailable.
-PromptDialogManager.showTimeLineDisabledMessage.contentText=Timeline functionality is not available yet.  Timeline will be disabled. 
-PromptDialogManager.showTimeLineDisabledMessage.headerText=
-PromptDialogManager.showTooManyFiles.contentText=There are too many files in the DB to ensure reasonable performance.  Timeline will be disabled. 
-PromptDialogManager.showTooManyFiles.headerText=
-ShowInTimelineDialog.amountValidator.message=The entered amount must only contain digits.
-ShowInTimelineDialog.artifactTitle=View Result in Timeline.
-ShowInTimelineDialog.eventSelectionValidator.message=You must select an event.
-# {0} - file path
-ShowInTimelineDialog.fileTitle=View {0} in timeline.
-ShowInTimelineDialog.showTimelineButtonType.text=Show Timeline
-Timeline.dialogs.title=\ Timeline
-Timeline.frameName.text={0} - Autopsy Timeline
-Timeline.resultsPanel.title=Timeline Results
-Timeline.runJavaFxThread.progress.creating=Creating timeline . . .
-Timeline.zoomOutButton.text=Zoom Out
-Timeline.goToButton.text=Go To\:
-Timeline.yearBarChart.x.years=Years
-Timeline.resultPanel.loading=Loading...
-
-TimeLineController.errorTitle=Timeline error.
-TimeLineController.outOfDate.errorMessage=Error determing if the timeline is out of date.  We will assume it should be updated.  See the logs for more details.
-TimeLineController.rebuildReasons.incompleteOldSchema=The Timeline events database was previously populated without incomplete information:  Some features may be unavailable or non-functional unless you update the events database.
-TimeLineController.rebuildReasons.ingestWasRunning=The Timeline events database was previously populated while ingest was running:  Some events may be missing, incomplete, or inaccurate.
-TimeLineController.rebuildReasons.outOfDate=The event data is out of date:  Not all events will be visible.
-TimeLineController.rebuildReasons.outOfDateError=Could not determine if the timeline data is out of date.
-TimeLineController.setEventsDBStale.errMsgNotStale=Failed to mark the timeline db as not stale. Some results may be out of date or missing.
-TimeLineController.setEventsDBStale.errMsgStale=Failed to mark the timeline db as stale. Some results may be out of date or missing.
-TimeLinecontroller.setIngestRunning.errMsgNotRunning=Failed to mark the timeline db as populated while ingest was not running. Some results may be out of date or missing.
-TimeLineController.setIngestRunning.errMsgRunning=Failed to mark the timeline db as populated while ingest was running. Some results may be out of date or missing.
-TimeLinecontroller.updateNowQuestion=Do you want to update the events database now?
-TimelineFrame.title=Timeline
-TimelinePanel.jButton1.text=6m
-TimelinePanel.jButton13.text=all
-TimelinePanel.jButton10.text=1h
-TimelinePanel.jButton9.text=12h
-TimelinePanel.jButton11.text=5y
-TimelinePanel.jButton12.text=10y
-TimelinePanel.jButton6.text=1w
-TimelinePanel.jButton5.text=1y
-TimelinePanel.jButton8.text=1d
-TimelinePanel.jButton7.text=3d
-TimelinePanel.jButton2.text=1m
-TimelinePanel.jButton3.text=3m
-TimelinePanel.jButton4.text=2w
-ProgressWindow.progressHeader.text=\ 
-# {0} - start of date range
-# {1} - end of date range
-TimeLineResultView.startDateToEndDate.text={0} to {1}
-TimeLineTopComponent.eventsTab.name=Events
-TimeLineTopComponent.filterTab.name=Filters
-TimelineTopComponent.selectedEventListener.errorMsg=There was a problem getting the content for the selected event.
diff --git a/Core/src/org/sleuthkit/autopsy/timeline/actions/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/timeline/actions/Bundle.properties-MERGED
deleted file mode 100755
index a5bc89bf6ff6245eeb7b3a97858e80e0b64443d1..0000000000000000000000000000000000000000
--- a/Core/src/org/sleuthkit/autopsy/timeline/actions/Bundle.properties-MERGED
+++ /dev/null
@@ -1,39 +0,0 @@
-# {0} - action accelerator keys 
-Back.longText=Back: {0}\nGo back to the last view settings.
-Back.text=Back
-# {0} - action accelerator keys 
-Forward.longText=Forward: {0}\nGo forward to the next view settings.
-Forward.text=Forward
-OpenReportAction.DisplayName=Open Report
-OpenReportAction.MessageBoxTitle=Open Report Failure
-OpenReportAction.MissingReportFileMessage=The report file no longer exists.
-OpenReportAction.NoAssociatedEditorMessage=There is no associated editor for reports of this type or the associated application failed to launch.
-OpenReportAction.NoOpenInEditorSupportMessage=This platform (operating system) does not support opening a file in an editor this way.
-OpenReportAction.ReportFileOpenPermissionDeniedMessage=Permission to open the report file was denied.
-RebuildDataBase.longText=Update the DB to include new events.
-RebuildDataBase.text=Update DB
-ResetFilters.text=Reset all filters
-RestFilters.longText=Reset all filters to their default state.
-SaveSnapShotAsReport.action.dialogs.title=Timeline
-SaveSnapShotAsReport.action.longText=Save a screen capture of the current view of the timeline as a report.
-SaveSnapShotAsReport.action.name.text=Snapshot Report
-SaveSnapShotAsReport.duplicateReportNameError.text=A report with that name already exists.
-# {0} - report path
-SaveSnapShotAsReport.ErrorWritingReport=Error writing report to disk at {0}.
-SaveSnapShotAsReport.FailedToAddReport=Failed to add snaphot to case as a report.
-SaveSnapShotAsReport.reportName.header=Enter a report name for the Timeline Snapshot Report.
-# {0} - generated default report name
-SaveSnapShotAsReport.reportName.prompt=leave empty for default report name: {0}.
-# {0} - report file path
-SaveSnapShotAsReport.ReportSavedAt=Report saved at [{0}]
-SaveSnapShotAsReport.Success=Success
-Timeline.ModuleName=Timeline
-ViewArtifactInTimelineAction.displayName=View Result in Timeline... 
-ViewFileInTimelineAction.viewFile.displayName=View File in Timeline... 
-ViewFileInTimelineAction.viewSourceFile.displayName=View Source File in Timeline... 
-ZoomIn.action.text=Zoom in
-ZoomIn.longText=Zoom in to view about half as much time.
-ZoomOut.action.text=Zoom out
-ZoomOut.longText=Zoom out to view about 50% more time.
-ZoomToEvents.action.text=Zoom to events
-ZoomToEvents.longText=Zoom out to show the nearest events.
diff --git a/Core/src/org/sleuthkit/autopsy/timeline/datamodel/eventtype/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/timeline/datamodel/eventtype/Bundle.properties-MERGED
deleted file mode 100755
index bac872cf02650bab5e1987dc4223d63cd181da02..0000000000000000000000000000000000000000
--- a/Core/src/org/sleuthkit/autopsy/timeline/datamodel/eventtype/Bundle.properties-MERGED
+++ /dev/null
@@ -1,22 +0,0 @@
-BaseTypes.fileSystem.name=File System
-BaseTypes.webActivity.name=Web Activity
-BaseTypes.miscTypes.name=Misc Types
-FileSystemTypes.fileModified.name=File Modified
-FileSystemTypes.fileAccessed.name=File Accessed
-FileSystemTypes.fileCreated.name=File Created
-FileSystemTypes.fileChanged.name=File Changed
-MiscTypes.message.name=Messages
-MiscTypes.GPSRoutes.name=GPS Routes
-MiscTypes.GPSTrackpoint.name=Location History
-MiscTypes.Calls.name=Calls
-MiscTypes.Email.name=Email
-MiscTypes.recentDocuments.name=Recent Documents
-MiscTypes.installedPrograms.name=Installed Programs
-MiscTypes.exif.name=Exif
-MiscTypes.devicesAttached.name=Devices Attached
-RootEventType.eventTypes.name=Event Types
-WebTypes.webDownloads.name=Web Downloads
-WebTypes.webCookies.name=Web Cookies
-WebTypes.webBookmarks.name=Web Bookmarks
-WebTypes.webHistory.name=Web History
-WebTypes.webSearch.name=Web Searches
\ No newline at end of file
diff --git a/Core/src/org/sleuthkit/autopsy/timeline/db/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/timeline/db/Bundle.properties-MERGED
deleted file mode 100755
index 01ff596e19110948dadd252f9867cf999b77f8dd..0000000000000000000000000000000000000000
--- a/Core/src/org/sleuthkit/autopsy/timeline/db/Bundle.properties-MERGED
+++ /dev/null
@@ -1,8 +0,0 @@
-msgdlg.problem.text=There was a problem populating the timeline.  Not all events may be present or accurate.
-progressWindow.msg.commitingDb=Committing events database
-progressWindow.msg.gatheringData=Gathering event data
-progressWindow.msg.populateMacEventsFiles=Populating MAC time events for files
-progressWindow.msg.refreshingFileTags=Refreshing file tags
-progressWindow.msg.refreshingResultTags=Refreshing result tags
-# {0} - event type 
-progressWindow.populatingXevents=Populating {0} events
diff --git a/Core/src/org/sleuthkit/autopsy/timeline/explorernodes/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/timeline/explorernodes/Bundle.properties-MERGED
deleted file mode 100755
index 87878e6400180732580570b393736c0b1dcfadf5..0000000000000000000000000000000000000000
--- a/Core/src/org/sleuthkit/autopsy/timeline/explorernodes/Bundle.properties-MERGED
+++ /dev/null
@@ -1,11 +0,0 @@
-EventNode.getAction.errorTitle=Error getting actions
-EventNode.getAction.linkedFileMessage=There was a problem getting actions for the selected result.  The 'View File in Timeline' action will not be available.
-# {0} - maximum number of events to display
-# {1} - the number of events that is too many
-EventRoodNode.tooManyNode.displayName=Too many events to display.  Maximum = {0}. But there are {1} to display.
-NodeProperty.displayName.baseType=Base Type
-NodeProperty.displayName.dateTime=Date/Time
-NodeProperty.displayName.description=Description
-NodeProperty.displayName.icon=Icon
-NodeProperty.displayName.known=Known
-NodeProperty.displayName.subType=Sub Type
diff --git a/Core/src/org/sleuthkit/autopsy/timeline/filters/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/timeline/filters/Bundle.properties-MERGED
deleted file mode 100755
index d62fb3444484e90aaac13d542a7193b197511727..0000000000000000000000000000000000000000
--- a/Core/src/org/sleuthkit/autopsy/timeline/filters/Bundle.properties-MERGED
+++ /dev/null
@@ -1,10 +0,0 @@
-DataSourcesFilter.displayName.text=Data Source
-DescriptionFilter.mode.exclude=Exclude
-DescriptionFilter.mode.include=Include
-hashHitsFilter.displayName.text=Hash Sets
-hideKnownFilter.displayName.text=Hide Known Files
-# {0} - sub filter displaynames
-IntersectionFilter.displayName.text=Intersection{0}
-tagsFilter.displayName.text=Tags
-TextFilter.displayName.text=Text Filter
-TypeFilter.displayName.text=Event Type
diff --git a/Core/src/org/sleuthkit/autopsy/timeline/ui/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/timeline/ui/Bundle.properties-MERGED
deleted file mode 100755
index 3255e82f2b77d07e3772207e302671390daf4801..0000000000000000000000000000000000000000
--- a/Core/src/org/sleuthkit/autopsy/timeline/ui/Bundle.properties-MERGED
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Autopsy Forensic Browser
- *
- * Copyright 2013-15 Basis Technology Corp.
- * Contact: carrier <at> sleuthkit <dot> org
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-AbstractTimelineChart.defaultTooltip.text=Drag the mouse to select a time interval to zoom into.\nRight-click for more actions.
-HistoryToolBar.historyLabel.text=History
-IntervalSelector.ClearSelectedIntervalAction.tooltTipText=Clear Selected Interval
-IntervalSelector.ZoomAction.name=Zoom
-NoEventsDialog.titledPane.text=No Visible Events
-Timeline.node.root=Root
-# {0} - start timestamp
-# {1} - end timestamp
-Timeline.ui.TimeLineChart.tooltip.text=Double-click to zoom into range:\n{0} to {1}.\n\nRight-click to close.
-Timeline.ui.ZoomRanges.onemin.text=One Minute
-Timeline.ui.ZoomRanges.fifteenmin.text=Fifteen Minutes
-Timeline.ui.ZoomRanges.onehour.text=One Hour
-Timeline.ui.ZoomRanges.sixhours.text=Six Hours
-Timeline.ui.ZoomRanges.twelvehours.text=Twelve Hours
-Timeline.ui.ZoomRanges.oneday.text=One Day
-Timeline.ui.ZoomRanges.threedays.text=Three Days
-Timeline.ui.ZoomRanges.oneweek.text=One Week
-Timeline.ui.ZoomRanges.twoweeks.text=Two Weeks
-Timeline.ui.ZoomRanges.onemonth.text=One Month
-Timeline.ui.ZoomRanges.threemonths.text=Three Months
-Timeline.ui.ZoomRanges.sixmonths.text=Six Months
-Timeline.ui.ZoomRanges.oneyear.text=One Year
-Timeline.ui.ZoomRanges.threeyears.text=Three Years
-Timeline.ui.ZoomRanges.fiveyears.text=Five Years
-Timeline.ui.ZoomRanges.tenyears.text=Ten Years
-Timeline.ui.ZoomRanges.all.text=All
-TimeLineChart.zoomHistoryActionGroup.name=Zoom History
-TimeZonePanel.title=Display Times In:
-ViewFrame.countsToggle.text=Counts
-ViewFrame.detailsToggle.text=Details
-ViewFrame.endLabel.text=End:
-ViewFrame.histogramTask.preparing=Preparing
-ViewFrame.histogramTask.queryDb=Querying FB
-ViewFrame.histogramTask.resetUI=Resetting UI
-ViewFrame.histogramTask.title=Rebuilding Histogram
-ViewFrame.histogramTask.updateUI2=Updating UI
-ViewFrame.listToggle.text=List
-ViewFrame.noEventsDialogLabel.text=There are no events visible with the current zoom / filter settings.
-# {0} - datasource name
-ViewFrame.notification.analysisComplete=Analysis has finished for {0}.  The Timeline DB may be out of date.
-# {0} - datasource name
-ViewFrame.notification.newDataSource={0} has been added as a new datasource.  The Timeline DB may be out of date.
-ViewFrame.refresh.longText=Refresh the view to include information that is in the DB but not displayed, such as newly updated tags.
-ViewFrame.refresh.text=Refresh View
-ViewFrame.startLabel.text=Start:
-ViewFrame.tagsAddedOrDeleted=Tags have been created and/or deleted.  The view may not be up to date.
-ViewFrame.viewModeLabel.text=View Mode:
-ViewFrame.zoomButton.text=Zoom to events
-TimeZonePanel.localRadio.text=Local Time Zone
-TimeZonePanel.otherRadio.text=GMT / UTC
-ViewFrame.resetFiltersButton.text=Reset all filters
-ViewFrame.zoomMenuButton.text=Zoom in/out to
-ViewRefreshTask.preparing=Analyzing zoom and filter settings
diff --git a/Core/src/org/sleuthkit/autopsy/timeline/ui/countsview/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/timeline/ui/countsview/Bundle.properties-MERGED
deleted file mode 100755
index a4d4849c505c7423d7351d1e62231de6561e96eb..0000000000000000000000000000000000000000
--- a/Core/src/org/sleuthkit/autopsy/timeline/ui/countsview/Bundle.properties-MERGED
+++ /dev/null
@@ -1,25 +0,0 @@
-CountsViewPane.detailSwitchMessage=There is no temporal resolution smaller than Seconds.\nWould you like to switch to the Details view instead?
-CountsViewPane.detailSwitchTitle="Switch to Details View?
-CountsViewPane.linearRadio.text=Linear
-CountsViewPane.loggedTask.name=Updating Counts View
-CountsViewPane.loggedTask.updatingCounts=Populating view
-CountsViewPane.logRadio.text=Logarithmic
-# {0} - scale name
-CountsViewPane.numberOfEvents=Number of Events ({0})
-CountsViewPane.scaleHelp.label.text=Scales:   
-CountsViewPane.scaleHelpLinear=The linear scale is good for many use cases.  When this scale is selected, the height of the bars represents the counts in a linear, one-to-one fashion, and the y-axis is labeled with values. When the range of values is very large, time periods with low counts may have a bar that is too small to see.  To help the user detect this, the labels for date ranges with events are bold.  To see bars that are too small, there are three options:  adjust the window size so that the timeline has more vertical space, adjust the time range shown so that time periods with larger bars are excluded, or adjust the scale setting to logarithmic.
-CountsViewPane.scaleHelpLog=The logarithmic scale represents the number of events in a non-linear way that compresses the difference between large and small numbers. Note that even with the logarithmic scale, an extremely large difference in counts may still produce bars too small to see.  In this case the only option may be to filter events to reduce the difference in counts.  NOTE: Because the logarithmic scale is applied to each event type separately, the meaning of the height of the combined bar is not intuitive, and to emphasize this, no labels are shown on the y-axis with the logarithmic scale. The logarithmic scale should be used to quickly compare the counts 
-CountsViewPane.scaleHelpLog2=across time within a type, or across types for one time period, but not both.
-CountsViewPane.scaleHelpLog3=\ The actual counts (available in tooltips or the result viewer) should be used for absolute comparisons.  Use the logarithmic scale with care.
-CountsViewPane.scaleLabel.text=Scale:
-# {0} - count
-# {1} - event type displayname
-# {2} - start date time
-# {3} - end date time
-CountsViewPane.tooltip.text={0} {1} events\nbetween {2}\nand     {3}
-ScaleType.Linear=Linear
-ScaleType.Logarithmic=Logarithmic
-Timeline.ui.countsview.menuItem.selectEventType=Select Event Type
-Timeline.ui.countsview.menuItem.selectTimeandType=Select Time and Type
-Timeline.ui.countsview.menuItem.selectTimeRange=Select Time Range
-Timeline.ui.countsview.menuItem.zoomIntoTimeRange=Zoom into Time Range
diff --git a/Core/src/org/sleuthkit/autopsy/timeline/ui/detailview/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/timeline/ui/detailview/Bundle.properties-MERGED
deleted file mode 100755
index 8032d93d1c726751034016d06f393c500fec7baf..0000000000000000000000000000000000000000
--- a/Core/src/org/sleuthkit/autopsy/timeline/ui/detailview/Bundle.properties-MERGED
+++ /dev/null
@@ -1,40 +0,0 @@
-CollapseClusterAction.text=Collapse
-DetailViewPane.advancedLayoutOptionsButtonLabel.text=Advanced Layout Options
-DetailViewPane.bandByTypeBox.text=Band by Type
-DetailViewPane.countsRadio.text=Show Counts Only
-DetailViewPane.hiddenRadio.text=Hide Description
-DetailViewPane.loggedTask.backButton=Back (Cancel)
-DetailViewPane.loggedTask.continueButton=Continue
-DetailViewPane.loggedTask.name=Updating Details View
-# {0} - number of events
-DetailViewPane.loggedTask.prompt=You are about to show details for {0} events.  This might be very slow and could exhaust available memory.\n\nDo you want to continue?
-DetailViewPane.loggedTask.queryDb=Retrieving event data
-DetailViewPane.loggedTask.updateUI=Populating view
-DetailViewPane.oneEventPerRowBox.text=One Per Row
-DetailViewPane.pinnedLaneLabel.text=Pinned Events
-DetailViewPane.primaryLaneLabel.text=All Events (Filtered)
-DetailViewPane.showRadio.text=Show Full Description
-DetailViewPane.truncateAllBox.text=Truncate Descriptions
-DetailViewPane.truncateSliderLabel.text=max description width (px):
-EventBundleNodeBase.toolTip.loading=loading...
-EventClusterNode.loggedTask.name=Load sub events
-# {0} - hash set count string
-EventNodeBase.toolTip.hashSetHits=\n\nHash Set Hits\n{0}
-EventNodeBase.toolTip.loading2=loading tooltip
-# {0} - tag count string
-EventNodeBase.toolTip.tags=\n\nTags\n{0}
-# {0} - counts
-# {1} - event type
-# {2} - description
-# {3} - start date/time
-# {4} - end date/time
-EventNodeBase.tooltip.text={0} {1} events\n{2}\nbetween\t{3}\nand   \t{4}
-ExpandClusterAction.text=Expand
-# {0} - date/time at guideline position
-GuideLine.tooltip.text={0}\nRight-click to remove.\nDrag to reposition.
-HideDescriptionAction.displayMsg=Hide this group from the details view.
-HideDescriptionAction.displayName=Hide
-PinEventAction.text=Pin
-PlaceMArkerAction.name=Place Marker
-UnhideDescriptionAction.displayName=Unhide
-UnPinEventAction.text=Unpin
diff --git a/Core/src/org/sleuthkit/autopsy/timeline/ui/detailview/tree/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/timeline/ui/detailview/tree/Bundle.properties-MERGED
deleted file mode 100755
index 78ee1c62f563a7e9c40c8516907c15cf331e233b..0000000000000000000000000000000000000000
--- a/Core/src/org/sleuthkit/autopsy/timeline/ui/detailview/tree/Bundle.properties-MERGED
+++ /dev/null
@@ -1,4 +0,0 @@
-EventsTree.Label.text=Sort By:
-TreeComparator.Count.displayName=Count
-TreeComparator.Description.displayName=Description
-TreeComparator.Type.displayName=Type
diff --git a/Core/src/org/sleuthkit/autopsy/timeline/ui/filtering/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/timeline/ui/filtering/Bundle.properties-MERGED
deleted file mode 100755
index 149c2da610cc059b93bd097bb4f8bf0cf838400a..0000000000000000000000000000000000000000
--- a/Core/src/org/sleuthkit/autopsy/timeline/ui/filtering/Bundle.properties-MERGED
+++ /dev/null
@@ -1,12 +0,0 @@
-FilsetSetPanel.hiddenDescriptionsPane.displayName=Hidden Descriptions
-FilterSetPanel.applyButton.longText=(Re)Apply filters
-FilterSetPanel.applyButton.text=Apply
-FilterSetPanel.defaultButton.text=Default
-FilterSetPanel.hiddenDescriptionsListView.remove=Remove from list
-FilterSetPanel.hiddenDescriptionsListView.unhideAndRemove=Unhide and remove from list
-Timeline.ui.filtering.menuItem.all=all
-Timeline.ui.filtering.menuItem.none=none
-Timeline.ui.filtering.menuItem.only=only
-Timeline.ui.filtering.menuItem.others=others
-Timeline.ui.filtering.menuItem.select=select
-Timeline.ui.filtering.promptText=enter filter string
diff --git a/Core/src/org/sleuthkit/autopsy/timeline/ui/listvew/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/timeline/ui/listvew/Bundle.properties-MERGED
deleted file mode 100755
index 6153fc693434206460405643024f9896b11c50a8..0000000000000000000000000000000000000000
--- a/Core/src/org/sleuthkit/autopsy/timeline/ui/listvew/Bundle.properties-MERGED
+++ /dev/null
@@ -1,16 +0,0 @@
-ListChart.errorMsg=There was a problem getting the content for the selected event.
-# {0} - the number of events
-ListTimeline.eventCountLabel.text={0} events
-ListTimeline.hashHitTooltip.error=There was a problem getting the hash set names for the selected event.
-# {0} - hash set names
-ListTimeline.hashHitTooltip.text=Hash Sets:\n{0}
-ListTimeline.taggedTooltip.error=There was a problem getting the tag names for the selected event.
-# {0} - tag names
-ListTimeline.taggedTooltip.text=Tags:\n{0}
-ListView.EventTypeCell.accessedTooltip=File Accessed ( A )
-ListView.EventTypeCell.changedTooltip=File Changed ( C )
-ListView.EventTypeCell.createdTooltip=File Created ( B, for Born )
-ListView.EventTypeCell.modifiedTooltip=File Modified ( M )
-ListViewPane.loggedTask.name=Updating List View
-ListViewPane.loggedTask.queryDb=Retrieving event data
-ListViewPane.loggedTask.updateUI=Populating view
diff --git a/Core/src/org/sleuthkit/autopsy/timeline/zooming/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/timeline/zooming/Bundle.properties-MERGED
deleted file mode 100755
index 326eba789bcc6f82d793c4eb708b50de976777c9..0000000000000000000000000000000000000000
--- a/Core/src/org/sleuthkit/autopsy/timeline/zooming/Bundle.properties-MERGED
+++ /dev/null
@@ -1,11 +0,0 @@
-DescriptionLOD.short=Short
-DescriptionLOD.medium=Medium
-DescriptionLOD.full=Full
-
-EventTypeZoomLevel.baseType=Base Type
-EventTypeZoomLevel.rootType=Root Type
-EventTypeZoomLevel.subType=Sub Type
-ZoomSettingsPane.descrLODLabel.text=Description Detail:
-ZoomSettingsPane.timeUnitLabel.text=Time Units:
-ZoomSettingsPane.typeZoomLabel.text=Event Type:
-ZoomSettingsPane.zoomLabel.text=Zoom
diff --git a/Experimental/build.xml b/Experimental/build.xml
index 015cbf0585c3c0b969206c35207dfe3e4bf080fc..3264616a392f17e707cb99bfc96e27736328763e 100644
--- a/Experimental/build.xml
+++ b/Experimental/build.xml
@@ -32,20 +32,4 @@
         out-of-date/unneeded stuff in the installer-->
         <delete dir="${basedir}/release"/>
     </target>
-    
-    <target name="compile" depends="projectized-common.compile">
-        <antcall target="copy-bundle" />
-    </target>
-
-    <target name="copy-bundle">
-        <!-- the externalized strings in 'src' are in both the java files as annotations and in the Bundle.property files.
-          The strings get merged during compilation.  This target copies that merged file into src so that it can be checked
-          in and used as a basis for translation efforts -->
-        <copy todir="src">
-            <fileset dir="build/classes">
-                <include name="**/Bundle.properties"/>
-            </fileset>
-            <globmapper from="*" to="*-MERGED"/>
-        </copy>
-    </target>
 </project>
diff --git a/Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/Bundle.properties-MERGED b/Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/Bundle.properties-MERGED
deleted file mode 100755
index d2d665c8d4444a32100af0392e6305037f3f78f7..0000000000000000000000000000000000000000
--- a/Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/Bundle.properties-MERGED
+++ /dev/null
@@ -1,409 +0,0 @@
-AinStatusDashboardTopComponent.exceptionMessage.failedToCreateDashboard=Failed to create Auto Ingest Node Status Dashboard.
-AinStatusNode.hostName.title=Host Name
-AinStatusNode.status.pausedByUser=Paused By User
-AinStatusNode.status.pausedForError=Paused Due to System Error
-AinStatusNode.status.pauseRequested=Pause Requested
-AinStatusNode.status.running=Running
-AinStatusNode.status.shuttingdown=Shutting Down
-AinStatusNode.status.startingup=Starting Up
-AinStatusNode.status.title=Status
-AinStatusNode.status.unknown=Unknown
-ArchiveDSP.dsType.text=Archive file
-ArchiveFilePanel.moduleErr=Module Error
-ArchiveFilePanel.moduleErr.msg=A module caused an error listening to ArchiveFilePanel updates. See log to determine which module. Some data could be incomplete.\n
-AutoIngestAdminActions.cancelJobAction.title=Cancel Job
-AutoIngestAdminActions.cancelModuleAction.title=Cancel Module
-AutoIngestAdminActions.deleteCaseAction.error=Failed to delete case.
-AutoIngestAdminActions.deleteCaseAction.title=Delete Case
-AutoIngestAdminActions.pause.title=Pause Node
-AutoIngestAdminActions.progressDialogAction.title=Ingest Progress
-AutoIngestAdminActions.reprocessJobAction.error=Failed to reprocess job
-AutoIngestAdminActions.reprocessJobAction.title=Reprocess Job
-AutoIngestAdminActions.resume.title=Resume Node
-AutoIngestAdminActions.showCaseLogAction.title=Show Case Log
-AutoIngestAdminActions.showCaseLogActionDialog.cannotFindLog=Unable to find the selected case log file
-AutoIngestAdminActions.showCaseLogActionDialog.ok=Okay
-AutoIngestAdminActions.showCaseLogActionDialog.unableToShowLogFile=Unable to show log file
-AutoIngestAdminActions.showCaseLogActionFailed.message=Case log file does not exist
-AutoIngestAdminActions.showCaseLogActionFailed.title=Unable to display case log
-AutoIngestAdminActions.shutdown.Cancel=Cancel
-AutoIngestAdminActions.shutdown.consequences=This will cancel any currently running job on this host. Exiting while a job is running potentially leaves the case in an inconsistent or corrupted state.
-AutoIngestAdminActions.shutdown.OK=OK
-AutoIngestAdminActions.shutdown.title=Shutdown Node
-AutoIngestControlPanel.AutoIngestStartupError=Failed to start automated ingest. Verify Multi-user Settings.
-AutoIngestControlPanel.AutoIngestStartupFailed.Message=Failed to start automated ingest.\nPlease see auto ingest system log for details.
-AutoIngestControlPanel.AutoIngestStartupFailed.Title=Automated Ingest Error
-AutoIngestControlPanel.AutoIngestStartupWarning.Message=Failed to establish remote communications with other automated ingest nodes.\nAuto ingest dashboard will only be able to display local ingest job events.\nPlease verify Multi-User settings (Options->Multi-User). See application log for details.
-AutoIngestControlPanel.AutoIngestStartupWarning.Title=Automated Ingest Warning
-AutoIngestControlPanel.bnCancelJob.toolTipText=Cancel processing of the current Job and move on to the next Job. This functionality is only available for jobs running on current AIM node.
-AutoIngestControlPanel.bnCancelModule.toolTipText=Cancel processing of the current module within the Job and move on to the next module within the Job. This functionality is only available for jobs running on current AIM node.
-AutoIngestControlPanel.bnDeleteCase.toolTipText=Delete the selected Case in its entirety
-AutoIngestControlPanel.bnExit.toolTipText=Exit Application
-AutoIngestControlPanel.bnOptions.toolTipText=Display options panel. All processing must be paused to open the options panel.
-AutoIngestControlPanel.bnPause.confirmHeader=Are you sure you want to pause?
-AutoIngestControlPanel.bnPause.paused=Paused
-AutoIngestControlPanel.bnPause.pausing=Pausing after current job completes...
-AutoIngestControlPanel.bnPause.running=Running
-AutoIngestControlPanel.bnPause.toolTipText=Suspend processing of Pending Jobs
-AutoIngestControlPanel.bnPause.toolTipTextResume=Resume processing of Pending Jobs
-AutoIngestControlPanel.bnPause.warningText=Pause will occur after the current job completes processing. This could take a long time. Continue?
-AutoIngestControlPanel.bnRefresh.toolTipText=Refresh displayed tables
-AutoIngestControlPanel.bnResume.text=Resume
-AutoIngestControlPanel.bnShowCaseLog.toolTipText=Display case log file for selected case
-AutoIngestControlPanel.bnShowProgress.toolTipText=Show the progress of the currently running Job. This functionality is only available for jobs running on current AIM node.
-AutoIngestControlPanel.bnStart.startMessage=Waiting to start
-AutoIngestControlPanel.bnStart.text=Start
-AutoIngestControlPanel.bnStart.toolTipText=Start processing auto ingest jobs
-AutoIngestControlPanel.Cancel=Cancel
-AutoIngestControlPanel.Cancelling=Cancelling...
-AutoIngestControlPanel.completedTable.toolTipText=The Completed table shows all Jobs that have been processed already
-AutoIngestControlPanel.ConfigLocked=The shared configuration directory is locked because upload from another node is in progress. \nIf this is an error, you can unlock the directory and then retry the upload.
-AutoIngestControlPanel.ConfigLockedTitle=Configuration directory locked
-AutoIngestControlPanel.DeletionFailed=Deletion failed for job
-AutoIngestControlPanel.EnableConfigurationSettings=Enable shared configuration from the options panel before uploading
-AutoIngestControlPanel.errorMessage.caseDeprioritization=An error occurred when deprioritizing the case. Some or all jobs may not have been deprioritized.
-AutoIngestControlPanel.errorMessage.casePrioritization=An error occurred when prioritizing the case. Some or all jobs may not have been prioritized.
-AutoIngestControlPanel.errorMessage.jobDeprioritization=An error occurred when deprioritizing the job.
-AutoIngestControlPanel.errorMessage.jobPrioritization=An error occurred when prioritizing the job.
-AutoIngestControlPanel.ErrorUploadingConfiguration=Error uploading configuration
-AutoIngestControlPanel.ExitConsequences=This will cancel any currently running job on this host. Exiting while a job is running potentially leaves the case in an inconsistent or corrupted state.
-AutoIngestControlPanel.ExitingStatus=Exiting...
-AutoIngestControlPanel.JobsTableModel.ColumnHeader.Case=Case
-AutoIngestControlPanel.JobsTableModel.ColumnHeader.CaseFolder=Case Folder
-AutoIngestControlPanel.JobsTableModel.ColumnHeader.CompletedTime=Job Completed
-AutoIngestControlPanel.JobsTableModel.ColumnHeader.CreatedTime=Job Created
-AutoIngestControlPanel.JobsTableModel.ColumnHeader.HostName=Host Name
-AutoIngestControlPanel.JobsTableModel.ColumnHeader.ImageFolder=Data Source
-AutoIngestControlPanel.JobsTableModel.ColumnHeader.LocalJob=\ Local Job?
-AutoIngestControlPanel.JobsTableModel.ColumnHeader.ManifestFilePath=\ Manifest File Path
-AutoIngestControlPanel.JobsTableModel.ColumnHeader.Priority=Prioritized
-AutoIngestControlPanel.JobsTableModel.ColumnHeader.Stage=Stage
-AutoIngestControlPanel.JobsTableModel.ColumnHeader.StageTime=Time in Stage
-AutoIngestControlPanel.JobsTableModel.ColumnHeader.StartedTime=Stage Started
-AutoIngestControlPanel.JobsTableModel.ColumnHeader.Status=Status
-AutoIngestControlPanel.OK=OK
-AutoIngestControlPanel.PauseDueToCoordinationServiceDown=Paused, unable to communicate with coordination service.
-AutoIngestControlPanel.PauseDueToDatabaseServiceDown=Paused, unable to communicate with case database service.
-AutoIngestControlPanel.PauseDueToFileExporterError=Paused, unable to load File Exporter settings.
-AutoIngestControlPanel.PauseDueToIngestJobStartFailure=Paused, unable to start ingest job processing.
-AutoIngestControlPanel.PauseDueToKeywordSearchServiceDown=Paused, unable to communicate with keyword search service.
-AutoIngestControlPanel.PauseDueToSharedConfigError=Paused, unable to update shared configuration.
-AutoIngestControlPanel.PauseDueToSystemError=Paused due to system error, please consult the auto ingest system log
-AutoIngestControlPanel.PauseDueToWriteStateFilesFailure=Paused, unable to write to shared images or cases location.
-AutoIngestControlPanel.pendingTable.toolTipText=The Pending table displays the order upcoming Jobs will be processed with the top of the list first
-AutoIngestControlPanel.runningTable.toolTipText=The Running table displays the currently running Job and information about it
-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
-AutoIngestControlPanel.tbServicesStatusMessage.Message.Up=up
-AutoIngestControlPanel.UpdatingSharedConfig=Updating shared configuration
-AutoIngestControlPanel.UploadFailedTitle=Failed
-AutoIngestControlPanel.UploadSuccess=Shared configuration successfully uploaded
-AutoIngestControlPanel.UploadSuccessTitle=Success
-AutoIngestDashboard.completedTable.toolTipText=The Completed table shows all Jobs that have been processed already
-AutoIngestDashboard.lbCompleted.text=Completed Jobs
-AutoIngestDashboard.lbRunning.text=Running Jobs
-AutoIngestDashboard.lbPending.text=Pending Jobs
-AutoIngestDashboard.JobsTableModel.ColumnHeader.Case=Case
-AutoIngestDashboard.JobsTableModel.ColumnHeader.ImageFolder=Data Source
-AutoIngestDashboard.JobsTableModel.ColumnHeader.HostName=Host Name
-AutoIngestDashboard.JobsTableModel.ColumnHeader.CreatedTime=Job Created
-AutoIngestDashboard.JobsTableModel.ColumnHeader.StartedTime=Stage Started
-AutoIngestDashboard.JobsTableModel.ColumnHeader.CompletedTime=Job Completed
-AutoIngestDashboard.JobsTableModel.ColumnHeader.Stage=Stage
-AutoIngestDashboard.JobsTableModel.ColumnHeader.Status=Status
-AutoIngestDashboard.JobsTableModel.ColumnHeader.ManifestFilePath= Manifest File Path
-AutoIngestDashboard.JobsTableModel.ColumnHeader.StageTime=Time in Stage
-AutoIngestDashboard.JobsTableModel.ColumnHeader.CaseFolder=Case 
-AutoIngestDashboard.JobsTableModel.ColumnHeader.Job=Job 
-AutoIngestDashboard.pendingTable.toolTipText=The Pending table displays the order upcoming Jobs will be processed with the top of the list first
-AutoIngestDashboard.runningTable.toolTipText=The Running table displays the currently running Job and information about it
-AutoIngestDashboard.tbServicesStatusMessage.Message=Case databases {0}, keyword search {1}, coordination {2}, messaging {3} 
-AutoIngestDashboard.tbServicesStatusMessage.Message.Up=up
-AutoIngestDashboard.tbServicesStatusMessage.Message.Down=down
-AutoIngestDashboard.tbServicesStatusMessage.Message.Unknown=unknown
-AutoIngestDashboardTopComponent.exceptionMessage.failedToCreateDashboard=Failed to create Auto Ingest Dashboard.
-AutoIngestJobsNode.caseName.text=Case Name
-AutoIngestJobsNode.dataSource.text=Data Source
-AutoIngestJobsNode.hostName.text=Host Name
-AutoIngestJobsNode.jobCompleted.text=Job Completed
-AutoIngestJobsNode.jobCreated.text=Job Created
-AutoIngestJobsNode.prioritized.false=No
-AutoIngestJobsNode.prioritized.true=Yes
-AutoIngestJobsNode.priority.text=Prioritized
-AutoIngestJobsNode.stage.text=Stage
-AutoIngestJobsNode.stageTime.text=Time in Stage
-AutoIngestJobsNode.status.text=Status
-AutoIngestJobsPanel.waitNode.text=Please Wait...
-AutoIngestMetricsDialog.initReportText=Select a date above and click the 'Generate Metrics Report' button to generate\na metrics report.
-AutoIngestMetricsDialog.title.text=Auto Ingest Metrics
-ConfirmationDialog.DoNotDelete=Do not delete
-ConfirmationDialog.Delete=Permanently delete
-ConfirmationDialog.DeleteAreYouSure=The entire case will be removed. Are you sure you want to delete case 
-ConfirmationDialog.ConfirmDeletion=Do you really want to cancel copy job 
-ConfirmationDialog.ConfirmDeletionHeader=Confirm Deletion
-ConfirmationDialog.QuestionMark=?
-ConfirmationDialog.DoNotCancelModule=Do Not Cancel Module
-ConfirmationDialog.DoNotCancelJob=Do Not Cancel Job
-ConfirmationDialog.DoNotCancel=Do not cancel
-ConfirmationDialog.Cancel=Proceed with cancellation
-ConfirmationDialog.CancelJob=Cancel Job
-ConfirmationDialog.CancelModule=Cancel Module
-ConfirmationDialog.CancelModuleAreYouSure=The analysis of the ingest module processing the current job will be canceled. Are you sure?
-ConfirmationDialog.CancelJobAreYouSure=The currently running job will be canceled. Are you sure?
-ConfirmationDialog.ConfirmCancellationHeader=Confirm Cancellation
-ConfirmationDialog.Exit=Exit
-ConfirmationDialog.DoNotExit=Do Not Exit
-ConfirmationDialog.ConfirmExit=All incomplete copy jobs will be cancelled. Are you sure?
-ConfirmationDialog.ConfirmExitHeader=Confirm Exit
-CTL_AinStatusDashboardAction=Auto Ingest Nodes
-CTL_AinStatusDashboardTopComponent=Auto Ingest Nodes
-CTL_AutoIngestDashboardAction=Auto Ingest Jobs
-CTL_AutoIngestDashboardOpenAction=Auto Ingest Dashboard
-CTL_AutoIngestDashboardTopComponent=Auto Ingest Jobs
-DataSourceOnCDriveError.noOpenCase.errMsg=Warning: Exception while getting open case.
-DataSourceOnCDriveError.text=Warning: Path to multi-user data source is on "C:" drive
-GeneralFilter.archiveDesc.text=Archive Files (.zip, .rar, .arj, .7z, .7zip, .gzip, .gz, .bzip2, .tar, .tgz)
-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\n\
-    We make no guarantee that the API of this module will not change, so developers should be careful when relying on it.
-OpenIDE-Module-Name=Experimental
-OpenIDE-Module-Short-Description=This module contains features that are being developed by Basis Technology and are not part of the default Autopsy distribution.
-DisplayLogDialog.cannotOpenLog=Unable to open the selected case log file
-DisplayLogDialog.cannotFindLog=Unable to find the selected case log file
-DisplayLogDialog.unableToShowLogFile=Unable to show log file
-DisplayLogDialog.okay=Okay
-CopyFilesPanel.lbFrom.text=From Source
-CopyFilesPanel.lbTo.text=Destination Case
-CopyFilesPanel.bnCopy.text=&Copy
-CopyFilesPanel.bnCancel.text=C&ancel
-CopyFilesPanel.lbStatus.text=Status
-CopyFilesPanel.tbCaseName.text=
-CopyFilesPanel.tbSourceName.text=
-CopyFilesPanel.bnCaseName.text=B&rowse
-CopyFilesPanel.bnSourceName.text=&Browse
-CopyFilesPanel.spRetryCount.toolTipText=Skip this copy job and move on to the next after failing this number of times.
-CopyFilesPanel.rbExistingCase.text=
-CopyFilesPanel.rbNewCase.text=
-CopyFilesPanel.lbFailureText.text=failures
-CopyFilesPanel.lpSkipAfterText.text=Skip after
-CopyFilesPanel.lbExistingCase.text=Use Existing Case
-CopyFilesPanel.lbNewCase.text=Create New Case
-CopyFilesPanel.lbTitle.text=Schedule New Copy Job
-CopyFilesPanel.confirmCancellation=Do you really want to cancel the copy operation?
-CopyFilesPanel.confirmCopyHeader=Confirm Copy to Existing Case
-CopyFilesPanel.confirmCopyAdd=exists. Do you really want to copy more files to this Case?
-CopyFilesPanel.confirmCopyYes=Copy
-CopyFilesPanel.confirmCopyNo=Do not copy
-CopyFilesPanel.lbScheduledJobs.text=Scheduled Copy Jobs
-CopyFilesPanel.lbRunningJob.text=Running Copy Job
-CopyFilesPanel.lbCompletedJobs.text=Completed Copy Jobs
-CopyFilesPanel.Source=Source
-CopyFilesPanel.Destination=Destination
-CopyFilesPanel.Initiated=Initiated
-CopyFilesPanel.Started=Started
-CopyFilesPanel.RunTime=Run Time
-CopyFilesPanel.Status=State
-CopyFilesPanel.tableCompletedJobs.toolTipText=Shows completed copy jobs and status
-CopyFilesPanel.toolTipText=Shows the currently running copy job.
-CopyFilesPanel.lbWait.text=Wait
-CopyFilesPanel.lbWaitMinutesText.text=minutes before retrying
-CopyFilesPanel.bnUp.text=
-CopyFilesPanel.bnDown.text=
-CopyFilesPanel.bnShowLog.text=&Show Log
-CopyFilesPanel.tablePendingJobs.toolTipText=Scheduled copy jobs in the order they will complete, starting from the top.
-CopyFilesPanel.lbPendingJobs.text=Scheduled Copy Jobs
-CopyFilesPanel.chooseOrCreate=Please choose or create a Case
-CopyFilesPanel.invalidCasePath=Invalid case path
-CopyFilesPanel.empty=
-CopyFilesPanel.failedToDeleteSome=Failed to delete some files in cancelled job
-CopyFilesPanel.noRunningJob=No running copy job to cancel
-CopyFilesPanel.destinationEmpty=Destination cannot be within Source
-CopyFilesPanel.copyAborted=Copy aborted. No copying occurred.
-CopyFilesPanel.copying=Copying...
-CopyFilesPanel.copySuccess=Files successfully copied.
-CopyFilesPanel.errorCopying=Error copying.
-CopyFilesPanel.permissionDenied=Permission denied. Check permissions on source and destination directories.
-CopyFilesPanel.retriesLeft=retries left. Waiting to retry.
-CopyFilesPanel.noRetriesLeft=Error copying. All retries used. Skipping.
-CopyFilesPanel.cancelled=Cancelled running copy job
-CopyFilesPanel.deleteConfirmed=Copy job cancelled
-CopyFilesPanel.deleteNotConfirmed=Copy job not cancelled
-CopyFilesPanel.deleteUnable=Unable to cancel copy job
-CopyFilesPanel.unableToOpenLogfile=Unable to open logfile
-CopyFilesPanel.invalidSourcePath=Invalid source path
-CopyFilesPanel.lbScheduledJobs.text=Scheduled Copy Jobs (Placeholder)
-CopyFilesPanel.ConfirmCancellation=Do you really want to cancel the copy operation?
-CopyFilesPanel.ConfirmCopyHeader=Confirm Copy to Existing Case
-CopyFilesPanel.ConfirmCopyAdd=exists. Do you really want to copy more files to this Case?
-CopyFilesPanel.ConfirmCopyYes=Copy
-CopyFilesPanel.ConfirmCopyNo=Do not copy
-ConfirmationDialog.ConfirmUnlockHeader=Confirm Case Unlock
-CopyFilesPanel.bnCancelPendingJob.text=Ca&ncel
-CopyFilesPanel.tbDestinationCase.text=
-CopyFilesPanel.cbThrottleNetwork.text=&Throttle Network
-CopyFilesPanel.cbThrottleNetwork.toolTipText=<html>Select this box if a low-bandwidth network connection is involved in this copy job.<br>\nSelecting this box will artificially limit the transfer speed by inserting strategic delays.<br>\nThis helps copy files across low-bandwidth networks where the transfer would<br>\notherwise fail. Only select this if you are having problems copying across the network.</html>
-CopyFilesPanel.bnShowCurrentLog.text=Show &Log
-CopyFilesPanel.bnShowCurrentLog.text=Show &Log
-CopyFilesPanel.lbCaseName.text=Case Name
-OptionsCategory_Name_Case_Import=Case Import
-OptionsCategory_Keywords_Case_Import=Case Import Settings
-CaseImportPanel.validationErrMsg.MUdisabled=Multi user settings must be enabled and saved
-CaseImportPanel.validationErrMsg.AIMdisabled=Automated ingest cluster must be joined in Automated ingest mode
-CaseImportPanel.ChooseCase=Choose a case to import
-CaseImportPanel.ChooseSource=Choose source images
-CaseImportPanel.DatabaseConnected=Database connected
-CaseImportPanel.DatabaseNotConnected=Verify Multi-user database settings.
-CaseImportPanel.ImportingCases=Importing case(s)...
-CaseImportPanel.Cancelling=Cancelling
-CaseImportPanel.CannotOpenLog=Unable to open log file
-CaseImportPanel.BadCaseSourceFolder=Bad case source folder name
-CaseImportPanel.BadCaseDestinationFolder=Bad case destination folder name
-CaseImportPanel.BadImageSourceFolder=Bad image source folder name
-CaseImportPanel.BadImageDestinationFolder=Bad image destination folder name
-CaseImportPanel.Error=Error
-CaseImportPanel.Complete=Complete
-CaseImportPanel.Blank=
-CaseImportPanel.DeleteWarning=Make sure no important files are in the case source directory
-PrioritizationAction.deprioritizeCaseAction.error=Failed to deprioritize case "%s".
-PrioritizationAction.deprioritizeCaseAction.title=Deprioritize Case
-PrioritizationAction.deprioritizeJobAction.error=Failed to deprioritize job "%s".
-PrioritizationAction.deprioritizeJobAction.title=Deprioritize Job
-PrioritizationAction.prioritizeCaseAction.error==Failed to prioritize case "%s".
-PrioritizationAction.prioritizeCaseAction.title=Prioritize Case
-PrioritizationAction.prioritizeJobAction.error=Failed to prioritize job "%s".
-PrioritizationAction.prioritizeJobAction.title=Prioritize Job
-PrioritizedIconCellRenderer.notPrioritized.tooltiptext=This job has not been prioritized.
-PrioritizedIconCellRenderer.prioritized.tooltiptext=This job has been prioritized. The most recently prioritized job should be processed next.
-SingleUserCaseImporter.NonUniqueOutputFolder=Output folder not unique. Skipping 
-SingleUserCaseImporter.WillImport=Will import:
-SingleUserCaseImporter.None=None
-SingleUserCaseImporter.WillNotImport=Will not import:
-SingleUserCaseImporter.ContinueWithImport=Continue with import?
-SingleUserCaseImporter.Cancelled=Cancelled
-SingleUserCaseImporter.ImportedAsMultiUser=\nThis case was imported as a multi-user collaborative case on 
-SingleUserCaseImporter.StartingBatch=Starting batch processing of 
-SingleUserCaseImporter.to=to
-SingleUserCaseImporter.ErrorFindingAutFiles=Error trying to find .aut files to import
-SingleUserCaseImporter.StartedProcessing=Started processing 
-SingleUserCaseImporter.FinishedProcessing=Finished processing
-SingleUserCaseImporter.FailedToComplete=Failed to complete processing of
-SingleUserCaseImporter.CompletedBatch=Completed batch processing of
-SingleUserCaseImporter.AbortingBatch=Aborting batch processing of
-SingleUserCaseImporter.SourceImageMissing=. Source image missing for
-CopyFilesPanel.bnOptions.text=&Options
-AutoIngestDashboard.lbServicesStatus.text=Services Status:
-AutoIngestDashboard.tbServicesStatusMessage.text=Connecting...
-FileExporterSettingsPanel.ChooseRootDirectory=Choose a root directory for file output
-FileExporterSettingsPanel.ChooseReportDirectory=Choose a report directory
-FileExporterSettingsPanel.RuleName=Rule Name
-FileExporterSettingsPanel.RootDirectory=Root Directory
-FileExporterSettingsPanel.ReportDirectory=Report Directory
-FileExporterSettingsPanel.AttributeValue=Value to compare against
-FileExporterSettingsPanel.RuleListTooltip=Shows a list of rules.
-FileExporterSettingsPanel.RuleOutputTooltip=This is the root output folder for saved output. You must have read and write access for this folder.
-FileExporterSettingsPanel.MimetypeTooltip=Select the MIME Type to compare against.
-FileExporterSettingsPanel.MimetypeText=MIME Type
-FileExporterSettingsPanel.MimetypeCheckboxTooltip=Check this to filter based on MIME Type.
-FileExporterSettingsPanel.FileSizeValueToolTip=Select the value to compare against.
-FileExporterSettingsPanel.FileSizeUnitToolTip=Select the units of the file size value.
-FileExporterSettingsPanel.FileSize=File Size
-FileExporterSettingsPanel.FileSizeComparisonTooltip=Select the file size comparison operator.
-FileExporterSettingsPanel.MimeTypeComparisonTooltip=Select the MIME Type comparison operator.
-FileExporterSettingsPanel.CurrentlySelectedRuleNameTooltip=Shows the currently selected rule's name.
-FileExporterSettingsPanel.SaveText=Save Rule
-FileExporterSettingsPanel.SaveTooltip=Click to save the rule. There must be a rule name and at least one conditional (checkbox) enabled.
-FileExporterSettingsPanel.BrowseText=Browse
-FileExporterSettingsPanel.BrowseRootOutputFolder=Browse to set the root output folder.
-FileExporterSettingsPanel.NewText=New Rule
-FileExporterSettingsPanel.NewRuleTooltip=Clears the rule editor, allowing the user to enter a new rule.
-FileExporterSettingsPanel.BrowseReportTooltip=Browse to set the report output folder.
-FileExporterSettingsPanel.ReportOutputFolderTooltip=This is the report output folder. You must have read and write access for this folder.
-FileExporterSettingsPanel.DeleteText=Delete Rule
-FileExporterSettingsPanel.DeleteTooltip=Deletes the selected rule.
-FileExporterSettingsPanel.UnsavedChangesLost=Unsaved rule changes will be lost. Continue?
-FileExporterSettingsPanel.ChangesWillBeLost=Unsaved changes will be lost.
-FileExporterSettingsPanel.DoYouWantToSave=Do you want to save?
-FileExporterSettingsPanel.BadRootFolder=Bad root folder chosen.
-FileExporterSettingsPanel.BadFolderForInterestingFileExport=Bad folder for file export
-FileExporterSettingsPanel.BadReportFolder=Bad report folder chosen.
-FileExporterSettingsPanel.ReallyDeleteRule=Really delete rule
-FileExporterSettingsPanel.ReallyDeleteCondition=Really delete condition
-FileExporterSettingsPanel.QuestionMark=?
-FileExporterSettingsPanel.ConfirmRuleDeletion=Confirm rule deletion
-FileExporterSettingsPanel.ConfirmClauseDeletion=Confirm clause deletion
-FileExporterSettingsPanel.Title=File Export Rule Generator
-FileExporterSettingsPanel.UnableToFindDirectory=Unable to find directory.
-FileExporterSettingsPanel.PermissionsInvalid=Invalid folder permissions. Can not read or write.
-FileExporterSettingsPanel.RuleNotSaved=Malformed rule. Rule not saved.
-FileExporterSettingsPanel.MalformedRule=Malformed rule.
-FileExporterSettingsPanel.FileSize_1=Select to include file size in the rule
-FileExporterSettingsPanel.MimetypeCheckboxTooltip_1=Select to include MIME type in the rule
-FileExporterSettingsPanel.MimeTypeComparisonTooltip_1=Select the conditional operator
-FileExporterSettingsPanel.FileSizeComparisonTooltip_1=Select the conditional operator
-FileExporterSettingsPanel.FileSizeValueToolTip_1=Select the desired file size
-FileExporterSettingsPanel.FileSizeUnitToolTip_1=Select the desired file size units
-FileExporterSettingsPanel.MimetypeTooltip_1=Select the desired MIME type
-FileExporterSettingsPanel.CurrentlySelectedRuleNameTooltip_1=The name of the rule
-FileExporterSettingsPanel.ReportOutputFolderTooltip_1=The Reports folder where a JSON report is written out for each exported file.
-FileExporterSettingsPanel.RuleOutputTooltip_1=The Files folder where each matching file is written out
-FileExporterSettingsPanel.BrowseRootOutputFolder_1=Browse for the Files Folder
-FileExporterSettingsPanel.BrowseReportTooltip_1=Browse for the Reports Folder
-FileExporterSettingsPanel.NewRuleTooltip_1=Clear the rule editor to begin a new rule
-FileExporterSettingsPanel.DeleteTooltip_1=Delete the selected rule
-FileExporterSettingsPanel.SaveTooltip_1=Save the current rule
-AutoIngestDashboard.refreshButton.toolTipText=Refresh displayed tables
-AutoIngestDashboard.refreshButton.text=&Refresh
-AutoIngestDashboard.jButton1.text=jButton1
-AutoIngestMetricsDialog.reportTextArea.text=
-AutoIngestMetricsDialog.metricsButton.text=Generate Metrics Report
-AutoIngestMetricsDialog.closeButton.text=Close
-AutoIngestMetricsDialog.datePicker.toolTipText=Choose a date
-ArchiveFilePanel.pathLabel.text=Browse for an archive file:
-ArchiveFilePanel.browseButton.text=Browse
-ArchiveFilePanel.pathTextField.text=
-ArchiveFilePanel.errorLabel.text=Error Label
-AutoIngestMetricsDialog.startingDataLabel.text=Starting Date:
-AutoIngestControlPanel.bnDeprioritizeCase.text=Deprioritize Case
-AutoIngestControlPanel.bnDeprioritizeJob.text=Deprioritize Job
-AutoIngestControlPanel.bnPrioritizeCase.text=Prioritize Case
-AutoIngestControlPanel.bnPrioritizeJob.text=Prioritize Job
-AutoIngestControlPanel.bnShowProgress.text=Ingest Progress
-AutoIngestControlPanel.bnCancelJob.text=&Cancel Job
-AutoIngestControlPanel.bnCancelModule.text=Cancel &Module
-AutoIngestControlPanel.bnReprocessJob.text=Reprocess Job
-AutoIngestControlPanel.bnDeleteCase.text=&Delete Case
-AutoIngestControlPanel.bnShowCaseLog.text=Show Case &Log
-AutoIngestControlPanel.bnPause.text=Pause
-AutoIngestControlPanel.bnRefresh.text=&Refresh
-AutoIngestControlPanel.bnOptions.text=&Options
-AutoIngestControlPanel.bnOpenLogDir.text=Open System Logs Folder
-AutoIngestControlPanel.bnClusterMetrics.text=Auto Ingest Metrics
-AutoIngestControlPanel.bnExit.text=&Exit
-AutoIngestControlPanel.lbStatus.text=Status:
-AutoIngestControlPanel.lbServicesStatus.text=Services Status:
-AutoIngestControlPanel.lbPending.text=Pending Jobs
-AutoIngestControlPanel.lbRunning.text=Running Jobs
-AutoIngestControlPanel.lbCompleted.text=Completed Jobs
-AutoIngestControlPanel.tbStatusMessage.text=
-AutoIngestControlPanel.tbServicesStatusMessage.text=
-AutoIngestControlPanel.bnDeprioritizeJob.toolTipText=
-AutoIngestControlPanel.bnDeprioritizeCase.toolTipText=
-AutoIngestControlPanel.bnPrioritizeJob.toolTipText=Move this folder to the top of the Pending queue.
-AutoIngestControlPanel.bnPrioritizeCase.toolTipText=Move all images associated with a case to top of Pending queue.
-AutoIngestControlPanel.bnPrioritizeJob.actionCommand=Prioritize Job
-AutoIngestControlPanel.bnDeprioritizeJob.actionCommand=Deprioritize Job
-AinStatusDashboard.refreshButton.toolTipText=Refresh displayed tables
-AinStatusDashboard.refreshButton.text=&Refresh
-AinStatusDashboard.clusterMetricsButton.text=Auto Ingest &Metrics
-AinStatusDashboard.nodeStatusTableTitle.text=Auto Ingest Nodes
-AinStatusDashboard.healthMonitorButton.text=Health Monitor
diff --git a/Experimental/src/org/sleuthkit/autopsy/experimental/configuration/Bundle.properties-MERGED b/Experimental/src/org/sleuthkit/autopsy/experimental/configuration/Bundle.properties-MERGED
deleted file mode 100755
index bb4910edee0d3f819896fabf4108563ecf1d502f..0000000000000000000000000000000000000000
--- a/Experimental/src/org/sleuthkit/autopsy/experimental/configuration/Bundle.properties-MERGED
+++ /dev/null
@@ -1,135 +0,0 @@
-AdvancedAutoIngestSettingsPanel.AccessibleContext.accessibleName=
-AdvancedAutoIngestSettingsPanel.ItemDisabled.text=Item disabled based upon current Autopsy mode.
-AdvancedAutoIngestSettingsPanel.jPanelFolderMaintenanceSettings.border.title=Folder Maintenance Settings
-AdvancedAutoIngestSettingsPanel.lbConcurrentJobsPerCase.toolTipText=A soft limit on the number of concurrent jobs per case when multiple cases are processed simultaneously.
-AdvancedAutoIngestSettingsPanel.lbInputScanInterval.AccessibleContext.accessibleDescription=The interval
-AdvancedAutoIngestSettingsPanel.lbInputScanInterval.toolTipText=The interval between scans for new manifest files.
-AdvancedAutoIngestSettingsPanel.lbInputScanIntervalMinutes1.AccessibleContext.accessibleName=minutes
-AdvancedAutoIngestSettingsPanel.lbInputScanIntervalMinutes1.text=minutes
-AdvancedAutoIngestSettingsPanel.lbNumberOfThreads.toolTipText=The number of threads running file level ingest modules.
-AdvancedAutoIngestSettingsPanel.lbRetriesAllowed.toolTipText=The maximum number of retries for crashed jobs.
-AdvancedAutoIngestSettingsPanel.lbSecondsBetweenJobs.toolTipText=A wait time used by auto ingest nodes to ensure proper synchronization of node operations.
-AdvancedAutoIngestSettingsPanel.tbWarning.text=WARNING: Ensure you know what you are doing before modifying these values. Informed use can improve system performance. Misuse can cause system performance degradation and data loss. Please consult the user guide for details.
-AdvancedAutoIngestSettingsPanel.threadCountLabel.text=For this computer, a maximum of {0} file ingest threads should be used.
-AIMIngestSettingsPanel.browseGlobalSettingsButton.text=Browse
-AIMIngestSettingsPanel.globalSettingsErrorTextField.text=
-AIMIngestSettingsPanel.globalSettingsTextField.text=
-AIMIngestSettingsPanel.jButton1.text=Download shared settings
-AIMIngestSettingsPanel.jButtonEditIngestSettings.text=Ingest Module Settings
-AIMIngestSettingsPanel.jButtonEditIngestSettings.toolTipText=Ingest job settings for the automated processing mode context.
-AIMIngestSettingsPanel.jLabel1.text=Download the current shared setting (highly recommended to do this before editing)
-AIMIngestSettingsPanel.lbSecondsBetweenJobs.text=Number of seconds to wait between jobs:
-AIMIngestSettingsPanel.lbSecondsBetweenJobs.toolTipText=Increase this value if database locks cause problems. It gives a little more time for finalizing.
-AIMIngestSettingsPanel.spSecondsBetweenJobs.toolTipText=Increase this value if database locks cause problems. It gives a little more time for finalizing.
-AutoIngestSettingsPanel.AdvancedAutoIngestSettingsPanel.Title=Advanced Settings
-AutoIngestSettingsPanel.autoIngestModeRadioButton.text=Auto Ingest mode
-AutoIngestSettingsPanel.browseGlobalSettingsButton.text=Browse
-AutoIngestSettingsPanel.CannotAccess=Cannot access
-AutoIngestSettingsPanel.CheckPermissions=Check permissions.
-AutoIngestSettingsPanel.EmptySettingsDirectory=Enter path to settings directory
-AutoIngestSettingsPanel.ErrorSettingDefaultFolder=Error creating default folder
-AutoIngestSettingsPanel.examinerModeRadioButton.text=Examiner mode
-AutoIngestSettingsPanel.FileExportRules.text=File Export Rules
-AutoIngestSettingsPanel.globalSettingsErrorTextField.text=
-AutoIngestSettingsPanel.globalSettingsTextField.text=
-AutoIngestSettingsPanel.ImageDirectoryUnspecified=Shared images folder must be set
-AutoIngestSettingsPanel.InvalidPortNumber=Invalid port number.
-AutoIngestSettingsPanel.jRadioButtonCopyFiles.text=File Copy mode
-AutoIngestSettingsPanel.KeywordSearchNull=Cannot find Keyword Search service
-AutoIngestSettingsPanel.MustRestart=Autopsy must be restarted for new configuration to take effect
-AutoIngestSettingsPanel.nodePanel.TabConstraints.tabTitle=Node Configuration
-AutoIngestSettingsPanel.NodeStatusLogging.text=Node Status Logging Settings
-AutoIngestSettingsPanel.PathInvalid=Path is not valid
-AutoIngestSettingsPanel.restartRequiredLabel.text=Application restart required to take effect.
-AutoIngestSettingsPanel.restartRequiredLabel.text=Application restart required
-AutoIngestSettingsPanel.ResultsDirectoryUnspecified=Shared cases folder must be set
-AutoIngestSettingsPanel.tbOops.text=
-AutoIngestSettingsPanel.validationErrMsg.incomplete=Fill in all values
-AutoIngestSettingsPanel.validationErrMsg.invalidDatabasePort=Invalid database port number
-AutoIngestSettingsPanel.validationErrMsg.invalidIndexingServerPort=Invalid Solr server port number
-AutoIngestSettingsPanel.validationErrMsg.invalidMessageServicePort=Invalid message service port number
-AutoIngestSettingsPanel.validationErrMsg.MUdisabled=Multi user settings must be enabled and saved
-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
-NodeStatusLogPanel.bnCancel.text=Cancel
-NodeStatusLogPanel.bnOk.text=OK
-NodeStatusLogPanel.bnTestDatabase.text=Test
-NodeStatusLogPanel.cbEnableLogging.text=Enable Database Logging
-NodeStatusLogPanel.lbDatabaseSettings.text=Database Settings
-NodeStatusLogPanel.lbTestDatabase.text=
-NodeStatusLogPanel.lbTestDbWarning.text=
-NodeStatusLogPanel.lbTestDbWarning.text=
-NodeStatusLogPanel.tbDbHostname.text=
-NodeStatusLogPanel.tbDbHostname.toolTipText=Hostname or IP Address
-NodeStatusLogPanel.tbDbName.text=
-NodeStatusLogPanel.tbDbName.toolTipText=Database Name
-NodeStatusLogPanel.tbDbPassword.text=
-NodeStatusLogPanel.tbDbPassword.toolTipText=Password
-NodeStatusLogPanel.tbDbPort.text=
-NodeStatusLogPanel.tbDbPort.toolTipText=Port Number
-NodeStatusLogPanel.tbDbUsername.text=
-NodeStatusLogPanel.tbDbUsername.toolTipText=User Name
-OpenOptionsPanelAction.name=Auto Ingest Options
-OptionsCategory_Keywords_Auto_Ingest_Settings=Auto Ingest Settings
-OptionsCategory_Keywords_General=Options
-OptionsCategory_Name_Auto_Ingest=Auto Ingest
-OptionsDialog.jButton1.text=jButton1
-OptionsDialog.jCheckBox1.text=jCheckBox1
-OptionsDialog.jLabel1.text=jLabel1
-StartupWindow.AutoIngestMode=Automated Ingest Node
-StartupWindow.CaseImportMode=Single User Case Import
-StartupWindow.CopyAndImportMode=Utilities
-StartupWindow.title.text=Welcome
-AdvancedAutoIngestSettingsPanel.lbInputScanIntervalMinutes.text=minutes
-AdvancedAutoIngestSettingsPanel.lbTimeoutHours.text=hour(s)
-AdvancedAutoIngestSettingsPanel.lbSecondsBetweenJobsSeconds.text=seconds
-AdvancedAutoIngestSettingsPanel.spSecondsBetweenJobs.toolTipText=Increase this value if database locks cause problems. It gives a little more time for finalizing.
-AdvancedAutoIngestSettingsPanel.spTimeoutHours.toolTipText=Components that spawn potentially long-running processes optionally terminate those processes if the specified time out period has elapsed.
-AdvancedAutoIngestSettingsPanel.spInputScanInterval.toolTipText=Increase this value to reduce the frequency of input scan.
-AdvancedAutoIngestSettingsPanel.spMaximumRetryAttempts.AccessibleContext.accessibleDescription=Maximum number of retries allowed in Automated Ingest Mode
-AdvancedAutoIngestSettingsPanel.spMaximumRetryAttempts.toolTipText=The maximum number of times Automated ingest will attempt to reprocess a job if processing fails.
-AdvancedAutoIngestSettingsPanel.lbRestartRequired.text=Application restart required to take effect.
-AdvancedAutoIngestSettingsPanel.cbTimeoutEnabled.toolTipText=Components that spawn potentially long-running processes optionally terminate those processes if the specified time out period has elapsed.
-AdvancedAutoIngestSettingsPanel.cbTimeoutEnabled.text=
-AdvancedAutoIngestSettingsPanel.lbConcurrentJobsPerCase.text=Target concurrent jobs per case:
-AdvancedAutoIngestSettingsPanel.lbNumberOfThreads.text=Number of threads to use for file ingest:
-AdvancedAutoIngestSettingsPanel.lbRetriesAllowed.text=Maximum job retries allowed:
-AdvancedAutoIngestSettingsPanel.lbInputScanInterval.text=Interval between input scans:
-AdvancedAutoIngestSettingsPanel.lbTimeoutText.text=External processes time out:
-AdvancedAutoIngestSettingsPanel.lbSecondsBetweenJobs.text=System synchronization wait time:
-AdvancedAutoIngestSettingsPanel.jPanelAutoIngestJobSettings.border.title=Automated Ingest Job Settings
-AdvancedAutoIngestSettingsPanel.lbSecondsBetweenJobs.toolTipText_1=Increase this value if database locks cause problems. It gives a little more time for finalizing.
-AdvancedAutoIngestSettingsPanel.lbTimeoutText.toolTipText=Components that spawn potentially long-running processes optionally terminate those processes if the specified time out period has elapsed.
-AdvancedAutoIngestSettingsPanel.lbInputScanInterval.toolTipText_1=Increase this value to reduce the frequency of input scan.
-AdvancedAutoIngestSettingsPanel.lbInputScanIntervalMinutes.toolTipText=
-AdvancedAutoIngestSettingsPanel.lbTimeoutHours.toolTipText=
-AdvancedAutoIngestSettingsPanel.lbRetriesAllowed.toolTipText_1=The maximum number of retries for crashed jobs.
-AdvancedAutoIngestSettingsPanel.lbRetriesAllowed.toolTipText_2=The maximum number of retries for crashed jobs.
-AdvancedAutoIngestSettingsPanel.lbConcurrentJobsPerCase.toolTipText_1=A soft limit on the number of concurrent jobs per case when multiple cases are processed simultaneously.
-AdvancedAutoIngestSettingsPanel.lbNumberOfThreads.toolTipText_1=The number of threads running file level ingest modules.
-AdvancedAutoIngestSettingsPanel.numberOfFileIngestThreadsComboBox.toolTipText=The number of threads running file level ingest modules.
-NodeStatusLogPanel.tbDbName.toolTipText_1=Database name
-AutoIngestSettingsPanel.sharedSettingsTextField.text=
-AutoIngestSettingsPanel.sharedConfigCheckbox.text=Use shared configuration in folder:
-AutoIngestSettingsPanel.configButtonErrorTextField.text=configButtonErrorTextField
-AutoIngestSettingsPanel.jLabelTaskDescription.text=jLabel1
-AutoIngestSettingsPanel.jLabelCurrentTask.text=Current task:
-AutoIngestSettingsPanel.downloadButton.text=Download Config
-AutoIngestSettingsPanel.uploadButton.text=Save & Upload Config
-AutoIngestSettingsPanel.masterNodeCheckBox.text=Use this node as a master node that can upload settings
-AutoIngestSettingsPanel.sharedSettingsErrorTextField.text=globalSettingsErrorTextField
-AutoIngestSettingsPanel.browseSharedSettingsButton.text=Browse
-AutoIngestSettingsPanel.jLabelInvalidResultsFolder.text=jLabelInvalidResultsFolder
-AutoIngestSettingsPanel.jLabelInvalidImageFolder.text=jLabelInvalidImageFolder
-AutoIngestSettingsPanel.browseOutputFolderButton.text=Browse
-AutoIngestSettingsPanel.outputPathTextField.toolTipText=Shared cases folder for automated processing, i.e., the location where case folder will be created by automated processing mode for presentation to the user in examiner mode.
-AutoIngestSettingsPanel.outputPathTextField.text=
-AutoIngestSettingsPanel.jLabelSelectOutputFolder.text=Select shared cases folder:
-AutoIngestSettingsPanel.browseInputFolderButton.text=Browse
-AutoIngestSettingsPanel.inputPathTextField.toolTipText=Input folder for automated processing, i.e., the location where input case folders will be created for ingest by automated processing mode
-AutoIngestSettingsPanel.inputPathTextField.text=
-AutoIngestSettingsPanel.jLabelSelectInputFolder.text=Select shared images folder:
-AutoIngestSettingsPanel.bnFileExport.text=File Export Settings
-AutoIngestSettingsPanel.bnAdvancedSettings.text=Advanced Settings
-AutoIngestSettingsPanel.bnEditIngestSettings.toolTipText=Ingest job settings for the automated processing mode context.
-AutoIngestSettingsPanel.bnEditIngestSettings.text=Ingest Module Settings
diff --git a/Experimental/src/org/sleuthkit/autopsy/experimental/objectdetection/Bundle.properties-MERGED b/Experimental/src/org/sleuthkit/autopsy/experimental/objectdetection/Bundle.properties-MERGED
deleted file mode 100755
index 4256a2a349a3d60a4fb30b9e67a85fc1883d7d38..0000000000000000000000000000000000000000
--- a/Experimental/src/org/sleuthkit/autopsy/experimental/objectdetection/Bundle.properties-MERGED
+++ /dev/null
@@ -1,7 +0,0 @@
-# {0} - detectionCount
-ObjectDetectionFileIngestModule.classifierDetection.text=Classifier detected {0} object(s)
-# {0} - classifierDir
-ObjectDetectionFileIngestModule.noClassifiersFound.message=No classifiers were found in {0}, object detection will not be executed.
-ObjectDetectionFileIngestModule.noClassifiersFound.subject=No classifiers found.
-ObjectDetectionModuleFactory.moduleDescription.text=Use object classifiers to identify objects in pictures.
-ObjectDetectionModuleFactory.moduleName.text=Object Detection
diff --git a/Experimental/src/org/sleuthkit/autopsy/experimental/volatilityDSP/Bundle.properties-MERGED b/Experimental/src/org/sleuthkit/autopsy/experimental/volatilityDSP/Bundle.properties-MERGED
deleted file mode 100755
index 41737085245b795de57a4d81e1cc0a595a5c35a7..0000000000000000000000000000000000000000
--- a/Experimental/src/org/sleuthkit/autopsy/experimental/volatilityDSP/Bundle.properties-MERGED
+++ /dev/null
@@ -1,50 +0,0 @@
-# To change this license header, choose License Headers in Project Properties.
-# To change this template file, choose Tools | Templates
-# and open the template in the editor.
-
-# {0} - exception message
-AddMemoryImageTask_errorMessage_criticalException=\ Critical error: {0}
-# {0} - image file path
-# {1} - device id
-AddMemoryImageTask_exceptionMessage_noImageFile=\ Memory image file {0} for device {1} does not exist
-# {0} - image file path
-AddMemoryImageTask_progressMessage_addingImageFile=\ Adding memory image {0}
-MemoryDSInputPanel.pathLabel.AccessibleContext.accessibleName=Browse for a memory image file:
-MemoryDSInputPanel.PluginsToRunLabel.text=Plugins to run:
-MemoryDSInputPanel.pathLabel.text=Browse for a memory image file:
-MemoryDSInputPanel.pathTextField.text=
-MemoryDSInputPanel.errorLabel.text=Error Label
-MemoryDSInputPanel.browseButton.text=Browse
-MemoryDSInputPanel.timeZoneLabel.text=Timezone:
-MemoryDSInputPanel.profileLabel.text=Profile: 
-MemoryDSInputPanel_errorMsg_dataSourcePathOnCdrive=Path to multi-user data source is on "C:" drive
-MemoryDSInputPanel_errorMsg_noOpenCase=No open case
-MemoryDSProcessor.dataSourceType=Memory Image File (Volatility)
-# {0} - plugin name
-VolatilityProcessor_artifactAttribute_interestingFileSet=Volatility Plugin {0}
-# {0} - plugin name
-VolatilityProcessor_errorMessage_errorFindingFiles=Error finding files parsed from output of {0} plugin
-# {0} - plugin name
-VolatilityProcessor_errorMessage_failedToIndexArtifact=Error indexing artifact from output of {0} plugin
-# {0} - plugin name
-VolatilityProcessor_errorMessage_outputParsingError=Error parsing output for {0} plugin
-# {0} - plugin name
-VolatilityProcessor_exceptionMessage_errorAddingOutput=Failed to add output for {0} to case
-# {0} - plugin name
-VolatilityProcessor_exceptionMessage_errorCreatingArtifact=Error creating artifact for output of {0} plugin
-# {0} - plugin name
-VolatilityProcessor_exceptionMessage_errorIndexingOutput=Error indexing output for {0} plugin
-# {0} - plugin name
-VolatilityProcessor_exceptionMessage_errorRunningPlugin=Volatility error running {0} plugin
-VolatilityProcessor_exceptionMessage_failedToParseImageInfo=Could not parse image info
-VolatilityProcessor_exceptionMessage_failedToRunVolatilityExe=Could not run Volatility
-# {0} - file path
-# {1} - file name
-# {2} - plugin name
-VolatilityProcessor_exceptionMessage_fileNotFound=File {0}/{1} not found for ouput of {2} plugin
-# {0} - plugin name
-VolatilityProcessor_exceptionMessage_searchServiceNotFound=Keyword search service not found, output for {0} plugin not indexed
-VolatilityProcessor_exceptionMessage_volatilityExeNotFound=Volatility executable not found
-VolatilityProcessor_progressMessage_noCurrentCase=Failed to get current case
-# {0} - plugin name
-VolatilityProcessor_progressMessage_runningImageInfo=Running {0} plugin
diff --git a/ImageGallery/build.xml b/ImageGallery/build.xml
index 7454b3a2a0a04ea960ebddd35096e5d61e09cf1a..92d809a96dfe1e5d28f5b16224b7e57d8dcee64f 100644
--- a/ImageGallery/build.xml
+++ b/ImageGallery/build.xml
@@ -15,20 +15,4 @@
         out-of-date/unneeded stuff in the installer-->
         <delete dir="${ext.dir}"/>
     </target>
-    
-    <target name="compile" depends="projectized-common.compile">
-        <antcall target="copy-bundle" />
-    </target>
-
-    <target name="copy-bundle">
-        <!-- the externalized strings in 'src' are in both the java files as annotations and in the Bundle.property files.
-          The strings get merged during compilation.  This target copies that merged file into src so that it can be checked
-          in and used as a basis for translation efforts -->
-        <copy todir="src">
-            <fileset dir="build/classes">
-                <include name="**/Bundle.properties"/>
-            </fileset>
-            <globmapper from="*" to="*-MERGED"/>
-        </copy>
-    </target>
 </project>
diff --git a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/Bundle.properties-MERGED b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/Bundle.properties-MERGED
deleted file mode 100755
index 3e2435d56aee337cf85e08bb173ab7bab6fb2d3a..0000000000000000000000000000000000000000
--- a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/Bundle.properties-MERGED
+++ /dev/null
@@ -1,46 +0,0 @@
-BulkTask.committingDb.status=committing image/video database
-BulkTask.errPopulating.errMsg=There was an error populating Image Gallery database.
-BulkTask.stopCopy.status=Stopping copy to drawable db task.
-CopyAnalyzedFiles.committingDb.status=committing image/video database
-CopyAnalyzedFiles.errPopulating.errMsg=There was an error populating Image Gallery database.
-CopyAnalyzedFiles.populatingDb.status=populating analyzed image/video database
-CopyAnalyzedFiles.stopCopy.status=Stopping copy to drawable db task.
-CTL_ImageGalleryAction=Image/Video Gallery
-CTL_ImageGalleryTopComponent=Image/Video Gallery
-ImageGallery.dialogTitle=Image Gallery
-ImageGallery.showTooManyFiles.contentText=There are too many files in the selected datasource(s) to ensure reasonable performance.
-ImageGallery.showTooManyFiles.headerText=
-ImageGalleryController.dataSourceAnalyzed.confDlg.msg=\ A new data source was added and finished ingest.\nThe image / video database may be out of date. Do you want to update the database with ingest results?\n
-ImageGalleryController.dataSourceAnalyzed.confDlg.title=Image Gallery
-ImageGalleryController.InnerTask.message.name=status
-ImageGalleryController.InnerTask.progress.name=progress
-ImageGalleryController.noGroupsDlg.msg1=No groups are fully analyzed; but listening to ingest is disabled.  No groups will be available until ingest is finished and listening is re-enabled.
-ImageGalleryController.noGroupsDlg.msg2=No groups are fully analyzed yet, but ingest is still ongoing.  Please Wait.
-ImageGalleryController.noGroupsDlg.msg3=No groups are fully analyzed yet, but image / video data is still being populated.  Please Wait.
-ImageGalleryController.noGroupsDlg.msg4=There are no images/videos available from the added datasources;  but listening to ingest is disabled.  No groups will be available until ingest is finished and listening is re-enabled.
-ImageGalleryController.noGroupsDlg.msg5=There are no images/videos in the added datasources.
-ImageGalleryController.noGroupsDlg.msg6=There are no fully analyzed groups to display:  the current Group By setting resulted in no groups, or no groups are fully analyzed but ingest is not running.
-ImageGalleryDatabaseUpdateService.openCaseResources.progressMessage.finish=Opened Image Gallery databases.
-ImageGalleryDatabaseUpdateService.openCaseResources.progressMessage.start=Opening Image Gallery databases...
-ImageGalleryDatabaseUpdateService.serviceName=Image Gallery Database Update Service
-ImageGalleryModule.moduleName=Image Gallery
-ImageGalleryTopComponent.chooseDataSourceDialog.all=All
-ImageGalleryTopComponent.chooseDataSourceDialog.contentText=Data source:
-ImageGalleryTopComponent.chooseDataSourceDialog.headerText=Choose a data source to view.
-ImageGalleryTopComponent.chooseDataSourceDialog.titleText=Image Gallery
-OpenIDE-Module-Long-Description=\
-    New image and video gallery that has been designed to make performing image-intensive investigations more efficient.  \
-    This work has been funded by DHS S&T and this is a beta release. \
-    It is not available on the sleuthkit.org site and has been distributed to limited users.
-OpenIDE-Module-Name=ImageGallery
-OpenIDE-Module-Short-Description=Advanced image and video gallery
-ImageGalleryOptionsPanel.enabledForCaseBox.text=Enable Image Gallery updates for the current case.
-ImageGalleryOptionsPanel.enabledByDefaultBox.text=Enable Image Gallery for new cases by default. 
-ImageGalleryOptionsPanel.enabledForCaseBox.toolTipText=If Image Gallery is disabled, only the fact that an update is needed is recorded.  If Image Gallery is enabled after ingest, it will do one bulk update based on the results from ingest.  If Image Gallery is disabled,  you will be prompted to enable it when attempting to open its window.
-ImageGalleryOptionsPanel.descriptionLabel.text=<html>To minimize its startup times, Image Gallery will constantly update its internal database. <br />This can cause ingest to be slower if you do not need the Image Gallery features. <br />Use these settings to disable Image Gallery if you do not need it.</html>
-ImageGalleryOptionsPanel.furtherDescriptionArea.text=If Image Gallery is disabled, only the fact that an update is needed is recorded.  If Image Gallery is enabled after ingest, it will do one bulk update based on the results from ingest.  If Image Gallery is disabled,  you will be prompted to enable it when attempting to open its window.
-ImageGalleryOptionsPanel.unavailableDuringInjestLabel.text=This setting is unavailable during ingest.
-ImageGalleryOptionsPanel.groupCategorizationWarningBox.text=Don't show a warning when overwriting categories, by acting on an entire group.
-CTL_OpenAction=Open Image/Video
-OptionsCategory_Keywords_Options=image video gallery category 
-OptionsCategory_Name_Options=Image / Video Gallery
diff --git a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/actions/Bundle.properties-MERGED b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/actions/Bundle.properties-MERGED
deleted file mode 100755
index 1af8a08078d9a467e36e63d11ec874e8c841c9e1..0000000000000000000000000000000000000000
--- a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/actions/Bundle.properties-MERGED
+++ /dev/null
@@ -1,40 +0,0 @@
-# {0} - fileID
-AddDrawableTagAction.addTagsToFiles.alert=Unable to tag file {0}.
-AddDrawableTagAction.displayName.plural=Tag Files
-AddDrawableTagAction.displayName.singular=Tag File
-AddTagAction.menuItem.newTag=New Tag...
-AddTagAction.menuItem.noTags=No tags
-AddTagAction.menuItem.quickTag=Quick Tag
-AddTagAction.menuItem.tagAndComment=Tag and Comment...
-Back_diplayName=Back
-CategorizeAction.displayName=Categorize
-CategorizeGroupAction.dontShowAgain=Don't show this message again
-CategorizeGroupAction.fileCountHeader=Files in the following categories will have their categories overwritten: 
-# {0} - number of files with the category
-# {1} - the name of the category
-CategorizeGroupAction.fileCountMessage={0} with {1}
-CategorizeGroupAction.OverwriteButton.text=Overwrite
-# {0} - fileID number
-CategorizeTask.errorUnable.msg=Unable to categorize {0}.
-CategorizeTask.errorUnable.title=Categorizing Error
-CTL_AddImage=View Images/Videos
-CTL_OpenAction=Images/Videos
-# {0} - fileID
-DeleteDrawableTagAction.deleteTag.alert=Unable to untag file {0}.
-DeleteDrawableTagAction.displayName=Remove File Tag
-DeleteFollwUpTagAction.displayName=Delete Follow Up Tag
-Forward.displayName=Forward
-MediaViewImagePanel.externalViewerButton.text=Open in External Viewer
-NextUnseenGroup.allGroupsSeen=All Groups Have Been Seen
-NextUnseenGroup.markGroupSeen=Mark Group Seen
-NextUnseenGroup.nextUnseenGroup=Next Unseen Group
-OpenAction.dialogTitle=Image Gallery
-OpenAction.multiUserDialog.checkBox.text=Don't show this message again.
-OpenAction.multiUserDialog.ContentText=The Image Gallery updates itself differently for multi-user cases than single user cases. Notably:\n\nIf your computer is analyzing a data source, then you will get real-time Image Gallery updates as files are analyzed (hashed, EXIF, etc.). This is the same behavior as a single-user case.\n\nIf another computer in your multi-user cluster is analyzing a data source, you will get updates about files on that data source only when you launch Image Gallery, which will cause the local database to be rebuilt based on results from other nodes.
-OpenAction.multiUserDialog.Header=Multi-user Image Gallery
-OpenAction.notAnalyzedDlg.msg=No image/video files available to display yet.\nPlease run FileType and EXIF ingest modules.
-OpenAction.stale.confDlg.msg=The image / video database may be out of date. Do you want to update and listen for further ingest results?\nChoosing 'yes' will update the database and enable listening to future ingests.
-OpenAction.stale.confDlg.title=Image Gallery
-OpenExternalViewerAction.displayName=External Viewer
-RedoAction.name=Redo
-UndoAction.displayName=Undo
diff --git a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/Bundle.properties-MERGED b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/Bundle.properties-MERGED
deleted file mode 100755
index 6686b2799492fa54c6b1544b30f73965ac8955b9..0000000000000000000000000000000000000000
--- a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/Bundle.properties-MERGED
+++ /dev/null
@@ -1,18 +0,0 @@
-DrawableAttribute.analyzed=Analyzed
-DrawableAttribute.cameraMake=Camera Make
-DrawableAttribute.cameraModel=Camera Model
-DrawableAttribute.category=Category
-DrawableAttribute.createdTime=Created Time
-DrawableAttribute.hashSet=Hashset
-DrawableAttribute.height=Height
-DrawableAttribute.intObjID=Internal Object ID
-DrawableAttribute.md5hash=MD5 Hash
-DrawableAttribute.mimeType=MIME type
-DrawableAttribute.modifiedTime=Modified Time
-DrawableAttribute.name=Name
-DrawableAttribute.path=Path
-DrawableAttribute.tags=Tags
-DrawableAttribute.width=Width
-DrawableTagsManager.bookMark=Bookmark
-DrawableTagsManager.followUp=Follow Up
-VideoFile.getMedia.progress=writing temporary file to disk
diff --git a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/grouping/Bundle.properties-MERGED b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/grouping/Bundle.properties-MERGED
deleted file mode 100755
index 36d74f6cafb3779de56014dcddc4c529299f35ae..0000000000000000000000000000000000000000
--- a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/grouping/Bundle.properties-MERGED
+++ /dev/null
@@ -1,6 +0,0 @@
-GroupSortBy.groupName=Group Name
-GroupSortBy.groupSize=Group Size
-GroupSortBy.none=None
-GroupSortBy.priority=Priority
-# {0} - groupBy attribute Name
-ReGroupTask.displayTitle=regrouping by {0}: 
diff --git a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/Bundle.properties-MERGED b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/Bundle.properties-MERGED
deleted file mode 100755
index 2de57b21a96a8d7746ff5a5cea4c03d32060d3d2..0000000000000000000000000000000000000000
--- a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/Bundle.properties-MERGED
+++ /dev/null
@@ -1,20 +0,0 @@
-StatuBar.toolTip=Some data may be out of date.  Enable Image Gallery in Tools | Options | Image /Video Gallery , after ingest is complete to update the Image Gallery data.
-StatusBar.bgTaskLabel.text=Regrouping
-StatusBar.fileUpdateTaskLabel.text=\ File Update Tasks
-SummaryTablePane.catColumn=Category
-SummaryTablePane.countColumn=\# Files
-Toolbar.ascRadio=Ascending
-Toolbar.categoryImageViewLabel=Categorize Group's Files:
-Toolbar.descRadio=Descending
-Toolbar.getDataSources.errMessage=Unable to get datasources for current case.
-Toolbar.groupByLabel=Group By:
-Toolbar.nonPathGroupingWarning.content=Proceed with regrouping?
-Toolbar.nonPathGroupingWarning.header=Grouping by attributes other than path does not support the data source filter.\nFiles and groups from all data sources will be shown.
-Toolbar.nonPathGroupingWarning.title=Image Gallery
-Toolbar.sortByLabel=Sort By:
-Toolbar.sortHelp=The sort direction (ascending/descending) affects the queue of unseen groups that Image Gallery maintains, but changes to this queue aren't apparent until the "Next Unseen Group" button is pressed.
-Toolbar.sortHelpTitle=Group Sorting
-Toolbar.tagImageViewLabel=Tag Group's Files:
-Toolbar.thumbnailSizeLabel=Thumbnail Size (px):
-# {0} - exception type
-VideoPlayer.errNotice={0}\nSee the logs for details.
diff --git a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/drawableviews/Bundle.properties-MERGED b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/drawableviews/Bundle.properties-MERGED
deleted file mode 100755
index 8cb9633613bef59fe184d7fa81f56e10ec87c282..0000000000000000000000000000000000000000
--- a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/drawableviews/Bundle.properties-MERGED
+++ /dev/null
@@ -1,24 +0,0 @@
-DrawableTileBase.externalViewerAction.text=Open in External Viewer
-DrawableTileBase.menuItem.extractFiles=Extract File(s)
-DrawableTileBase.menuItem.showContentViewer=Show Content Viewer
-DrawableUIBase.errorLabel.OOMText=Insufficent memory
-DrawableUIBase.errorLabel.text=Could not read file
-GroupPane.bottomLabel.displayText=Group Viewing History: 
-GroupPane.catContainerLabel.displayText=Categorize Selected File:
-GroupPane.catHeadingLabel.displayText=Category:
-GroupPane.gridViewContextMenuItem.extractFiles=Extract File(s)
-# {0} - default group name
-# {1} - hashset hits count
-# {2} - group size
-GroupPane.headerString={0} -- {1} hash set hits / {2} files
-GroupPane.hederLabel.displayText=Tag Selected Files:
-# {0} - file name
-MediaLoadTask.messageText=Reading video: {0}
-MetaDataPane.attributeColumn.headingName=Attribute
-MetaDataPane.copyMenuItem.text=Copy
-MetaDataPane.tableView.placeholder=Select a file to show its details here.
-MetaDataPane.titledPane.displayName=Details
-MetaDataPane.valueColumn.headingName=Value
-# {0} - file id number
-# {1} - number of file ids
-SlideShowView.supplementalText={0} of {1} in group
diff --git a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/navpanel/Bundle.properties-MERGED b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/navpanel/Bundle.properties-MERGED
deleted file mode 100755
index c7b9637275267e57e31840383fbc33f81fc38f5d..0000000000000000000000000000000000000000
--- a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/navpanel/Bundle.properties-MERGED
+++ /dev/null
@@ -1,11 +0,0 @@
-GroupComparators.groupName=Group Name
-GroupComparators.groupSize=Group Size
-GroupComparators.hitCount=Hit Count
-GroupComparators.hitDensity=Hit Density
-GroupComparators.uncategorizedCount=Uncategorized Count
-GroupTree.displayName.allGroups=All Groups
-HashHitGroupList.displayName.onlyHashHits=Only Hash Hits
-NavPanel.ascRadio.text=Ascending
-NavPanel.descRadio.text=Descending
-NavPanel.placeHolder.text=There are no groups.
-NavPanel.sortByBoxLabel.text=Sort By:
diff --git a/KeywordSearch/build.xml b/KeywordSearch/build.xml
index 1a43a00cf8b360a444b5901241e72fba128cd90a..5066a8e0510898119f8adf896e8b592064fa5c0d 100644
--- a/KeywordSearch/build.xml
+++ b/KeywordSearch/build.xml
@@ -52,7 +52,6 @@
     <target name="clean-all" depends="clean" description="Clear Ivy cache.">
         <ivy:cleancache/>
     </target>
-    
     <target name="test-unit" depends="init, test-init, test-build">
         <junit fork="on" haltonfailure="yes" dir=".">
             <formatter type="plain" usefile="false" />
@@ -60,21 +59,5 @@
                 <test name="org.sleuthkit.autopsy.keywordsearch.KeywordSearchTestSuite" />
         </junit>
     </target>
-    
-    <target name="compile" depends="projectized-common.compile">
-        <antcall target="copy-bundle" />
-    </target>
-
-    <target name="copy-bundle">
-        <!-- the externalized strings in 'src' are in both the java files as annotations and in the Bundle.property files.
-          The strings get merged during compilation.  This target copies that merged file into src so that it can be checked
-          in and used as a basis for translation efforts -->
-        <copy todir="src">
-            <fileset dir="build/classes">
-                <include name="**/Bundle.properties"/>
-            </fileset>
-            <globmapper from="*" to="*-MERGED"/>
-        </copy>
-    </target>
 
 </project>
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Bundle.properties-MERGED b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Bundle.properties-MERGED
deleted file mode 100755
index e384766d55b04ea62f054d1ece752b2585ef452f..0000000000000000000000000000000000000000
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Bundle.properties-MERGED
+++ /dev/null
@@ -1,378 +0,0 @@
-AccountsText.creditCardNumber=Credit Card Number
-AccountsText.creditCardNumbers=Credit Card Numbers
-AccountsText.nextItem.exception.msg=No next item.
-AccountsText.nextPage.exception.msg=No next page.
-AccountsText.previousItem.exception.msg=No previous item.
-AccountsText.previousPage.exception.msg=No previous page.
-CannotRunFileTypeDetection=Unable to run file type detection.
-DropdownListSearchPanel.selected=Ad Hoc Search data source filter is selected
-DropdownSingleTermSearchPanel.selected=Ad Hoc Search data source filter is selected
-DropdownSingleTermSearchPanel.warning.text=Boundary characters ^ and $ do not match word boundaries. Consider\nreplacing with an explicit list of boundary characters, such as [ \\.,]
-DropdownSingleTermSearchPanel.warning.title=Warning
-ExtractedContentPanel.setMarkup.panelTxt=<span style='font-style:italic'>Loading text... Please wait</span>
-# {0} - Content name
-ExtractedContentPanel.SetMarkup.progress.loading=Loading text for {0}
-GlobalEditListPanel.editKeyword.title=Edit Keyword
-GlobalEditListPanel.warning.text=Boundary characters ^ and $ do not match word boundaries. Consider\nreplacing with an explicit list of boundary characters, such as [ \\.,]
-GlobalEditListPanel.warning.title=Warning
-IndexedText.errorMessage.errorGettingText=<span style='font-style:italic'>Error retrieving indexed text.</span>
-IndexedText.warningMessage.knownFile=<span style='font-style:italic'>This file is a known file (based on MD5 hash) and does not have indexed text.</span>
-IndexedText.warningMessage.noTextAvailable=<span style='font-style:italic'>No indexed text for this file.</span>
-KeywordSearchGlobalSettingsPanel.Title=Global Keyword Search Settings
-KeywordSearchIngestModule.init.badInitMsg=Keyword search server was not properly initialized, cannot run keyword search ingest.
-# {0} - Reason for not connecting to Solr
-KeywordSearchIngestModule.init.exception.errConnToSolr.msg=Error connecting to SOLR server: {0}.
-# {0} - Reason for not starting Solr
-KeywordSearchIngestModule.init.tryStopSolrMsg={0}<br />Please try stopping Java Solr processes if any exist and restart the application.
-KeywordSearchIngestModule.noOpenCase.errMsg=No open case available.
-KeywordSearchIngestModule.startUp.noOpenCore.msg=The index could not be opened or does not exist.
-# {0} - schema version number
-KeywordSearchIngestModule.startupException.indexSchemaNotSupported=Adding text no longer supported for schema version {0} of the text index.
-# {0} - Solr version number
-KeywordSearchIngestModule.startupException.indexSolrVersionNotSupported=Adding text no longer supported for Solr version {0} of the text index.
-KeywordSearchIngestModule.startupMessage.failedToGetIndexSchema=Failed to get schema version for text index.
-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\n\
-    The module indexes files found in the disk image at ingest time.  \n\
-    It 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 seach 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
-ListBundleName=Keyword Lists
-ListBundleConfig=Keyword List Configuration
-ExtractedContentPanel.hitLabel.text=Matches on page:
-ExtractedContentPanel.hitCountLabel.text=-
-ExtractedContentPanel.hitOfLabel.text=of
-ExtractedContentPanel.hitTotalLabel.text=-
-ExtractedContentPanel.hitButtonsLabel.text=Match
-ExtractedContentPanel.hitPreviousButton.text=
-ExtractedContentPanel.hitNextButton.text=
-ExtractedContentPanel.copyMenuItem.text=Copy
-ExtractedContentPanel.selectAllMenuItem.text=Select All
-KeywordSearchEditListPanel.saveListButton.text=Copy List
-KeywordSearchEditListPanel.addWordField.text=
-KeywordSearchEditListPanel.addWordButton.text=New Keyword
-KeywordSearchEditListPanel.chRegex.text=Regular Expression
-KeywordSearchEditListPanel.deleteWordButton.text=Delete Keywords
-KeywordSearchEditListPanel.cutMenuItem.text=Cut
-KeywordSearchEditListPanel.selectAllMenuItem.text=Select All
-KeywordSearchEditListPanel.pasteMenuItem.text=Paste
-KeywordSearchEditListPanel.copyMenuItem.text=Copy
-KeywordSearchEditListPanel.exportButton.text=Export List
-KeywordSearchEditListPanel.deleteListButton.text=Delete List
-KeywordSearchEditListPanel.emptyKeyword.text=Empty keyword
-KeywordSearchEditListPanel.errorAddingKeywords.text=Error adding keyword(s)
-KeywordSearchListsManagementPanel.newListButton.text=New List
-KeywordSearchListsManagementPanel.importButton.text=Import List
-KeywordSearchListsViewerPanel.searchAddButton.text=Search
-KeywordSearchListsViewerPanel.manageListsButton.text=Manage Lists
-KeywordSearchListsViewerPanel.ingestIndexLabel.text=Files Indexed:
-ExtractedContentPanel.hitLabel.toolTipText=
-KeywordSearchEditListPanel.ingestMessagesCheckbox.text=Send ingest inbox messages for each hit
-KeywordSearchEditListPanel.ingestMessagesCheckbox.toolTipText=Send messages during ingest when hits on keywords from this list occur
-KeywordSearchEditListPanel.keywordOptionsLabel.text=Keyword Options
-KeywordSearchEditListPanel.listOptionsLabel.text=List Options
-KeywordSearchListsManagementPanel.keywordListsLabel.text=Keyword Lists:
-KeywordSearchEditListPanel.keywordsLabel.text=Keywords:
-OpenIDE-Module-Short-Description=Keyword Search ingest module, extracted text viewer and keyword search tools
-KeywordSearchListsViewerPanel.manageListsButton.toolTipText=Manage keyword lists, their settings and associated keywords. The settings are shared among all cases.
-AbstractKeywordSearchPerformer.search.dialogErrorHeader=Keyword Search Error
-AbstractKeywordSearchPerformer.search.invalidSyntaxHeader=Invalid query syntax. If this is a regular expression search note that Java predefined and POSIX character classes are not supported.
-AbstractKeywordSearchPerformer.search.searchIngestInProgressTitle=Keyword Search Ingest in Progress
-AbstractKeywordSearchPerformer.search.ingestInProgressBody=<html>Keyword Search Ingest is currently running.<br />Not all files have been indexed and this search might yield incomplete results.<br />Do you want to proceed with this search anyway?</html>
-AbstractKeywordSearchPerformer.search.emptyKeywordErrorBody=Keyword list is empty, please add at least one keyword to the list
-AbstractKeywordSearchPerformer.search.noFilesInIdxMsg=<html>No files are in index yet. <br />Try again later.  Index is updated every {0} minutes.</html>
-AbstractKeywordSearchPerformer.search.noFilesIdxdMsg=<html>No files were indexed.<br />Re-ingest the image with the Keyword Search Module enabled. </html>
-ExtractedContentViewer.toolTip=Displays extracted text from files and keyword-search results. Requires Keyword Search ingest to be run on a file to activate this viewer.
-ExtractedContentViewer.getTitle=Indexed Text
-HighlightedMatchesSource.toString=Search Results
-Installer.reportPortError=Indexing server port {0} is not available.  Check if your security software does not block {1} and consider changing {2} in {3} property file in the application user folder. Then try rebooting your system if another process was causing the conflict.
-Installer.reportStopPortError=Indexing server stop port {0} is not available.  Consider changing {1} in {2} property file in the application user folder.
-Installer.errorInitKsmMsg=Error initializing Keyword Search module
-Installer.reportInitError=Indexing server port {0} is not available.  Check if your security software does not block {1} and consider changing {2} in {3} property file in the application user folder. Then try rebooting your system if another process was causing the conflict.
-KeywordSearchConfigurationPanel.customizeComponents.listTabTitle=Lists
-KeywordSearchConfigurationPanel.customizeComponents.stringExtTitle=String Extraction
-KeywordSearchConfigurationPanel.customizeComponents.genTabTitle=General
-KeywordSearchConfigurationPanel.customizeComponents.listLabToolTip=List configuration
-KeywordSearchConfigurationPanel.customizeComponents.stringExtToolTip=String extraction configuration for Keyword Search Ingest
-KeywordSearchConfigurationPanel.customizeComponents.genTabToolTip=General configuration
-KeywordSearchConfigurationPanel1.customizeComponents.title=Delete a Keyword List
-KeywordSearchConfigurationPanel1.customizeComponents.body=This will delete the keyword list globally (for all Cases). Do you want to proceed with the deletion?
-KeywordSearchConfigurationPanel1.customizeComponents.keywordListEmptyErr=Keyword List is empty and cannot be saved
-KeywordSearch.newKwListTitle=New keyword list name\:
-KeywordSearch.openCore.notification.msg=Could not open keyword search index
-KeywordSearch.closeCore.notification.msg=Error closing keyword search index
-KeywordSearchConfigurationPanel1.customizeComponents.noOwDefaultMsg=Cannot overwrite default list
-KeywordSearchConfigurationPanel1.customizeComponents.kwListExistMsg=Keyword List <{0}> already exists, do you want to replace it?
-KeywordSearchConfigurationPanel1.customizeComponents.kwListSavedMsg=Keyword List <{0}> saved
-KeywordSearchEditListPanel.customizeComponents.kwReToolTip=Keyword is a regular expression
-KeywordSearchEditListPanel.customizeComponents.addWordToolTip=Add new words to the keyword search list
-KeywordSearchEditListPanel.customizeComponents.enterNewWordToolTip=Enter a new word or regex to search
-KeywordSearchEditListPanel.customizeComponents.exportToFile=Export the current keyword list to a file
-KeywordSearchEditListPanel.customizeComponents.saveCurrentWIthNewNameToolTip=Save the current keyword list with a new name
-KeywordSearchEditListPanel.customizeComponents.removeSelectedMsg=Remove selected keyword(s) from the list
-KeywordSearchEditListPanel.newKwTitle=New Keyword Entry
-KeywordSearchEditListPanel.addWordButtonAction.kwAlreadyExistsMsg=Keyword already exists in the list.
-KeywordSearchEditListPanel.invalidKwMsg=Invalid keyword pattern.  Use words or a correct regex pattern.
-KeywordSearchEditListPanel.removeKwMsg=Removing a keyword
-KeywordSearchEditListPanel.deleteWordButtonActionPerformed.delConfirmMsg=This will remove a keyword from the list globally (for all Cases). Do you want to proceed?
-KeywordSearchEditListPanel.exportButtonActionPerformed.fileFilterLabel=Keyword List XML Files
-KeywordSearchEditListPanel.exportButtonActionPerformed.fileExistPrompt=File {0} exists, overwrite?
-KeywordSearchEditListPanel.exportButtonActionPerformed.kwListExportedMsg=Keyword lists exported
-KeywordSearchEditListPanel.kwColName=Keyword
-KeywordSearchEditListPanel.addKeyword.message=Add a new word to the keyword search list\:
-KeywordSearchEditListPanel.addKeyword.title=New Keyword
-KeywordSearchFilterNode.getFileActions.openExternViewActLbl=Open in External Viewer
-KeywordSearchFilterNode.getFileActions.searchSameMd5=Search for files with the same MD5 hash
-KeywordSearchFilterNode.getFileActions.viewInNewWinActionLbl=View in New Window
-KeywordSearchIngestModule.init.noKwInLstMsg=No keywords in keyword list.
-KeywordSearchIngestModule.init.onlyIdxKwSkipMsg=Only indexing will be done and keyword search will be skipped (you can still add keyword lists using the Keyword Lists - Add to Ingest).
-KeywordSearchIngestModule.doInBackGround.displayName=Periodic Keyword Search
-KeywordSearchIngestModule.doInBackGround.finalizeMsg= - Finalizing
-KeywordSearchIngestModule.doInBackGround.pendingMsg= (Pending)
-RawText.FileText=File Text
-RawText.ResultText=Result Text
-SearchRunner.doInBackGround.cancelMsg= (Cancelling...)
-KeywordSearchIngestModule.postIndexSummary.knowFileHeaderLbl=Files with known types
-KeywordSearchIngestModule.postIndexSummary.fileGenStringsHead=Files with general strings extracted
-KeywordSearchIngestModule.postIndexSummary.mdOnlyLbl=Metadata only was indexed
-KeywordSearchIngestModule.postIndexSummary.idxErrLbl=Error (indexer)
-KeywordSearchIngestModule.postIndexSummary.errTxtLbl=Error (text extraction)
-KeywordSearchIngestModule.postIndexSummary.errIoLbl=Error (I/O)
-KeywordSearchIngestModule.postIndexSummary.kwIdxResultsLbl=Keyword Indexing Results
-KeywordSearchIngestModule.postIndexSummary.kwIdxErrsTitle=Keyword Indexing Errors
-KeywordSearchIngestModule.postIndexSummary.kwIdxErrMsgFiles=Keyword index service had errors ingesting {0} files.
-KeywordSearchIngestModule.postIndexSummary.kwIdxWarnMsgTitle=Keyword Indexing Warning
-KeywordSearchIngestModule.postIndexSummary.idxErrReadFilesMsg=Keyword index service had errors reading files and extracting text. Could have been from corrupt media or files.
-KeywordSearchListsViewerPanel.initIngest.addIngestTitle=Add to Ingest
-KeywordSearchListsViewerPanel.initIngest.addIngestMsg=<html>You can select additional keyword lists<br />and enqueue them to the ongoing ingest.<br />The selected lists will be searched next time the file index is rebuilt.</html>
-KeywordSearchListsViewerPanel.initIngest.searchIngestTitle=Search
-KeywordSearchListsViewerPanel.initIngest.addIdxSearchMsg=Search indexed files for keywords in selected lists
-KeywordSearchListsViewerPanel.initIngest.ongoingIngestMsg=Files Indexed\: {0} (ingest is ongoing)
-KeywordSearchListsViewerPanel.initIngest.fileIndexCtMsg=Files Indexed\: {0}
-KeywordSearch.selectedColLbl=Selected
-KeywordSearch.nameColLbl=Name
-KeywordSearch.typeColLbl=Keyword Type
-KeywordSearchQueryManager.execute.exeWinTitle=Keyword search {0} - {1}
-KeywordSearch.newKeywordListMsg=New Keyword List
-KeywordSearch.importListFileDialogMsg=Error importing keyword list from file {0}
-KeywordSearch.yesOwMsg=Yes, overwrite
-KeywordSearch.noSkipMsg=No, skip
-KeywordSearch.cancelImportMsg=Cancel import
-KeywordSearch.overwriteListPrompt=Keyword list <{0}> already exists locally, overwrite?
-KeywordSearch.importOwConflict=Import list conflict
-KeywordSearch.kwListFailImportMsg=Keyword list not imported
-KeywordSearchListsManagementPanel.fileExtensionFilterLbl=Autopsy Keyword List File (xml)
-KeywordSearchListsManagementPanel.fileExtensionFilterLb2=Encase Keyword List File (txt)
-KeywordSearch.listImportFeatureTitle=Keyword List Import
-KeywordSearchIngestModule.moduleName=Keyword Search
-KeywordSearchIngestModule.moduleDescription=Performs file indexing and periodic search using keywords and regular expressions in lists.
-DropdownSearchPanel.keywordTextField.text=
-KeywordSearchPanel.searchDropButton.text=Keyword Search
-DropdownSearchPanel.exactRadioButton.text=Exact Match
-DropdownSearchPanel.substringRadioButton.text=Substring Match
-DropdownSearchPanel.regexRadioButton.text=Regular Expression
-DropdownSearchPanel.searchButton.text=Search
-DropdownSearchPanel.cutMenuItem.text=Cut
-DropdownSearchPanel.selectAllMenuItem.text=Select All
-DropdownSearchPanel.pasteMenuItem.text=Paste
-DropdownSearchPanel.copyMenuItem.text=Copy
-AbstractFileStringContentStream.getSize.exception.msg=Cannot tell how many chars in converted string, until entire string is converted
-AbstractFileStringContentStream.getSrcInfo.text=File\:{0}
-ByteContentStream.getSrcInfo.text=File\:{0}
-ExtractedContentViewer.nextPage.exception.msg=No next page.
-ExtractedContentViewer.previousPage.exception.msg=No previous page.
-ExtractedContentViewer.hasNextItem.exception.msg=Not supported, not a searchable source.
-ExtractedContentViewer.hasPreviousItem.exception.msg=Not supported, not a searchable source.
-ExtractedContentViewer.nextItem.exception.msg=Not supported, not a searchable source.
-ExtractedContentViewer.previousItem.exception.msg=Not supported, not a searchable source.
-ExtractedContentViewer.currentItem.exception.msg=Not supported, not a searchable source.
-Ingester.ingest.exception.unknownImgId.msg=Skipping indexing the file, unknown image id, for file\: {0}
-Ingester.ingest.exception.cantReadStream.msg=Could not read content stream\: {0}
-Ingester.ingest.exception.err.msg=Error ingesting document\: {0}
-Ingester.ingestExtract.exception.solrTimeout.msg=Solr index request time out for id\: {0}, name\: {1}
-Ingester.ingestExtract.exception.probPostToSolr.msg=Problem posting content to Solr, id\: {0}, name\: {1}
-Ingester.UpReqestTask.run.exception.sorlNotAvail.msg=No Solr core available, cannot index the content
-Ingester.UpRequestTask.run.exception.probReadFile.msg=Problem reading file.
-Ingester.UpRequestTask.run.exception.solrProb.msg=Problem with Solr
-Ingester.UpRequestTask.run.exception.probPostToSolr.msg=Problem posting file contents to Solr. SolrException error code\: {0}
-Ingester.FscContentStream.getSrcInfo=File\:{0}
-Ingester.FscContentStream.getReader=Not supported yet.
-Ingester.NullContentStream.getSrcInfo.text=File\:{0}
-Ingester.NullContentStream.getReader=Not supported yet.
-KeywordSearch.moduleErr=Module Error
-KeywordSearch.fireNumIdxFileChg.moduleErr.msg=A module caused an error listening to KeywordSearch updates. See log to determine which module. Some data could be incomplete.
-KeywordSearchListsEncase.save.exception.msg=Not supported yet.
-KeywordSearchListsEncase.save2.exception.msg=Not supported yet.
-KeywordSearchListsEncase.encaseMetaType.exception.msg=Unsupported EncaseMetaType\: {0}
-KeywordSearchListsManagementPanel.getColName.text=Name
-KeywordSearchListsManagementPanel.setValueAt.exception.msg=Editing of cells is not supported
-KeywordSearchOptionsPanelController.moduleErr=Module Error
-KeywordSearchOptionsPanelController.moduleErr.msg1=A module caused an error listening to KeywordSearchOptionsPanelController updates. See log to determine which module. Some data could be incomplete.
-KeywordSearchOptionsPanelController.moduleErr.msg2=A module caused an error listening to KeywordSearchOptionsPanelController updates. See log to determine which module. Some data could be incomplete.
-KeywordSearchQueryManager.pathText.text=Keyword search
-KeywordSearchResultFactory.progress.saving=Saving results\: {0}
-KeywordSearchSettings.moduleName.text=KeywordSearch
-KeywordSearchSettings.properties_options.text={0}_Options
-KeywordSearchSettings.propertiesNSRL.text={0}_NSRL
-KeywordSearchSettings.propertiesScripts.text={0}_Scripts
-NoOpenCoreException.err.noOpenSorlCore.msg=No currently open Solr core.
-SearchRunner.query.exception.msg=Error performing query:
-# {0} - core name
-Server.deleteCore.exception.msg=Failed to delete Solr core {0}
-Server.start.exception.cantStartSolr.msg=Could not start Solr server process
-Server.start.exception.cantStartSolr.msg2=Could not start Solr server process
-Server.isRunning.exception.errCheckSolrRunning.msg=Error checking if Solr server is running
-Server.isRunning.exception.errCheckSolrRunning.msg2=Error checking if Solr server is running
-Server.openCore.exception.alreadyOpen.msg=Already an open Core\! Explicitely close Core first.
-Server.queryNumIdxFiles.exception.msg=Error querying number of indexed files,
-Server.queryNumIdxChunks.exception.msg=Error querying number of indexed chunks,
-Server.queryNumIdxDocs.exception.msg=Error querying number of indexed documents,
-Server.queryIsIdxd.exception.msg=Error checking if content is indexed,
-Server.queryNumFileChunks.exception.msg=Error getting number of file chunks,
-Server.query.exception.msg=Error running query\: {0}
-Server.query2.exception.msg=Error running query\: {0}
-Server.queryTerms.exception.msg=Error running terms query\: {0}
-Server.connect.exception.msg=Failed to connect to Solr server\: {0}
-Server.openCore.exception.msg=Keyword search service not yet running
-Server.openCore.exception.cantOpen.msg=Could not create or open index
-Server.openCore.exception.noIndexDir.msg=Index directory could not be created or is missing
-Server.request.exception.exception.msg=Could not issue Solr request
-Server.commit.exception.msg=Could not commit index
-Server.addDoc.exception.msg=Could not add document to index via update handler\: {0}
-Server.addDoc.exception.msg2=Could not add document to index via update handler\: {0}
-Server.close.exception.msg=Cannot close Core
-Server.close.exception.msg2=Cannot close Core
-Server.solrServerNoPortException.msg=Indexing server could not bind to port {0}, port is not available, consider change the default {1} port.
-KeywordSearchJobSettingsPanel.keywordSearchEncodings.text=-
-KeywordSearchJobSettingsPanel.languagesValLabel.toolTipText=
-KeywordSearchJobSettingsPanel.languagesValLabel.text=-
-KeywordSearchJobSettingsPanel.encodingsLabel.text=Encodings:
-KeywordSearchJobSettingsPanel.titleLabel.text=Select keyword lists to enable during ingest:
-KeywordSearchJobSettingsPanel.languagesLabel.toolTipText=Scripts enabled for string extraction from unknown file types. Changes can be done in Advanced Settings.
-KeywordSearchJobSettingsPanel.languagesLabel.text=Scripts enabled for string extraction from unknown file types:
-KeywordSearchGlobalLanguageSettingsPanel.enableUTF8Checkbox.text=Enable UTF8 text extraction
-KeywordSearchGlobalLanguageSettingsPanel.ingestSettingsLabel.text=Ingest settings for string extraction from unknown file types (changes effective on next ingest):
-KeywordSearchGlobalLanguageSettingsPanel.enableUTF16Checkbox.text=Enable UTF16LE and UTF16BE string extraction
-KeywordSearchGlobalLanguageSettingsPanel.enableOcrCheckbox.text=Enable Optical Character Recognition (OCR)
-KeywordSearchGlobalLanguageSettingsPanel.languagesLabel.text=Enabled scripts (languages):
-KeywordSearchGlobalSearchSettingsPanel.timeRadioButton1.toolTipText=20 mins. (fastest ingest time)
-KeywordSearchGlobalSearchSettingsPanel.timeRadioButton1.text=20 minutes (slowest feedback, fastest ingest)
-KeywordSearchGlobalSearchSettingsPanel.timeRadioButton2.toolTipText=10 minutes (faster overall ingest time than default)
-KeywordSearchGlobalSearchSettingsPanel.timeRadioButton2.text=10 minutes (slower feedback, faster ingest)
-KeywordSearchGlobalSearchSettingsPanel.frequencyLabel.text=Results update frequency during ingest:
-KeywordSearchGlobalSearchSettingsPanel.skipNSRLCheckBox.toolTipText=Requires Hash Set service to had run previously, or be selected for next ingest.
-KeywordSearchGlobalSearchSettingsPanel.skipNSRLCheckBox.text=Do not add files in NSRL (known files) to keyword index during ingest
-KeywordSearchGlobalSearchSettingsPanel.informationLabel.text=Information
-KeywordSearchGlobalSearchSettingsPanel.settingsLabel.text=Settings
-KeywordSearchGlobalSearchSettingsPanel.filesIndexedValue.text=0
-KeywordSearchGlobalSearchSettingsPanel.filesIndexedLabel.text=Files in keyword index:
-KeywordSearchGlobalSearchSettingsPanel.showSnippetsCB.text=Show Keyword Preview in Keyword Search Results (will result in longer search times)
-KeywordSearchGlobalSearchSettingsPanel.chunksValLabel.text=0
-KeywordSearchGlobalSearchSettingsPanel.timeRadioButton4.toolTipText=1 minute (overall ingest time will be longest)
-KeywordSearchGlobalSearchSettingsPanel.timeRadioButton4.text_1=1 minute (faster feedback, longest ingest)
-KeywordSearchGlobalSearchSettingsPanel.chunksLabel.text=Chunks in keyword index:
-KeywordSearchGlobalSearchSettingsPanel.timeRadioButton3.toolTipText=5 minutes (overall ingest time will be longer)
-KeywordSearchGlobalSearchSettingsPanel.timeRadioButton3.text=5 minutes (default)
-KeywordSearchIngestModule.regExpHitLbl=Reg Ex hit: 
-KeywordSearchIngestModule.kwHitLbl=Keyword hit: 
-KeywordSearchIngestModule.kwHitThLbl=Keyword
-KeywordSearchIngestModule.previewThLbl=Preview
-KeywordSearchIngestModule.fileThLbl=File
-KeywordSearchIngestModule.listThLbl=List
-KeywordSearchIngestModule.regExThLbl=Reg Ex
-AbstractFileTikaTextExtract.index.tikaParseTimeout.text=Exception\: Tika parse timeout for content\: {0}, {1}
-AbstractFileTikaTextExtract.index.exception.tikaParse.msg=Exception\: Unexpected exception from Tika parse task execution for file\: {0}, {1}
-KeywordSearchEditListPanel.exportButtonAction.featureName.text=Keyword List Export
-KeywordSearchGlobalListSettingsPanel.component.featureName.text=Save Keyword List
-KeywordSearchListsAbstract.moduleErr=Module Error
-KeywordSearchListsAbstract.addList.errMsg1.msg=A module caused an error listening to KeywordSearchListsAbstract updates. See log to determine which module. Some data could be incomplete.
-KeywordSearchListsAbstract.addList.errMsg2.msg=A module caused an error listening to KeywordSearchListsAbstract updates. See log to determine which module. Some data could be incomplete.
-SearchRunner.updateTimer.title.text=SearchRunner update timer
-KeywordSearchListsAbstract.saveList.errMsg1.msg=A module caused an error listening to KeywordSearchListsAbstract updates. See log to determine which module. Some data could be incomplete.
-KeywordSearchListsAbstract.saveList.errMsg2.msg=A module caused an error listening to KeywordSearchListsAbstract updates. See log to determine which module. Some data could be incomplete.
-KeywordSearchListsAbstract.writeLists.errMsg1.msg=A module caused an error listening to KeywordSearchListsAbstract updates. See log to determine which module. Some data could be incomplete.
-KeywordSearchListsAbstract.writeLists.errMsg2.msg=A module caused an error listening to KeywordSearchListsAbstract updates. See log to determine which module. Some data could be incomplete.
-KeywordSearchListsAbstract.deleteList.errMsg1.msg=A module caused an error listening to KeywordSearchListsAbstract updates. See log to determine which module. Some data could be incomplete.
-KeywordSearchListsManagementPanel.newKeywordListDescription=Keyword list <{0}> already exists as a read-only list. Do you want to replace it for the duration of the program (the change will not be persistent).
-KeywordSearchListsManagementPanel.newKeywordListDescription2=Keyword list <{0}> already exists, do you want to replace it?
-KeywordSearchModuleFactory.getIngestJobSettingsPanel.exception.msg=Expected settings argument to be instanceof KeywordSearchJobSettings
-KeywordSearchModuleFactory.createFileIngestModule.exception.msg=Expected settings argument to be instanceof KeywordSearchJobSettings
-SearchRunner.Searcher.done.err.msg=Error performing keyword search
-KeywordSearchGlobalSearchSettingsPanel.timeRadioButton5.toolTipText=Fastest overall, but no results until the end
-KeywordSearchGlobalSearchSettingsPanel.timeRadioButton5.text=No periodic searches
-SolrConnectionCheck.HostnameOrPort=Invalid hostname and/or port number.
-SolrConnectionCheck.Hostname=Invalid hostname.
-SolrConnectionCheck.MissingHostname=Missing hostname.
-GlobalListsManagementPanel.newListButton.text=New List
-GlobalListsManagementPanel.importButton.text=Import List
-GlobalListsManagementPanel.keywordListsLabel.text=Keyword Lists:
-NewKeywordPanel.regexButton.text=Regular Expression
-NewKeywordPanel.exactButton.text=Exact Match
-NewKeywordPanel.substringButton.text=Substring Match
-NewKeywordPanel.keywordTextField.text=
-NewKeywordPanel.newKeywordLabel.text=Enter a new keyword:
-AddKeywordsDialog.exactRadioButton.text=Exact Match
-AddKeywordsDialog.substringRadioButton.text=Substring Match
-AddKeywordsDialog.regexRadioButton.text=Regular Expression
-AddKeywordsDialog.keywordTypeLabel.text=Select type for keywords:
-AddKeywordsDialog.enterKeywordsLabel.text=Enter keywords (one per line) below:
-AddKeywordsDialog.pasteButton.text=Paste From Clipboard
-AddKeywordsDialog.addButton.text=OK
-AddKeywordsDialog.cancelButton.text=Cancel
-AddKeywordsDialog.addKeywordsTitle.text=New Keywords
-GlobalEditListPanel.newKeywordsButton.text=New Keywords
-GlobalEditListPanel.addKeywordResults.text=Add Keyword Results
-GlobalEditListPanel.keywordsAdded.text={0} keyword was successfully added.
-GlobalEditListPanel.keywordsAddedPlural.text={0} keywords were successfully added.
-GlobalEditListPanel.keywordDupesSkipped.text={0} keyword was already in the list.
-GlobalEditListPanel.keywordDupesSkippedPlural.text={0} keywords were already in the list.
-GlobalEditListPanel.keywordErrors.text={0} keyword could not be parsed. Please review and try again.
-GlobalEditListPanel.keywordErrorsPlural.text={0} keywords could not be parsed. Please review and try again.
-GlobalListsManagementPanel.exportButton.text=Export List
-GlobalListsManagementPanel.deleteListButton.text=Delete List
-GlobalListsManagementPanel.copyListButton.text=Copy List
-GlobalListsManagementPanel.renameListButton.text=Edit List Name
-GlobalEditListPanel.editWordButton.text=Edit Keyword
-SolrConnectionCheck.Port=Invalid port number.
-SolrSearch.checkingForLatestIndex.msg=Looking for text index with latest Solr and schema version
-SolrSearch.complete.msg=Text index successfully opened
-SolrSearch.creatingNewIndex.msg=Creating new text index
-SolrSearch.findingIndexes.msg=Looking for existing text index directories
-SolrSearch.indentifyingIndex.msg=Identifying text index to use
-SolrSearch.lookingForMetadata.msg=Looking for text index metadata file
-SolrSearch.openCore.msg=Opening text index
-SolrSearch.openGiantCore.msg=Opening text index. Text index for this case is very large and may take long time to load.
-SolrSearch.openLargeCore.msg=Opening text index. This may take several minutes.
-SolrSearch.readingIndexes.msg=Reading text index metadata file
-# {0} - index folder path
-SolrSearchService.exceptionMessage.failedToDeleteIndexFiles=Failed to delete text index files at {0}
-SolrSearchService.exceptionMessage.noCurrentSolrCore=IndexMetadata did not contain a current Solr core so could not delete the case
-# {0} - case directory
-SolrSearchService.exceptionMessage.noIndexMetadata=Unable to create IndexMetaData from case directory: {0}
-SolrSearchService.ServiceName=Solr Keyword Search Service
-SolrSearchService.IndexReadOnlyDialog.title=Text Index Is Read-Only
-SolrSearchService.IndexReadOnlyDialog.msg=<html>The text index for this case is read-only. <br />You will be able to see existing keyword search results and perform exact match and substring match keyword searches,<br />but you will not be able to add new text to the index or perform regex searches. You may instead open the case<br /> with your previous version of this application.</html>
-ExtractedContentPanel.jLabel1.text=Text Source:
-ExtractedContentPanel.pagePreviousButton.actionCommand=pagePreviousButton
-ExtractedContentPanel.pagePreviousButton.text=
-ExtractedContentPanel.pageNextButton.text=
-ExtractedContentPanel.pageCurLabel.text=-
-ExtractedContentPanel.pageOfLabel.text=of
-ExtractedContentPanel.pageTotalLabel.text=-
-ExtractedContentPanel.pageButtonsLabel.text=Page
-ExtractedContentPanel.pagesLabel.text=Page:
-DropdownSingleTermSearchPanel.dataSourceCheckBox.text=Restrict search to the selected data sources:
-DropdownListSearchPanel.dataSourceCheckBox.text=Restrict search to the selected data sources:
-DropdownSingleTermSearchPanel.ingestIndexLabel.text=Files Indexed:
-DropdownSingleTermSearchPanel.jSaveSearchResults.toolTipText=Perform keyword search without saving the results in the form of keyword hit artifacts
-DropdownSingleTermSearchPanel.jSaveSearchResults.text=Save search results
-DropdownListSearchPanel.jSaveSearchResults.toolTipText=Perform keyword search without saving the results in the form of keyword hit artifacts
-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.
diff --git a/RecentActivity/build.xml b/RecentActivity/build.xml
index 738f1ca9a20317235c14d3279de6d1e858544da8..af346f58e748737aa658c4a41194296e6ed7de09 100644
--- a/RecentActivity/build.xml
+++ b/RecentActivity/build.xml
@@ -21,7 +21,6 @@
         </copy>
     </target>
     
-    
     <target name="get-deps" depends="init-ivy,get-thirdparty-tools">
         <!-- fetch all the dependencies from Ivy and stick them in the right places -->
         <ivy:resolve log="quiet"/>
@@ -36,20 +35,4 @@
         out-of-date/unneeded stuff in the installer-->
         <delete  dir="${basedir}/release" />
     </target>
-    
-    <target name="compile" depends="projectized-common.compile">
-        <antcall target="copy-bundle" />
-    </target>
-
-    <target name="copy-bundle">
-        <!-- the externalized strings in 'src' are in both the java files as annotations and in the Bundle.property files.
-          The strings get merged during compilation.  This target copies that merged file into src so that it can be checked
-          in and used as a basis for translation efforts -->
-        <copy todir="src">
-            <fileset dir="build/classes">
-                <include name="**/Bundle.properties"/>
-            </fileset>
-            <globmapper from="*" to="*-MERGED"/>
-        </copy>
-    </target>
 </project>
diff --git a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Bundle.properties-MERGED b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Bundle.properties-MERGED
deleted file mode 100755
index 8ca26a2a9da0ca96730d244bea5aea31d45874c6..0000000000000000000000000000000000000000
--- a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Bundle.properties-MERGED
+++ /dev/null
@@ -1,149 +0,0 @@
-cannotBuildXmlParser=Unable to build XML parser: 
-cannotLoadSEUQA=Unable to load Search Engine URL Query Analyzer settings file, SEUQAMappings.xml: 
-cannotParseXml=Unable to parse XML file: 
-# {0} - OS name
-DataSourceUsageAnalyzer.customVolume.label=OS Drive ({0})
-DataSourceUsageAnalyzer.parentModuleName=Recent Activity
-Extract.indexError.message=Failed to index artifact for keyword search.
-Extract.noOpenCase.errMsg=No open case available.
-ExtractOs.androidOs.label=Android
-ExtractOs.androidVolume.label=OS Drive (Android)
-ExtractOs.debianLinuxOs.label=Linux (Debian)
-ExtractOs.debianLinuxVolume.label=OS Drive (Linux Debian)
-ExtractOs.fedoraLinuxOs.label=Linux (Fedora)
-ExtractOs.fedoraLinuxVolume.label=OS Drive (Linux Fedora)
-ExtractOs.gentooLinuxOs.label=Linux (Gentoo)
-ExtractOs.gentooLinuxVolume.label=OS Drive (Linux Gentoo)
-ExtractOs.mandrakeLinuxOs.label=Linux (Mandrake)
-ExtractOs.mandrakeLinuxVolume.label=OS Drive (Linux Mandrake)
-ExtractOs.novellSUSEOs.label=Linux (Novell SUSE)
-ExtractOs.novellSUSEVolume.label=OS Drive (Linux Novell SUSE)
-ExtractOs.osx.label=Mac OS X
-ExtractOs.osxVolume.label=OS Drive (OS X)
-ExtractOs.parentModuleName=Recent Activity
-ExtractOs.redhatLinuxOs.label=Linux (Redhat)
-ExtractOs.redhatLinuxVolume.label=OS Drive (Linux Redhat)
-ExtractOs.slackwareLinuxOs.label=Linux (Slackware)
-ExtractOs.slackwareLinuxVolume.label=OS Drive (Linux Slackware)
-ExtractOs.solarisSparcOs.label=Linux (Solaris/Sparc)
-ExtractOs.solarisSparcVolume.label=OS Drive (Linux Solaris/Sparc)
-ExtractOs.sunJDSLinuxOs.label=Linux (Sun JDS)
-ExtractOs.sunJDSLinuxVolume.label=OS Drive (Linux Sun JDS)
-ExtractOs.ubuntuLinuxOs.label=Linux (Ubuntu)
-ExtractOs.ubuntuLinuxVolume.label=OS Drive (Linux Ubuntu)
-ExtractOs.unitedLinuxOs.label=Linux (United Linux)
-ExtractOs.unitedLinuxVolume.label=OS Drive (Linux United Linux)
-ExtractOs.windowsVolume.label=OS Drive (Windows)
-ExtractOs.yellowDogLinuxOs.label=Linux (Yellow Dog)
-ExtractOs.yellowDogLinuxVolume.label=OS Drive (Linux Yellow Dog)
-OpenIDE-Module-Display-Category=Ingest Module
-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 acitivity (sites visited, stored cookies, bookmarked sites, search engine queries, file downloads),\n- Recently attached devices,\n- Installed programs.\n\n\
-    The module currently supports Windows only disk images.  \n\
-    The 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
-Chrome.getHistory.errMsg.errGettingFiles=Error when trying to get Chrome history files.
-Chrome.getHistory.errMsg.couldntFindAnyFiles=Could not find any allocated Chrome history files.
-Chrome.getHistory.errMsg.errAnalyzingFile={0}\: Error while trying to analyze file\:{1}
-Chrome.parentModuleName=Recent Activity
-Chrome.getBookmark.errMsg.errGettingFiles=Error when trying to get Chrome Bookmark files.
-Chrome.getBookmark.errMsg.errAnalyzingFile={0}\: Error while trying to analyze file\:{1}
-Chrome.getBookmark.errMsg.errAnalyzeFile={0}\: Error while trying to analyze file\: {1}
-Chrome.getBookmark.errMsg.errAnalyzingFile3={0}\: Error while trying to analyze file\: {1}
-Chrome.getBookmark.errMsg.errAnalyzingFile4={0}\: Error while trying to analyze file\:{1}
-Chrome.getCookie.errMsg.errGettingFiles=Error when trying to get Chrome history files.
-Chrome.getCookie.errMsg.errAnalyzeFile={0}\: Error while trying to analyze file\:{1}
-Chrome.getDownload.errMsg.errGettingFiles=Error when trying to get Chrome history files.
-Chrome.getDownload.errMsg.errAnalyzeFiles1={0}\: Error while trying to analyze file\:{1}
-Chrome.getLogin.errMsg.errGettingFiles=Error when trying to get Chrome history files.
-Chrome.getLogin.errMsg.errAnalyzingFiles={0}\: Error while trying to analyze file\:{1}
-Chrome.getAutofill.errMsg.errGettingFiles=Error when trying to get Chrome Web Data files.
-Chrome.getAutofill.errMsg.errAnalyzingFiles={0}\: Error while trying to analyze file\:{1}
-Extract.dbConn.errMsg.failedToQueryDb={0}\: Failed to query database.
-ExtractIE.moduleName.text=Internet Explorer
-ExtractIE.getBookmark.errMsg.errGettingBookmarks={0}\: Error getting Internet Explorer Bookmarks.
-ExtractIE.parentModuleName.noSpace=RecentActivity
-ExtractIE.parentModuleName=Recent Activity
-ExtractIE.getURLFromIEBmkFile.errMsg={0}\: Error parsing IE bookmark File {1}
-ExtractIE.getURLFromIEBmkFile.errMsg2={0}\: Error parsing IE bookmark File {1}
-ExtractIE.getCookie.errMsg.errGettingFile={0}\: Error getting Internet Explorer cookie files.
-ExtractIE.getCookie.errMsg.errReadingIECookie={0}\: Error reading Internet Explorer cookie {1}
-ExtractIE.getHistory.errMsg.unableToGetHist={0}\: Unable to get IE History\: pasco not found
-ExtractIE.getHistory.errMsg.errGettingHistFiles={0}\: Error getting Internet Explorer history files
-ExtractIE.getHistory.errMsg.noHistFiles=No InternetExplorer history files found.
-ExtractIE.getHistory.errMsg.errWriteFile={0}\: Error while trying to write file\:{1}
-ExtractIE.getHistory.errMsg.errProcHist={0}\: Error processing Internet Explorer history.
-ExtractIE.parsePascoOutput.errMsg.notFound={0}\: Pasco output not found\: {1}
-ExtractIE.parsePascoOutput.errMsg.errParsing={0}\: Error parsing IE history entry {1}
-ExtractIE.parsePascoOutput.errMsg.errParsingEntry={0}\: Error parsing Internet Explorer History entry.
-ExtractRegistry.moduleName.text=Registry
-ExtractRegistry.findRegFiles.errMsg.errReadingFile=Error fetching registry file\: {0}
-ExtractRegistry.analyzeRegFiles.errMsg.errWritingTemp={0}\: Error analyzing registry file {1}
-ExtractRegistry.analyzeRegFiles.failedParsingResults={0}\: Failed parsing registry file results {1}
-ExtractRegistry.parentModuleName.noSpace=RecentActivity
-ExtractRegistry.programName=RegRipper
-ExtractRegistry.analyzeRegFiles.errMsg.errReadingRegFile={0}\: Error reading registry file - {1}
-ExtractRegistry.execRegRip.errMsg.failedAnalyzeRegFile={0}\: Failed to analyze registry file
-ExtractRegistry.execRegRip.errMsg.failedAnalyzeRegFile2={0}\: Failed to analyze registry file
-ExtractRegistry.execRegRip.errMsg.failedAnalyzeRegFile3={0}\: Failed to analyze registry file
-ExtractRegistry.execRegRip.errMsg.failedAnalyzeRegFile4={0}\: Failed to analyze registry file
-Firefox.moduleName=FireFox
-Firefox.getHistory.errMsg.errFetchingFiles=Error fetching internet history files for Firefox.
-Firefox.getHistory.errMsg.noFilesFound=No FireFox history files found.
-Firefox.getHistory.errMsg.errAnalyzeFile={0}\: Error while trying to analyze file\:{1}
-Firefox.getFormsAutofill.errMsg.errFetchingFiles=Error fetching form history file for Firefox.
-Firefox.getFormsAutofill.errMsg.noFilesFound=No FireFox form history files found.
-Firefox.getFormsAutofill.errMsg.errAnalyzeFile={0}\: Error while trying to analyze file\:{1}
-Firefox.getAutofillProfiles.errMsg.errFetchingFiles=Error fetching Autofill Profiles file for Firefox.
-Firefox.getAutofillProfiles.errMsg.noFilesFound=No FireFox Autofill Profiles files found.
-Firefox.getAutofillProfiles.errMsg.errAnalyzeFile={0}\: Error while trying to analyze file\:{1}
-Firefox.parentModuleName.noSpace=RecentActivity
-Firefox.parentModuleName=Recent Activity
-Firefox.getBookmark.errMsg.errFetchFiles=Error fetching bookmark files for Firefox.
-Firefox.getBookmark.errMsg.errAnalyzeFile={0}\: Error while trying to analyze file\:{1}
-Firefox.getCookie.errMsg.errFetchFile=Error fetching cookies files for Firefox.
-Firefox.getCookie.errMsg.errAnalyzeFile={0}\: Error while trying to analyze file\:{1}
-Firefox.getDlPre24.errMsg.errFetchFiles=Error fetching 'downloads' files for Firefox.
-Firefox.getDlPre24.errMsg.errAnalyzeFiles={0}\: Error while trying to analyze file\:{1}
-Firefox.getDlPre24.errMsg.errParsingArtifacts={0}\: Error parsing {1} Firefox web history artifacts.
-Firefox.getDlV24.errMsg.errFetchFiles=Error fetching 'downloads' files for Firefox.
-Firefox.getDlV24.errMsg.errAnalyzeFile={0}\: Error while trying to analyze file\:{1}
-Firefox.getDlV24.errMsg.errParsingArtifacts={0}\: Error parsing {1} Firefox web download artifacts.
-RAImageIngestModule.process.started=Started {0}
-RAImageIngestModule.process.errModFailed={0} failed - see log for details <br>
-RAImageIngestModule.process.errModErrs={0} had errors -- see log
-RAImageIngestModule.process.errMsg.errsEncountered=<p>Errors encountered during analysis\: <ul>
-RAImageIngestModule.process.errMsgSub.oneErr=1 error found
-RAImageIngestModule.process.errMsgSub.nErrs={0} errors found
-RAImageIngestModule.process.ingestMsg.finished=Finished {0} - {1}
-RAImageIngestModule.process.errMsg.noErrs=<p>No errors encountered.</p>
-RAImageIngestModule.process.errMsgSub.noErrs=No errors reported
-RAImageIngestModule.process.histMsg.title=<p>Browser Data on {0}\:<ul>
-RAImageIngestModule.process.histMsg.found=\ Found.
-RAImageIngestModule.process.histMsg.notFnd=\ Not Found.
-RAImageIngestModule.process.ingestMsg.results={0} - Browser Results
-RAImageIngestModule.complete.errMsg.failed={0} failed to complete - see log for details <br>
-RAImageIngestModule.getName=Recent Activity
-RAImageIngestModule.getDesc=Extracts recent user activity, such as Web browsing, recently used documents and installed programs.
-RecentDocumentsByLnk.getRecDoc.errMsg.errGetLnkFiles={0}\: Error getting lnk Files.
-RecentDocumentsByLnk.getRecDoc.errParsingFile={0}\: Error parsing Recent File {1}
-RecentDocumentsByLnk.parentModuleName.noSpace=RecentActivity
-RecentDocumentsByLnk.parentModuleName=Recent Activity
-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
-SearchEngineURLQueryAnalyzer.domainSubStr.none=NONE
-SearchEngineURLQueryAnalyzer.toString=Name\: {0}\n\
- Domain Substring\: {1}\n\
- count\: {2}\n\
- Split Tokens\: \n\
- {3}
-SearchEngineURLQueryAnalyzer.parentModuleName.noSpace=RecentActivity
-SearchEngineURLQueryAnalyzer.parentModuleName=Recent Activity
-UsbDeviceIdMapper.parseAndLookup.text=Product\: {0}
diff --git a/thunderbirdparser/build.xml b/thunderbirdparser/build.xml
index caabb5f0de06d6c184e329a286334c68238925be..0b0a4fe2dd3e72ee4ad41a1528f4f7f3851d7207 100644
--- a/thunderbirdparser/build.xml
+++ b/thunderbirdparser/build.xml
@@ -32,21 +32,5 @@
     </target>
     
     <target name="init" depends="get-deps,harness.init"/>
-    
-    <target name="compile" depends="projectized-common.compile">
-        <antcall target="copy-bundle" />
-    </target>
-
-    <target name="copy-bundle">
-        <!-- the externalized strings in 'src' are in both the java files as annotations and in the Bundle.property files.
-          The strings get merged during compilation.  This target copies that merged file into src so that it can be checked
-          in and used as a basis for translation efforts -->
-        <copy todir="src">
-            <fileset dir="build/classes">
-                <include name="**/Bundle.properties"/>
-            </fileset>
-            <globmapper from="*" to="*-MERGED"/>
-        </copy>
-    </target>
 </project>
 
diff --git a/thunderbirdparser/src/org/sleuthkit/autopsy/thunderbirdparser/Bundle.properties-MERGED b/thunderbirdparser/src/org/sleuthkit/autopsy/thunderbirdparser/Bundle.properties-MERGED
deleted file mode 100755
index a699992c1a848bb5f121fd62d1c3011141dd2211..0000000000000000000000000000000000000000
--- a/thunderbirdparser/src/org/sleuthkit/autopsy/thunderbirdparser/Bundle.properties-MERGED
+++ /dev/null
@@ -1,32 +0,0 @@
-MboxParser.handleAttch.noOpenCase.errMsg=Exception while getting open case.
-OpenIDE-Module-Display-Category=Ingest Module
-OpenIDE-Module-Long-Description=\
-    Email Parser ingest module.\n\n\
-    The module extracts MBOX and PST e-mail files and posts the results to the blackboard.  \n\
-    It knows about the Thunderbird folder structure for MBOX files.
-OpenIDE-Module-Name=Email Parser
-OpenIDE-Module-Short-Description=Parses MBOX and PST files
-MboxParser.parse.errMsg.failedToReadFile=Failed to read mbox file from disk.
-MboxParser.parse.errMsg.couldntFindCharset=Could not find appropriate charset encoder.
-MboxParser.parse.errMsg.failedToParseNMsgs=Failed to extract {0} email messages.
-MboxParser.handleAttch.errMsg.failedToCreateOnDisk=Failed to extract MBOX attachment to disk\: {0}
-MboxParser.handleAttch.failedWriteToDisk=Failed to extract attachment to disk\: {0}
-PstParser.noOpenCase.errMsg=Exception while getting open case.
-PstParser.parse.errMsg.failedToParseNMsgs=Failed to extract {0} email messages.
-PstParser.extractAttch.errMsg.failedToExtractToDisk=Failed to extract PST attachment to disk\: {0}
-ThunderbirdMboxFileIngestModule.addArtifact.indexError.message=Failed to index email message detected artifact for keyword search.
-ThunderbirdMboxFileIngestModule.moduleName=Email Parser
-ThunderbirdMboxFileIngestModule.noOpenCase.errMsg=Exception while getting open case.
-ThunderbirdMboxFileIngestModule.processPst.errMsg.outOfDiskSpace=Out of disk space. Cannot copy {0} to parse.
-ThunderbirdMboxFileIngestModule.encryptionFileLevel=File-level Encryption
-ThunderbirdMboxFileIngestModule.processPst.errProcFile.msg=Error while processing {0}
-ThunderbirdMboxFileIngestModule.processPst.errProcFile.details=Only files from Outlook 2003 and later are supported.
-ThunderbirdMboxFileIngestModule.processPst.errProcFile.msg2=Error while processing {0}
-ThunderbirdMboxFileIngestModule.processMBox.errProcFile.msg=Error while processing {0}
-ThunderbirdMboxFileIngestModule.processMBox.errProfFile.details=Out of disk space. Cannot copy file to parse.
-ThunderbirdMboxFileIngestModule.processMBox.errProcFile.msg2=Error while processing {0}
-ThunderbirdMboxFileIngestModule.getDesc.text=This module detects and parses mbox and pst/ost files and populates email artifacts in the blackboard.
-ThunderbirdMboxFileIngestModule.handleAttch.errMsg=Error processing {0}
-ThunderbirdMboxFileIngestModule.handleAttch.errMsg.details=Failed to add attachment named {0} to the case.
-ThunderbirdMboxFileIngestModule.notAvail=Not available
-ThunderbirdMboxFileIngestModule.processPst.indexError.message=Failed to index encryption detected artifact for keyword search.