--- a/.pydevproject	Mon May 23 00:39:14 2011 +0200
+++ b/.pydevproject	Mon May 23 00:40:13 2011 +0200
@@ -12,7 +12,6 @@
 <path>/var/local/eggs/zope.testing-3.10.2-py2.6.egg</path>
 <path>/var/local/eggs/zope.tales-3.5.1-py2.6.egg</path>
 <path>/var/local/eggs/zope.interface-3.6.1-py2.6-linux-x86_64.egg</path>
-<path>/var/local/eggs/zope.app.zapi-3.5.0-py2.6.egg</path>
 <path>/var/local/eggs/zope.datetime-3.4.0-py2.6.egg</path>
 <path>/var/local/eggs/zope.i18n-3.7.4-py2.6.egg</path>
 <path>/var/local/eggs/z3c.form-2.4.3-py2.6.egg</path>
@@ -34,5 +33,8 @@
 <path>/var/local/eggs/zopyx.txng3.core-3.5.3-py2.6.egg</path>
 <path>/var/local/eggs/zopyx.txng3.ext-3.3.2-py2.6-linux-x86_64.egg</path>
 <path>/var/local/eggs/hurry.query-1.1.0-py2.6.egg</path>
+<path>/var/local/eggs/pytz-2010l-py2.6.egg</path>
+<path>/var/local/eggs/zope.authentication-3.7.1-py2.6.egg</path>
+<path>/var/local/eggs/zc.set-0.1dev_r75642-py2.6.egg</path>
 </pydev_pathproperty>
 </pydev_project>

--- a/bin/i18ncompile	Mon May 23 00:39:14 2011 +0200
+++ b/bin/i18ncompile	Mon May 23 00:40:13 2011 +0200
@@ -16,70 +16,73 @@
     '/var/local/eggs/zc.buildout-1.5.2-py2.6.egg',
     '/var/local/eggs/zopyx.txng3.core-3.5.3-py2.6.egg',
     '/var/local/eggs/zope.tales-3.5.1-py2.6.egg',
-    '/var/local/eggs/zope.app.zapi-3.5.0-py2.6.egg',
-    '/var/local/eggs/zope.app.session-3.6.2-py2.6.egg',
-    '/var/local/eggs/zope.app.intid-3.7.1-py2.6.egg',
+    '/var/local/eggs/zope.session-3.9.3-py2.6.egg',
+    '/var/local/eggs/zope.security-3.8.0-py2.6-linux-x86_64.egg',
+    '/var/local/eggs/zope.schema-3.7.1-py2.6.egg',
+    '/var/local/eggs/zope.publisher-3.12.6-py2.6.egg',
+    '/var/local/eggs/zope.location-3.9.0-py2.6.egg',
+    '/var/local/eggs/zope.intid-3.7.2-py2.6.egg',
+    '/var/local/eggs/zope.index-3.6.1-py2.6-linux-x86_64.egg',
+    '/var/local/eggs/zope.i18n-3.7.4-py2.6.egg',
+    '/var/local/eggs/zope.datetime-3.4.0-py2.6.egg',
+    '/var/local/eggs/zope.container-3.12.0-py2.6-linux-x86_64.egg',
+    '/var/local/eggs/zope.component-3.10.0-py2.6.egg',
+    '/var/local/eggs/zope.catalog-3.8.1-py2.6.egg',
     '/var/local/eggs/zope.app.file-3.6.1-py2.6.egg',
-    '/var/local/eggs/zope.app.container-3.9.1-py2.6.egg',
-    '/var/local/eggs/zope.app.catalog-3.8.1-py2.6.egg',
+    '/var/local/eggs/zope.app.authentication-3.9-py2.6.egg',
+    '/var/local/eggs/zope.annotation-3.5.0-py2.6.egg',
     '/var/local/eggs/zc.set-0.1dev_r75642-py2.6.egg',
+    '/var/local/eggs/z3c.form-2.4.3-py2.6.egg',
+    '/var/local/eggs/pytz-2010l-py2.6.egg',
     '/var/local/eggs/hurry.query-1.1.0-py2.6.egg',
     '/var/local/eggs/zope.traversing-3.14.0-py2.6.egg',
     '/var/local/eggs/zope.site-3.9.2-py2.6.egg',
-    '/var/local/eggs/zope.session-3.9.3-py2.6.egg',
-    '/var/local/eggs/zope.security-3.8.0-py2.6-linux-x86_64.egg',
     '/var/local/eggs/zope.processlifetime-1.0-py2.6.egg',
     '/var/local/eggs/zope.event-3.5.0_1-py2.6.egg',
     '/var/local/eggs/zope.error-3.7.2-py2.6.egg',
-    '/var/local/eggs/zope.container-3.12.0-py2.6-linux-x86_64.egg',
-    '/var/local/eggs/zope.component-3.10.0-py2.6.egg',
     '/var/local/eggs/zope.app.publication-3.12.0-py2.6.egg',
     '/var/local/eggs/ZODB3-3.10.2-py2.6-linux-x86_64.egg',
     '/var/local/eggs/zope.size-3.4.1-py2.6.egg',
-    '/var/local/eggs/zope.location-3.9.0-py2.6.egg',
     '/var/local/eggs/zope.applicationcontrol-3.5.5-py2.6.egg',
-    '/var/local/eggs/zope.schema-3.7.1-py2.6.egg',
     '/var/local/eggs/zopyx.txng3.ext-3.3.2-py2.6-linux-x86_64.egg',
-    '/var/local/eggs/zope.deprecation-3.4.0-py2.6.egg',
-    '/var/local/eggs/zope.app.publisher-3.10.2-py2.6.egg',
-    '/var/local/eggs/zope.app.interface-3.6.0-py2.6.egg',
-    '/var/local/eggs/zope.publisher-3.12.6-py2.6.egg',
     '/var/local/eggs/zope.minmax-1.1.2-py2.6.egg',
-    '/var/local/eggs/zope.app.http-3.9.0-py2.6.egg',
-    '/var/local/eggs/zope.annotation-3.5.0-py2.6.egg',
-    '/var/local/eggs/zope.intid-3.7.2-py2.6.egg',
+    '/var/local/eggs/zope.proxy-3.6.1-py2.6-linux-x86_64.egg',
+    '/var/local/eggs/zope.exceptions-3.6.1-py2.6.egg',
+    '/var/local/eggs/zope.contenttype-3.5.2-py2.6.egg',
+    '/var/local/eggs/zope.browser-1.3-py2.6.egg',
+    '/var/local/eggs/zope.keyreference-3.6.2-py2.6.egg',
+    '/var/local/eggs/zope.lifecycleevent-3.6.2-py2.6.egg',
+    '/var/local/eggs/zope.broken-3.6.0-py2.6.egg',
     '/var/local/eggs/zope.filerepresentation-3.6.0-py2.6.egg',
