merge -r1332:1333 from branch 1.6 to trunk (bug 374 fixed)

git-svn-id: http://piwigo.org/svn/trunk@1334 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
plegall 2006-06-02 19:31:29 +00:00
commit 84372ad5c9
3 changed files with 3 additions and 2 deletions

View file

@ -87,6 +87,7 @@ $lang['Grant selected groups'] = 'Grant selected groups';
$lang['Grant selected users'] = 'Grant selected users';
$lang['Group name'] = 'Group name';
$lang['Groups'] = 'Groups';
$lang['Guests'] = 'Guests';
$lang['History'] = 'History';
$lang['Informations'] = 'Informations';
$lang['Interface theme'] = 'Interface theme';

View file

@ -25,7 +25,6 @@
// | USA. |
// +-----------------------------------------------------------------------+
$lang['%d categories including %d physical and %d virtual'] = '%d catégories dont %d physiques et %d virtuelles';
$lang['%d categories moved'] = '%d catégories déplacées';
$lang['%d comments'] = '%d commentaires utilisateur';
@ -88,6 +87,7 @@ $lang['Grant selected groups'] = 'Donner l\'acc
$lang['Grant selected users'] = 'Donner l\'accès aux utilisateurs sélectionnés';
$lang['Group name'] = 'Nom du groupe';
$lang['Groups'] = 'Groupes';
$lang['Guests'] = 'Invités';
$lang['History'] = 'Historique';
$lang['Informations'] = 'Informations';
$lang['Interface theme'] = 'Theme de l\'interface';