diff --git a/bindings/java/doxygen/artifact_catalog.dox b/bindings/java/doxygen/artifact_catalog.dox index bec16b8e9525f4ec1dfe540f9c4c31eaa3c3c74d..07674595927ad1861bebb3e86bcf3894f0dc0934 100644 --- a/bindings/java/doxygen/artifact_catalog.dox +++ b/bindings/java/doxygen/artifact_catalog.dox @@ -190,15 +190,6 @@ Details about a device data source. - TSK_IMSI (IMSI number of the device) ---- -## TSK_WEB_CATEGORIZATION -The categorization of a web host using a specific usage type, e.g. mail.google.com would correspond to Web Email. - -### REQUIRED ATTRIBUTES -- TSK_NAME (The usage category identifier, e.g. Web Email) -- TSK_DOMAIN (The domain of the host, e.g. google.com) -- TSK_HOST (The full host, e.g. mail.google.com) - --- ## TSK_EMAIL_MSG @@ -776,6 +767,17 @@ A web cache entry. The resource that was cached may or may not be present in the +--- +## TSK_WEB_CATEGORIZATION +The categorization of a web host using a specific usage type, e.g. mail.google.com would correspond to Web Email. + +### REQUIRED ATTRIBUTES +- TSK_NAME (The usage category identifier, e.g. Web Email) +- TSK_DOMAIN (The domain of the host, e.g. google.com) +- TSK_HOST (The full host, e.g. mail.google.com) + + + --- ## TSK_WEB_COOKIE A Web cookie found. diff --git a/bindings/java/src/org/sleuthkit/datamodel/Bundle.properties b/bindings/java/src/org/sleuthkit/datamodel/Bundle.properties index fe8e83475f19f0a3ae20ab23e0b9a8209d4bb721..cf152cc5e3f57a7c558d7de105b4d48c37f5f58b 100644 --- a/bindings/java/src/org/sleuthkit/datamodel/Bundle.properties +++ b/bindings/java/src/org/sleuthkit/datamodel/Bundle.properties @@ -18,7 +18,7 @@ BlackboardArtifact.tagFile.text=Tagged Files BlackboardArtifact.tskTagArtifact.text=Tagged Results BlackboardArtifact.tskOsInfo.text=Operating System Information BlackboardArtifact.tskOsAccount.text=Operating System User Account -BlackboardArtifact.tskServiceAccount.text=Accounts +BlackboardArtifact.tskServiceAccount.text=Web Accounts BlackboardArtifact.tskToolOutput.text=Raw Tool Output BlackboardArtifact.tskContact.text=Contacts BlackboardArtifact.tskMessage.text=Messages @@ -63,7 +63,7 @@ BlackboardArtifact.tskDeletedProg.text=Deleted Programs BlackboardArtifact.tskUserDeviceEvent.text=User Device Events BlackboardArtifact.shortDescriptionDate.text=at {0} BlackboardArtifact.tskAssociatedObject.text=Associated Object -BlackboardArtifact.tskWebCategorization.text=Web Category +BlackboardArtifact.tskWebCategorization.text=Web Categories BlackboardArtifact.tskYaraHit.text=YARA Hit BlackboardArtifact.tskGPSArea.text=GPS Area BlackboardAttribute.tskAccountType.text=Account Type diff --git a/bindings/java/src/org/sleuthkit/datamodel/Bundle.properties-MERGED b/bindings/java/src/org/sleuthkit/datamodel/Bundle.properties-MERGED index fe8e83475f19f0a3ae20ab23e0b9a8209d4bb721..cf152cc5e3f57a7c558d7de105b4d48c37f5f58b 100644 --- a/bindings/java/src/org/sleuthkit/datamodel/Bundle.properties-MERGED +++ b/bindings/java/src/org/sleuthkit/datamodel/Bundle.properties-MERGED @@ -18,7 +18,7 @@ BlackboardArtifact.tagFile.text=Tagged Files BlackboardArtifact.tskTagArtifact.text=Tagged Results BlackboardArtifact.tskOsInfo.text=Operating System Information BlackboardArtifact.tskOsAccount.text=Operating System User Account -BlackboardArtifact.tskServiceAccount.text=Accounts +BlackboardArtifact.tskServiceAccount.text=Web Accounts BlackboardArtifact.tskToolOutput.text=Raw Tool Output BlackboardArtifact.tskContact.text=Contacts BlackboardArtifact.tskMessage.text=Messages @@ -63,7 +63,7 @@ BlackboardArtifact.tskDeletedProg.text=Deleted Programs BlackboardArtifact.tskUserDeviceEvent.text=User Device Events BlackboardArtifact.shortDescriptionDate.text=at {0} BlackboardArtifact.tskAssociatedObject.text=Associated Object -BlackboardArtifact.tskWebCategorization.text=Web Category +BlackboardArtifact.tskWebCategorization.text=Web Categories BlackboardArtifact.tskYaraHit.text=YARA Hit BlackboardArtifact.tskGPSArea.text=GPS Area BlackboardAttribute.tskAccountType.text=Account Type