-    '/var/local/eggs/zope.exceptions-3.6.1-py2.6.egg',
+    '/var/local/eggs/zope.dottedname-3.4.6-py2.6.egg',
     '/var/local/eggs/zope.dublincore-3.8.2-py2.6.egg',
-    '/var/local/eggs/zope.datetime-3.4.0-py2.6.egg',
-    '/var/local/eggs/zope.contenttype-3.5.2-py2.6.egg',
     '/var/local/eggs/transaction-1.1.1-py2.6.egg',
-    '/var/local/eggs/zope.lifecycleevent-3.6.2-py2.6.egg',
-    '/var/local/eggs/zope.i18n-3.7.4-py2.6.egg',
-    '/var/local/eggs/zope.copypastemove-3.8.0-py2.6.egg',
-    '/var/local/eggs/zope.browser-1.3-py2.6.egg',
-    '/var/local/eggs/zope.catalog-3.8.1-py2.6.egg',
+    '/var/local/eggs/zope.app.component-3.9.2-py2.6.egg',
+    '/var/local/eggs/zope.app.container-3.9.1-py2.6.egg',
+    '/var/local/eggs/zope.pluggableauth-1.2-py2.6.egg',
+    '/var/local/eggs/zope.password-3.6.1-py2.6.egg',
+    '/var/local/eggs/zope.formlib-4.0.5-py2.6.egg',
+    '/var/local/eggs/zope.authentication-3.7.1-py2.6.egg',
     '/var/local/eggs/zope.app.folder-3.5.2-py2.6.egg',
+    '/var/local/eggs/zope.pagetemplate-3.5.2-py2.6.egg',
+    '/var/local/eggs/zope.contentprovider-3.7.2-py2.6.egg',
     '/var/local/eggs/zc.catalog-1.5-py2.6.egg',
-    '/var/local/eggs/zope.proxy-3.6.1-py2.6-linux-x86_64.egg',
-    '/var/local/eggs/zope.broken-3.6.0-py2.6.egg',
-    '/var/local/eggs/zope.dottedname-3.4.6-py2.6.egg',
-    '/var/local/eggs/zope.authentication-3.7.1-py2.6.egg',
     '/var/local/eggs/zdaemon-2.0.4-py2.6.egg',
     '/var/local/eggs/ZConfig-2.8.0-py2.6.egg',
     '/var/local/eggs/zc.lockfile-1.0.0-py2.6.egg',
     '/var/local/eggs/zope.componentvocabulary-1.0.1-py2.6.egg',
+    '/var/local/eggs/zope.deprecation-3.4.0-py2.6.egg',
+    '/var/local/eggs/zope.cachedescriptors-3.5.1-py2.6.egg',
+    '/var/local/eggs/zope.app.pagetemplate-3.11.2-py2.6.egg',
+    '/var/local/eggs/zope.app.publisher-3.10.2-py2.6.egg',
+    '/var/local/eggs/zope.copypastemove-3.8.0-py2.6.egg',
+    '/var/local/eggs/zope.browserpage-3.12.2-py2.6.egg',
+    '/var/local/eggs/zope.app.content-3.5.1-py2.6.egg',
+    '/var/local/eggs/zope.hookable-3.4.1-py2.6-linux-x86_64.egg',
     '/var/local/eggs/zope.ptresource-3.9.0-py2.6.egg',
     '/var/local/eggs/zope.browserresource-3.12.0-py2.6.egg',
-    '/var/local/eggs/zope.browserpage-3.12.2-py2.6.egg',
     '/var/local/eggs/zope.browsermenu-3.9.1-py2.6.egg',
-    '/var/local/eggs/zope.app.content-3.5.1-py2.6.egg',
-    '/var/local/eggs/zodbcode-3.4.0-py2.6.egg',
-    '/var/local/eggs/zope.keyreference-3.6.2-py2.6.egg',
-    '/var/local/eggs/pytz-2010l-py2.6.egg',
     '/var/local/eggs/zope.copy-3.5.0-py2.6.egg',
-    '/var/local/eggs/zope.index-3.6.1-py2.6-linux-x86_64.egg',
-    '/var/local/eggs/zope.pagetemplate-3.5.2-py2.6.egg',
     '/var/local/eggs/RestrictedPython-3.6.0-py2.6.egg',
     '/var/local/eggs/z3c.recipe.i18n-0.6.0-py2.6.egg',
     ]

--- a/bin/i18nextract	Mon May 23 00:39:14 2011 +0200
+++ b/bin/i18nextract	Mon May 23 00:40:13 2011 +0200
@@ -16,70 +16,73 @@
     '/var/local/eggs/zc.buildout-1.5.2-py2.6.egg',
     '/var/local/eggs/zopyx.txng3.core-3.5.3-py2.6.egg',
     '/var/local/eggs/zope.tales-3.5.1-py2.6.egg',
-    '/var/local/eggs/zope.app.zapi-3.5.0-py2.6.egg',
-    '/var/local/eggs/zope.app.session-3.6.2-py2.6.egg',
-    '/var/local/eggs/zope.app.intid-3.7.1-py2.6.egg',
+    '/var/local/eggs/zope.session-3.9.3-py2.6.egg',
+    '/var/local/eggs/zope.security-3.8.0-py2.6-linux-x86_64.egg',
+    '/var/local/eggs/zope.schema-3.7.1-py2.6.egg',
+    '/var/local/eggs/zope.publisher-3.12.6-py2.6.egg',
+    '/var/local/eggs/zope.location-3.9.0-py2.6.egg',
+    '/var/local/eggs/zope.intid-3.7.2-py2.6.egg',
+    '/var/local/eggs/zope.index-3.6.1-py2.6-linux-x86_64.egg',
+    '/var/local/eggs/zope.i18n-3.7.4-py2.6.egg',
+    '/var/local/eggs/zope.datetime-3.4.0-py2.6.egg',
+    '/var/local/eggs/zope.container-3.12.0-py2.6-linux-x86_64.egg',
+    '/var/local/eggs/zope.component-3.10.0-py2.6.egg',
+    '/var/local/eggs/zope.catalog-3.8.1-py2.6.egg',
     '/var/local/eggs/zope.app.file-3.6.1-py2.6.egg',
