diff options
| author | Michael Hamann <michael@content-space.de> | 2011-02-24 23:27:24 +0100 |
|---|---|---|
| committer | Michael Hamann <michael@content-space.de> | 2011-02-24 23:27:24 +0100 |
| commit | f77fc90de1e477b721442757cd7413f91cccc044 (patch) | |
| tree | 2abb734dacf39419b96b6b70c65115de57228fc3 /lib/plugins/usermanager/lang/fr | |
| parent | b8c040db1fdc0eee80963e57d95a15fd3813912d (diff) | |
| parent | bd07158f0f2569ae470f980dd49d69b7f1fd2c49 (diff) | |
| download | rpg-f77fc90de1e477b721442757cd7413f91cccc044.tar.gz rpg-f77fc90de1e477b721442757cd7413f91cccc044.tar.bz2 | |
Merge branch 'master' into indexer_rewrite
Conflicts:
inc/fulltext.php
inc/indexer.php
lib/exe/indexer.php
Diffstat (limited to 'lib/plugins/usermanager/lang/fr')
| -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)'; |