backport stable
authorSylvain Thénault <sylvain.thenault@logilab.fr>
Thu, 26 Aug 2010 11:45:57 +0200
changeset 6162 76bd320c5ace
parent 6154 b520763b6ace (current diff)
parent 6161 c777730dfcc4 (diff)
child 6173 eb386e473044
child 6180 9d7acf23369d
backport stable
cwvreg.py
doc/book/_maybe_to_integrate/treemixin.rst
doc/book/en/devrepo/repo/hooks.rst
i18n/en.po
i18n/es.po
i18n/fr.po
server/sources/__init__.py
--- a/.hgtags	Thu Aug 26 10:29:32 2010 +0200
+++ b/.hgtags	Thu Aug 26 11:45:57 2010 +0200
@@ -147,3 +147,5 @@
 ab1f9686ff3e0843b570b98f89fb5ccc8d7dec8c cubicweb-debian-version-3.9.3-1
 6cebb361dcb27ded654426b4c82f6401c862e034 cubicweb-version-3.9.4
 8d32d82134dc1d8eb0ce230191f34fd49084a168 cubicweb-debian-version-3.9.4-1
+0a1fce8ddc672ca9ee7328ed4f88c1aa6e48d286 cubicweb-version-3.9.5
+12038ca95f0fff2205f7ee029f5602d192118aec cubicweb-debian-version-3.9.5-1
--- a/__pkginfo__.py	Thu Aug 26 10:29:32 2010 +0200
+++ b/__pkginfo__.py	Thu Aug 26 11:45:57 2010 +0200
@@ -22,7 +22,7 @@
 
 modname = distname = "cubicweb"
 
-numversion = (3, 9, 4)
+numversion = (3, 9, 5)
 version = '.'.join(str(num) for num in numversion)
 
 description = "a repository of entities / relations for knowledge management"
