6143 Commits

Author SHA1 Message Date
Kay Bassi
094ca0e777 Resolved/deleted comments 2014-03-12 14:04:29 -07:00
Kay Bassi
8783a45027 Made final changes. 2014-03-12 14:02:48 -07:00
Kay Bassi
90d2232f62 Translation complete. Checked previous translation also. 2014-03-12 13:55:49 -07:00
Nick Davis
77fbc819a1 Merge branch 'core-report' of ssh://repo.narfindustries.com/autopsy-jp into core-report 2014-03-12 12:19:02 -04:00
Nick Davis
3d3f18ed6a Merge branch 'develop' of https://github.com/sleuthkit/autopsy into core-report 2014-03-12 12:18:50 -04:00
Nick Davis
0ca1ffbff6 Merge branch 'corelibs' of ssh://repo.narfindustries.com/autopsy-jp into corelibs 2014-03-12 12:15:55 -04:00
Nick Davis
0b60841de4 Merge branch 'exifParser' of ssh://repo.narfindustries.com/autopsy-jp into exifParser 2014-03-12 12:12:53 -04:00
Nick Davis
54e1a68c21 Merge branch 'fileTypeId' of ssh://repo.narfindustries.com/autopsy-jp into fileTypeId 2014-03-12 12:09:22 -04:00
Nick Davis
d52a765f43 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into develop 2014-03-12 12:06:06 -04:00
Kay Bassi
d7dec60cf3 More translation 2014-03-11 23:28:03 -07:00
Kay Bassi
0426be5914 More translation 2014-03-11 23:01:58 -07:00
Kay Bassi
6530d43b1a Initial translation 2014-03-11 22:55:09 -07:00
Richard Cordovano
4959ab5206 Merge pull request #537 from rcordovano/develop
Format HashDbManager.java with NetBeans IDE
2014-03-12 01:39:24 -04:00
Richard Cordovano
6ad51f40c3 Format HashDbManager.java with NetBeans IDE 2014-03-12 01:37:47 -04:00
Richard Cordovano
4a417b6df0 Merge pull request #536 from rcordovano/merge_release_3.0.9
Merge release 3.0.9
2014-03-12 01:14:46 -04:00
Richard Cordovano
142ebc662f Fix assorted issues causing compiler warnings 2014-03-12 01:12:29 -04:00
Kay Bassi
ffc3ed0550 Merge remote-tracking branch 'origin/fileTypeId' into fileTypeId 2014-03-11 21:57:25 -07:00
Kay Bassi
05dbf943af Translation complete. 2014-03-11 21:57:10 -07:00
Kay Bassi
7cfb73d54a Translation complete except for one. 2014-03-11 21:47:24 -07:00
Kay Bassi
7e62ae5677 Translation complete. Made minor change. 2014-03-11 21:10:33 -07:00
Kay Bassi
f1cc63f73e Merge branch 'exifParser' of repo.narfindustries.com:autopsy-jp into exifParser 2014-03-11 21:07:25 -07:00
Kay Bassi
e905ebf9b3 Translation complete 2014-03-11 21:07:10 -07:00
Kay Bassi
bbb7e7e674 Translation complete 2014-03-11 17:41:10 -07:00
Kay Bassi
eaa1eab270 Translation complete 2014-03-11 17:02:34 -07:00
Kay Bassi
cf1e578e47 Translation complete 2014-03-11 16:11:35 -07:00
Richard Cordovano
1c81fa804b Redo merge of two keyword search files 2014-03-11 17:38:55 -04:00
Kay Bassi
c08b448e5a More translation. Checking meaning of some text. 2014-03-11 14:23:31 -07:00
Samuel H. Kenyon
91aef3bd38 Merge remote-tracking branch 'upstream/develop' into searchoptions
Conflicts:
	KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Bundle.properties
	KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Bundle_ja.properties
	KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchListsViewerPanel.java
	KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchPanel.java
2014-03-11 17:14:45 -04:00
Samuel H. Kenyon
7d5778e4c7 moved comment 2014-03-11 16:24:21 -04:00
Samuel H. Kenyon
00a177203d Remove some commented out code. 2014-03-11 15:24:10 -04:00
Richard Cordovano
70ddbfb3c7 Merged Autopsy 3.0.9 release into develop (master->develop) 2014-03-11 15:21:33 -04:00
Richard Cordovano
302655d5bf Continued work on ingest framework in 3.1 form 2014-03-11 01:29:58 -04:00
Kay Bassi
8ecadf818c Merge remote-tracking branch 'origin/ewfVerify' into ewfVerify 2014-03-10 22:18:12 -07:00
Kay Bassi
78a998f5eb Initial translation 2014-03-10 22:17:31 -07:00
Kay Bassi
e635bc75b2 Initial translation 2014-03-10 22:08:55 -07:00
Kay Bassi
785817fdd7 More translation 2014-03-10 22:05:09 -07:00
Kay Bassi
a1c9a19361 Merge remote-tracking branch 'origin/core-report' into core-report 2014-03-10 21:11:19 -07:00
Kay Bassi
11bcf21227 More translation 2014-03-10 21:11:03 -07:00
Brian Carrier
5a0aa04d10 removed old branding code and files 2014-03-10 17:22:07 -04:00
Nick Davis
f4e734904b Merge branch 'develop' of https://github.com/sleuthkit/autopsy into develop 2014-03-10 14:42:47 -04:00
Nick Davis
618e35f666 Merge branch 'core-report' of ssh://repo.narfindustries.com/autopsy-jp into core-report 2014-03-10 14:32:04 -04:00
Richard Cordovano
e3b8a72524 Revised ingest modules API for 3.1 release 2014-03-08 09:43:30 -05:00
Richard Cordovano
9e49241ac0 Work on ingest framework API 2014-03-08 00:23:05 -05:00
Richard Cordovano
955999280c Continued work on new ingest API 2014-03-07 17:35:22 -05:00
Richard Cordovano
44c6e2c68b Merge pull request #534 from jletourneau-basistech/develop
Merged and resolved conflicts from JA translation pull requests
2014-03-07 17:30:56 -05:00
Jason Letourneau
862eeb6797 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into develop 2014-03-07 17:09:51 -05:00
Richard Cordovano
8869620cb1 Merge pull request #529 from mrtizmo/core-casemodule
Pulled static strings into Bundle - Core casemodule
2014-03-07 16:25:03 -05:00
Richard Cordovano
9def5ea31a Merge pull request #528 from mrtizmo/core-corecomponents
Pulled static strings into Bundle - Core - corecomponents module
2014-03-07 15:59:22 -05:00
Richard Cordovano
fc0eb794c8 Merge pull request #525 from mrtizmo/core-filesearch
Pulled static strings into Bundle - Core - filesearch module
2014-03-07 15:30:06 -05:00
Richard Cordovano
eb97e47216 Merge pull request #524 from mrtizmo/core-ingest
Pulled static strings into Bundle - Core - ingest module
2014-03-07 15:27:22 -05:00