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 b290d7abe4..62bacbc9fc 100755
--- a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Bundle.properties-MERGED
+++ b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Bundle.properties-MERGED
@@ -37,7 +37,7 @@ 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\nThe module extracts useful information about the recent user activity on the disk image being ingested, such as:\n\n- Recently open documents,\n- Web acitivity (sites visited, stored cookies, bookmarked sites, search engine queries, file downloads),\n- Recently attached devices,\n- Installed programs.\n\nThe module currently supports Windows only disk images.  \nThe plugin is also fully functional when deployed on Windows version of Autopsy.
+OpenIDE-Module-Long-Description=Recent Activity ingest module.\n\n\The module extracts useful information about the recent user activity on the disk image being ingested, such as:\n\n- Recently open documents,\n- Web 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
@@ -135,7 +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}\nDomain Substring: {1}\ncount: {2}\nSplit 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}