# HG changeset patch
# User Thierry Florac <tflorac@ulthar.net>
# Date 1261519177 -3600
# Node ID 035058514c2d3988e25d3938bb8afedc62dca9d4
# Parent  ec82f750a462edc15ec72f097f916ccd2c7edd0b
Updated buildout

diff -r ec82f750a462 -r 035058514c2d .hgignore
--- a/.hgignore	Wed Dec 02 23:12:23 2009 +0100
+++ b/.hgignore	Tue Dec 22 22:59:37 2009 +0100
@@ -2,3 +2,6 @@
 \.hgignore$
 ^develop-eggs/
 ^parts/
+^dist/
+^build/
+^EGG-INFO/
diff -r ec82f750a462 -r 035058514c2d .installed.cfg
--- a/.installed.cfg	Wed Dec 02 23:12:23 2009 +0100
+++ b/.installed.cfg	Tue Dec 22 22:59:37 2009 +0100
@@ -1,42 +1,61 @@
 [buildout]
-installed_develop_eggs = /var/local/ztfy/ztfy.utils/develop-eggs/ztfy.utils.egg-link
-parts = package test
+installed_develop_eggs = 
+parts = test package i18n
+
+[test]
+__buildout_installed__ = /var/local/ztfy-2.5/ztfy.utils/parts/test
+	/var/local/ztfy-2.5/ztfy.utils/bin/test
+__buildout_signature__ = zc.recipe.testrunner-1.0.0-py2.5.egg zc.recipe.egg-1.2.2-py2.5.egg setuptools-0.6c9-py2.5.egg zope.testing-3.5.6-py2.5.egg zc.buildout-1.4.3-py2.5.egg zc.buildout-1.4.3-py2.5.egg
+_b = /var/local/ztfy-2.5/ztfy.utils/bin
+_d = /var/local/ztfy-2.5/ztfy.utils/develop-eggs
+_e = /var/local/eggs
+bin-directory = /var/local/ztfy-2.5/ztfy.utils/bin
+develop-eggs-directory = /var/local/ztfy-2.5/ztfy.utils/develop-eggs
+eggs = ztfy.utils [test]
+eggs-directory = /var/local/eggs
+executable = /var/local/ztfy-2.5/bin/python2.5
+location = /var/local/ztfy-2.5/ztfy.utils/parts/test
+recipe = zc.recipe.testrunner
+script = /var/local/ztfy-2.5/ztfy.utils/bin/test
 
 [package]
 __buildout_installed__ = 
-__buildout_signature__ = zc.recipe.egg-1.0.0-py2.4.egg setuptools-0.6c9-py2.4.egg zc.buildout-1.3.0-py2.4.egg
-_b = /var/local/ztfy/ztfy.utils/bin
-_d = /var/local/ztfy/ztfy.utils/develop-eggs
-_e = /var/local/ztfy/eggs
-bin-directory = /var/local/ztfy/ztfy.utils/bin
-develop-eggs-directory = /var/local/ztfy/ztfy.utils/develop-eggs
+__buildout_signature__ = zc.recipe.egg-1.2.2-py2.5.egg setuptools-0.6c9-py2.5.egg zc.buildout-1.4.3-py2.5.egg
+_b = /var/local/ztfy-2.5/ztfy.utils/bin
+_d = /var/local/ztfy-2.5/ztfy.utils/develop-eggs
+_e = /var/local/eggs
+bin-directory = /var/local/ztfy-2.5/ztfy.utils/bin
+develop-eggs-directory = /var/local/ztfy-2.5/ztfy.utils/develop-eggs
 eggs = ztfy.utils
+	zc.set
 	zope.app.zapi
-eggs-directory = /var/local/ztfy/eggs
-executable = /var/local/ztfy/bin/python2.4
+eggs-directory = /var/local/eggs
+executable = /var/local/ztfy-2.5/bin/python2.5
 recipe = zc.recipe.egg
 
-[test]
-__buildout_installed__ = /var/local/ztfy/ztfy.utils/parts/test
-	/var/local/ztfy/ztfy.utils/bin/test
-__buildout_signature__ = zc.recipe.testrunner-1.0.0-py2.4.egg zc.recipe.egg-1.0.0-py2.4.egg setuptools-0.6c9-py2.4.egg zope.testing-3.5.6-py2.4.egg zc.buildout-1.3.0-py2.4.egg zc.buildout-1.3.0-py2.4.egg
-_b = /var/local/ztfy/ztfy.utils/bin
-_d = /var/local/ztfy/ztfy.utils/develop-eggs
-_e = /var/local/ztfy/eggs
-bin-directory = /var/local/ztfy/ztfy.utils/bin
-develop-eggs-directory = /var/local/ztfy/ztfy.utils/develop-eggs
-eggs = ztfy.utils [test]
-eggs-directory = /var/local/ztfy/eggs
-executable = /var/local/ztfy/bin/python2.4
-location = /var/local/ztfy/ztfy.utils/parts/test
-recipe = zc.recipe.testrunner
-script = /var/local/ztfy/ztfy.utils/bin/test
+[i18n]
+__buildout_installed__ = /var/local/ztfy-2.5/ztfy.utils/bin/i18nextract
+	/var/local/ztfy-2.5/ztfy.utils/bin/i18nmergeall
+	/var/local/ztfy-2.5/ztfy.utils/bin/i18nstats
+	/var/local/ztfy-2.5/ztfy.utils/bin/i18ncompile
+__buildout_signature__ = z3c.recipe.i18n-0.6.0-py2.5.egg zope.configuration-3.4.0-py2.5.egg zope.app.locales-3.5.1-py2.5.egg zope.app.appsetup-3.4.1-py2.5.egg zc.recipe.egg-1.2.2-py2.5.egg zc.buildout-1.4.3-py2.5.egg setuptools-0.6c9-py2.5.egg zope.schema-3.4.0-py2.5.egg zope.interface-FMcTxkEwgPqHv7lxWGYxgQ== zope.i18nmessageid-3.4.3-py2.5-linux-i686.egg zope.deprecation-3.4.0-py2.5.egg ZODB3-3.8.5-py2.5-linux-i686.egg zope.traversing-3.4.1-py2.5.egg zope.security-3.4.1-py2.5-linux-i686.egg zope.event-3.4.0-py2.5.egg zope.error-3.5.1-py2.5.egg zope.component-3.4.0-py2.5.egg zope.app.publication-3.4.3-py2.5.egg zope.app.folder-3.4.0-py2.5.egg zope.app.container-3.5.6-py2.5-linux-i686.egg zope.app.component-3.4.1-py2.5.egg zc.buildout-1.4.3-py2.5.egg zope.testing-3.5.6-py2.5.egg zdaemon-2.0.2-py2.5.egg ZConfig-2.5.1-py2.5.egg zope.proxy-3.4.2-py2.5-linux-i686.egg zope.publisher-3.4.6-py2.5.egg zope.i18n-3.4.0-py2.5.egg zope.app.applicationcontrol-3.4.3-py2.5.egg zope.proxy-3.4.2-py2.5-linux-i686.egg zope.location-3.4.0-py2.5.egg zope.exceptions-3.4.0-py2.5.egg zope.deferredimport-3.4.0-py2.5.egg pytz-2007k-py2.5.egg zope.app.security-3.5.2-py2.5.egg zope.app.exception-3.4.1-py2.5.egg zope.app.error-3.5.1-py2.5.egg zope.app.http-3.4.1-py2.5.egg zope.app.authentication-3.4.4-py2.5.egg zope.dublincore-3.4.0-py2.5.egg zope.datetime-3.4.0-py2.5.egg zope.copypastemove-3.4.0-py2.5.egg zope.app.broken-3.4.0-py2.5.egg zope.size-3.4.0-py2.5.egg zope.filerepresentation-3.4.0-py2.5.egg zope.lifecycleevent-3.4.0-py2.5.egg zope.dottedname-3.4.2-py2.5.egg zope.cachedescriptors-3.4.1-py2.5.egg zope.app.zapi-3.4.0-py2.5.egg zope.app.publisher-3.4.1-py2.5.egg zope.thread-3.4-py2.5.egg zope.location-3.4.0-py2.5.egg zope.formlib-3.4.0-py2.5.egg zope.component-3.4.0-py2.5.egg zope.app.pagetemplate-3.4.1-py2.5.egg zope.app.interface-3.4.0-py2.5.egg zope.annotation-3.4.1-py2.5.egg zope.app.testing-3.4.3-py2.5.egg zope.component-3.4.0-py2.5.egg zope.proxy-3.4.2-py2.5-linux-i686.egg zope.app.form-3.4.1-py2.5.egg zope.session-3.4.1-py2.5.egg zope.app.principalannotation-3.4.0-py2.5.egg zope.pagetemplate-3.4.0-py2.5.egg zope.contenttype-3.4.0-py2.5.egg zope.app.zcmlfiles-3.4.3-py2.5.egg zope.hookable-3.4.0-py2.5-linux-i686.egg zope.tales-3.4.0-py2.5.egg zope.security-3.4.1-py2.5-linux-i686.egg zodbcode-3.4.0-py2.5.egg zope.location-3.4.0-py2.5.egg zope.app.dependable-3.4.0-py2.5.egg zope.app.debug-3.4.1-py2.5.egg zope.app.basicskin-3.4.0-py2.5.egg zope.minmax-1.1.0-py2.5.egg zope.tal-3.4.1-py2.5.egg zope.app.schema-3.4.0-py2.5.egg zope.app.wsgi-3.4.1-py2.5.egg zope.app.rotterdam-3.4.1-py2.5.egg zope.app.zopeappgenerations-3.4.0-py2.5.egg zope.app.i18n-3.4.4-py2.5.egg zope.app.generations-3.4.1-py2.5.egg zope.app.content-3.4.0-py2.5.egg zope.modulealias-3.4.0-py2.5.egg RestrictedPython-3.4.2-py2.5.egg zope.app.renderer-3.4.0-py2.5.egg zope.structuredtext-3.4.0-py2.5.egg docutils-1RKpGtNWTj1M9ZWyugdWNQ==
+_b = /var/local/ztfy-2.5/ztfy.utils/bin
+_d = /var/local/ztfy-2.5/ztfy.utils/develop-eggs
+_e = /var/local/eggs
+bin-directory = /var/local/ztfy-2.5/ztfy.utils/bin
+develop-eggs-directory = /var/local/ztfy-2.5/ztfy.utils/develop-eggs
+domain = ztfy.utils
+eggs = ztfy.utils
+	zc.set
+	zope.app.zapi
+	z3c.recipe.i18n
+	zope.app.locales [extract]
+eggs-directory = /var/local/eggs
+executable = /var/local/ztfy-2.5/bin/python2.5
+output = ztfy/utils/locales
+packages = ztfy.utils
+recipe = z3c.recipe.i18n:i18n
+zcml = <include file="configure.zcml" />
 
 [buildout]
