Author: gruiick Date: Sat Sep 16 14:43:13 2006 New Revision: 339 URL: http://svn.gna.org/viewcvs/galette?rev=339&view=rev Log: Merge from main trunk (r337) Added: branches/galette-0-63-bugfix/galette/includes/adodb492/ - copied from r338, trunk/galette/includes/adodb492/ branches/galette-0-63-bugfix/galette/lang/chinese.gif - copied unchanged from r338, trunk/galette/lang/chinese.gif branches/galette-0-63-bugfix/galette/lang/dutch.gif - copied unchanged from r338, trunk/galette/lang/dutch.gif branches/galette-0-63-bugfix/galette/lang/english.gif - copied unchanged from r338, trunk/galette/lang/english.gif branches/galette-0-63-bugfix/galette/lang/french.gif - copied unchanged from r338, trunk/galette/lang/french.gif branches/galette-0-63-bugfix/galette/lang/italian.gif - copied unchanged from r338, trunk/galette/lang/italian.gif branches/galette-0-63-bugfix/galette/lang/spanish.gif - copied unchanged from r338, trunk/galette/lang/spanish.gif Modified: branches/galette-0-63-bugfix/galette/ajouter_adherent.php branches/galette-0-63-bugfix/galette/change_passwd.php branches/galette-0-63-bugfix/galette/etiquettes_adherents.php branches/galette-0-63-bugfix/galette/includes/adodb branches/galette-0-63-bugfix/galette/install/index.php branches/galette-0-63-bugfix/galette/lang/en_US.po branches/galette-0-63-bugfix/galette/lang/en_US/LC_MESSAGES/galette.mo branches/galette-0-63-bugfix/galette/lang/es_ES@xxxxxxx branches/galette-0-63-bugfix/galette/lang/es_ES@euro/LC_MESSAGES/galette.mo branches/galette-0-63-bugfix/galette/lang/fr_FR@xxxxxxx branches/galette-0-63-bugfix/galette/lang/fr_FR@euro/LC_MESSAGES/galette.mo branches/galette-0-63-bugfix/galette/lang/lang_english.php branches/galette-0-63-bugfix/galette/lang/lang_french.php branches/galette-0-63-bugfix/galette/lang/lang_spanish.php branches/galette-0-63-bugfix/galette/lang/messages.po branches/galette-0-63-bugfix/galette/log.php branches/galette-0-63-bugfix/galette/lostpasswd.php branches/galette-0-63-bugfix/galette/mailing_adherents.php branches/galette-0-63-bugfix/galette/self_adherent.php branches/galette-0-63-bugfix/galette/self_contribution.php branches/galette-0-63-bugfix/galette/templates/default/voir_adherent.tpl