mstoeck3/autopsy-flatpak
1
0
Fork 0
mirror of https://github.com/overcuriousity/autopsy-flatpak.git synced 2025-07-12 16:06:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix merge

Browse Source
This commit is contained in:
millmanorama 2019-03-08 12:39:58 +01:00
parent 8fccb3d845
commit 1cf785b8cb
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Core/src/org/sleuthkit/autopsy/timeline/actions/Bundle.properties-MERGED
View File

@ -1,5 +1,7 @@
AddManualEvent.createArtifactFailed=Failed to create artifact for event.
AddManualEvent.EventCreationDialogPane.initialize.dataSourcesError=Error getting datasources in case. AddManualEvent.EventCreationDialogPane.initialize.dataSourcesError=Error getting datasources in case.
AddManualEvent.longText=Manually add an event to the timeline. AddManualEvent.longText=Manually add an event to the timeline.
AddManualEvent.postArtifactFailed=Failed to post artifact to blackboard.
AddManualEvent.text=Add Event AddManualEvent.text=Add Event
# {0} - action accelerator keys # {0} - action accelerator keys
Back.longText=Back: {0}\nGo back to the last view settings. Back.longText=Back: {0}\nGo back to the last view settings.

2
RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractIE.java
View File

@ -283,7 +283,7 @@ class ExtractIE extends Extract {
try { try {
blackboard.postArtifacts(bbartifacts, moduleName); blackboard.postArtifacts(bbartifacts, moduleName);
} catch (Blackboard.BlackboardException ex) { } catch (Blackboard.BlackboardException ex) {
this.addErrorMessage(Bundle.ExtractIE_getCookie_errMsg_errPostinCookiess()); this.addErrorMessage(Bundle.ExtractIE_getCookie_errMsg_errPostingCookiess());
logger.log(Level.SEVERE, "Exception thrown while posting IE cookie artifact.", ex); //NON-NLS logger.log(Level.SEVERE, "Exception thrown while posting IE cookie artifact.", ex); //NON-NLS
} }
} }