-    '/var/local/eggs/zope.app.container-3.9.1-py2.6.egg',
-    '/var/local/eggs/zope.app.catalog-3.8.1-py2.6.egg',
+    '/var/local/eggs/zope.app.authentication-3.9-py2.6.egg',
+    '/var/local/eggs/zope.annotation-3.5.0-py2.6.egg',
     '/var/local/eggs/zc.set-0.1dev_r75642-py2.6.egg',
+    '/var/local/eggs/z3c.form-2.4.3-py2.6.egg',
+    '/var/local/eggs/pytz-2010l-py2.6.egg',
     '/var/local/eggs/hurry.query-1.1.0-py2.6.egg',
     '/var/local/eggs/zope.traversing-3.14.0-py2.6.egg',
     '/var/local/eggs/zope.site-3.9.2-py2.6.egg',
-    '/var/local/eggs/zope.session-3.9.3-py2.6.egg',
-    '/var/local/eggs/zope.security-3.8.0-py2.6-linux-x86_64.egg',
     '/var/local/eggs/zope.processlifetime-1.0-py2.6.egg',
     '/var/local/eggs/zope.event-3.5.0_1-py2.6.egg',
     '/var/local/eggs/zope.error-3.7.2-py2.6.egg',
-    '/var/local/eggs/zope.container-3.12.0-py2.6-linux-x86_64.egg',
-    '/var/local/eggs/zope.component-3.10.0-py2.6.egg',
     '/var/local/eggs/zope.app.publication-3.12.0-py2.6.egg',
     '/var/local/eggs/ZODB3-3.10.2-py2.6-linux-x86_64.egg',
     '/var/local/eggs/zope.size-3.4.1-py2.6.egg',
-    '/var/local/eggs/zope.location-3.9.0-py2.6.egg',
     '/var/local/eggs/zope.applicationcontrol-3.5.5-py2.6.egg',
-    '/var/local/eggs/zope.schema-3.7.1-py2.6.egg',
     '/var/local/eggs/zopyx.txng3.ext-3.3.2-py2.6-linux-x86_64.egg',
-    '/var/local/eggs/zope.deprecation-3.4.0-py2.6.egg',
-    '/var/local/eggs/zope.app.publisher-3.10.2-py2.6.egg',
-    '/var/local/eggs/zope.app.interface-3.6.0-py2.6.egg',
-    '/var/local/eggs/zope.publisher-3.12.6-py2.6.egg',
     '/var/local/eggs/zope.minmax-1.1.2-py2.6.egg',
-    '/var/local/eggs/zope.app.http-3.9.0-py2.6.egg',
-    '/var/local/eggs/zope.annotation-3.5.0-py2.6.egg',
-    '/var/local/eggs/zope.intid-3.7.2-py2.6.egg',
+    '/var/local/eggs/zope.proxy-3.6.1-py2.6-linux-x86_64.egg',
+    '/var/local/eggs/zope.exceptions-3.6.1-py2.6.egg',
+    '/var/local/eggs/zope.contenttype-3.5.2-py2.6.egg',
+    '/var/local/eggs/zope.browser-1.3-py2.6.egg',
+    '/var/local/eggs/zope.keyreference-3.6.2-py2.6.egg',
+    '/var/local/eggs/zope.lifecycleevent-3.6.2-py2.6.egg',
+    '/var/local/eggs/zope.broken-3.6.0-py2.6.egg',
     '/var/local/eggs/zope.filerepresentation-3.6.0-py2.6.egg',
-    '/var/local/eggs/zope.exceptions-3.6.1-py2.6.egg',
+    '/var/local/eggs/zope.dottedname-3.4.6-py2.6.egg',
     '/var/local/eggs/zope.dublincore-3.8.2-py2.6.egg',
-    '/var/local/eggs/zope.datetime-3.4.0-py2.6.egg',
-    '/var/local/eggs/zope.contenttype-3.5.2-py2.6.egg',
     '/var/local/eggs/transaction-1.1.1-py2.6.egg',
-    '/var/local/eggs/zope.lifecycleevent-3.6.2-py2.6.egg',
-    '/var/local/eggs/zope.i18n-3.7.4-py2.6.egg',
-    '/var/local/eggs/zope.copypastemove-3.8.0-py2.6.egg',
-    '/var/local/eggs/zope.browser-1.3-py2.6.egg',
-    '/var/local/eggs/zope.catalog-3.8.1-py2.6.egg',
+    '/var/local/eggs/zope.app.component-3.9.2-py2.6.egg',
+    '/var/local/eggs/zope.app.container-3.9.1-py2.6.egg',
+    '/var/local/eggs/zope.pluggableauth-1.2-py2.6.egg',
+    '/var/local/eggs/zope.password-3.6.1-py2.6.egg',
+    '/var/local/eggs/zope.formlib-4.0.5-py2.6.egg',
+    '/var/local/eggs/zope.authentication-3.7.1-py2.6.egg',
     '/var/local/eggs/zope.app.folder-3.5.2-py2.6.egg',
+    '/var/local/eggs/zope.pagetemplate-3.5.2-py2.6.egg',
+    '/var/local/eggs/zope.contentprovider-3.7.2-py2.6.egg',
     '/var/local/eggs/zc.catalog-1.5-py2.6.egg',
-    '/var/local/eggs/zope.proxy-3.6.1-py2.6-linux-x86_64.egg',
-    '/var/local/eggs/zope.broken-3.6.0-py2.6.egg',
-    '/var/local/eggs/zope.dottedname-3.4.6-py2.6.egg',
-    '/var/local/eggs/zope.authentication-3.7.1-py2.6.egg',
     '/var/local/eggs/zdaemon-2.0.4-py2.6.egg',
     '/var/local/eggs/ZConfig-2.8.0-py2.6.egg',
     '/var/local/eggs/zc.lockfile-1.0.0-py2.6.egg',
     '/var/local/eggs/zope.componentvocabulary-1.0.1-py2.6.egg',
+    '/var/local/eggs/zope.deprecation-3.4.0-py2.6.egg',
+    '/var/local/eggs/zope.cachedescriptors-3.5.1-py2.6.egg',
+    '/var/local/eggs/zope.app.pagetemplate-3.11.2-py2.6.egg',
+    '/var/local/eggs/zope.app.publisher-3.10.2-py2.6.egg',
+    '/var/local/eggs/zope.copypastemove-3.8.0-py2.6.egg',
+    '/var/local/eggs/zope.browserpage-3.12.2-py2.6.egg',
+    '/var/local/eggs/zope.app.content-3.5.1-py2.6.egg',
+    '/var/local/eggs/zope.hookable-3.4.1-py2.6-linux-x86_64.egg',
     '/var/local/eggs/zope.ptresource-3.9.0-py2.6.egg',
     '/var/local/eggs/zope.browserresource-3.12.0-py2.6.egg',
