1466 Commits

Author SHA1 Message Date
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
Richard Cordovano
df90e11e18 Merge pull request #523 from mrtizmo/core-menuactions
Pulled static strings into Bundle - Core - menuactions module
2014-03-07 15:20:01 -05:00
Richard Cordovano
2a2fcbe53c Merge pull request #522 from mrtizmo/core-report
Pulled static strings into Bundle - Core - report module
2014-03-07 15:16:38 -05:00
Nick Davis
607f96ef29 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into core-corecomponents 2014-03-07 14:42:29 -05:00
Kay Bassi
0ddfaa9c7b Translation complete 2014-03-07 11:39:55 -08:00
Nick Davis
256fd4b850 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into core-filesearch 2014-03-07 14:34:36 -05:00
Kay Bassi
cf1c79c1a7 Translation complete 2014-03-07 11:28:48 -08:00
Richard Cordovano
6371ea22fe Merge pull request #498 from mrtizmo/develop
Japanese localization for Core - actions and Core - core modules
2014-03-07 11:20:33 -05:00
Jason Letourneau
8a12d93aed fixed two line escape for IngestManager.getFileModStats.moduleInfo.text 2014-03-07 11:04:17 -05:00
Jason Letourneau
15fd54bb0b Merge remote-tracking branch 'origin/pr/529' into develop 2014-03-07 10:35:48 -05:00
Jason Letourneau
1f96e20e50 Merge remote-tracking branch 'origin/pr/528' into develop 2014-03-07 10:35:43 -05:00
Jason Letourneau
41def13c7c resolved conflict 2014-03-07 10:35:21 -05:00
Jason Letourneau
ba0cc8da0e resolved conflict 2014-03-07 10:29:53 -05:00
Jason Letourneau
238d3ecf92 Merge remote-tracking branch 'origin/pr/525' into develop 2014-03-07 10:28:32 -05:00
Jason Letourneau
2667b6aaee Merge remote-tracking branch 'origin/pr/524' into develop 2014-03-07 10:28:28 -05:00
Jason Letourneau
4c967de40f Merge remote-tracking branch 'origin/pr/523' into develop 2014-03-07 10:28:25 -05:00
Jason Letourneau
68b5bb0ed4 Merge remote-tracking branch 'origin/pr/522' into develop 2014-03-07 10:28:20 -05:00
Jason Letourneau
4879882898 Merge remote-tracking branch 'origin/pr/506' into develop 2014-03-07 10:27:18 -05:00
Jason Letourneau
6a6f4a10ca merge conflict resolved 2014-03-07 10:27:06 -05:00
Jason Letourneau
ab9c9f7160 Merge remote-tracking branch 'origin/pr/499' into develop 2014-03-07 10:24:06 -05:00
Jason Letourneau
f8b682437d Merge remote-tracking branch 'origin/pr/498' into develop 2014-03-07 10:23:50 -05:00
Nick Davis
4b38f3d27b Merge branch 'core-menuactions' of ssh://repo.narfindustries.com/autopsy-jp into core-menuactions 2014-03-06 14:21:20 -05:00
Nick Davis
8cdf16c289 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into core-menuactions 2014-03-06 14:20:59 -05:00
Kay Bassi
b1e7bd85f4 Completed translation 2014-03-06 10:27:47 -08:00
Richard Cordovano
05c9e0876c Merge pull request #473 from shahit2/object
added object ID column
2014-03-06 12:26:18 -05:00
Richard Cordovano
66cb306c92 Merge pull request #470 from shahit2/timeline2
changed timezone and times to UTC for display
2014-03-06 12:25:41 -05:00
Kay Bassi
3c3c0db830 Completed translation 2014-03-05 13:36:13 -08:00
Richard Cordovano
90aeeed19a Merge pull request #504 from bcarrier/move_between_packages
Moved SQLiteDBConnect and LocalDisk to better packages
2014-03-05 16:24:34 -05:00
Kay Bassi
8b882533c7 Initial translation 2014-03-05 13:19:33 -08:00
Kay Bassi
48c7704d8f Initial translation. Committing before moving to different branch. 2014-03-05 12:34:46 -08:00
Kay Bassi
248b4490ec Completed and checked over translation. 2014-03-05 12:07:01 -08:00
Kay Bassi
7300587716 Two more to translate 2014-03-05 10:02:04 -08:00
Kay Bassi
b0886cd6bd Merge remote-tracking branch 'origin/core-corecomponents' into core-corecomponents 2014-03-04 14:01:15 -08:00
Kay Bassi
e80e6d68b0 Corrected translation of "image" to イメージ 2014-03-04 14:01:01 -08:00
Kay Bassi
bde878f8df Work in progress before branch switch 2014-03-04 13:45:28 -08:00
Kay Bassi
7cca1fdca0 Merge remote-tracking branch 'origin/core-datamodel' into core-datamodel 2014-03-04 12:59:29 -08:00
Kay Bassi
4feba90283 Completed translation for core-datamodel 2014-03-04 12:59:14 -08:00
Kay Bassi
a05f7cd79a Merge remote-tracking branch 'origin/core-directorytree' into core-directorytree 2014-03-04 12:25:14 -08:00
Kay Bassi
bbd1eee967 Initial translation 2014-03-04 12:24:01 -08:00
Nick Davis
c4d6b2d24b Merge branch 'develop' of https://github.com/sleuthkit/autopsy into core-casemodule 2014-03-04 14:38:54 -05:00
Nick Davis
462266bdcd Merge branch 'develop' of https://github.com/sleuthkit/autopsy into core-corecomponents 2014-03-04 14:33:04 -05:00
Nick Davis
d9026ace73 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into core-coreutils 2014-03-04 14:30:32 -05:00
Nick Davis
38c882c439 Merge branch 'core-datamodel' of ssh://repo.narfindustries.com/autopsy-jp into core-datamodel 2014-03-04 14:25:30 -05:00
Nick Davis
8052dae2a6 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into core-datamodel 2014-03-04 14:24:25 -05:00
Nick Davis
e2bcc7edc2 Merge branch 'core-directorytree' of ssh://repo.narfindustries.com/autopsy-jp into core-directorytree 2014-03-04 14:21:13 -05:00
Nick Davis
9a1576ab56 Pulled 2 new static strings into Bundle. 2014-03-04 14:20:36 -05:00