- Group permission delivery

- Reorganisation of common.lang.php


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

14 files changed, 342 insertions, 365 deletions

diff --git a/admin/group_list.php b/admin/group_list.php
index d399a6d69..2d9ff7e26 100644
--- a/admin/group_list.php
+++ b/admin/group_list.php
@@ -135,28 +135,25 @@ $groups_display .= '</select>';
 $action = PHPWG_ROOT_PATH.'admin.php?page=group_list';
 //----------------------------------------------------- template initialization
 $template->set_filenames( array('groups'=>'admin/group_list.tpl') );
-$tpl = array( 'group_add','add','listuser_permission','delete',
-              'group_confirm','yes','no','group_list_title' );
-
 $template->assign_vars(array(
   'S_GROUP_SELECT'=>$groups_display,
 	
   'L_GROUP_SELECT'=>$lang['group_list_title'],
-	'L_GROUP_CONFIRM'=>$lang['group_confirm_delete'],
-	'L_LOOK_UP'=>$lang['edit'],
-	'L_GROUP_DELETE'=>$lang['delete'],
+  'L_GROUP_CONFIRM'=>$lang['group_confirm_delete'],
+  'L_LOOK_UP'=>$lang['edit'],
+  'L_GROUP_DELETE'=>$lang['delete'],
   'L_CREATE_NEW_GROUP'=>$lang['group_add'],
   'L_GROUP_EDIT'=>$lang['group_edit'],
-	'L_USER_NAME'=>$lang['login'],
-	'L_USER_EMAIL'=>$lang['mail_address'],
-	'L_USER_SELECT'=>$lang['Select'],
-	'L_DENY_SELECTED'=>$lang['group_deny_user'],
-	'L_ADD_MEMBER'=>$lang['group_add_user'],
+  'L_USER_NAME'=>$lang['login'],
+  'L_USER_EMAIL'=>$lang['mail_address'],
+  'L_USER_SELECT'=>$lang['Select'],
+  'L_DENY_SELECTED'=>$lang['group_deny_user'],
+  'L_ADD_MEMBER'=>$lang['group_add_user'],
   'L_FIND_USERNAME'=>$lang['Find_username'],
 	
-	'S_GROUP_ACTION'=>add_session_id($action),
-	'U_SEARCH_USER' => add_session_id(PHPWG_ROOT_PATH.'admin/search.php')
-	));
+  'S_GROUP_ACTION'=>add_session_id($action),
+  'U_SEARCH_USER' => add_session_id(PHPWG_ROOT_PATH.'admin/search.php')
+  ));
 
 if ($groups_nb) 
 {
@@ -167,32 +164,32 @@ if ($groups_nb)
 if ( isset( $_POST['edit']) || isset( $_POST['add']) || isset( $_POST['deny_user'] ))
 {
   // Retrieving the group name
-	$query = 'SELECT id, name FROM '.GROUPS_TABLE;
+  $query = 'SELECT id, name FROM '.GROUPS_TABLE;
   $query.= " WHERE id = '".$_POST['group_id']."'";
   $query.= ';';
   $result = mysql_fetch_array(pwg_query( $query ));
   $template->assign_block_vars('edit_group',array(
 	  'GROUP_NAME'=>$result['name'],
-		'GROUP_ID'=>$result['id']
+	  'GROUP_ID'=>$result['id']
 		));
 		
   // Retrieving all the users
-	$query = 'SELECT id, username, mail_address';
-	$query.= ' FROM ('.USERS_TABLE.' as u';
-	$query.= ' LEFT JOIN '.USER_GROUP_TABLE.' as ug ON ug.user_id=u.id)';
+  $query = 'SELECT id, username, mail_address';
+  $query.= ' FROM ('.USERS_TABLE.' as u';
+  $query.= ' LEFT JOIN '.USER_GROUP_TABLE.' as ug ON ug.user_id=u.id)';
   $query.= " WHERE ug.group_id = '".$_POST['group_id']."';";
-	$result = pwg_query( $query );
-	$i=0;
-	while ( $row = mysql_fetch_array( $result ) )
-	{
-	  $class = ($i % 2)? 'row1':'row2'; $i++;
-	  $template->assign_block_vars('edit_group.user',array(
-		  'ID'=>$row['id'],
-			'NAME'=>$row['username'],
-			'EMAIL'=>$row['mail_address'],
-			'T_CLASS'=>$class
-		));
-	}
+  $result = pwg_query( $query );
+  $i=0;
+  while ( $row = mysql_fetch_array( $result ) )
+  {
+    $class = ($i % 2)? 'row1':'row2'; $i++;
+	$template->assign_block_vars('edit_group.user',array(
+		'ID'=>$row['id'],
+		'NAME'=>$row['username'],
+		'EMAIL'=>$row['mail_address'],
+		'T_CLASS'=>$class
+	));
+  }
 }
 
 //----------------------------------------------------------- sending html code
diff --git a/admin/group_perm.php b/admin/group_perm.php
index c60ed7420..ea81ac818 100644
--- a/admin/group_perm.php
+++ b/admin/group_perm.php
@@ -24,105 +24,144 @@
 // | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
 // | USA.                                                                  |
 // +-----------------------------------------------------------------------+
-include_once( './admin/include/isadmin.inc.php' );
-//----------------------------------------------------- template initialization
-$sub = $vtp->Open( './template/'.$user['template'].'/admin/group_perm.vtp' );
-$error = array();
-$tpl = array( 'permuser_authorized','permuser_forbidden','submit',
-              'permuser_parent_forbidden','permuser_info_message',
-              'adduser_info_back','permuser_only_private' );
-templatize_array( $tpl, 'lang', $sub );
-$vtp->setGlobalVar( $sub, 'user_template', $user['template'] );
+if( !defined("PHPWG_ROOT_PATH") )
+{
+	die ("Hacking attempt!");
+}
+
+include_once( PHPWG_ROOT_PATH.'admin/include/isadmin.inc.php' );
 //--------------------------------------------------------------------- updates
-if ( isset( $_POST['submit'] ) )
+if (isset($_POST['falsify'])
+         and isset($_POST['cat_true'])
+         and count($_POST['cat_true']) > 0)
 {
-  // cleaning the user_access table for this group
-  $query = 'DELETE FROM '.PREFIX_TABLE.'group_access';
-  $query.= ' WHERE group_id = '.$_GET['group_id'];
-  $query.= ';';
-  pwg_query( $query );
-  // selecting all private categories
-  $query = 'SELECT id';
-  $query.= ' FROM '.PREFIX_TABLE.'categories';
-  $query.= " WHERE status = 'private'";
-  $query.= ';';
-  $result = pwg_query( $query );
-  while ( $row = mysql_fetch_array( $result ) )
-  {
-    $radioname = 'access-'.$row['id'];
-    if ( $_POST[$radioname] == 0 )
-    {
-      $query = 'INSERT INTO '.PREFIX_TABLE.'group_access';
-      $query.= ' (group_id,cat_id) VALUES';
-      $query.= ' ('.$_GET['group_id'].','.$row['id'].')';
-      $query.= ';';
-      pwg_query ( $query );
-    }
-  }
-  // checking users favorites
-  $query = 'SELECT id';
-  $query.= ' FROM '.USERS_TABLE;
-  $query.= ';';
-  $result = pwg_query( $query );
-  while ( $row = mysql_fetch_array( $result ) )
-  {
-    check_favorites( $row['id'] );
-  }
-  // synchronization of calculated data
-  synchronize_group( $_GET['group_id'] );
-  // confirmation display
-  $vtp->addSession( $sub, 'confirmation' );
-  $url = './admin.php?page=group_list';
-  $vtp->setVar( $sub, 'confirmation.back_url', add_session_id( $url ) );
-  $vtp->closeSession( $sub, 'confirmation' );
+  // if you forbid access to a category, all sub-categories become
+  // automatically forbidden
+  $subcats = get_subcat_ids($_POST['cat_true']);
+  $query = 'DELETE FROM '.GROUP_ACCESS_TABLE.'
+    WHERE group_id = '.$_POST['group_id'].'
+    AND cat_id IN ('.implode(',', $subcats).');';
+  pwg_query($query);
 }
-//---------------------------------------------------------------- form display
-$restrictions = get_group_restrictions( $_GET['group_id'] );
-$action = './admin.php?page=group_perm&amp;group_id='.$_GET['group_id'];
-$vtp->setVar( $sub, 'action', add_session_id( $action ) );
-// only private categories are listed
-$query = 'SELECT id';
-$query.= ' FROM '.PREFIX_TABLE.'categories';
-$query.= " WHERE status = 'private'";
-$query.= ';';
-$result = pwg_query( $query );
-while ( $row = mysql_fetch_array( $result ) )
+else if (isset($_POST['trueify'])
+         and isset($_POST['cat_false'])
+         and count($_POST['cat_false']) > 0)
 {
-  $vtp->addSession( $sub, 'category' );
-  $vtp->setVar( $sub, 'category.id', $row['id'] );
-  $url = './admin.php?page=cat_perm&amp;cat_id='.$row['id'];
-  $vtp->setVar( $sub, 'category.cat_perm_link', add_session_id( $url ) );
-  // Is the group allowed to access this category
-  $is_group_allowed = is_group_allowed( $row['id'], $restrictions );
-  if ( $is_group_allowed == 0 )
+  $uppercats = get_uppercat_ids($_POST['cat_false']);
+  $private_uppercats = array();
+
+  $query = 'SELECT id
+    FROM '.CATEGORIES_TABLE.'
+    WHERE id IN ('.implode(',', $uppercats).')
+    AND status = \'private\';';
+  $result = pwg_query($query);
+  while ($row = mysql_fetch_array($result))
   {
-    $vtp->setVar( $sub, 'category.color', 'green' );
+    array_push($private_uppercats, $row['id']);
   }
-  else
+
+  // retrying to authorize a category which is already authorized may cause
+  // an error (in SQL statement), so we need to know which categories are
+  // accesible
+  $authorized_ids = array();
+    
+  $query = 'SELECT cat_id
+  FROM '.GROUP_ACCESS_TABLE.'
+  WHERE group_id = '.$_POST['group_id'].';';
+  $result = pwg_query($query);
+  
+  while ($row = mysql_fetch_array($result))
   {
-    $vtp->setVar( $sub, 'category.color', 'red' );
+    array_push($authorized_ids, $row['cat_id']);
   }
-  // category name
-  $cat_infos = get_cat_info( $row['id'] );
-  $name = get_cat_display_name($cat_infos['name']);
-  $vtp->setVar( $sub, 'category.name', $name );
-  // any subcat forbidden for this group ?
-  if ( $is_group_allowed == 2 )
+  
+  $inserts = array();
+  $to_autorize_ids = array_diff($private_uppercats, $authorized_ids);
+  foreach ($to_autorize_ids as $to_autorize_id)
   {
-    $vtp->addSession( $sub, 'parent_forbidden' );
-    $vtp->closeSession( $sub, 'parent_forbidden' );
+    array_push($inserts, array('group_id' => $_POST['group_id'],
+                               'cat_id' => $to_autorize_id));
   }
-  // forbidden or authorized access ?
-  if ( $is_group_allowed == 0 or $is_group_allowed == 2 )
+
+  mass_inserts(GROUP_ACCESS_TABLE, array('group_id','cat_id'), $inserts);
+}
+
+//----------------------------------------------------- template initialization
+$query = 'SELECT id,name FROM '.GROUPS_TABLE;
+$query.= ' ORDER BY id ASC;';
+$result = pwg_query( $query );
+$groups_display = '<select name="group_id">';
+$groups_nb=0;
+while ( $row = mysql_fetch_array( $result ) )
+{
+  $groups_nb++;
+  $selected = '';
+  if (isset($_POST['group_id']) && $_POST['group_id']==$row['id'])
+		$selected = 'selected';
+  $groups_display .= '<option value="' . $row['id'] . '" '.$selected.'>' . $row['name']  . '</option>';
+}
+$groups_display .= '</select>';
+
+$action = PHPWG_ROOT_PATH.'admin.php?page=group_perm';
+$template->set_filenames( array('groups'=>'admin/group_perm.tpl') );
+$template->assign_vars(array(
+  'S_GROUP_SELECT'=>$groups_display,
+  'L_GROUP_SELECT'=>$lang['group_list_title'],
+  'L_LOOK_UP'=>$lang['edit'],
+  'S_GROUP_ACTION'=>add_session_id($action)
+  ));
+  
+if ($groups_nb) 
+{
+  $template->assign_block_vars('select_box',array());
+}
+
+if ( isset( $_POST['edit']) || isset($_POST['falsify']) || isset($_POST['trueify']))
+{
+  $template->set_filenames(array('groups_auth'=>'admin/cat_options.tpl'));
+  $template->assign_vars(array(
+      'L_RESET'=>$lang['reset'],
+      'L_CAT_OPTIONS_TRUE'=>$lang['authorized'],
+      'L_CAT_OPTIONS_FALSE'=>$lang['forbidden'],
+      'L_CAT_OPTIONS_INFO'=>$lang['permuser_info'],
+      
+      'HIDDEN_NAME'=> 'group_id',
+      'HIDDEN_VALUE'=>$_POST['group_id'],
+      'F_ACTION' => add_session_id(PHPWG_ROOT_PATH.'admin.php?page=group_perm'),
+  ));
+  
+  // only private categories are listed
+  $query_true = '
+SELECT id,name,uppercats,global_rank
+  FROM '.CATEGORIES_TABLE.' INNER JOIN '.GROUP_ACCESS_TABLE.' ON cat_id = id
+  WHERE status = \'private\'
+    AND group_id = '.$_POST['group_id'].'
+;';
+  display_select_cat_wrapper($query_true,array(),'category_option_true');
+  
+  $result = pwg_query($query_true);
+  $authorized_ids = array();
+  while ($row = mysql_fetch_array($result))
   {
-    $vtp->setVar( $sub, 'category.authorized_checked', ' checked="checked"' );
+    array_push($authorized_ids, $row['id']);
   }
-  else
+  
+  $query_false = '
+SELECT id,name,uppercats,global_rank
+  FROM '.CATEGORIES_TABLE.'
+  WHERE status = \'private\'';
+  if (count($authorized_ids) > 0)
   {
-    $vtp->setVar( $sub, 'category.forbidden_checked', ' checked="checked"' );
+    $query_false.= '
+    AND id NOT IN ('.implode(',', $authorized_ids).')';
   }
-  $vtp->closeSession( $sub, 'category' );
+  $query_false.= '
+;';
+  display_select_cat_wrapper($query_false,array(),'category_option_false');
+  
+  $template->assign_var_from_handle('ADMIN_CONTENT_2', 'groups_auth');
 }
 //----------------------------------------------------------- sending html code
-$vtp->Parse( $handle , 'sub', $sub );
+$template->assign_var_from_handle('ADMIN_CONTENT', 'groups');
+
 ?>
diff --git a/admin/include/isadmin.inc.php b/admin/include/isadmin.inc.php
index 9b71cb900..0d05c9853 100644
--- a/admin/include/isadmin.inc.php
+++ b/admin/include/isadmin.inc.php
@@ -30,7 +30,7 @@ include( PHPWG_ROOT_PATH.'admin/include/functions.php' );
 if ($user['status'] != 'admin')
 {
   echo '<div style="text-align:center;">'.$lang['access_forbiden'].'<br />';
-  echo '<a href="'.PHPWG_ROOT_PATH.'identification.php">'.$lang['ident_title'].'</a></div>';
+  echo '<a href="'.PHPWG_ROOT_PATH.'identification.php">'.$lang['identification'].'</a></div>';
   exit();
 }
 ?>
diff --git a/category.php b/category.php
index 86038d981..ba87a835c 100644
--- a/category.php
+++ b/category.php
@@ -136,7 +136,7 @@ $template->assign_vars(array(
   'L_SUMMARY' => $lang['title_menu'],
   'L_UPLOAD' => $lang['upload_picture'],
   'L_COMMENT' => $lang['comments'],
-  'L_IDENTIFY' => $lang['ident_title'],
+  'L_IDENTIFY' => $lang['identification'],
   'L_SUBMIT' => $lang['menu_login'],
   'L_USERNAME' => $lang['login'],
   'L_PASSWORD' => $lang['password'],
diff --git a/identification.php b/identification.php
index a395e72ca..6bce5e447 100644
--- a/identification.php
+++ b/identification.php
@@ -61,7 +61,7 @@ SELECT id, password
 //
 // Start output of page
 //
-$title = $lang['ident_page_title'];
+$title = $lang['identification'];
 include(PHPWG_ROOT_PATH.'include/page_header.php');
 
 $template->set_filenames( array('identification'=>'identification.tpl') );
@@ -70,7 +70,7 @@ $template->assign_vars(
   array(
     'MAIL_ADMIN' => $conf['mail_webmaster'],
     
-    'L_TITLE' => $lang['ident_title'],
+    'L_TITLE' => $lang['identification'],
     'L_USERNAME' => $lang['login'],
     'L_PASSWORD' => $lang['password'],
     'L_LOGIN' => $lang['submit'],
diff --git a/language/en_UK.iso-8859-1/admin.lang.php b/language/en_UK.iso-8859-1/admin.lang.php
index 31b5ec021..6cf9e1040 100644
--- a/language/en_UK.iso-8859-1/admin.lang.php
+++ b/language/en_UK.iso-8859-1/admin.lang.php
@@ -132,6 +132,7 @@ $lang['title_default'] = 'PhpWebGallery administration';
 $lang['title_waiting'] = 'Pictures waiting for validation';
 $lang['title_cat_options'] = 'Categories options';
 $lang['title_groups'] = 'Groups management';
+$lang['title_cat_perm'] = 'Modify permissions for category';
 
 //Error messages
 $lang['cat_error_name'] = 'The name of a category should not be empty';
@@ -214,6 +215,7 @@ $lang['conf_show_iptc_info'] = 'Give the possibility to show IPTC metadata on vi
 $lang['conf_remote_site_delete_info'] = 'Deleting a remote server will delete all the image and the categories in relation with this server.';
 
 // Image informations
+$lang['title_picmod'] = 'Modify informations about a picture';
 $lang['infoimage_general'] = 'General options for the category';
 $lang['infoimage_useforall'] = 'use for all pictures ?';
 $lang['infoimage_creation_date'] = 'Creation date';
@@ -228,8 +230,8 @@ $lang['infoimage_dissociated'] = 'dissociated from';
 $lang['storage_category'] = 'storage category';
 $lang['represents'] = 'represents';
 $lang['doesnt_represent'] = 'doesn\'t represent';
-$lang['waiting_update'] = 'Validated pictures will be displayed only once pictures database updated';
 $lang['cat_unknown_id'] = 'This category is unknown in the database';
+$lang['dissociate'] = 'dissociate';
 
 // Thumbnails
 $lang['tn_width'] = 'width';
@@ -262,6 +264,9 @@ $lang['tn_alone_title'] = 'pictures without thumbnail (jpeg and png only)';
 $lang['tn_dirs_title'] = 'Directories list';
 $lang['tn_dirs_alone'] = 'pictures without thumbnail';
 
+// Waiting files 
+$lang['waiting_update'] = 'Validated pictures will be displayed only once pictures database updated';
+
 // Update
 $lang['update_missing_tn'] = 'the thumbnail is missing for';
 $lang['update_missing_tn_short'] = 'missing thumbnail';
@@ -326,9 +331,5 @@ $lang['group_list_title'] = 'List of existing groups';
 $lang['group_edit'] = 'Manage users of the group';
 $lang['group_deny_user'] = 'Deny selected';
 $lang['group_add_user']= 'Add user';
-
-
-$lang['title_cat_perm'] = 'Modify permissions for category';
 $lang['title_group_perm'] = 'Modify permissions for group';
-$lang['title_picmod'] = 'Modify informations about a picture';
 ?>
\ No newline at end of file
diff --git a/language/en_UK.iso-8859-1/common.lang.php b/language/en_UK.iso-8859-1/common.lang.php
index 9f240a593..7097462c8 100644
--- a/language/en_UK.iso-8859-1/common.lang.php
+++ b/language/en_UK.iso-8859-1/common.lang.php
@@ -66,9 +66,16 @@ $lang['creation_date'] = 'Created on';
 $lang['submit'] = 'Submit';
 $lang['delete'] = 'Delete';
 $lang['reset'] = 'Reset';
+$lang['Close'] = 'Close the window';
+$lang['Select'] = 'Select';
+
+// Error management
+$lang['mandatory'] = 'obligatory';
+$lang['err_date'] = 'wrong date';
 
 // Navigation
 $lang['home'] = 'Home';
+$lang['title_menu'] = 'Menu';
 $lang['home_hint'] = 'Back to the home page';
 $lang['special_categories'] = 'Specials';
 $lang['favorite_cat'] = 'my favorites';
@@ -77,6 +84,7 @@ $lang['most_visited_cat'] = 'most visited';
 $lang['most_visited_cat_hint'] = 'displays most visited pictures';
 $lang['best_rated_cat'] = 'best rated';
 $lang['best_rated_cat_hint'] = 'displays best rated items';
+$lang['recent_image'] = 'Image within the';
 $lang['recent_pics_cat'] = 'Last pictures';
 $lang['recent_pics_cat_hint'] = 'Displays most recent pictures';
 $lang['recent_cats_cat'] = 'Last categories';
@@ -90,6 +98,13 @@ $lang['previous_page'] = 'Previous';
 $lang['next_page'] = 'Next';
 $lang['first_page'] = 'First';
 $lang['last_page'] = 'Last';
+$lang['hint_category'] = 'shows images at the root of this categry';
+$lang['hint_customize'] = 'customize the appareance of the gallery';
+$lang['hint_search'] = 'search';
+$lang['upload_picture'] = 'Upload a picture';
+$lang['favorites'] = 'Favorites';
+$lang['random_cat'] = 'random pictures';
+$lang['random_cat_hint'] = 'Displays a set of random pictures';
 
 // Identification
 $lang['login'] = 'Login';
@@ -99,6 +114,24 @@ $lang['customize'] = 'Customize';
 $lang['new'] = 'New';
 $lang['identification'] = 'Identification';
 $lang['remember_me'] = 'Auto login';
+$lang['only_members'] = 'Only members can access this page';
+$lang['invalid_pwd'] = 'Invalid password!';
+$lang['access_forbiden'] = 'You are not authorized to access this page';
+$lang['ident_register'] = 'Register';
+$lang['ident_forgotten_password'] = 'Forget your password ?';
+$lang['ident_guest_visit'] = 'Go through the gallery as a visitor';
+
+// Registration
+$lang['register_page_title'] = 'Registration';
+$lang['register_title'] = 'Registration';
+$lang['reg_err_login1'] = 'Please, enter a login';
+$lang['reg_err_login2'] = 'login mustn\'t end with a space character';
+$lang['reg_err_login3'] = 'login mustn\'t start with a space character';
+$lang['reg_err_login4'] = 'login mustn\'t contain characters " and \'';
+$lang['reg_err_login5'] = 'this login is already used';
+$lang['reg_err_pass'] = 'please enter your password again';
+$lang['reg_confirm'] = 'Confirm password';
+$lang['reg_err_mail_address'] = 'mail address must be like xxx@yyy.eee (example : jack@altern.org)';
 
 //Calendar
 $lang['calendar'] = 'calendar';
@@ -149,18 +182,6 @@ $lang['show_nb_comments'] = 'Show number of comments';
 $lang['recent_period'] = 'Recent period';
 $lang['periods_error'] = 'Recent period must be a positive integer value';
 
-// Registration
-$lang['register_page_title'] = 'Registration';
-$lang['register_title'] = 'Registration';
-$lang['reg_err_login1'] = 'Please, enter a login';
-$lang['reg_err_login2'] = 'login mustn\'t end with a space character';
-$lang['reg_err_login3'] = 'login mustn\'t start with a space character';
-$lang['reg_err_login4'] = 'login mustn\'t contain characters " and \'';
-$lang['reg_err_login5'] = 'this login is already used';
-$lang['reg_err_pass'] = 'please enter your password again';
-$lang['reg_confirm'] = 'Confirm password';
-$lang['reg_err_mail_address'] = 'mail address must be like xxx@yyy.eee (example : jack@altern.org)';
-
 // search
 $lang['search_title'] = 'Search';
 $lang['search_options'] = 'Search Options';
@@ -187,41 +208,17 @@ $lang['search_ascending'] = 'Ascending';
 $lang['search_descending'] = 'Descending';
 $lang['search_one_clause_at_least'] = 'Empty query. No criteria has been entered.';
 $lang['search_result'] = 'Search results';
-
-// Admin messages
-$lang['gallery_locked_message'] = 'The gallery is locked for maintenance. Please, come back later or loggin as an administrator to enter the gallery : <a href="'.PHPWG_ROOT_PATH.'identification.php">Identification</a>';
-$lang['sql_queries_in'] = 'SQL queries in';
-
 $lang['Look_up_user'] = 'Seek user';
 $lang['Find_username'] = 'Find a username';
 $lang['No_match'] = 'No match';
 $lang['Select_username'] = 'Select a username';
-$lang['Close'] = 'Close the window';
-$lang['Select'] = 'Select';
-
-$lang['only_members'] = 'Only members can access this page';
-$lang['invalid_pwd'] = 'Invalid password!';
-$lang['access_forbiden'] = 'You are not authorized to access this page';
-$lang['diapo_default_page_title'] = 'No category selected';
-$lang['hint_category'] = 'shows images at the root of this categry';
-$lang['total_images'] = 'total';
-$lang['title_menu'] = 'Menu';
-$lang['change_login'] = 'change login';
-$lang['hint_login'] = 'identification enables site\'s appareance customization';
-$lang['hint_customize'] = 'customize the appareance of the gallery';
-$lang['hint_search'] = 'search';
-
 
-$lang['recent_image'] = 'Image within the';
-$lang['days'] = 'days';
-
-$lang['title_send_mail'] = 'A comment on your site';
+// Category
 $lang['sub-cat'] = 'subcategories';
 $lang['images_available'] = 'images in this category';
 $lang['total'] = 'images';
-$lang['upload_picture'] = 'Upload a picture';
-$lang['generation_time'] = 'Page generated in';
-$lang['favorites'] = 'Favorites';
+
+// About
 $lang['about_page_title'] = 'About PhpWebGallery';
 $lang['about_title'] = 'About...';
 $lang['about_message'] = '<div style="text-align:center;font-weigh:bold;">Information about PhpWebGallery</div>
@@ -230,26 +227,41 @@ $lang['about_message'] = '<div style="text-align:center;font-weigh:bold;">Inform
   <li>Technicaly, PhpWebGallery is fully developped with PHP (the elePHPant) with a MySQL database (the SQuirreL).</li>
   <li>If you have any suggestions or comments, please visit <a href="http://www.phpwebgallery.net" style="text-decoration:underline">PhpWebGallery</a> official site, and its dedicated <a href="http://forum.phpwebgallery.net" style="text-decoration:underline">forum</a>.</li>
 </ul>';
-$lang['ident_page_title'] = 'Identification';
-$lang['ident_title'] = 'Identification';
-$lang['ident_register'] = 'Register';
-$lang['ident_forgotten_password'] = 'Forget your password ?';
-$lang['ident_guest_visit'] = 'Go through the gallery as a visitor';
 
-$lang['previous_image'] = 'Previous';
-$lang['next_image'] = 'Next';
-$lang['info_image_title'] = 'Image information';
+// Picture
+$lang['add_favorites_alt'] = 'Add to favorites';
+$lang['add_favorites_hint'] = 'Add this picture to your favorites';
+$lang['del_favorites_alt'] = 'Delete from favorites';
+$lang['del_favorites_hint'] = 'Delete this picture from your favorites';
 $lang['link_info_image'] = 'Modify information';
 $lang['true_size'] = 'Real size';
 $lang['comments_title'] = 'Comments from the users of the site';
 $lang['comments_del'] = 'delete this comment';
 $lang['comments_add'] = 'Add a comment';
+$lang['slideshow'] = 'slideshow';
+$lang['period_seconds'] = 'seconds per picture';
+$lang['slideshow_stop'] = 'stop the slideshow';
+$lang['download'] = 'download';
+$lang['download_hint'] = 'download this file';
+$lang['comment_added'] = 'Your comment has been registered';
+$lang['comment_to_validate'] = 'An administrator must authorize your comment before it is visible.';
+$lang['comment_anti-flood'] = 'Anti-flood system : please wait for a moment before trying to post another comment';
+$lang['comment_user_exists'] = 'This login is already used by another user';
+$lang['picture_show_metadata'] = 'Show file metadata';
+$lang['picture_hide_metadata'] = 'Hide file metadata';
+$lang['to_rate'] = 'Rate';
+$lang['update_rate'] = 'Update your rating';
+$lang['element_rate'] = 'rate';
+$lang['already_rated'] = 'You\'ve already rated this item';
+$lang['never_rated'] = 'You\'ve never rated this item';
+$lang['no_rate'] = 'no rate';
+$lang['rates'] = 'rates';
+$lang['standard_deviation'] = 'STD';
+$lang['picture_high'] = 'Click on the picture to see it in high definition';
+$lang['visited'] = 'visited';
+$lang['times'] = 'times';
 
-$lang['add_favorites_alt'] = 'Add to favorites';
-$lang['add_favorites_hint'] = 'Add this picture to your favorites';
-$lang['del_favorites_alt'] = 'Delete from favorites';
-$lang['del_favorites_hint'] = 'Delete this picture from your favorites';
-
+// Upload
 $lang['upload_forbidden'] = 'You can\'t upload pictures in this category';
 $lang['upload_file_exists'] = 'A picture\'s name already used';
 $lang['upload_filenotfound'] = 'You must choose a picture fileformat for the image';
@@ -264,60 +276,30 @@ $lang['upload_advise_filetype'] = 'the picture must be to the fileformat jpg, gi
 $lang['upload_err_username'] = 'the username must be given';
 $lang['upload_username'] = 'Username';
 $lang['upload_successful'] = 'Picture uploaded with success, an administrator will validate it as soon as possible';
-
-$lang['guest'] = 'guest';
-$lang['add'] = 'add';
-$lang['dissociate'] = 'dissociate';
-$lang['mandatory'] = 'obligatory';
-$lang['err_date'] = 'wrong date';
-$lang['IP'] = 'IP';
-
-$lang['errors_title'] = 'Errors';
-$lang['infos_title'] = 'Informations';
-$lang['category_representative'] = 'representative';
-
-
-$lang['visited'] = 'visited';
-$lang['times'] = 'times';
-$lang['slideshow'] = 'slideshow';
-$lang['period_seconds'] = 'seconds per picture';
-$lang['slideshow_stop'] = 'stop the slideshow';
-$lang['download'] = 'download';
-$lang['download_hint'] = 'download this file';
-$lang['comment_added'] = 'Your comment has been registered';
-$lang['comment_to_validate'] = 'An administrator must authorize your comment before it is visible.';
-$lang['comment_anti-flood'] = 'Anti-flood system : please wait for a moment before trying to post another comment';
-$lang['comment_user_exists'] = 'This login is already used by another user';
-$lang['invalid_search'] = 'Searched words must be grater than 3 characters and must not contain punctuation mark';
 $lang['upload_name'] = 'Name of the picture';
 $lang['upload_author'] = 'Author (eg "Pierrick LE GALL")';
 $lang['upload_creation_date'] = 'Creation date (DD/MM/YYYY)';
-$lang['upload_comment'] = 'Comment';
+
+// Admin messages
+$lang['gallery_locked_message'] = 'The gallery is locked for maintenance. Please, come back later or loggin as an administrator to enter the gallery : <a href="'.PHPWG_ROOT_PATH.'identification.php">Identification</a>';
+$lang['sql_queries_in'] = 'SQL queries in';
+$lang['title_send_mail'] = 'A comment on your site';
+$lang['generation_time'] = 'Page generated in';
 $lang['mail_hello'] = 'Hi,';
 $lang['mail_new_upload_subject'] = 'New picture on the website';
 $lang['mail_new_upload_content'] = 'A new picture has been uploaded on the gallery. It is waiting for your validation. Let\'s meet in the administration panel to authorize or refuse this picture.';
 $lang['mail_new_comment_subject'] = 'New comment on website';
 $lang['mail_new_comment_content'] = 'A new comment has been registered on the gallery. If you chose to validate each comment, you first have to validate this comment in the administration panel to make it visible in the gallery.'."\n\n".'You can see last comments in the administration panel';
-$lang['connected_user'] = 'connected user';
-$lang['title_comments'] = 'Users comments';
+
+
+
+// NOT YET VALIDATED
+$lang['guest'] = 'guest';
+$lang['add'] = 'add';
+
 $lang['stats_last_days'] = 'last days';
 $lang['hint_comments'] = 'See last users comments';
 $lang['menu_login'] = 'login';
 $lang['hello'] = 'Hello';
 
-$lang['picture_show_metadata'] = 'Show file metadata ?';
-$lang['picture_hide_metadata'] = 'Hide file metadata';
-$lang['to_rate'] = 'Rate';
-$lang['update_rate'] = 'Update your rating';
-$lang['element_rate'] = 'rate';
-$lang['already_rated'] = 'You\'ve already rated this item';
-$lang['never_rated'] = 'You\'ve never rated this item';
-$lang['no_rate'] = 'no rate';
-$lang['rates'] = 'rates';
-$lang['standard_deviation'] = 'STD';
-$lang['random_cat'] = 'random pictures';
-$lang['random_cat_hint'] = 'Displays a set of random pictures';
-$lang['picture_high'] = 'Click on the picture to see it in high definition';
-
-
 ?>
\ No newline at end of file
diff --git a/language/fr_FR.iso-8859-1/admin.lang.php b/language/fr_FR.iso-8859-1/admin.lang.php
index 7cce1271e..f29b8f3d0 100644
--- a/language/fr_FR.iso-8859-1/admin.lang.php
+++ b/language/fr_FR.iso-8859-1/admin.lang.php
@@ -85,6 +85,7 @@ $lang['remote_site_local_new'] = '(nouveau site)';
 $lang['remote_site_local_update'] = 'read local listing.xml and update';
 
 // Category words
+$lang['title_cat_perm'] = 'Modifier les permissions pour la catégorie';
 $lang['cat_security'] = 'Sécurité';
 $lang['cat_options'] = 'Options de la catégorie';
 $lang['cat_add'] = 'Ajouter une catégorie virtuelle';
@@ -216,6 +217,7 @@ $lang['conf_show_iptc'] = 'Montrer les IPTC';
 $lang['conf_show_iptc_info'] = 'Affiche les métadonnées IPTC';
 
 // Image informations
+$lang['title_picmod'] = 'Modifier les informations d\'une image';
 $lang['infoimage_general'] = 'Options générale pour la catégorie';
 $lang['infoimage_useforall'] = 'utiliser pour toutes les images ?';
 $lang['infoimage_creation_date'] = 'Date de création';
@@ -231,6 +233,7 @@ $lang['storage_category'] = 'Repertoire de stockage';
 $lang['represents'] = 'Représente';
 $lang['doesnt_represent'] = 'Autres catégories';
 $lang['cat_unknown_id'] = 'Cette catégorie n\'existe pas dans la base de données';
+$lang['dissociate'] = 'dissocier';
 
 // Thumbnails
 $lang['tn_width'] = 'largeur';
@@ -267,6 +270,9 @@ $lang['tn_alone_title'] = 'images sans miniatures (format jpg et png uniquement)
 $lang['tn_dirs_title'] = 'Liste des répertoires';
 $lang['tn_dirs_alone'] = 'images sans miniatures';
 
+// Waiting files 
+$lang['waiting_update'] = 'Les images validées ne seront visibles qu\'après mise à jour de la base d\'images.';
+
 // Update
 $lang['update_missing_tn'] = 'Il manque la miniature pour';
 $lang['update_missing_tn_short'] = 'Miniature manquante';
@@ -333,11 +339,5 @@ $lang['group_add_error2'] = 'Ce nom de groupe est déjà utilisé.';
 $lang['group_edit'] = 'Edition des utilisateurs appartenant au groupe';
 $lang['group_deny_user'] = 'Supprimer la sélection';
 $lang['group_add_user']= 'Ajouter le membre';
-
-
-
-$lang['title_cat_perm'] = 'Modifier les permissions pour la catégorie';
 $lang['title_group_perm'] = 'Modifier les permissions pour le groupe';
-$lang['title_picmod'] = 'Modifier les informations d\'une image';
-$lang['waiting_update'] = 'Les images validées ne seront visibles qu\'après mise à jour de la base d\'images.';
 ?>
\ No newline at end of file
diff --git a/language/fr_FR.iso-8859-1/common.lang.php b/language/fr_FR.iso-8859-1/common.lang.php
index b52532f89..b73aa512a 100644
--- a/language/fr_FR.iso-8859-1/common.lang.php
+++ b/language/fr_FR.iso-8859-1/common.lang.php
@@ -56,6 +56,7 @@ $lang['keywords'] = 'Mots-clefs';
 $lang['default'] = 'Défaut';
 $lang['webmaster'] = 'Webmaster';
 $lang['language'] = 'Langue';
+$lang['send_mail'] = 'Contact';
 
 // Properties
 $lang['registration_date'] = 'Enregistré le';
@@ -65,6 +66,12 @@ $lang['creation_date'] = 'Créé le';
 $lang['submit'] = 'Valider';
 $lang['delete'] = 'Supprimer';
 $lang['reset'] = 'Rétablir';
+$lang['Close'] = 'Fermer la fenêtre';
+$lang['Select'] = 'Sélectionner';
+
+// Error management
+$lang['mandatory'] = 'obligatoire';
+$lang['err_date'] = 'date erronée';
 
 // Identification
 $lang['login'] = 'Nom d\'utilisateur';
@@ -74,9 +81,28 @@ $lang['customize'] = 'Personnalisation';
 $lang['new'] = 'Nouveau';
 $lang['identification'] = 'Identification';
 $lang['remember_me'] = 'Connexion auto';
+$lang['only_members'] = 'Seuls les membres du site peuvent accéder à cette page';
+$lang['invalid_pwd'] = 'Le mot de passe rentré n\'est pas valide';
+$lang['access_forbiden'] = 'Vous n\'êtes pas autorisé à aller dans cette section';
+$lang['ident_register'] = 'S\'enregistrer';
+$lang['ident_forgotten_password'] = 'Mot de passe oublié ?';
+$lang['ident_guest_visit'] = 'Parcourir la galerie en tant que visiteur';
+
+// Register
+$lang['register_page_title'] = 'Enregistrement';
+$lang['register_title'] = 'Enregistrement';
+$lang['reg_err_login1'] = 'veuillez rentrer un pseudo';
+$lang['reg_err_login2'] = 'le pseudo ne doit pas se terminer par un espace';
+$lang['reg_err_login3'] = 'le pseudo ne doit pas commencer par un espace';
+$lang['reg_err_login4'] = 'le pseudo ne doit pas comporter les caractère " et \'';
+$lang['reg_err_login5'] = 'ce pseudo est déjà utilisé';
+$lang['reg_err_pass'] = 'veuillez retaper le mot de passe';
+$lang['reg_confirm'] = 'Confirmer le mot de passe';
+$lang['reg_err_mail_address'] = 'l\'adresse mail doit être de la forme xxx@yyy.eee (exemple : jack@altern.org)';
 
 // Navigation
 $lang['home'] = 'Accueil';
+$lang['title_menu'] = 'Sommaire';
 $lang['home_hint'] = 'Retour à la page des miniatures';
 $lang['special_categories'] = 'Spécial';
 $lang['favorite_cat'] = 'Favoris';
@@ -91,6 +117,7 @@ $lang['recent_cats_cat'] = 'Nouvelles catégories';
 $lang['recent_cats_cat_hint'] = 'Affiche les catégories les plus récentes';
 $lang['random_cat'] = 'Images au hasard';
 $lang['random_cat_hint'] = 'Affiche plusieurs images choisies au hasard';
+$lang['recent_image'] = 'Image datant de moins de';
 $lang['about'] = 'A propos';
 $lang['hint_about'] = 'Quelques informations sur PhpWebGallery...';
 $lang['admin'] = 'Administration';
@@ -100,6 +127,11 @@ $lang['previous_page'] = 'Précédente';
 $lang['next_page'] = 'Suivante';
 $lang['first_page'] = '<<';
 $lang['last_page'] = '>>';
+$lang['hint_category'] = 'affiche les images à la racine de cette catégorie';
+$lang['hint_customize'] = 'personnaliser votre affichage';
+$lang['hint_search'] = 'lancer une recherche';
+$lang['upload_picture'] = 'Ajouter une image';
+$lang['favorites'] = 'Favoris';
 
 //Calendar
 $lang['calendar'] = 'Calendrier';
@@ -150,18 +182,6 @@ $lang['periods_error'] = 'La période doit être entière.';
 $lang['maxwidth_error'] = 'La largeur maximum des images doit être un entier supérieur à 50';
 $lang['maxheight_error'] = 'La hauteur maximum des images doit être un entier supérieur à 50';
 
-// Register
-$lang['register_page_title'] = 'Enregistrement';
-$lang['register_title'] = 'Enregistrement';
-$lang['reg_err_login1'] = 'veuillez rentrer un pseudo';
-$lang['reg_err_login2'] = 'le pseudo ne doit pas se terminer par un espace';
-$lang['reg_err_login3'] = 'le pseudo ne doit pas commencer par un espace';
-$lang['reg_err_login4'] = 'le pseudo ne doit pas comporter les caractère " et \'';
-$lang['reg_err_login5'] = 'ce pseudo est déjà utilisé';
-$lang['reg_err_pass'] = 'veuillez retaper le mot de passe';
-$lang['reg_confirm'] = 'Confirmer le mot de passe';
-$lang['reg_err_mail_address'] = 'l\'adresse mail doit être de la forme xxx@yyy.eee (exemple : jack@altern.org)';
-
 // search
 $lang['search_title'] = 'Rechercher';
 $lang['search_options'] = 'Options de recherche';
@@ -189,66 +209,60 @@ $lang['search_descending'] = 'Décroissant';
 $lang['search_one_clause_at_least'] = 'Recherche vide. Aucun critère n\'a été renseigné.';
 $lang['search_result'] = 'Résultats de la recherche';
 $lang['invalid_search'] = 'Les mots recherchés doivent comporter plus de 3 caractères et ne doivent pas inclure de caractères de ponctuation';
-
-// Admin messages
-$lang['gallery_locked_message'] = 'Cette galerie est actuellement inaccessible pour cause de maintenance.
-Revenez plus tard ou connectez vous en tant qu\'administrateur: <a href="'.PHPWG_ROOT_PATH.'identification.php">Identification</a>';
-$lang['sql_queries_in'] = 'requêtes SQL en';
-
 $lang['Look_up_user'] = 'Rechercher l\'utilisateur';
 $lang['Find_username'] = 'Trouver un nom d\'utilisateur';
 $lang['No_match'] = 'Aucun enregistrement trouvé.';
 $lang['Select_username'] = 'Sélectionner un Nom d\'utilisateur';
-$lang['Close'] = 'Fermer la fenêtre';
-$lang['Select'] = 'Sélectionner';
 
-$lang['only_members'] = 'Seuls les membres du site peuvent accéder à cette page';
-$lang['invalid_pwd'] = 'Le mot de passe rentré n\'est pas valide';
-$lang['access_forbiden'] = 'Vous n\'êtes pas autorisé à aller dans cette section';
-$lang['diapo_default_page_title'] = 'Aucune catégorie séléctionnée';
-$lang['hint_category'] = 'affiche les images à la racine de cette catégorie';
-$lang['total_images'] = 'total';
-$lang['title_menu'] = 'Sommaire';
-$lang['change_login'] = 'changer de login';
-$lang['hint_login'] = 's&#039;identifier permet de personnaliser l&#039;apparence du site';
-$lang['hint_customize'] = 'personnaliser votre affichage';
-$lang['hint_search'] = 'lancer une recherche';
-
-
-
-$lang['nb_image_category'] = 'nombre d\'images dans la catégorie';
-$lang['recent_image'] = 'Image datant de moins de';
-$lang['send_mail'] = 'Contacter l\'adminstrateur';
-$lang['title_send_mail'] = '[phpwebgallery] une remarque sur ton site';
+// Category
 $lang['sub-cat'] = 'sous-catégories';
 $lang['images_available'] = 'images dans cette catégorie';
 $lang['total'] = 'images';
-$lang['upload_picture'] = 'Ajouter une image';
-$lang['generation_time'] = 'Page générée en';
-$lang['favorites'] = 'Favoris';
+
+// About
 $lang['about_page_title'] = 'A propos de PhpWebGallery';
 $lang['about_title'] = 'A propos...';
-$lang['about_return'] = 'Retour';
-$lang['ident_page_title'] = 'Identification';
-$lang['ident_title'] = 'Identification';
-$lang['ident_register'] = 'S\'enregistrer';
-$lang['ident_forgotten_password'] = 'Mot de passe oublié ?';
-$lang['ident_guest_visit'] = 'Parcourir la galerie en tant que visiteur';
+$lang['about_message'] = '<div style="text-align:center;font-weigh:bold;">Informations sur le PhpWebGallery</div>
+<ul>
+<li>Ce site utilise la version '.PHPWG_VERSION.' de <a href="'.PHPWG_URL.'" style="text-decoration:underline">PhpWebGallery</a>. PhpWebGallery est une application web permettant de créer simplement une galerie d\'images en ligne.</li>
+<li>D\'un point de vue technique, PhpWebGallery est entièrement développé en PHP (l\'elePHPant) avec une base de données MySQL(le mySQreuiL).</li>
+<li>Si vous avez des suggestions ou des commentaires, n\'hésitez pas à visiter le site de <a href="'.PHPWG_URL.'" style="text-decoration:underline">PhpWebGallery</a> et son <a href="'.PHPWG_FORUM_URL.'" style="text-decoration:underline">forum</a>.</li>
+</ul>';
 
-$lang['previous_image'] = 'Précédent';
-$lang['next_image'] = 'Suivant';
-$lang['info_image_title'] = 'Informations';
+// Picture
+$lang['add_favorites_alt'] = 'Ajouter aux favoris';
+$lang['add_favorites_hint'] = 'ajouter cette image à vos favoris';
+$lang['del_favorites_alt'] = 'Retirer des favoris';
+$lang['del_favorites_hint'] = 'supprimer cette image de vos favoris';
 $lang['link_info_image'] = 'Modifier les informations de cette image';
 $lang['true_size'] = 'Taille réelle';
 $lang['comments_title'] = 'Commentaires des visiteurs du site';
 $lang['comments_del'] = 'supprimer ce message';
 $lang['comments_add'] = 'Ajouter un commentaire';
+$lang['slideshow'] = 'diaporama';
+$lang['period_seconds'] = 'secondes par image';
+$lang['slideshow_stop'] = 'stopper le diaporama';
+$lang['download'] = 'Télécharger';
+$lang['download_hint'] = 'Télécharger ce fichier';
+$lang['comment_added'] = 'Votre commentaire a été enregistré';
+$lang['comment_to_validate'] = 'Un administrateur doit valider votre commentaire pour qu\'il soit visible';
+$lang['comment_anti-flood'] = 'Système anti-flood : attendez un moment avant de déposer un message';
+$lang['comment_user_exists'] = 'Ce pseudo appartient à un autre utilisateur';
+$lang['picture_show_metadata'] = 'Montrer les métadonnées';
+$lang['picture_hide_metadata'] = 'Cacher les métadonnées';
+$lang['to_rate'] = 'Vote';
+$lang['update_rate'] = 'Mettre à jour votre vote';
+$lang['element_rate'] = 'vote';
+$lang['already_rated'] = 'Vous avez déja voté pour cette image';
+$lang['never_rated'] = 'Vous n\'avez jamais voté pour cette image';
+$lang['no_rate'] = 'Aucun vote';
+$lang['rates'] = 'Votes';
+$lang['standard_deviation'] = 'STD';
+$lang['picture_high'] = 'Cliquez sur l\'image pour la voir en haute résolution';
+$lang['visited'] = 'visité';
+$lang['times'] = 'fois';
 
-$lang['add_favorites_alt'] = 'Ajouter aux favoris';
-$lang['add_favorites_hint'] = 'ajouter cette image à vos favoris';
-$lang['del_favorites_alt'] = 'Retirer des favoris';
-$lang['del_favorites_hint'] = 'supprimer cette image de vos favoris';
-
+// Upload
 $lang['upload_forbidden'] = 'On ne peut pas ajouter d\'image dans cette catégorie';
 $lang['upload_file_exists'] = 'Une image du même nom existe déjà';
 $lang['upload_filenotfound'] = 'vous devez choisir un fichier image pour la photo';
@@ -263,69 +277,33 @@ $lang['upload_advise_filetype'] = 'l\'image doit être au format jpg, gif ou png'
 $lang['upload_err_username'] = 'le nom de l\'utilisateur doit être renseigné';
 $lang['upload_username'] = 'Nom d\'utilisateur';
 $lang['upload_successful'] = 'Image uploadée avec succès, un administrateur validera celle-ci dès que possible.';
-
-// new or modified in release 1.3
-
-$lang['guest'] = 'visiteur';
-$lang['add'] = 'ajouter';
-$lang['dissociate'] = 'dissocier';
-$lang['mandatory'] = 'obligatoire';
-$lang['err_date'] = 'date erronée';
-$lang['IP'] = 'IP';
-
-$lang['errors_title'] = 'Erreurs';
-$lang['infos_title'] = 'Informations';
-$lang['category_representative'] = 'représentant';
-$lang['title_comments'] = 'Commentaires des visiteurs';
-$lang['stats_last_days'] = 'derniers jours';
-$lang['menu_login'] = 'Connexion';
-$lang['connected_user'] = 'utilisateur connecté';
-$lang['hint_comments'] = 'Voir les derniers commentaires des visiteurs';
-
-
-$lang['visited'] = 'visité';
-$lang['times'] = 'fois';
-
-$lang['slideshow'] = 'diaporama';
-$lang['period_seconds'] = 'secondes par image';
-$lang['slideshow_stop'] = 'stopper le diaporama';
-$lang['download'] = 'Télécharger';
-$lang['download_hint'] = 'Télécharger ce fichier';
-$lang['comment_added'] = 'Votre commentaire a été enregistré';
-$lang['comment_to_validate'] = 'Un administrateur doit valider votre commentaire pour qu\'il soit visible';
-$lang['comment_anti-flood'] = 'Système anti-flood : attendez un moment avant de déposer un message';
-$lang['comment_user_exists'] = 'Ce pseudo appartient à un autre utilisateur';
 $lang['upload_name'] = 'Nom de l\'image';
 $lang['upload_author'] = 'Auteur (eg "Pierrick LE GALL")';
 $lang['upload_creation_date'] = 'Date de création (JJ/MM/AAAA)';
-$lang['upload_comment'] = 'Commentaire';
+
+// Admin messages
+$lang['gallery_locked_message'] = 'Cette galerie est actuellement inaccessible pour cause de maintenance.
+Revenez plus tard ou connectez vous en tant qu\'administrateur: <a href="'.PHPWG_ROOT_PATH.'identification.php">Identification</a>';
+$lang['sql_queries_in'] = 'requêtes SQL en';
+$lang['title_send_mail'] = '[phpwebgallery] une remarque sur ton site';
+$lang['generation_time'] = 'Page générée en';
 $lang['mail_hello'] = 'Bonjour,';
 $lang['mail_new_upload_subject'] = 'Nouvelle image sur le site';
 $lang['mail_new_upload_content'] = 'Une nouvelle image a été placée sur la galerie. Elle est en attente de validation. RDV dans la section d\'administration pour valider ou supprimer cette image.';
 $lang['mail_new_comment_subject'] = 'Nouveau commentaire sur le site';
 $lang['mail_new_comment_content'] = 'Un nouveau commentaire a été posté sur la galerie. Si vous avez activé la validation des commentaires, il faut d\'abord valider le commentaire dans la zone d\'administration pour le voir apparaître.'."\n\n".'Vous avez accès aux derniers commentaires dans la zone d\'administration.';
 
-$lang['about_message'] = '<div style="text-align:center;font-weigh:bold;">Informations sur le PhpWebGallery</div>
-<ul>
-<li>Ce site utilise la version '.PHPWG_VERSION.' de <a href="'.PHPWG_URL.'" style="text-decoration:underline">PhpWebGallery</a>. PhpWebGallery est une application web permettant de créer simplement une galerie d\'images en ligne.</li>
-<li>D\'un point de vue technique, PhpWebGallery est entièrement développé en PHP (l\'elePHPant) avec une base de données MySQL(le mySQreuiL).</li>
-<li>Si vous avez des suggestions ou des commentaires, n\'hésitez pas à visiter le site de <a href="'.PHPWG_URL.'" style="text-decoration:underline">PhpWebGallery</a> et son <a href="'.PHPWG_FORUM_URL.'" style="text-decoration:underline">forum</a>.</li>
-</ul>';
 
-$lang['update_wrong_dirname'] = 'Le nom des fichiers et répertoires ne doivent être composé que de lettres, de chiffres et "-", "_" ou ".".';
-$lang['hello'] = 'Bonjour';
+// NOT YET VALIDATED
 
+$lang['guest'] = 'visiteur';
+$lang['add'] = 'ajouter';
 
+$lang['title_comments'] = 'Commentaires des visiteurs';
+$lang['stats_last_days'] = 'derniers jours';
+$lang['menu_login'] = 'Connexion';
+$lang['hint_comments'] = 'Voir les derniers commentaires des visiteurs';
 
-$lang['picture_show_metadata'] = 'Montrer les métadonnées';
-$lang['picture_hide_metadata'] = 'Cacher les métadonnées';
-$lang['to_rate'] = 'Vote';
-$lang['update_rate'] = 'Mettre à jour votre vote';
-$lang['element_rate'] = 'vote';
-$lang['already_rated'] = 'Vous avez déja voté pour cette image';
-$lang['never_rated'] = 'Vous n\'avez jamais voté pour cette image';
-$lang['no_rate'] = 'Aucun vote';
-$lang['rates'] = 'Votes';
-$lang['standard_deviation'] = 'STD';
-$lang['picture_high'] = 'Cliquez sur l\'image pour la voir en haute résolution';
+$lang['update_wrong_dirname'] = 'Le nom des fichiers et répertoires ne doivent être composé que de lettres, de chiffres et "-", "_" ou ".".';
+$lang['hello'] = 'Bonjour';
 ?>
\ No newline at end of file
diff --git a/picture.php b/picture.php
index c4dd73154..6a6262407 100644
--- a/picture.php
+++ b/picture.php
@@ -145,7 +145,7 @@ foreach (array('prev', 'current', 'next') as $i)
   $cat_directory = dirname($row['path']);
   $file_wo_ext = get_filename_wo_extension($row['file']);
 
-  $icon = './template/'.$user['template'].'/mimetypes/';
+  $icon = PHPWG_ROOT_PATH.'template/'.$user['template'].'/mimetypes/';
   $icon.= strtolower(get_extension($row['file'])).'.png';
 
   if (isset($row['representative_ext']) and $row['representative_ext'] =! '')
@@ -453,7 +453,8 @@ $template->assign_vars(array(
   'L_HOME' => $lang['home'],
   'L_SLIDESHOW' => $lang['slideshow'],
   'L_STOP_SLIDESHOW' => $lang['slideshow_stop'],
-  'L_PREV_IMG' =>$lang['previous_image'].' : ',
+  'L_PREV_IMG' =>$lang['previous_page'].' : ',
+  'L_NEXT_IMG' =>$lang['next_page'].' : ',
   'L_ADMIN' =>$lang['link_info_image'],
   'L_COMMENT_TITLE' =>$lang['comments_title'],
   'L_ADD_COMMENT' =>$lang['comments_add'],
diff --git a/template/default/admin.tpl b/template/default/admin.tpl
index c342e2283..50e2e581a 100644
--- a/template/default/admin.tpl
+++ b/template/default/admin.tpl
@@ -63,7 +63,6 @@
 <ul class="menu">
   <li><a class="adminMenu" href="{U_USERS_AUTH}">{L_USERS}</a></li>
   <li><a class="adminMenu" href="{U_GROUPS_AUTH}">{L_GROUPS}</a></li>
-  <li><a class="adminMenu" href="{U_CAT_AUTH}">{L_CATEGORIES}</a></li
 </ul>
 </div>
       </div>
@@ -71,7 +70,7 @@
 	<td style="padding:10px;width:99%;" valign="top">
 <div class="home">
   <div class="titrePage">{PAGE_TITLE}</div>
-  <div align="center">{ADMIN_CONTENT}</div>
+  <div align="center">{ADMIN_CONTENT}{ADMIN_CONTENT_2}</div>
 </div>
 	</td>
   </tr>
diff --git a/template/default/admin/group_perm.tpl b/template/default/admin/group_perm.tpl
new file mode 100644
index 000000000..9bf490e5b
--- /dev/null
+++ b/template/default/admin/group_perm.tpl
@@ -0,0 +1,7 @@
+<!-- BEGIN select_box -->
+<form method="post" name="post" action="{S_GROUP_ACTION}">
+  <div class="admin">{L_GROUP_SELECT}</div>
+  {S_GROUP_SELECT}&nbsp;&nbsp;
+  <input type="submit" name="edit" value="{L_LOOK_UP}" class="bouton" />
+</form>
+<!-- END select_box -->
\ No newline at end of file
diff --git a/template/default/admin/group_perm.vtp b/template/default/admin/group_perm.vtp
deleted file mode 100644
index ef0a0bba3..000000000
--- a/template/default/admin/group_perm.vtp
+++ /dev/null
@@ -1,27 +0,0 @@
-<!--VTP_confirmation-->
-<div class="info">{#permuser_info_message} [ <a href="{#back_url}">{#adduser_info_back}</a> ]</div>
-<!--/VTP_confirmation-->
-
-<div class="info">{#permuser_only_private}</div>
-
-<form action="{#action}" method="post">
-  <table style="width:100%;">
-    <!--VTP_category-->
-    <tr>
-      <td>
-        <img src="./template/{#user_template}/admin/images/puce.gif" alt="&gt;" /> <a href="{#cat_perm_link}"><span style="color:{#color}">{#name}</span></a>
-      </td>
-      <td style="text-align:right;">
-        <!--VTP_parent_forbidden-->
-        {#permuser_parent_forbidden}
-        <!--/VTP_parent_forbidden-->
-        <input type="radio" name="access-{#id}" value="0"{#authorized_checked}/>{#permuser_authorized}
-        <input type="radio" name="access-{#id}" value="1"{#forbidden_checked}/>{#permuser_forbidden}
-      </td>
-    </tr>
-    <!--/VTP_category-->
-    <tr>
-      <td colspan="2" align="center"><input type="submit" name="submit" value="{#submit}"/></td>
-    </tr>
-  </table>
-</form>
\ No newline at end of file
diff --git a/upload.php b/upload.php
index df947598e..b14932593 100644
--- a/upload.php
+++ b/upload.php
@@ -298,7 +298,7 @@ $template->assign_vars(array(
   'L_SUBMIT' =>  $lang['submit'],
   'L_AUTHOR' =>  $lang['upload_author'], 
   'L_CREATION_DATE' =>  $lang['upload_creation_date'], 
-  'L_COMMENT' =>  $lang['upload_comment'],
+  'L_COMMENT' =>  $lang['comment'],
   'L_RETURN' =>  $lang['home'],
   'L_RETURN_HINT' =>  $lang['home_hint'],
   'L_UPLOAD_DONE' =>  $lang['upload_successful'],