--- a/i18n/en.po	Fri Sep 18 09:17:20 2009 +0200
+++ b/i18n/en.po	Fri Sep 18 09:21:53 2009 +0200
@@ -894,6 +894,9 @@
 msgid "add State allowed_transition WorkflowTransition subject"
 msgstr "workflow-transition"
 
+msgid "add State state_of Workflow object"
+msgstr "state"
+
 msgid "add Transition condition RQLExpression subject"
 msgstr "condition"
 
@@ -903,12 +906,18 @@
 msgid "add Transition destination_state State subject"
 msgstr "destination state"
 
+msgid "add Transition transition_of Workflow object"
+msgstr "transition"
+
 msgid "add WorkflowTransition condition RQLExpression subject"
 msgstr "workflow-transition"
 
 msgid "add WorkflowTransition subworkflow_exit SubWorkflowExitPoint subject"
 msgstr "subworkflow exit-point"
 
+msgid "add WorkflowTransition transition_of Workflow object"
+msgstr "workflow-transition"
+
 msgctxt "inlined:CWRelation.from_entity.subject"
 msgid "add a CWEType"
 msgstr "add an entity type"
@@ -1522,10 +1531,6 @@
 msgid "created_by"
 msgstr "created by"
 
-msgctxt "CWUser"
-msgid "created_by_object"
-msgstr ""
-
 msgid "created_by_object"
 msgstr "has created"
 
@@ -1594,6 +1599,9 @@
 msgid "creating State (State allowed_transition Transition %(linkto)s)"
 msgstr "creating a state able to trigger transition %(linkto)s"
 
+msgid "creating State (State state_of Workflow %(linkto)s)"
+msgstr "creating state of workflow %(linkto)s"
+
 msgid "creating State (Transition %(linkto)s destination_state State)"
 msgstr "creating destination state for transition %(linkto)s"
 
@@ -1608,11 +1616,19 @@
 msgid "creating Transition (Transition destination_state State %(linkto)s)"
 msgstr "creating transition leading to state %(linkto)s"
 
+msgid "creating Transition (Transition transition_of Workflow %(linkto)s)"
+msgstr "creating transition of workflow %(linkto)s"
+
 msgid ""
 "creating WorkflowTransition (State %(linkto)s allowed_transition "
 "WorkflowTransition)"
 msgstr "creating workflow-transition leading to state %(linkto)s"
 
+msgid ""
+"creating WorkflowTransition (WorkflowTransition transition_of Workflow %"
+"(linkto)s)"
+msgstr "creating workflow-transition of workflow %(linkto)s"
+
 msgid "creation"
 msgstr ""
 
@@ -1649,14 +1665,6 @@
 msgid "custom_workflow"
 msgstr "custom workflow"
 
-msgctxt "CWUser"
-msgid "custom_workflow"
-msgstr "custom workflow"
-
-msgctxt "Workflow"
-msgid "custom_workflow_object"
-msgstr ""
-
 msgid "custom_workflow_object"
 msgstr "custom workflow of"
 
@@ -2348,94 +2356,6 @@
 msgid "identity"
 msgstr ""
 
-msgctxt "CWRelation"
-msgid "identity_object"
-msgstr ""
-
-msgctxt "Bookmark"
-msgid "identity_object"
-msgstr ""
-
-msgctxt "CWAttribute"
-msgid "identity_object"
-msgstr ""
-
-msgctxt "CWConstraintType"
-msgid "identity_object"
-msgstr ""
-
-msgctxt "State"
-msgid "identity_object"
-msgstr ""
-
-msgctxt "BaseTransition"
-msgid "identity_object"
-msgstr ""
-
-msgctxt "CWEType"
-msgid "identity_object"
-msgstr ""
-
-msgctxt "Workflow"
-msgid "identity_object"
-msgstr ""
-
-msgctxt "CWGroup"
-msgid "identity_object"
-msgstr ""
-
-msgctxt "TrInfo"
-msgid "identity_object"
-msgstr ""
-
-msgctxt "CWConstraint"
-msgid "identity_object"
-msgstr ""
-
-msgctxt "CWUser"
-msgid "identity_object"
-msgstr ""
-
-msgctxt "Transition"
-msgid "identity_object"
-msgstr ""
-
-msgctxt "CWRType"
-msgid "identity_object"
-msgstr ""
-
-msgctxt "SubWorkflowExitPoint"
-msgid "identity_object"
-msgstr ""
-
-msgctxt "ExternalUri"
-msgid "identity_object"
-msgstr ""
-
-msgctxt "CWCache"
-msgid "identity_object"
-msgstr ""
-
-msgctxt "WorkflowTransition"
-msgid "identity_object"
-msgstr ""
-
-msgctxt "RQLExpression"
-msgid "identity_object"
-msgstr ""
-
-msgctxt "CWPermission"
-msgid "identity_object"
-msgstr ""
-
-msgctxt "EmailAddress"
-msgid "identity_object"
-msgstr ""
-
-msgctxt "CWProperty"
-msgid "identity_object"
-msgstr ""
-
 msgid "identity_object"
 msgstr "identity"
 
@@ -2470,14 +2390,6 @@
 msgid "in_state"
 msgstr "in state"
 