-    '/var/local/eggs/zope.browserpage-3.12.2-py2.6.egg',
     '/var/local/eggs/zope.browsermenu-3.9.1-py2.6.egg',
-    '/var/local/eggs/zope.app.content-3.5.1-py2.6.egg',
-    '/var/local/eggs/zodbcode-3.4.0-py2.6.egg',
-    '/var/local/eggs/zope.keyreference-3.6.2-py2.6.egg',
-    '/var/local/eggs/pytz-2010l-py2.6.egg',
     '/var/local/eggs/zope.copy-3.5.0-py2.6.egg',
-    '/var/local/eggs/zope.index-3.6.1-py2.6-linux-x86_64.egg',
-    '/var/local/eggs/zope.pagetemplate-3.5.2-py2.6.egg',
     '/var/local/eggs/RestrictedPython-3.6.0-py2.6.egg',
     '/var/local/eggs/z3c.recipe.i18n-0.6.0-py2.6.egg',
     ]

--- a/bin/i18nmergeall	Mon May 23 00:39:14 2011 +0200
+++ b/bin/i18nmergeall	Mon May 23 00:40:13 2011 +0200
@@ -16,70 +16,73 @@
     '/var/local/eggs/zc.buildout-1.5.2-py2.6.egg',
     '/var/local/eggs/zopyx.txng3.core-3.5.3-py2.6.egg',
     '/var/local/eggs/zope.tales-3.5.1-py2.6.egg',
-    '/var/local/eggs/zope.app.zapi-3.5.0-py2.6.egg',
-    '/var/local/eggs/zope.app.session-3.6.2-py2.6.egg',
-    '/var/local/eggs/zope.app.intid-3.7.1-py2.6.egg',
+    '/var/local/eggs/zope.session-3.9.3-py2.6.egg',
+    '/var/local/eggs/zope.security-3.8.0-py2.6-linux-x86_64.egg',
+    '/var/local/eggs/zope.schema-3.7.1-py2.6.egg',
+    '/var/local/eggs/zope.publisher-3.12.6-py2.6.egg',
+    '/var/local/eggs/zope.location-3.9.0-py2.6.egg',
+    '/var/local/eggs/zope.intid-3.7.2-py2.6.egg',
+    '/var/local/eggs/zope.index-3.6.1-py2.6-linux-x86_64.egg',
+    '/var/local/eggs/zope.i18n-3.7.4-py2.6.egg',
+    '/var/local/eggs/zope.datetime-3.4.0-py2.6.egg',
+    '/var/local/eggs/zope.container-3.12.0-py2.6-linux-x86_64.egg',
+    '/var/local/eggs/zope.component-3.10.0-py2.6.egg',
+    '/var/local/eggs/zope.catalog-3.8.1-py2.6.egg',
     '/var/local/eggs/zope.app.file-3.6.1-py2.6.egg',
-    '/var/local/eggs/zope.app.container-3.9.1-py2.6.egg',
-    '/var/local/eggs/zope.app.catalog-3.8.1-py2.6.egg',
+    '/var/local/eggs/zope.app.authentication-3.9-py2.6.egg',
+    '/var/local/eggs/zope.annotation-3.5.0-py2.6.egg',
     '/var/local/eggs/zc.set-0.1dev_r75642-py2.6.egg',
+    '/var/local/eggs/z3c.form-2.4.3-py2.6.egg',
+    '/var/local/eggs/pytz-2010l-py2.6.egg',
     '/var/local/eggs/hurry.query-1.1.0-py2.6.egg',
     '/var/local/eggs/zope.traversing-3.14.0-py2.6.egg',
     '/var/local/eggs/zope.site-3.9.2-py2.6.egg',
-    '/var/local/eggs/zope.session-3.9.3-py2.6.egg',
-    '/var/local/eggs/zope.security-3.8.0-py2.6-linux-x86_64.egg',
     '/var/local/eggs/zope.processlifetime-1.0-py2.6.egg',
     '/var/local/eggs/zope.event-3.5.0_1-py2.6.egg',
     '/var/local/eggs/zope.error-3.7.2-py2.6.egg',
-    '/var/local/eggs/zope.container-3.12.0-py2.6-linux-x86_64.egg',
-    '/var/local/eggs/zope.component-3.10.0-py2.6.egg',
     '/var/local/eggs/zope.app.publication-3.12.0-py2.6.egg',
     '/var/local/eggs/ZODB3-3.10.2-py2.6-linux-x86_64.egg',
     '/var/local/eggs/zope.size-3.4.1-py2.6.egg',
-    '/var/local/eggs/zope.location-3.9.0-py2.6.egg',
     '/var/local/eggs/zope.applicationcontrol-3.5.5-py2.6.egg',
-    '/var/local/eggs/zope.schema-3.7.1-py2.6.egg',
     '/var/local/eggs/zopyx.txng3.ext-3.3.2-py2.6-linux-x86_64.egg',
-    '/var/local/eggs/zope.deprecation-3.4.0-py2.6.egg',
-    '/var/local/eggs/zope.app.publisher-3.10.2-py2.6.egg',
-    '/var/local/eggs/zope.app.interface-3.6.0-py2.6.egg',
-    '/var/local/eggs/zope.publisher-3.12.6-py2.6.egg',
     '/var/local/eggs/zope.minmax-1.1.2-py2.6.egg',
-    '/var/local/eggs/zope.app.http-3.9.0-py2.6.egg',
-    '/var/local/eggs/zope.annotation-3.5.0-py2.6.egg',
-    '/var/local/eggs/zope.intid-3.7.2-py2.6.egg',
+    '/var/local/eggs/zope.proxy-3.6.1-py2.6-linux-x86_64.egg',
+    '/var/local/eggs/zope.exceptions-3.6.1-py2.6.egg',
+    '/var/local/eggs/zope.contenttype-3.5.2-py2.6.egg',
+    '/var/local/eggs/zope.browser-1.3-py2.6.egg',
+    '/var/local/eggs/zope.keyreference-3.6.2-py2.6.egg',
+    '/var/local/eggs/zope.lifecycleevent-3.6.2-py2.6.egg',
+    '/var/local/eggs/zope.broken-3.6.0-py2.6.egg',
     '/var/local/eggs/zope.filerepresentation-3.6.0-py2.6.egg',
