sleuthkit/autopsy — pull request #684 by mrtizmo (2014-04-23 16:51:28+00:00)
Title: Keywordsearch - additional Japanese translations

Fixed merge conflict.