-msgctxt "CWUser"
-msgid "in_state"
-msgstr "in state"
-
-msgctxt "State"
-msgid "in_state_object"
-msgstr ""
-
 msgid "in_state_object"
 msgstr "state of"
 
@@ -2588,17 +2500,9 @@
 msgid "is_instance_of"
 msgstr ""
 
-msgctxt "CWEType"
-msgid "is_instance_of_object"
-msgstr ""
-
 msgid "is_instance_of_object"
 msgstr "is instance of"
 
-msgctxt "CWEType"
-msgid "is_object"
-msgstr ""
-
 msgid "is_object"
 msgstr "has instances"
 
@@ -2943,10 +2847,6 @@
 msgid "owned_by"
 msgstr "owned by"
 
-msgctxt "CWUser"
-msgid "owned_by_object"
-msgstr ""
-
 msgid "owned_by_object"
 msgstr "owns"
 
@@ -3859,14 +3759,6 @@
 msgid "wf_info_for"
 msgstr "record for"
 
-msgctxt "TrInfo"
-msgid "wf_info_for"
-msgstr ""
-
-msgctxt "CWUser"
-msgid "wf_info_for_object"
-msgstr ""
-
 msgid "wf_info_for_object"
 msgstr "workflow history"
 
@@ -3926,132 +3818,3 @@
 
 msgid "you should probably delete that property"
 msgstr ""
-
-#~ msgid "add a BaseTransition"
-#~ msgstr "XXX"
-
-#~ msgid "add a Bookmark"
-#~ msgstr "add a bookmark"
-
-#~ msgid "add a CWAttribute"
-#~ msgstr "add an attribute"
-
-#~ msgid "add a CWCache"
-#~ msgstr "add a cubicweb cache"
-
-#~ msgid "add a CWConstraint"
-#~ msgstr "add a constraint"
-
-#~ msgid "add a CWConstraintType"
-#~ msgstr "add a constraint type"
-
-#~ msgid "add a CWEType"
-#~ msgstr "add an entity type"
-
-#~ msgid "add a CWGroup"
-#~ msgstr "add a group"
-
-#~ msgid "add a CWPermission"
-#~ msgstr "add a permission"
-
-#~ msgid "add a CWProperty"
-#~ msgstr "add a property"
-
-#~ msgid "add a CWRType"
-#~ msgstr "add a relation type"
-
-#~ msgid "add a CWRelation"
-#~ msgstr "add a relation"
-
-#~ msgid "add a CWUser"
-#~ msgstr "add a user"
-
-#~ msgid "add a EmailAddress"
-#~ msgstr "add an email address"
-
-#~ msgid "add a ExternalUri"
-#~ msgstr "and an external uri"
-
-#~ msgid "add a RQLExpression"
-#~ msgstr "add a rql expression"
-
-#~ msgid "add a State"
-#~ msgstr "add a state"
-
-#~ msgid "add a SubWorkflowExitPoint"
-#~ msgstr "add a subworkflow exit-point"
-
-#~ msgid "add a TrInfo"
-#~ msgstr "add a transition information"
-
-#~ msgid "add a Transition"
-#~ msgstr "add a transition"
-
-#~ msgid "add a Workflow"
-#~ msgstr "add a workflow"
-
-#~ msgid "add a WorkflowTransition"
-#~ msgstr "add a workflow-transition"
-
-#~ msgid "remove this Bookmark"
-#~ msgstr "remove this bookmark"
-
-#~ msgid "remove this CWAttribute"
-#~ msgstr "remove this attribute"
-
-#~ msgid "remove this CWCache"
-#~ msgstr "remove this cubicweb cache"
-
-#~ msgid "remove this CWConstraint"
-#~ msgstr "remove this constraint"
-
-#~ msgid "remove this CWConstraintType"
-#~ msgstr "remove this constraint type"
-
-#~ msgid "remove this CWEType"
-#~ msgstr "remove this entity type"
-
-#~ msgid "remove this CWGroup"
-#~ msgstr "remove this group"
-
-#~ msgid "remove this CWPermission"
-#~ msgstr "remove this permission"
-
-#~ msgid "remove this CWProperty"
-#~ msgstr "remove this property"
-
-#~ msgid "remove this CWRType"
-#~ msgstr "remove this relation type"
-
-#~ msgid "remove this CWRelation"
-#~ msgstr "remove this relation"
-
-#~ msgid "remove this CWUser"
-#~ msgstr "remove this user"
-
-#~ msgid "remove this EmailAddress"
-#~ msgstr "remove this email address"
-
-#~ msgid "remove this ExternalUri"
-#~ msgstr "remove this external uri"
-
-#~ msgid "remove this RQLExpression"
-#~ msgstr "remove this RQL expression"
-
-#~ msgid "remove this State"
-#~ msgstr "remove this state"
-
-#~ msgid "remove this SubWorkflowExitPoint"
-#~ msgstr "remove this subworkflow exit-point"
-
-#~ msgid "remove this TrInfo"
-#~ msgstr "remove this transition information"
-
-#~ msgid "remove this Transition"
-#~ msgstr "remove this transition"
-
-#~ msgid "remove this Workflow"
-#~ msgstr "remove this workflow"
-
-#~ msgid "remove this WorkflowTransition"
-#~ msgstr "remove this workflow-transition"