-    '/var/local/eggs/zope.exceptions-3.6.1-py2.6.egg',
+    '/var/local/eggs/zope.dottedname-3.4.6-py2.6.egg',
     '/var/local/eggs/zope.dublincore-3.8.2-py2.6.egg',
-    '/var/local/eggs/zope.datetime-3.4.0-py2.6.egg',
-    '/var/local/eggs/zope.contenttype-3.5.2-py2.6.egg',
     '/var/local/eggs/transaction-1.1.1-py2.6.egg',
-    '/var/local/eggs/zope.lifecycleevent-3.6.2-py2.6.egg',
-    '/var/local/eggs/zope.i18n-3.7.4-py2.6.egg',
-    '/var/local/eggs/zope.copypastemove-3.8.0-py2.6.egg',
-    '/var/local/eggs/zope.browser-1.3-py2.6.egg',
-    '/var/local/eggs/zope.catalog-3.8.1-py2.6.egg',
+    '/var/local/eggs/zope.app.component-3.9.2-py2.6.egg',
+    '/var/local/eggs/zope.app.container-3.9.1-py2.6.egg',
+    '/var/local/eggs/zope.pluggableauth-1.2-py2.6.egg',
+    '/var/local/eggs/zope.password-3.6.1-py2.6.egg',
+    '/var/local/eggs/zope.formlib-4.0.5-py2.6.egg',
+    '/var/local/eggs/zope.authentication-3.7.1-py2.6.egg',
     '/var/local/eggs/zope.app.folder-3.5.2-py2.6.egg',
+    '/var/local/eggs/zope.pagetemplate-3.5.2-py2.6.egg',
+    '/var/local/eggs/zope.contentprovider-3.7.2-py2.6.egg',
     '/var/local/eggs/zc.catalog-1.5-py2.6.egg',
-    '/var/local/eggs/zope.proxy-3.6.1-py2.6-linux-x86_64.egg',
-    '/var/local/eggs/zope.broken-3.6.0-py2.6.egg',
-    '/var/local/eggs/zope.dottedname-3.4.6-py2.6.egg',
-    '/var/local/eggs/zope.authentication-3.7.1-py2.6.egg',
     '/var/local/eggs/zdaemon-2.0.4-py2.6.egg',
     '/var/local/eggs/ZConfig-2.8.0-py2.6.egg',
     '/var/local/eggs/zc.lockfile-1.0.0-py2.6.egg',
     '/var/local/eggs/zope.componentvocabulary-1.0.1-py2.6.egg',
+    '/var/local/eggs/zope.deprecation-3.4.0-py2.6.egg',
+    '/var/local/eggs/zope.cachedescriptors-3.5.1-py2.6.egg',
+    '/var/local/eggs/zope.app.pagetemplate-3.11.2-py2.6.egg',
+    '/var/local/eggs/zope.app.publisher-3.10.2-py2.6.egg',
+    '/var/local/eggs/zope.copypastemove-3.8.0-py2.6.egg',
+    '/var/local/eggs/zope.browserpage-3.12.2-py2.6.egg',
+    '/var/local/eggs/zope.app.content-3.5.1-py2.6.egg',
+    '/var/local/eggs/zope.hookable-3.4.1-py2.6-linux-x86_64.egg',
     '/var/local/eggs/zope.ptresource-3.9.0-py2.6.egg',
     '/var/local/eggs/zope.browserresource-3.12.0-py2.6.egg',
-    '/var/local/eggs/zope.browserpage-3.12.2-py2.6.egg',
     '/var/local/eggs/zope.browsermenu-3.9.1-py2.6.egg',
-    '/var/local/eggs/zope.app.content-3.5.1-py2.6.egg',
-    '/var/local/eggs/zodbcode-3.4.0-py2.6.egg',
-    '/var/local/eggs/zope.keyreference-3.6.2-py2.6.egg',
-    '/var/local/eggs/pytz-2010l-py2.6.egg',
     '/var/local/eggs/zope.copy-3.5.0-py2.6.egg',
-    '/var/local/eggs/zope.index-3.6.1-py2.6-linux-x86_64.egg',
-    '/var/local/eggs/zope.pagetemplate-3.5.2-py2.6.egg',
     '/var/local/eggs/RestrictedPython-3.6.0-py2.6.egg',
     '/var/local/eggs/z3c.recipe.i18n-0.6.0-py2.6.egg',
     ]

--- a/bin/i18nstats	Mon May 23 00:39:14 2011 +0200
+++ b/bin/i18nstats	Mon May 23 00:40:13 2011 +0200
@@ -16,70 +16,73 @@
     '/var/local/eggs/zc.buildout-1.5.2-py2.6.egg',
     '/var/local/eggs/zopyx.txng3.core-3.5.3-py2.6.egg',
     '/var/local/eggs/zope.tales-3.5.1-py2.6.egg',
-    '/var/local/eggs/zope.app.zapi-3.5.0-py2.6.egg',
-    '/var/local/eggs/zope.app.session-3.6.2-py2.6.egg',
-    '/var/local/eggs/zope.app.intid-3.7.1-py2.6.egg',
+    '/var/local/eggs/zope.session-3.9.3-py2.6.egg',
+    '/var/local/eggs/zope.security-3.8.0-py2.6-linux-x86_64.egg',
+    '/var/local/eggs/zope.schema-3.7.1-py2.6.egg',
+    '/var/local/eggs/zope.publisher-3.12.6-py2.6.egg',
+    '/var/local/eggs/zope.location-3.9.0-py2.6.egg',
+    '/var/local/eggs/zope.intid-3.7.2-py2.6.egg',
+    '/var/local/eggs/zope.index-3.6.1-py2.6-linux-x86_64.egg',
+    '/var/local/eggs/zope.i18n-3.7.4-py2.6.egg',
+    '/var/local/eggs/zope.datetime-3.4.0-py2.6.egg',
+    '/var/local/eggs/zope.container-3.12.0-py2.6-linux-x86_64.egg',
+    '/var/local/eggs/zope.component-3.10.0-py2.6.egg',
+    '/var/local/eggs/zope.catalog-3.8.1-py2.6.egg',
     '/var/local/eggs/zope.app.file-3.6.1-py2.6.egg',
-    '/var/local/eggs/zope.app.container-3.9.1-py2.6.egg',
-    '/var/local/eggs/zope.app.catalog-3.8.1-py2.6.egg',
+    '/var/local/eggs/zope.app.authentication-3.9-py2.6.egg',
+    '/var/local/eggs/zope.annotation-3.5.0-py2.6.egg',
     '/var/local/eggs/zc.set-0.1dev_r75642-py2.6.egg',
