--- a/src/pyams_i18n.egg-info/SOURCES.txt	Wed May 20 12:25:29 2015 +0200
+++ b/src/pyams_i18n.egg-info/SOURCES.txt	Wed Jun 17 09:57:04 2015 +0200
@@ -4,7 +4,9 @@
 docs/README.txt
 src/pyams_i18n/__init__.py
 src/pyams_i18n/attr.py
-src/pyams_i18n/configure.zcml
+src/pyams_i18n/expr.py
+src/pyams_i18n/include.py
+src/pyams_i18n/index.py
 src/pyams_i18n/language.py
 src/pyams_i18n/negotiator.py
 src/pyams_i18n/property.py
@@ -25,12 +27,19 @@
 src/pyams_i18n/locales/pyams_i18n.pot
 src/pyams_i18n/locales/fr/LC_MESSAGES/pyams_i18n.mo
 src/pyams_i18n/locales/fr/LC_MESSAGES/pyams_i18n.po
+src/pyams_i18n/resources/img/flags/aa.png
 src/pyams_i18n/resources/img/flags/aa_ET.png
+src/pyams_i18n/resources/img/flags/ab.png
 src/pyams_i18n/resources/img/flags/ab_GE.png
+src/pyams_i18n/resources/img/flags/ae.png
 src/pyams_i18n/resources/img/flags/ae_IR.png
+src/pyams_i18n/resources/img/flags/af.png
 src/pyams_i18n/resources/img/flags/af_ZA.png
+src/pyams_i18n/resources/img/flags/ak.png
 src/pyams_i18n/resources/img/flags/ak_GH.png
+src/pyams_i18n/resources/img/flags/am.png
 src/pyams_i18n/resources/img/flags/am_ET.png
+src/pyams_i18n/resources/img/flags/an.png
 src/pyams_i18n/resources/img/flags/an_ES.png
 src/pyams_i18n/resources/img/flags/ar.png
 src/pyams_i18n/resources/img/flags/ar_AE.png
@@ -49,39 +58,64 @@
 src/pyams_i18n/resources/img/flags/ar_SY.png
 src/pyams_i18n/resources/img/flags/ar_TN.png
 src/pyams_i18n/resources/img/flags/ar_YE.png
+src/pyams_i18n/resources/img/flags/arn.png
 src/pyams_i18n/resources/img/flags/arn_CL.png
+src/pyams_i18n/resources/img/flags/as.png
 src/pyams_i18n/resources/img/flags/as_IN.png
+src/pyams_i18n/resources/img/flags/ast.png
 src/pyams_i18n/resources/img/flags/ast_ES.png
+src/pyams_i18n/resources/img/flags/av.png
 src/pyams_i18n/resources/img/flags/av_RU.png
+src/pyams_i18n/resources/img/flags/ay.png
 src/pyams_i18n/resources/img/flags/ay_BO.png
+src/pyams_i18n/resources/img/flags/az.png
 src/pyams_i18n/resources/img/flags/az_AZ-Cyrl.png
 src/pyams_i18n/resources/img/flags/az_AZ-Latn.png
+src/pyams_i18n/resources/img/flags/ba.png
 src/pyams_i18n/resources/img/flags/ba_RU.png
 src/pyams_i18n/resources/img/flags/be.png
 src/pyams_i18n/resources/img/flags/be_BY.png
+src/pyams_i18n/resources/img/flags/ber.png
 src/pyams_i18n/resources/img/flags/ber_DZ.png
 src/pyams_i18n/resources/img/flags/bg.png
 src/pyams_i18n/resources/img/flags/bg_BG.png
+src/pyams_i18n/resources/img/flags/bh.png
 src/pyams_i18n/resources/img/flags/bh_IN.png
+src/pyams_i18n/resources/img/flags/bi.png
 src/pyams_i18n/resources/img/flags/bi_VU.png
+src/pyams_i18n/resources/img/flags/bm.png
 src/pyams_i18n/resources/img/flags/bm_ML.png
+src/pyams_i18n/resources/img/flags/bn.png
 src/pyams_i18n/resources/img/flags/bn_IN.png
+src/pyams_i18n/resources/img/flags/bo.png
 src/pyams_i18n/resources/img/flags/bo_BT.png
 src/pyams_i18n/resources/img/flags/bo_CN.png
+src/pyams_i18n/resources/img/flags/br.png
 src/pyams_i18n/resources/img/flags/br_FR.png