--- a/cwvreg.py	Thu Aug 26 10:29:32 2010 +0200
+++ b/cwvreg.py	Thu Aug 26 11:45:57 2010 +0200
@@ -161,14 +161,14 @@
 'primary'`) view (`__registry__ = 'views'`) for a result set
 containing a `Card` entity, two objects will probably be selectable:
 
-* the default primary view (`__select__ = implements('Any')`), meaning
+* the default primary view (`__select__ = is_instance('Any')`), meaning
   that the object is selectable for any kind of entity type
 
-* the specific `Card` primary view (`__select__ = implements('Card')`,
+* the specific `Card` primary view (`__select__ = is_instance('Card')`,
   meaning that the object is selectable for Card entities
 
 Other primary views specific to other entity types won't be selectable in this
-case. Among selectable objects, the `implements('Card')` selector will return a higher
+case. Among selectable objects, the `is_instance('Card')` selector will return a higher
 score since it's more specific, so the correct view will be selected as expected.
 
 .. _SelectionAPI:
--- a/debian/changelog	Thu Aug 26 10:29:32 2010 +0200
+++ b/debian/changelog	Thu Aug 26 11:45:57 2010 +0200
@@ -1,3 +1,9 @@
+cubicweb (3.9.5-1) unstable; urgency=low
+
+  * new upstream release
+
+ -- Sylvain Thénault <sylvain.thenault@logilab.fr>  Thu, 26 Aug 2010 10:53:34 +0200
+
 cubicweb (3.9.4-1) unstable; urgency=low
 
   * new upstream release
--- a/doc/book/_maybe_to_integrate/treemixin.rst	Thu Aug 26 10:29:32 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,100 +0,0 @@
-
-Class `TreeMixIn`
------------------
-
-This class provides a tree interface. This mixin has to be inherited 
-explicitly and configured using the tree_attribute, parent_target and 
-children_target class attribute to benefit from this default implementation.
-
-This class provides the following methods:
-
-  * `different_type_children(entities=True)`, returns children entities
-    of different type as this entity. According to the `entities` parameter, 
-    returns entity objects (if entity=True) or the equivalent result set.
-
-  * `same_type_children(entities=True)`, returns children entities of 
-    the same type as this entity. According to the `entities` parameter, 
-    return entity objects (if entity=True) or the equivalent result set.
-  
-  * `iterchildren( _done=None)`, iters on the children of the entity.
-  
-  * `prefixiter( _done=None)`
-  
-  * `path()`, returns the list of eids from the root object to this object.
-  
-  * `iterparents()`, iters on the parents of the entity.
-  
-  * `notification_references(view)`, used to control References field 
-    of email send on notification for this entity. `view` is the notification view.
-    Should return a list of eids which can be used to generate message ids
-    of previously sent email.
-
-`TreeMixIn` implements also the ITree interface (``cubicweb.interfaces``):
-
-  * `parent()`, returns the parent entity if any, else None (e.g. if we are on the
-    root)
-
-  * `children(entities=True, sametype=False)`, returns children entities
-    according to the `entities` parameter, return entity objects or the
-    equivalent result set.
-
-  * `children_rql()`, returns the RQL query corresponding to the children
-    of the entity.
-
-  * `is_leaf()`, returns True if the entity does not have any children.
-
-  * `is_root()`, returns True if the entity does not have any parent.
-
-  * `root()`, returns the root object of the tree representation of
-    the entity and its related entities.
-
-Example of use
-``````````````
-
-Imagine you defined three types of entities in your schema, and they
-relates to each others as follows in ``schema.py``::
-
-  class Entity1(EntityType):
-      title = String()
-      is_related_to = SubjectRelation('Entity2', 'subject')
-
-  class Entity2(EntityType):
-      title = String()
-      belongs_to = SubjectRelation('Entity3', 'subject')
-
-  class Entity3(EntityType):
-      name = String()
-
-You would like to create a view that applies to both entity types
-`Entity1` and `Entity2` and which lists the entities they are related to.
-That means when you view `Entity1` you want to list all `Entity2`, and
-when you view `Entity2` you want to list all `Entity3`.
-
-In ``entities.py``::
-
-  class Entity1(TreeMixIn, AnyEntity):
-      id = 'Entity1'
-      __implements__ = AnyEntity.__implements__ + (ITree,)
-      __rtags__ = {('is_related_to', 'Entity2', 'object'): 'link'}
-      tree_attribute = 'is_related_to'
-
-      def children(self, entities=True):
-          return self.different_type_children(entities)
-
-  class Entity2(TreeMixIn, AnyEntity):
-      id = 'Entity2'
-      __implements__ = AnyEntity.__implements__ + (ITree,)
-      __rtags__ = {('belongs_to', 'Entity3', 'object'): 'link'}
-      tree_attribute = 'belongs_to'
-
-      def children(self, entities=True):
-          return self.different_type_children(entities)
-
-Once this is done, you can define your common view as follows::
-
-  class E1E2CommonView(baseviews.PrimaryView):
-      accepts = ('Entity11, 'Entity2')
-      
-      def render_entity_relations(self, entity, siderelations):
-          self.wview('list', entity.children(entities=False))
-
--- a/doc/book/en/devrepo/datamodel/definition.rst	Thu Aug 26 10:29:32 2010 +0200
+++ b/doc/book/en/devrepo/datamodel/definition.rst	Thu Aug 26 11:45:57 2010 +0200
@@ -583,12 +583,7 @@
 
 * a string corresponding to an entity type
 * a tuple of string corresponding to multiple entity types
-* special string such as follows:
-
-  - "**": all types of entities
-  - "*": all types of non-meta entities
-  - "@": all types of meta entities but not system entities (e.g. used for
-    the basic schema description)
+* the '*' special string, meaning all types of entities
 
 When a relation is not inlined and not symmetrical, and it does not require
 specific permissions, it can be defined using a `SubjectRelation`
--- a/doc/book/en/devrepo/entityclasses/adapters.rst	Thu Aug 26 10:29:32 2010 +0200
+++ b/doc/book/en/devrepo/entityclasses/adapters.rst	Thu Aug 26 11:45:57 2010 +0200
@@ -13,7 +13,7 @@
 
 In |cubicweb| adapters provide logical functionalities
 to entity types. They are introduced in version `3.9`. Before that one
-had to implements Interfaces in entity classes to achieve a similar goal. However,
+had to implement Interfaces in entity classes to achieve a similar goal. However,
 hte problem with this approch is that is clutters the entity class's namespace, exposing
 name collision risks with schema attributes/relations or even methods names
 (different interfaces may define the same method with not necessarily the same
@@ -42,6 +42,16 @@
 The adapter object has ``self.entity`` attribute which represents the
 entity being adapted.
 
+.. Note::
+
+   Adapters came with the notion of service identified by the registry identifier
+   of an adapters, hence dropping the need for explicit interface and the
+   :class:`cubicweb.selectors.implements` selector. You should instead use
+   :class:`cubicweb.selectors.is_instance` when you want to select on an entity
+   type, or :class:`cubicweb.selectors.adaptable` when you want to select on a
+   service.
+
+
 Specializing and binding an adapter
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -61,12 +71,6 @@
 ``MyEntity`` entity type (the `adaptee`).
 
 
-Selecting on an adapter
-~~~~~~~~~~~~~~~~~~~~~~~
-
-There is an ``adaptable`` selector which can be used instead of
-``implements``.
-
 .. _interfaces_to_adapters:
 
 Converting code from Interfaces/Mixins to Adapters
@@ -94,11 +98,11 @@
 
 .. sourcecode:: python
 
-    from cubicweb.selectors import adaptable, implements
+    from cubicweb.selectors import adaptable, is_instance
     from cubicweb.entities.adapters import ITreeAdapter
 
     class MyEntityITreeAdapter(ITreeAdapter):
-        __select__ = implements('MyEntity')
+        __select__ = is_instance('MyEntity')
 
     class ITreeView(EntityView):
         __select__ = adaptable('ITree')
--- a/doc/book/en/devrepo/entityclasses/application-logic.rst	Thu Aug 26 10:29:32 2010 +0200
+++ b/doc/book/en/devrepo/entityclasses/application-logic.rst	Thu Aug 26 11:45:57 2010 +0200
@@ -62,7 +62,7 @@
     from cubicweb.entities.adapters import ITreeAdapter
 
     class ProjectAdapter(ITreeAdapter):
-        __select__ = implements('Project')
+        __select__ = is_instance('Project')
         tree_relation = 'subproject_of'
 
     class Project(AnyEntity):
--- a/doc/book/en/devrepo/repo/hooks.rst	Thu Aug 26 10:29:32 2010 +0200
+++ b/doc/book/en/devrepo/repo/hooks.rst	Thu Aug 26 11:45:57 2010 +0200
@@ -25,22 +25,22 @@
 .. sourcecode:: python
 
    from cubicweb import ValidationError
-   from cubicweb.selectors import implements
+   from cubicweb.selectors import is_instance
    from cubicweb.server.hook import Hook
 
    class PersonAgeRange(Hook):
         __regid__ = 'person_age_range'
         events = ('before_add_entity', 'before_update_entity')
-        __select__ = Hook.__select__ & implements('Person')
+        __select__ = Hook.__select__ & is_instance('Person')
 
         def __call__(self):
 	    if 'age' in self.entity.cw_edited:
-		if 0 >= self.entity.age <= 120:
-		   return
+                if 0 <= self.entity.age <= 120:
+                   return
 		msg = self._cw._('age must be between 0 and 120')
 		raise ValidationError(self.entity.eid, {'age': msg})
 
-In our example the base `__select__` is augmented with an `implements` selector
+In our example the base `__select__` is augmented with an `is_instance` selector
 matching the desired entity type.
 
 The `events` tuple is used specify that our hook should be called before the
--- a/doc/book/en/devweb/edition/examples.rst	Thu Aug 26 10:29:32 2010 +0200
+++ b/doc/book/en/devweb/edition/examples.rst	Thu Aug 26 11:45:57 2010 +0200
@@ -18,7 +18,7 @@
  from cubicweb.web import formfields as ff, formwidgets as fwdgs
  class SendToReviewerStatusChangeView(ChangeStateFormView):
      __select__ = (ChangeStateFormView.__select__ &
-                   implements('Talk') &
+                   is_instance('Talk') &
                    rql_condition('X in_state S, S name "submitted"'))
 
      def get_form(self, entity, transition, **kwargs):
@@ -126,7 +126,7 @@
 
     class MassMailingFormView(form.FormViewMixIn, EntityView):
 	__regid__ = 'massmailing'
-	__select__ = implements(IEmailable) & authenticated_user()
+	__select__ = is_instance(IEmailable) & authenticated_user()
 
 	def call(self):
 	    form = self._cw.vreg['forms'].select('massmailing', self._cw,
--- a/doc/book/en/devweb/views/primary.rst	Thu Aug 26 10:29:32 2010 +0200
+++ b/doc/book/en/devweb/views/primary.rst	Thu Aug 26 11:45:57 2010 +0200
@@ -215,11 +215,11 @@
 
 .. sourcecode:: python
 
-   from cubicweb.selectors import implements
+   from cubicweb.selectors import is_instance
    from cubicweb.web.views.primary import Primaryview
 
    class BlogEntryPrimaryView(PrimaryView):
-     __select__ = PrimaryView.__select__ & implements('BlogEntry')
+     __select__ = PrimaryView.__select__ & is_instance('BlogEntry')
 
        def render_entity_attributes(self, entity):
            self.w(u'<p>published on %s</p>' %
@@ -245,12 +245,12 @@
 .. sourcecode:: python
 
  from logilab.mtconverter import xml_escape
- from cubicweb.selectors import implements, one_line_rset
+ from cubicweb.selectors import is_instance, one_line_rset
  from cubicweb.web.views.primary import Primaryview
 
  class BlogPrimaryView(PrimaryView):
      __regid__ = 'primary'
-     __select__ = PrimaryView.__select__ & implements('Blog')
+     __select__ = PrimaryView.__select__ & is_instance('Blog')
      rql = 'Any BE ORDERBY D DESC WHERE BE entry_of B, BE publish_date D, B eid %(b)s'
 
      def render_entity_relations(self, entity):
@@ -260,7 +260,7 @@
 
  class BlogEntryInBlogView(EntityView):
      __regid__ = 'inblogcontext'
-     __select__ = implements('BlogEntry')
+     __select__ = is_instance('BlogEntry')
 
      def cell_call(self, row, col):
          entity = self.cw_rset.get_entity(row, col)
--- a/doc/book/en/devweb/views/views.rst	Thu Aug 26 10:29:32 2010 +0200
+++ b/doc/book/en/devweb/views/views.rst	Thu Aug 26 11:45:57 2010 +0200
@@ -121,7 +121,7 @@
         """
         __regid__ = 'search-associate'
         title = _('search for association')
-        __select__ = one_line_rset() & match_search_state('linksearch') & implements('Any')
+        __select__ = one_line_rset() & match_search_state('linksearch') & is_instance('Any')
 
 
 XML views, binaries views...
--- a/doc/book/en/tutorials/advanced/index.rst	Thu Aug 26 10:29:32 2010 +0200
+++ b/doc/book/en/tutorials/advanced/index.rst	Thu Aug 26 11:45:57 2010 +0200
@@ -335,7 +335,7 @@
 
 .. sourcecode:: python
 
-    from cubicweb.selectors import implements
+    from cubicweb.selectors import is_instance
     from cubicweb.server import hook
 
     class SetVisibilityOp(hook.Operation):
@@ -347,7 +347,7 @@
 
     class SetVisibilityHook(hook.Hook):
 	__regid__ = 'sytweb.setvisibility'
-	__select__ = hook.Hook.__select__ & implements('Folder', 'File', 'Image', 'Comment')
+	__select__ = hook.Hook.__select__ & is_instance('Folder', 'File', 'Image', 'Comment')
 	events = ('after_add_entity',)
 	def __call__(self):
 	    hook.set_operation(self._cw, 'pending_visibility', self.entity.eid,
--- a/doc/book/en/tutorials/base/create-cube.rst	Thu Aug 26 10:29:32 2010 +0200
+++ b/doc/book/en/tutorials/base/create-cube.rst	Thu Aug 26 11:45:57 2010 +0200
@@ -307,11 +307,11 @@
 
 .. sourcecode:: python
 
-  from cubicweb.selectors import implements
+  from cubicweb.selectors import is_instance
   from cubicweb.web.views import primary
 
   class BlogEntryPrimaryView(primary.PrimaryView):
-      __select__ = implements('BlogEntry')
+      __select__ = is_instance('BlogEntry')
 
       def render_entity_attributes(self, entity):
           self.w(u'<p>published on %s</p>' %
@@ -357,7 +357,6 @@
     class BlogEntry(AnyEntity):
         """customized class for BlogEntry entities"""
     	__regid__ = 'BlogEntry'
-    	__implements__ = AnyEntity.__implements__
 
         def display_cw_logo(self):
             if 'CW' in self.title:
@@ -376,7 +375,7 @@
 .. sourcecode:: python
 
  class BlogEntryPrimaryView(primary.PrimaryView):
-     __select__ = implements('BlogEntry')
+     __select__ = is_instance('BlogEntry')
 
      ...
 
--- a/entities/adapters.py	Thu Aug 26 10:29:32 2010 +0200
+++ b/entities/adapters.py	Thu Aug 26 11:45:57 2010 +0200
@@ -182,8 +182,29 @@
 
 class ITreeAdapter(EntityAdapter):
     """This adapter has to be overriden to be configured using the
-    tree_relation, child_role and parent_role class attributes to
-    benefit from this default implementation
+    tree_relation, child_role and parent_role class attributes to benefit from
+    this default implementation.
+
+    This adapter provides a tree interface. It has to be overriden to be
+    configured using the tree_relation, child_role and parent_role class
+    attributes to benefit from this default implementation.
+
+    This class provides the following methods:
+
+    .. automethod: iterparents
+    .. automethod: iterchildren
+    .. automethod: prefixiter
+
+    .. automethod: is_leaf
+    .. automethod: is_root
+
+    .. automethod: root
+    .. automethod: parent
+    .. automethod: children
+    .. automethod: different_type_children
+    .. automethod: same_type_children
+    .. automethod: children_rql
+    .. automethod: path
     """
     __regid__ = 'ITree'
     __select__ = implements(ITree, warn=False) # XXX for bw compat, else should be abstract
@@ -198,20 +219,18 @@
              DeprecationWarning)
         return self.entity.tree_attribute
 
+    # XXX should be removed from the public interface
     @implements_adapter_compat('ITree')
     def children_rql(self):
-        """returns RQL to get children
-
-        XXX should be removed from the public interface
-        """
+        """Returns RQL to get the children of the entity."""
         return self.entity.cw_related_rql(self.tree_relation, self.parent_role)
 
     @implements_adapter_compat('ITree')
     def different_type_children(self, entities=True):
-        """return children entities of different type as this entity.
+        """Return children entities of different type as this entity.
 
-        according to the `entities` parameter, return entity objects or the
-        equivalent result set
+        According to the `entities` parameter, return entity objects or the
+        equivalent result set.
         """
         res = self.entity.related(self.tree_relation, self.parent_role,
                                   entities=entities)
@@ -222,10 +241,10 @@
 
     @implements_adapter_compat('ITree')
     def same_type_children(self, entities=True):
-        """return children entities of the same type as this entity.
+        """Return children entities of the same type as this entity.
 
-        according to the `entities` parameter, return entity objects or the
-        equivalent result set
+        According to the `entities` parameter, return entity objects or the
+        equivalent result set.
         """
         res = self.entity.related(self.tree_relation, self.parent_role,
                                   entities=entities)
@@ -236,23 +255,24 @@
 
     @implements_adapter_compat('ITree')
     def is_leaf(self):
-        """returns true if this node as no child"""
+        """Returns True if the entity does not have any children."""
         return len(self.children()) == 0
 
     @implements_adapter_compat('ITree')
     def is_root(self):
-        """returns true if this node has no parent"""
+        """Returns true if the entity is root of the tree (e.g. has no parent).
+        """
         return self.parent() is None
 
     @implements_adapter_compat('ITree')
     def root(self):
-        """return the root object"""
+        """Return the root entity of the tree."""
         return self._cw.entity_from_eid(self.path()[0])
 
     @implements_adapter_compat('ITree')
     def parent(self):
-        """return the parent entity if any, else None (e.g. if we are on the
-        root)
+        """Returns the parent entity if any, else None (e.g. if we are on the
+        root).
         """
         try:
             return self.entity.related(self.tree_relation, self.child_role,
@@ -262,10 +282,10 @@
 
     @implements_adapter_compat('ITree')
     def children(self, entities=True, sametype=False):
-        """return children entities
+        """Return children entities.
 
-        according to the `entities` parameter, return entity objects or the
-        equivalent result set
+        According to the `entities` parameter, return entity objects or the
+        equivalent result set.
         """
         if sametype:
             return self.same_type_children(entities)
@@ -275,6 +295,7 @@
 
     @implements_adapter_compat('ITree')
     def iterparents(self, strict=True):
+        """Return an iterator on the parents of the entity."""
         def _uptoroot(self):
             curr = self
             while True:
@@ -289,7 +310,7 @@
 
     @implements_adapter_compat('ITree')
     def iterchildren(self, _done=None):
-        """iterates over the item's children"""
+        """Return an iterator over the item's children."""
         if _done is None:
             _done = set()
         for child in self.children():
@@ -301,6 +322,7 @@
 
     @implements_adapter_compat('ITree')
     def prefixiter(self, _done=None):
+        """Return an iterator over the item's descendants in a prefixed order."""
         if _done is None:
             _done = set()
         if self.entity.eid in _done:
@@ -314,7 +336,7 @@
     @cached
     @implements_adapter_compat('ITree')
     def path(self):
-        """returns the list of eids from the root object to this object"""
+        """Returns the list of eids from the root object to this object."""
         path = []
         adapter = self
         entity = adapter.entity
--- a/i18n/en.po	Thu Aug 26 10:29:32 2010 +0200
+++ b/i18n/en.po	Thu Aug 26 11:45:57 2010 +0200
@@ -8,6 +8,7 @@
 "PO-Revision-Date: 2010-05-16 18:58+0200\n"
 "Last-Translator: Sylvain Thenault <sylvain.thenault@logilab.fr>\n"
 "Language-Team: English <devel@logilab.fr.org>\n"
+"Language: en\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -358,6 +359,10 @@
 "supported"
 msgstr ""
 
+#, python-format
+msgid "Data connection graph for %s"
+msgstr ""
+
 msgid "Date"
 msgstr "Date"
 
@@ -382,10 +387,10 @@
 msgid "Download schema as OWL"
 msgstr ""
 
-msgctxt "inlined:CWUser.use_email.subject"
 msgid "EmailAddress"
 msgstr "Email address"
 
+msgctxt "inlined:CWUser.use_email.subject"
 msgid "EmailAddress"
 msgstr "Email address"
 
@@ -951,6 +956,9 @@
 msgid "add_permission"
 msgstr "add permission"
 
+msgid "add_permission_object"
+msgstr "has permission to add"
+
 msgctxt "CWGroup"
 msgid "add_permission_object"
 msgstr "can add"
@@ -959,9 +967,6 @@
 msgid "add_permission_object"
 msgstr "used to define add permission on"
 
-msgid "add_permission_object"
-msgstr "has permission to add"
-
 msgid "add_relation"
 msgstr "add"
 
@@ -971,8 +976,8 @@
 
 #, python-format
 msgid ""
-"added relation %(rtype)s from %(frometype)s #%(eidfrom)s to %(toetype)s #%"
-"(eidto)s"
+"added relation %(rtype)s from %(frometype)s #%(eidfrom)s to %(toetype)s #"
+"%(eidto)s"
 msgstr ""
 
 msgid "addrelated"
@@ -1005,6 +1010,9 @@
 msgid "allowed_transition"
 msgstr "allowed transition"
 
+msgid "allowed_transition_object"
+msgstr "incoming states"
+
 msgctxt "BaseTransition"
 msgid "allowed_transition_object"
 msgstr "incoming states"
@@ -1017,9 +1025,6 @@
 msgid "allowed_transition_object"
 msgstr "incoming states"
 
-msgid "allowed_transition_object"
-msgstr "incoming states"
-
 msgid "am/pm calendar (month)"
 msgstr ""
 
@@ -1103,13 +1108,13 @@
 msgid "bookmarked_by"
 msgstr "bookmarked by"
 
+msgid "bookmarked_by_object"
+msgstr "has bookmarks"
+
 msgctxt "CWUser"
 msgid "bookmarked_by_object"
 msgstr "uses bookmarks"
 
-msgid "bookmarked_by_object"
-msgstr "has bookmarks"
-
 msgid "bookmarks"
 msgstr ""
 
@@ -1195,6 +1200,9 @@
 msgid "by_transition"
 msgstr "by transition"
 
+msgid "by_transition_object"
+msgstr "transition information"
+
 msgctxt "BaseTransition"
 msgid "by_transition_object"
 msgstr "transition information"
@@ -1207,9 +1215,6 @@
 msgid "by_transition_object"
 msgstr "transition information"
 
-msgid "by_transition_object"
-msgstr "transition information"
-
 msgid "calendar"
 msgstr ""
 
@@ -1391,10 +1396,10 @@
 msgid "condition"
 msgstr "condition"
 
-msgctxt "RQLExpression"
 msgid "condition_object"
 msgstr "condition of"
 
+msgctxt "RQLExpression"
 msgid "condition_object"
 msgstr "condition of"
 
@@ -1421,10 +1426,10 @@
 msgid "constrained_by"
 msgstr "constrained by"
 
-msgctxt "CWConstraint"
 msgid "constrained_by_object"
 msgstr "constraints"
 
+msgctxt "CWConstraint"
 msgid "constrained_by_object"
 msgstr "constraints"
 
@@ -1635,8 +1640,8 @@
 msgstr "creating workflow-transition leading to state %(linkto)s"
 
 msgid ""
-"creating WorkflowTransition (WorkflowTransition transition_of Workflow %"
-"(linkto)s)"
+"creating WorkflowTransition (WorkflowTransition transition_of Workflow "
+"%(linkto)s)"
 msgstr "creating workflow-transition of workflow %(linkto)s"
 
 msgid "creation"
@@ -1658,13 +1663,13 @@
 msgid "cstrtype"
 msgstr "constraint type"
 
+msgid "cstrtype_object"
+msgstr "used by"
+
 msgctxt "CWConstraintType"
 msgid "cstrtype_object"
 msgstr "constraint type of"
 
-msgid "cstrtype_object"
-msgstr "used by"
-
 msgid "csv entities export"
 msgstr ""
 
@@ -1747,10 +1752,10 @@
 msgid "default_workflow"
 msgstr "default workflow"
 
-msgctxt "Workflow"
 msgid "default_workflow_object"
 msgstr "default workflow of"
 
+msgctxt "Workflow"
 msgid "default_workflow_object"
 msgstr "default workflow of"
 
@@ -1826,6 +1831,9 @@
 msgid "delete_permission"
 msgstr "delete_permission"
 
+msgid "delete_permission_object"
+msgstr "has permission to delete"
+
 msgctxt "CWGroup"
 msgid "delete_permission_object"
 msgstr "has permission to delete"
@@ -1834,17 +1842,14 @@
 msgid "delete_permission_object"
 msgstr "has permission to delete"
 
-msgid "delete_permission_object"
-msgstr "has permission to delete"
-
 #, python-format
 msgid "deleted %(etype)s #%(eid)s (%(title)s)"
 msgstr ""
 
 #, python-format
 msgid ""
-"deleted relation %(rtype)s from %(frometype)s #%(eidfrom)s to %(toetype)s #%"
-"(eidto)s"
+"deleted relation %(rtype)s from %(frometype)s #%(eidfrom)s to %(toetype)s #"
+"%(eidto)s"
 msgstr ""
 
 msgid "depends on the constraint type"
@@ -1853,15 +1858,7 @@
 msgid "description"
 msgstr "description"
 
-msgctxt "CWEType"
-msgid "description"
-msgstr "description"
-
-msgctxt "CWRelation"
-msgid "description"
-msgstr "description"
-
-msgctxt "Workflow"
+msgctxt "BaseTransition"
 msgid "description"
 msgstr "description"
 
@@ -1869,15 +1866,7 @@
 msgid "description"
 msgstr "description"
 
-msgctxt "Transition"
-msgid "description"
-msgstr "description"
-
-msgctxt "WorkflowTransition"
-msgid "description"
-msgstr "description"
-
-msgctxt "State"
+msgctxt "CWEType"
 msgid "description"
 msgstr "description"
 
@@ -1885,10 +1874,34 @@
 msgid "description"
 msgstr "description"
 
-msgctxt "BaseTransition"
+msgctxt "CWRelation"
+msgid "description"
+msgstr "description"
+
+msgctxt "State"
+msgid "description"
+msgstr "description"
+
+msgctxt "Transition"
 msgid "description"
 msgstr "description"
 
+msgctxt "Workflow"
+msgid "description"
+msgstr "description"
+
+msgctxt "WorkflowTransition"
+msgid "description"
+msgstr "description"
+
+msgid "description_format"
+msgstr "format"
+
+msgctxt "BaseTransition"
+msgid "description_format"
+msgstr "format"
+
+msgctxt "CWAttribute"
 msgid "description_format"
 msgstr "format"
 
@@ -1896,38 +1909,30 @@
 msgid "description_format"
 msgstr "format"
 
+msgctxt "CWRType"
+msgid "description_format"
+msgstr "format"
+
 msgctxt "CWRelation"
 msgid "description_format"
 msgstr "format"
 
+msgctxt "State"
+msgid "description_format"
+msgstr "format"
+
+msgctxt "Transition"
+msgid "description_format"
+msgstr "format"
+
 msgctxt "Workflow"
 msgid "description_format"
 msgstr "format"
 
-msgctxt "CWAttribute"
-msgid "description_format"
-msgstr "format"
-
-msgctxt "Transition"
-msgid "description_format"
-msgstr "format"
-
 msgctxt "WorkflowTransition"
 msgid "description_format"
 msgstr "format"
 
-msgctxt "State"
-msgid "description_format"
-msgstr "format"
-
-msgctxt "CWRType"
-msgid "description_format"
-msgstr "format"
-
-msgctxt "BaseTransition"
-msgid "description_format"
-msgstr "format"
-
 msgid "destination state for this transition"
 msgstr ""
 
@@ -1945,21 +1950,21 @@
 msgid "destination_state"
 msgstr "destination state"
 
+msgctxt "SubWorkflowExitPoint"
+msgid "destination_state"
+msgstr "destination state"
+
 msgctxt "Transition"
 msgid "destination_state"
 msgstr "destination state"
 
-msgctxt "SubWorkflowExitPoint"
-msgid "destination_state"
-msgstr "destination state"
+msgid "destination_state_object"
+msgstr "destination of"
 
 msgctxt "State"
 msgid "destination_state_object"
 msgstr "destination of"
 
-msgid "destination_state_object"
-msgstr "destination of"
-
 msgid "detach attached file"
 msgstr ""
 
@@ -2090,7 +2095,7 @@
 msgid "eta_date"
 msgstr "ETA date"
 
-msgid "exit state must a subworkflow state"
+msgid "exit state must be a subworkflow state"
 msgstr ""
 
 msgid "exit_point"
@@ -2213,13 +2218,13 @@
 msgid "for_user"
 msgstr "for user"
 
+msgid "for_user_object"
+msgstr "use properties"
+
 msgctxt "CWUser"
 msgid "for_user_object"
 msgstr "property of"
 
-msgid "for_user_object"
-msgstr "use properties"
-
 msgid "friday"
 msgstr ""
 
@@ -2241,13 +2246,13 @@
 msgid "from_entity"
 msgstr "from entity"
 
+msgid "from_entity_object"
+msgstr "subjet relation"
+
 msgctxt "CWEType"
 msgid "from_entity_object"
 msgstr "subjec relation"
 
-msgid "from_entity_object"
-msgstr "subjet relation"
-
 msgid "from_interval_start"
 msgstr "from"
 
@@ -2258,10 +2263,10 @@
 msgid "from_state"
 msgstr "from state"
 
-msgctxt "State"
 msgid "from_state_object"
 msgstr "transitions from this state"
 
+msgctxt "State"
 msgid "from_state_object"
 msgstr "transitions from this state"
 
@@ -2315,10 +2320,6 @@
 "model"
 msgstr ""
 
-#, python-format
-msgid "graphical workflow for %s"
-msgstr ""
-
 msgid "group in which a user should be to be allowed to pass this transition"
 msgstr ""
 
@@ -2423,10 +2424,10 @@
 msgid "in_group"
 msgstr "in group"
 
-msgctxt "CWGroup"
 msgid "in_group_object"
 msgstr "contains"
 
+msgctxt "CWGroup"
 msgid "in_group_object"
 msgstr "contains"
 
@@ -2481,10 +2482,10 @@
 msgid "initial_state"
 msgstr "initial state"
 
-msgctxt "State"
 msgid "initial_state_object"
 msgstr "initial state of"
 
+msgctxt "State"
 msgid "initial_state_object"
 msgstr "initial state of"
 
@@ -2740,15 +2741,19 @@
 msgid "name"
 msgstr ""
 
-msgctxt "CWEType"
+msgctxt "BaseTransition"
+msgid "name"
+msgstr "name"
+
+msgctxt "CWCache"
 msgid "name"
-msgstr ""
-
-msgctxt "Transition"
+msgstr "name"
+
+msgctxt "CWConstraintType"
 msgid "name"
 msgstr ""
 
-msgctxt "Workflow"
+msgctxt "CWEType"
 msgid "name"
 msgstr ""
 
@@ -2756,18 +2761,6 @@
 msgid "name"
 msgstr ""
 
-msgctxt "CWConstraintType"
-msgid "name"
-msgstr ""
-
-msgctxt "WorkflowTransition"
-msgid "name"
-msgstr ""
-
-msgctxt "State"
-msgid "name"
-msgstr "name"
-
 msgctxt "CWPermission"
 msgid "name"
 msgstr "name"
@@ -2776,13 +2769,21 @@
 msgid "name"
 msgstr "name"
 
-msgctxt "BaseTransition"
+msgctxt "State"
 msgid "name"
 msgstr "name"
 
-msgctxt "CWCache"
+msgctxt "Transition"
+msgid "name"
+msgstr ""
+
+msgctxt "Workflow"
 msgid "name"
-msgstr "name"
+msgstr ""
+
+msgctxt "WorkflowTransition"
+msgid "name"
+msgstr ""
 
 msgid "name of the cache"
 msgstr ""
@@ -2998,10 +2999,10 @@
 msgid "prefered_form"
 msgstr "prefered form"
 
-msgctxt "EmailAddress"
 msgid "prefered_form_object"
 msgstr "prefered over"
 
+msgctxt "EmailAddress"
 msgid "prefered_form_object"
 msgstr "prefered over"
 
@@ -3021,10 +3022,10 @@
 msgid "primary_email"
 msgstr "primary email"
 
-msgctxt "EmailAddress"
 msgid "primary_email_object"
 msgstr "primary email of"
 
+msgctxt "EmailAddress"
 msgid "primary_email_object"
 msgstr "primary email of"
 
@@ -3052,11 +3053,11 @@
 msgid "read_permission"
 msgstr "can be read by"
 
-msgctxt "CWEType"
+msgctxt "CWAttribute"
 msgid "read_permission"
 msgstr "read permission"
 
-msgctxt "CWAttribute"
+msgctxt "CWEType"
 msgid "read_permission"
 msgstr "read permission"
 
@@ -3064,6 +3065,9 @@
 msgid "read_permission"
 msgstr "read permission"
 
+msgid "read_permission_object"
+msgstr "has permission to read"
+
 msgctxt "CWGroup"
 msgid "read_permission_object"
 msgstr "can be read by"
@@ -3072,9 +3076,6 @@
 msgid "read_permission_object"
 msgstr "can be read by"
 
-msgid "read_permission_object"
-msgstr "has permission to read"
-
 msgid "registry"
 msgstr ""
 
@@ -3108,10 +3109,10 @@
 msgid "relation_type"
 msgstr "relation type"
 
-msgctxt "CWRType"
 msgid "relation_type_object"
 msgstr "relation definitions"
 
+msgctxt "CWRType"
 msgid "relation_type_object"
 msgstr "relation definitions"
 
@@ -3131,11 +3132,11 @@
 msgid "require_group"
 msgstr "require group"
 
-msgctxt "Transition"
+msgctxt "CWPermission"
 msgid "require_group"
 msgstr "require group"
 
-msgctxt "CWPermission"
+msgctxt "Transition"
 msgid "require_group"
 msgstr "require group"
 
@@ -3143,10 +3144,10 @@
 msgid "require_group"
 msgstr "require group"
 
-msgctxt "CWGroup"
 msgid "require_group_object"
 msgstr "required by"
 
+msgctxt "CWGroup"
 msgid "require_group_object"
 msgstr "required by"
 
@@ -3339,10 +3340,10 @@
 msgid "specializes"
 msgstr "specializes"
 
-msgctxt "CWEType"
 msgid "specializes_object"
 msgstr "specialized by"
 
+msgctxt "CWEType"
 msgid "specializes_object"
 msgstr "specialized by"
 
@@ -3379,10 +3380,10 @@
 msgid "state_of"
 msgstr "state of"
 
-msgctxt "Workflow"
 msgid "state_of_object"
 msgstr "use states"
 
+msgctxt "Workflow"
 msgid "state_of_object"
 msgstr "use states"
 
@@ -3426,20 +3427,20 @@
 msgid "subworkflow_exit"
 msgstr "subworkflow exit"
 
+msgid "subworkflow_exit_object"
+msgstr "subworkflow exit of"
+
 msgctxt "SubWorkflowExitPoint"
 msgid "subworkflow_exit_object"
 msgstr "subworkflow exit of"
 
-msgid "subworkflow_exit_object"
-msgstr "subworkflow exit of"
+msgid "subworkflow_object"
+msgstr "subworkflow of"
 
 msgctxt "Workflow"
 msgid "subworkflow_object"
 msgstr "subworkflow of"
 
-msgid "subworkflow_object"
-msgstr "subworkflow of"
-
 msgid "subworkflow_state"
 msgstr "subworkflow state"
 
@@ -3447,10 +3448,10 @@
 msgid "subworkflow_state"
 msgstr "subworkflow state"
 
-msgctxt "State"
 msgid "subworkflow_state_object"
 msgstr "exit point"
 
+msgctxt "State"
 msgid "subworkflow_state_object"
 msgstr "exit point"
 
@@ -3564,10 +3565,10 @@
 msgid "to_entity"
 msgstr "to entity"
 
-msgctxt "CWEType"
 msgid "to_entity_object"
 msgstr "object relations"
 
+msgctxt "CWEType"
 msgid "to_entity_object"
 msgstr "object relations"
 
@@ -3581,10 +3582,10 @@
 msgid "to_state"
 msgstr "to state"
 
-msgctxt "State"
 msgid "to_state_object"
 msgstr "transitions to this state"
 
+msgctxt "State"
 msgid "to_state_object"
 msgstr "transitions to this state"
 
@@ -3625,10 +3626,10 @@
 msgid "transition_of"
 msgstr "transition of"
 
-msgctxt "Workflow"
 msgid "transition_of_object"
 msgstr "use transitions"
 
+msgctxt "Workflow"
 msgid "transition_of_object"
 msgstr "use transitions"
 
@@ -3732,13 +3733,16 @@
 msgid "update_permission"
 msgstr "can be updated by"
 
+msgctxt "CWAttribute"
+msgid "update_permission"
+msgstr "can be updated by"
+
 msgctxt "CWEType"
 msgid "update_permission"
 msgstr "can be updated by"
 
-msgctxt "CWAttribute"
-msgid "update_permission"
-msgstr "can be updated by"
+msgid "update_permission_object"
+msgstr "has permission to update"
 
 msgctxt "CWGroup"
 msgid "update_permission_object"
@@ -3748,9 +3752,6 @@
 msgid "update_permission_object"
 msgstr "has permission to update"
 
-msgid "update_permission_object"
-msgstr "has permission to update"
-
 msgid "update_relation"
 msgstr "update"
 
@@ -3784,10 +3785,10 @@
 msgid "use_email"
 msgstr "use email"
 
-msgctxt "EmailAddress"
 msgid "use_email_object"
 msgstr "used by"
 
+msgctxt "EmailAddress"
 msgid "use_email_object"
 msgstr "used by"
 
@@ -3966,10 +3967,10 @@
 msgid "workflow_of"
 msgstr "workflow of"
 
-msgctxt "CWEType"
 msgid "workflow_of_object"
 msgstr "may use workflow"
 
+msgctxt "CWEType"
 msgid "workflow_of_object"
 msgstr "may use workflow"
 
--- a/i18n/es.po	Thu Aug 26 10:29:32 2010 +0200
+++ b/i18n/es.po	Thu Aug 26 11:45:57 2010 +0200
@@ -5,8 +5,10 @@
 msgstr ""
 "Project-Id-Version: cubicweb 2.46.0\n"
 "PO-Revision-Date: 2010-11-27 07:59+0100\n"
-"Last-Translator: Celso Flores<celso.flores@crealibre.com>, Carlos Balderas <carlos.balderas@crealibre.com>\n"
+"Last-Translator: Celso Flores<celso.flores@crealibre.com>, Carlos Balderas "
+"<carlos.balderas@crealibre.com>\n"
 "Language-Team: es <contact@logilab.fr>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -23,8 +25,8 @@
 "url: %(url)s\n"
 msgstr ""
 "\n"
-"%(user)s ha cambiado su estado de <%(previous_state)s> hacia "
-"<%(current_state)s> por la entidad\n"
+"%(user)s ha cambiado su estado de <%(previous_state)s> hacia <"
+"%(current_state)s> por la entidad\n"
 "'%(title)s'\n"
 "\n"
 "%(comment)s\n"
@@ -186,7 +188,8 @@
 "can also display a <a href=\"%s\">complete schema with meta-data</a>.</div>"
 msgstr ""
 "<div>Este esquema del modelo de datos <em>no incluye</em> los meta-datos, "
-"pero se puede ver a un <a href=\"%s\">modelo completo con meta-datos</a>.</div>"
+"pero se puede ver a un <a href=\"%s\">modelo completo con meta-datos</a>.</"
+"div>"
 
 msgid "?*"
 msgstr "0..1 0..n"
@@ -334,8 +337,8 @@
 "Can't restore %(role)s relation %(rtype)s to entity %(eid)s which is already "
 "linked using this relation."
 msgstr ""
-"No puede restaurar la relación %(role)s %(rtype)s en la entidad %(eid)s "
-"pues ya esta ligada a otra entidad usando esa relación."
+"No puede restaurar la relación %(role)s %(rtype)s en la entidad %(eid)s pues "
+"ya esta ligada a otra entidad usando esa relación."
 
 #, python-format
 msgid ""
@@ -358,16 +361,16 @@
 "Can't restore relation %(rtype)s, %(role)s entity %(eid)s doesn't exist "
 "anymore."
 msgstr ""
-"No puede restaurar la relación %(rtype)s, la entidad %(role)s %(eid)s ya "
-"no existe."
+"No puede restaurar la relación %(rtype)s, la entidad %(role)s %(eid)s ya no "
+"existe."
 
 #, python-format
 msgid ""
 "Can't undo addition of relation %(rtype)s from %(subj)s to %(obj)s, doesn't "
 "exist anymore"
 msgstr ""
-"No puede anular el agregar la relación %(rtype)s de %(subj)s a %(obj)s, "
-"esta relación ya no existe"
+"No puede anular el agregar la relación %(rtype)s de %(subj)s a %(obj)s, esta "
+"relación ya no existe"
 
 #, python-format
 msgid ""
@@ -377,6 +380,10 @@
 "No puede anular la creación de la entidad %(eid)s de tipo %(etype)s, este "
 "tipo ya no existe"
 
+#, python-format
+msgid "Data connection graph for %s"
+msgstr ""
+
 msgid "Date"
 msgstr "Fecha"
 
@@ -401,10 +408,10 @@
 msgid "Download schema as OWL"
 msgstr "Descargar el esquema en formato OWL"
 
-msgctxt "inlined:CWUser.use_email.subject"
 msgid "EmailAddress"
 msgstr "Correo Electrónico"
 
+msgctxt "inlined:CWUser.use_email.subject"
 msgid "EmailAddress"
 msgstr "Correo Electrónico"
 
@@ -808,7 +815,8 @@
 "You have no access to this view or it can not be used to display the current "
 "data."
 msgstr ""
-"No tiene permisos para accesar esta vista o No puede utilizarse para desplegar los datos seleccionados."
+"No tiene permisos para accesar esta vista o No puede utilizarse para "
+"desplegar los datos seleccionados."
 
 msgid ""
 "You're not authorized to access this page. If you think you should, please "
@@ -990,6 +998,9 @@
 msgid "add_permission"
 msgstr "Permiso de agregar"
 
+msgid "add_permission_object"
+msgstr "tiene permiso de agregar"
+
 msgctxt "CWGroup"
 msgid "add_permission_object"
 msgstr "tiene permiso de agregar"
@@ -998,9 +1009,6 @@
 msgid "add_permission_object"
 msgstr "tiene permiso de agregar"
 
-msgid "add_permission_object"
-msgstr "tiene permiso de agregar"
-
 msgid "add_relation"
 msgstr "agregar"
 
@@ -1010,11 +1018,11 @@
 
 #, python-format
 msgid ""
-"added relation %(rtype)s from %(frometype)s #%(eidfrom)s to %(toetype)s #%"
-"(eidto)s"
+"added relation %(rtype)s from %(frometype)s #%(eidfrom)s to %(toetype)s #"
+"%(eidto)s"
 msgstr ""
-"la relación %(rtype)s de %(frometype)s #%(eidfrom)s a %(toetype)s #%"
-"(eidto)s ha sido agregada"
+"la relación %(rtype)s de %(frometype)s #%(eidfrom)s a %(toetype)s #%(eidto)s "
+"ha sido agregada"
 
 msgid "addrelated"
 msgstr "Agregar"
@@ -1046,6 +1054,9 @@
 msgid "allowed_transition"
 msgstr "transiciones autorizadas"
 
+msgid "allowed_transition_object"
+msgstr "Estados de entrada"
+
 msgctxt "BaseTransition"
 msgid "allowed_transition_object"
 msgstr "transición autorizada de"
@@ -1058,9 +1069,6 @@
 msgid "allowed_transition_object"
 msgstr "transición autorizada de"
 
-msgid "allowed_transition_object"
-msgstr "Estados de entrada"
-
 msgid "am/pm calendar (month)"
 msgstr "calendario am/pm (mes)"
 
@@ -1106,7 +1114,8 @@
 #, python-format
 msgid "at least one relation %(rtype)s is required on %(etype)s (%(eid)s)"
 msgstr ""
-"La entidad #%(eid)s de tipo %(etype)s debe necesariamente tener almenos una relación de tipo %(rtype)s"
+"La entidad #%(eid)s de tipo %(etype)s debe necesariamente tener almenos una "
+"relación de tipo %(rtype)s"
 
 msgid "attribute"
 msgstr "Atributo"
@@ -1145,10 +1154,10 @@
 msgid "bookmarked_by"
 msgstr "está en los Favoritos de"
 
-msgctxt "CWUser"
 msgid "bookmarked_by_object"
 msgstr "tiene como Favoritos"
 
+msgctxt "CWUser"
 msgid "bookmarked_by_object"
 msgstr "tiene como Favoritos"
 
@@ -1177,8 +1186,7 @@
 msgstr "Caja de Acciones"
 
 msgid "ctxcomponents_edit_box_description"
-msgstr ""
-"Muestra las acciones posibles a ejecutar para los datos seleccionados"
+msgstr "Muestra las acciones posibles a ejecutar para los datos seleccionados"
 
 msgid "ctxcomponents_filter_box"
 msgstr "Filtros"
@@ -1202,7 +1210,8 @@
 msgstr "Caja de búsqueda"
 
 msgid "ctxcomponents_search_box_description"
-msgstr "Permite realizar una búsqueda simple para cualquier tipo de dato en la aplicación"
+"Permite realizar una búsqueda simple para cualquier tipo de dato en la "
+"aplicación"
 
 msgid "ctxcomponents_startup_views_box"
 msgstr "Caja Vistas de inicio"
@@ -1238,6 +1247,9 @@
 msgid "by_transition"
 msgstr "transición"
 
+msgid "by_transition_object"
+msgstr "cambio de estados"
+
 msgctxt "BaseTransition"
 msgid "by_transition_object"
 msgstr "tiene como información"
@@ -1250,9 +1262,6 @@
 msgid "by_transition_object"
 msgstr "tiene como información"
 
-msgid "by_transition_object"
-msgstr "cambio de estados"
-
 msgid "calendar"
 msgstr "mostrar un calendario"
 
@@ -1373,8 +1382,7 @@
 msgstr "Ruta de Navegación"
 
 msgid "components_breadcrumbs_description"
-msgstr ""
-"Muestra el lugar donde se encuentra la página actual en el Sistema"
+msgstr "Muestra el lugar donde se encuentra la página actual en el Sistema"
 
 msgid "components_etypenavigation"
 msgstr "Filtar por tipo"
@@ -1407,8 +1415,8 @@
 
 msgid "components_navigation_description"
 msgstr ""
-"Componente que permite presentar en varias páginas los resultados de  búsqueda "
-" cuando son mayores a un número predeterminado "
+"Componente que permite presentar en varias páginas los resultados de  "
+"búsqueda  cuando son mayores a un número predeterminado "
 
 msgid "components_rqlinput"
 msgstr "Barra RQL"
@@ -1438,10 +1446,10 @@
 msgid "condition"
 msgstr "condición"
 
-msgctxt "RQLExpression"
 msgid "condition_object"
 msgstr "condición de"
 
+msgctxt "RQLExpression"
 msgid "condition_object"
 msgstr "condición de"
 
@@ -1468,10 +1476,10 @@
 msgid "constrained_by"
 msgstr "Restricción impuesta por"
 
-msgctxt "CWConstraint"
 msgid "constrained_by_object"
 msgstr "Restricción de"
 
+msgctxt "CWConstraint"
 msgid "constrained_by_object"
 msgstr "Restricción de"
 
@@ -1515,16 +1523,16 @@
 
 msgid "ctxcomponents_seealso_description"
 msgstr ""
-"sección que muestra las entidades relacionadas por la relación \"vea también\" , "
-"si la entidad soporta esta relación."
+"sección que muestra las entidades relacionadas por la relación \"vea también"
+"\" , si la entidad soporta esta relación."
 
 msgid "ctxcomponents_wfhistory"
 msgstr "Histórico del workflow."
 
 msgid "ctxcomponents_wfhistory_description"
 msgstr ""
-"Sección que muestra el reporte histórico de las transiciones del workflow."
-" Aplica solo en entidades con workflow."
+"Sección que muestra el reporte histórico de las transiciones del workflow. "
+"Aplica solo en entidades con workflow."
 
 msgid "context"
 msgstr "Contexto"
@@ -1536,7 +1544,8 @@
 msgstr "Contexto en el cual el componente debe aparecer en el sistema"
 
 msgid "context where this facet should be displayed, leave empty for both"
-msgstr "Contexto en el cual esta faceta debe ser mostrada, dejar vacia para ambos"
+msgstr ""
+"Contexto en el cual esta faceta debe ser mostrada, dejar vacia para ambos"
 
 msgid "control subject entity's relations order"
 msgstr "Controla el orden de relaciones de la entidad sujeto"
@@ -1553,8 +1562,8 @@
 "the owner into the owners group for the entity"
 msgstr ""
 "Relación sistema que indica el(los) propietario(s) de una entidad. Esta "
-"relación pone de manera implícita al propietario en el grupo de "
-"propietarios de una entidad."
+"relación pone de manera implícita al propietario en el grupo de propietarios "
+"de una entidad."
 
 msgid "core relation indicating the original creator of an entity"
 msgstr "Relación sistema que indica el creador de una entidad."
@@ -1619,11 +1628,11 @@
 "creating RQLExpression (CWAttribute %(linkto)s read_permission RQLExpression)"
 msgstr "creación de una expresión RQL por el derecho de lectura de %(linkto)s"
 
-
 msgid ""
 "creating RQLExpression (CWAttribute %(linkto)s update_permission "
 "RQLExpression)"
-msgstr "creación de una expresión RQL por el derecho de actualización de %(linkto)s"
+msgstr ""
+"creación de una expresión RQL por el derecho de actualización de %(linkto)s"
 
 msgid ""
 "creating RQLExpression (CWEType %(linkto)s add_permission RQLExpression)"
@@ -1690,11 +1699,12 @@
 msgid ""
 "creating WorkflowTransition (State %(linkto)s allowed_transition "
 "WorkflowTransition)"
-msgstr "Creación de una Transición Workflow permitida desde el estado %(linkto)s"
+msgstr ""
+"Creación de una Transición Workflow permitida desde el estado %(linkto)s"
 
 msgid ""
-"creating WorkflowTransition (WorkflowTransition transition_of Workflow %"
-"(linkto)s)"
+"creating WorkflowTransition (WorkflowTransition transition_of Workflow "
+"%(linkto)s)"
 msgstr "Creación de una Transición Workflow del Workflow %(linkto)s"
 
 msgid "creation"
@@ -1716,13 +1726,13 @@
 msgid "cstrtype"
 msgstr "Tipo"
 
+msgid "cstrtype_object"
+msgstr "utilizado por"
+
 msgctxt "CWConstraintType"
 msgid "cstrtype_object"
 msgstr "Tipo de restricciones"
 
-msgid "cstrtype_object"
-msgstr "utilizado por"
-
 msgid "csv entities export"
 msgstr "Exportar entidades en csv"
 
@@ -1787,7 +1797,8 @@
 msgstr "Valor por defecto"
 
 msgid "default text format for rich text fields."
-msgstr "Formato de texto que se utilizará por defecto para los campos de tipo texto"
+msgstr ""
+"Formato de texto que se utilizará por defecto para los campos de tipo texto"
 
 msgid "default user workflow"
 msgstr "Workflow por defecto de los usuarios"
@@ -1805,10 +1816,10 @@
 msgid "default_workflow"
 msgstr "Workflow por defecto"
 
-msgctxt "Workflow"
 msgid "default_workflow_object"
 msgstr "Workflow por defecto de"
 
+msgctxt "Workflow"
 msgid "default_workflow_object"
 msgstr "Workflow por defecto de"
 
@@ -1830,18 +1841,20 @@
 "to a final entity type. used to build the instance schema"
 msgstr ""
 "Define una relación final: liga un tipo de relación final desde una entidad "
-"NO final hacia un tipo de entidad final. Se usa para crear el esquema de " "la instancia."
+"NO final hacia un tipo de entidad final. Se usa para crear el esquema de la "
+"instancia."
 
 msgid ""
 "define a non final relation: link a non final relation type from a non final "
 "entity to a non final entity type. used to build the instance schema"
 msgstr ""
 "Define una relación NO final: liga un tipo de relación NO final desde una  "
-"entidad NO final hacia un tipo de entidad NO final. Se usa para crear el " "esquema de la instancia."
-
+"entidad NO final hacia un tipo de entidad NO final. Se usa para crear el "
+"esquema de la instancia."
 
 msgid "define a relation type, used to build the instance schema"
-msgstr "Define un tipo de relación, usado para construir el esquema de la " "instancia."
+msgstr ""
+"Define un tipo de relación, usado para construir el esquema de la instancia."
 
 msgid "define a rql expression used to define permissions"
 msgstr "Expresión RQL utilizada para definir los derechos de acceso"
@@ -1853,7 +1866,8 @@
 msgstr "Define un tipo de condición de esquema"
 
 msgid "define an entity type, used to build the instance schema"
-msgstr "Define un tipo de entidad, usado para construir el esquema de la " "instancia."
+msgstr ""
+"Define un tipo de entidad, usado para construir el esquema de la instancia."
 
 msgid "define how we get out from a sub-workflow"
 msgstr "Define como salir de un sub-Workflow"
@@ -1891,6 +1905,9 @@
 msgid "delete_permission"
 msgstr "Permiso de eliminar"
 
+msgid "delete_permission_object"
+msgstr "posee permiso para eliminar"
+
 msgctxt "CWGroup"
 msgid "delete_permission_object"
 msgstr "puede eliminar"
@@ -1899,17 +1916,14 @@
 msgid "delete_permission_object"
 msgstr "puede eliminar"
 
-msgid "delete_permission_object"
-msgstr "posee permiso para eliminar"
-
 #, python-format
 msgid "deleted %(etype)s #%(eid)s (%(title)s)"
 msgstr "Eliminación de la entidad %(etype)s #%(eid)s (%(title)s)"
 
 #, python-format
 msgid ""
-"deleted relation %(rtype)s from %(frometype)s #%(eidfrom)s to %(toetype)s #%"
-"(eidto)s"
+"deleted relation %(rtype)s from %(frometype)s #%(eidfrom)s to %(toetype)s #"
+"%(eidto)s"
 msgstr ""
 "La relación %(rtype)s de %(frometype)s #%(eidfrom)s a %(toetype)s #%(eidto)s "
 "ha sido suprimida."
@@ -1920,15 +1934,7 @@
 msgid "description"
 msgstr "Descripción"
 
-msgctxt "CWEType"
-msgid "description"
-msgstr "Descripción"
-
-msgctxt "CWRelation"
-msgid "description"
-msgstr "Descripción"
-
-msgctxt "Workflow"
+msgctxt "BaseTransition"
 msgid "description"
 msgstr "Descripción"
 
@@ -1936,15 +1942,7 @@
 msgid "description"
 msgstr "Descripción"
 
-msgctxt "Transition"
-msgid "description"
-msgstr "Descripción"
-
-msgctxt "WorkflowTransition"
-msgid "description"
-msgstr "Descripción"
-
-msgctxt "State"
+msgctxt "CWEType"
 msgid "description"
 msgstr "Descripción"
 
@@ -1952,10 +1950,34 @@
 msgid "description"
 msgstr "Descripción"
 
-msgctxt "BaseTransition"
+msgctxt "CWRelation"
+msgid "description"
+msgstr "Descripción"
+
+msgctxt "State"
+msgid "description"
+msgstr "Descripción"
+
+msgctxt "Transition"
 msgid "description"
 msgstr "Descripción"
 
+msgctxt "Workflow"
+msgid "description"
+msgstr "Descripción"
+
+msgctxt "WorkflowTransition"
+msgid "description"
+msgstr "Descripción"
+
+msgid "description_format"
+msgstr "Formato"
+
+msgctxt "BaseTransition"
+msgid "description_format"
+msgstr "Formato"
+
+msgctxt "CWAttribute"
 msgid "description_format"
 msgstr "Formato"
 
@@ -1963,43 +1985,37 @@
 msgid "description_format"
 msgstr "Formato"
 
+msgctxt "CWRType"
+msgid "description_format"
+msgstr "Formato"
+
 msgctxt "CWRelation"
 msgid "description_format"
 msgstr "Formato"
 
+msgctxt "State"
+msgid "description_format"
+msgstr "Formato"
+
+msgctxt "Transition"
+msgid "description_format"
+msgstr "Formato"
+
 msgctxt "Workflow"
 msgid "description_format"
 msgstr "Formato"
 
-msgctxt "CWAttribute"
-msgid "description_format"
-msgstr "Formato"
-
-msgctxt "Transition"
-msgid "description_format"
-msgstr "Formato"
-
 msgctxt "WorkflowTransition"
 msgid "description_format"
 msgstr "Formato"
 
-msgctxt "State"
-msgid "description_format"
-msgstr "Formato"
-
-msgctxt "CWRType"
-msgid "description_format"
-msgstr "Formato"
-
-msgctxt "BaseTransition"
-msgid "description_format"
-msgstr "Formato"
-
 msgid "destination state for this transition"
 msgstr "Estados accesibles para esta transición"
 
 msgid "destination state must be in the same workflow as our parent transition"
-msgstr "El estado de destino debe pertenecer al mismo Workflow que la " "transición padre."
+msgstr ""
+"El estado de destino debe pertenecer al mismo Workflow que la transición "
+"padre."
 
 msgid "destination state of a transition"
 msgstr "Estado destino de una transición"
@@ -2009,8 +2025,13 @@
 "to the state from which we've entered the subworkflow."
 msgstr ""
 "Estado destino de la transición. Si el Estado destino no ha sido "
-"especificado, la transición regresará hacia el estado que tenía la " "entidad al entrar en el Sub-Workflow."
-
+"especificado, la transición regresará hacia el estado que tenía la entidad "
+"al entrar en el Sub-Workflow."
+
+msgid "destination_state"
+msgstr "Estado destino"
+
+msgctxt "SubWorkflowExitPoint"
 msgid "destination_state"
 msgstr "Estado destino"
 
@@ -2018,17 +2039,13 @@
 msgid "destination_state"
 msgstr "Estado destino"
 
-msgctxt "SubWorkflowExitPoint"
-msgid "destination_state"
-msgstr "Estado destino"
+msgid "destination_state_object"
+msgstr "Destino de"
 
 msgctxt "State"
 msgid "destination_state_object"
 msgstr "Estado final de"
 
-msgid "destination_state_object"
-msgstr "Destino de"
-
 msgid "detach attached file"
 msgstr "soltar el archivo existente"
 
@@ -2289,13 +2306,13 @@
 msgid "for_user"
 msgstr "Propiedad del Usuario"
 
+msgid "for_user_object"
+msgstr "Utiliza las propiedades"
+
 msgctxt "CWUser"
 msgid "for_user_object"
 msgstr "Tiene como preferencia"
 
-msgid "for_user_object"
-msgstr "Utiliza las propiedades"
-
 msgid "friday"
 msgstr "Viernes"
 
@@ -2317,13 +2334,13 @@
 msgid "from_entity"
 msgstr "Relación de la entidad"
 
+msgid "from_entity_object"
+msgstr "Relación sujeto"
+
 msgctxt "CWEType"
 msgid "from_entity_object"
 msgstr "Entidad de"
 
-msgid "from_entity_object"
-msgstr "Relación sujeto"
-
 msgid "from_interval_start"
 msgstr "De"
 
@@ -2334,13 +2351,13 @@
 msgid "from_state"
 msgstr "Estado de Inicio"
 
+msgid "from_state_object"
+msgstr "Transiciones desde este estado"
+
 msgctxt "State"
 msgid "from_state_object"
 msgstr "Estado de Inicio de"
 
-msgid "from_state_object"
-msgstr "Transiciones desde este estado"
-
 msgid "full text or RQL query"
 msgstr "Texto de búsqueda o demanda RQL"
 
@@ -2368,8 +2385,8 @@
 "generic relation to specify that an external entity represent the same "
 "object as a local one: http://www.w3.org/TR/owl-ref/#sameAs-def"
 msgstr ""
-"Relación genérica que indicar que una entidad es idéntica a otro "
-"recurso web (ver http://www.w3.org/TR/owl-ref/#sameAs-def)."
+"Relación genérica que indicar que una entidad es idéntica a otro recurso web "
+"(ver http://www.w3.org/TR/owl-ref/#sameAs-def)."
 
 msgid "go back to the index page"
 msgstr "Regresar a la página de inicio"
@@ -2394,13 +2411,8 @@
 "graphical representation of the %(rtype)s relation type from %(appid)s data "
 "model"
 msgstr ""
-"Representación gráfica del modelo de datos para el tipo de relación %(rtype)s "
-"de %(appid)s"
-
-
-#, python-format
-msgid "graphical workflow for %s"
-msgstr "Gráfica del workflow por %s"
+"Representación gráfica del modelo de datos para el tipo de relación "
+"%(rtype)s de %(appid)s"
 
 msgid "group in which a user should be to be allowed to pass this transition"
 msgstr "Grupo en el cual el usuario debe estar lograr la transición"
@@ -2433,21 +2445,22 @@
 "how to format date and time in the ui (\"man strftime\" for format "
 "description)"
 msgstr ""
-"Formato de fecha y hora que se utilizará por defecto en la interfaz (\"man strftime\" para mayor información "
-"del formato)"
+"Formato de fecha y hora que se utilizará por defecto en la interfaz (\"man "
+"strftime\" para mayor información del formato)"
 
 msgid "how to format date in the ui (\"man strftime\" for format description)"
 msgstr ""
-"Formato de fecha que se utilizará por defecto en la interfaz (\"man strftime\" para mayor información  "
-"del formato)"
+"Formato de fecha que se utilizará por defecto en la interfaz (\"man strftime"
+"\" para mayor información  del formato)"
 
 msgid "how to format float numbers in the ui"
-msgstr "Formato de números flotantes que se utilizará por defecto en la interfaz"
+msgstr ""
+"Formato de números flotantes que se utilizará por defecto en la interfaz"
 
 msgid "how to format time in the ui (\"man strftime\" for format description)"
 msgstr ""
-"Formato de hora que se utilizará por defecto en la interfaz (\"man strftime\" para mayor información "
-"del formato)"
+"Formato de hora que se utilizará por defecto en la interfaz (\"man strftime"
+"\" para mayor información del formato)"
 
 msgid "i18n_bookmark_url_fqs"
 msgstr "Parámetros"
@@ -2514,13 +2527,13 @@
 msgid "in_group"
 msgstr "Forma parte del grupo"
 
+msgid "in_group_object"
+msgstr "Miembros"
+
 msgctxt "CWGroup"
 msgid "in_group_object"
 msgstr "Contiene los usuarios"
 
-msgid "in_group_object"
-msgstr "Miembros"
-
 msgid "in_state"
 msgstr "Estado"
 
@@ -2573,10 +2586,10 @@
 msgid "initial_state"
 msgstr "Estado inicial"
 
-msgctxt "State"
 msgid "initial_state_object"
 msgstr "Estado inicial de"
 
+msgctxt "State"
 msgid "initial_state_object"
 msgstr "Estado inicial de"
 
@@ -2700,16 +2713,16 @@
 "link a permission to the entity. This permission should be used in the "
 "security definition of the entity's type to be useful."
 msgstr ""
-"Relacionar un permiso con la entidad. Este permiso debe ser integrado "
-"en la definición de seguridad de la entidad para poder ser utilizado."
+"Relacionar un permiso con la entidad. Este permiso debe ser integrado en la "
+"definición de seguridad de la entidad para poder ser utilizado."
 
 msgid ""
 "link a property to the user which want this property customization. Unless "
 "you're a site manager, this relation will be handled automatically."
 msgstr ""
 "Liga una propiedad al usuario que desea esta personalización. Salvo que "
-"usted sea un administrador del sistema, esta relación será administrada "
-"de forma automática."
+"usted sea un administrador del sistema, esta relación será administrada de "
+"forma automática."
 
 msgid "link a relation definition to its object entity type"
 msgstr "Liga una definición de relación a su tipo de entidad objeto"
@@ -2841,10 +2854,38 @@
 msgid "name"
 msgstr "Nombre"
 
+msgctxt "BaseTransition"
+msgid "name"
+msgstr "Nombre"
+
+msgctxt "CWCache"
+msgid "name"
+msgstr "Nombre"
+
+msgctxt "CWConstraintType"
+msgid "name"
+msgstr "Nombre"
+
 msgctxt "CWEType"
 msgid "name"
 msgstr "Nombre"
 
+msgctxt "CWGroup"
+msgid "name"
+msgstr "Nombre"
+
+msgctxt "CWPermission"
+msgid "name"
+msgstr "Nombre"
+
+msgctxt "CWRType"
+msgid "name"
+msgstr "Nombre"
+
+msgctxt "State"
+msgid "name"
+msgstr "Nombre"
+
 msgctxt "Transition"
 msgid "name"
 msgstr "Nombre"
@@ -2853,38 +2894,10 @@
 msgid "name"
 msgstr "Nombre"
 
-msgctxt "CWGroup"
-msgid "name"
-msgstr "Nombre"
-
-msgctxt "CWConstraintType"
-msgid "name"
-msgstr "Nombre"
-
 msgctxt "WorkflowTransition"
 msgid "name"
 msgstr "Nombre"
 
-msgctxt "State"
-msgid "name"
-msgstr "Nombre"
-
-msgctxt "CWPermission"
-msgid "name"
-msgstr "Nombre"
-
-msgctxt "CWRType"
-msgid "name"
-msgstr "Nombre"
-
-msgctxt "BaseTransition"
-msgid "name"
-msgstr "Nombre"
-
-msgctxt "CWCache"
-msgid "name"
-msgstr "Nombre"
-
 msgid "name of the cache"
 msgstr "Nombre del Caché"
 
@@ -3100,13 +3113,13 @@
 msgid "prefered_form"
 msgstr "Email principal"
 
+msgid "prefered_form_object"
+msgstr "Formato preferido sobre"
+
 msgctxt "EmailAddress"
 msgid "prefered_form_object"
 msgstr "Email principal de"
 
-msgid "prefered_form_object"
-msgstr "Formato preferido sobre"
-
 msgid "preferences"
 msgstr "Preferencias"
 
@@ -3123,13 +3136,13 @@
 msgid "primary_email"
 msgstr "Dirección principal de correo electrónico"
 
+msgid "primary_email_object"
+msgstr "Dirección de email principal (objeto)"
+
 msgctxt "EmailAddress"
 msgid "primary_email_object"
 msgstr "Dirección principal de correo electrónico de"
 
-msgid "primary_email_object"
-msgstr "Dirección de email principal (objeto)"
-
 msgid "progress"
 msgstr "Progreso"
 
@@ -3154,11 +3167,11 @@
 msgid "read_permission"
 msgstr "Permiso de lectura"
 
-msgctxt "CWEType"
+msgctxt "CWAttribute"
 msgid "read_permission"
 msgstr "Permiso de Lectura"
 
-msgctxt "CWAttribute"
+msgctxt "CWEType"
 msgid "read_permission"
 msgstr "Permiso de Lectura"
 
@@ -3166,6 +3179,9 @@
 msgid "read_permission"
 msgstr "Permiso de Lectura"
 
+msgid "read_permission_object"
+msgstr "Tiene acceso de lectura a"
+
 msgctxt "CWGroup"
 msgid "read_permission_object"
 msgstr "Puede leer"
@@ -3174,9 +3190,6 @@
 msgid "read_permission_object"
 msgstr "Puede leer"
 
-msgid "read_permission_object"
-msgstr "Tiene acceso de lectura a"
-
 msgid "registry"
 msgstr "Registro"
 
@@ -3210,10 +3223,10 @@
 msgid "relation_type"
 msgstr "Tipo de Relación"
 
-msgctxt "CWRType"
 msgid "relation_type_object"
 msgstr "Definición de Relaciones"
 
+msgctxt "CWRType"
 msgid "relation_type_object"
 msgstr "Definición de Relaciones"
 
@@ -3233,11 +3246,11 @@
 msgid "require_group"
 msgstr "Restringida al Grupo"
 
-msgctxt "Transition"
+msgctxt "CWPermission"
 msgid "require_group"
 msgstr "Restringida al Grupo"
 
-msgctxt "CWPermission"
+msgctxt "Transition"
 msgid "require_group"
 msgstr "Restringida al Grupo"
 
@@ -3245,10 +3258,10 @@
 msgid "require_group"
 msgstr "Restringida al Grupo"
 
-msgctxt "CWGroup"
 msgid "require_group_object"
 msgstr "Posee derechos sobre"
 
+msgctxt "CWGroup"
 msgid "require_group_object"
 msgstr "Posee derechos sobre"
 
@@ -3276,10 +3289,10 @@
 "relation rql expression, S, O and U are predefined respectivly to the "
 "current relation'subject, object and to the request user. "
 msgstr ""
-"Parte restrictiva de una consulta RQL. En una expresión ligada a una entidad, " 
-"X y U son respectivamente asignadas a la Entidad y el Usuario en curso."
-"En una expresión ligada a una relación, S, O y U son respectivamente asignados "
-"al Sujeto/Objeto de la relación y al Usuario actual."
+"Parte restrictiva de una consulta RQL. En una expresión ligada a una "
+"entidad, X y U son respectivamente asignadas a la Entidad y el Usuario en "
+"curso.En una expresión ligada a una relación, S, O y U son respectivamente "
+"asignados al Sujeto/Objeto de la relación y al Usuario actual."
 
 msgid "revert changes"
 msgstr "Anular modificación"
@@ -3394,7 +3407,8 @@
 "You should also select text/html as default text format to actually get "
 "fckeditor."
 msgstr ""
-"Indica si los campos de tipo texto deberán ser editados usando fckeditor (un\n"
+"Indica si los campos de tipo texto deberán ser editados usando fckeditor "
+"(un\n"
 "editor HTML WYSIWYG). Deberá también elegir text/html\n"
 "como formato de texto por defecto para poder utilizar fckeditor."
 
@@ -3424,15 +3438,14 @@
 msgstr "Nombre del Sistema"
 
 msgid "site-wide property can't be set for user"
-msgstr ""
-"Una propiedad específica al Sistema no puede ser propia al usuario"
+msgstr "Una propiedad específica al Sistema no puede ser propia al usuario"
 
 msgid "some errors occurred:"
 msgstr "Algunos errores encontrados :"
 
 msgid "some later transaction(s) touch entity, undo them first"
-msgstr "Las transacciones más recientes modificaron esta entidad, anúlelas " 
-"primero"
+msgstr ""
+"Las transacciones más recientes modificaron esta entidad, anúlelas primero"
 
 msgid "sorry, the server is unable to handle this query"
 msgstr "Lo sentimos, el servidor no puede manejar esta consulta"
@@ -3450,10 +3463,10 @@
 msgid "specializes"
 msgstr "Especializa"
 
-msgctxt "CWEType"
 msgid "specializes_object"
 msgstr "Especializado por"
 
+msgctxt "CWEType"
 msgid "specializes_object"
 msgstr "Especializado por"
 
@@ -3478,8 +3491,9 @@
 msgid ""
 "state doesn't belong to entity's workflow. You may want to set a custom "
 "workflow for this entity first."
-msgstr "El Estado no pertenece al Workflow Actual de la Entidad. Usted desea" 
-"quizás especificar que esta entidad debe utilizar este Workflow"
+msgstr ""
+"El Estado no pertenece al Workflow Actual de la Entidad. Usted deseaquizás "
+"especificar que esta entidad debe utilizar este Workflow"
 
 msgid "state doesn't belong to this workflow"
 msgstr "El Estado no pertenece a este Workflow"
@@ -3491,10 +3505,10 @@
 msgid "state_of"
 msgstr "Estado de"
 
-msgctxt "Workflow"
 msgid "state_of_object"
 msgstr "Tiene por Estado"
 
+msgctxt "Workflow"
 msgid "state_of_object"
 msgstr "Tiene por Estado"
 
@@ -3526,7 +3540,9 @@
 
 msgid ""
 "subworkflow isn't a workflow for the same types as the transition's workflow"
-msgstr "Le Sub-Workflow no se aplica a los mismos tipos que el Workflow " "de esta transición"
+msgstr ""
+"Le Sub-Workflow no se aplica a los mismos tipos que el Workflow de esta "
+"transición"
 
 msgid "subworkflow state"
 msgstr "Estado de Sub-Workflow"
@@ -3538,20 +3554,20 @@
 msgid "subworkflow_exit"
 msgstr "Salida del Sub-Workflow"
 
+msgid "subworkflow_exit_object"
+msgstr "Salida Sub-Workflow de"
+
 msgctxt "SubWorkflowExitPoint"
 msgid "subworkflow_exit_object"
 msgstr "Salida Sub-Workflow de"
 
-msgid "subworkflow_exit_object"
-msgstr "Salida Sub-Workflow de"
+msgid "subworkflow_object"
+msgstr "Sub-Workflow de"
 
 msgctxt "Workflow"
 msgid "subworkflow_object"
 msgstr "Sub-Workflow de"
 
-msgid "subworkflow_object"
-msgstr "Sub-Workflow de"
-
 msgid "subworkflow_state"
 msgstr "Estado de Sub-Workflow"
 
@@ -3559,10 +3575,10 @@
 msgid "subworkflow_state"
 msgstr "Estado de Sub-Workflow"
 
-msgctxt "State"
 msgid "subworkflow_state_object"
 msgstr "Estado de Salida de"
 
+msgctxt "State"
 msgid "subworkflow_state_object"
 msgstr "Estado de Salida de"
 
@@ -3676,10 +3692,10 @@
 msgid "to_entity"
 msgstr "Por la entidad"
 
-msgctxt "CWEType"
 msgid "to_entity_object"
 msgstr "Objeto de la Relación"
 
+msgctxt "CWEType"
 msgid "to_entity_object"
 msgstr "Objeto de la Relación"
 
@@ -3693,10 +3709,10 @@
 msgid "to_state"
 msgstr "Hacia el Estado"
 
-msgctxt "State"
 msgid "to_state_object"
 msgstr "Transición hacia este Estado"
 
+msgctxt "State"
 msgid "to_state_object"
 msgstr "Transición hacia este Estado"
 
@@ -3737,10 +3753,10 @@
 msgid "transition_of"
 msgstr "Transición de"
 
-msgctxt "Workflow"
 msgid "transition_of_object"
 msgstr "Utiliza las transiciones"
 
+msgctxt "Workflow"
 msgid "transition_of_object"
 msgstr "Utiliza las transiciones"
 
@@ -3844,13 +3860,16 @@
 msgid "update_permission"
 msgstr "Puede ser modificado por"
 
+msgctxt "CWAttribute"
+msgid "update_permission"
+msgstr "Puede ser modificado por"
+
 msgctxt "CWEType"
 msgid "update_permission"
 msgstr "Puede ser modificado por"
 
-msgctxt "CWAttribute"
-msgid "update_permission"
-msgstr "Puede ser modificado por"
+msgid "update_permission_object"
+msgstr "Tiene permiso de modificar"
 
 msgctxt "CWGroup"
 msgid "update_permission_object"
@@ -3860,9 +3879,6 @@
 msgid "update_permission_object"
 msgstr "Puede modificar"
 
-msgid "update_permission_object"
-msgstr "Tiene permiso de modificar"
-
 msgid "update_relation"
 msgstr "Modificar"
 
@@ -3899,13 +3915,13 @@
 msgid "use_email"
 msgstr "Usa el Correo Electrónico"
 
+msgid "use_email_object"
+msgstr "Email utilizado por"
+
 msgctxt "EmailAddress"
 msgid "use_email_object"
 msgstr "Utilizado por"
 
-msgid "use_email_object"
-msgstr "Email utilizado por"
-
 msgid "use_template_format"
 msgstr "Utilización del formato 'cubicweb template'"
 
@@ -3919,8 +3935,8 @@
 msgid ""
 "used to associate simple states to an entity type and/or to define workflows"
 msgstr ""
-"Se utiliza para asociar estados simples a un tipo de entidad y/o para definir "
-"Workflows"
+"Se utiliza para asociar estados simples a un tipo de entidad y/o para "
+"definir Workflows"
 
 msgid "used to grant a permission to a group"
 msgstr "Se utiliza para otorgar permisos a un grupo"
@@ -4051,9 +4067,9 @@
 "and python-projects@lists.logilab.org), set this to indicate which is the "
 "preferred form."
 msgstr ""
-"Cuando varias direcciones email son equivalentes (como python-projects@logilab."
-"org y python-projects@lists.logilab.org), aquí se indica cual es la forma "
-"preferida."
+"Cuando varias direcciones email son equivalentes (como python-"
+"projects@logilab.org y python-projects@lists.logilab.org), aquí se indica "
+"cual es la forma preferida."
 
 msgid "workflow"
 msgstr "Workflow"
@@ -4090,10 +4106,10 @@
 msgid "workflow_of"
 msgstr "Workflow de"
 
-msgctxt "CWEType"
 msgid "workflow_of_object"
 msgstr "Utiliza el Workflow"
 
+msgctxt "CWEType"
 msgid "workflow_of_object"
 msgstr "Utiliza el Workflow"
 
@@ -4119,3 +4135,5 @@
 msgid "you should probably delete that property"
 msgstr "Debería probablamente suprimir esta propriedad"
 
+#~ msgid "graphical workflow for %s"
+#~ msgstr "Gráfica del workflow por %s"
--- a/i18n/fr.po	Thu Aug 26 10:29:32 2010 +0200
+++ b/i18n/fr.po	Thu Aug 26 11:45:57 2010 +0200
@@ -7,6 +7,7 @@
 "PO-Revision-Date: 2010-05-16 18:59+0200\n"
 "Last-Translator: Logilab Team <contact@logilab.fr>\n"
 "Language-Team: fr <contact@logilab.fr>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -377,6 +378,10 @@
 "Ne peut annuler la création de l'entité %(eid)s de type %(etype)s, ce type "
 "n'existe plus"
 
+#, python-format
+msgid "Data connection graph for %s"
+msgstr ""
+
 msgid "Date"
 msgstr "Date"
 
@@ -401,10 +406,10 @@
 msgid "Download schema as OWL"
 msgstr "Télécharger le schéma au format OWL"
 
-msgctxt "inlined:CWUser.use_email.subject"
 msgid "EmailAddress"
 msgstr "Adresse électronique"
 
+msgctxt "inlined:CWUser.use_email.subject"
 msgid "EmailAddress"
 msgstr "Adresse électronique"
 
@@ -991,6 +996,9 @@
 msgid "add_permission"
 msgstr "permission d'ajout"
 
+msgid "add_permission_object"
+msgstr "a la permission d'ajouter"
+
 msgctxt "CWGroup"
 msgid "add_permission_object"
 msgstr "a la permission d'ajouter"
@@ -999,9 +1007,6 @@
 msgid "add_permission_object"
 msgstr "a la permission d'ajouter"
 
-msgid "add_permission_object"
-msgstr "a la permission d'ajouter"
-
 msgid "add_relation"
 msgstr "ajouter"
 
@@ -1011,11 +1016,11 @@
 
 #, python-format
 msgid ""
-"added relation %(rtype)s from %(frometype)s #%(eidfrom)s to %(toetype)s #%"
-"(eidto)s"
+"added relation %(rtype)s from %(frometype)s #%(eidfrom)s to %(toetype)s #"
+"%(eidto)s"
 msgstr ""
-"la relation %(rtype)s de %(frometype)s #%(eidfrom)s vers %(toetype)s #%"
-"(eidto)s a été ajoutée"
+"la relation %(rtype)s de %(frometype)s #%(eidfrom)s vers %(toetype)s #"
+"%(eidto)s a été ajoutée"
 
 msgid "addrelated"
 msgstr "ajouter"
@@ -1047,6 +1052,9 @@
 msgid "allowed_transition"
 msgstr "transitions autorisées"
 
+msgid "allowed_transition_object"
+msgstr "états en entrée"
+
 msgctxt "BaseTransition"
 msgid "allowed_transition_object"
 msgstr "transition autorisée de"
@@ -1059,9 +1067,6 @@
 msgid "allowed_transition_object"
 msgstr "transition autorisée de"
 
-msgid "allowed_transition_object"
-msgstr "états en entrée"
-
 msgid "am/pm calendar (month)"
 msgstr "calendrier am/pm (mois)"
 
@@ -1147,10 +1152,10 @@
 msgid "bookmarked_by"
 msgstr "utilisé par"
 
-msgctxt "CWUser"
 msgid "bookmarked_by_object"
 msgstr "utilise le(s) signet(s)"
 
+msgctxt "CWUser"
 msgid "bookmarked_by_object"
 msgstr "utilise le(s) signet(s)"
 
@@ -1241,6 +1246,9 @@
 msgid "by_transition"
 msgstr "transition"
 
+msgid "by_transition_object"
+msgstr "changement d'états"
+
 msgctxt "BaseTransition"
 msgid "by_transition_object"
 msgstr "a pour information"
@@ -1253,9 +1261,6 @@
 msgid "by_transition_object"
 msgstr "a pour information"
 
-msgid "by_transition_object"
-msgstr "changement d'états"
-
 msgid "calendar"
 msgstr "afficher un calendrier"
 
@@ -1442,10 +1447,10 @@
 msgid "condition"
 msgstr "condition"
 
-msgctxt "RQLExpression"
 msgid "condition_object"
 msgstr "condition de"
 
+msgctxt "RQLExpression"
 msgid "condition_object"
 msgstr "condition de"
 
@@ -1472,10 +1477,10 @@
 msgid "constrained_by"
 msgstr "contraint par"
 
-msgctxt "CWConstraint"
 msgid "constrained_by_object"
 msgstr "contrainte de"
 
+msgctxt "CWConstraint"
 msgid "constrained_by_object"
 msgstr "contrainte de"
 
@@ -1699,8 +1704,8 @@
 msgstr "création d'une transition workflow autorisée depuis l'état %(linkto)s"
 
 msgid ""
-"creating WorkflowTransition (WorkflowTransition transition_of Workflow %"
-"(linkto)s)"
+"creating WorkflowTransition (WorkflowTransition transition_of Workflow "
+"%(linkto)s)"
 msgstr "création d'une transition workflow du workflow %(linkto)s"
 
 msgid "creation"
@@ -1722,13 +1727,13 @@
 msgid "cstrtype"
 msgstr "type"
 
+msgid "cstrtype_object"
+msgstr "utilisé par"
+
 msgctxt "CWConstraintType"
 msgid "cstrtype_object"
 msgstr "type des contraintes"
 
-msgid "cstrtype_object"
-msgstr "utilisé par"
-
 msgid "csv entities export"
 msgstr "export d'entités en CSV"
 
@@ -1811,10 +1816,10 @@
 msgid "default_workflow"
 msgstr "workflow par défaut"
 
-msgctxt "Workflow"
 msgid "default_workflow_object"
 msgstr "workflow par défaut de"
 
+msgctxt "Workflow"
 msgid "default_workflow_object"
 msgstr "workflow par défaut de"
 
@@ -1897,6 +1902,9 @@
 msgid "delete_permission"
 msgstr "permission de supprimer"
 
+msgid "delete_permission_object"
+msgstr "a la permission de supprimer"
+
 msgctxt "CWGroup"
 msgid "delete_permission_object"
 msgstr "peut supprimer"
@@ -1905,17 +1913,14 @@
 msgid "delete_permission_object"
 msgstr "peut supprimer"
 
-msgid "delete_permission_object"
-msgstr "a la permission de supprimer"
-
 #, python-format
 msgid "deleted %(etype)s #%(eid)s (%(title)s)"
 msgstr "suppression de l'entité %(etype)s #%(eid)s (%(title)s)"
 
 #, python-format
 msgid ""
-"deleted relation %(rtype)s from %(frometype)s #%(eidfrom)s to %(toetype)s #%"
-"(eidto)s"
+"deleted relation %(rtype)s from %(frometype)s #%(eidfrom)s to %(toetype)s #"
+"%(eidto)s"
 msgstr ""
 "relation %(rtype)s de %(frometype)s #%(eidfrom)s vers %(toetype)s #%(eidto)s "
 "supprimée"
@@ -1926,15 +1931,7 @@
 msgid "description"
 msgstr "description"
 
-msgctxt "CWEType"
-msgid "description"
-msgstr "description"
-
-msgctxt "CWRelation"
-msgid "description"
-msgstr "description"
-
-msgctxt "Workflow"
+msgctxt "BaseTransition"
 msgid "description"
 msgstr "description"
 
@@ -1942,15 +1939,7 @@
 msgid "description"
 msgstr "description"
 
-msgctxt "Transition"
-msgid "description"
-msgstr "description"
-
-msgctxt "WorkflowTransition"
-msgid "description"
-msgstr "description"
-
-msgctxt "State"
+msgctxt "CWEType"
 msgid "description"
 msgstr "description"
 
@@ -1958,10 +1947,34 @@
 msgid "description"
 msgstr "description"
 
-msgctxt "BaseTransition"
+msgctxt "CWRelation"
+msgid "description"
+msgstr "description"
+
+msgctxt "State"
+msgid "description"
+msgstr "description"
+
+msgctxt "Transition"
 msgid "description"
 msgstr "description"
 
+msgctxt "Workflow"
+msgid "description"
+msgstr "description"
+
+msgctxt "WorkflowTransition"
+msgid "description"
+msgstr "description"
+
+msgid "description_format"
+msgstr "format"
+
+msgctxt "BaseTransition"
+msgid "description_format"
+msgstr "format"
+
+msgctxt "CWAttribute"
 msgid "description_format"
 msgstr "format"
 
@@ -1969,38 +1982,30 @@
 msgid "description_format"
 msgstr "format"
 
+msgctxt "CWRType"
+msgid "description_format"
+msgstr "format"
+
 msgctxt "CWRelation"
 msgid "description_format"
 msgstr "format"
 
+msgctxt "State"
+msgid "description_format"
+msgstr "format"
+
+msgctxt "Transition"
+msgid "description_format"
+msgstr "format"
+
 msgctxt "Workflow"
 msgid "description_format"
 msgstr "format"
 
-msgctxt "CWAttribute"
-msgid "description_format"
-msgstr "format"
-
-msgctxt "Transition"
-msgid "description_format"
-msgstr "format"
-
 msgctxt "WorkflowTransition"
 msgid "description_format"
 msgstr "format"
 
-msgctxt "State"
-msgid "description_format"
-msgstr "format"
-
-msgctxt "CWRType"
-msgid "description_format"
-msgstr "format"
-
-msgctxt "BaseTransition"
-msgid "description_format"
-msgstr "format"
-
 msgid "destination state for this transition"
 msgstr "états accessibles par cette transition"
 
@@ -2023,21 +2028,21 @@
 msgid "destination_state"
 msgstr "état de destination"
 
+msgctxt "SubWorkflowExitPoint"
+msgid "destination_state"
+msgstr "état de destination"
+
 msgctxt "Transition"
 msgid "destination_state"
 msgstr "état de destination"
 
-msgctxt "SubWorkflowExitPoint"
-msgid "destination_state"
-msgstr "état de destination"
+msgid "destination_state_object"
+msgstr "destination de"
 
 msgctxt "State"
 msgid "destination_state_object"
 msgstr "état final de"
 
-msgid "destination_state_object"
-msgstr "destination de"
-
 msgid "detach attached file"
 msgstr "détacher le fichier existant"
 
@@ -2297,13 +2302,13 @@
 msgid "for_user"
 msgstr "propriété de l'utilisateur"
 
+msgid "for_user_object"
+msgstr "utilise les propriétés"
+
 msgctxt "CWUser"
 msgid "for_user_object"
 msgstr "a pour préférence"
 
-msgid "for_user_object"
-msgstr "utilise les propriétés"
-
 msgid "friday"
 msgstr "vendredi"
 
@@ -2325,13 +2330,13 @@
 msgid "from_entity"
 msgstr "relation de l'entité"
 
+msgid "from_entity_object"
+msgstr "relation sujet"
+
 msgctxt "CWEType"
 msgid "from_entity_object"
 msgstr "entité de"
 
-msgid "from_entity_object"
-msgstr "relation sujet"
-
 msgid "from_interval_start"
 msgstr "De"
 
@@ -2342,13 +2347,13 @@
 msgid "from_state"
 msgstr "état de départ"
 
+msgid "from_state_object"
+msgstr "transitions depuis cet état"
+
 msgctxt "State"
 msgid "from_state_object"
 msgstr "état de départ de"
 
-msgid "from_state_object"
-msgstr "transitions depuis cet état"
-
 msgid "full text or RQL query"
 msgstr "texte à rechercher ou requête RQL"
 
@@ -2394,20 +2399,16 @@
 "graphical representation of the %(etype)s entity type from %(appid)s data "
 "model"
 msgstr ""
-"réprésentation graphique du modèle de données pour le type d'entité %(etype)"
-"s de %(appid)s"
+"réprésentation graphique du modèle de données pour le type d'entité "
+"%(etype)s de %(appid)s"
 
 #, python-format
 msgid ""
 "graphical representation of the %(rtype)s relation type from %(appid)s data "
 "model"
 msgstr ""
-"réprésentation graphique du modèle de données pour le type de relation %"
-"(rtype)s de %(appid)s"
-
-#, python-format
-msgid "graphical workflow for %s"
-msgstr "graphique du workflow pour %s"
+"réprésentation graphique du modèle de données pour le type de relation "
+"%(rtype)s de %(appid)s"
 
 msgid "group in which a user should be to be allowed to pass this transition"
 msgstr ""
@@ -2522,13 +2523,13 @@
 msgid "in_group"
 msgstr "fait partie du groupe"
 
+msgid "in_group_object"
+msgstr "membres"
+
 msgctxt "CWGroup"
 msgid "in_group_object"
 msgstr "contient les utilisateurs"
 
-msgid "in_group_object"
-msgstr "membres"
-
 msgid "in_state"
 msgstr "état"
 
@@ -2581,10 +2582,10 @@
 msgid "initial_state"
 msgstr "état initial"
 
-msgctxt "State"
 msgid "initial_state_object"
 msgstr "état initial de"
 
+msgctxt "State"
 msgid "initial_state_object"
 msgstr "état initial de"
 
@@ -2850,10 +2851,38 @@
 msgid "name"
 msgstr "nom"
 
+msgctxt "BaseTransition"
+msgid "name"
+msgstr "nom"
+
+msgctxt "CWCache"
+msgid "name"
+msgstr "nom"
+
+msgctxt "CWConstraintType"
+msgid "name"
+msgstr "nom"
+
 msgctxt "CWEType"
 msgid "name"
 msgstr "nom"
 
+msgctxt "CWGroup"
+msgid "name"
+msgstr "nom"
+
+msgctxt "CWPermission"
+msgid "name"
+msgstr "nom"
+
+msgctxt "CWRType"
+msgid "name"
+msgstr "nom"
+
+msgctxt "State"
+msgid "name"
+msgstr "nom"
+
 msgctxt "Transition"
 msgid "name"
 msgstr "nom"
@@ -2862,38 +2891,10 @@
 msgid "name"
 msgstr "nom"
 
-msgctxt "CWGroup"
-msgid "name"
-msgstr "nom"
-
-msgctxt "CWConstraintType"
-msgid "name"
-msgstr "nom"
-
 msgctxt "WorkflowTransition"
 msgid "name"
 msgstr "nom"
 
-msgctxt "State"
-msgid "name"
-msgstr "nom"
-
-msgctxt "CWPermission"
-msgid "name"
-msgstr "nom"
-
-msgctxt "CWRType"
-msgid "name"
-msgstr "nom"
-
-msgctxt "BaseTransition"
-msgid "name"
-msgstr "nom"
-
-msgctxt "CWCache"
-msgid "name"
-msgstr "nom"
-
 msgid "name of the cache"
 msgstr "nom du cache applicatif"
 
@@ -2901,8 +2902,8 @@
 "name of the main variables which should be used in the selection if "
 "necessary (comma separated)"
 msgstr ""
-"nom des variables principales qui devrait être utilisées dans la sélection si "
-"nécessaire (les séparer par des virgules)"
+"nom des variables principales qui devrait être utilisées dans la sélection "
+"si nécessaire (les séparer par des virgules)"
 
 msgid "name or identifier of the permission"
 msgstr "nom (identifiant) de la permission"
@@ -3111,13 +3112,13 @@
 msgid "prefered_form"
 msgstr "forme préférée"
 
+msgid "prefered_form_object"
+msgstr "forme préférée à"
+
 msgctxt "EmailAddress"
 msgid "prefered_form_object"
 msgstr "forme préférée de"
 
-msgid "prefered_form_object"
-msgstr "forme préférée à"
-
 msgid "preferences"
 msgstr "préférences"
 
@@ -3134,13 +3135,13 @@
 msgid "primary_email"
 msgstr "email principal"
 
+msgid "primary_email_object"
+msgstr "adresse email principale (object)"
+
 msgctxt "EmailAddress"
 msgid "primary_email_object"
 msgstr "adresse principale de"
 
-msgid "primary_email_object"
-msgstr "adresse email principale (object)"
-
 msgid "progress"
 msgstr "avancement"
 
@@ -3165,11 +3166,11 @@
 msgid "read_permission"
 msgstr "permission de lire"
 
-msgctxt "CWEType"
+msgctxt "CWAttribute"
 msgid "read_permission"
 msgstr "permission de lire"
 
-msgctxt "CWAttribute"
+msgctxt "CWEType"
 msgid "read_permission"
 msgstr "permission de lire"
 
@@ -3177,6 +3178,9 @@
 msgid "read_permission"
 msgstr "permission de lire"
 
+msgid "read_permission_object"
+msgstr "a la permission de lire"
+
 msgctxt "CWGroup"
 msgid "read_permission_object"
 msgstr "peut lire"
@@ -3185,9 +3189,6 @@
 msgid "read_permission_object"
 msgstr "peut lire"
 
-msgid "read_permission_object"
-msgstr "a la permission de lire"
-
 msgid "registry"
 msgstr "registre"
 
@@ -3221,10 +3222,10 @@
 msgid "relation_type"
 msgstr "type de relation"
 
-msgctxt "CWRType"
 msgid "relation_type_object"
 msgstr "définition"
 
+msgctxt "CWRType"
 msgid "relation_type_object"
 msgstr "définition"
 
@@ -3244,11 +3245,11 @@
 msgid "require_group"
 msgstr "restreinte au groupe"
 
-msgctxt "Transition"
+msgctxt "CWPermission"
 msgid "require_group"
 msgstr "restreinte au groupe"
 
-msgctxt "CWPermission"
+msgctxt "Transition"
 msgid "require_group"
 msgstr "restreinte au groupe"
 
@@ -3256,10 +3257,10 @@
 msgid "require_group"
 msgstr "restreinte au groupe"
 
-msgctxt "CWGroup"
 msgid "require_group_object"
 msgstr "a les droits"
 
+msgctxt "CWGroup"
 msgid "require_group_object"
 msgstr "a les droits"
 
@@ -3461,10 +3462,10 @@
 msgid "specializes"
 msgstr "spécialise"
 
-msgctxt "CWEType"
 msgid "specializes_object"
 msgstr "parent de"
 
+msgctxt "CWEType"
 msgid "specializes_object"
 msgstr "parent de"
 
@@ -3503,13 +3504,13 @@
 msgid "state_of"
 msgstr "état de"
 
+msgid "state_of_object"
+msgstr "a pour état"
+
 msgctxt "Workflow"
 msgid "state_of_object"
 msgstr "contient les états"
 
-msgid "state_of_object"
-msgstr "a pour état"
-
 msgid "status change"
 msgstr "changer l'état"
 
@@ -3552,20 +3553,20 @@
 msgid "subworkflow_exit"
 msgstr "sortie du sous-workflow"
 
+msgid "subworkflow_exit_object"
+msgstr "états de sortie"
+
 msgctxt "SubWorkflowExitPoint"
 msgid "subworkflow_exit_object"
 msgstr "états de sortie"
 
-msgid "subworkflow_exit_object"
-msgstr "états de sortie"
+msgid "subworkflow_object"
+msgstr "utilisé par la transition"
 
 msgctxt "Workflow"
 msgid "subworkflow_object"
 msgstr "sous workflow de"
 
-msgid "subworkflow_object"
-msgstr "utilisé par la transition"
-
 msgid "subworkflow_state"
 msgstr "état du sous-workflow"
 
@@ -3573,10 +3574,10 @@
 msgid "subworkflow_state"
 msgstr "état"
 
-msgctxt "State"
 msgid "subworkflow_state_object"
 msgstr "état de sortie de"
 
+msgctxt "State"
 msgid "subworkflow_state_object"
 msgstr "état de sortie de"
 
@@ -3691,10 +3692,10 @@
 msgid "to_entity"
 msgstr "pour l'entité"
 
-msgctxt "CWEType"
 msgid "to_entity_object"
 msgstr "objet de la relation"
 
+msgctxt "CWEType"
 msgid "to_entity_object"
 msgstr "objet de la relation"
 
@@ -3708,13 +3709,13 @@
 msgid "to_state"
 msgstr "état de destination"
 
+msgid "to_state_object"
+msgstr "transitions vers cet état"
+
 msgctxt "State"
 msgid "to_state_object"
 msgstr "transition vers cet état"
 
-msgid "to_state_object"
-msgstr "transitions vers cet état"
-
 msgid "todo_by"
 msgstr "à faire par"
 
@@ -3752,10 +3753,10 @@
 msgid "transition_of"
 msgstr "transition de"
 
-msgctxt "Workflow"
 msgid "transition_of_object"
 msgstr "a pour transition"
 
+msgctxt "Workflow"
 msgid "transition_of_object"
 msgstr "a pour transition"
 
@@ -3859,13 +3860,16 @@
 msgid "update_permission"
 msgstr "permission de modification"
 
+msgctxt "CWAttribute"
+msgid "update_permission"
+msgstr "permission de modifier"
+
 msgctxt "CWEType"
 msgid "update_permission"
 msgstr "permission de modifier"
 
-msgctxt "CWAttribute"
-msgid "update_permission"
-msgstr "permission de modifier"
+msgid "update_permission_object"
+msgstr "a la permission de modifier"
 
 msgctxt "CWGroup"
 msgid "update_permission_object"
@@ -3875,9 +3879,6 @@
 msgid "update_permission_object"
 msgstr "peut modifier"
 
-msgid "update_permission_object"
-msgstr "a la permission de modifier"
-
 msgid "update_relation"
 msgstr "modifier"
 
@@ -3914,13 +3915,13 @@
 msgid "use_email"
 msgstr "utilise l'adresse électronique"
 
+msgid "use_email_object"
+msgstr "adresse utilisée par"
+
 msgctxt "EmailAddress"
 msgid "use_email_object"
 msgstr "utilisée par"
 
-msgid "use_email_object"
-msgstr "adresse utilisée par"
-
 msgid "use_template_format"
 msgstr "utilisation du format 'cubicweb template'"
 
@@ -4104,10 +4105,10 @@
 msgid "workflow_of"
 msgstr "workflow de"
 
-msgctxt "CWEType"
 msgid "workflow_of_object"
 msgstr "a pour workflow"
 
+msgctxt "CWEType"
 msgid "workflow_of_object"
 msgstr "a pour workflow"
 
@@ -4132,3 +4133,6 @@
 
 msgid "you should probably delete that property"
 msgstr "vous devriez probablement supprimer cette propriété"
+
+#~ msgid "graphical workflow for %s"
+#~ msgstr "graphique du workflow pour %s"
--- a/server/sources/__init__.py	Thu Aug 26 10:29:32 2010 +0200
+++ b/server/sources/__init__.py	Thu Aug 26 11:45:57 2010 +0200
@@ -307,7 +307,7 @@
         pass
 
     def authenticate(self, session, login, **kwargs):
-        """if the source support CWUser entity type, it should implements
+        """if the source support CWUser entity type, it should implement
         this method which should return CWUser eid for the given login/password
         if this account is defined in this source and valid login / password is
         given. Else raise `AuthenticationError`
--- a/web/facet.py	Thu Aug 26 10:29:32 2010 +0200
+++ b/web/facet.py	Thu Aug 26 11:45:57 2010 +0200
@@ -482,7 +482,7 @@
       class AgencyFacet(RelationFacet):
           __regid__ = 'agency'
           # this facet should only be selected when visualizing offices
-          __select__ = RelationFacet.__select__ & implements('Office')
+          __select__ = RelationFacet.__select__ & is_instance('Office')
           # this facet is a filter on the 'Agency' entities linked to the office
           # through the 'proposed_by' relation, where the office is the subject
           # of the relation
@@ -659,7 +659,7 @@
       class PostalCodeFacet(RelationAttributeFacet):
           __regid__ = 'postalcode'
           # this facet should only be selected when visualizing offices
-          __select__ = RelationAttributeFacet.__select__ & implements('Office')
+          __select__ = RelationAttributeFacet.__select__ & is_instance('Office')
           # this facet is a filter on the PostalAddress entities linked to the
           # office through the 'has_address' relation, where the office is the
           # subject of the relation
@@ -722,7 +722,7 @@
 
       class SurfaceFacet(AttributeFacet):
           __regid__ = 'surface'
-          __select__ = AttributeFacet.__select__ & implements('Office')
+          __select__ = AttributeFacet.__select__ & is_instance('Office')
           # this facet is a filter on the office'surface
           rtype = 'surface'
           # override the default value of operator since we want to filter
@@ -794,7 +794,7 @@
 
       class SurfaceFacet(RangeFacet):
           __regid__ = 'surface'
-          __select__ = RangeFacet.__select__ & implements('Office')
+          __select__ = RangeFacet.__select__ & is_instance('Office')
           # this facet is a filter on the office'surface
           rtype = 'surface'
 
@@ -880,7 +880,7 @@
 
       class HasImageFacet(HasRelationFacet):
           __regid__ = 'hasimage'
-          __select__ = HasRelationFacet.__select__ & implements('Book')
+          __select__ = HasRelationFacet.__select__ & is_instance('Book')
           rtype = 'has_image'
           role = 'subject'
     """