From a6d104e98f2dcb2f1de03fb13ce43083c66274a4 Mon Sep 17 00:00:00 2001
From: gweltas <gweltas@piwigo.org>
Date: Thu, 23 Dec 2004 12:30:03 +0000
Subject: - French translation of general lock - Correction of page title in
 the category page

git-svn-id: http://piwigo.org/svn/trunk@654 68402e56-0260-453c-a942-63ccdbb3a9ee
---
 category.php                             | 10 ++++++----
 include/functions_category.inc.php       |  2 +-
 language/fr_FR.iso-8859-1/admin.lang.php |  3 +++
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/category.php b/category.php
index 0824c2efb..581b4055d 100644
--- a/category.php
+++ b/category.php
@@ -106,7 +106,9 @@ if ( !isset( $page['title'] ) )
 {
   $page['title'] = $lang['no_category'];
 }
-$template_title = $page['title'];
+$template_title = get_cat_display_name($page['cat_name'],
+                             'category.php?cat=',
+                             false);;
 if ( isset( $page['cat_nb_images'] ) and $page['cat_nb_images'] > 0 )
 {
   $template_title.= ' ['.$page['cat_nb_images'].']';
@@ -135,8 +137,8 @@ $template->assign_vars(array(
   'L_USERNAME' => $lang['login'],
   'L_PASSWORD' => $lang['password'],
   'L_HELLO' => $lang['hello'],
-	'L_REGISTER' => $lang['ident_register'],
-	'L_LOGIN' => $lang['menu_login'],
+  'L_REGISTER' => $lang['ident_register'],
+  'L_LOGIN' => $lang['menu_login'],
   'L_LOGOUT' => $lang['logout'],
   'L_ADMIN' => $lang['admin'],
   'L_ADMIN_HINT' => $lang['hint_admin'],
@@ -148,7 +150,7 @@ $template->assign_vars(array(
   'T_RECENT' => $icon_recent,
 
   'U_HOME' => add_session_id( PHPWG_ROOT_PATH.'category.php' ),
-	'U_REGISTER' => add_session_id( PHPWG_ROOT_PATH.'register.php' ),
+  'U_REGISTER' => add_session_id( PHPWG_ROOT_PATH.'register.php' ),
   'U_LOGOUT' => PHPWG_ROOT_PATH.'category.php?act=logout',
   'U_ADMIN'=>add_session_id( PHPWG_ROOT_PATH.'admin.php' ),
   'U_PROFILE'=>add_session_id(PHPWG_ROOT_PATH.'profile.php?'.str_replace( '&', '&amp;', $_SERVER['QUERY_STRING'] ))
diff --git a/include/functions_category.inc.php b/include/functions_category.inc.php
index 5bcf82f6a..5c76dd065 100644
--- a/include/functions_category.inc.php
+++ b/include/functions_category.inc.php
@@ -348,7 +348,7 @@ function initialize_category( $calling_page = 'category' )
       $page['uppercats']      = $result['uppercats'];
       $page['title'] =
         get_cat_display_name($page['cat_name'],
-                             'category.php?cat=',
+                             '',
                              false);
       $page['where'] = ' WHERE category_id = '.$page['cat'];
     }
diff --git a/language/fr_FR.iso-8859-1/admin.lang.php b/language/fr_FR.iso-8859-1/admin.lang.php
index 93c8a4148..bad240705 100644
--- a/language/fr_FR.iso-8859-1/admin.lang.php
+++ b/language/fr_FR.iso-8859-1/admin.lang.php
@@ -154,6 +154,9 @@ $lang['conf_access'] = 'Type d\'acces';
 $lang['conf_log_info'] = 'historiser les visites sur le site ? Les visites seront visibles dans l\'historique de l\'administration';
 $lang['conf_notification'] = 'Notification par mail';
 $lang['conf_notification_info'] = 'Notification automatique par mail des administrateurs (seuls les administrateurs) lors de l\'ajout d\'un commentaire, ou lors de l\'ajout d\'une image.';
+$lang['conf_gallery_locked'] = 'Verrouiller la galerie';
+$lang['conf_gallery_locked_info'] = 'Verrouiller toute la galerie pour maintenance. 
+Attention à ne pas vous déconnecter : seul l\'administrateur sera capable d\'y accéder.';
 
 // Configuration -> comments
 $lang['conf_comments_title'] = 'Configuration des commentaires';
-- 
cgit v1.2.3