merge r4955 from branch 2.0 to trunk

bug 1452 fixed: check cookies are enabled in web browser and notify user
otherwise that she can't connect.


git-svn-id: http://piwigo.org/svn/trunk@4956 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
plegall 2010-02-23 15:52:32 +00:00
commit 149268353d
3 changed files with 18 additions and 6 deletions

View file

@ -369,4 +369,5 @@ $lang['Reset_To_Default'] = 'Reset to default values';
// --------- Starting below: New or revised $lang ---- from Colibri (2.1)
$lang['del_all_favorites_hint'] = 'delete all images from your favorites';
$lang['Sent by'] = 'Sent by';
$lang['Cookies are blocked or not supported by your browser. You must enable cookies to connect.'] = 'Cookies are blocked or not supported by your browser. You must enable cookies to connect.';
?>

View file

@ -368,4 +368,5 @@ $lang['cloud'] = 'nuage';
$lang['Reset_To_Default'] = 'Rétablir les valeurs par défaut';
$lang['del_all_favorites_hint'] = 'supprimer toutes les images de vos favoris';
$lang['Sent by'] = 'Envoyé par';
$lang['Cookies are blocked or not supported by your browser. You must enable cookies to connect.'] = 'Les cookies sont bloqués ou non supportés par votre navigateur web. Vous devez activer les cookies pour vous connecter.';
?>