+    '/var/local/eggs/z3c.form-2.4.3-py2.6.egg',
+    '/var/local/eggs/pytz-2010l-py2.6.egg',
     '/var/local/eggs/hurry.query-1.1.0-py2.6.egg',
     '/var/local/eggs/zope.traversing-3.14.0-py2.6.egg',
     '/var/local/eggs/zope.site-3.9.2-py2.6.egg',
-    '/var/local/eggs/zope.session-3.9.3-py2.6.egg',
-    '/var/local/eggs/zope.security-3.8.0-py2.6-linux-x86_64.egg',
     '/var/local/eggs/zope.processlifetime-1.0-py2.6.egg',
     '/var/local/eggs/zope.event-3.5.0_1-py2.6.egg',
     '/var/local/eggs/zope.error-3.7.2-py2.6.egg',
-    '/var/local/eggs/zope.container-3.12.0-py2.6-linux-x86_64.egg',
-    '/var/local/eggs/zope.component-3.10.0-py2.6.egg',
     '/var/local/eggs/zope.app.publication-3.12.0-py2.6.egg',
     '/var/local/eggs/ZODB3-3.10.2-py2.6-linux-x86_64.egg',
     '/var/local/eggs/zope.size-3.4.1-py2.6.egg',
-    '/var/local/eggs/zope.location-3.9.0-py2.6.egg',
     '/var/local/eggs/zope.applicationcontrol-3.5.5-py2.6.egg',
-    '/var/local/eggs/zope.schema-3.7.1-py2.6.egg',
     '/var/local/eggs/zopyx.txng3.ext-3.3.2-py2.6-linux-x86_64.egg',
-    '/var/local/eggs/zope.deprecation-3.4.0-py2.6.egg',
-    '/var/local/eggs/zope.app.publisher-3.10.2-py2.6.egg',
-    '/var/local/eggs/zope.app.interface-3.6.0-py2.6.egg',
-    '/var/local/eggs/zope.publisher-3.12.6-py2.6.egg',
     '/var/local/eggs/zope.minmax-1.1.2-py2.6.egg',
-    '/var/local/eggs/zope.app.http-3.9.0-py2.6.egg',
-    '/var/local/eggs/zope.annotation-3.5.0-py2.6.egg',
-    '/var/local/eggs/zope.intid-3.7.2-py2.6.egg',
+    '/var/local/eggs/zope.proxy-3.6.1-py2.6-linux-x86_64.egg',
+    '/var/local/eggs/zope.exceptions-3.6.1-py2.6.egg',
+    '/var/local/eggs/zope.contenttype-3.5.2-py2.6.egg',
+    '/var/local/eggs/zope.browser-1.3-py2.6.egg',
+    '/var/local/eggs/zope.keyreference-3.6.2-py2.6.egg',
+    '/var/local/eggs/zope.lifecycleevent-3.6.2-py2.6.egg',
+    '/var/local/eggs/zope.broken-3.6.0-py2.6.egg',
     '/var/local/eggs/zope.filerepresentation-3.6.0-py2.6.egg',
-    '/var/local/eggs/zope.exceptions-3.6.1-py2.6.egg',
+    '/var/local/eggs/zope.dottedname-3.4.6-py2.6.egg',
     '/var/local/eggs/zope.dublincore-3.8.2-py2.6.egg',
-    '/var/local/eggs/zope.datetime-3.4.0-py2.6.egg',
-    '/var/local/eggs/zope.contenttype-3.5.2-py2.6.egg',
     '/var/local/eggs/transaction-1.1.1-py2.6.egg',
-    '/var/local/eggs/zope.lifecycleevent-3.6.2-py2.6.egg',
-    '/var/local/eggs/zope.i18n-3.7.4-py2.6.egg',
-    '/var/local/eggs/zope.copypastemove-3.8.0-py2.6.egg',
-    '/var/local/eggs/zope.browser-1.3-py2.6.egg',
-    '/var/local/eggs/zope.catalog-3.8.1-py2.6.egg',
+    '/var/local/eggs/zope.app.component-3.9.2-py2.6.egg',
+    '/var/local/eggs/zope.app.container-3.9.1-py2.6.egg',
+    '/var/local/eggs/zope.pluggableauth-1.2-py2.6.egg',
+    '/var/local/eggs/zope.password-3.6.1-py2.6.egg',
+    '/var/local/eggs/zope.formlib-4.0.5-py2.6.egg',
+    '/var/local/eggs/zope.authentication-3.7.1-py2.6.egg',
     '/var/local/eggs/zope.app.folder-3.5.2-py2.6.egg',
+    '/var/local/eggs/zope.pagetemplate-3.5.2-py2.6.egg',
+    '/var/local/eggs/zope.contentprovider-3.7.2-py2.6.egg',
     '/var/local/eggs/zc.catalog-1.5-py2.6.egg',
-    '/var/local/eggs/zope.proxy-3.6.1-py2.6-linux-x86_64.egg',
-    '/var/local/eggs/zope.broken-3.6.0-py2.6.egg',
-    '/var/local/eggs/zope.dottedname-3.4.6-py2.6.egg',
-    '/var/local/eggs/zope.authentication-3.7.1-py2.6.egg',
     '/var/local/eggs/zdaemon-2.0.4-py2.6.egg',
     '/var/local/eggs/ZConfig-2.8.0-py2.6.egg',
     '/var/local/eggs/zc.lockfile-1.0.0-py2.6.egg',
     '/var/local/eggs/zope.componentvocabulary-1.0.1-py2.6.egg',
+    '/var/local/eggs/zope.deprecation-3.4.0-py2.6.egg',
+    '/var/local/eggs/zope.cachedescriptors-3.5.1-py2.6.egg',
+    '/var/local/eggs/zope.app.pagetemplate-3.11.2-py2.6.egg',
+    '/var/local/eggs/zope.app.publisher-3.10.2-py2.6.egg',
+    '/var/local/eggs/zope.copypastemove-3.8.0-py2.6.egg',
+    '/var/local/eggs/zope.browserpage-3.12.2-py2.6.egg',
+    '/var/local/eggs/zope.app.content-3.5.1-py2.6.egg',
+    '/var/local/eggs/zope.hookable-3.4.1-py2.6-linux-x86_64.egg',
     '/var/local/eggs/zope.ptresource-3.9.0-py2.6.egg',
     '/var/local/eggs/zope.browserresource-3.12.0-py2.6.egg',
-    '/var/local/eggs/zope.browserpage-3.12.2-py2.6.egg',
     '/var/local/eggs/zope.browsermenu-3.9.1-py2.6.egg',
