# HG changeset patch
# User Thierry Florac <tflorac@ulthar.net>
# Date 1331510400 -3600
# Node ID e807bcb0fcac31ebbca7b0b7d07370a8591c7ef9
# Parent  71368db3b970bf3aeda0ce38460532d8c0e03658# Parent  704ea6488874d172c92cb6ad316f667c714ac271
Merge with 704ea6488874d172c92cb6ad316f667c714ac271

diff -r 71368db3b970 -r e807bcb0fcac .hgtags
--- a/.hgtags	Mon Mar 05 13:53:38 2012 +0100
+++ b/.hgtags	Mon Mar 12 01:00:00 2012 +0100
@@ -6,3 +6,4 @@
 96e344fe61666bcf26f9f0529f6efd761ab11b28 0.3.2
 165f37f89e5a3f5763cc59125d47e4cd7fc38ae6 0.3.3
 93cdc4a26e0de12c546bcb03a342f856621f2c20 0.3.6
+3bbec4dadfa710dcb7f751897a39502412d7de48 0.3.7
diff -r 71368db3b970 -r e807bcb0fcac .settings/org.eclipse.core.resources.prefs
--- a/.settings/org.eclipse.core.resources.prefs	Mon Mar 05 13:53:38 2012 +0100
+++ b/.settings/org.eclipse.core.resources.prefs	Mon Mar 12 01:00:00 2012 +0100
@@ -1,4 +1,4 @@
-#Sun Nov 20 00:28:15 CET 2011
+#Sun Mar 04 00:01:41 CET 2012
 eclipse.preferences.version=1
 encoding//build/lib/ztfy/utils/site.py=utf-8
 encoding//build/lib/ztfy/utils/tal/html.py=utf-8
@@ -7,9 +7,11 @@
 encoding//build/lib/ztfy/utils/timezone/__init__.py=utf-8
 encoding//build/lib/ztfy/utils/timezone/utility.py=utf-8
 encoding//ztfy/utils/__init__.py=utf-8
+encoding//ztfy/utils/browser/encoding.py=utf-8
 encoding//ztfy/utils/catalog/__init__.py=utf-8
 encoding//ztfy/utils/catalog/index.py=utf-8
 encoding//ztfy/utils/date.py=utf-8
+encoding//ztfy/utils/encoding.py=utf-8
 encoding//ztfy/utils/file.py=utf-8
 encoding//ztfy/utils/html.py=utf-8
 encoding//ztfy/utils/interfaces.py=utf-8