+src/pyams_i18n/resources/img/flags/bs.png
 src/pyams_i18n/resources/img/flags/bs_BA-Cyrl.png
 src/pyams_i18n/resources/img/flags/bs_BA-Latn.png
+src/pyams_i18n/resources/img/flags/ca.png
 src/pyams_i18n/resources/img/flags/ca_AD.png
 src/pyams_i18n/resources/img/flags/ca_ES.png
 src/pyams_i18n/resources/img/flags/ca_FR.png
+src/pyams_i18n/resources/img/flags/ce.png
 src/pyams_i18n/resources/img/flags/ce_RU.png
+src/pyams_i18n/resources/img/flags/ch.png
 src/pyams_i18n/resources/img/flags/ch_US.png
+src/pyams_i18n/resources/img/flags/co.png
 src/pyams_i18n/resources/img/flags/co_FR.png
+src/pyams_i18n/resources/img/flags/cr.png
 src/pyams_i18n/resources/img/flags/cr_CA.png
+src/pyams_i18n/resources/img/flags/cs.png
 src/pyams_i18n/resources/img/flags/cs_CZ.png
+src/pyams_i18n/resources/img/flags/cu.png
 src/pyams_i18n/resources/img/flags/cu_BG.png
+src/pyams_i18n/resources/img/flags/cv.png
 src/pyams_i18n/resources/img/flags/cv_RU.png
+src/pyams_i18n/resources/img/flags/cy.png
 src/pyams_i18n/resources/img/flags/cy_GB.png
+src/pyams_i18n/resources/img/flags/da.png
 src/pyams_i18n/resources/img/flags/da_DK.png
 src/pyams_i18n/resources/img/flags/de.png
 src/pyams_i18n/resources/img/flags/de_AT.png
@@ -89,9 +123,13 @@
 src/pyams_i18n/resources/img/flags/de_DE.png
 src/pyams_i18n/resources/img/flags/de_LI.png
 src/pyams_i18n/resources/img/flags/de_LU.png
+src/pyams_i18n/resources/img/flags/dv.png
 src/pyams_i18n/resources/img/flags/dv_MV.png
+src/pyams_i18n/resources/img/flags/dz.png
 src/pyams_i18n/resources/img/flags/dz_BT.png
+src/pyams_i18n/resources/img/flags/ee.png
 src/pyams_i18n/resources/img/flags/ee_GH.png
+src/pyams_i18n/resources/img/flags/el.png
 src/pyams_i18n/resources/img/flags/el_GR.png
 src/pyams_i18n/resources/img/flags/en.png
 src/pyams_i18n/resources/img/flags/en_AU.png
@@ -132,11 +170,15 @@
 src/pyams_i18n/resources/img/flags/es_US.png
 src/pyams_i18n/resources/img/flags/es_VE.png
 src/pyams_i18n/resources/img/flags/et_EE.png
+src/pyams_i18n/resources/img/flags/eu.png
 src/pyams_i18n/resources/img/flags/eu_ES.png
+src/pyams_i18n/resources/img/flags/fa.png
 src/pyams_i18n/resources/img/flags/fa_IR.png
 src/pyams_i18n/resources/img/flags/fi.png
 src/pyams_i18n/resources/img/flags/fi_FI.png
+src/pyams_i18n/resources/img/flags/fil.png
 src/pyams_i18n/resources/img/flags/fil_PH.png
+src/pyams_i18n/resources/img/flags/fj.png
 src/pyams_i18n/resources/img/flags/fj_FJ.png
 src/pyams_i18n/resources/img/flags/fo.png
 src/pyams_i18n/resources/img/flags/fo_FO.png
@@ -148,27 +190,41 @@
 src/pyams_i18n/resources/img/flags/fr_LU.png
 src/pyams_i18n/resources/img/flags/fr_MC.png
 src/pyams_i18n/resources/img/flags/fy_NL.png
+src/pyams_i18n/resources/img/flags/ga.png
 src/pyams_i18n/resources/img/flags/ga_IE.png
+src/pyams_i18n/resources/img/flags/gbz.png
 src/pyams_i18n/resources/img/flags/gbz_AF.png
+src/pyams_i18n/resources/img/flags/gd.png
 src/pyams_i18n/resources/img/flags/gd_GB.png
+src/pyams_i18n/resources/img/flags/gl.png
 src/pyams_i18n/resources/img/flags/gl_ES.png