-installed_develop_eggs = /var/local/ztfy/ztfy.utils/develop-eggs/ztfy.utils.egg-link
-
-[buildout]
-parts = test package
-
-[buildout]
-parts = package test
+parts = package i18n test
diff -r ec82f750a462 -r 035058514c2d .pydevproject
--- a/.pydevproject	Wed Dec 02 23:12:23 2009 +0100
+++ b/.pydevproject	Tue Dec 22 22:59:37 2009 +0100
@@ -2,12 +2,12 @@
 <?eclipse-pydev version="1.0"?>
 
 <pydev_project>
-<pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 2.4</pydev_property>
+<pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 2.5</pydev_property>
 <pydev_pathproperty name="org.python.pydev.PROJECT_SOURCE_PATH">
 <path>/ZTFY.utils/ztfy</path>
 </pydev_pathproperty>
 <pydev_pathproperty name="org.python.pydev.PROJECT_EXTERNAL_SOURCE_PATH">
 <path>/var/local/ztfy/eggs</path>
 </pydev_pathproperty>
-<pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">/usr/bin/python2.4</pydev_property>
+<pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">Python 2.5</pydev_property>
 </pydev_project>
diff -r ec82f750a462 -r 035058514c2d .settings/org.eclipse.core.resources.prefs
--- a/.settings/org.eclipse.core.resources.prefs	Wed Dec 02 23:12:23 2009 +0100
+++ b/.settings/org.eclipse.core.resources.prefs	Tue Dec 22 22:59:37 2009 +0100
@@ -1,6 +1,9 @@
-#Thu Nov 19 15:20:04 CET 2009
+#Tue Dec 22 11:37:26 CET 2009
 eclipse.preferences.version=1
+encoding//ztfy/utils/__init__.py=utf-8
 encoding//ztfy/utils/catalog.py=utf-8
 encoding//ztfy/utils/file.py=utf-8
 encoding//ztfy/utils/protocol/xmlrpc.py=utf-8
+encoding//ztfy/utils/request.py=utf-8
 encoding//ztfy/utils/unicode.py=utf-8
+encoding/setup.py=utf-8
diff -r ec82f750a462 -r 035058514c2d CHANGES
--- a/CHANGES	Wed Dec 02 23:12:23 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-* '0.1'
- - initial version created by IngeniSkel
-
diff -r ec82f750a462 -r 035058514c2d bin/buildout
--- a/bin/buildout	Wed Dec 02 23:12:23 2009 +0100
+++ b/bin/buildout	Tue Dec 22 22:59:37 2009 +0100
@@ -1,9 +1,9 @@
-#!/var/local/ztfy/bin/python2.4
+#!/var/local/ztfy-2.5/bin/python2.5
 
 import sys
 sys.path[0:0] = [
-  '/var/local/ztfy/eggs/setuptools-0.6c9-py2.4.egg',
-  '/var/local/ztfy/eggs/zc.buildout-1.3.0-py2.4.egg',
+  '/var/local/eggs/setuptools-0.6c9-py2.5.egg',
+  '/var/local/eggs/zc.buildout-1.4.3-py2.5.egg',
   ]
 
 import zc.buildout.buildout
