diff --git a/Core/src/org/sleuthkit/autopsy/contentviewers/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/contentviewers/Bundle.properties-MERGED
index b894fb1053..c2e99a53b7 100755
--- a/Core/src/org/sleuthkit/autopsy/contentviewers/Bundle.properties-MERGED
+++ b/Core/src/org/sleuthkit/autopsy/contentviewers/Bundle.properties-MERGED
@@ -20,7 +20,6 @@ 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}).
diff --git a/Core/src/org/sleuthkit/autopsy/contentviewers/MediaPlayerPanel.java b/Core/src/org/sleuthkit/autopsy/contentviewers/MediaPlayerPanel.java
index 39dba3857a..9fe38f0c69 100644
--- a/Core/src/org/sleuthkit/autopsy/contentviewers/MediaPlayerPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/contentviewers/MediaPlayerPanel.java
@@ -256,7 +256,7 @@ public class MediaPlayerPanel extends JPanel implements MediaFileViewer.MediaVie
             logger.log(Level.INFO, "Initializing gstreamer for video/audio viewing"); //NON-NLS
             Gst.init();
             gstInited = true;
-        } catch (GstException ex) {
+        } catch (GstException | UnsatisfiedLinkError ex) {
             gstInited = false;
             logger.log(Level.SEVERE, "Error initializing gstreamer for audio/video viewing and frame extraction capabilities", ex); //NON-NLS
             MessageNotifyUtil.Notify.error(
diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/FrameCapture.java b/Core/src/org/sleuthkit/autopsy/corecomponents/FrameCapture.java
new file mode 100755
index 0000000000..fc3bba0502
--- /dev/null
+++ b/Core/src/org/sleuthkit/autopsy/corecomponents/FrameCapture.java
@@ -0,0 +1,46 @@
+/*
+ * Autopsy Forensic Browser
+ *
+ * Copyright 2013-2019 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.
+ */
+package org.sleuthkit.autopsy.corecomponents;
+
+import java.io.File;
+import java.util.List;
+
+/**
+ * Interface used to capture frames from a video file.
+ *
+ * @deprecated This "extension point" is not currently supported.
+ */
+@Deprecated
+public interface FrameCapture {
+
+    /**
+     * Captures the specified number of frames from a video file.
+     *
+     * @param file      The video file to use
+     * @param numFrames The number of frames to capture. Note that the actual
+     *                  number of frames returned may be less than this number.
+     *                  Specifically, this may happen if the video is very
+     *                  short.
+     *
+     * @throws Exception If anything goes wrong.
+     * @return A list of VideoFrames representing the captured frames
+     */
+    List<VideoFrame> captureFrames(File file, int numFrames) throws Exception;
+
+}
diff --git a/Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/Bundle.properties b/Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/Bundle.properties
index d53f52c0cc..737f24ac1e 100644
--- a/Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/Bundle.properties
+++ b/Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/Bundle.properties
@@ -9,7 +9,7 @@ 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.ManifestFilePath=Manifest File Path
 AutoIngestDashboard.JobsTableModel.ColumnHeader.StageTime=Time in Stage
 AutoIngestDashboard.JobsTableModel.ColumnHeader.CaseFolder=Case 
 AutoIngestDashboard.JobsTableModel.ColumnHeader.Job=Job 
@@ -36,11 +36,7 @@ ConfirmationDialog.Exit=Exit
 ConfirmationDialog.DoNotExit=Do Not Exit
 ConfirmationDialog.ConfirmExit=All incomplete copy jobs will be cancelled. Are you sure?
 ConfirmationDialog.ConfirmExitHeader=Confirm Exit
-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-Long-Description=This module contains features that are being developed by Basis Technology and are not part of the default Autopsy distribution. You can enable this module to use the new features. The features should be stable, but their exact behavior and API are subject to change.\n\nWe make no guarantee that the API of this module will not change, so developers should be careful when relying on it.
 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
diff --git a/Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/Bundle.properties-MERGED b/Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/Bundle.properties-MERGED
index d2d665c8d4..40e300a935 100755
--- a/Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/Bundle.properties-MERGED
+++ b/Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/Bundle.properties-MERGED
@@ -119,7 +119,7 @@ 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.ManifestFilePath=Manifest File Path
 AutoIngestDashboard.JobsTableModel.ColumnHeader.StageTime=Time in Stage
 AutoIngestDashboard.JobsTableModel.ColumnHeader.CaseFolder=Case 
 AutoIngestDashboard.JobsTableModel.ColumnHeader.Job=Job 
@@ -171,11 +171,7 @@ 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-Long-Description=This module contains features that are being developed by Basis Technology and are not part of the default Autopsy distribution. You can enable this module to use the new features. The features should be stable, but their exact behavior and API are subject to change.\n\nWe make no guarantee that the API of this module will not change, so developers should be careful when relying on it.
 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
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Bundle.properties b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Bundle.properties
index f22fb4e00a..9d82d32924 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Bundle.properties
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Bundle.properties
@@ -1,9 +1,5 @@
 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-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
@@ -68,7 +64,7 @@ KeywordSearchConfigurationPanel.customizeComponents.genTabToolTip=General config
 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.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
@@ -89,7 +85,7 @@ KeywordSearchEditListPanel.exportButtonActionPerformed.fileFilterLabel=Keyword L
 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.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
@@ -97,9 +93,9 @@ 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)
-SearchRunner.doInBackGround.cancelMsg= (Cancelling...)
+KeywordSearchIngestModule.doInBackGround.finalizeMsg=Finalizing
+KeywordSearchIngestModule.doInBackGround.pendingMsg=(Pending)
+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
@@ -115,8 +111,8 @@ 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}
+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
@@ -145,8 +141,8 @@ 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}
+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.
@@ -154,31 +150,31 @@ ExtractedContentViewer.hasPreviousItem.exception.msg=Not supported, not a search
 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.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.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.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}