+src/pyams_i18n/resources/img/flags/gsw.png
 src/pyams_i18n/resources/img/flags/gsw_FR.png
+src/pyams_i18n/resources/img/flags/gu.png
 src/pyams_i18n/resources/img/flags/gu_IN.png
+src/pyams_i18n/resources/img/flags/ha.png
 src/pyams_i18n/resources/img/flags/ha_NG-Latn.png
+src/pyams_i18n/resources/img/flags/he.png
 src/pyams_i18n/resources/img/flags/he_IL.png
+src/pyams_i18n/resources/img/flags/hi.png
 src/pyams_i18n/resources/img/flags/hi_IN.png
+src/pyams_i18n/resources/img/flags/hr.png
 src/pyams_i18n/resources/img/flags/hr_BA.png
 src/pyams_i18n/resources/img/flags/hr_HR.png
 src/pyams_i18n/resources/img/flags/hu.png
 src/pyams_i18n/resources/img/flags/hu_HU.png
+src/pyams_i18n/resources/img/flags/hy.png
 src/pyams_i18n/resources/img/flags/hy_AM.png
+src/pyams_i18n/resources/img/flags/id.png
 src/pyams_i18n/resources/img/flags/id_ID.png
+src/pyams_i18n/resources/img/flags/ii.png
 src/pyams_i18n/resources/img/flags/ii_CN.png
 src/pyams_i18n/resources/img/flags/is.png
 src/pyams_i18n/resources/img/flags/is_IS.png
 src/pyams_i18n/resources/img/flags/it.png
 src/pyams_i18n/resources/img/flags/it_CH.png
 src/pyams_i18n/resources/img/flags/it_IT.png
+src/pyams_i18n/resources/img/flags/iu.png
 src/pyams_i18n/resources/img/flags/iu_CA-Cans.png
 src/pyams_i18n/resources/img/flags/iu_CA-Latn.png
 src/pyams_i18n/resources/img/flags/ja.png
@@ -177,112 +233,175 @@
 src/pyams_i18n/resources/img/flags/ka_GE.png
 src/pyams_i18n/resources/img/flags/kh.png
 src/pyams_i18n/resources/img/flags/kh_KH.png
+src/pyams_i18n/resources/img/flags/kk.png
 src/pyams_i18n/resources/img/flags/kk_KZ.png
+src/pyams_i18n/resources/img/flags/kl.png
 src/pyams_i18n/resources/img/flags/kl_GL.png
+src/pyams_i18n/resources/img/flags/km.png
 src/pyams_i18n/resources/img/flags/km_KH.png
+src/pyams_i18n/resources/img/flags/kn.png
 src/pyams_i18n/resources/img/flags/kn_IN.png
 src/pyams_i18n/resources/img/flags/ko.png
 src/pyams_i18n/resources/img/flags/ko_KR.png
+src/pyams_i18n/resources/img/flags/kok.png
 src/pyams_i18n/resources/img/flags/kok_IN.png
+src/pyams_i18n/resources/img/flags/kw.png
 src/pyams_i18n/resources/img/flags/kw_GB.png
+src/pyams_i18n/resources/img/flags/ky.png
 src/pyams_i18n/resources/img/flags/ky_KG.png
+src/pyams_i18n/resources/img/flags/lb.png
 src/pyams_i18n/resources/img/flags/lb_LU.png
+src/pyams_i18n/resources/img/flags/lo.png
 src/pyams_i18n/resources/img/flags/lo_LA.png
 src/pyams_i18n/resources/img/flags/lt.png
 src/pyams_i18n/resources/img/flags/lt_LT.png
 src/pyams_i18n/resources/img/flags/lv.png
 src/pyams_i18n/resources/img/flags/lv_LV.png
+src/pyams_i18n/resources/img/flags/mi.png
 src/pyams_i18n/resources/img/flags/mi_NZ.png
+src/pyams_i18n/resources/img/flags/mk.png
 src/pyams_i18n/resources/img/flags/mk_MK.png
+src/pyams_i18n/resources/img/flags/ml.png
 src/pyams_i18n/resources/img/flags/ml_IN.png
+src/pyams_i18n/resources/img/flags/mn.png
 src/pyams_i18n/resources/img/flags/mn_CN.png
 src/pyams_i18n/resources/img/flags/mn_MN.png
+src/pyams_i18n/resources/img/flags/moh.png
 src/pyams_i18n/resources/img/flags/moh_CA.png
+src/pyams_i18n/resources/img/flags/mr.png
 src/pyams_i18n/resources/img/flags/mr_IN.png
