[galette-commits] [GIT] galette/galette.git branch, develop, updated. 0.7.1.2-49-g1c2fc28

[git@xxxxxxxxxxxxx]

This is an automated email from git. It was enerated because a ref
change was pushed to the repository "galette/galette.git".

The branch, develop has been updated
       via  1c2fc28f90306e6a464b14a6ce4023a97655b222 (commit)
       via  f8d78d8012720be84efe0b211336b753bd20dbdd (commit)
       via  28231a739539dac4819bbf90b87ca9bd5b78151e (commit)
       via  ae566fe6deda8bc56beef6089e2501491ff26511 (commit)
       via  d080b72e7f4cadbe8dde99616406fbf313b4f9a6 (commit)
      from  2c77df3a2aecfee85f09fba43ab4a6903c41d0db (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 1c2fc28f90306e6a464b14a6ce4023a97655b222
Merge: 2c77df3 f8d78d8
Author: Johan Cwiklinski <johan@xxxxxxxx>
Date:   Sun Oct 7 12:12:42 2012 +0200

    Merge branch 'hotfix/0.7.1.3' into develop
    
    Conflicts:
    	galette/includes/galette.inc.php

commit f8d78d8012720be84efe0b211336b753bd20dbdd
Author: Johan Cwiklinski <johan@xxxxxxxx>
Date:   Sun Oct 7 12:11:44 2012 +0200

    Bump version

commit 28231a739539dac4819bbf90b87ca9bd5b78151e
Author: Johan Cwiklinski <johan@xxxxxxxx>
Date:   Sun Oct 7 12:11:35 2012 +0200

    I18n

commit ae566fe6deda8bc56beef6089e2501491ff26511
Author: Johan Cwiklinski <johan@xxxxxxxx>
Date:   Sun Oct 7 12:08:37 2012 +0200

    Translation issue

-----------------------------------------------------------------------

Summary of changes:
 galette/lang/en_US.po                          |  406 ++++++++++++------------
 galette/lang/en_US/LC_MESSAGES/galette.mo      |  Bin 78409 -> 78803 bytes
 galette/lang/fr_FR.utf8.po                     |  406 ++++++++++++------------
 galette/lang/fr_FR.utf8/LC_MESSAGES/galette.mo |  Bin 86756 -> 87201 bytes
 galette/lang/lang_english.php                  |  370 +++++++++++-----------
 galette/lang/lang_french.php                   |  370 +++++++++++-----------
 galette/lang/messages.po                       |  392 ++++++++++++-----------
 galette/templates/default/page.tpl             |    2 +-
 galette/templates/default/public_page.tpl      |    2 +-
 9 files changed, 1000 insertions(+), 948 deletions(-)


hooks/post-receive
--
galette/galette.git

-- 
-- 
Galette repositories commits - http://galette.tuxfamily.org