diff -r 71368db3b970 -r e807bcb0fcac bin/i18ncompile
--- a/bin/i18ncompile	Mon Mar 05 13:53:38 2012 +0100
+++ b/bin/i18ncompile	Mon Mar 12 01:00:00 2012 +0100
@@ -2,7 +2,7 @@
 
 import sys
 sys.path[0:0] = [
-    '/var/local/eggs/ztfy.utils-0.3.4-py2.6.egg',
+    '/var/local/src/ztfy-bb/ztfy.utils',
     '/var/local/eggs/z3c.recipe.i18n-0.6.0-py2.6.egg',
     '/var/local/eggs/zope.app.locales-3.6.2-py2.6.egg',
     '/var/local/eggs/zope.app.appsetup-3.15.0-py2.6.egg',
@@ -36,6 +36,7 @@
     '/var/local/eggs/pytz-2011g-py2.6.egg',
     '/var/local/eggs/hurry.query-1.1.0-py2.6.egg',
     '/var/local/eggs/fanstatic-0.11.3-py2.6.egg',
+    '/var/local/eggs/chardet-1.0.1-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.processlifetime-1.0-py2.6.egg',
diff -r 71368db3b970 -r e807bcb0fcac bin/i18nextract
--- a/bin/i18nextract	Mon Mar 05 13:53:38 2012 +0100
+++ b/bin/i18nextract	Mon Mar 12 01:00:00 2012 +0100
@@ -2,7 +2,7 @@
 
 import sys
 sys.path[0:0] = [
-    '/var/local/eggs/ztfy.utils-0.3.4-py2.6.egg',
+    '/var/local/src/ztfy-bb/ztfy.utils',
     '/var/local/eggs/z3c.recipe.i18n-0.6.0-py2.6.egg',
     '/var/local/eggs/zope.app.locales-3.6.2-py2.6.egg',
     '/var/local/eggs/zope.app.appsetup-3.15.0-py2.6.egg',
@@ -36,6 +36,7 @@
     '/var/local/eggs/pytz-2011g-py2.6.egg',
     '/var/local/eggs/hurry.query-1.1.0-py2.6.egg',
     '/var/local/eggs/fanstatic-0.11.3-py2.6.egg',
+    '/var/local/eggs/chardet-1.0.1-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.processlifetime-1.0-py2.6.egg',
diff -r 71368db3b970 -r e807bcb0fcac bin/i18nmergeall
--- a/bin/i18nmergeall	Mon Mar 05 13:53:38 2012 +0100
+++ b/bin/i18nmergeall	Mon Mar 12 01:00:00 2012 +0100
@@ -2,7 +2,7 @@
 
 import sys
 sys.path[0:0] = [
-    '/var/local/eggs/ztfy.utils-0.3.4-py2.6.egg',
+    '/var/local/src/ztfy-bb/ztfy.utils',
     '/var/local/eggs/z3c.recipe.i18n-0.6.0-py2.6.egg',
     '/var/local/eggs/zope.app.locales-3.6.2-py2.6.egg',
     '/var/local/eggs/zope.app.appsetup-3.15.0-py2.6.egg',
@@ -36,6 +36,7 @@
     '/var/local/eggs/pytz-2011g-py2.6.egg',
     '/var/local/eggs/hurry.query-1.1.0-py2.6.egg',
     '/var/local/eggs/fanstatic-0.11.3-py2.6.egg',
+    '/var/local/eggs/chardet-1.0.1-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.processlifetime-1.0-py2.6.egg',
diff -r 71368db3b970 -r e807bcb0fcac bin/i18nstats
--- a/bin/i18nstats	Mon Mar 05 13:53:38 2012 +0100
+++ b/bin/i18nstats	Mon Mar 12 01:00:00 2012 +0100
@@ -2,7 +2,7 @@
 
 import sys
 sys.path[0:0] = [
-    '/var/local/eggs/ztfy.utils-0.3.4-py2.6.egg',
+    '/var/local/src/ztfy-bb/ztfy.utils',
     '/var/local/eggs/z3c.recipe.i18n-0.6.0-py2.6.egg',
     '/var/local/eggs/zope.app.locales-3.6.2-py2.6.egg',
     '/var/local/eggs/zope.app.appsetup-3.15.0-py2.6.egg',
@@ -36,6 +36,7 @@
     '/var/local/eggs/pytz-2011g-py2.6.egg',
     '/var/local/eggs/hurry.query-1.1.0-py2.6.egg',
     '/var/local/eggs/fanstatic-0.11.3-py2.6.egg',
+    '/var/local/eggs/chardet-1.0.1-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.processlifetime-1.0-py2.6.egg',
diff -r 71368db3b970 -r e807bcb0fcac bin/test
--- a/bin/test	Mon Mar 05 13:53:38 2012 +0100
+++ b/bin/test	Mon Mar 12 01:00:00 2012 +0100
@@ -2,7 +2,7 @@
 
 import sys
 sys.path[0:0] = [
-    '/var/local/eggs/ztfy.utils-0.3.4-py2.6.egg',
+    '/var/local/src/ztfy-bb/ztfy.utils',
     '/var/local/eggs/zope.testrunner-4.0.4-py2.6.egg',
     '/var/local/eggs/zope.interface-3.7.0-py2.6-linux-x86_64.egg',
     '/var/local/eggs/zope.exceptions-3.6.1-py2.6.egg',
@@ -30,6 +30,7 @@
     '/var/local/eggs/pytz-2011g-py2.6.egg',
     '/var/local/eggs/hurry.query-1.1.0-py2.6.egg',
     '/var/local/eggs/fanstatic-0.11.3-py2.6.egg',
+    '/var/local/eggs/chardet-1.0.1-py2.6.egg',
     '/var/local/eggs/zopyx.txng3.ext-3.3.2-py2.6-linux-x86_64.egg',
     '/var/local/eggs/zope.tal-3.5.2-py2.6.egg',
     '/var/local/eggs/zope.minmax-1.1.2-py2.6.egg',
@@ -87,5 +88,5 @@
 
 if __name__ == '__main__':
     zope.testrunner.run([
-        '--test-path', '/var/local/eggs/ztfy.utils-0.3.4-py2.6.egg',
+        '--test-path', '/var/local/src/ztfy-bb/ztfy.utils',
         ])
diff -r 71368db3b970 -r e807bcb0fcac buildout.cfg
--- a/buildout.cfg	Mon Mar 05 13:53:38 2012 +0100
+++ b/buildout.cfg	Mon Mar 12 01:00:00 2012 +0100
@@ -1,6 +1,7 @@
 [buildout]
-extends = /var/local/env/bb-2.6/webapp/versions.cfg
+extends = http://download.ztfy.org/webapp/ztfy.webapp-1.1.4.cfg
 versions = versions
+allow-picked-versions = false
 develop = .
 parts = package i18n test
 
diff -r 71368db3b970 -r e807bcb0fcac setup.py
--- a/setup.py	Mon Mar 05 13:53:38 2012 +0100
+++ b/setup.py	Mon Mar 12 01:00:00 2012 +0100
@@ -25,7 +25,7 @@
 README = os.path.join(DOCS, 'README.txt')
 HISTORY = os.path.join(DOCS, 'HISTORY.txt')
 
-version = '0.3.6'
+version = '0.3.7'
 long_description = open(README).read() + '\n\n' + open(HISTORY).read()
 
 tests_require = [
@@ -60,6 +60,7 @@
       install_requires=[
           'setuptools',
           # -*- Extra requirements: -*-
+          'chardet',
           'fanstatic',
           'hurry.query',
           'pytz',
diff -r 71368db3b970 -r e807bcb0fcac ztfy.utils.egg-info/PKG-INFO
--- a/ztfy.utils.egg-info/PKG-INFO	Mon Mar 05 13:53:38 2012 +0100
+++ b/ztfy.utils.egg-info/PKG-INFO	Mon Mar 12 01:00:00 2012 +0100
@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: ztfy.utils
-Version: 0.3.6
+Version: 0.3.7
 Summary: ZTFY utility functions and classes for Zope3
 Home-page: http://www.ztfy.org
 Author: Thierry Florac
@@ -41,6 +41,10 @@
         Changelog
         =========
         
+        0.3.7
+        -----
+         - added encodings vocabulary
+        
         0.3.6
         -----
          - corrected code and translations in MissingPrincipal class
diff -r 71368db3b970 -r e807bcb0fcac ztfy.utils.egg-info/SOURCES.txt
--- a/ztfy.utils.egg-info/SOURCES.txt	Mon Mar 05 13:53:38 2012 +0100
+++ b/ztfy.utils.egg-info/SOURCES.txt	Mon Mar 12 01:00:00 2012 +0100
@@ -27,6 +27,7 @@
 ztfy/utils/__init__.py
 ztfy/utils/configure.zcml
 ztfy/utils/date.py
+ztfy/utils/encoding.py
 ztfy/utils/file.py
 ztfy/utils/html.py
 ztfy/utils/interfaces.py
@@ -39,6 +40,9 @@
 ztfy/utils/text.py
 ztfy/utils/traversing.py
 ztfy/utils/unicode.py
+ztfy/utils/browser/__init__.py
+ztfy/utils/browser/configure.zcml
+ztfy/utils/browser/encoding.py
 ztfy/utils/catalog/__init__.py
 ztfy/utils/catalog/configure.zcml
 ztfy/utils/catalog/index.py
diff -r 71368db3b970 -r e807bcb0fcac ztfy.utils.egg-info/requires.txt
--- a/ztfy.utils.egg-info/requires.txt	Mon Mar 05 13:53:38 2012 +0100
+++ b/ztfy.utils.egg-info/requires.txt	Mon Mar 12 01:00:00 2012 +0100
@@ -1,4 +1,5 @@
 setuptools
+chardet
 fanstatic
 hurry.query
 pytz
diff -r 71368db3b970 -r e807bcb0fcac ztfy/utils/docs/HISTORY.txt
--- a/ztfy/utils/docs/HISTORY.txt	Mon Mar 05 13:53:38 2012 +0100
+++ b/ztfy/utils/docs/HISTORY.txt	Mon Mar 12 01:00:00 2012 +0100
@@ -1,6 +1,10 @@
 Changelog
 =========
 
+0.3.7
+-----
+ - added encodings vocabulary
+
 0.3.6
 -----
  - corrected code and translations in MissingPrincipal class
diff -r 71368db3b970 -r e807bcb0fcac ztfy/utils/locales/en/LC_MESSAGES/ztfy.utils.mo
Binary file ztfy/utils/locales/en/LC_MESSAGES/ztfy.utils.mo has changed
diff -r 71368db3b970 -r e807bcb0fcac ztfy/utils/locales/en/LC_MESSAGES/ztfy.utils.po
--- a/ztfy/utils/locales/en/LC_MESSAGES/ztfy.utils.po	Mon Mar 05 13:53:38 2012 +0100
+++ b/ztfy/utils/locales/en/LC_MESSAGES/ztfy.utils.po	Mon Mar 12 01:00:00 2012 +0100
@@ -14,7 +14,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ZTFY.utils\n"
-"POT-Creation-Date: Fri Feb  3 17:49:15 2012\n"
+"POT-Creation-Date: Mon Mar 12 00:29:30 2012\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"
diff -r 71368db3b970 -r e807bcb0fcac ztfy/utils/locales/fr/LC_MESSAGES/ztfy.utils.mo
Binary file ztfy/utils/locales/fr/LC_MESSAGES/ztfy.utils.mo has changed
diff -r 71368db3b970 -r e807bcb0fcac ztfy/utils/locales/fr/LC_MESSAGES/ztfy.utils.po
--- a/ztfy/utils/locales/fr/LC_MESSAGES/ztfy.utils.po	Mon Mar 05 13:53:38 2012 +0100
+++ b/ztfy/utils/locales/fr/LC_MESSAGES/ztfy.utils.po	Mon Mar 12 01:00:00 2012 +0100
@@ -16,7 +16,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ZTFY.utils\n"
-"POT-Creation-Date: Fri Feb  3 17:49:15 2012\n"
+"POT-Creation-Date: Mon Mar 12 00:29:30 2012\n"
 "PO-Revision-Date: 2012-02-03 17:57+0100\n"
 "Last-Translator: Thierry Florac <thierry.florac@onf.fr>\n"
 "Language-Team: français <>\n"
@@ -27,6 +27,10 @@
 "Generated-By: zope/app/locales/extract.py\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 
+#: ztfy/utils/browser/encoding.py:47
+msgid "-- automatic selection --"
+msgstr "-- sélection automatique --"
+
 #: ztfy/utils/date.py:101
 msgid "%d hours ago"
 msgstr "il y a %d heures"
@@ -59,15 +63,384 @@
 msgid "yesterday"
 msgstr "hier"
 
+#: ztfy/utils/encoding.py:100
+msgid "Greek (iso8859_7)"
+msgstr "Grec (iso8859-7)"
+
+#: ztfy/utils/encoding.py:101
+msgid "Hebrew (iso8859_8)"
+msgstr "Hébreu (iso8859-8)"
+
+#: ztfy/utils/encoding.py:102
+msgid "Turkish (iso8859_9)"
+msgstr "Turc (iso8859-9)"
+
+#: ztfy/utils/encoding.py:103
+msgid "Nordic languages (iso8859_10)"
+msgstr "Langues nordiques (iso8859-10)"
+
+#: ztfy/utils/encoding.py:104
+msgid "Baltic languages (iso8859_13)"
+msgstr "Langues baltes (iso8859-13)"
+
+#: ztfy/utils/encoding.py:105
+msgid "Celtic languages (iso8859_14)"
+msgstr "Langues celtes (iso8859-14)"
+
+#: ztfy/utils/encoding.py:106
+msgid "Western Europe (iso8859_15)"
+msgstr "Europe de l'ouest (iso8859-15)"
+
+#: ztfy/utils/encoding.py:107
+msgid "South-Eastern Europe (iso8859_16)"
+msgstr "Europe du sud-est (iso8859-16)"
+
+#: ztfy/utils/encoding.py:108
+msgid "Korean (johab)"
+msgstr "Coréen (johab)"
+
+#: ztfy/utils/encoding.py:109
+msgid "Russian (koi8_r)"
+msgstr "Russe (koi8-r)"
+
+#: ztfy/utils/encoding.py:110
+msgid "Ukrainian (koi8_u)"
+msgstr "Ukrainien (koi8-u)"
+
+#: ztfy/utils/encoding.py:111
+msgid "Bulgarian, Byelorussian, Macedonian, Russian, Serbian (mac_cyrillic)"
+msgstr "Burlage, Biélorusse, Macédonien, Russe, Serbe (mac-cyrillique)"
+
+#: ztfy/utils/encoding.py:112
+msgid "Greek (mac_greek)"
+msgstr "Grec (mac-grec)"
+
+#: ztfy/utils/encoding.py:113
+msgid "Icelandic (mac_iceland)"
+msgstr "Islandais (mac-islande)"
+
+#: ztfy/utils/encoding.py:114
+msgid "Central and Eastern Europe (mac_latin2)"
+msgstr "Europe centrale et de l'ouest (mac-latin2)"
+
+#: ztfy/utils/encoding.py:115
+msgid "Western Europe (mac_roman)"
+msgstr "Europe de l'ouest (mac-roman)"
+
+#: ztfy/utils/encoding.py:116
+msgid "Turkish (mac_turkish)"
+msgstr "Turc (mac-turc)"
+
+#: ztfy/utils/encoding.py:117
+msgid "Kazakh (ptcp154)"
+msgstr "Kazakh (ptcp-154)"
+
+#: ztfy/utils/encoding.py:118
+msgid "Japanese (shift_jis)"
+msgstr "Japonais (shift-jis)"
+
+#: ztfy/utils/encoding.py:119
+msgid "Japanese (shift_jis_2004)"
+msgstr "Japonais (shift-jis-2004)"
+
+#: ztfy/utils/encoding.py:120
+msgid "Japanese (shift_jisx0213)"
+msgstr "Japonais (shift-jisx-0213)"
+
+#: ztfy/utils/encoding.py:121
+msgid "all languages (utf_32)"
+msgstr "toutes langues (utf-32)"
+
+#: ztfy/utils/encoding.py:122
+msgid "all languages (utf_32_be)"
+msgstr "toutes langues (utf-32-be)"
+
+#: ztfy/utils/encoding.py:123
+msgid "all languages (utf_32_le)"
+msgstr "toutes langues (utf-32-le)"
+
+#: ztfy/utils/encoding.py:124
+msgid "all languages (utf_16)"
+msgstr "toutes langues (utf-16)"
+
+#: ztfy/utils/encoding.py:125
+msgid "all languages (BMP only - utf_16_be)"
+msgstr "toutes langues (BMP seulement - utf-16-be)"
+
+#: ztfy/utils/encoding.py:126
+msgid "all languages (BMP only - utf_16_le)"
+msgstr "toutes langues (BMP seulement - utf-16-le)"
+
+#: ztfy/utils/encoding.py:127
+msgid "all languages (utf_7)"
+msgstr "toutes langues (utf-7)"
+
+#: ztfy/utils/encoding.py:128
+msgid "all languages (utf_8)"
+msgstr "toutes langues (utf-8)"
+
+#: ztfy/utils/encoding.py:129
+msgid "all languages (utf_8_sig)"
+msgstr "toutes langues (utf-8-sig)"
+
+#: ztfy/utils/encoding.py:38
+msgid "English (ASCII)"
+msgstr "Anglais (ASCII)"
+
+#: ztfy/utils/encoding.py:39
+msgid "Traditional Chinese (big5)"
+msgstr "Chinois traditionnel (big5)"
+
+#: ztfy/utils/encoding.py:40
+msgid "Traditional Chinese (big5hkscs)"
+msgstr "Chinois traditionnel (big5hkscs)"
+
+#: ztfy/utils/encoding.py:41
+msgid "English (cp037)"
+msgstr "Anglais (cp037)"
+
+#: ztfy/utils/encoding.py:42
+msgid "Hebrew (cp424)"
+msgstr "Hébreu (cp424)"
+
+#: ztfy/utils/encoding.py:43
+msgid "English (cp437)"
+msgstr "Anglais (cp437)"
+
+#: ztfy/utils/encoding.py:44
+msgid "Western Europe (cp500)"
+msgstr "Europe de l'ouest (cp500)"
+
+#: ztfy/utils/encoding.py:45
+msgid "Arabic (cp720)"
+msgstr "Arabe (cp720)"
+
+#: ztfy/utils/encoding.py:46
+msgid "Greek (cp737)"
+msgstr "Grec (cp737)"
+
+#: ztfy/utils/encoding.py:47
+msgid "Baltic languages (cp775)"
+msgstr "Langues baltes (cp775)"
+
+#: ztfy/utils/encoding.py:48
+msgid "Western Europe (cp850)"
+msgstr "Europe de l'ouest (cp850)"
+
+#: ztfy/utils/encoding.py:49
+msgid "Central and Eastern Europe (cp852)"
+msgstr "Europe centrale et de l'est (cp852)"
+
+#: ztfy/utils/encoding.py:50
+msgid "Bulgarian, Byelorussian, Macedonian, Russian, Serbian (cp855)"
+msgstr "Bulgare, Biélorusse, Macédonien, Russe, Serbe (cp855)"
+
+#: ztfy/utils/encoding.py:51
+msgid "Hebrew (cp856)"
+msgstr "Hébreu (cp856)"
+
+#: ztfy/utils/encoding.py:52
+msgid "Turkish (cp857)"
+msgstr "Turc (cp857)"
+
+#: ztfy/utils/encoding.py:53
+msgid "Western Europe (cp858)"
+msgstr "Europe de l'ouest (cp858)"
+
+#: ztfy/utils/encoding.py:54
+msgid "Portuguese (cp860)"
+msgstr "Portuguais (cp860)"
+
+#: ztfy/utils/encoding.py:55
+msgid "Icelandic (cp861)"
+msgstr "Islandais (cp861)"
+
+#: ztfy/utils/encoding.py:56
+msgid "Hebrew (cp862)"
+msgstr "Hébreu (cp862)"
+
+#: ztfy/utils/encoding.py:57
+msgid "Canadian (cp863)"
+msgstr "Canadien (cp863)"
+
+#: ztfy/utils/encoding.py:58
+msgid "Arabic (cp864)"
+msgstr "Arabe (cp864)"
+
+#: ztfy/utils/encoding.py:59
+msgid "Danish, Norwegian (cp865)"
+msgstr "Danois, Norvégien (cp865)"
+
+#: ztfy/utils/encoding.py:60
+msgid "Russian (cp866)"
+msgstr "Russe (cp866)"
+
+#: ztfy/utils/encoding.py:61
+msgid "Greek (cp869)"
+msgstr "Grec (cp869)"
+
+#: ztfy/utils/encoding.py:62
+msgid "Thai (cp874)"
+msgstr "Thaï (cp874)"
+
+#: ztfy/utils/encoding.py:63
+msgid "Greek (cp875)"
+msgstr "Grec (cp875)"
+
+#: ztfy/utils/encoding.py:64
+msgid "Japanese (cp932)"
+msgstr "Japonais (cp932)"
+
+#: ztfy/utils/encoding.py:65
+msgid "Korean (cp949)"
+msgstr "Coréen (cp949)"
+
+#: ztfy/utils/encoding.py:66
+msgid "Traditional Chinese (cp950)"
+msgstr "Chinois traditionnel (cp950)"
+
+#: ztfy/utils/encoding.py:67
+msgid "Urdu (cp1006)"
+msgstr "Urdu (cp1006)"
+
+#: ztfy/utils/encoding.py:68
+msgid "Turkish (cp1026)"
+msgstr "Turc (cp1026)"
+
+#: ztfy/utils/encoding.py:69
+msgid "Western Europe (cp1140)"
+msgstr "Europe de l'ouest (cp1140)"
+
+#: ztfy/utils/encoding.py:70
+msgid "Central and Eastern Europe (cp1250)"
+msgstr "Europe centrale et de l'est (cp1250)"
+
+#: ztfy/utils/encoding.py:71
+msgid "Bulgarian, Byelorussian, Macedonian, Russian, Serbian (cp1251)"
+msgstr "Bulgare, Biélorusse, Macédonien, Russe, Serbe (cp1251)"
+
+#: ztfy/utils/encoding.py:72
+msgid "Western Europe (cp1252)"
+msgstr "Europe de l'ouest (cp1252)"
+
+#: ztfy/utils/encoding.py:73
+msgid "Greek (cp1253)"
+msgstr "Grec (cp1253)"
+
+#: ztfy/utils/encoding.py:74
+msgid "Turkish (cp1254)"
+msgstr "Turc (cp1254)"
+
+#: ztfy/utils/encoding.py:75
+msgid "Hebrew (cp1255)"
+msgstr "Hébreu (cp1255)"
+
+#: ztfy/utils/encoding.py:76
+msgid "Arabic (cp1256)"
+msgstr "Arabe (cp1256)"
+
+#: ztfy/utils/encoding.py:77
+msgid "Baltic languages (cp1257)"
+msgstr "Langues baltes (cp1257)"
+
+#: ztfy/utils/encoding.py:78
+msgid "Vietnamese (cp1258)"
+msgstr "Vietnamien (cp1258)"
+
+#: ztfy/utils/encoding.py:79
+msgid "Japanese (euc_jp)"
+msgstr "Japonais (euc-jp)"
+
+#: ztfy/utils/encoding.py:80
+msgid "Japanese (euc_jis_2004)"
+msgstr "Japonais (euc-jp-2004)"
+
+#: ztfy/utils/encoding.py:81
+msgid "Japanese (euc_jisx0213)"
+msgstr "Japonais (euc-jisx0213)"
+
+#: ztfy/utils/encoding.py:82
+msgid "Korean (euc_kr)"
+msgstr "Coréen (euc-kr)"
+
+#: ztfy/utils/encoding.py:83
+msgid "Simplified Chinese (gb2312)"
+msgstr "Chinois simplifié (gb2312)"
+
+#: ztfy/utils/encoding.py:84
+msgid "Unified Chinese (gbk)"
+msgstr "Chinois unifié (gbk)"
+
+#: ztfy/utils/encoding.py:85
+msgid "Unified Chinese (gb18030)"
+msgstr "Chinois unifié (gb18030)"
+
+#: ztfy/utils/encoding.py:86
+msgid "Simplified Chinese (hz)"
+msgstr "Chinois simplifié (hz)"
+
+#: ztfy/utils/encoding.py:87
+msgid "Japanese (iso2022_jp)"
+msgstr "Japonais (iso2002-jp)"
+
+#: ztfy/utils/encoding.py:88
+msgid "Japanese (iso2022_jp_1)"
+msgstr "Japonais (iso2022-jp-1)"
+
+#: ztfy/utils/encoding.py:89
+msgid ""
+"Japanese, Korean, Simplified Chinese, Western Europe, Greek (iso2022_jp_2)"
+msgstr "Japonais, Coréen, Chinois simplifié, Europe de l'ouest, Grec (iso2022-jp-2)"
+
+#: ztfy/utils/encoding.py:90
+msgid "Japanese (iso2022_jp_2004)"
+msgstr "Japonais (iso2022-jp-2004)"
+
+#: ztfy/utils/encoding.py:91
+msgid "Japanese (iso2022_jp_3)"
+msgstr "Japonais (iso2022-jp-3)"
+
+#: ztfy/utils/encoding.py:92
+msgid "Japanese (iso2022_jp_ext)"
+msgstr "Japonais (iso2022-jp-ext)"
+
+#: ztfy/utils/encoding.py:93
+msgid "Korean (iso2022_kr)"
+msgstr "Coréen (iso2022-kr)"
+
+#: ztfy/utils/encoding.py:94
+msgid "West Europe (latin_1)"
+msgstr "Europe de l'ouest (latin-1)"
+
+#: ztfy/utils/encoding.py:95
+msgid "Central and Eastern Europe (iso8859_2)"
+msgstr "Europe centrale et de l'est (iso8859-2)"
+
+#: ztfy/utils/encoding.py:96
+msgid "Esperanto, Maltese (iso8859_3)"
+msgstr "Espéranto, Maltais (iso8859-3)"
+
+#: ztfy/utils/encoding.py:97
+msgid "Baltic languages (iso8859_4)"
+msgstr "Langues baltes (iso8859-4)"
+
+#: ztfy/utils/encoding.py:98
+msgid "Bulgarian, Byelorussian, Macedonian, Russian, Serbian (iso8859_5)"
+msgstr "Bulgare, Biélorusse, Macédonien, Russe, Serbe (iso8859-5)"
+
+#: ztfy/utils/encoding.py:99
+msgid "Arabic (iso8859_6)"
+msgstr "Arabe (iso8859-6)"
+
 #: ztfy/utils/request.py:40
 msgid "No Request in interaction !"
 msgstr "Pas de requête en cours !"
 
-#: ztfy/utils/security.py:66
+#: ztfy/utils/security.py:71
 msgid "< missing principal %s >"
 msgstr "< mandant inconnu %s >"
 
-#: ztfy/utils/security.py:70
+#: ztfy/utils/security.py:75
 msgid "This principal can't be found in any authentication utility..."
 msgstr "Ce mandant ne peut pas être trouvé"
 
@@ -78,3 +451,4 @@
 #: ztfy/utils/timezone/interfaces.py:36
 msgid "Default server timezone"
 msgstr "Fuseau horaire par défaut du serveur"
+
diff -r 71368db3b970 -r e807bcb0fcac ztfy/utils/locales/ztfy.utils.pot
--- a/ztfy/utils/locales/ztfy.utils.pot	Mon Mar 05 13:53:38 2012 +0100
+++ b/ztfy/utils/locales/ztfy.utils.pot	Mon Mar 12 01:00:00 2012 +0100
@@ -14,7 +14,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Meaningless\n"
-"POT-Creation-Date: Fri Feb  3 17:49:15 2012\n"
+"POT-Creation-Date: Mon Mar 12 00:29:30 2012\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Zope 3 Developers <zope-dev@zope.org>\n"
@@ -23,6 +23,10 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: zope/app/locales/extract.py\n"
 
+#: ztfy/utils/browser/encoding.py:47
+msgid "-- automatic selection --"
+msgstr ""
+
 #: ztfy/utils/date.py:101
 msgid "%d hours ago"
 msgstr ""
@@ -55,15 +59,383 @@
 msgid "yesterday"
 msgstr ""
 
+#: ztfy/utils/encoding.py:100
+msgid "Greek (iso8859_7)"
+msgstr ""
+
+#: ztfy/utils/encoding.py:101
+msgid "Hebrew (iso8859_8)"
+msgstr ""
+
+#: ztfy/utils/encoding.py:102
+msgid "Turkish (iso8859_9)"
+msgstr ""
+
+#: ztfy/utils/encoding.py:103
+msgid "Nordic languages (iso8859_10)"
+msgstr ""
+
+#: ztfy/utils/encoding.py:104
+msgid "Baltic languages (iso8859_13)"
+msgstr ""
+
+#: ztfy/utils/encoding.py:105
+msgid "Celtic languages (iso8859_14)"
+msgstr ""
+
+#: ztfy/utils/encoding.py:106
+msgid "Western Europe (iso8859_15)"
+msgstr ""
+
+#: ztfy/utils/encoding.py:107
+msgid "South-Eastern Europe (iso8859_16)"
+msgstr ""
+
+#: ztfy/utils/encoding.py:108
+msgid "Korean (johab)"
+msgstr ""
+
+#: ztfy/utils/encoding.py:109
+msgid "Russian (koi8_r)"
+msgstr ""
+
+#: ztfy/utils/encoding.py:110
+msgid "Ukrainian (koi8_u)"
+msgstr ""
+
+#: ztfy/utils/encoding.py:111
+msgid "Bulgarian, Byelorussian, Macedonian, Russian, Serbian (mac_cyrillic)"
+msgstr ""
+
+#: ztfy/utils/encoding.py:112
+msgid "Greek (mac_greek)"
+msgstr ""
+
+#: ztfy/utils/encoding.py:113
+msgid "Icelandic (mac_iceland)"
+msgstr ""
+
+#: ztfy/utils/encoding.py:114
+msgid "Central and Eastern Europe (mac_latin2)"
+msgstr ""
+
+#: ztfy/utils/encoding.py:115
+msgid "Western Europe (mac_roman)"
+msgstr ""
+
+#: ztfy/utils/encoding.py:116
+msgid "Turkish (mac_turkish)"
+msgstr ""
+
+#: ztfy/utils/encoding.py:117
+msgid "Kazakh (ptcp154)"
+msgstr ""
+
+#: ztfy/utils/encoding.py:118
+msgid "Japanese (shift_jis)"
+msgstr ""
+
+#: ztfy/utils/encoding.py:119
+msgid "Japanese (shift_jis_2004)"
+msgstr ""
+
+#: ztfy/utils/encoding.py:120
+msgid "Japanese (shift_jisx0213)"
+msgstr ""
+
+#: ztfy/utils/encoding.py:121
+msgid "all languages (utf_32)"
+msgstr ""
+
+#: ztfy/utils/encoding.py:122
+msgid "all languages (utf_32_be)"
+msgstr ""
+
+#: ztfy/utils/encoding.py:123
+msgid "all languages (utf_32_le)"
+msgstr ""
+
+#: ztfy/utils/encoding.py:124
+msgid "all languages (utf_16)"
+msgstr ""
+
+#: ztfy/utils/encoding.py:125
+msgid "all languages (BMP only - utf_16_be)"
+msgstr ""
+
+#: ztfy/utils/encoding.py:126
+msgid "all languages (BMP only - utf_16_le)"
+msgstr ""
+
+#: ztfy/utils/encoding.py:127
+msgid "all languages (utf_7)"
+msgstr ""
+
+#: ztfy/utils/encoding.py:128
+msgid "all languages (utf_8)"
+msgstr ""
+
+#: ztfy/utils/encoding.py:129
+msgid "all languages (utf_8_sig)"
+msgstr ""
+
+#: ztfy/utils/encoding.py:38
+msgid "English (ASCII)"
+msgstr ""
+
+#: ztfy/utils/encoding.py:39
+msgid "Traditional Chinese (big5)"
+msgstr ""
+
+#: ztfy/utils/encoding.py:40
+msgid "Traditional Chinese (big5hkscs)"
+msgstr ""
+
+#: ztfy/utils/encoding.py:41
+msgid "English (cp037)"
+msgstr ""
+
+#: ztfy/utils/encoding.py:42
+msgid "Hebrew (cp424)"
+msgstr ""
+
+#: ztfy/utils/encoding.py:43
+msgid "English (cp437)"
+msgstr ""
+
+#: ztfy/utils/encoding.py:44
+msgid "Western Europe (cp500)"
+msgstr ""
+
+#: ztfy/utils/encoding.py:45
+msgid "Arabic (cp720)"
+msgstr ""
+
+#: ztfy/utils/encoding.py:46
+msgid "Greek (cp737)"
+msgstr ""
+
+#: ztfy/utils/encoding.py:47
+msgid "Baltic languages (cp775)"
+msgstr ""
+
+#: ztfy/utils/encoding.py:48
+msgid "Western Europe (cp850)"
+msgstr ""
+
+#: ztfy/utils/encoding.py:49
+msgid "Central and Eastern Europe (cp852)"
+msgstr ""
+
+#: ztfy/utils/encoding.py:50
+msgid "Bulgarian, Byelorussian, Macedonian, Russian, Serbian (cp855)"
+msgstr ""
+
+#: ztfy/utils/encoding.py:51
+msgid "Hebrew (cp856)"
+msgstr ""
+
+#: ztfy/utils/encoding.py:52
+msgid "Turkish (cp857)"
+msgstr ""
+
+#: ztfy/utils/encoding.py:53
+msgid "Western Europe (cp858)"
+msgstr ""
+
+#: ztfy/utils/encoding.py:54
+msgid "Portuguese (cp860)"
+msgstr ""
+
+#: ztfy/utils/encoding.py:55
+msgid "Icelandic (cp861)"
+msgstr ""
+
+#: ztfy/utils/encoding.py:56
+msgid "Hebrew (cp862)"
+msgstr ""
+
+#: ztfy/utils/encoding.py:57
+msgid "Canadian (cp863)"
+msgstr ""
+
+#: ztfy/utils/encoding.py:58
+msgid "Arabic (cp864)"
+msgstr ""
+
+#: ztfy/utils/encoding.py:59
+msgid "Danish, Norwegian (cp865)"
+msgstr ""
+
+#: ztfy/utils/encoding.py:60
+msgid "Russian (cp866)"
+msgstr ""
+
+#: ztfy/utils/encoding.py:61
+msgid "Greek (cp869)"
+msgstr ""
+
+#: ztfy/utils/encoding.py:62
+msgid "Thai (cp874)"
+msgstr ""
+
+#: ztfy/utils/encoding.py:63
+msgid "Greek (cp875)"
+msgstr ""
+
+#: ztfy/utils/encoding.py:64
+msgid "Japanese (cp932)"
+msgstr ""
+
+#: ztfy/utils/encoding.py:65
+msgid "Korean (cp949)"
+msgstr ""
+
+#: ztfy/utils/encoding.py:66
+msgid "Traditional Chinese (cp950)"
+msgstr ""
+
+#: ztfy/utils/encoding.py:67
+msgid "Urdu (cp1006)"
+msgstr ""
+
+#: ztfy/utils/encoding.py:68
+msgid "Turkish (cp1026)"
+msgstr ""
+
+#: ztfy/utils/encoding.py:69
+msgid "Western Europe (cp1140)"
+msgstr ""
+
+#: ztfy/utils/encoding.py:70
+msgid "Central and Eastern Europe (cp1250)"
+msgstr ""
+
+#: ztfy/utils/encoding.py:71
+msgid "Bulgarian, Byelorussian, Macedonian, Russian, Serbian (cp1251)"
+msgstr ""
+
+#: ztfy/utils/encoding.py:72
+msgid "Western Europe (cp1252)"
+msgstr ""
+
+#: ztfy/utils/encoding.py:73
+msgid "Greek (cp1253)"
+msgstr ""
+
+#: ztfy/utils/encoding.py:74
+msgid "Turkish (cp1254)"
+msgstr ""
+
+#: ztfy/utils/encoding.py:75
+msgid "Hebrew (cp1255)"
+msgstr ""
+
+#: ztfy/utils/encoding.py:76
+msgid "Arabic (cp1256)"
+msgstr ""
+
+#: ztfy/utils/encoding.py:77
+msgid "Baltic languages (cp1257)"
+msgstr ""
+
+#: ztfy/utils/encoding.py:78
+msgid "Vietnamese (cp1258)"
+msgstr ""
+
+#: ztfy/utils/encoding.py:79
+msgid "Japanese (euc_jp)"
+msgstr ""
+
+#: ztfy/utils/encoding.py:80
+msgid "Japanese (euc_jis_2004)"
+msgstr ""
+
+#: ztfy/utils/encoding.py:81
+msgid "Japanese (euc_jisx0213)"
+msgstr ""
+
+#: ztfy/utils/encoding.py:82
+msgid "Korean (euc_kr)"
+msgstr ""
+
+#: ztfy/utils/encoding.py:83
+msgid "Simplified Chinese (gb2312)"
+msgstr ""
+
+#: ztfy/utils/encoding.py:84
+msgid "Unified Chinese (gbk)"
+msgstr ""
+
+#: ztfy/utils/encoding.py:85
+msgid "Unified Chinese (gb18030)"
+msgstr ""
+
+#: ztfy/utils/encoding.py:86
+msgid "Simplified Chinese (hz)"
+msgstr ""
+
+#: ztfy/utils/encoding.py:87
+msgid "Japanese (iso2022_jp)"
+msgstr ""
+
+#: ztfy/utils/encoding.py:88
+msgid "Japanese (iso2022_jp_1)"
+msgstr ""
+
+#: ztfy/utils/encoding.py:89
+msgid "Japanese, Korean, Simplified Chinese, Western Europe, Greek (iso2022_jp_2)"
+msgstr ""
+
+#: ztfy/utils/encoding.py:90
+msgid "Japanese (iso2022_jp_2004)"
+msgstr ""
+
+#: ztfy/utils/encoding.py:91
+msgid "Japanese (iso2022_jp_3)"
+msgstr ""
+
+#: ztfy/utils/encoding.py:92
+msgid "Japanese (iso2022_jp_ext)"
+msgstr ""
+
+#: ztfy/utils/encoding.py:93
+msgid "Korean (iso2022_kr)"
+msgstr ""
+
+#: ztfy/utils/encoding.py:94
+msgid "West Europe (latin_1)"
+msgstr ""
+
+#: ztfy/utils/encoding.py:95
+msgid "Central and Eastern Europe (iso8859_2)"
+msgstr ""
+
+#: ztfy/utils/encoding.py:96
+msgid "Esperanto, Maltese (iso8859_3)"
+msgstr ""
+
+#: ztfy/utils/encoding.py:97
+msgid "Baltic languages (iso8859_4)"
+msgstr ""
+
+#: ztfy/utils/encoding.py:98
+msgid "Bulgarian, Byelorussian, Macedonian, Russian, Serbian (iso8859_5)"
+msgstr ""
+
+#: ztfy/utils/encoding.py:99
+msgid "Arabic (iso8859_6)"
+msgstr ""
+
 #: ztfy/utils/request.py:40
 msgid "No Request in interaction !"
 msgstr ""
 
-#: ztfy/utils/security.py:66
+#: ztfy/utils/security.py:71
 msgid "< missing principal %s >"
 msgstr ""
 
-#: ztfy/utils/security.py:70
+#: ztfy/utils/security.py:75
 msgid "This principal can't be found in any authentication utility..."
 msgstr ""