Merge branch 'develop' of https://github.com/sleuthkit/autopsy into develop
Merge branch 'develop' of https://github.com/sleuthkit/autopsy into develop
Pulled static strings into Bundle.
Removed unused strings from Bundle.
Merge branch 'develop' of https://github.com/sleuthkit/autopsy into keywordSearch
Pulled static strings into Bundle. Removed unused strings from Bundle.
Merge branch 'develop' of https://github.com/sleuthkit/autopsy into develop
Changed inconsistent translation of type from 種類　to タイプ
Merge remote-tracking branch 'origin/hashDatabase' into hashDatabase

Conflicts:
	HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/Bundle_ja.properties
Changed inconsistent translation of type from 種類　to タイプ
Changed inconsistent translation of type from インフォメーション　to 情報
Changed the translation for "date" from 日時(date/time) to 日付(date)
Merge branch 'core-filesearch' of ssh://repo.narfindustries.com/autopsy-jp into core-filesearch
Merge branch 'develop' of https://github.com/sleuthkit/autopsy into core-filesearch
Merge branch 'hashDatabase' of ssh://repo.narfindustries.com/autopsy-jp into hashDatabase
Merge branch 'develop' of https://github.com/sleuthkit/autopsy into hashDatabase
Translation completed
Merge branch 'develop' of https://github.com/sleuthkit/autopsy into ingest
Merge branch 'develop' of https://github.com/sleuthkit/autopsy into develop
Added missing .modules. to module path.
Translation completed