bundle updates

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.

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

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