+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}
+KeywordSearchResultFactory.progress.saving=Saving results: {0}
 KeywordSearchSettings.moduleName.text=KeywordSearch
 KeywordSearchSettings.properties_options.text={0}_Options
 KeywordSearchSettings.propertiesNSRL.text={0}_NSRL
@@ -188,23 +184,23 @@ 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.openCore.exception.alreadyOpen.msg=There is an already open Solr core. Explicitly close the 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.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.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.
@@ -245,8 +241,8 @@ 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}
+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
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Bundle.properties-MERGED b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Bundle.properties-MERGED
index e384766d55..f4febc1d7c 100755
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Bundle.properties-MERGED
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Bundle.properties-MERGED
@@ -34,11 +34,7 @@ KeywordSearchIngestModule.startupMessage.failedToGetIndexSchema=Failed to get sc
 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-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
@@ -103,7 +99,7 @@ KeywordSearchConfigurationPanel.customizeComponents.genTabToolTip=General config
 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.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
@@ -124,7 +120,7 @@ KeywordSearchEditListPanel.exportButtonActionPerformed.fileFilterLabel=Keyword L
 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.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
@@ -132,11 +128,11 @@ 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)
+KeywordSearchIngestModule.doInBackGround.finalizeMsg=Finalizing
+KeywordSearchIngestModule.doInBackGround.pendingMsg=(Pending)
 RawText.FileText=File Text
 RawText.ResultText=Result Text
-SearchRunner.doInBackGround.cancelMsg= (Cancelling...)
+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
@@ -152,8 +148,8 @@ 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}
+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
@@ -182,8 +178,8 @@ 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}
+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.
@@ -191,31 +187,31 @@ ExtractedContentViewer.hasPreviousItem.exception.msg=Not supported, not a search
 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.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.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.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}
+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}
+KeywordSearchResultFactory.progress.saving=Saving results: {0}
 KeywordSearchSettings.moduleName.text=KeywordSearch
 KeywordSearchSettings.properties_options.text={0}_Options
 KeywordSearchSettings.propertiesNSRL.text={0}_NSRL
@@ -228,23 +224,23 @@ 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.openCore.exception.alreadyOpen.msg=There is an already open Solr core. Explicitly close the 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.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.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.
@@ -285,8 +281,8 @@ 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}
+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
diff --git a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Bundle.properties b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Bundle.properties
index 1750a4287c..7c75aeb9d0 100644
--- a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Bundle.properties
+++ b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Bundle.properties
@@ -1,107 +1,99 @@
 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-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.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.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.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.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.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.
+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.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.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.
+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.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
+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.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.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.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.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.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.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.
+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.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.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.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
 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.toString=Name: {0}\nDomain Substring: {1}\n\count: {2}\nSplit Tokens: \n{3}
 SearchEngineURLQueryAnalyzer.parentModuleName.noSpace=RecentActivity
 SearchEngineURLQueryAnalyzer.parentModuleName=Recent Activity