diff -r ec82f750a462 -r 035058514c2d bin/i18ncompile
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/bin/i18ncompile	Tue Dec 22 22:59:37 2009 +0100
@@ -0,0 +1,93 @@
+#!/var/local/ztfy-2.5/bin/python2.5
+
+import sys
+sys.path[0:0] = [
+  '/var/local/ztfy-2.5/ztfy.utils',
+  '/var/local/eggs/zc.set-0.1dev_r75642-py2.5.egg',
+  '/var/local/eggs/zope.app.zapi-3.4.0-py2.5.egg',
+  '/var/local/eggs/z3c.recipe.i18n-0.6.0-py2.5.egg',
+  '/var/local/eggs/zope.app.locales-3.5.1-py2.5.egg',
+  '/var/local/eggs/zope.app.appsetup-3.4.1-py2.5.egg',
+  '/var/local/eggs/zope.app.applicationcontrol-3.4.3-py2.5.egg',
+  '/var/local/eggs/zope.tal-3.4.1-py2.5.egg',
+  '/var/local/eggs/zope.interface-3.4.1-py2.5-linux-i686.egg',
+  '/var/local/eggs/zope.i18nmessageid-3.4.3-py2.5-linux-i686.egg',
+  '/var/local/eggs/setuptools-0.6c9-py2.5.egg',
+  '/var/local/eggs/zope.configuration-3.4.0-py2.5.egg',
+  '/var/local/eggs/zc.recipe.egg-1.2.2-py2.5.egg',
+  '/var/local/eggs/zc.buildout-1.4.3-py2.5.egg',
+  '/var/local/eggs/zope.app.interface-3.4.0-py2.5.egg',
+  '/var/local/eggs/zope.app.publisher-3.4.1-py2.5.egg',
+  '/var/local/eggs/zope.traversing-3.4.1-py2.5.egg',
+  '/var/local/eggs/zope.component-3.4.0-py2.5.egg',
+  '/var/local/eggs/zope.app.folder-3.4.0-py2.5.egg',
+  '/var/local/eggs/ZODB3-3.8.5-py2.5-linux-i686.egg',
+  '/var/local/eggs/zope.security-3.4.1-py2.5-linux-i686.egg',
+  '/var/local/eggs/zope.event-3.4.0-py2.5.egg',
+  '/var/local/eggs/zope.error-3.5.1-py2.5.egg',
+  '/var/local/eggs/zope.app.publication-3.4.3-py2.5.egg',
+  '/var/local/eggs/zope.app.container-3.5.6-py2.5-linux-i686.egg',
+  '/var/local/eggs/zope.app.component-3.4.1-py2.5.egg',
+  '/var/local/eggs/zope.size-3.4.0-py2.5.egg',
+  '/var/local/eggs/zope.i18n-3.4.0-py2.5.egg',
+  '/var/local/eggs/zope.schema-3.4.0-py2.5.egg',
+  '/var/local/eggs/zope.deprecation-3.4.0-py2.5.egg',
+  '/var/local/eggs/zodbcode-3.4.0-py2.5.egg',
+  '/var/local/eggs/zope.publisher-3.4.6-py2.5.egg',
+  '/var/local/eggs/zope.pagetemplate-3.4.0-py2.5.egg',
+  '/var/local/eggs/zope.location-3.4.0-py2.5.egg',
+  '/var/local/eggs/zope.deferredimport-3.4.0-py2.5.egg',
+  '/var/local/eggs/zope.datetime-3.4.0-py2.5.egg',
+  '/var/local/eggs/zope.contenttype-3.4.0-py2.5.egg',
+  '/var/local/eggs/zope.app.pagetemplate-3.4.1-py2.5.egg',
+  '/var/local/eggs/zope.proxy-3.4.2-py2.5-linux-i686.egg',
+  '/var/local/eggs/zope.app.security-3.5.2-py2.5.egg',
+  '/var/local/eggs/zope.app.authentication-3.4.4-py2.5.egg',
+  '/var/local/eggs/zope.dublincore-3.4.0-py2.5.egg',
+  '/var/local/eggs/zdaemon-2.0.2-py2.5.egg',
+  '/var/local/eggs/ZConfig-2.5.1-py2.5.egg',
+  '/var/local/eggs/zope.testing-3.5.6-py2.5.egg',
+  '/var/local/eggs/zope.exceptions-3.4.0-py2.5.egg',
+  '/var/local/eggs/pytz-2007k-py2.5.egg',
+  '/var/local/eggs/zope.app.exception-3.4.1-py2.5.egg',
+  '/var/local/eggs/zope.app.error-3.5.1-py2.5.egg',
+  '/var/local/eggs/zope.app.http-3.4.1-py2.5.egg',
+  '/var/local/eggs/zope.copypastemove-3.4.0-py2.5.egg',
+  '/var/local/eggs/zope.app.broken-3.4.0-py2.5.egg',
+  '/var/local/eggs/zope.filerepresentation-3.4.0-py2.5.egg',
+  '/var/local/eggs/zope.lifecycleevent-3.4.0-py2.5.egg',
+  '/var/local/eggs/zope.dottedname-3.4.2-py2.5.egg',
+  '/var/local/eggs/zope.cachedescriptors-3.4.1-py2.5.egg',
+  '/var/local/eggs/zope.thread-3.4-py2.5.egg',
+  '/var/local/eggs/zope.formlib-3.4.0-py2.5.egg',
+  '/var/local/eggs/zope.annotation-3.4.1-py2.5.egg',
+  '/var/local/eggs/zope.app.testing-3.4.3-py2.5.egg',
+  '/var/local/eggs/zope.tales-3.4.0-py2.5.egg',
+  '/var/local/eggs/zope.app.form-3.4.1-py2.5.egg',
+  '/var/local/eggs/zope.session-3.4.1-py2.5.egg',
+  '/var/local/eggs/zope.app.principalannotation-3.4.0-py2.5.egg',
+  '/var/local/eggs/zope.app.zcmlfiles-3.4.3-py2.5.egg',
+  '/var/local/eggs/zope.hookable-3.4.0-py2.5-linux-i686.egg',
+  '/var/local/eggs/zope.app.dependable-3.4.0-py2.5.egg',
+  '/var/local/eggs/zope.app.debug-3.4.1-py2.5.egg',
+  '/var/local/eggs/RestrictedPython-3.4.2-py2.5.egg',
+  '/var/local/eggs/zope.app.basicskin-3.4.0-py2.5.egg',
+  '/var/local/eggs/zope.minmax-1.1.0-py2.5.egg',
+  '/var/local/eggs/zope.app.schema-3.4.0-py2.5.egg',
+  '/var/local/eggs/zope.app.wsgi-3.4.1-py2.5.egg',
+  '/var/local/eggs/zope.app.rotterdam-3.4.1-py2.5.egg',
+  '/var/local/eggs/zope.app.zopeappgenerations-3.4.0-py2.5.egg',
+  '/var/local/eggs/zope.app.i18n-3.4.4-py2.5.egg',
+  '/var/local/eggs/zope.app.generations-3.4.1-py2.5.egg',
+  '/var/local/eggs/zope.app.content-3.4.0-py2.5.egg',
+  '/var/local/eggs/zope.modulealias-3.4.0-py2.5.egg',
+  '/var/local/eggs/zope.app.renderer-3.4.0-py2.5.egg',
+  '/var/local/eggs/zope.structuredtext-3.4.0-py2.5.egg',
+  '/var/local/eggs/docutils-0.4-py2.5.egg',
+  '/var/local/eggs/z3c.recipe.i18n-0.6.0-py2.5.egg',
+  ]
+
+import z3c.recipe.i18n.i18ncompile
+
+if __name__ == '__main__':
+    z3c.recipe.i18n.i18ncompile.main(['i18ncompile', '-l', '/var/local/ztfy-2.5/ztfy.utils/ztfy/utils/locales'])
diff -r ec82f750a462 -r 035058514c2d bin/i18nextract
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/bin/i18nextract	Tue Dec 22 22:59:37 2009 +0100
@@ -0,0 +1,98 @@
+#!/var/local/ztfy-2.5/bin/python2.5
+
+import sys
+sys.path[0:0] = [
+  '/var/local/ztfy-2.5/ztfy.utils',
+  '/var/local/eggs/zc.set-0.1dev_r75642-py2.5.egg',
+  '/var/local/eggs/zope.app.zapi-3.4.0-py2.5.egg',
+  '/var/local/eggs/z3c.recipe.i18n-0.6.0-py2.5.egg',
+  '/var/local/eggs/zope.app.locales-3.5.1-py2.5.egg',
+  '/var/local/eggs/zope.app.appsetup-3.4.1-py2.5.egg',
+  '/var/local/eggs/zope.app.applicationcontrol-3.4.3-py2.5.egg',
+  '/var/local/eggs/zope.tal-3.4.1-py2.5.egg',
+  '/var/local/eggs/zope.interface-3.4.1-py2.5-linux-i686.egg',
+  '/var/local/eggs/zope.i18nmessageid-3.4.3-py2.5-linux-i686.egg',
+  '/var/local/eggs/setuptools-0.6c9-py2.5.egg',
+  '/var/local/eggs/zope.configuration-3.4.0-py2.5.egg',
+  '/var/local/eggs/zc.recipe.egg-1.2.2-py2.5.egg',
+  '/var/local/eggs/zc.buildout-1.4.3-py2.5.egg',
+  '/var/local/eggs/zope.app.interface-3.4.0-py2.5.egg',
+  '/var/local/eggs/zope.app.publisher-3.4.1-py2.5.egg',
+  '/var/local/eggs/zope.traversing-3.4.1-py2.5.egg',
+  '/var/local/eggs/zope.component-3.4.0-py2.5.egg',
+  '/var/local/eggs/zope.app.folder-3.4.0-py2.5.egg',
+  '/var/local/eggs/ZODB3-3.8.5-py2.5-linux-i686.egg',
+  '/var/local/eggs/zope.security-3.4.1-py2.5-linux-i686.egg',
+  '/var/local/eggs/zope.event-3.4.0-py2.5.egg',
+  '/var/local/eggs/zope.error-3.5.1-py2.5.egg',
+  '/var/local/eggs/zope.app.publication-3.4.3-py2.5.egg',
+  '/var/local/eggs/zope.app.container-3.5.6-py2.5-linux-i686.egg',
+  '/var/local/eggs/zope.app.component-3.4.1-py2.5.egg',
+  '/var/local/eggs/zope.size-3.4.0-py2.5.egg',
+  '/var/local/eggs/zope.i18n-3.4.0-py2.5.egg',
+  '/var/local/eggs/zope.schema-3.4.0-py2.5.egg',
+  '/var/local/eggs/zope.deprecation-3.4.0-py2.5.egg',
+  '/var/local/eggs/zodbcode-3.4.0-py2.5.egg',
+  '/var/local/eggs/zope.publisher-3.4.6-py2.5.egg',
+  '/var/local/eggs/zope.pagetemplate-3.4.0-py2.5.egg',
+  '/var/local/eggs/zope.location-3.4.0-py2.5.egg',
+  '/var/local/eggs/zope.deferredimport-3.4.0-py2.5.egg',
+  '/var/local/eggs/zope.datetime-3.4.0-py2.5.egg',
+  '/var/local/eggs/zope.contenttype-3.4.0-py2.5.egg',
+  '/var/local/eggs/zope.app.pagetemplate-3.4.1-py2.5.egg',
+  '/var/local/eggs/zope.proxy-3.4.2-py2.5-linux-i686.egg',
+  '/var/local/eggs/zope.app.security-3.5.2-py2.5.egg',
+  '/var/local/eggs/zope.app.authentication-3.4.4-py2.5.egg',
+  '/var/local/eggs/zope.dublincore-3.4.0-py2.5.egg',
+  '/var/local/eggs/zdaemon-2.0.2-py2.5.egg',
+  '/var/local/eggs/ZConfig-2.5.1-py2.5.egg',
+  '/var/local/eggs/zope.testing-3.5.6-py2.5.egg',
+  '/var/local/eggs/zope.exceptions-3.4.0-py2.5.egg',
+  '/var/local/eggs/pytz-2007k-py2.5.egg',
+  '/var/local/eggs/zope.app.exception-3.4.1-py2.5.egg',
+  '/var/local/eggs/zope.app.error-3.5.1-py2.5.egg',
+  '/var/local/eggs/zope.app.http-3.4.1-py2.5.egg',
+  '/var/local/eggs/zope.copypastemove-3.4.0-py2.5.egg',
+  '/var/local/eggs/zope.app.broken-3.4.0-py2.5.egg',
+  '/var/local/eggs/zope.filerepresentation-3.4.0-py2.5.egg',
+  '/var/local/eggs/zope.lifecycleevent-3.4.0-py2.5.egg',
+  '/var/local/eggs/zope.dottedname-3.4.2-py2.5.egg',
+  '/var/local/eggs/zope.cachedescriptors-3.4.1-py2.5.egg',
+  '/var/local/eggs/zope.thread-3.4-py2.5.egg',
+  '/var/local/eggs/zope.formlib-3.4.0-py2.5.egg',
+  '/var/local/eggs/zope.annotation-3.4.1-py2.5.egg',
+  '/var/local/eggs/zope.app.testing-3.4.3-py2.5.egg',
+  '/var/local/eggs/zope.tales-3.4.0-py2.5.egg',
+  '/var/local/eggs/zope.app.form-3.4.1-py2.5.egg',
+  '/var/local/eggs/zope.session-3.4.1-py2.5.egg',
+  '/var/local/eggs/zope.app.principalannotation-3.4.0-py2.5.egg',
+  '/var/local/eggs/zope.app.zcmlfiles-3.4.3-py2.5.egg',
+  '/var/local/eggs/zope.hookable-3.4.0-py2.5-linux-i686.egg',
+  '/var/local/eggs/zope.app.dependable-3.4.0-py2.5.egg',
+  '/var/local/eggs/zope.app.debug-3.4.1-py2.5.egg',
+  '/var/local/eggs/RestrictedPython-3.4.2-py2.5.egg',
+  '/var/local/eggs/zope.app.basicskin-3.4.0-py2.5.egg',
+  '/var/local/eggs/zope.minmax-1.1.0-py2.5.egg',
+  '/var/local/eggs/zope.app.schema-3.4.0-py2.5.egg',
+  '/var/local/eggs/zope.app.wsgi-3.4.1-py2.5.egg',
+  '/var/local/eggs/zope.app.rotterdam-3.4.1-py2.5.egg',
+  '/var/local/eggs/zope.app.zopeappgenerations-3.4.0-py2.5.egg',
+  '/var/local/eggs/zope.app.i18n-3.4.4-py2.5.egg',
+  '/var/local/eggs/zope.app.generations-3.4.1-py2.5.egg',
+  '/var/local/eggs/zope.app.content-3.4.0-py2.5.egg',
+  '/var/local/eggs/zope.modulealias-3.4.0-py2.5.egg',
+  '/var/local/eggs/zope.app.renderer-3.4.0-py2.5.egg',
+  '/var/local/eggs/zope.structuredtext-3.4.0-py2.5.egg',
+  '/var/local/eggs/docutils-0.4-py2.5.egg',
+  '/var/local/eggs/z3c.recipe.i18n-0.6.0-py2.5.egg',
+  ]
+
+import os
+sys.argv[0] = os.path.abspath(sys.argv[0])
+os.chdir('/var/local/eggs/z3c.recipe.i18n-0.6.0-py2.5.egg')
+
+
+import z3c.recipe.i18n.i18nextract
+
+if __name__ == '__main__':
+    z3c.recipe.i18n.i18nextract.main(['i18nextract', '-d', 'ztfy.utils', '-s', '/var/local/ztfy-2.5/ztfy.utils/parts/i18n/configure.zcml', '-o', '/var/local/ztfy-2.5/ztfy.utils/ztfy/utils/locales', '-p', 'ztfy.utils'])
diff -r ec82f750a462 -r 035058514c2d bin/i18nextract.py
--- a/bin/i18nextract.py	Wed Dec 02 23:12:23 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,156 +0,0 @@
-#!/var/local/ztfy/bin/python2.4
-
-import os
-import sys
-sys.path[0:0] = [
-  '/var/local/ztfy/ztfy.app/src',
-  '/var/local/ztfy/ztfy.utils',
-  '/var/local/ztfy/ztfy.monitor',
-  '/var/local/ztfy/ztfy.jqueryui',
-  '/var/local/ztfy/ztfy.skin',
-  '/var/local/ztfy/ztfy.i18n',
-  '/var/local/ztfy/ztfy.workflow',
-  '/var/local/ztfy/ztfy.file',
-  '/var/local/ztfy/ztfy.extfile',
-  '/var/local/ztfy/ztfy.gallery',
-  '/var/local/ztfy/eggs/zope.app.apidoc-3.4.3-py2.4.egg',
-  '/var/local/ztfy/eggs/zope.app.securitypolicy-3.4.6-py2.4.egg',
-  '/var/local/ztfy/eggs/z3c.evalexception-2.0-py2.4.egg',
-  '/var/local/ztfy/eggs/Paste-1.7.2-py2.4.egg',
-  '/var/local/ztfy/eggs/setuptools-0.6c9-py2.4.egg',
-  '/var/local/ztfy/eggs/PasteScript-1.7.3-py2.4.egg',
-  '/var/local/ztfy/eggs/PasteDeploy-1.3.3-py2.4.egg',
-  '/var/local/ztfy/eggs/zope.security-3.4.1-py2.4-linux-i686.egg',
-  '/var/local/ztfy/eggs/zope.securitypolicy-3.4.1-py2.4.egg',
-  '/var/local/ztfy/eggs/zope.schema-3.4.0-py2.4.egg',
-  '/var/local/ztfy/eggs/zope.location-3.4.0-py2.4.egg',
-  '/var/local/ztfy/eggs/zope.interface-3.4.1-py2.4-linux-i686.egg',
-  '/var/local/ztfy/eggs/zope.i18nmessageid-3.4.3-py2.4-linux-i686.egg',
-  '/var/local/ztfy/eggs/zope.i18n-3.4.0-py2.4.egg',
-  '/var/local/ztfy/eggs/zope.exceptions-3.4.0-py2.4.egg',
-  '/var/local/ztfy/eggs/zope.configuration-3.4.0-py2.4.egg',
-  '/var/local/ztfy/eggs/zope.component-3.4.0-py2.4.egg',
-  '/var/local/ztfy/eggs/zope.app.security-3.5.2-py2.4.egg',
-  '/var/local/ztfy/eggs/zope.app.form-3.4.1-py2.4.egg',
-  '/var/local/ztfy/eggs/zope.annotation-3.4.1-py2.4.egg',
-  '/var/local/ztfy/eggs/zope.traversing-3.4.1-py2.4.egg',
-  '/var/local/ztfy/eggs/zope.testing-3.5.6-py2.4.egg',
-  '/var/local/ztfy/eggs/zope.testbrowser-3.4.2-py2.4.egg',
-  '/var/local/ztfy/eggs/zope.publisher-3.4.6-py2.4.egg',
-  '/var/local/ztfy/eggs/zope.proxy-3.4.2-py2.4-linux-i686.egg',
-  '/var/local/ztfy/eggs/zope.deprecation-3.4.0-py2.4.egg',
-  '/var/local/ztfy/eggs/zope.cachedescriptors-3.4.1-py2.4.egg',
-  '/var/local/ztfy/eggs/zope.app.tree-3.4.0-py2.4.egg',
-  '/var/local/ztfy/eggs/zope.app.testing-3.4.3-py2.4.egg',
-  '/var/local/ztfy/eggs/zope.app.skins-3.4.0-py2.4.egg',
-  '/var/local/ztfy/eggs/zope.app.renderer-3.4.0-py2.4.egg',
-  '/var/local/ztfy/eggs/zope.app.publisher-3.4.1-py2.4.egg',
-  '/var/local/ztfy/eggs/zope.app.preference-3.4.1-py2.4.egg',
-  '/var/local/ztfy/eggs/zope.app.onlinehelp-3.4.1-py2.4.egg',
-  '/var/local/ztfy/eggs/zope.app.container-3.5.6-py2.4-linux-i686.egg',
-  '/var/local/ztfy/eggs/zope.app.component-3.4.1-py2.4.egg',
-  '/var/local/ztfy/eggs/zope.app.basicskin-3.4.0-py2.4.egg',
-  '/var/local/ztfy/eggs/zope.app.appsetup-3.4.1-py2.4.egg',
-  '/var/local/ztfy/eggs/zope.app.catalog-3.5.1-py2.4.egg',
-  '/var/local/ztfy/eggs/zope.app.keyreference-3.4.1-py2.4.egg',
-  '/var/local/ztfy/eggs/zope.app.intid-3.4.1-py2.4.egg',
-  '/var/local/ztfy/eggs/zope.app.session-3.5.1-py2.4.egg',
-  '/var/local/ztfy/eggs/zope.app.authentication-3.4.4-py2.4.egg',
-  '/var/local/ztfy/eggs/zope.formlib-3.4.0-py2.4.egg',
-  '/var/local/ztfy/eggs/zope.copypastemove-3.4.0-py2.4.egg',
-  '/var/local/ztfy/eggs/zope.app.zcmlfiles-3.4.3-py2.4.egg',
-  '/var/local/ztfy/eggs/zope.app.wsgi-3.4.1-py2.4.egg',
-  '/var/local/ztfy/eggs/zdaemon-2.0.2-py2.4.egg',
-  '/var/local/ztfy/eggs/ZConfig-2.5.1-py2.4.egg',
-  '/var/local/ztfy/eggs/ZODB3-3.8.1-py2.4-linux-i686.egg',
-  '/var/local/ztfy/eggs/zope.deferredimport-3.4.0-py2.4.egg',
-  '/var/local/ztfy/eggs/pytz-2007k-py2.4.egg',
-  '/var/local/ztfy/eggs/zope.event-3.4.0-py2.4.egg',
-  '/var/local/ztfy/eggs/zope.hookable-3.4.0-py2.4-linux-i686.egg',
-  '/var/local/ztfy/eggs/zope.app.pagetemplate-3.4.1-py2.4.egg',
-  '/var/local/ztfy/eggs/zope.app.applicationcontrol-3.4.3-py2.4.egg',
-  '/var/local/ztfy/eggs/ClientForm-0.2.9-py2.4.egg',
-  '/var/local/ztfy/eggs/mechanize-0.1.7b-py2.4.egg',
-  '/var/local/ztfy/eggs/zope.app.zapi-3.4.0-py2.4.egg',
-  '/var/local/ztfy/eggs/zope.app.rotterdam-3.4.1-py2.4.egg',
-  '/var/local/ztfy/eggs/zope.app.folder-3.4.0-py2.4.egg',
-  '/var/local/ztfy/eggs/zope.app.publication-3.4.3-py2.4.egg',
-  '/var/local/ztfy/eggs/zope.app.dependable-3.4.0-py2.4.egg',
-  '/var/local/ztfy/eggs/zope.app.debug-3.4.1-py2.4.egg',
-  '/var/local/ztfy/eggs/zope.structuredtext-3.4.0-py2.4.egg',
-  '/var/local/ztfy/eggs/docutils-0.4-py2.4.egg',
-  '/var/local/ztfy/eggs/zope.pagetemplate-3.4.0-py2.4.egg',
-  '/var/local/ztfy/eggs/zope.datetime-3.4.0-py2.4.egg',
-  '/var/local/ztfy/eggs/zope.contenttype-3.4.0-py2.4.egg',
-  '/var/local/ztfy/eggs/zope.app.file-3.4.4-py2.4.egg',
-  '/var/local/ztfy/eggs/zope.app.broken-3.4.0-py2.4.egg',
-  '/var/local/ztfy/eggs/zope.dublincore-3.4.0-py2.4.egg',
-  '/var/local/ztfy/eggs/zope.size-3.4.0-py2.4.egg',
-  '/var/local/ztfy/eggs/zope.filerepresentation-3.4.0-py2.4.egg',
-  '/var/local/ztfy/eggs/zope.lifecycleevent-3.4.0-py2.4.egg',
-  '/var/local/ztfy/eggs/zope.dottedname-3.4.2-py2.4.egg',
-  '/var/local/ztfy/eggs/zope.thread-3.4-py2.4.egg',
-  '/var/local/ztfy/eggs/zope.app.interface-3.4.0-py2.4.egg',
-  '/var/local/ztfy/eggs/zope.error-3.5.1-py2.4.egg',
-  '/var/local/ztfy/eggs/zope.index-3.4.1-py2.4.egg',
-  '/var/local/ztfy/eggs/zope.session-3.4.1-py2.4.egg',
-  '/var/local/ztfy/eggs/zope.minmax-1.1.0-py2.4.egg',
-  '/var/local/ztfy/eggs/zope.app.http-3.4.1-py2.4.egg',
-  '/var/local/ztfy/eggs/zope.app.principalannotation-3.4.0-py2.4.egg',
-  '/var/local/ztfy/eggs/zope.app.schema-3.4.0-py2.4.egg',
-  '/var/local/ztfy/eggs/zope.app.zopeappgenerations-3.4.0-py2.4.egg',
-  '/var/local/ztfy/eggs/zope.app.locales-3.4.5-py2.4.egg',
-  '/var/local/ztfy/eggs/zope.app.i18n-3.4.4-py2.4.egg',
-  '/var/local/ztfy/eggs/zope.app.generations-3.4.1-py2.4.egg',
-  '/var/local/ztfy/eggs/zope.app.content-3.4.0-py2.4.egg',
-  '/var/local/ztfy/eggs/zope.modulealias-3.4.0-py2.4.egg',
-  '/var/local/ztfy/eggs/zope.tales-3.4.0-py2.4.egg',
-  '/var/local/ztfy/eggs/zope.app.exception-3.4.1-py2.4.egg',
-  '/var/local/ztfy/eggs/zope.app.error-3.5.1-py2.4.egg',
-  '/var/local/ztfy/eggs/zope.tal-3.4.1-py2.4.egg',
-  '/var/local/ztfy/eggs/zodbcode-3.4.0-py2.4.egg',
-  '/var/local/ztfy/eggs/RestrictedPython-3.4.2-py2.4.egg',
-  '/var/local/ztfy/eggs/zope.paste-0.3-py2.4.egg',
-  '/var/local/ztfy/eggs/zope.viewlet-3.4.2-py2.4.egg',
-  '/var/local/ztfy/eggs/zope.contentprovider-3.4.0-py2.4.egg',
-  '/var/local/ztfy/eggs/lxml-1.3.6-py2.4-linux-i686.egg',
-  '/var/local/ztfy/eggs/threadframe-0.2-py2.4-linux-i686.egg',
-  '/var/local/ztfy/eggs/zc.monitor-0.1.2-py2.4.egg',
-  '/var/local/ztfy/eggs/zc.ngi-1.0.1-py2.4.egg',
-  '/var/local/ztfy/eggs/zc.z3monitor-0.7.0-py2.4.egg',
-  '/var/local/ztfy/eggs/zc.resourcelibrary-1.0.0-py2.4.egg',
-  '/var/local/ztfy/eggs/z3c.language.negotiator-1.0.1-py2.4.egg',
-  '/var/local/ztfy/eggs/z3c.language.session-1.0.1-py2.4.egg',
-  '/var/local/ztfy/eggs/z3c.language.switch-1.0.1-py2.4.egg',
-  '/var/local/ztfy/eggs/z3c.layer-0.2.3-py2.4.egg',
-  '/var/local/ztfy/eggs/z3c.widget-0.1.7-py2.4.egg',
-  '/var/local/ztfy/eggs/z3c.form-1.8.0-py2.4.egg',
-  '/var/local/ztfy/eggs/z3c.formui-1.4.1-py2.4.egg',
-  '/var/local/ztfy/eggs/z3c.formjs-0.3.0-py2.4.egg',
-  '/var/local/ztfy/eggs/z3c.macro-1.1.0-py2.4.egg',
-  '/var/local/ztfy/eggs/z3c.template-1.1-py2.4.egg',
-  '/var/local/ztfy/eggs/z3c.menu-0.2.0-py2.4.egg',
-  '/var/local/ztfy/eggs/z3c.json-0.5.1-py2.4.egg',
-  '/var/local/ztfy/eggs/z3c.jsonrpc-0.5.1-py2.4.egg',
-  '/var/local/ztfy/eggs/z3c.viewlet-1.0.0-py2.4.egg',
-  '/var/local/ztfy/eggs/z3c.i18n-0.1.1-py2.4.egg',
-  '/var/local/ztfy/eggs/z3c.traverser-0.2.1-py2.4.egg',
-  '/var/local/ztfy/eggs/z3c.schema-0.1_r73916-py2.4.egg',
-  '/var/local/ztfy/eggs/z3c.javascript-0.2_r80712-py2.4.egg',
-  '/var/local/ztfy/eggs/z3c.pagelet-1.0.2-py2.4.egg',
-  '/var/local/ztfy/eggs/z3c.resourceinclude-0.2.2-py2.4.egg',
-  '/var/local/ztfy/eggs/z3c.pt-0.6.1-py2.4.egg',
-  '/var/local/ztfy/eggs/jquery.layer-1.0.0-py2.4.egg',
-  ]
-
-from zope.app.locales import extract
-
-basedir = os.path.realpath(os.path.join(os.path.dirname(__file__),
-                                        '../ztfy/utils'))
-sitedir = os.path.realpath(os.path.join(os.path.dirname(__file__),
-                                        '../../ztfy.app/site.zcml'))
-
-extract.main(argv = [ '-p', basedir,
-                      '-s', sitedir,
-                      '-d', 'ztfy.utils',
-                      '-o', os.path.join(basedir,'locales') ])
diff -r ec82f750a462 -r 035058514c2d bin/i18nmergeall
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/bin/i18nmergeall	Tue Dec 22 22:59:37 2009 +0100
@@ -0,0 +1,93 @@
+#!/var/local/ztfy-2.5/bin/python2.5
+
+import sys
+sys.path[0:0] = [
+  '/var/local/ztfy-2.5/ztfy.utils',
+  '/var/local/eggs/zc.set-0.1dev_r75642-py2.5.egg',
+  '/var/local/eggs/zope.app.zapi-3.4.0-py2.5.egg',
+  '/var/local/eggs/z3c.recipe.i18n-0.6.0-py2.5.egg',
+  '/var/local/eggs/zope.app.locales-3.5.1-py2.5.egg',
+  '/var/local/eggs/zope.app.appsetup-3.4.1-py2.5.egg',
+  '/var/local/eggs/zope.app.applicationcontrol-3.4.3-py2.5.egg',
+  '/var/local/eggs/zope.tal-3.4.1-py2.5.egg',
+  '/var/local/eggs/zope.interface-3.4.1-py2.5-linux-i686.egg',
+  '/var/local/eggs/zope.i18nmessageid-3.4.3-py2.5-linux-i686.egg',
+  '/var/local/eggs/setuptools-0.6c9-py2.5.egg',
+  '/var/local/eggs/zope.configuration-3.4.0-py2.5.egg',
+  '/var/local/eggs/zc.recipe.egg-1.2.2-py2.5.egg',
+  '/var/local/eggs/zc.buildout-1.4.3-py2.5.egg',
+  '/var/local/eggs/zope.app.interface-3.4.0-py2.5.egg',
+  '/var/local/eggs/zope.app.publisher-3.4.1-py2.5.egg',
+  '/var/local/eggs/zope.traversing-3.4.1-py2.5.egg',
+  '/var/local/eggs/zope.component-3.4.0-py2.5.egg',
+  '/var/local/eggs/zope.app.folder-3.4.0-py2.5.egg',
+  '/var/local/eggs/ZODB3-3.8.5-py2.5-linux-i686.egg',
+  '/var/local/eggs/zope.security-3.4.1-py2.5-linux-i686.egg',
+  '/var/local/eggs/zope.event-3.4.0-py2.5.egg',
+  '/var/local/eggs/zope.error-3.5.1-py2.5.egg',
+  '/var/local/eggs/zope.app.publication-3.4.3-py2.5.egg',
+  '/var/local/eggs/zope.app.container-3.5.6-py2.5-linux-i686.egg',
+  '/var/local/eggs/zope.app.component-3.4.1-py2.5.egg',
+  '/var/local/eggs/zope.size-3.4.0-py2.5.egg',
+  '/var/local/eggs/zope.i18n-3.4.0-py2.5.egg',
+  '/var/local/eggs/zope.schema-3.4.0-py2.5.egg',
+  '/var/local/eggs/zope.deprecation-3.4.0-py2.5.egg',
+  '/var/local/eggs/zodbcode-3.4.0-py2.5.egg',
+  '/var/local/eggs/zope.publisher-3.4.6-py2.5.egg',
+  '/var/local/eggs/zope.pagetemplate-3.4.0-py2.5.egg',
+  '/var/local/eggs/zope.location-3.4.0-py2.5.egg',
+  '/var/local/eggs/zope.deferredimport-3.4.0-py2.5.egg',
+  '/var/local/eggs/zope.datetime-3.4.0-py2.5.egg',
+  '/var/local/eggs/zope.contenttype-3.4.0-py2.5.egg',
+  '/var/local/eggs/zope.app.pagetemplate-3.4.1-py2.5.egg',
+  '/var/local/eggs/zope.proxy-3.4.2-py2.5-linux-i686.egg',
+  '/var/local/eggs/zope.app.security-3.5.2-py2.5.egg',
+  '/var/local/eggs/zope.app.authentication-3.4.4-py2.5.egg',
+  '/var/local/eggs/zope.dublincore-3.4.0-py2.5.egg',
+  '/var/local/eggs/zdaemon-2.0.2-py2.5.egg',
+  '/var/local/eggs/ZConfig-2.5.1-py2.5.egg',
+  '/var/local/eggs/zope.testing-3.5.6-py2.5.egg',
+  '/var/local/eggs/zope.exceptions-3.4.0-py2.5.egg',
+  '/var/local/eggs/pytz-2007k-py2.5.egg',
+  '/var/local/eggs/zope.app.exception-3.4.1-py2.5.egg',
+  '/var/local/eggs/zope.app.error-3.5.1-py2.5.egg',
+  '/var/local/eggs/zope.app.http-3.4.1-py2.5.egg',
+  '/var/local/eggs/zope.copypastemove-3.4.0-py2.5.egg',
+  '/var/local/eggs/zope.app.broken-3.4.0-py2.5.egg',
+  '/var/local/eggs/zope.filerepresentation-3.4.0-py2.5.egg',
+  '/var/local/eggs/zope.lifecycleevent-3.4.0-py2.5.egg',
+  '/var/local/eggs/zope.dottedname-3.4.2-py2.5.egg',
+  '/var/local/eggs/zope.cachedescriptors-3.4.1-py2.5.egg',
+  '/var/local/eggs/zope.thread-3.4-py2.5.egg',
+  '/var/local/eggs/zope.formlib-3.4.0-py2.5.egg',
+  '/var/local/eggs/zope.annotation-3.4.1-py2.5.egg',
+  '/var/local/eggs/zope.app.testing-3.4.3-py2.5.egg',
+  '/var/local/eggs/zope.tales-3.4.0-py2.5.egg',
+  '/var/local/eggs/zope.app.form-3.4.1-py2.5.egg',
+  '/var/local/eggs/zope.session-3.4.1-py2.5.egg',
+  '/var/local/eggs/zope.app.principalannotation-3.4.0-py2.5.egg',
+  '/var/local/eggs/zope.app.zcmlfiles-3.4.3-py2.5.egg',
+  '/var/local/eggs/zope.hookable-3.4.0-py2.5-linux-i686.egg',
+  '/var/local/eggs/zope.app.dependable-3.4.0-py2.5.egg',
+  '/var/local/eggs/zope.app.debug-3.4.1-py2.5.egg',
+  '/var/local/eggs/RestrictedPython-3.4.2-py2.5.egg',
+  '/var/local/eggs/zope.app.basicskin-3.4.0-py2.5.egg',
+  '/var/local/eggs/zope.minmax-1.1.0-py2.5.egg',
+  '/var/local/eggs/zope.app.schema-3.4.0-py2.5.egg',
+  '/var/local/eggs/zope.app.wsgi-3.4.1-py2.5.egg',
+  '/var/local/eggs/zope.app.rotterdam-3.4.1-py2.5.egg',
+  '/var/local/eggs/zope.app.zopeappgenerations-3.4.0-py2.5.egg',
+  '/var/local/eggs/zope.app.i18n-3.4.4-py2.5.egg',
+  '/var/local/eggs/zope.app.generations-3.4.1-py2.5.egg',
+  '/var/local/eggs/zope.app.content-3.4.0-py2.5.egg',
+  '/var/local/eggs/zope.modulealias-3.4.0-py2.5.egg',
+  '/var/local/eggs/zope.app.renderer-3.4.0-py2.5.egg',
+  '/var/local/eggs/zope.structuredtext-3.4.0-py2.5.egg',
+  '/var/local/eggs/docutils-0.4-py2.5.egg',
+  '/var/local/eggs/z3c.recipe.i18n-0.6.0-py2.5.egg',
+  ]
+
+import z3c.recipe.i18n.i18nmergeall
+
+if __name__ == '__main__':
+    z3c.recipe.i18n.i18nmergeall.main(['i18nmergeall', '-l', '/var/local/ztfy-2.5/ztfy.utils/ztfy/utils/locales'])
diff -r ec82f750a462 -r 035058514c2d bin/i18nstats
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/bin/i18nstats	Tue Dec 22 22:59:37 2009 +0100
@@ -0,0 +1,93 @@
+#!/var/local/ztfy-2.5/bin/python2.5
+
+import sys
+sys.path[0:0] = [
+  '/var/local/ztfy-2.5/ztfy.utils',
+  '/var/local/eggs/zc.set-0.1dev_r75642-py2.5.egg',
+  '/var/local/eggs/zope.app.zapi-3.4.0-py2.5.egg',
+  '/var/local/eggs/z3c.recipe.i18n-0.6.0-py2.5.egg',
+  '/var/local/eggs/zope.app.locales-3.5.1-py2.5.egg',
+  '/var/local/eggs/zope.app.appsetup-3.4.1-py2.5.egg',
+  '/var/local/eggs/zope.app.applicationcontrol-3.4.3-py2.5.egg',
+  '/var/local/eggs/zope.tal-3.4.1-py2.5.egg',
+  '/var/local/eggs/zope.interface-3.4.1-py2.5-linux-i686.egg',
+  '/var/local/eggs/zope.i18nmessageid-3.4.3-py2.5-linux-i686.egg',
+  '/var/local/eggs/setuptools-0.6c9-py2.5.egg',
+  '/var/local/eggs/zope.configuration-3.4.0-py2.5.egg',
+  '/var/local/eggs/zc.recipe.egg-1.2.2-py2.5.egg',
+  '/var/local/eggs/zc.buildout-1.4.3-py2.5.egg',
+  '/var/local/eggs/zope.app.interface-3.4.0-py2.5.egg',
+  '/var/local/eggs/zope.app.publisher-3.4.1-py2.5.egg',
+  '/var/local/eggs/zope.traversing-3.4.1-py2.5.egg',
+  '/var/local/eggs/zope.component-3.4.0-py2.5.egg',
+  '/var/local/eggs/zope.app.folder-3.4.0-py2.5.egg',
+  '/var/local/eggs/ZODB3-3.8.5-py2.5-linux-i686.egg',
+  '/var/local/eggs/zope.security-3.4.1-py2.5-linux-i686.egg',
+  '/var/local/eggs/zope.event-3.4.0-py2.5.egg',
+  '/var/local/eggs/zope.error-3.5.1-py2.5.egg',
+  '/var/local/eggs/zope.app.publication-3.4.3-py2.5.egg',
+  '/var/local/eggs/zope.app.container-3.5.6-py2.5-linux-i686.egg',
+  '/var/local/eggs/zope.app.component-3.4.1-py2.5.egg',
+  '/var/local/eggs/zope.size-3.4.0-py2.5.egg',
+  '/var/local/eggs/zope.i18n-3.4.0-py2.5.egg',
+  '/var/local/eggs/zope.schema-3.4.0-py2.5.egg',
+  '/var/local/eggs/zope.deprecation-3.4.0-py2.5.egg',
+  '/var/local/eggs/zodbcode-3.4.0-py2.5.egg',
+  '/var/local/eggs/zope.publisher-3.4.6-py2.5.egg',
+  '/var/local/eggs/zope.pagetemplate-3.4.0-py2.5.egg',
+  '/var/local/eggs/zope.location-3.4.0-py2.5.egg',
+  '/var/local/eggs/zope.deferredimport-3.4.0-py2.5.egg',
+  '/var/local/eggs/zope.datetime-3.4.0-py2.5.egg',
+  '/var/local/eggs/zope.contenttype-3.4.0-py2.5.egg',
+  '/var/local/eggs/zope.app.pagetemplate-3.4.1-py2.5.egg',
+  '/var/local/eggs/zope.proxy-3.4.2-py2.5-linux-i686.egg',
+  '/var/local/eggs/zope.app.security-3.5.2-py2.5.egg',
+  '/var/local/eggs/zope.app.authentication-3.4.4-py2.5.egg',
+  '/var/local/eggs/zope.dublincore-3.4.0-py2.5.egg',
+  '/var/local/eggs/zdaemon-2.0.2-py2.5.egg',
+  '/var/local/eggs/ZConfig-2.5.1-py2.5.egg',
+  '/var/local/eggs/zope.testing-3.5.6-py2.5.egg',
+  '/var/local/eggs/zope.exceptions-3.4.0-py2.5.egg',
+  '/var/local/eggs/pytz-2007k-py2.5.egg',
+  '/var/local/eggs/zope.app.exception-3.4.1-py2.5.egg',
+  '/var/local/eggs/zope.app.error-3.5.1-py2.5.egg',
+  '/var/local/eggs/zope.app.http-3.4.1-py2.5.egg',
+  '/var/local/eggs/zope.copypastemove-3.4.0-py2.5.egg',
+  '/var/local/eggs/zope.app.broken-3.4.0-py2.5.egg',
+  '/var/local/eggs/zope.filerepresentation-3.4.0-py2.5.egg',
+  '/var/local/eggs/zope.lifecycleevent-3.4.0-py2.5.egg',
+  '/var/local/eggs/zope.dottedname-3.4.2-py2.5.egg',
+  '/var/local/eggs/zope.cachedescriptors-3.4.1-py2.5.egg',
+  '/var/local/eggs/zope.thread-3.4-py2.5.egg',
+  '/var/local/eggs/zope.formlib-3.4.0-py2.5.egg',
+  '/var/local/eggs/zope.annotation-3.4.1-py2.5.egg',
+  '/var/local/eggs/zope.app.testing-3.4.3-py2.5.egg',
+  '/var/local/eggs/zope.tales-3.4.0-py2.5.egg',
+  '/var/local/eggs/zope.app.form-3.4.1-py2.5.egg',
+  '/var/local/eggs/zope.session-3.4.1-py2.5.egg',
+  '/var/local/eggs/zope.app.principalannotation-3.4.0-py2.5.egg',
+  '/var/local/eggs/zope.app.zcmlfiles-3.4.3-py2.5.egg',
+  '/var/local/eggs/zope.hookable-3.4.0-py2.5-linux-i686.egg',
+  '/var/local/eggs/zope.app.dependable-3.4.0-py2.5.egg',
+  '/var/local/eggs/zope.app.debug-3.4.1-py2.5.egg',
+  '/var/local/eggs/RestrictedPython-3.4.2-py2.5.egg',
+  '/var/local/eggs/zope.app.basicskin-3.4.0-py2.5.egg',
+  '/var/local/eggs/zope.minmax-1.1.0-py2.5.egg',
+  '/var/local/eggs/zope.app.schema-3.4.0-py2.5.egg',
+  '/var/local/eggs/zope.app.wsgi-3.4.1-py2.5.egg',
+  '/var/local/eggs/zope.app.rotterdam-3.4.1-py2.5.egg',
+  '/var/local/eggs/zope.app.zopeappgenerations-3.4.0-py2.5.egg',
+  '/var/local/eggs/zope.app.i18n-3.4.4-py2.5.egg',
+  '/var/local/eggs/zope.app.generations-3.4.1-py2.5.egg',
+  '/var/local/eggs/zope.app.content-3.4.0-py2.5.egg',
+  '/var/local/eggs/zope.modulealias-3.4.0-py2.5.egg',
+  '/var/local/eggs/zope.app.renderer-3.4.0-py2.5.egg',
+  '/var/local/eggs/zope.structuredtext-3.4.0-py2.5.egg',
+  '/var/local/eggs/docutils-0.4-py2.5.egg',
+  '/var/local/eggs/z3c.recipe.i18n-0.6.0-py2.5.egg',
+  ]
+
+import z3c.recipe.i18n.i18nstats
+
+if __name__ == '__main__':
+    z3c.recipe.i18n.i18nstats.main(['i18nstats', '-l', '/var/local/ztfy-2.5/ztfy.utils/ztfy/utils/locales'])
diff -r ec82f750a462 -r 035058514c2d bin/locales
--- a/bin/locales	Wed Dec 02 23:12:23 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-#!/bin/bash
-
-BASDIR=`dirname $0`
-LOCDIR=${BASDIR}/../ztfy/utils/locales
-
-${BASDIR}/i18nextract.py
-
-if [ -f "${LOCDIR}/fr/LC_MESSAGES/ztfy.utils.po" ]; then
-	msgmerge ${LOCDIR}/fr/LC_MESSAGES/ztfy.utils.po ${LOCDIR}/ztfy.utils.pot -o ${LOCDIR}/fr/LC_MESSAGES/ztfy.utils.po
-else
-	msginit -i ${LOCDIR}/ztfy.utils.pot -o ${LOCDIR}/fr/LC_MESSAGES/ztfy.utils.po -l fr
-fi
diff -r ec82f750a462 -r 035058514c2d bin/test
--- a/bin/test	Wed Dec 02 23:12:23 2009 +0100
+++ b/bin/test	Tue Dec 22 22:59:37 2009 +0100
@@ -1,95 +1,96 @@
-#!/var/local/ztfy/bin/python2.4
+#!/var/local/ztfy-2.5/bin/python2.5
 
 import sys
 sys.path[0:0] = [
-  '/var/local/ztfy/ztfy.utils',
-  '/var/local/ztfy/eggs/zope.testing-3.5.6-py2.4.egg',
-  '/var/local/ztfy/eggs/setuptools-0.6c9-py2.4.egg',
-  '/var/local/ztfy/eggs/zope.app.zapi-3.4.0-py2.4.egg',
-  '/var/local/ztfy/eggs/zope.app.interface-3.4.0-py2.4.egg',
-  '/var/local/ztfy/eggs/zope.app.publisher-3.4.1-py2.4.egg',
-  '/var/local/ztfy/eggs/zope.traversing-3.4.1-py2.4.egg',
-  '/var/local/ztfy/eggs/zope.component-3.4.0-py2.4.egg',
-  '/var/local/ztfy/eggs/zope.interface-3.4.1-py2.4-linux-i686.egg',
-  '/var/local/ztfy/eggs/zope.security-3.4.1-py2.4-linux-i686.egg',
-  '/var/local/ztfy/eggs/zodbcode-3.4.0-py2.4.egg',
-  '/var/local/ztfy/eggs/ZODB3-3.8.1-py2.4-linux-i686.egg',
-  '/var/local/ztfy/eggs/zope.schema-3.4.0-py2.4.egg',
-  '/var/local/ztfy/eggs/zope.publisher-3.4.6-py2.4.egg',
-  '/var/local/ztfy/eggs/zope.pagetemplate-3.4.0-py2.4.egg',
-  '/var/local/ztfy/eggs/zope.location-3.4.0-py2.4.egg',
-  '/var/local/ztfy/eggs/zope.i18n-3.4.0-py2.4.egg',
-  '/var/local/ztfy/eggs/zope.deprecation-3.4.0-py2.4.egg',
-  '/var/local/ztfy/eggs/zope.deferredimport-3.4.0-py2.4.egg',
-  '/var/local/ztfy/eggs/zope.datetime-3.4.0-py2.4.egg',
-  '/var/local/ztfy/eggs/zope.contenttype-3.4.0-py2.4.egg',
-  '/var/local/ztfy/eggs/zope.configuration-3.4.0-py2.4.egg',
-  '/var/local/ztfy/eggs/zope.app.publication-3.4.3-py2.4.egg',
-  '/var/local/ztfy/eggs/zope.app.pagetemplate-3.4.1-py2.4.egg',
-  '/var/local/ztfy/eggs/zope.app.container-3.5.6-py2.4-linux-i686.egg',
-  '/var/local/ztfy/eggs/zope.app.component-3.4.1-py2.4.egg',
-  '/var/local/ztfy/eggs/zope.proxy-3.4.2-py2.4-linux-i686.egg',
-  '/var/local/ztfy/eggs/zope.i18nmessageid-3.4.3-py2.4-linux-i686.egg',
-  '/var/local/ztfy/eggs/zope.app.applicationcontrol-3.4.3-py2.4.egg',
-  '/var/local/ztfy/eggs/zope.event-3.4.0-py2.4.egg',
-  '/var/local/ztfy/eggs/zope.exceptions-3.4.0-py2.4.egg',
-  '/var/local/ztfy/eggs/pytz-2007k-py2.4.egg',
-  '/var/local/ztfy/eggs/zdaemon-2.0.2-py2.4.egg',
-  '/var/local/ztfy/eggs/ZConfig-2.5.1-py2.4.egg',
-  '/var/local/ztfy/eggs/zope.app.testing-3.4.3-py2.4.egg',
-  '/var/local/ztfy/eggs/zope.tal-3.4.1-py2.4.egg',
-  '/var/local/ztfy/eggs/zope.tales-3.4.0-py2.4.egg',
-  '/var/local/ztfy/eggs/zope.app.security-3.5.2-py2.4.egg',
-  '/var/local/ztfy/eggs/zope.app.exception-3.4.1-py2.4.egg',
-  '/var/local/ztfy/eggs/zope.app.error-3.5.1-py2.4.egg',
-  '/var/local/ztfy/eggs/zope.app.http-3.4.1-py2.4.egg',
-  '/var/local/ztfy/eggs/zope.error-3.5.1-py2.4.egg',
-  '/var/local/ztfy/eggs/zope.size-3.4.0-py2.4.egg',
-  '/var/local/ztfy/eggs/zope.dublincore-3.4.0-py2.4.egg',
-  '/var/local/ztfy/eggs/zope.copypastemove-3.4.0-py2.4.egg',
-  '/var/local/ztfy/eggs/zope.app.broken-3.4.0-py2.4.egg',
-  '/var/local/ztfy/eggs/zope.filerepresentation-3.4.0-py2.4.egg',
-  '/var/local/ztfy/eggs/zope.lifecycleevent-3.4.0-py2.4.egg',
-  '/var/local/ztfy/eggs/zope.dottedname-3.4.2-py2.4.egg',
-  '/var/local/ztfy/eggs/zope.cachedescriptors-3.4.1-py2.4.egg',
-  '/var/local/ztfy/eggs/zope.thread-3.4-py2.4.egg',
-  '/var/local/ztfy/eggs/zope.formlib-3.4.0-py2.4.egg',
-  '/var/local/ztfy/eggs/zope.annotation-3.4.1-py2.4.egg',
-  '/var/local/ztfy/eggs/zope.app.folder-3.4.0-py2.4.egg',
-  '/var/local/ztfy/eggs/zope.app.dependable-3.4.0-py2.4.egg',
-  '/var/local/ztfy/eggs/zope.app.debug-3.4.1-py2.4.egg',
-  '/var/local/ztfy/eggs/zope.app.authentication-3.4.4-py2.4.egg',
-  '/var/local/ztfy/eggs/zope.app.form-3.4.1-py2.4.egg',
-  '/var/local/ztfy/eggs/zope.app.appsetup-3.4.1-py2.4.egg',
-  '/var/local/ztfy/eggs/RestrictedPython-3.4.2-py2.4.egg',
-  '/var/local/ztfy/eggs/zope.hookable-3.4.0-py2.4-linux-i686.egg',
-  '/var/local/ztfy/eggs/zope.app.principalannotation-3.4.0-py2.4.egg',
-  '/var/local/ztfy/eggs/zope.app.zcmlfiles-3.4.3-py2.4.egg',
-  '/var/local/ztfy/eggs/zope.session-3.4.1-py2.4.egg',
-  '/var/local/ztfy/eggs/zope.app.basicskin-3.4.0-py2.4.egg',
-  '/var/local/ztfy/eggs/zope.app.schema-3.4.0-py2.4.egg',
-  '/var/local/ztfy/eggs/zope.app.wsgi-3.4.1-py2.4.egg',
-  '/var/local/ztfy/eggs/zope.app.rotterdam-3.4.1-py2.4.egg',
-  '/var/local/ztfy/eggs/zope.app.zopeappgenerations-3.4.0-py2.4.egg',
-  '/var/local/ztfy/eggs/zope.app.locales-3.4.5-py2.4.egg',
-  '/var/local/ztfy/eggs/zope.app.i18n-3.4.4-py2.4.egg',
-  '/var/local/ztfy/eggs/zope.app.generations-3.4.1-py2.4.egg',
-  '/var/local/ztfy/eggs/zope.app.content-3.4.0-py2.4.egg',
-  '/var/local/ztfy/eggs/zope.modulealias-3.4.0-py2.4.egg',
-  '/var/local/ztfy/eggs/zope.minmax-1.1.0-py2.4.egg',
-  '/var/local/ztfy/eggs/zope.app.renderer-3.4.0-py2.4.egg',
-  '/var/local/ztfy/eggs/zope.structuredtext-3.4.0-py2.4.egg',
-  '/var/local/ztfy/eggs/docutils-0.4-py2.4.egg',
+  '/var/local/ztfy-2.5/ztfy.utils',
+  '/var/local/eggs/zope.testing-3.5.6-py2.5.egg',
+  '/var/local/eggs/setuptools-0.6c9-py2.5.egg',
+  '/var/local/eggs/zc.set-0.1dev_r75642-py2.5.egg',
+  '/var/local/eggs/zope.app.zapi-3.4.0-py2.5.egg',
+  '/var/local/eggs/zope.app.folder-3.4.0-py2.5.egg',
+  '/var/local/eggs/ZODB3-3.8.5-py2.5-linux-i686.egg',
+  '/var/local/eggs/zope.app.interface-3.4.0-py2.5.egg',
+  '/var/local/eggs/zope.app.publisher-3.4.1-py2.5.egg',
+  '/var/local/eggs/zope.traversing-3.4.1-py2.5.egg',
+  '/var/local/eggs/zope.component-3.4.0-py2.5.egg',
+  '/var/local/eggs/zope.interface-3.4.1-py2.5-linux-i686.egg',
+  '/var/local/eggs/zope.app.security-3.5.2-py2.5.egg',
+  '/var/local/eggs/zope.app.container-3.5.6-py2.5-linux-i686.egg',
+  '/var/local/eggs/zope.app.component-3.4.1-py2.5.egg',
+  '/var/local/eggs/zope.app.authentication-3.4.4-py2.5.egg',
+  '/var/local/eggs/zope.security-3.4.1-py2.5-linux-i686.egg',
+  '/var/local/eggs/zope.schema-3.4.0-py2.5.egg',
+  '/var/local/eggs/zope.event-3.4.0-py2.5.egg',
+  '/var/local/eggs/zope.dublincore-3.4.0-py2.5.egg',
+  '/var/local/eggs/zope.datetime-3.4.0-py2.5.egg',
+  '/var/local/eggs/zdaemon-2.0.2-py2.5.egg',
+  '/var/local/eggs/ZConfig-2.5.1-py2.5.egg',
+  '/var/local/eggs/zope.proxy-3.4.2-py2.5-linux-i686.egg',
+  '/var/local/eggs/zodbcode-3.4.0-py2.5.egg',
+  '/var/local/eggs/zope.publisher-3.4.6-py2.5.egg',
+  '/var/local/eggs/zope.pagetemplate-3.4.0-py2.5.egg',
+  '/var/local/eggs/zope.location-3.4.0-py2.5.egg',
+  '/var/local/eggs/zope.i18n-3.4.0-py2.5.egg',
+  '/var/local/eggs/zope.deprecation-3.4.0-py2.5.egg',
+  '/var/local/eggs/zope.deferredimport-3.4.0-py2.5.egg',
+  '/var/local/eggs/zope.contenttype-3.4.0-py2.5.egg',
+  '/var/local/eggs/zope.configuration-3.4.0-py2.5.egg',
+  '/var/local/eggs/zope.app.publication-3.4.3-py2.5.egg',
+  '/var/local/eggs/zope.app.pagetemplate-3.4.1-py2.5.egg',
+  '/var/local/eggs/zope.i18nmessageid-3.4.3-py2.5-linux-i686.egg',
+  '/var/local/eggs/zope.app.applicationcontrol-3.4.3-py2.5.egg',
+  '/var/local/eggs/zope.app.form-3.4.1-py2.5.egg',
+  '/var/local/eggs/zope.copypastemove-3.4.0-py2.5.egg',
+  '/var/local/eggs/zope.app.broken-3.4.0-py2.5.egg',
+  '/var/local/eggs/zope.size-3.4.0-py2.5.egg',
+  '/var/local/eggs/zope.filerepresentation-3.4.0-py2.5.egg',
+  '/var/local/eggs/zope.lifecycleevent-3.4.0-py2.5.egg',
+  '/var/local/eggs/zope.exceptions-3.4.0-py2.5.egg',
+  '/var/local/eggs/zope.dottedname-3.4.2-py2.5.egg',
+  '/var/local/eggs/zope.cachedescriptors-3.4.1-py2.5.egg',
+  '/var/local/eggs/zope.thread-3.4-py2.5.egg',
+  '/var/local/eggs/zope.formlib-3.4.0-py2.5.egg',
+  '/var/local/eggs/zope.annotation-3.4.1-py2.5.egg',
+  '/var/local/eggs/zope.session-3.4.1-py2.5.egg',
+  '/var/local/eggs/pytz-2007k-py2.5.egg',
+  '/var/local/eggs/zope.app.testing-3.4.3-py2.5.egg',
+  '/var/local/eggs/zope.tal-3.4.1-py2.5.egg',
+  '/var/local/eggs/zope.tales-3.4.0-py2.5.egg',
+  '/var/local/eggs/zope.app.exception-3.4.1-py2.5.egg',
+  '/var/local/eggs/zope.app.error-3.5.1-py2.5.egg',
+  '/var/local/eggs/zope.app.http-3.4.1-py2.5.egg',
+  '/var/local/eggs/zope.error-3.5.1-py2.5.egg',
+  '/var/local/eggs/zope.app.basicskin-3.4.0-py2.5.egg',
+  '/var/local/eggs/zope.app.principalannotation-3.4.0-py2.5.egg',
+  '/var/local/eggs/zope.app.appsetup-3.4.1-py2.5.egg',
+  '/var/local/eggs/zope.app.zcmlfiles-3.4.3-py2.5.egg',
+  '/var/local/eggs/zope.hookable-3.4.0-py2.5-linux-i686.egg',
+  '/var/local/eggs/zope.minmax-1.1.0-py2.5.egg',
+  '/var/local/eggs/zope.app.dependable-3.4.0-py2.5.egg',
+  '/var/local/eggs/zope.app.debug-3.4.1-py2.5.egg',
+  '/var/local/eggs/RestrictedPython-3.4.2-py2.5.egg',
+  '/var/local/eggs/zope.app.schema-3.4.0-py2.5.egg',
+  '/var/local/eggs/zope.app.wsgi-3.4.1-py2.5.egg',
+  '/var/local/eggs/zope.app.rotterdam-3.4.1-py2.5.egg',
+  '/var/local/eggs/zope.app.zopeappgenerations-3.4.0-py2.5.egg',
+  '/var/local/eggs/zope.app.locales-3.5.1-py2.5.egg',
+  '/var/local/eggs/zope.app.i18n-3.4.4-py2.5.egg',
+  '/var/local/eggs/zope.app.generations-3.4.1-py2.5.egg',
+  '/var/local/eggs/zope.app.content-3.4.0-py2.5.egg',
+  '/var/local/eggs/zope.modulealias-3.4.0-py2.5.egg',
+  '/var/local/eggs/zope.app.renderer-3.4.0-py2.5.egg',
+  '/var/local/eggs/zope.structuredtext-3.4.0-py2.5.egg',
+  '/var/local/eggs/docutils-0.4-py2.5.egg',
   ]
 
 import os
 sys.argv[0] = os.path.abspath(sys.argv[0])