-    '/var/local/eggs/zope.app.content-3.5.1-py2.6.egg',
-    '/var/local/eggs/zodbcode-3.4.0-py2.6.egg',
-    '/var/local/eggs/zope.keyreference-3.6.2-py2.6.egg',
-    '/var/local/eggs/pytz-2010l-py2.6.egg',
     '/var/local/eggs/zope.copy-3.5.0-py2.6.egg',
-    '/var/local/eggs/zope.index-3.6.1-py2.6-linux-x86_64.egg',
-    '/var/local/eggs/zope.pagetemplate-3.5.2-py2.6.egg',
     '/var/local/eggs/RestrictedPython-3.6.0-py2.6.egg',
     '/var/local/eggs/z3c.recipe.i18n-0.6.0-py2.6.egg',
     ]

--- a/bin/test	Mon May 23 00:39:14 2011 +0200
+++ b/bin/test	Mon May 23 00:40:13 2011 +0200
@@ -10,72 +10,73 @@
     '/var/local/eggs/zope.testing-3.10.2-py2.6.egg',
     '/var/local/eggs/zopyx.txng3.core-3.5.3-py2.6.egg',
     '/var/local/eggs/zope.tales-3.5.1-py2.6.egg',
-    '/var/local/eggs/zope.app.zapi-3.5.0-py2.6.egg',
-    '/var/local/eggs/zope.app.session-3.6.2-py2.6.egg',
-    '/var/local/eggs/zope.app.intid-3.7.1-py2.6.egg',
+    '/var/local/eggs/zope.session-3.9.3-py2.6.egg',
+    '/var/local/eggs/zope.security-3.8.0-py2.6-linux-x86_64.egg',
+    '/var/local/eggs/zope.schema-3.7.1-py2.6.egg',
+    '/var/local/eggs/zope.publisher-3.12.6-py2.6.egg',
+    '/var/local/eggs/zope.location-3.9.0-py2.6.egg',
+    '/var/local/eggs/zope.intid-3.7.2-py2.6.egg',
+    '/var/local/eggs/zope.index-3.6.1-py2.6-linux-x86_64.egg',
+    '/var/local/eggs/zope.i18n-3.7.4-py2.6.egg',
+    '/var/local/eggs/zope.datetime-3.4.0-py2.6.egg',
+    '/var/local/eggs/zope.container-3.12.0-py2.6-linux-x86_64.egg',
+    '/var/local/eggs/zope.component-3.10.0-py2.6.egg',
+    '/var/local/eggs/zope.catalog-3.8.1-py2.6.egg',
     '/var/local/eggs/zope.app.file-3.6.1-py2.6.egg',
-    '/var/local/eggs/zope.app.container-3.9.1-py2.6.egg',
-    '/var/local/eggs/zope.app.catalog-3.8.1-py2.6.egg',
+    '/var/local/eggs/zope.app.authentication-3.9-py2.6.egg',
+    '/var/local/eggs/zope.annotation-3.5.0-py2.6.egg',
     '/var/local/eggs/zc.set-0.1dev_r75642-py2.6.egg',
+    '/var/local/eggs/z3c.form-2.4.3-py2.6.egg',
+    '/var/local/eggs/pytz-2010l-py2.6.egg',
     '/var/local/eggs/hurry.query-1.1.0-py2.6.egg',
     '/var/local/eggs/zopyx.txng3.ext-3.3.2-py2.6-linux-x86_64.egg',
-    '/var/local/eggs/zope.component-3.10.0-py2.6.egg',
     '/var/local/eggs/zope.tal-3.5.2-py2.6.egg',
-    '/var/local/eggs/zope.traversing-3.14.0-py2.6.egg',
-    '/var/local/eggs/zope.deprecation-3.4.0-py2.6.egg',
-    '/var/local/eggs/zope.app.publisher-3.10.2-py2.6.egg',
-    '/var/local/eggs/zope.app.interface-3.6.0-py2.6.egg',
-    '/var/local/eggs/zope.session-3.9.3-py2.6.egg',
-    '/var/local/eggs/zope.publisher-3.12.6-py2.6.egg',
     '/var/local/eggs/zope.minmax-1.1.2-py2.6.egg',
-    '/var/local/eggs/zope.location-3.9.0-py2.6.egg',
     '/var/local/eggs/zope.i18nmessageid-3.5.3-py2.6-linux-x86_64.egg',
-    '/var/local/eggs/zope.app.http-3.9.0-py2.6.egg',
-    '/var/local/eggs/zope.app.appsetup-3.15.0-py2.6.egg',
-    '/var/local/eggs/zope.annotation-3.5.0-py2.6.egg',
     '/var/local/eggs/ZODB3-3.10.2-py2.6-linux-x86_64.egg',
-    '/var/local/eggs/zope.security-3.8.0-py2.6-linux-x86_64.egg',
-    '/var/local/eggs/zope.intid-3.7.2-py2.6.egg',
+    '/var/local/eggs/zope.proxy-3.6.1-py2.6-linux-x86_64.egg',
+    '/var/local/eggs/zope.event-3.5.0_1-py2.6.egg',
+    '/var/local/eggs/zope.contenttype-3.5.2-py2.6.egg',
+    '/var/local/eggs/zope.configuration-3.7.4-py2.6.egg',
+    '/var/local/eggs/zope.browser-1.3-py2.6.egg',
+    '/var/local/eggs/zope.keyreference-3.6.2-py2.6.egg',
+    '/var/local/eggs/zope.lifecycleevent-3.6.2-py2.6.egg',
+    '/var/local/eggs/zope.broken-3.6.0-py2.6.egg',
+    '/var/local/eggs/zope.traversing-3.14.0-py2.6.egg',
     '/var/local/eggs/zope.size-3.4.1-py2.6.egg',
+    '/var/local/eggs/zope.filerepresentation-3.6.0-py2.6.egg',
+    '/var/local/eggs/zope.dottedname-3.4.6-py2.6.egg',
     '/var/local/eggs/zope.site-3.9.2-py2.6.egg',
-    '/var/local/eggs/zope.schema-3.7.1-py2.6.egg',
-    '/var/local/eggs/zope.filerepresentation-3.6.0-py2.6.egg',
-    '/var/local/eggs/zope.event-3.5.0_1-py2.6.egg',
     '/var/local/eggs/zope.dublincore-3.8.2-py2.6.egg',
