[Fusionforge-commits] FusionForge branch master updated. 821a74121d0ff1536808c42982f7944d69e35c04

Sylvain Beucler beuc-inria at fusionforge.org
Tue May 6 12:06:07 CEST 2014


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".

The branch, master has been updated
       via  821a74121d0ff1536808c42982f7944d69e35c04 (commit)
       via  db3935363702e91896b46d944f686ed756174cac (commit)
      from  d5982aac99b7b8ae8af527a8b32c589e05f5301a (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 821a74121d0ff1536808c42982f7944d69e35c04
Merge: d5982aa db39353
Author: Sylvain Beucler <sylvain.beucler at inria.fr>
Date:   Tue May 6 12:05:51 2014 +0200

    Merge branch 'Branch_5_3'
    
    Conflicts:
    	src/translations/fr.po

diff --cc src/translations/fr.po
index ebad576,0dff088..ee1bd23
--- a/src/translations/fr.po
+++ b/src/translations/fr.po
@@@ -3690,14 -3671,12 +3690,12 @@@ msgstr "Place de marché pour recruter 
  msgid "Site Admin"
  msgstr "Administration du site"
  
 -#: common/include/Navigation.class.php:304
 +#: common/include/Navigation.class.php:297
  msgid ""
  "Administration Submenu to handle global configuration, users & projects."
- msgstr ""
- "Sous-menu d'adminsitration, pour gérer la configuration globale, les "
- "utilisateurs et les projets."
+ msgstr "Sous-menu d'administration, pour gérer la configuration globale, les utilisateurs et les projets."
  
 -#: common/include/Navigation.class.php:312
 +#: common/include/Navigation.class.php:305
  msgid "Statistics about visits, users & projects in time frame."
  msgstr ""
  "Statistiques sur les nombres de visites, d'utilisateurs et de projets au fil "

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

Summary of changes:
 src/translations/fr.po |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list