Pulled 2 new hardcoded strings.
Pulled 2 new hardcoded strings.
Merge remote-tracking branch 'upstream/develop' into smarterDiffing
Translation complete.
Committing before checking out different branch.
Translation complete.
Corrected inconsistency
Corrected inconsistency
Merge remote-tracking branch 'upstream/develop' into smarterDiffing
DB dumps will now show file paths instead of object ids.
Added a comment for the potentially confusing dictionary creation code.
Typo fix.
Merge branch 'develop' of https://github.com/sleuthkit/autopsy into fileextmismatch-ja
Merge branch 'develop' of https://github.com/sleuthkit/autopsy into filetypeid-ja
Pulled new static strings.
Marked a few static strings with NON-NLS.
KeywordSearch - Added NON-NLS tags to hardcoded strings not needing National Language Support.
Pulled 2 additional static strings.
Translation complete.
Merge pull request #670 from alexjacks92/smarterDiffing

Smarter diffing - replace object id's with file paths instead.
RecentActivity - Added NON-NLS tags to hardcoded strings not needing National Language Support.