diff options
| author | Adrian Lang <mail@adrianlang.de> | 2011-04-22 22:35:43 +0200 |
|---|---|---|
| committer | Adrian Lang <mail@adrianlang.de> | 2011-04-22 22:35:43 +0200 |
| commit | 8ccf9c9785ec2b626bad30a88a21f02886845418 (patch) | |
| tree | 0ecd6103880e3350bd37ba11ae3872805ede1755 /lib/plugins/usermanager/lang/fr/lang.php | |
| parent | e2092379b1c3200832cb569781ec647db5aeef0f (diff) | |
| parent | 23d27376b2a2f6a1ccf0777c48435717494d85b1 (diff) | |
| download | rpg-8ccf9c9785ec2b626bad30a88a21f02886845418.tar.gz rpg-8ccf9c9785ec2b626bad30a88a21f02886845418.tar.bz2 | |
Merge branch 'master' into stable
Conflicts:
data/deleted.files
doku.php
lib/exe/xmlrpc.php
Diffstat (limited to 'lib/plugins/usermanager/lang/fr/lang.php')
| -rw-r--r-- | lib/plugins/usermanager/lang/fr/lang.php | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/plugins/usermanager/lang/fr/lang.php b/lib/plugins/usermanager/lang/fr/lang.php index 92bc127ed..49baf9d51 100644 --- a/lib/plugins/usermanager/lang/fr/lang.php +++ b/lib/plugins/usermanager/lang/fr/lang.php @@ -14,6 +14,7 @@ * @author Philippe Bajoit <philippe.bajoit@gmail.com> * @author Florian Gaub <floriang@floriang.net> * @author Samuel Dorsaz samuel.dorsaz@novelion.net + * @author Johan Guilbaud <guilbaud.johan@gmail.com> */ $lang['menu'] = 'Gestion des utilisateurs'; $lang['noauth'] = '(authentification utilisateur non disponible)'; |