[Galette-cvs] r318 - in /branches/galette-0-63-bugfix/galette: ./ cache/ includes/ lang/ lang/en_US/LC_MESSAGES/ lang/es_ES@euro/LC_MESSAGES/ lang/fr_FR@euro/LC_MESSAGES/ public/ tempimages/ templates/default/ -- August 23, 2006 - 09:30

Author: gruiick
Date: Wed Aug 23 09:29:34 2006
New Revision: 318

URL: http://svn.gna.org/viewcvs/galette?rev=318&view=rev
Log:

Merging from main trunk (r317).


Added:
    branches/galette-0-63-bugfix/galette/cache/readme.txt
      - copied unchanged from r317, trunk/galette/cache/readme.txt
    branches/galette-0-63-bugfix/galette/lang/en_US/LC_MESSAGES/galette.mo   
(props changed)
      - copied unchanged from r317, 
trunk/galette/lang/en_US/LC_MESSAGES/galette.mo
    
branches/galette-0-63-bugfix/galette/lang/es_ES@euro/LC_MESSAGES/galette.mo   
(props changed)
      - copied unchanged from r317, 
trunk/galette/lang/es_ES@euro/LC_MESSAGES/galette.mo
    
branches/galette-0-63-bugfix/galette/lang/fr_FR@euro/LC_MESSAGES/galette.mo   
(props changed)
      - copied unchanged from r317, 
trunk/galette/lang/fr_FR@euro/LC_MESSAGES/galette.mo
    branches/galette-0-63-bugfix/galette/public/
      - copied from r317, trunk/galette/public/
    branches/galette-0-63-bugfix/galette/tempimages/readme.txt
      - copied unchanged from r317, trunk/galette/tempimages/readme.txt
Modified:
    branches/galette-0-63-bugfix/galette/editer_champ.php
    branches/galette-0-63-bugfix/galette/includes/functions.inc.php
    branches/galette-0-63-bugfix/galette/lang/en_US.po
    branches/galette-0-63-bugfix/galette/lang/es_ES@xxxxxxx
    branches/galette-0-63-bugfix/galette/lang/fr_FR@xxxxxxx
    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/templates/default/preferences.tpl