# HG changeset patch
# User Thierry Florac <tflorac@ulthar.net>
# Date 1544189274 -3600
# Node ID 2be615fc6da4963c24519fca47f6a549af627c6d
# Parent  4b8d1079828218e1055e3ce57a2b7443ff518968# Parent  2265a1c6cbd1db081b8ce54ceaf1d624292ff0da
Rebase after corruption

diff -r 4b8d10798282 -r 2be615fc6da4 .hgtags
diff -r 4b8d10798282 -r 2be615fc6da4 MANIFEST.in
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/MANIFEST.in	Fri Dec 07 14:27:54 2018 +0100
@@ -0,0 +1,5 @@
+include *.txt
+recursive-include docs *
+recursive-include src *
+global-exclude *.pyc
+global-exclude *.*~
diff -r 4b8d10798282 -r 2be615fc6da4 buildout.cfg
diff -r 4b8d10798282 -r 2be615fc6da4 docs/HISTORY.txt
diff -r 4b8d10798282 -r 2be615fc6da4 setup.py
diff -r 4b8d10798282 -r 2be615fc6da4 src/pyams_alchemy.egg-info/PKG-INFO
diff -r 4b8d10798282 -r 2be615fc6da4 src/pyams_alchemy.egg-info/SOURCES.txt
diff -r 4b8d10798282 -r 2be615fc6da4 src/pyams_alchemy.egg-info/requires.txt
diff -r 4b8d10798282 -r 2be615fc6da4 src/pyams_alchemy/__init__.py
diff -r 4b8d10798282 -r 2be615fc6da4 src/pyams_alchemy/configure.zcml
diff -r 4b8d10798282 -r 2be615fc6da4 src/pyams_alchemy/engine.py
diff -r 4b8d10798282 -r 2be615fc6da4 src/pyams_alchemy/interfaces/__init__.py
diff -r 4b8d10798282 -r 2be615fc6da4 src/pyams_alchemy/loader.py
diff -r 4b8d10798282 -r 2be615fc6da4 src/pyams_alchemy/locales/fr/LC_MESSAGES/pyams_alchemy.mo
diff -r 4b8d10798282 -r 2be615fc6da4 src/pyams_alchemy/locales/fr/LC_MESSAGES/pyams_alchemy.po
--- a/src/pyams_alchemy/locales/fr/LC_MESSAGES/pyams_alchemy.po	Fri Jul 20 12:50:01 2018 +0200
+++ b/src/pyams_alchemy/locales/fr/LC_MESSAGES/pyams_alchemy.po	Fri Dec 07 14:27:54 2018 +0100
@@ -67,8 +67,8 @@
 #: src/pyams_alchemy/interfaces/__init__.py:59
 msgid "SQLAlchemy connection recycle time (-1 for none)"
 msgstr ""
-"Durée de vie (en secondes) des connexions avant leur recyclage ; indiquer -1 pour "
-"conserver les connexions"
+"Durée de vie (en secondes) des connexions avant leur recyclage ; indiquer -1 "
+"pour conserver les connexions"
 
 #: src/pyams_alchemy/metadirectives.py:58
 #: src/pyams_alchemy/interfaces/__init__.py:63
@@ -78,7 +78,9 @@
 #: src/pyams_alchemy/metadirectives.py:59
 #: src/pyams_alchemy/interfaces/__init__.py:64
 msgid "Log all pool checkouts/checkins to system logger?"
-msgstr "Tracer toutes les entrées/sorties du pool de connexions dans le système de logs de l'application"
+msgstr ""
+"Tracer toutes les entrées/sorties du pool de connexions dans le système de "
+"logs de l'application"
 
 #: src/pyams_alchemy/metadirectives.py:63
 #: src/pyams_alchemy/interfaces/__init__.py:68
@@ -157,4 +159,5 @@
 
 #: src/pyams_alchemy/interfaces/__init__.py:44
 msgid "Log all SQL statements to system logger"
-msgstr "Tracer toutes les instructions SQL dans le système de logs de l'application"
+msgstr ""
+"Tracer toutes les instructions SQL dans le système de logs de l'application"
diff -r 4b8d10798282 -r 2be615fc6da4 src/pyams_alchemy/locales/pyams_alchemy.mo
Binary file src/pyams_alchemy/locales/pyams_alchemy.mo has changed
diff -r 4b8d10798282 -r 2be615fc6da4 src/pyams_alchemy/locales/pyams_alchemy.pot
diff -r 4b8d10798282 -r 2be615fc6da4 src/pyams_alchemy/metaconfigure.py
diff -r 4b8d10798282 -r 2be615fc6da4 src/pyams_alchemy/metadirectives.py
diff -r 4b8d10798282 -r 2be615fc6da4 src/pyams_alchemy/mixin.py
diff -r 4b8d10798282 -r 2be615fc6da4 src/pyams_alchemy/zmi/engine.py