-os.chdir('/var/local/ztfy/ztfy.utils/parts/test')
+os.chdir('/var/local/ztfy-2.5/ztfy.utils/parts/test')
 
 
 import zope.testing.testrunner
 
 if __name__ == '__main__':
     zope.testing.testrunner.run([
-  '--test-path', '/var/local/ztfy/ztfy.utils',
+  '--test-path', '/var/local/ztfy-2.5/ztfy.utils',
   ])
diff -r ec82f750a462 -r 035058514c2d buildout.cfg
--- a/buildout.cfg	Wed Dec 02 23:12:23 2009 +0100
+++ b/buildout.cfg	Tue Dec 22 22:59:37 2009 +0100
@@ -1,22 +1,22 @@
 [buildout]
 develop = .
-parts = package test
-newest = false
-eggs-directory = /var/local/ztfy/eggs
-
-# These settings pin egg versions to the Zope 3.4.0 Known Good Set
-# if you want to upgrade the KGS version, you need to change the URL
-# below. If you will comment/remove these settings, you'll get the
-# latest versions of Zope eggs that are not guaranteed to work well
-# together.
-extends = /var/local/ztfy/eggs/versions.cfg
-versions = versions
+parts = package i18n test
 
 [package]
 recipe = zc.recipe.egg
 eggs = ztfy.utils