-UsbDeviceIdMapper.parseAndLookup.text=Product\: {0}
+UsbDeviceIdMapper.parseAndLookup.text=Product: {0}
diff --git a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Bundle.properties-MERGED b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Bundle.properties-MERGED
index 8ca26a2a9d..62bacbc9fc 100755
--- a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Bundle.properties-MERGED
+++ b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Bundle.properties-MERGED
@@ -37,99 +37,95 @@ 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-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.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.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.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.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.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.
+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.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.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.
+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.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
+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.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.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.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.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.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.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.
+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.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.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.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.
@@ -139,11 +135,7 @@ 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.toString=Name: {0}\nDomain Substring: {1}\n\count: {2}\nSplit Tokens: \n{3}
 SearchEngineURLQueryAnalyzer.parentModuleName.noSpace=RecentActivity
 SearchEngineURLQueryAnalyzer.parentModuleName=Recent Activity
-UsbDeviceIdMapper.parseAndLookup.text=Product\: {0}
+UsbDeviceIdMapper.parseAndLookup.text=Product: {0}
diff --git a/branding/core/core.jar/org/netbeans/core/startup/Bundle.properties b/branding/core/core.jar/org/netbeans/core/startup/Bundle.properties
index 0798d3e75e..f45204c2aa 100644
--- a/branding/core/core.jar/org/netbeans/core/startup/Bundle.properties
+++ b/branding/core/core.jar/org/netbeans/core/startup/Bundle.properties
@@ -1,5 +1,5 @@
 #Updated by build script
-#Tue, 11 Dec 2018 14:41:40 -0500
+#Tue, 26 Feb 2019 14:37:44 -0500
 LBL_splash_window_title=Starting Autopsy
 SPLASH_HEIGHT=314
 SPLASH_WIDTH=538
@@ -8,4 +8,4 @@ SplashRunningTextBounds=0,289,538,18
 SplashRunningTextColor=0x0
 SplashRunningTextFontSize=19
 
-currentVersion=Autopsy 4.9.1
+currentVersion=Autopsy 4.10.0
diff --git a/branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties b/branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties
index 1080917618..da77dbdc80 100644
--- a/branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties
+++ b/branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties
@@ -1,4 +1,4 @@
 #Updated by build script
-#Tue, 11 Dec 2018 14:41:40 -0500
-CTL_MainWindow_Title=Autopsy 4.9.1
-CTL_MainWindow_Title_No_Project=Autopsy 4.9.1
+#Tue, 26 Feb 2019 14:37:44 -0500
+CTL_MainWindow_Title=Autopsy 4.10.0
+CTL_MainWindow_Title_No_Project=Autopsy 4.10.0
diff --git a/thunderbirdparser/src/org/sleuthkit/autopsy/thunderbirdparser/Bundle.properties b/thunderbirdparser/src/org/sleuthkit/autopsy/thunderbirdparser/Bundle.properties
index b9e69b6eba..c1fa32781d 100644
--- a/thunderbirdparser/src/org/sleuthkit/autopsy/thunderbirdparser/Bundle.properties
+++ b/thunderbirdparser/src/org/sleuthkit/autopsy/thunderbirdparser/Bundle.properties
@@ -1,17 +1,14 @@
 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-Long-Description=Email Parser ingest module.\n\nThe module extracts MBOX and PST e-mail files and posts the results to the blackboard.\nIt 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}
+MboxParser.handleAttch.errMsg.failedToCreateOnDisk=Failed to extract MBOX attachment to disk: {0}
+MboxParser.handleAttch.failedWriteToDisk=Failed to extract attachment to disk: {0}
 PstParser.parse.errMsg.failedToParseNMsgs=Failed to extract {0} email messages.
-PstParser.extractAttch.errMsg.failedToExtractToDisk=Failed to extract PST attachment to disk\: {0}
+PstParser.extractAttch.errMsg.failedToExtractToDisk=Failed to extract PST attachment to disk: {0}
 ThunderbirdMboxFileIngestModule.moduleName=Email Parser
 ThunderbirdMboxFileIngestModule.processPst.errMsg.outOfDiskSpace=Out of disk space. Cannot copy {0} to parse.
 ThunderbirdMboxFileIngestModule.encryptionFileLevel=File-level Encryption
diff --git a/thunderbirdparser/src/org/sleuthkit/autopsy/thunderbirdparser/Bundle.properties-MERGED b/thunderbirdparser/src/org/sleuthkit/autopsy/thunderbirdparser/Bundle.properties-MERGED
index a699992c1a..5c8735261d 100755
--- a/thunderbirdparser/src/org/sleuthkit/autopsy/thunderbirdparser/Bundle.properties-MERGED
+++ b/thunderbirdparser/src/org/sleuthkit/autopsy/thunderbirdparser/Bundle.properties-MERGED
@@ -1,19 +1,16 @@
 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-Long-Description=Email Parser ingest module.\n\nThe module extracts MBOX and PST e-mail files and posts the results to the blackboard.\nIt 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}
+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}
+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.