Categories option management update.

- Rewrite of the tpl file (no more table in it)
- Deletion of duplicate entry in language files
- French version


git-svn-id: http://piwigo.org/svn/trunk@622 68402e56-0260-453c-a942-63ccdbb3a9ee

4 files changed, 23 insertions, 28 deletions

diff --git a/admin.php b/admin.php
index 8176a2f0a..d9e6a700b 100644
--- a/admin.php
+++ b/admin.php
@@ -199,10 +199,10 @@ $template->assign_vars(array(
   'L_GROUPS'=>$lang['groups'],
   'L_AUTH'=>$lang['permissions'],
   'L_UPDATE'=>$lang['update'],
-  'L_CAT_UPLOAD'=>$lang['cat_options_upload_menu'],
-  'L_CAT_COMMENTS'=>$lang['cat_options_comments_menu'],
-  'L_CAT_VISIBLE'=>$lang['cat_options_visible_menu'],
-  'L_CAT_STATUS'=>$lang['cat_options_status_menu'],
+  'L_CAT_UPLOAD'=>$lang['upload'],
+  'L_CAT_COMMENTS'=>$lang['comments'],
+  'L_CAT_VISIBLE'=>$lang['lock'],
+  'L_CAT_STATUS'=>$lang['permissions'],
 
   'U_CONFIG_GENERAL'=>add_session_id($conf_link.'general' ),
   'U_CONFIG_COMMENTS'=>add_session_id($conf_link.'comments' ),
diff --git a/admin/cat_list.php b/admin/cat_list.php
index 639a74ce6..eac3869b3 100644
--- a/admin/cat_list.php
+++ b/admin/cat_list.php
@@ -282,8 +282,8 @@ $template->assign_vars(array(
   'L_SUBMIT'=>$lang['submit'],
   'L_STORAGE'=>$lang['storage'],
   'L_NB_IMG'=>$lang['pictures'],
-  'L_MOVE_UP'=>$lang['cat_up'],
-  'L_MOVE_DOWN'=>$lang['cat_down'],
+  'L_MOVE_UP'=>$lang['up'],
+  'L_MOVE_DOWN'=>$lang['down'],
   'L_EDIT'=>$lang['edit'],
   'L_INFO_IMG'=>$lang['cat_image_info'],
   'L_DELETE'=>$lang['delete'],
diff --git a/admin/cat_modify.php b/admin/cat_modify.php
index e4d2ffaff..ca133d79c 100644
--- a/admin/cat_modify.php
+++ b/admin/cat_modify.php
@@ -151,7 +151,7 @@ $template->assign_vars(array(
   'L_EDIT_STATUS_INFO'=>$lang['cat_access_info'],
   'L_ACCESS_FREE'=>$lang['free'],
   'L_ACCESS_RESTRICTED'=>$lang['restricted'],
-  'L_EDIT_LOCK'=>$lang['cat_lock'],
+  'L_EDIT_LOCK'=>$lang['lock'],
   'L_EDIT_LOCK_INFO'=>$lang['cat_lock_info'],
   'L_YES'=>$lang['yes'],
   'L_NO'=>$lang['no'],
diff --git a/admin/cat_options.php b/admin/cat_options.php
index b62422961..21eb13434 100644
--- a/admin/cat_options.php
+++ b/admin/cat_options.php
@@ -182,11 +182,6 @@ $template->assign_vars(
     'L_SUBMIT'=>$lang['submit'],
     'L_RESET'=>$lang['reset'],
     
-    'U_UPLOAD'=>add_session_id($base_url.'upload'),
-    'U_VISIBLE'=>add_session_id($base_url.'visible'),
-    'U_COMMENTS'=>add_session_id($base_url.'comments'),
-    'U_STATUS'=>add_session_id($base_url.'status'),
-    
     'F_ACTION'=>add_session_id($base_url.$page['section'])
    )
  );
@@ -227,10 +222,10 @@ SELECT id,name,uppercats,global_rank
 ;';
     $template->assign_vars(
       array(
-        'L_TITLE' => $lang['cat_options_upload_title'],
-        'L_CAT_OPTIONS_TRUE' => $lang['cat_options_upload_true'],
-        'L_CAT_OPTIONS_FALSE' => $lang['cat_options_upload_false'],
-        'L_CAT_OPTIONS_INFO' => $lang['cat_options_upload_info'],
+        'L_CAT_TITLE' => $lang['cat_upload_title'],
+        'L_CAT_OPTIONS_TRUE' => $lang['authorized'],
+        'L_CAT_OPTIONS_FALSE' => $lang['forbidden'],
+        'L_CAT_OPTIONS_INFO' => $lang['cat_upload_info'],
         )
       );
     $template->assign_block_vars('upload', array());
@@ -250,10 +245,10 @@ SELECT id,name,uppercats,global_rank
 ;';
     $template->assign_vars(
       array(
-        'L_TITLE' => $lang['cat_options_comments_title'],
-        'L_CAT_OPTIONS_TRUE' => $lang['cat_options_comments_true'],
-        'L_CAT_OPTIONS_FALSE' => $lang['cat_options_comments_false'],
-        'L_CAT_OPTIONS_INFO' => $lang['cat_options_comments_info'],
+        'L_CAT_TITLE' => $lang['cat_comments_title'],
+        'L_CAT_OPTIONS_TRUE' => $lang['authorized'],
+        'L_CAT_OPTIONS_FALSE' => $lang['forbidden'],
+        'L_CAT_OPTIONS_INFO' => $lang['cat_comments_info'],
         )
       );
     $template->assign_block_vars('comments', array());
@@ -273,10 +268,10 @@ SELECT id,name,uppercats,global_rank
 ;';
     $template->assign_vars(
       array(
-        'L_TITLE' => $lang['cat_options_visible_title'],
-        'L_CAT_OPTIONS_TRUE' => $lang['cat_options_visible_true'],
-        'L_CAT_OPTIONS_FALSE' => $lang['cat_options_visible_false'],
-        'L_CAT_OPTIONS_INFO' => $lang['cat_options_visible_info'],
+        'L_CAT_TITLE' => $lang['cat_lock_title'],
+        'L_CAT_OPTIONS_TRUE' => $lang['lock'],
+        'L_CAT_OPTIONS_FALSE' => $lang['unlock'],
+        'L_CAT_OPTIONS_INFO' => $lang['cat_lock_info'],
         )
       );
     $template->assign_block_vars('visible', array());
@@ -296,10 +291,10 @@ SELECT id,name,uppercats,global_rank
 ;';
     $template->assign_vars(
       array(
-        'L_TITLE' => $lang['cat_options_status_title'],
-        'L_CAT_OPTIONS_TRUE' => $lang['cat_options_status_true'],
-        'L_CAT_OPTIONS_FALSE' => $lang['cat_options_status_false'],
-        'L_CAT_OPTIONS_INFO' => $lang['cat_options_status_info'],
+        'L_CAT_TITLE' => $lang['cat_status_title'],
+        'L_CAT_OPTIONS_TRUE' => $lang['cat_public'],
+        'L_CAT_OPTIONS_FALSE' => $lang['cat_private'],
+        'L_CAT_OPTIONS_INFO' => $lang['cat_status_info'],
         )
       );
     $template->assign_block_vars('status', array());