+src/pyams_i18n/resources/img/flags/ms.png
 src/pyams_i18n/resources/img/flags/ms_BN.png
 src/pyams_i18n/resources/img/flags/ms_MY.png
 src/pyams_i18n/resources/img/flags/mt.png
 src/pyams_i18n/resources/img/flags/mt_MT.png
+src/pyams_i18n/resources/img/flags/my.png
 src/pyams_i18n/resources/img/flags/my_MM.png
+src/pyams_i18n/resources/img/flags/nb.png
 src/pyams_i18n/resources/img/flags/nb_NO.png
+src/pyams_i18n/resources/img/flags/ne.png
 src/pyams_i18n/resources/img/flags/ne_NP.png
+src/pyams_i18n/resources/img/flags/nl.png
 src/pyams_i18n/resources/img/flags/nl_BE.png
 src/pyams_i18n/resources/img/flags/nl_NL.png
+src/pyams_i18n/resources/img/flags/nn.png
 src/pyams_i18n/resources/img/flags/nn_NO.png
+src/pyams_i18n/resources/img/flags/ns.png
 src/pyams_i18n/resources/img/flags/ns_ZA.png
+src/pyams_i18n/resources/img/flags/oc.png
 src/pyams_i18n/resources/img/flags/oc_FR.png
+src/pyams_i18n/resources/img/flags/or.png
 src/pyams_i18n/resources/img/flags/or_IN.png
 src/pyams_i18n/resources/img/flags/other.png
+src/pyams_i18n/resources/img/flags/pa.png
 src/pyams_i18n/resources/img/flags/pa_IN.png
 src/pyams_i18n/resources/img/flags/pl.png
 src/pyams_i18n/resources/img/flags/pl_PL.png
+src/pyams_i18n/resources/img/flags/ps.png
 src/pyams_i18n/resources/img/flags/ps_AF.png
 src/pyams_i18n/resources/img/flags/pt.png
 src/pyams_i18n/resources/img/flags/pt_BR.png
 src/pyams_i18n/resources/img/flags/pt_PT.png
+src/pyams_i18n/resources/img/flags/que.png
 src/pyams_i18n/resources/img/flags/que_BO.png
 src/pyams_i18n/resources/img/flags/que_EC.png
 src/pyams_i18n/resources/img/flags/que_PE.png
+src/pyams_i18n/resources/img/flags/qut.png
 src/pyams_i18n/resources/img/flags/qut_GT.png
+src/pyams_i18n/resources/img/flags/rm.png
 src/pyams_i18n/resources/img/flags/rm_CH.png
 src/pyams_i18n/resources/img/flags/ro.png
 src/pyams_i18n/resources/img/flags/ro_RO.png
 src/pyams_i18n/resources/img/flags/ru.png
 src/pyams_i18n/resources/img/flags/ru_RU.png
+src/pyams_i18n/resources/img/flags/rw.png
 src/pyams_i18n/resources/img/flags/rw_RW.png
+src/pyams_i18n/resources/img/flags/sa.png
 src/pyams_i18n/resources/img/flags/sa_IN.png
+src/pyams_i18n/resources/img/flags/sah.png
 src/pyams_i18n/resources/img/flags/sah_RU.png
 src/pyams_i18n/resources/img/flags/se.png
 src/pyams_i18n/resources/img/flags/se_FI.png
 src/pyams_i18n/resources/img/flags/se_NO.png
 src/pyams_i18n/resources/img/flags/se_SE.png
+src/pyams_i18n/resources/img/flags/si.png
 src/pyams_i18n/resources/img/flags/si_LK.png
 src/pyams_i18n/resources/img/flags/sk.png
 src/pyams_i18n/resources/img/flags/sk_SK.png
+src/pyams_i18n/resources/img/flags/sl.png
 src/pyams_i18n/resources/img/flags/sl_SI.png
+src/pyams_i18n/resources/img/flags/sma.png
 src/pyams_i18n/resources/img/flags/sma_NO.png
 src/pyams_i18n/resources/img/flags/sma_SE.png
+src/pyams_i18n/resources/img/flags/smj.png
 src/pyams_i18n/resources/img/flags/smj_NO.png
 src/pyams_i18n/resources/img/flags/smj_SE.png
+src/pyams_i18n/resources/img/flags/smn.png
 src/pyams_i18n/resources/img/flags/smn_FI.png
