aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorplegall <plg@piwigo.org>2006-06-02 19:31:29 +0000
committerplegall <plg@piwigo.org>2006-06-02 19:31:29 +0000
commit84372ad5c9fe04b7952ed13068447ad60a59a729 (patch)
tree4ba0cfeccb39cc95d8667f7f85805a36afe2312e
parentcfbadffe5facc16a1690aa1528a3996d0619baa9 (diff)
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
Diffstat (limited to '')
-rw-r--r--admin/rating.php2
-rw-r--r--language/en_UK.iso-8859-1/admin.lang.php1
-rw-r--r--language/fr_FR.iso-8859-1/admin.lang.php2
3 files changed, 3 insertions, 2 deletions
diff --git a/admin/rating.php b/admin/rating.php
index e228726f3..21850d5df 100644
--- a/admin/rating.php
+++ b/admin/rating.php
@@ -164,7 +164,7 @@ for ($i=0; $i<count($available_order_by); $i++)
$user_options = array(
array(
'value' => 'all',
- 'content' => l10n('All'),
+ 'content' => l10n('all'),
),
array(
'value' => 'user',
diff --git a/language/en_UK.iso-8859-1/admin.lang.php b/language/en_UK.iso-8859-1/admin.lang.php
index a29ab89f4..466ad5611 100644
--- a/language/en_UK.iso-8859-1/admin.lang.php
+++ b/language/en_UK.iso-8859-1/admin.lang.php
@@ -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';
diff --git a/language/fr_FR.iso-8859-1/admin.lang.php b/language/fr_FR.iso-8859-1/admin.lang.php
index 6e2f4ea71..8fa0a180c 100644
--- a/language/fr_FR.iso-8859-1/admin.lang.php
+++ b/language/fr_FR.iso-8859-1/admin.lang.php
@@ -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ès aux groupes sélectionnés';
$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';