+       zc.set
        zope.app.zapi
 
+[i18n]
+recipe = z3c.recipe.i18n:i18n
+eggs = ${package:eggs}
+       z3c.recipe.i18n
+packages = ztfy.utils
+domain = ztfy.utils
+output = ztfy/utils/locales
+zcml = <include file="configure.zcml" />
+
 [test]
 recipe = zc.recipe.testrunner
 eggs = ztfy.utils [test]
diff -r ec82f750a462 -r 035058514c2d setup.py
--- a/setup.py	Wed Dec 02 23:12:23 2009 +0100
+++ b/setup.py	Tue Dec 22 22:59:37 2009 +0100
@@ -20,17 +20,18 @@
 import os
 from setuptools import setup, find_packages
 
-version = '0.1'
+DOCS = os.path.join(os.path.dirname(__file__),
+                    'ztfy', 'utils', 'docs')
 
-README = os.path.join(os.path.dirname(__file__),
-          'ztfy',
-          'utils', 'docs', 'README.txt')
+README = os.path.join(DOCS, 'README.txt')
+HISTORY = os.path.join(DOCS, 'HISTORY.txt')
 
-long_description = open(README).read() + '\n\n'
+version = '1.0'
+long_description = open(README).read() + '\n\n' + open(HISTORY).read()
 
 tests_require = [
-        'zope.testing',
-    ]
+    'zope.testing',
+]
 
 setup(name='ztfy.utils',
       version=version,
@@ -67,4 +68,3 @@
       # -*- Entry points: -*-
       """,
       )
-
diff -r ec82f750a462 -r 035058514c2d test.txt
--- a/test.txt	Wed Dec 02 23:12:23 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-Test accentué
-Pour import dans Zope...
\ No newline at end of file
diff -r ec82f750a462 -r 035058514c2d ztfy.utils.egg-info/PKG-INFO
--- a/ztfy.utils.egg-info/PKG-INFO	Wed Dec 02 23:12:23 2009 +0100
+++ b/ztfy.utils.egg-info/PKG-INFO	Tue Dec 22 22:59:37 2009 +0100
@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: ztfy.utils
-Version: 0.1dev
+Version: 1.0dev
 Summary: ZTFY utility functions and classes for Zope3
 Home-page: UNKNOWN
 Author: Thierry Florac
@@ -32,8 +32,18 @@
         A set of ztfy.utils usage are given as doctests in ztfy/utils/doctests/README.txt
         
         
+        Changelog
+        =========
+        
+        1.0dev (unreleased)
+        -------------------
+        
+        - Initial release
         
 Keywords: ZTFY utilities for Zope3
 Platform: UNKNOWN
+Classifier: License :: OSI Approved :: Zope Public License
+Classifier: Development Status :: 4 - Beta
 Classifier: Programming Language :: Python
+Classifier: Framework :: Zope3
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
diff -r ec82f750a462 -r 035058514c2d ztfy/utils/docs/HISTORY.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/ztfy/utils/docs/HISTORY.txt	Tue Dec 22 22:59:37 2009 +0100
@@ -0,0 +1,7 @@
+Changelog
+=========
+
+1.0dev (unreleased)
+-------------------
+
+- Initial release
diff -r ec82f750a462 -r 035058514c2d ztfy/utils/locales/fr/LC_MESSAGES/ztfy.utils.mo
Binary file ztfy/utils/locales/fr/LC_MESSAGES/ztfy.utils.mo has changed
diff -r ec82f750a462 -r 035058514c2d ztfy/utils/locales/fr/LC_MESSAGES/ztfy.utils.po
--- a/ztfy/utils/locales/fr/LC_MESSAGES/ztfy.utils.po	Wed Dec 02 23:12:23 2009 +0100
+++ b/ztfy/utils/locales/fr/LC_MESSAGES/ztfy.utils.po	Tue Dec 22 22:59:37 2009 +0100
@@ -14,7 +14,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ZTFY.utils\n"
-"POT-Creation-Date: Sat Sep 12 12:51:52 2009\n"
+"POT-Creation-Date: Sun Dec 20 22:51:21 2009\n"
 "PO-Revision-Date: 2009-08-14 18:14+0200\n"
 "Last-Translator: Thierry Florac <tflorac@ulthar.net>\n"
 "Language-Team: French <traduc@traduc.org>\n"
@@ -24,6 +24,6 @@
 "Generated-By: zope/app/locales/extract.py\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: s/request.py:39
+#: ztfy/utils/request.py:39
 msgid "No Request in interaction !"
 msgstr "Pas de requête en cours !"
diff -r ec82f750a462 -r 035058514c2d ztfy/utils/locales/ztfy.utils.pot
--- a/ztfy/utils/locales/ztfy.utils.pot	Wed Dec 02 23:12:23 2009 +0100
+++ b/ztfy/utils/locales/ztfy.utils.pot	Tue Dec 22 22:59:37 2009 +0100
@@ -14,7 +14,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Development/Unknown\n"
-"POT-Creation-Date: Sat Sep 12 12:51:52 2009\n"
+"POT-Creation-Date: Sun Dec 20 22:51:21 2009\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Zope 3 Developers <zope3-dev@zope.org>\n"
@@ -23,7 +23,7 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: zope/app/locales/extract.py\n"
 
-#: s/request.py:39
+#: ztfy/utils/request.py:39
 msgid "No Request in interaction !"
 msgstr ""
 
diff -r ec82f750a462 -r 035058514c2d ztfy/utils/protocol/xmlrpc.py
--- a/ztfy/utils/protocol/xmlrpc.py	Wed Dec 02 23:12:23 2009 +0100
+++ b/ztfy/utils/protocol/xmlrpc.py	Tue Dec 22 22:59:37 2009 +0100
@@ -33,6 +33,7 @@
     """An XML-RPC transport handling authentication via cookies"""
 
     def __init__(self, user_agent, credentials=(), cookies=None):
+        xmlrpclib.Transport.__init__(self)
         self.user_agent = user_agent
         self.credentials = credentials
         self.cookies = cookies