+src/pyams_i18n/resources/img/flags/sms.png
 src/pyams_i18n/resources/img/flags/sms_FI.png
+src/pyams_i18n/resources/img/flags/sq.png
 src/pyams_i18n/resources/img/flags/sq_AL.png
+src/pyams_i18n/resources/img/flags/sr.png
 src/pyams_i18n/resources/img/flags/sr_BA-Cyrl.png
 src/pyams_i18n/resources/img/flags/sr_BA-Latn.png
 src/pyams_i18n/resources/img/flags/sr_SP-Cyrl.png
 src/pyams_i18n/resources/img/flags/sr_SP-Latn.png
+src/pyams_i18n/resources/img/flags/sv.png
 src/pyams_i18n/resources/img/flags/sv_FI.png
 src/pyams_i18n/resources/img/flags/sv_SE.png
+src/pyams_i18n/resources/img/flags/sw.png
 src/pyams_i18n/resources/img/flags/sw_KE.png
+src/pyams_i18n/resources/img/flags/syr.png
 src/pyams_i18n/resources/img/flags/syr_SY.png
+src/pyams_i18n/resources/img/flags/ta.png
 src/pyams_i18n/resources/img/flags/ta_IN.png
+src/pyams_i18n/resources/img/flags/te.png
 src/pyams_i18n/resources/img/flags/te_IN.png
+src/pyams_i18n/resources/img/flags/tg.png
 src/pyams_i18n/resources/img/flags/tg_TJ-Cyrl.png
+src/pyams_i18n/resources/img/flags/th.png
 src/pyams_i18n/resources/img/flags/th_TH.png
+src/pyams_i18n/resources/img/flags/tk.png
 src/pyams_i18n/resources/img/flags/tk_TM.png
+src/pyams_i18n/resources/img/flags/tn.png
 src/pyams_i18n/resources/img/flags/tn_ZA.png
+src/pyams_i18n/resources/img/flags/tr.png
 src/pyams_i18n/resources/img/flags/tr_TR.png
+src/pyams_i18n/resources/img/flags/tt.png
 src/pyams_i18n/resources/img/flags/tt_RU.png
+src/pyams_i18n/resources/img/flags/ug.png
 src/pyams_i18n/resources/img/flags/ug_CN.png
+src/pyams_i18n/resources/img/flags/uk.png
 src/pyams_i18n/resources/img/flags/uk_UA.png
+src/pyams_i18n/resources/img/flags/ur.png
 src/pyams_i18n/resources/img/flags/ur_IN.png
 src/pyams_i18n/resources/img/flags/ur_PK.png
+src/pyams_i18n/resources/img/flags/uz.png
 src/pyams_i18n/resources/img/flags/uz_UZ-Cyrl.png
 src/pyams_i18n/resources/img/flags/uz_UZ-Latn.png
+src/pyams_i18n/resources/img/flags/vi.png
 src/pyams_i18n/resources/img/flags/vi_VN.png
+src/pyams_i18n/resources/img/flags/wee.png
 src/pyams_i18n/resources/img/flags/wee_DE.png
+src/pyams_i18n/resources/img/flags/wen.png
 src/pyams_i18n/resources/img/flags/wen_DE.png
+src/pyams_i18n/resources/img/flags/wo.png
 src/pyams_i18n/resources/img/flags/wo_SN.png
+src/pyams_i18n/resources/img/flags/xh.png
 src/pyams_i18n/resources/img/flags/xh_ZA.png
+src/pyams_i18n/resources/img/flags/yo.png
 src/pyams_i18n/resources/img/flags/yo_NG.png
+src/pyams_i18n/resources/img/flags/zh.png
 src/pyams_i18n/resources/img/flags/zh_CN.png
 src/pyams_i18n/resources/img/flags/zh_HK.png
 src/pyams_i18n/resources/img/flags/zh_MO.png
 src/pyams_i18n/resources/img/flags/zh_SG.png
 src/pyams_i18n/resources/img/flags/zh_TW.png
+src/pyams_i18n/resources/img/flags/zu.png
 src/pyams_i18n/resources/img/flags/zu_ZA.png
 src/pyams_i18n/widget/__init__.py
 src/pyams_i18n/widget/templates/i18n-input.pt
 src/pyams_i18n/zmi/__init__.py
-src/pyams_i18n/zmi/configure.zcml
+src/pyams_i18n/zmi/language.py
 src/pyams_i18n/zmi/negotiator.py
\ No newline at end of file