-    '/var/local/eggs/zope.datetime-3.4.0-py2.6.egg',
-    '/var/local/eggs/zope.contenttype-3.5.2-py2.6.egg',
     '/var/local/eggs/zope.app.publication-3.12.0-py2.6.egg',
     '/var/local/eggs/transaction-1.1.1-py2.6.egg',
-    '/var/local/eggs/zope.lifecycleevent-3.6.2-py2.6.egg',
-    '/var/local/eggs/zope.i18n-3.7.4-py2.6.egg',
-    '/var/local/eggs/zope.copypastemove-3.8.0-py2.6.egg',
-    '/var/local/eggs/zope.container-3.12.0-py2.6-linux-x86_64.egg',
-    '/var/local/eggs/zope.browser-1.3-py2.6.egg',
-    '/var/local/eggs/zope.catalog-3.8.1-py2.6.egg',
+    '/var/local/eggs/zope.app.component-3.9.2-py2.6.egg',
+    '/var/local/eggs/zope.app.container-3.9.1-py2.6.egg',
+    '/var/local/eggs/zope.pluggableauth-1.2-py2.6.egg',
+    '/var/local/eggs/zope.password-3.6.1-py2.6.egg',
+    '/var/local/eggs/zope.formlib-4.0.5-py2.6.egg',
+    '/var/local/eggs/zope.authentication-3.7.1-py2.6.egg',
     '/var/local/eggs/zope.app.folder-3.5.2-py2.6.egg',
+    '/var/local/eggs/zope.pagetemplate-3.5.2-py2.6.egg',
+    '/var/local/eggs/zope.contentprovider-3.7.2-py2.6.egg',
     '/var/local/eggs/zc.catalog-1.5-py2.6.egg',
-    '/var/local/eggs/zope.proxy-3.6.1-py2.6-linux-x86_64.egg',
-    '/var/local/eggs/zope.componentvocabulary-1.0.1-py2.6.egg',
-    '/var/local/eggs/zope.ptresource-3.9.0-py2.6.egg',
-    '/var/local/eggs/zope.configuration-3.7.4-py2.6.egg',
-    '/var/local/eggs/zope.browserresource-3.12.0-py2.6.egg',
-    '/var/local/eggs/zope.browserpage-3.12.2-py2.6.egg',
-    '/var/local/eggs/zope.browsermenu-3.9.1-py2.6.egg',
-    '/var/local/eggs/zope.app.content-3.5.1-py2.6.egg',
-    '/var/local/eggs/zodbcode-3.4.0-py2.6.egg',
-    '/var/local/eggs/zope.processlifetime-1.0-py2.6.egg',
-    '/var/local/eggs/zope.error-3.7.2-py2.6.egg',
     '/var/local/eggs/zdaemon-2.0.4-py2.6.egg',
     '/var/local/eggs/ZConfig-2.8.0-py2.6.egg',
     '/var/local/eggs/zc.lockfile-1.0.0-py2.6.egg',
-    '/var/local/eggs/zope.keyreference-3.6.2-py2.6.egg',
-    '/var/local/eggs/pytz-2010l-py2.6.egg',
-    '/var/local/eggs/zope.authentication-3.7.1-py2.6.egg',
+    '/var/local/eggs/zope.error-3.7.2-py2.6.egg',
+    '/var/local/eggs/zope.componentvocabulary-1.0.1-py2.6.egg',
+    '/var/local/eggs/zope.deprecation-3.4.0-py2.6.egg',
+    '/var/local/eggs/zope.cachedescriptors-3.5.1-py2.6.egg',
+    '/var/local/eggs/zope.app.pagetemplate-3.11.2-py2.6.egg',
+    '/var/local/eggs/zope.app.publisher-3.10.2-py2.6.egg',
+    '/var/local/eggs/zope.copypastemove-3.8.0-py2.6.egg',
+    '/var/local/eggs/zope.browserpage-3.12.2-py2.6.egg',
+    '/var/local/eggs/zope.app.content-3.5.1-py2.6.egg',
+    '/var/local/eggs/zope.hookable-3.4.1-py2.6-linux-x86_64.egg',
+    '/var/local/eggs/zope.ptresource-3.9.0-py2.6.egg',
+    '/var/local/eggs/zope.browserresource-3.12.0-py2.6.egg',
+    '/var/local/eggs/zope.browsermenu-3.9.1-py2.6.egg',
     '/var/local/eggs/zope.copy-3.5.0-py2.6.egg',
-    '/var/local/eggs/zope.broken-3.6.0-py2.6.egg',
-    '/var/local/eggs/zope.dottedname-3.4.6-py2.6.egg',
-    '/var/local/eggs/zope.index-3.6.1-py2.6-linux-x86_64.egg',
-    '/var/local/eggs/zope.pagetemplate-3.5.2-py2.6.egg',
     '/var/local/eggs/RestrictedPython-3.6.0-py2.6.egg',
     ]
 

--- a/setup.py	Mon May 23 00:39:14 2011 +0200
+++ b/setup.py	Mon May 23 00:40:13 2011 +0200
@@ -25,7 +25,7 @@
 README = os.path.join(DOCS, 'README.txt')
 HISTORY = os.path.join(DOCS, 'HISTORY.txt')
 
-version = '0.3'
+version = '0.4.0'
 long_description = open(README).read() + '\n\n' + open(HISTORY).read()
 
 tests_require = [
@@ -61,13 +61,24 @@
           'setuptools',
           # -*- Extra requirements: -*-
           'hurry.query',
+          'pytz',
+          'z3c.form',
           'zc.set',
+          'zope.annotation',
+          'zope.app.authentication',
           'zope.app.file',
-          'zope.app.zapi',
           'zope.catalog',
+          'zope.component',
           'zope.container',
+          'zope.datetime',
+          'zope.i18n',
+          'zope.index',
           'zope.interface',
           'zope.intid',
+          'zope.location',
+          'zope.publisher',
+          'zope.schema',
+          'zope.security',
           'zope.session',
           'zope.tales',
           'zopyx.txng3.core',

--- a/ztfy.utils.egg-info/requires.txt	Mon May 23 00:39:14 2011 +0200
+++ b/ztfy.utils.egg-info/requires.txt	Mon May 23 00:40:13 2011 +0200
@@ -1,12 +1,23 @@
 setuptools
 hurry.query
+pytz
+z3c.form
 zc.set
+zope.annotation
+zope.app.authentication
 zope.app.file
-zope.app.zapi
 zope.catalog
+zope.component
 zope.container
+zope.datetime
+zope.i18n
+zope.index
 zope.interface
 zope.intid
+zope.location
+zope.publisher
+zope.schema
+zope.security
 zope.session
 zope.tales
 zopyx.txng3.core