- improvement: long localized messages are in HTML files instead of $lang

  array. This is the case of admin/help and about pages.

- deletion: of unused functions (ts_to_mysqldt, is_image, TN_exists,
  check_date_format, date_convert, get_category_directories,
  get_used_metadata_list, array_remove, pwg_write_debug,
  get_group_restrictions, get_all_group_restrictions, is_group_allowed,
  style_select, deprecated_getAttribute).

- new: many new contextual help pages to replace descriptions previously
  included in pages.

- modification: reorganisation of language files. Deletion of unused
  language keys, alphabetical sort. No faq.lang.php anymore (replaced by
  help.html). Only done for en_UK.iso-8859-1.


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

42 files changed, 1123 insertions, 1215 deletions

diff --git a/about.php b/about.php
index 9f37275f5..7e6bd9c88 100644
--- a/about.php
+++ b/about.php
@@ -39,11 +39,26 @@ include(PHPWG_ROOT_PATH.'include/page_header.php');
 $template->set_filenames(array('about'=>'about.tpl'));
 $template->assign_vars(
   array(
-    'L_ABOUT' => $lang['about_message'],
     'U_HOME' => add_session_id(PHPWG_ROOT_PATH.'category.php')
     )
   );
 
+// language files
+$user_langdir = PHPWG_ROOT_PATH.'language/'.$user['language'];
+$conf_langdir = PHPWG_ROOT_PATH.'language/'.$conf['default_language'];
+
+if (file_exists($user_langdir.'/about.html'))
+{
+  $html_file = $user_langdir.'/about.html';
+}
+else
+{
+  $html_file = $conf_langdir.'/about.html';
+}
+
+$template->set_filenames(array('about_content' => $html_file));
+$template->assign_var_from_handle('ABOUT_MESSAGE', 'about_content');
+  
 $template->parse('about');
 include(PHPWG_ROOT_PATH.'include/page_tail.php');
 ?>
diff --git a/admin.php b/admin.php
index cb92cb5d5..552be51e8 100644
--- a/admin.php
+++ b/admin.php
@@ -56,7 +56,7 @@ $link_start = PHPWG_ROOT_PATH.'admin.php?page=';
 $conf_link = $link_start.'configuration&section=';
 $opt_link = $link_start.'cat_options&section=';
 //----------------------------------------------------- template initialization
-$title = l10n('PhpWebGallery administration'); // for include/page_header.php
+$title = l10n('PhpWebGallery Administration'); // for include/page_header.php
 $page['gallery_title'] = l10n('PhpWebGallery Administration');
 $page['body_id'] = 'theAdminPage';
 include(PHPWG_ROOT_PATH.'include/page_header.php');
diff --git a/admin/cat_modify.php b/admin/cat_modify.php
index 791dff589..18aff772f 100644
--- a/admin/cat_modify.php
+++ b/admin/cat_modify.php
@@ -157,17 +157,12 @@ $template->assign_vars(array(
   'L_STORAGE'=>$lang['storage'],
   'L_REMOTE_SITE'=>$lang['remote_site'],
   'L_EDIT_COMMENT'=>$lang['description'],
-  'L_EDIT_CAT_OPTIONS'=>$lang['cat_options'],
   'L_EDIT_STATUS'=>$lang['conf_access'],
-  'L_EDIT_STATUS_INFO'=>$lang['cat_access_info'],
   'L_STATUS_PUBLIC'=>$lang['public'],
   'L_STATUS_PRIVATE'=>$lang['private'],
   'L_EDIT_LOCK'=>$lang['lock'],
-  'L_EDIT_LOCK_INFO'=>$lang['editcat_lock_info'],
   'L_EDIT_UPLOADABLE'=>$lang['editcat_uploadable'],
-  'L_EDIT_UPLOADABLE_INFO'=>$lang['editcat_uploadable_info'],
   'L_EDIT_COMMENTABLE'=>$lang['comments'],
-  'L_EDIT_COMMENTABLE_INFO'=>$lang['editcat_commentable_info'],
   'L_YES'=>$lang['yes'],
   'L_NO'=>$lang['no'],
   'L_SUBMIT'=>$lang['submit'],
@@ -177,6 +172,7 @@ $template->assign_vars(array(
     add_session_id(PHPWG_ROOT_PATH.'category.php?cat='.$category['id']),
   'U_CHILDREN'=>
     add_session_id($cat_list_url.'&parent_id='.$category['id']),
+  'U_HELP' => PHPWG_ROOT_PATH.'/popuphelp.php?page=cat_modify',
    
   'F_ACTION'=>add_session_id($form_action)
   ));
diff --git a/admin/cat_options.php b/admin/cat_options.php
index 24e0687cd..f8ca7527b 100644
--- a/admin/cat_options.php
+++ b/admin/cat_options.php
@@ -150,6 +150,8 @@ $template->assign_vars(
   array(
     'L_SUBMIT'=>$lang['submit'],
     'L_RESET'=>$lang['reset'],
+
+    'U_HELP' => PHPWG_ROOT_PATH.'/popuphelp.php?page=cat_options',
     
     'F_ACTION'=>add_session_id($base_url.$page['section'])
    )
@@ -193,7 +195,6 @@ SELECT id,name,uppercats,global_rank
         'L_SECTION' => $lang['cat_upload_title'],
         'L_CAT_OPTIONS_TRUE' => $lang['authorized'],
         'L_CAT_OPTIONS_FALSE' => $lang['forbidden'],
-        'L_CAT_OPTIONS_INFO' => $lang['cat_upload_info'],
         )
       );
     break;
@@ -215,7 +216,6 @@ SELECT id,name,uppercats,global_rank
         'L_SECTION' => $lang['cat_comments_title'],
         'L_CAT_OPTIONS_TRUE' => $lang['authorized'],
         'L_CAT_OPTIONS_FALSE' => $lang['forbidden'],
-        'L_CAT_OPTIONS_INFO' => $lang['cat_comments_info'],
         )
       );
     break;
@@ -237,7 +237,6 @@ SELECT id,name,uppercats,global_rank
         'L_SECTION' => $lang['cat_lock_title'],
         'L_CAT_OPTIONS_TRUE' => $lang['unlocked'],
         'L_CAT_OPTIONS_FALSE' => $lang['locked'],
-        'L_CAT_OPTIONS_INFO' => $lang['cat_lock_info'],
         )
       );
     break;
@@ -259,7 +258,6 @@ SELECT id,name,uppercats,global_rank
         'L_SECTION' => $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'],
         )
       );
     break;
@@ -281,8 +279,7 @@ SELECT id,name,uppercats,global_rank
       array(
         'L_SECTION' => l10n('Representative'),
         'L_CAT_OPTIONS_TRUE' => l10n('singly represented'),
-        'L_CAT_OPTIONS_FALSE' => l10n('randomly represented'),
-        'L_CAT_OPTIONS_INFO' => l10n('')
+        'L_CAT_OPTIONS_FALSE' => l10n('randomly represented')
         )
       );
     break;
diff --git a/admin/cat_perm.php b/admin/cat_perm.php
index 2c6420ae1..092d6792b 100644
--- a/admin/cat_perm.php
+++ b/admin/cat_perm.php
@@ -206,6 +206,7 @@ $template->assign_vars(
         $page['cat'],
         'admin.php?page=cat_modify&cat_id='
         ),
+    'U_HELP' => PHPWG_ROOT_PATH.'/popuphelp.php?page=cat_perm',
     'F_ACTION' =>
       add_session_id(
         PHPWG_ROOT_PATH.'admin.php?page=cat_perm&cat='.$page['cat']
diff --git a/admin/help.php b/admin/help.php
index 5817db6a7..7447c3fc9 100644
--- a/admin/help.php
+++ b/admin/help.php
@@ -24,23 +24,22 @@
 // | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
 // | USA.                                                                  |
 // +-----------------------------------------------------------------------+
+
 include_once( PHPWG_ROOT_PATH.'admin/include/isadmin.inc.php' );
-//----------------------------------------------------- template initialization
-$template->set_filenames( array('help'=>'admin/help.tpl') );
 
-//----------------------------------------------------- help categories display
-$categories = array('images','thumbnails','database','access','groups',
-                    'remote','upload','virtual','infos');
-foreach ($categories as $category)
+// language files
+$user_langdir = PHPWG_ROOT_PATH.'language/'.$user['language'];
+$conf_langdir = PHPWG_ROOT_PATH.'language/'.$conf['default_language'];
+
+if (file_exists($user_langdir.'/help.html'))
 {
-  $template->assign_block_vars(
-    'cat',
-    array('NAME'=>$lang['help_'.$category.'_title']));
-  
-  foreach ($lang['help_'.$category] as $item)
-  {
-    $template->assign_block_vars('cat.item', array('CONTENT'=>$item));
-  }
+  $html_file = $user_langdir.'/help.html';
 }
-$template->assign_var_from_handle('ADMIN_CONTENT', 'help');
+else
+{
+  $html_file = $conf_langdir.'/help.html';
+}
+
+$template->set_filenames(array('help_content' => $html_file));
+$template->assign_var_from_handle('ADMIN_CONTENT', 'help_content');
 ?>
diff --git a/admin/include/functions.php b/admin/include/functions.php
index 78ec15a09..12a032b39 100644
--- a/admin/include/functions.php
+++ b/admin/include/functions.php
@@ -27,44 +27,6 @@
 
 include(PHPWG_ROOT_PATH.'admin/include/functions_metadata.php');
 
-$tab_ext_create_TN = array ( 'jpg', 'png', 'JPG', 'PNG' );
-
-// is_image returns true if the given $filename (including the path) is a
-// picture according to its format and its extension.
-// As GD library can only generate pictures from jpeg and png files, if you
-// ask if the filename is an image for thumbnail creation (second parameter
-// set to true), the only authorized formats are jpeg and png.
-function is_image( $filename, $create_thumbnail = false )
-{
-  global $conf, $tab_ext_create_TN;
-
-  if (is_file($filename)
-      and in_array(get_extension($filename), $conf['picture_ext']))
-  {
-    $size = getimagesize( $filename );
-    // $size[2] == 1 means GIF
-    // $size[2] == 2 means JPG
-    // $size[2] == 3 means PNG
-    if ( !$create_thumbnail )
-    {
-      if ( in_array( get_extension( $filename ), $conf['picture_ext'] )
-           and ( $size[2] == 1 or $size[2] == 2 or $size[2] == 3 ) )
-      {
-        return true;
-      }
-    }
-    else
-    {
-      if ( in_array( get_extension( $filename ), $tab_ext_create_TN )
-           and ( $size[2] == 2 or $size[2] == 3 ) )
-      {
-        return true;
-      }
-    }
-  }
-  return false;
-}
-
 /**
  * returns an array with all picture files according to $conf['file_ext']
  *
@@ -142,22 +104,6 @@ function get_representative_files($dir)
   return $pictures;
 }
 
-function TN_exists( $dir, $file )
-{
-  global $conf;
-
-  $filename = get_filename_wo_extension( $file );
-  foreach ( $conf['picture_ext'] as $ext ) {
-    $test = $dir.'/thumbnail/'.$conf['prefix_thumbnail'].$filename.'.'.$ext;
-    if ( is_file ( $test ) )
-    {
-      return $ext;
-    }
-  }
-  return false;
-}
-	
-
 // The function delete_site deletes a site and call the function
 // delete_categories for each primary category of the site
 function delete_site( $id )
@@ -552,21 +498,6 @@ SELECT id
   }
 }
 
-function check_date_format( $date )
-{
-  // date arrives at this format : DD/MM/YYYY
-  @list($day,$month,$year) = explode( '/', $date );
-  return @checkdate( $month, $day, $year );
-}
-
-function date_convert( $date )
-{
-  // date arrives at this format : DD/MM/YYYY
-  // It must be transformed in YYYY-MM-DD
-  list($day,$month,$year) = explode( '/', $date );
-  return $year.'-'.$month.'-'.$day;
-}
-
 function date_convert_back( $date )
 {
   // date arrives at this format : YYYY-MM-DD
@@ -602,37 +533,6 @@ function get_keywords($keywords_string)
 }
 
 /**
- * returns an array containing sub-directories which can be a category
- *
- * directories nammed "thumbnail", "pwg_high" or "pwg_representative" are
- * omitted
- *
- * @param string $basedir
- * @return array
- */
-function get_category_directories( $basedir )
-{
-  $sub_dirs = array();
-  
-  if ( $opendir = opendir( $basedir ) )
-  {
-    while ( $file = readdir( $opendir ) )
-    {
-      if ($file != '.'
-          and $file != '..'
-          and $file != 'thumbnail'
-          and $file != 'pwg_high'
-          and $file != 'pwg_representative'
-          and is_dir($basedir.'/'.$file))
-      {
-        array_push( $sub_dirs, $file );
-      }
-    }
-  }
-  return $sub_dirs;
-}
-
-/**
  * returns an array containing sub-directories which can be a category,
  * recursive by default
  *
diff --git a/admin/include/functions_metadata.php b/admin/include/functions_metadata.php
index 4836f85a3..79e38a829 100644
--- a/admin/include/functions_metadata.php
+++ b/admin/include/functions_metadata.php
@@ -221,28 +221,4 @@ SELECT id, path
   
   return $files;
 }
-
-// used_metadata string is displayed to inform admin which metadata will be
-// used from files for synchronization
-function get_used_metadata_list()
-{
-  global $conf;
-  
-  $used_metadata = array('filesize', 'width', 'height');
-
-  if ($conf['use_exif'])
-  {
-    array_push($used_metadata, 'date_creation');
-  }
-
-  if ($conf['use_iptc'])
-  {
-    foreach (array_keys($conf['use_iptc_mapping']) as $key)
-    {
-      array_push($used_metadata, $key);
-    }
-  }
-
-  return array_unique($used_metadata);
-}
 ?>
\ No newline at end of file
diff --git a/admin/thumbnail.php b/admin/thumbnail.php
index 64a6797e3..5193388d7 100644
--- a/admin/thumbnail.php
+++ b/admin/thumbnail.php
@@ -169,13 +169,7 @@ $template->assign_vars(array(
   'L_THUMBNAIL'=>$lang['thumbnail'],
   'L_PARAMS'=>$lang['tn_params_title'],
   'L_GD'=>$lang['tn_params_GD'],
-  'L_GD_INFO'=>$lang['tn_params_GD_info'],
-  'L_WIDTH_INFO'=>$lang['tn_params_width_info'],
-  'L_HEIGHT_INFO'=>$lang['tn_params_height_info'],
   'L_CREATE'=>$lang['tn_params_create'],
-  'L_CREATE_INFO'=>$lang['tn_params_create_info'],
-  'L_FORMAT'=>$lang['tn_params_format'],
-  'L_FORMAT_INFO'=>$lang['tn_params_format_info'],
   'L_SUBMIT'=>$lang['submit'],
   'L_REMAINING'=>$lang['tn_alone_title'],
   'L_TN_STATS'=>$lang['tn_stats'],
@@ -185,6 +179,8 @@ $template->assign_vars(array(
   'L_TN_MIN'=>$lang['tn_stats_min'],
   'L_TN_AVERAGE'=>$lang['tn_stats_mean'],
   'L_ALL'=>$lang['tn_all'],
+
+  'U_HELP' => PHPWG_ROOT_PATH.'/popuphelp.php?page=thumbnail',
   
   'T_STYLE'=>$user['template']
   ));
diff --git a/admin/user_list.php b/admin/user_list.php
index 0671dabc3..91bcfc954 100644
--- a/admin/user_list.php
+++ b/admin/user_list.php
@@ -293,6 +293,8 @@ $template->assign_vars(
     'L_RESET' => $lang['reset'],
     'L_DELETE' => $lang['user_delete'],
     'L_DELETE_HINT' => $lang['user_delete_hint'],
+
+    'U_HELP' => PHPWG_ROOT_PATH.'/popuphelp.php?page=user_list',
     
     'F_ADD_ACTION' => $base_url,
     'F_USERNAME' => @$_GET['username'],
diff --git a/doc/ChangeLog b/doc/ChangeLog
index b00a6a902..d45287b47 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,5 +1,24 @@
 2005-09-03 Pierrick LE GALL
 
+	* improvement: long localized messages are in HTML files instead
+	of $lang array. This is the case of admin/help and about pages.
+
+	* deletion: of unused functions (ts_to_mysqldt, is_image,
+	TN_exists, check_date_format, date_convert,
+	get_category_directories, get_used_metadata_list, array_remove,
+	pwg_write_debug, get_group_restrictions,
+	get_all_group_restrictions, is_group_allowed, style_select,
+	deprecated_getAttribute).
+
+	* new: many new contextual help pages to replace descriptions
+	previously included in pages.
+
+	* modification: reorganisation of language files. Deletion of
+	unused language keys, alphabetical sort. No faq.lang.php anymore
+	(replaced by help.html). Only done for en_UK.iso-8859-1.
+
+2005-09-03 Pierrick LE GALL
+
 	* bug fixed : no display of first added element date in
 	admin/intro if no element in the gallery.
 
diff --git a/feed.php b/feed.php
index c3747dfdc..49b52c103 100644
--- a/feed.php
+++ b/feed.php
@@ -215,18 +215,6 @@ function explode_mysqldt($mysqldt)
 }
 
 /**
- * creates a MySQL datetime format (2005-07-14 23:01:37) from a Unix
- * timestamp (number of seconds since 1970-01-01 00:00:00 GMT)
- *
- * @param int unix timestamp
- * @return string mysql datetime format
- */
-function ts_to_mysqldt($ts)
-{
-  return date('Y-m-d H:i:s', $ts);
-}
-
-/**
  * creates a Unix timestamp (number of seconds since 1970-01-01 00:00:00
  * GMT) from a MySQL datetime format (2005-07-14 23:01:37)
  *
diff --git a/include/common.inc.php b/include/common.inc.php
index afed22c87..fa0a7f3db 100644
--- a/include/common.inc.php
+++ b/include/common.inc.php
@@ -181,7 +181,7 @@ else
 // The administration section requires 2 more language files
 if (defined('IN_ADMIN') and IN_ADMIN)
 {
-  foreach (array('admin', 'faq') as $section)
+  foreach (array('admin') as $section)
   {
     if (file_exists($user_langdir.'/'.$section.'.lang.php'))
     {
diff --git a/include/config_default.inc.php b/include/config_default.inc.php
index 90d2cabf9..dbd5beb51 100644
--- a/include/config_default.inc.php
+++ b/include/config_default.inc.php
@@ -176,7 +176,8 @@ $conf['gallery_description'] = 'My photos web site';
 // galery_url : URL given in RSS feed
 $conf['gallery_url'] = 'http://demo.phpwebgallery.net';
 
-// prefix_thumbnail : string before filename
+// prefix_thumbnail : string before filename. Thumbnail's prefix must only
+// contain characters among : a to z (case insensitive), "-" or "_".
 $conf['prefix_thumbnail'] = 'TN-';
 
 // +-----------------------------------------------------------------------+
diff --git a/include/functions.inc.php b/include/functions.inc.php
index a37623ca2..5fb2fc263 100644
--- a/include/functions.inc.php
+++ b/include/functions.inc.php
@@ -102,17 +102,6 @@ function boolean_to_string($var)
   }
 }
 
-// array_remove removes a value from the given array if the value existed in
-// this array.
-function array_remove( $array, $value )
-{
-  $output = array();
-  foreach ( $array as $v ) {
-    if ( $v != $value ) array_push( $output, $v );
-  }
-  return $output;
-}
-
 // The function get_moment returns a float value coresponding to the number
 // of seconds since the unix epoch (1st January 1970) and the microseconds
 // are precised : e.g. 1052343429.89276600
@@ -433,16 +422,6 @@ function format_date($date, $type = 'us', $show_time = false)
   return $formated_date;
 }
 
-function pwg_write_debug()
-{
-  global $debug;
-  
-  $fp = @fopen( './log/debug.log', 'a+' );
-  fwrite( $fp, "\n\n" );
-  fwrite( $fp, $debug );
-  fclose( $fp );
-}
-
 function pwg_query($query)
 {
   global $conf,$page;
@@ -734,7 +713,7 @@ function l10n($key)
 {
   global $lang, $conf;
 
-  if ($conf['debug_l10n'])
+  if ($conf['debug_l10n'] and !isset($lang[$key]))
   {
     echo '[l10n] language key "'.$key.'" is not defined<br />';
   }
diff --git a/include/functions_group.inc.php b/include/functions_group.inc.php
index c45b8fcc3..919082a92 100644
--- a/include/functions_group.inc.php
+++ b/include/functions_group.inc.php
@@ -25,85 +25,6 @@
 // | USA.                                                                  |
 // +-----------------------------------------------------------------------+
 
-// get_group_restrictions returns an array containing all unaccessible
-// category ids.
-function get_group_restrictions( $group_id )
-{
-  // 1. retrieving ids of private categories
-  $query = 'SELECT id FROM '.CATEGORIES_TABLE;
-  $query.= " WHERE status = 'private'";
-  $query.= ';';
-  $result = pwg_query( $query );
-  $privates = array();
-  while ( $row = mysql_fetch_array( $result ) )
-  {
-    array_push( $privates, $row['id'] );
-  }
-  // 2. retrieving all authorized categories for the group
-  $authorized = array();
-  $query = 'SELECT cat_id FROM '.GROUP_ACCESS_TABLE;
-  $query.= ' WHERE group_id = '.$group_id;
-  $query.= ';';
-  $result = pwg_query( $query );
-  while ( $row = mysql_fetch_array( $result ) )
-  {
-    array_push( $authorized, $row['cat_id'] );
-  }
+// with 1.5 preparation, no group dedicated function is used.
 
-  $forbidden = array();
-  foreach ( $privates as $private ) {
-    if ( !in_array( $private, $authorized ) )
-    {
-      array_push( $forbidden, $private );
-    }
-  }
-
-  return $forbidden;
-}
-
-// get_all_group_restrictions returns an array with ALL unaccessible
-// category ids, including sub-categories
-function get_all_group_restrictions( $group_id )
-{
-  $restricted_cats = get_group_restrictions( $group_id );
-  foreach ( $restricted_cats as $restricted_cat ) {
-    $sub_restricted_cats = get_subcats_id( $restricted_cat );
-    foreach ( $sub_restricted_cats as $sub_restricted_cat ) {
-      array_push( $restricted_cats, $sub_restricted_cat );
-    }
-  }
-  return $restricted_cats;
-}
-
-// The function is_group_allowed returns :
-//      - 0 : if the category is allowed with this $restrictions array
-//      - 1 : if this category is not allowed
-//      - 2 : if an uppercat category is not allowed
-function is_group_allowed( $category_id, $restrictions )
-{
-  $lowest_category_id = $category_id;
-                
-  $is_root = false;
-  while ( !$is_root and !in_array( $category_id, $restrictions ) )
-  {
-    $query = 'SELECT id_uppercat FROM '.CATEGORIES_TABLE;
-    $query.= ' WHERE id = '.$category_id;
-    $query.= ';';
-    $row = mysql_fetch_array( pwg_query( $query ) );
-    if ( !isset( $row['id_uppercat'] ) ) $row['id_uppercat'] = '';
-    if ( $row['id_uppercat'] == '' ) $is_root = true;
-    $category_id = $row['id_uppercat'];
-  }
-                
-  if ( in_array( $lowest_category_id, $restrictions ) )
-  {
-    return 1;
-  }
-  if ( in_array( $category_id, $restrictions ) )
-  {
-    return 2;
-  }
-  // this group is allowed to go in this category
-  return 0;
-}
 ?>
diff --git a/include/functions_html.inc.php b/include/functions_html.inc.php
index b3aacb70d..ae5d5ef47 100644
--- a/include/functions_html.inc.php
+++ b/include/functions_html.inc.php
@@ -203,24 +203,6 @@ function language_select($default, $select_name = "language")
   return $lang_select;
 }
 
-//
-// Pick a template/theme combo, 
-//
-function style_select($default_style, $select_name = "style")
-{
-  $templates = get_templates();
-
-  $style_selected = '<select name="' . $select_name . '" >';
-  foreach ($templates as $template)
-  {
-    $selected = ( $template == $default_style ) ? ' selected="selected"' : '';
-    $style_selected.= '<option value="'.$template.'"'.$selected.'>';
-    $style_selected.= $template.'</option>';
-  }
-  $style_selected .= '</select>';
-  return $style_selected;
-}
-
 /**
  * returns the list of categories as a HTML string
  *
diff --git a/include/functions_xml.inc.php b/include/functions_xml.inc.php
index 2afe7a23b..d37537fa1 100644
--- a/include/functions_xml.inc.php
+++ b/include/functions_xml.inc.php
@@ -56,28 +56,6 @@ function getAttribute( $element, $attribute )
   if ( preg_match( $regex, $element, $out ) ) return $out[1];
   else return '';
 }
-
-function deprecated_getAttribute( $element, $attribute )
-{
-  // Retrieving string with tag name and all attributes
-  $regex = '/^<\w+( '.ATT_REG.'="'.VAL_REG.'")*/';
-  preg_match( $regex, $element, $out );
-
-  // Splitting string for retrieving separately attributes
-  // and corresponding values
-  $regex = '/('.ATT_REG.')="('.VAL_REG.')"/';
-  preg_match_all( $regex, $out[0], $out );
-
-  // Searching and returning the value of the requested attribute
-  for ( $i = 0; $i < sizeof( $out[0] ); $i++ )
-  {
-    if ( $out[1][$i] == $attribute )
-    {
-      return $out[2][$i];
-    }
-  }
-  return '';
-}
 	
 // The function getChild returns the first child
 // exemple : getChild( "<table><tr>XXX</tr><tr>YYY</tr></table>", "tr" )
diff --git a/language/en_UK.iso-8859-1/about.html b/language/en_UK.iso-8859-1/about.html
new file mode 100644
index 000000000..36ad2557b
--- /dev/null
+++ b/language/en_UK.iso-8859-1/about.html
@@ -0,0 +1,13 @@
+<ul>
+
+  <li>PhpWebGallery is a web application giving you the possibility to
+  create an online images gallery easily.</li>
+
+  <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">PhpWebGallery</a> official site, and
+  its dedicated <a href="http://forum.phpwebgallery.net">forum</a>.</li>
+
+</ul>
diff --git a/language/en_UK.iso-8859-1/admin.lang.php b/language/en_UK.iso-8859-1/admin.lang.php
index 40553bf68..65b4a56cb 100644
--- a/language/en_UK.iso-8859-1/admin.lang.php
+++ b/language/en_UK.iso-8859-1/admin.lang.php
@@ -25,325 +25,314 @@
 // | USA.                                                                  |
 // +-----------------------------------------------------------------------+
 
-// Main words
-$lang['links'] = 'Links';
-$lang['general'] = 'General';
+$lang['%d categories including %d physical and %d virtual'] = '%d categories including %d physical and %d virtual';
+$lang['%d comments'] = '%d comments';
+$lang['%d elements'] = '%d elements';
+$lang['%d groups'] = '%d groups';
+$lang['%d members'] = '%d members';
+$lang['%d user comments rejected'] = '%d user comments rejected';
+$lang['%d user comments validated'] = '%d user comments validated';
+$lang['%d users deleted'] = '%d users deleted';
+$lang['%d users'] = '%d users';
+$lang['%d waiting for validation'] = '%d waiting for validation';
+$lang['%d waiting pictures rejected'] = '%d waiting pictures rejected';
+$lang['%d waiting pictures validated'] = '%d waiting pictures validated';
+$lang['A new version of PhpWebGallery is available.'] = 'A new version of PhpWebGallery is available.';
+$lang['Actions'] = 'Actions';
+$lang['Add a user'] = 'Add a user';
+$lang['Add group'] = 'Add group';
+$lang['Add'] = 'Add';
+$lang['Associated'] = 'Associated';
+$lang['Association to categories'] = 'Association to categories';
+$lang['Batch management'] = 'Batch management';
+$lang['Caddie'] = 'Caddie';
+$lang['Categories authorized thanks to group associations'] = 'Categories authorized thanks to group associations';
+$lang['Check for upgrade failed for unknown reasons.'] = 'Check for upgrade failed for unknown reasons.';
+$lang['Check for upgrade'] = 'Check for upgrade';
+$lang['Comments for all'] = 'Comments for all';
+$lang['Creation date'] = 'Creation date';
+$lang['Database'] = 'Database';
+$lang['Delete Representant'] = 'Delete Representant';
+$lang['Delete selected users'] = 'Delete selected users';
+$lang['Deletions'] = 'Deletions';
+$lang['Deny selected groups'] = 'Deny selected groups';
+$lang['Deny selected users'] = 'Deny selected users';
+$lang['Description'] = 'Description';
+$lang['Dissociated'] = 'Dissociated';
+$lang['Does not represent'] = 'Does not represent';
+$lang['Edit all picture informations'] = 'Edit all picture informations';
+$lang['Empty caddie'] = 'Empty caddie';
+$lang['Environment'] = 'Environment';
+$lang['Expand all categories'] = 'Expand all categories';
+$lang['Grant selected groups'] = 'Grant selected groups';
+$lang['Grant selected users'] = 'Grant selected users';
+$lang['Group name'] = 'Group name';
+$lang['Groups'] = 'Groups';
+$lang['History'] = 'History';
+$lang['Informations'] = 'Informations';
+$lang['Interface theme'] = 'Interface theme';
+$lang['Language'] = 'Language';
+$lang['Linked categories'] = 'Linked categories';
+$lang['Lock gallery'] = 'Lock gallery';
+$lang['Maintenance'] = 'Maintenance';
+$lang['Manage permissions for a category'] = 'Manage permissions for a category';
+$lang['Manage permissions for group "%s"'] = 'Manage permissions for group "%s"';
+$lang['Manage permissions for user "%s"'] = 'Manage permissions for user "%s"';
+$lang['Maximum height of the pictures'] = 'Maximum height of the pictures';
+$lang['Maximum width of the pictures'] = 'Maximum width of the pictures';
+$lang['Members'] = 'Members';
+$lang['Metadata synchronized from file'] = 'Metadata synchronized from file';
+$lang['Move'] = 'Move';
+$lang['Name'] = 'Name';
+$lang['No'] = 'No';
+$lang['Number of comments per page'] = 'Number of comments per page';
+$lang['Number of images per row'] = 'Number of images per row';
+$lang['Number of rows per page'] = 'Number of rows per page';
+$lang['Number of thumbnails to create'] = 'Number of thumbnails to create';
+$lang['Only private categories are listed'] = 'Only private categories are listed';
+$lang['Operating system'] = 'Operating system';
+$lang['Options'] = 'Options';
+$lang['Order by'] = 'Order by';
+$lang['Other private categories'] = 'Other private categories';
+$lang['Parent category'] = 'Parent category';
+$lang['Path'] = 'Path';
+$lang['Permission denied'] = 'Permission denied';
+$lang['Permission granted thanks to a group'] = 'Permission granted thanks to a group';
+$lang['Permission granted'] = 'Permission granted';
+$lang['PhpWebGallery Administration'] = 'PhpWebGallery Administration';
+$lang['PhpWebGallery version'] = 'PhpWebGallery version';
+$lang['Picture informations updated'] = 'Picture informations updated';
+$lang['Position'] = 'Position';
+$lang['Preferences'] = 'Preferences';
+$lang['Properties'] = 'Properties';
+$lang['Random picture'] = 'Random picture';
+$lang['Recent period'] = 'Recent period';
+$lang['Registration date'] = 'Registration date';
+$lang['Reject All'] = 'Reject All';
+$lang['Reject'] = 'Reject';
+$lang['Representant'] = 'Representant';
+$lang['Representation of categories'] = 'Representation of categories';
+$lang['Representative'] = 'Representative';
+$lang['Represents'] = 'Represents';
+$lang['Save order'] = 'Save order';
+$lang['Select at least one user'] = 'Select at least one user';
+$lang['Show info'] = 'Show info';
+$lang['Show number of comments'] = 'Show number of comments';
+$lang['Status'] = 'Status';
+$lang['Storage category'] = 'Storage category';
+$lang['Submit'] = 'Submit';
+$lang['Take selected elements out of caddie'] = 'Take selected elements out of caddie';
+$lang['Unable to check for upgrade since allow_url_fopen is disabled.'] = 'Unable to check for upgrade since allow_url_fopen is disabled.';
+$lang['User comments validation'] = 'User comments validation';
+$lang['Users'] = 'Users';
+$lang['Validate All'] = 'Validate All';
+$lang['Validate'] = 'Validate';
+$lang['Validation'] = 'Validation';
+$lang['Webmaster cannot be deleted'] = 'Webmaster cannot be deleted';
+$lang['Yes'] = 'Yes';
+$lang['You are running on development sources, no check possible.'] = 'You are running on development sources, no check possible.';
+$lang['You are running the latest version of PhpWebGallery.'] = 'You are running the latest version of PhpWebGallery.';
+$lang['You need to confirm deletion'] = 'You need to confirm deletion';
+$lang['actions'] = 'actions';
+$lang['all'] = 'all';
+$lang['ascending'] = 'ascending';
+$lang['associate to group'] = 'associate to group';
+$lang['author'] = 'author';
+$lang['authorized'] = 'Authorized';
+$lang['cat_add'] = 'Add a virtual category';
+$lang['cat_comments_title'] = 'Authorize users to add comments on selected categories';
+$lang['cat_error_name'] = 'The name of a category should not be empty';
+$lang['cat_image_info'] = 'Images info';
+$lang['cat_lock_title'] = 'Lock categories';
+$lang['cat_private'] = 'Private category';
+$lang['cat_public'] = 'Public category';
+$lang['cat_representant'] = 'Find a new representant by random';
+$lang['cat_security'] = 'Public / Private';
+$lang['cat_status_title'] = 'Manage authorizations for selected categories';
+$lang['cat_upload_title'] = 'Select uploadable categories';
+$lang['cat_virtual_added'] = 'Virtual category added';
+$lang['cat_virtual_deleted'] = 'Virtual category deleted';
+$lang['category'] = 'category';
+$lang['conf_access'] = 'Access type';
+$lang['conf_comments_title'] = 'Users comments';
+$lang['conf_confirmation'] = 'Information data registered in database';
+$lang['conf_default'] = 'Default display';
+$lang['conf_default_title'] = 'Default display';
+$lang['conf_general_title'] = 'Main configuration';
+$lang['conf_nb_comment_page_error'] = 'The number of comments a page must be between 5 and 50 included.';
 $lang['config'] = 'Configuration';
-$lang['users'] = 'Users';
-$lang['instructions'] = 'Instructions';
-$lang['history'] = 'History';
-$lang['manage'] = 'Manage';
-$lang['waiting'] = 'Waiting';
-$lang['groups'] = 'Groups';
-$lang['permissions'] = 'Permissions';
-$lang['update'] = 'Synchronize';
-$lang['storage'] = 'Directory';
+$lang['confirm'] = 'confirm';
+$lang['date'] = 'date';
+$lang['delete category'] = 'delete category';
+$lang['descending'] = 'descending';
+$lang['description'] = 'description';
+$lang['dissociate from group'] = 'dissociate from group';
+$lang['down'] = 'Move down';
+$lang['edit category permissions'] = 'edit category permissions';
 $lang['edit'] = 'Edit';
-$lang['authorized'] = 'Authorized';
+$lang['editcat_confirm'] = 'Category informations updated successfully.';
+$lang['editcat_uploadable'] = 'Authorize upload';
+$lang['elements'] = 'elements';
+$lang['file'] = 'file';
+$lang['filesize'] = 'filesize';
+$lang['first element added on %s'] = 'first element added on %s';
 $lang['forbidden'] = 'Forbidden';
-$lang['public'] = 'public';
-$lang['private'] = 'private';
-$lang['metadata']='Metadata';
-$lang['visitors'] = 'Visitors';
-$lang['locked'] = 'Locked';
-$lang['unlocked'] = 'Unlocked';
+$lang['general'] = 'General';
+$lang['group "%s" added'] = 'group "%s" added';
+$lang['group "%s" deleted'] = 'group "%s" deleted';
+$lang['group'] = 'group';
+$lang['group_add_error1'] = 'The name of a group must not contain " or \' or be empty.';
+$lang['group_add_error2'] = 'This name is already used by another group.';
+$lang['group_add_user']= 'Add user';
+$lang['group_id URL parameter is missing'] = 'group_id URL parameter is missing';
+$lang['groups'] = 'Groups';
+$lang['history'] = 'History';
+$lang['instructions'] = 'Instructions';
+$lang['jump to category'] = 'jump to category';
+$lang['jump to image'] = 'jump to image';
+$lang['jump to'] = 'jump to';
+$lang['leave'] = 'leave';
+$lang['links'] = 'Links';
 $lang['lock'] = 'Lock';
-$lang['unlock'] = 'Unlock';
-$lang['up'] = 'Move up';
-$lang['down'] = 'Move down';
-$lang['path'] = 'path';
+$lang['locked'] = 'Locked';
+$lang['manage category elements'] = 'manage category elements';
+$lang['manage sub-categories'] = 'manage sub-categories';
+$lang['manage'] = 'Manage';
+$lang['metadata_basic'] = 'basic';
+$lang['metadata_exif'] = 'EXIF';
+$lang['metadata_iptc'] = 'IPTC';
+$lang['name'] = 'name';
 $lang['no_write_access'] = 'no write access';
-
-// Specific words
-$lang['phpinfos'] = 'PHP Information';
+$lang['order_by'] = 'order by';
+$lang['path'] = 'path';
+$lang['permissions'] = 'Permissions';
+$lang['permuser_info'] = 'Only private categories are listed. Private/Public category status can be set in screen "Categories &gt; Public / Private"';
+$lang['permuser_only_private'] = 'Only private categories are shown';
+$lang['pictures'] = 'pictures';
+$lang['private'] = 'private';
+$lang['public'] = 'public';
+$lang['purge history'] = 'purge history';
+$lang['purge never used notification feeds'] = 'purge never used notification feeds';
+$lang['purge sessions'] = 'purge sessions';
+$lang['randomly represented'] = 'randomly represented';
+$lang['registration_date'] = 'registration date';
 $lang['remote_site'] = 'Remote site';
-$lang['remote_sites'] = 'Remote sites';
-$lang['gallery_default'] = 'Gallery Default';
-$lang['upload'] = 'Upload';
-
-// Remote sites management
-$lang['remote_site_create'] = 'Create a new site : (give its URL to generate_file_listing.php)';
-$lang['remote_site_uncorrect_url'] = 'Remote site url must start by http or https and must only contain characters among "/", "a-zA-Z0-9", "-" or "_"';
 $lang['remote_site_already_exists'] = 'This site already exists';
-$lang['remote_site_generate'] = 'generate listing';
-$lang['remote_site_generate_hint'] = 'generate file listing.xml on remote site';
-$lang['remote_site_update'] = 'update';
-$lang['remote_site_update_hint'] = 'read remote listing.xml and updates database';
 $lang['remote_site_clean'] = 'clean';
 $lang['remote_site_clean_hint'] = 'remove remote listing.xml file';
+$lang['remote_site_create'] = 'Create a new site : (give its URL to generate_file_listing.php)';
+$lang['remote_site_created'] = 'created';
 $lang['remote_site_delete'] = 'delete';
 $lang['remote_site_delete_hint'] = 'delete this site and all its attached elements';
-$lang['remote_site_file_not_found'] = 'file create_listing_file.php on remote site was not found';
+$lang['remote_site_deleted'] = 'deleted';
 $lang['remote_site_error'] = 'an error happened';
+$lang['remote_site_file_not_found'] = 'file create_listing_file.php on remote site was not found';
+$lang['remote_site_generate'] = 'generate listing';
+$lang['remote_site_generate_hint'] = 'generate file listing.xml on remote site';
 $lang['remote_site_listing_not_found'] = 'listing.xml file was not found';
-$lang['remote_site_removed'] = 'was removed on remote site';
-$lang['remote_site_removed_title'] = 'Removed elements';
-$lang['remote_site_created'] = 'created';
-$lang['remote_site_deleted'] = 'deleted';
 $lang['remote_site_local_found'] = 'A local listing.xml file has been found for ';
 $lang['remote_site_local_new'] = '(new site)';
 $lang['remote_site_local_update'] = 'read local listing.xml and update';
-
-// Categories
-$lang['cat_security'] = 'Public / Private';
-$lang['cat_options'] = 'Category options';
-$lang['cat_add'] = 'Add a virtual category';
-$lang['cat_virtual'] = 'Virtual category';
-$lang['cat_public'] = 'Public category';
-$lang['cat_private'] = 'Private category';
-$lang['cat_image_info'] = 'Images info';
-$lang['editcat_status'] = 'Status';
-$lang['editcat_confirm'] = 'Category informations updated successfully.';
-$lang['editcat_perm'] = 'To set permissions for this category, click';
-$lang['editcat_lock_info'] = 'The category and its sub-categories will temporary been disabled for maintenance.';
-$lang['editcat_uploadable'] = 'Authorize upload';
-$lang['editcat_uploadable_info'] = 'Authorize users to upload files';
-$lang['editcat_commentable_info'] = 'Authorize users to comment elements of this category';
-$lang['cat_access_info'] = 'Permission management. If you make a category private, all its child categories becomes private. If you make a category public, all its parent categories becomes public';
-$lang['cat_virtual_added'] = 'Virtual category added';
-$lang['cat_virtual_deleted'] = 'Virtual category deleted';
-$lang['cat_upload_title'] = 'Select uploadable categories';
-$lang['cat_upload_info'] = 'Only non virtual and non remote categories are shown.';
-$lang['cat_lock_title'] = 'Lock categories';
-$lang['cat_lock_info'] = 'Selected categories will temporary been disabled for maintenance.
-<br />If you lock a category, all its child categories become locked.
-<br />If you unlock a category, all its parent categories become unlocked.';
-$lang['cat_comments_title'] = 'Authorize users to add comments on selected categories';
-$lang['cat_comments_info'] = 'By inheritance, an element is commentable if it belongs at least to one commentable category.';
-$lang['cat_status_title'] = 'Manage authorizations for selected categories';
-$lang['cat_status_info'] = 'Selected categories are private : you will need to authorize users and/or groups to access to them.
-<br />If you make a category private, all its child categories becomes private.
-<br />If you make a category public, all its parent categories becomes public';
-$lang['cat_representant'] = 'Find a new representant by random';
-
-// Titles
-$lang['admin_panel'] = 'Administration Panel';
-$lang['default_message'] = 'PhpWebGallery Administration Control Panel';
-$lang['title_liste_users'] = 'Users list';
-$lang['title_history'] = 'History';
-$lang['title_update'] = 'Database synchronization with files';
-$lang['title_configuration'] = 'PhpWebGallery configuration';
-$lang['title_instructions'] = 'Instructions';
+$lang['remote_site_removed'] = 'was removed on remote site';
+$lang['remote_site_removed_title'] = 'Removed elements';
+$lang['remote_site_uncorrect_url'] = 'Remote site url must start by http or https and must only contain characters among "/", "a-zA-Z0-9", "-" or "_"';
+$lang['remote_site_update'] = 'update';
+$lang['remote_site_update_hint'] = 'read remote listing.xml and updates database';
+$lang['remote_sites'] = 'Remote sites';
+$lang['selection'] = 'selection';
+$lang['set to'] = 'set to';
+$lang['singly represented'] = 'singly represented';
+$lang['stats_global_graph_title'] = 'Pages seen by month';
+$lang['stats_month_title'] = 'Monthly statistics';
+$lang['stats_pages_seen'] = 'Pages seen';
+$lang['stats_title'] = 'Last year statistics';
+$lang['status'] = 'status';
+$lang['storage'] = 'Directory';
+$lang['sub-categories'] = 'sub-categories';
+$lang['synchronize metadata'] = 'synchronize metadata';
+$lang['synchronize'] = 'synchronize';
+$lang['target'] = 'target';
+$lang['thumbnail'] = 'thumbnail';
+$lang['title_cat_options'] = 'Categories options';
 $lang['title_categories'] = 'Categories management';
-$lang['title_edit_cat'] = 'Edit a category';
-$lang['title_info_images'] = 'Modify category\'s image information';
-$lang['title_thumbnails'] = 'Thumbnail creation';
-$lang['title_thumbnails_2'] = 'for';
+$lang['title_configuration'] = 'PhpWebGallery configuration';
 $lang['title_default'] = 'PhpWebGallery administration';
-$lang['title_waiting'] = 'Pictures waiting for validation';
-$lang['title_cat_options'] = 'Categories options';
+$lang['title_edit_cat'] = 'Edit a category';
 $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';
-
-//Configuration
-$lang['conf_confirmation'] = 'Information data registered in database';
-$lang['conf_default'] = 'Default display';
-$lang['conf_cookie'] = 'Session & Cookie';
-
-// Configuration -> general
-$lang['conf_general_title'] = 'Main configuration';
-$lang['conf_mail_webmaster'] = 'Webmaster mail adress';
-$lang['conf_mail_webmaster_info'] = 'Visitors will be able to contact site administrator with this mail';
-$lang['conf_mail_webmaster_error'] = 'e-mail address refused, it must be like name@domain.com';
-$lang['conf_prefix'] = 'Thumbnail prefix';
-$lang['conf_prefix_info'] = 'Thumbnails use this prefix. Do not fill if your not sure.';
-$lang['conf_prefix_error'] = 'Thumbnail\'s prefix must only contain characters among : a to z (case insensitive), "-" or "_"';
-$lang['conf_access'] = 'Access type';
-$lang['conf_log_info'] = 'Keep an history of visits on your website ? Visits will be shown in the history section of the administration panel';
-$lang['conf_notification'] = 'Mail notification';
-$lang['conf_notification_info'] = 'Automated mail notification for adminsitrators (and only for them) when a user add a comment or upload a picture.';
-$lang['conf_gallery_locked'] = 'Lock gallery';
-$lang['conf_gallery_locked_info'] = 'Lock the entire gallery for maintenance. Only administrator users will be able to reach the gallery';
-
-// Configuration -> comments
-$lang['conf_comments_title'] = 'Users comments';
-$lang['conf_comments_forall'] = 'Comments for all ?';
-$lang['conf_comments_forall_info'] = 'Even guest not registered can post comments';
-$lang['conf_nb_comment_page'] = 'Number of comments per page';
-$lang['conf_nb_comment_page_info'] = 'number of comments to display on each page. This number is unlimited for a picture. Enter a number between 5 and 50.';
-$lang['conf_nb_comment_page_error'] = 'The number of comments a page must be between 5 and 50 included.';
-$lang['conf_comments_validation'] = 'Validation';
-$lang['conf_comments_validation_info'] = 'An administrator validate users posted comments before the becom visible on the site';
-
-// Configuration -> default
-$lang['conf_default_title'] = 'Default display';
-$lang['conf_default_language_info'] = 'Default language';
-$lang['conf_default_theme_info'] = 'Default theme';
-$lang['conf_nb_image_line_info'] = 'Number of pictures for each row by default';
-$lang['conf_nb_line_page_info'] = 'Number of rows by page by default';
-$lang['conf_recent_period_info'] = 'By days. Period within a picture is shown as new. Must be superior to 1 day.';
-$lang['conf_default_expand_info'] = 'Expand all categories by default in the menu ?';
-$lang['conf_show_nb_comments_info'] = 'show the number of comments for each picture on the thumbnails page';
-
-// Configuration -> upload
-$lang['conf_upload_title'] = 'Users upload';
-$lang['conf_upload_maxfilesize'] = 'Maximum filesize';
-$lang['conf_upload_maxfilesize_info'] = 'Maximum filesize for the uploaded pictures. Must be a number between 10 and 1000 KB.';
-$lang['conf_upload_maxfilesize_error'] = 'Maximum filesize for the uploaded pictures must be a number between 10 and 1000 KB.';
-$lang['conf_upload_maxwidth'] = 'Maximum width';
-$lang['conf_upload_maxwidth_info'] = 'Maximum width authorized for the uploaded images. Must be a number superior to 10 pixels';
-$lang['conf_upload_maxwidth_error'] = 'maximum width authorized for the uploaded images must be a number superior to 10 pixels.';
-$lang['conf_upload_maxheight'] = 'Maximum height';
-$lang['conf_upload_maxheight_info'] = 'Maximum height authorized for the uploaded images. Must be a number superior to 10 pixels';
-$lang['conf_upload_maxheight_error'] = 'maximum height authorized for the uploaded images must be a number superior to 10 pixels.';
-$lang['conf_upload_tn_maxwidth'] = 'thumbnails maximum width';
-$lang['conf_upload_tn_maxwidth_info'] = 'Maximum width authorized for the uploaded thumbnails. Must be a number superior to 10 pixels';
-$lang['conf_upload_maxwidth_thumbnail_error'] = 'Maximum width authorized for the uploaded thumbnails must be a number superior to 10 pixels.';
-$lang['conf_upload_tn_maxheight'] = 'Thumbnails maximum height';
-$lang['conf_upload_tn_maxheight_info'] = 'Maximum height authorized for the uploaded thumbnails. Must be a number superior to 10 pixels';
-$lang['conf_upload_maxheight_thumbnail_error'] = 'Maximum height authorized for the uploaded thumbnails must be a number superior to 10 pixels.';
-
-// Configuration -> session
-$lang['conf_session_title'] = 'Sessions';
-$lang['conf_authorize_remembering'] = 'Authorize remembering';
-$lang['conf_authorize_remembering_info'] = 'Permits user to log for a long time. It creates a cookie on client side, with duration set in include/config.inc.php (1 year per default)';
-
-// Configuration -> metadata
-$lang['conf_metadata_title'] = 'Metadata';
-$lang['conf_use_exif'] = 'Use EXIF';
-$lang['conf_use_exif_info'] = 'Use EXIF data during metadata synchronization into PhpWebGallery database';
-$lang['conf_use_iptc'] = 'Use IPTC';
-$lang['conf_use_iptc_info'] = 'Use IPTC data during metadata synchronization into PhpWebGallery database';
-$lang['conf_show_exif'] = 'Show EXIF';
-$lang['conf_show_exif_info'] = 'Give the possibility to show EXIF metadata on visualisation page. See include/config.inc.php for available EXIF fields';
-$lang['conf_show_iptc'] = 'Show IPTC';
-$lang['conf_show_iptc_info'] = 'Give the possibility to show IPTC metadata on visualisation page. See include/config.inc.php for available IPTC fields';
-
-// Configuration -> remote
-$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_history'] = 'History';
+$lang['title_liste_users'] = 'Users list';
 $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';
-$lang['infoimage_detailed'] = 'Option for each picture';
-$lang['infoimage_title'] = 'Title';
-$lang['infoimage_keyword_separation'] = '(separate with coma ",")';
-$lang['infoimage_addtoall'] = 'add to all';
-$lang['infoimage_removefromall'] = 'remove from all';
-$lang['infoimage_associate'] = 'Associate to the category';
-$lang['infoimage_associated'] = 'virtually associated to';
-$lang['infoimage_dissociated'] = 'dissociated from';
-$lang['storage_category'] = 'storage category';
-$lang['represents'] = 'represents';
-$lang['doesnt_represent'] = 'doesn\'t represent';
-$lang['cat_unknown_id'] = 'This category is unknown in the database';
-$lang['dissociate'] = 'dissociate';
-
-// Thumbnails
-$lang['tn_width'] = 'width';
+$lang['title_thumbnails'] = 'Thumbnail creation';
+$lang['title_update'] = 'Database synchronization with files';
+$lang['title_waiting'] = 'Pictures waiting for validation';
+$lang['tn_all'] = 'all';
+$lang['tn_alone_title'] = 'pictures without thumbnail (jpeg and png only)';
+$lang['tn_dirs_alone'] = 'pictures without thumbnail';
+$lang['tn_dirs_title'] = 'Directories list';
+$lang['tn_err_height'] = 'height must be a number superior to';
+$lang['tn_err_width'] = 'width must be a number superior to';
+$lang['tn_format'] = 'for the file format';
 $lang['tn_height'] = 'height';
+$lang['tn_no_missing'] = 'No missing thumbnail';
 $lang['tn_no_support'] = 'Picture unreachable or no support';
-$lang['tn_format'] = 'for the file format';
-$lang['tn_thisformat'] = 'for this file format';
-$lang['tn_err_width'] = 'width must be a number superior to';
-$lang['tn_err_height'] = 'height must be a number superior to';
-$lang['tn_results_title'] = 'Results of miniaturization';
-$lang['tn_picture'] = 'picture';
+$lang['tn_params_GD'] = 'GD version';
+$lang['tn_params_create'] = 'create';
+$lang['tn_params_title'] = 'Miniaturization parameters';
 $lang['tn_results_gen_time'] = 'generated in';
+$lang['tn_results_title'] = 'Results of miniaturization';
 $lang['tn_stats'] = 'General statistics';
-$lang['tn_stats_nb'] = 'number of miniaturized pictures';
-$lang['tn_stats_total'] = 'total time';
 $lang['tn_stats_max'] = 'max time';
-$lang['tn_stats_min'] = 'min time';
 $lang['tn_stats_mean'] = 'average time';
-$lang['tn_err'] = 'You made mistakes';
-$lang['tn_params_title'] = 'Miniaturization parameters';
-$lang['tn_params_GD'] = 'GD version';
-$lang['tn_params_GD_info'] = '- GD is the picture manipulating library for PHP<br />-choose the version installed on your server. If you choose the wrong, you\'ll just have errors messages, come back with your browser and choose the other version. If no version works, it means your server doesn\'t support GD.';
-$lang['tn_params_width_info'] = 'maximum width that thumbnails can take';
-$lang['tn_params_height_info'] = 'maximum height that thumbnails can take';
-$lang['tn_params_create'] = 'create';
-$lang['tn_params_create_info'] = 'Do not try to miniaturize too many pictures in the same time.<br />Indeed, miniaturization uses a lot of CPU. If you installed PhpWebGallery on a free provider, a too high CPU load can sometime lead to the deletion of your website.';
-$lang['tn_params_format'] = 'file format';
-$lang['tn_params_format_info'] = 'only jpeg file format is supported for thumbnail creation';
-$lang['tn_alone_title'] = 'pictures without thumbnail (jpeg and png only)';
-$lang['tn_dirs_title'] = 'Directories list';
-$lang['tn_dirs_alone'] = 'pictures without thumbnail';
-$lang['tn_no_missing'] = 'No missing thumbnail';
-$lang['tn_all'] = 'all';
-
-// 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';
+$lang['tn_stats_min'] = 'min time';
+$lang['tn_stats_nb'] = 'number of miniaturized pictures';
+$lang['tn_stats_total'] = 'total time';
+$lang['tn_thisformat'] = 'for this file format';
+$lang['tn_width'] = 'width';
+$lang['unlocked'] = 'Unlocked';
+$lang['unset'] = 'unset';
+$lang['up'] = 'Move up';
+$lang['update categories informations'] = 'update categories informations';
+$lang['update images informations'] = 'update images informations';
+$lang['update'] = 'Synchronize';
+$lang['update_cats_subset'] = 'reduce to single existing categories';
+$lang['update_default_title'] = 'Choose an option';
+$lang['update_display_info'] = 'display maximum informations (added categories and elements, deleted categories and elements)';
+$lang['update_elements_metadata_sync'] = 'elements informations synchronized with files metadata';
+$lang['update_error_list_title'] = 'Error list';
+$lang['update_errors_caption'] = 'Errors caption';
+$lang['update_infos_title'] = 'Detailed informations';
 $lang['update_missing_tn_info'] = 'a picture filetype requires a thumbnail. The thumbnail must be present in the sub-directory "thumbnail" of the category directory. The thumbnail filename must start with the configured thumbnail prefix and the extension must be among the following list :';
-$lang['update_disappeared_tn'] = 'the thumbnail disapeared';
-$lang['update_disappeared'] = 'doesn\'t exist';
-$lang['update_part_deletion'] = 'Deletion of images that have no thumbnail or that doesn\'t exist';
+$lang['update_missing_tn_short'] = 'missing thumbnail';
+$lang['update_nb_del_categories'] = 'categories deleted in the database';
+$lang['update_nb_del_elements'] = 'elements deleted in the database';
+$lang['update_nb_errors'] = 'errors during synchronization';
+$lang['update_nb_new_categories'] = 'categories added in the database';
+$lang['update_nb_new_elements'] = 'elements added in the database';
 $lang['update_part_research'] = 'Search for new images in the directories';
 $lang['update_research_added'] = 'added';
 $lang['update_research_deleted'] = 'deleted';
-$lang['update_research_tn_ext'] = 'thumbnail in';
-$lang['update_nb_new_elements'] = 'elements added in the database';
-$lang['update_nb_del_elements'] = 'elements deleted in the database';
-$lang['update_nb_new_categories'] = 'categories added in the database';
-$lang['update_nb_del_categories'] = 'categories deleted in the database';
-$lang['update_default_title'] = 'Choose an option';
-$lang['update_sync_files'] = 'synchronize files structure with database';
-$lang['update_sync_dirs'] = 'only directories';
+$lang['update_result_metadata'] = 'Metadata synchronization results';
+$lang['update_simulate'] = 'only perform a simulation (no change in database will be made)';
+$lang['update_simulation_title'] = '[Simulation]';
 $lang['update_sync_all'] = 'directories + files';
+$lang['update_sync_dirs'] = 'only directories';
+$lang['update_sync_files'] = 'synchronize files structure with database';
 $lang['update_sync_metadata'] = 'synchronize files metadata with database elements informations';
-$lang['update_sync_metadata_new'] = 'only never synchronized elements';
 $lang['update_sync_metadata_all'] = 'even already synchronized elements';
-$lang['update_cats_subset'] = 'reduce to single existing categories';
-$lang['update_nb_errors'] = 'errors during synchronization';
-$lang['update_error_list_title'] = 'Error list';
-$lang['update_errors_caption'] = 'Errors caption';
-$lang['update_display_info'] = 'display maximum informations (added categories and elements, deleted categories and elements)';
-$lang['update_simulate'] = 'only perform a simulation (no change in database will be made)';
-$lang['update_infos_title'] = 'Detailed informations';
-$lang['update_simulation_title'] = '[Simulation]';
-$lang['update_wrong_dirname'] = 'The name of directories and files must be composed of letters, figures, "-", "_" or "."';
-$lang['update_wrong_dirname_short'] = 'wrong filename';
-$lang['update_wrong_dirname_info'] = 'The name of directories and files must be composed of letters, figures, "-", "_" or "."';
-$lang['update_result_metadata'] = 'Metadata synchronization results';
-$lang['update_elements_metadata_sync'] = 'elements informations synchronized with files metadata';
+$lang['update_sync_metadata_new'] = 'only never synchronized elements';
 $lang['update_used_metadata'] = 'Used metadata';
-$lang['metadata_basic'] = 'basic';
-$lang['metadata_exif'] = 'EXIF';
-$lang['metadata_iptc'] = 'IPTC';
-
-// History
-$lang['stats_title'] = 'Last year statistics';
-$lang['stats_month_title'] = 'Monthly statistics';
-$lang['stats_pages_seen'] = 'Pages seen';
-$lang['stats_global_graph_title'] = 'Pages seen by month';
-$lang['stats_visitors_graph_title'] = 'Nombre de visiteurs par jour';
-
-// Users
-$lang['title_user_modify'] = 'Modify a user';
-$lang['title_user_perm'] = 'Modify permission for user';
-$lang['user_err_modify'] = 'This user can\'t be modified or deleted';
-$lang['user_err_unknown'] = 'This user doesn\'t exist in the database';
-$lang['user_management'] = 'Special field for administrators';
+$lang['update_wrong_dirname_info'] = 'The name of directories and files must be composed of letters, figures, "-", "_" or "."';
+$lang['update_wrong_dirname_short'] = 'wrong filename';
+$lang['upload'] = 'Upload';
+$lang['user_delete'] = 'Delete user';
+$lang['user_delete_hint'] = 'Click here to delete this user. Warning! This operation cannot be undone!';
+$lang['user_id URL parameter is missing'] = 'user_id URL parameter is missing';
 $lang['user_status'] = 'User status';
 $lang['user_status_admin'] = 'Administrator';
 $lang['user_status_guest'] = 'User';
-$lang['user_delete'] = 'Delete user';
-$lang['user_delete_hint'] = 'Click here to delete this user. Warning! This operation cannot be undone!';
-$lang['permuser_only_private'] = 'Only private categories are shown';
-$lang['permuser_info'] = 'Only private categories are listed. Private/Public category status can be set in screen "Categories &gt; Public / Private"';
-$lang['order_by'] = 'order by';
-$lang['registration_date'] = 'registration date';
-$lang['ascending'] = 'ascending';
-$lang['descending'] = 'descending';
-$lang['actions'] = 'actions';
-
-// Groups
-$lang['group_confirm_delete']= 'Confirm group deletion';
-$lang['group_add'] = 'Add a group';
-$lang['group_add_error1'] = 'The name of a group must not contain " or \' or be empty.';
-$lang['group_add_error2'] = 'This name is already used by another group.';
-$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_group_perm'] = 'Modify permissions for group';
+$lang['username'] = 'username';
+$lang['users'] = 'Users';
+$lang['visitors'] = 'Visitors';
+$lang['w_day'] = 'w_day';
+$lang['waiting'] = 'Waiting';
 ?>
\ 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 2793b9a30..dbe9921d0 100644
--- a/language/en_UK.iso-8859-1/common.lang.php
+++ b/language/en_UK.iso-8859-1/common.lang.php
@@ -32,114 +32,148 @@ $lang_info['charset'] = 'iso-8859-1';
 $lang_info['direction'] = 'ltr';
 $lang_info['code'] = 'en';
 
-// Main words 
-$lang['no_category'] = 'Home';
-$lang['category'] = 'Category';
+$lang['%.2f (rated %d times, standard deviation = %.2f)'] = '%.2f (rated %d times, standard deviation = %.2f)';
+$lang['%d Kb'] = '%d Kb';
+$lang['%d categories updated'] = '%d categories updated';
+$lang['%d comments to validate'] = '%d comments to validate';
+$lang['%d new comments'] = '%d new comments';
+$lang['%d new elements'] = '%d new elements';
+$lang['%d new users'] = '%d new users';
+$lang['About'] = 'About';
+$lang['Author'] = 'Author';
+$lang['Average rate'] = 'Average rate';
+$lang['Categories'] = 'Categories';
+$lang['Category'] = 'Category';
+$lang['Close this window'] = 'Close this window';
+$lang['Confirm Password'] = 'Confirm Password';
+$lang['Connection settings'] = 'Connection settings';
+$lang['Create a new account'] = 'Create a new account';
+$lang['Created on'] = 'Created on';
+$lang['Current password is wrong'] = 'Current password is wrong';
+$lang['Dimensions'] = 'Dimensions';
+$lang['Display'] = 'Display';
+$lang['Email address'] = 'Email address';
+$lang['Enter your personnal informations'] = 'Enter your personnal informations';
+$lang['File'] = 'File';
+$lang['Filesize'] = 'Filesize';
+$lang['Filter and display'] = 'Filter and display';
+$lang['Filter'] = 'Filter';
+$lang['Go through the gallery as a visitor'] = 'Go through the gallery as a visitor';
+$lang['Help'] = 'Help';
+$lang['Identification'] = 'Identification';
+$lang['Keyword'] = 'Keyword';
+$lang['Keywords'] = 'Keywords';
+$lang['Links'] = 'Links';
+$lang['Mail address'] = 'Mail address';
+$lang['N/A'] = 'N/A';
+$lang['New on %s'] = 'New on %s';
+$lang['New password confirmation does not correspond'] = 'New password confirmation does not correspond';
+$lang['Notification'] = 'Notification';
+$lang['Number of items'] = 'Number of items';
+$lang['Original dimensions'] = 'Original dimensions';
+$lang['Password'] = 'Password';
+$lang['PhpWebGallery Help'] = 'PhpWebGallery Help';
+$lang['Profile'] = 'Profile';
+$lang['RSS feed'] = 'RSS feed';
+$lang['Register'] = 'Register';
+$lang['Registered on'] = 'Registered on';
+$lang['Registration'] = 'Registration';
+$lang['Reset'] = 'Reset';
+$lang['Search'] = 'Search';
+$lang['Since'] = 'Since';
+$lang['Sort by'] = 'Sort by';
+$lang['Sort order'] = 'Sort order';
+$lang['The RSS notification feed provides notification on news from this website : new pictures, updated categories, new comments. Use a RSS feed reader.'] = 'The RSS notification feed provides notification on news from this website : new pictures, updated categories, new comments. Use a RSS feed reader.';
+$lang['Unknown feed identifier'] = 'Unknown feed identifier';
+$lang['User comments'] = 'User comments';
+$lang['Username'] = 'Username';
+$lang['Visits'] = 'Visits';
+$lang['Webmaster'] = 'Webmaster';
+$lang['about'] = 'about';
+$lang['about_page_title'] = 'About PhpWebGallery';
+$lang['access_forbiden'] = 'You are not authorized to access this page';
+$lang['add to caddie'] = 'add to caddie';
+$lang['add_favorites_alt'] = 'Add to favorites';
+$lang['add_favorites_hint'] = 'Add this picture to your favorites';
+$lang['admin'] = 'Administration';
+$lang['all_categories'] = 'all categories';
+$lang['already_rated'] = 'You\'ve already rated this item';
+$lang['auto_expand'] = 'Expand all categories';
+$lang['best_rated_cat'] = 'best rated';
+$lang['best_rated_cat_hint'] = 'displays best rated items';
+$lang['caddie'] = 'caddie';
+$lang['calendar'] = 'calendar';
+$lang['calendar_hint'] = 'displays each day with pictures, month per month';
+$lang['calendar_picture_hint'] = 'displays pictures added on ';
 $lang['categories'] = 'Categories';
-$lang['thumbnail'] = 'Thumbnail';
-$lang['thumbnails'] = 'Thumbnails';
-$lang['search'] = 'Search';
 $lang['comment'] = 'Comment';
+$lang['comment_added'] = 'Your comment has been registered';
+$lang['comment_anti-flood'] = 'Anti-flood system : please wait for a moment before trying to post another comment';
+$lang['comment_to_validate'] = 'An administrator must authorize your comment before it is visible.';
+$lang['comment_user_exists'] = 'This login is already used by another user';
 $lang['comments'] = 'Comments';
-$lang['picture'] = 'Picture';
-$lang['pictures'] = 'Pictures';
-$lang['name'] = 'Name';
-$lang['no'] = 'No';
-$lang['yes'] = 'Yes';
-$lang['date'] = 'Date';
-$lang['description'] = 'Description';
-$lang['author'] = 'Author';
-$lang['size'] = 'Size';
-$lang['filesize'] = 'Filesize';
-$lang['file'] = 'File';
-$lang['keywords'] = 'Keywords';
-$lang['default'] = 'Default';
-$lang['send_mail'] = 'Contact';
-$lang['webmaster'] = 'Webmaster';
-$lang['language']='Language';
-$lang['powered_by'] = 'Powered by';
-$lang['all_categories'] = 'all categories';
-$lang['unavailable'] = 'N/A';
-
-//Properties
-$lang['registration_date'] = 'Registered on';
-$lang['creation_date'] = 'Created on';
-
-// Form words 
-$lang['submit'] = 'Submit';
+$lang['comments_add'] = 'Add a comment';
+$lang['comments_del'] = 'delete this comment';
+$lang['comments_title'] = 'Comments from the users of the site';
+$lang['confirm_password_hint'] = 'You only have to confirm your new password if you wish to change it.';
+$lang['customize'] = 'Customize';
+$lang['customize_page_title'] = 'Your Gallery Customization ';
+$lang['customize_title'] = 'Customization';
+$lang['day'][0] = 'Sunday';
+$lang['day'][1] = 'Monday';
+$lang['day'][2] = 'Tuesday';
+$lang['day'][3] = 'Wednesday';
+$lang['day'][4] = 'Thursday';
+$lang['day'][5] = 'Friday';
+$lang['day'][6] = 'Saturday';
+$lang['days'] = 'days';
+$lang['del_favorites_alt'] = 'Delete from favorites';
+$lang['del_favorites_hint'] = 'Delete this picture from your favorites';
 $lang['delete'] = 'Delete';
-$lang['reset'] = 'Reset';
-$lang['Close'] = 'Close the window';
-$lang['Select'] = 'Select';
-
-// Error management
-$lang['mandatory'] = 'obligatory';
+$lang['download'] = 'download';
+$lang['download_hint'] = 'download this file';
+$lang['edit category informations'] = 'edit category informations';
+$lang['edit'] = 'edit';
 $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';
 $lang['favorite_cat_hint'] = 'display my favorites pictures';
-$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';
-$lang['recent_cats_cat_hint'] = 'Displays recently updated categories';
-$lang['about'] = 'about';
+$lang['favorites'] = 'Favorites';
+$lang['first_page'] = 'First';
+$lang['gallery_locked_message'] = 'The gallery is locked for maintenance. Please, come back later.';
+$lang['generation_time'] = 'Page generated in';
+$lang['guest'] = 'guest';
+$lang['hello'] = 'Hello';
 $lang['hint_about'] = 'more informations on PhpWebGallery...';
-$lang['admin'] = 'Administration';
 $lang['hint_admin'] = 'available for administrators only';
-$lang['page_number'] = 'page number';
-$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_comments'] = 'See last users comments';
 $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';
-$lang['logout'] = 'Logout';
-$lang['password'] = 'Password';
-$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['home'] = 'Home';
+$lang['home_hint'] = 'Back to the home page';
 $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';
-$lang['calendar_hint'] = 'displays each day with pictures, month per month';
-$lang['calendar_picture_hint'] = 'displays pictures added on ';
+$lang['ident_register'] = 'Register';
+$lang['ident_title'] = 'ident_title';
+$lang['identification'] = 'Identification';
+$lang['images_available'] = 'images in this category';
+$lang['invalid_pwd'] = 'Invalid password!';
+$lang['language']='Language';
+$lang['last %d days'] = 'last %d days';
+$lang['last_page'] = 'Last';
+$lang['link_info_image'] = 'Modify information';
+$lang['login'] = 'Login';
+$lang['logout'] = 'Logout';
+$lang['mail_address'] = 'E-mail address';
+$lang['mandatory'] = 'obligatory';
+$lang['maxheight'] = 'Maximum height of the pictures';
+$lang['maxheight_error'] = 'Maximum height must be a number superior to 50';
+$lang['maxwidth'] = 'Maximum width of the pictures';
+$lang['maxwidth_error'] = 'Maximum width must be a number superior to 50';
+$lang['menu_login'] = 'login';
+$lang['month'][10] = 'October';
+$lang['month'][11] = 'November';
+$lang['month'][12] = 'December';
 $lang['month'][1] = 'January';
 $lang['month'][2] = 'February';
 $lang['month'][3] = 'March';
@@ -149,181 +183,108 @@ $lang['month'][6] = 'June';
 $lang['month'][7] = 'July';
 $lang['month'][8] = 'August';
 $lang['month'][9] = 'September';
-$lang['month'][10] = 'October';
-$lang['month'][11] = 'November';
-$lang['month'][12] = 'December';
-$lang['day'][0] = 'Sunday';
-$lang['day'][1] = 'Monday';
-$lang['day'][2] = 'Tuesday';
-$lang['day'][3] = 'Wednesday';
-$lang['day'][4] = 'Thursday';
-$lang['day'][5] = 'Friday';
-$lang['day'][6] = 'Saturday';
-$lang['w_month'] = 'Month';
-$lang['w_day'] = 'Day';
-$lang['days'] = 'days';
-$lang['today']='Today';
-
-// Customization
-$lang['customize_page_title'] = 'Your Gallery Customization ';
-$lang['customize_title'] = 'Customization';
-$lang['preferences'] = 'Preferences';
-$lang['mail_address'] = 'E-mail address';
-$lang['password_hint'] = 'You only have to give your password if you wish to change your e-mail';
-$lang['new_password'] = 'New password';
-$lang['new_password_hint'] = 'You only have to give a password if you wish to change it.';
-$lang['confirm_password_hint'] = 'You only have to confirm your new password if you wish to change it.';
+$lang['most_visited_cat'] = 'most visited';
+$lang['most_visited_cat_hint'] = 'displays most visited pictures';
 $lang['nb_image_per_row'] = 'Number of images per row';
 $lang['nb_row_per_page'] = 'Number of rows per page';
-$lang['maxwidth'] = 'Maximum width of the pictures';
-$lang['maxheight'] = 'Maximum height of the pictures';
-$lang['maxwidth_error'] = 'Maximum width must be a number superior to 50';
-$lang['maxheight_error'] = 'Maximum height must be a number superior to 50';
-$lang['theme'] = 'Interface theme';
-$lang['auto_expand'] = 'Expand all categories';
-$lang['show_nb_comments'] = 'Show number of comments';
-$lang['recent_period'] = 'Recent period';
+$lang['never_rated'] = 'You\'ve never rated this item';
+$lang['new_password'] = 'New password';
+$lang['new_password_hint'] = 'You only have to give a password if you wish to change it.';
+$lang['next_page'] = 'Next';
+$lang['no'] = 'No';
+$lang['no_category'] = 'Home';
+$lang['no_rate'] = 'no rate';
+$lang['notification'] = 'notification';
+$lang['only_members'] = 'Only members can access this page';
+$lang['password'] = 'Password';
+$lang['password_hint'] = 'You only have to give your password if you wish to change your e-mail';
 $lang['periods_error'] = 'Recent period must be a positive integer value';
-
-// search
-$lang['search_title'] = 'Search';
-$lang['search_options'] = 'Search Options';
-$lang['search_keywords'] = 'Search for words';
-$lang['search_keywords_hint'] = 'Search for entered words in all the attributes related to the pictures displayed in the gallery. Use * as a wildcard for partial matches';
-$lang['search_mode_or'] = 'Search for any terms';
-$lang['search_mode_and'] = 'Search for all terms ';
+$lang['picture_high'] = 'Click on the picture to see it in high definition';
+$lang['picture_show_metadata'] = 'Show file metadata';
+$lang['powered_by'] = 'Powered by';
+$lang['preferences'] = 'Preferences';
+$lang['previous_page'] = 'Previous';
+$lang['random_cat'] = 'random pictures';
+$lang['random_cat_hint'] = 'Displays a set of random pictures';
+$lang['recent_cats_cat'] = 'Last categories';
+$lang['recent_cats_cat_hint'] = 'Displays recently updated categories';
+$lang['recent_image'] = 'Image within the';
+$lang['recent_period'] = 'Recent period';
+$lang['recent_pics_cat'] = 'Last pictures';
+$lang['recent_pics_cat_hint'] = 'Displays most recent pictures';
+$lang['reg_confirm'] = 'Confirm password';
+$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_login5'] = 'this login is already used';
+$lang['reg_err_mail_address'] = 'mail address must be like xxx@yyy.eee (example : jack@altern.org)';
+$lang['reg_err_pass'] = 'please enter your password again';
+$lang['register'] = 'register';
+$lang['register_page_title'] = 'Registration';
+$lang['register_title'] = 'Registration';
+$lang['remember_me'] = 'Auto login';
+$lang['representative'] = 'representative';
+$lang['reset'] = 'Reset';
+$lang['return to homepage'] = 'return to homepage';
+$lang['search'] = 'Search';
+$lang['search_ascending'] = 'Ascending';
 $lang['search_author'] = 'Search for Author';
 $lang['search_categories'] = 'Search in Categories';
-$lang['search_subcats_included'] = 'Search in subcategroies';
-$lang['search_categories_hint'] = 'Select the category or categories you wish to search in. For speed all subcategories can be searched by selecting the parent and setting enable search subcategories below.';
-$lang['search_explain'] = 'Use * as a wildcard for partial matches';
 $lang['search_date'] = 'Search by Date';
-$lang['search_date_hint'] = 'Select a date and/or an ending date for your query.<br /> 
-Leave date empty if you want to make a "before" query.<br />
-The year must be entered in the last field in the following format : 0000 (i.e. 2004)';
+$lang['search_date_available'] = 'Availability';
+$lang['search_date_creation'] = 'Creation';
 $lang['search_date_from'] = 'Date';
 $lang['search_date_to'] = 'End-Date';
 $lang['search_date_type'] = 'Kind of date';
-$lang['search_date_available'] = 'Availability';
-$lang['search_date_creation'] = 'Creation';
-$lang['search_sort'] = 'Sort results by';
-$lang['search_ascending'] = 'Ascending';
 $lang['search_descending'] = 'Descending';
+$lang['search_explain'] = 'Use * as a wildcard for partial matches';
+$lang['search_keywords'] = 'Search for words';
+$lang['search_mode_and'] = 'Search for all terms ';
+$lang['search_mode_or'] = 'Search for any terms';
 $lang['search_one_clause_at_least'] = 'Empty query. No criteria has been entered.';
+$lang['search_options'] = 'Search Options';
 $lang['search_result'] = 'Search results';
-$lang['Look_up_user'] = 'Seek user';
-$lang['Find_username'] = 'Find a username';
-$lang['No_match'] = 'No match';
-$lang['Select_username'] = 'Select a username';
-
-// Category
-$lang['sub-cat'] = 'subcategories';
-$lang['images_available'] = 'images in this category';
-$lang['total'] = 'images';
-
-// About
-$lang['about_page_title'] = 'About PhpWebGallery';
-$lang['about_title'] = 'About...';
-$lang['about_message'] = '<ul>
-  <li>PhpWebGallery is a web application giving you the possibility to create an online images gallery easily.</li>
-  <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">PhpWebGallery</a> official site, and its dedicated <a href="http://forum.phpwebgallery.net">forum</a>.</li>
-</ul>';
-
-// 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['search_sort'] = 'Sort results by';
+$lang['search_subcats_included'] = 'Search in subcategroies';
+$lang['search_title'] = 'Search';
+$lang['send_mail'] = 'Contact';
+$lang['set as category representative'] = 'set as category representative';
+$lang['show_nb_comments'] = 'Show number of comments';
 $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['special_categories'] = 'Specials';
+$lang['sql_queries_in'] = 'SQL queries in';
+$lang['sub-cat'] = 'subcategories';
+$lang['submit'] = 'Submit';
+$lang['the beginning'] = 'the beginning';
+$lang['theme'] = 'Interface theme';
+$lang['thumbnails'] = 'Thumbnails';
+$lang['title_comments'] = 'Users comments';
+$lang['title_menu'] = 'Menu';
+$lang['title_send_mail'] = 'A comment on your site';
 $lang['to_rate'] = 'Rate';
+$lang['today'] = 'today';
+$lang['total'] = 'images';
 $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';
-
-// 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';
-$lang['upload_cannot_upload'] = 'can\'t upload the picture on the server';
-$lang['upload_title'] = 'Upload a picture';
+$lang['update_wrong_dirname'] = 'update_wrong_dirname';
 $lang['upload_advise'] = 'Choose an image to place in the category : ';
-$lang['upload_advise_thumbnail'] = 'Optional, but recommended : choose a thumbnail to associate to ';
 $lang['upload_advise_filesize'] = 'the filesize of the picture must not exceed : ';
-$lang['upload_advise_width'] = 'the width of the picture must not exceed : ';
-$lang['upload_advise_height'] = 'the height of the picture must not exceed : ';
 $lang['upload_advise_filetype'] = 'the picture must be to the fileformat jpg, gif or png';
-$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['upload_name'] = 'Name of the picture';
+$lang['upload_advise_height'] = 'the height of the picture must not exceed : ';
+$lang['upload_advise_thumbnail'] = 'Optional, but recommended : choose a thumbnail to associate to ';
+$lang['upload_advise_width'] = 'the width of the picture must not exceed : ';
 $lang['upload_author'] = 'Author (eg "Pierrick LE GALL")';
+$lang['upload_cannot_upload'] = 'can\'t upload the picture on the server';
 $lang['upload_creation_date'] = 'Creation date (DD/MM/YYYY)';
-
-// 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';
-
-
-
-// NOT YET VALIDATED
-$lang['guest'] = 'guest';
-$lang['add'] = 'add';
-
-$lang['title_comments'] = 'Users comments';
-$lang['stats_last_days'] = 'last days';
-$lang['hint_comments'] = 'See last users comments';
-$lang['menu_login'] = 'login';
-$lang['hello'] = 'Hello';
-
-$lang['today'] = 'today';
-$lang['last %d days'] = 'last %d days';
-$lang['the beginning'] = 'the beginning';
-
-$lang['comment date'] = 'comment date';
-$lang['image'] = 'image';
-$lang['descending'] = 'descending';
-$lang['ascending'] = 'ascending';
-$lang['all'] = 'all';
-$lang['Filter'] = 'Filter';
-$lang['Keyword'] = 'Keyword';
-$lang['Author'] = 'Author';
-$lang['Category'] = 'Category';
-$lang['Since'] = 'Since';
-$lang['Display'] = 'Display';
-$lang['Sort by'] = 'Sort by';
-$lang['Sort order'] = 'Sort order';
-$lang['Number of items'] = 'Number of items';
-$lang['return to homepage'] = 'return to homepage';
-$lang['Filter and display'] = 'Filter and display';
-$lang['Links'] = 'Links';
+$lang['upload_err_username'] = 'the username must be given';
+$lang['upload_file_exists'] = 'A picture\'s name already used';
+$lang['upload_filenotfound'] = 'You must choose a picture fileformat for the image';
+$lang['upload_forbidden'] = 'You can\'t upload pictures in this category';
+$lang['upload_name'] = 'Name of the picture';
+$lang['upload_picture'] = 'Upload a picture';
+$lang['upload_successful'] = 'Picture uploaded with success, an administrator will validate it as soon as possible';
+$lang['upload_title'] = 'Upload a picture';
+$lang['upload_username'] = 'Username';
+$lang['w_month'] = 'Month';
+$lang['yes'] = 'Yes';
 ?>
\ No newline at end of file
diff --git a/language/en_UK.iso-8859-1/faq.lang.php b/language/en_UK.iso-8859-1/faq.lang.php
deleted file mode 100644
index 7a42cd6c1..000000000
--- a/language/en_UK.iso-8859-1/faq.lang.php
+++ /dev/null
@@ -1,274 +0,0 @@
-<?php
-// +-----------------------------------------------------------------------+
-// | PhpWebGallery - a PHP based picture gallery                           |
-// | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
-// | Copyright (C) 2003-2005 PhpWebGallery Team - http://phpwebgallery.net |
-// +-----------------------------------------------------------------------+
-// | branch        : BSF (Best So Far)
-// | file          : $RCSfile$
-// | last update   : $Date$
-// | last modifier : $Author$
-// | revision      : $Revision$
-// +-----------------------------------------------------------------------+
-// | This program is free software; you can redistribute it and/or modify  |
-// | it under the terms of the GNU General Public License as published by  |
-// | the Free Software Foundation                                          |
-// |                                                                       |
-// | This program is distributed in the hope that it will be useful, but   |
-// | WITHOUT ANY WARRANTY; without even the implied warranty of            |
-// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU      |
-// | General Public License for more details.                              |
-// |                                                                       |
-// | You should have received a copy of the GNU General Public License     |
-// | along with this program; if not, write to the Free Software           |
-// | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
-// | USA.                                                                  |
-// +-----------------------------------------------------------------------+
-
-// Admin FAQ
-$lang['help_images_title'] = 'Adding elements';
-$lang['help_images'] =
-array(
-  'Category directories are in the PhpWebGallery directory "galleries". Here
-follow the directory tree of a very small gallery (but using many features)
-: <br />
-<pre>
-.
-|-- admin
-|-- doc
-|-- galleries
-|   |-- category-1
-|   |   |-- category-1.1
-|   |   |   |-- category-1.1.1
-|   |   |   |   |-- category-1.1.1.1
-|   |   |   |   |   |-- pwg_high
-|   |   |   |   |   |   +-- wedding.jpg
-|   |   |   |   |   |-- thumbnail
-|   |   |   |   |   |   +-- TN-wedding.jpg
-|   |   |   |   |   +-- wedding.jpg
-|   |   |   |   +-- category-1.1.1.2
-|   |   |   +-- category-1.1.2
-|   |   |-- category-1.2
-|   |   |   |-- pookie.jpg
-|   |   |   +-- thumbnail
-|   |   |       +-- TN-pookie.jpg
-|   |   +-- category-1.3
-|   +-- category-2
-|       |-- piglet.gif
-|       |-- pwg_representative
-|       |   +-- video.jpg
-|       |-- thumbnail
-|       |   +-- TN-piglet.jpg
-|       +-- video.avi
-|-- include
-|-- install
-|-- language
-|-- template
-+-- tool
-</pre>',
-  
-  'Basically, a category is represented by a directory at any level in
-PhpWebGallery directory "galleries". Each category can contain as many
-sub-level as you wish. In the example above, category-1.1.1.1 is at level 4
-of deepness.',
-  
-  'Basically, an element is represented by a file. A file can be a
-PhpWebGallery element if its extenstion is among $conf[\'file_ext\']
-possibilities (see include/config.inc.php file). A file can be a picture if
-its extension is among $conf[\'picture_ext\'] (see include/config.inc.php
-file).',
-  
-  'Picture elements must have an associated thumbnail (see section below about
-thumbnails)',
-
-  'Picture elements can have a high quality file associated. As for wedding.jpg
-in the example above. No prefix on the high quality picture is required.',
-
-  'Non picture elements (video, sounds, file texts, what you want...) are by
-default represented by an icon corresponding to the filename
-extension. Optionaly, you can associate a thumbnail and a representative
-file (see video.avi in the example above).',
-  
-  'Warning : the name of directories and files must be composed of letters,
-figures, "-", "_" or ".". No blank space, no accentuated characters',
-  
-  'Advise : a category can contain elements and sub-categories in the same
-time. Nerverthless, you are strongly advised for each category to choose
-between category containing elements OR category containing sub-categories.'
-  );
-
-$lang['help_thumbnails_title'] = 'Thumbnails';
-$lang['help_thumbnails'] =
-array(
-  'As said earlier, each element of picture type must be associated with a
-thumbnail.',
-
-  'Thumbnails are stored in the sub-directory "thumbnail" of the category
-directory. The thumbnail is a picture (same filename extensions possible
-than picture files) which filename is prefixed by the configured "Thumbnail
-prefix" (see admin panel, Configuration, General).',
-
-  'Thumbnails don\'t need to have the same extension as their associated
-picture (a picture with .jpg extension can have a thumbnail in .GIF
-extention for instance).',
-
-  'I advise you to use an external module for thumbnails creation (such as
-ThumbClic available on the presentation site of PhpWebGallery).',
-
-  'You can also use the thumbnail creation page integrated in PhpWebGallery,
-but I don\'t advise you so, because thumbnail quality may be poor and it
-uses a high CPU load which can be a problem if you use free web hosting.',
-
-  'If you choose to use your hosting provider to create thumbnails, you must
-give write rights on all category directories and sub-directories
-"thumbnail" for ugo (user, group, other).'
-  
-  );
-
-$lang['help_database_title'] = 'Synchronize filesystem and database';
-$lang['help_database'] =
-array(
-  'Once files, thumbnails and representatives are correctly placed in the
-directories, go to : administration panel, General, Synchronize',
-
-  'There are 2 synchronizations possible : directories/files and file
-metadata. directories/files is about synchronizing your directories tree
-with the category tree in the database. metadata is about updating elements
-informations such as filesize, dimensions in pixels, EXIF or IPTC
-informations.',
-
-  'The first synchronization must be the directories/files one.',
-
-  'Synchronization process may take long (depending on your server load and
-quantity of elements to manage) so it is possible to progress by step :
-category by category.'
-  
-  );
-
-$lang['help_access_title'] = 'Access authorization';
-$lang['help_access'] =
-array(
-  'You can forbid access to categories. Categories can be "public" or
-"private". Permissions (for groups and users) can be set only if the
-category is private.',
-
-  'You can set a category to private by editing a single category
-(administration panel, Categories, Manage, edit) or by setting options to
-your whole category tree (administration panel, Categories, Public/Private)',
-
-  'Once the category is private, you can manage permissions for groups and
-users (administration panel, Permissions).'
-  
-  );
-
-$lang['help_groups_title'] = 'Users Groups';
-$lang['help_groups'] =
-array(
-  
-  'PhpWebGallery is able to manage groups of users. It can be very useful to
-have common permission access for private categories.',
-
-  'You can create groups and add users to a group in administration panel,
-Identification, Groups.',
-
-  'A user can belong to several groups. The authorization is stronger than
-prohibition : if user "jack" belongs to groups "family" and "friends", and
-that only group "family" can see category "Christmas 2003", "jack" will be
-able to see "Christmas 2003".'
-  
-  );
-
-$lang['help_remote_title'] = 'Remote site';
-$lang['help_remote'] =
-array(
-
-  'PhpWebGallery offers the possibility to use several servers to store the
-images which will compose your gallery. It can be useful if your gallery is
-installed on one limited space and that you have a big quantity of images to
-be shown.',
-
-  '1. edit file tools/create_listing_file.php, by modifying parameters section
-such as $conf[\'prefix_thumbnail\'] or $conf[\'use_exif\'].',
-
-  '2. place file "tools/create_listing_file.php" modified on your distant
-website, in the same directory than your category directories (as the
-directory "galleries" of this website) by ftp. For the example, let\'s say
-that you can access http://example.com/galleries/create_listing_file.php.',
-
-  '3. go to administration panel, General, Remote sites. Ask to create a new
-site, for example http://example.com/galleries',
-
-  '4. a new remote site is registered. You can perform 4 actions :
-<ol>
-
-  <li>generate listing : launches a distant request to generate a distant
-  file listing</li>
-
-  <li>update : reads the distant listing.xml file and synchronizes with
-  database informations</li>
-
-  <li>clean : removes distant listing.xml file</li>
-
-  <li>delete : deletes the site (and all related categories and elements) in
-  the database</li>
-
-</ol>',
-
-  'You can do all this by hand by generating yourself the listing.xml file,
-moving it from your distant server to you local PhpWebGallery root
-directory and opening the remote site management screen : PhpWebGallery will
-propose you to use the found listing.xml file.'
-  
-  );
-
-$lang['help_upload_title'] = 'Files upload by users';
-$lang['help_upload'] =
-array(
-  'PhpWebGallery offers the possibility for users to upload images. in order to
-do it :',
-  
-  '1. authorize upload on any categories (administration panel, Categories,
-Manage, edit or administration panel, Categories, Upload)',
-
-  '2. give write rights on directories for ugo (user, group, other)',
-  
-  'Files uploaded by users are not directly visible on the website, they must
-be validated by an administrator. For that purpose, an administrator must go
-on administration panel, Pictures, Waiting in order to validate or to refuse
-the files proposed, then to synchronize filesystem with database.'
-  );
-
-$lang['help_virtual_title'] = 'Links between elements and categories, virtual categories';
-$lang['help_virtual'] =
-array(
-  'PhpWebGallery dissociates categories where elements are stored and
-categories where they are shown.',
-  
-  'By default, elements are shown only in their real categories : the ones
-corresponding to directories on the web server.',
-
-  'To link an element to a category, you just have to make the association on
-the page of element edition (link to this screen on picture.php logged as an
-administrator) or on the informations of all elements of a category.',
-  
-  'Using this principle, it is possible to create virtual categories : no
-directory coresponds to this category. You can create virtual categories in
-administration panel, Categories, Manage.'
-  );
-
-$lang['help_infos_title'] = 'Miscellanous informations';
-$lang['help_infos'] =
-array(
-  'As soon as you created your gallery, modify default display properties in
-administration panel, Configuration, Default. Indeed, every new registered
-user will have by default the same display properties.',
-  
-  'If you have any question, do not hesitate to take a look at the forum or ask
-a question there. The <a href="http://forum.phpwebgallery.net"
-style="text-decoration:underline">forum</a> (message board) is available on
-the presentation site of PhpWebGallery. Check the <a
-href="http://doc.phpwebgallery.net"
-style="text-decoration:underline">official PhpWebGallery documentation</a> for
-further reading.'
-  );
-?>
\ No newline at end of file
diff --git a/language/en_UK.iso-8859-1/help.html b/language/en_UK.iso-8859-1/help.html
new file mode 100644
index 000000000..4f1e5634f
--- /dev/null
+++ b/language/en_UK.iso-8859-1/help.html
@@ -0,0 +1,230 @@
+<h2>Help</h2>
+
+<h3>Adding elements</h3>
+
+<ul>
+
+  <li>
+
+    <p>Category directories are in the PhpWebGallery directory
+    "galleries". Here follow the directory tree of a very small gallery (but
+    using many features) :</p>
+
+    <pre>
+.
+|-- admin
+|-- doc
+|-- galleries
+|   |-- category-1
+|   |   |-- category-1.1
+|   |   |   |-- category-1.1.1
+|   |   |   |   |-- category-1.1.1.1
+|   |   |   |   |   |-- pwg_high
+|   |   |   |   |   |   +-- wedding.jpg
+|   |   |   |   |   |-- thumbnail
+|   |   |   |   |   |   +-- TN-wedding.jpg
+|   |   |   |   |   +-- wedding.jpg
+|   |   |   |   +-- category-1.1.1.2
+|   |   |   +-- category-1.1.2
+|   |   |-- category-1.2
+|   |   |   |-- pookie.jpg
+|   |   |   +-- thumbnail
+|   |   |       +-- TN-pookie.jpg
+|   |   +-- category-1.3
+|   +-- category-2
+|       |-- piglet.gif
+|       |-- pwg_representative
+|       |   +-- video.jpg
+|       |-- thumbnail
+|       |   +-- TN-piglet.jpg
+|       +-- video.avi
+|-- include
+|-- install
+|-- language
+|-- template
++-- tool</pre>
+
+  </li>
+  
+  <li>Basically, a category is represented by a directory at any level in
+  PhpWebGallery directory "galleries". Each category can contain as many
+  sub-level as you wish. In the example above, category-1.1.1.1 is at level
+  4 of deepness.</li>
+
+  <li>Basically, an element is represented by a file. A file can be a
+  PhpWebGallery element if its extenstion is among <code>file_ext</code>
+  configuration parameter possibilities (see <span
+  class="filename">include/config_default.inc.php</span> file). A file can
+  be a picture if its extension is among <code>picture_ext</code>
+  configuration parameter possibilities.</li>
+
+  <li>Picture elements must have an associated thumbnail (see section below
+  about thumbnails)</li>
+
+  <li>Picture elements can have a high quality file associated. As for
+  wedding.jpgin the example above. No prefix on the high quality picture is
+  required.</li>
+
+  <li>Non picture elements (video, sounds, file texts, what you want...) are
+  by default represented by an icon corresponding to the filename
+  extension. Optionaly, you can associate a thumbnail and a representative
+  file (see video.avi in the example above).</li>
+
+  <li>Warning : the name of directories and files must be composed of
+  letters, figures, "-", "_" or ".". No blank space, no accentuated
+  characters</li>
+
+  <li>Advise : a category can contain elements and sub-categories in the
+  same time. Nerverthless, you are strongly advised for each category to
+  choose between category containing elements OR category containing
+  sub-categories.</li>
+
+  <li>Once files, thumbnails and representatives are correctly placed in the
+  directories, go to : <span class="pwgScreen">Administration, General,
+  Synchronize</span></li>
+
+</ul>
+
+<h3>Thumbnails</h3>
+
+<ul>
+
+  <li>As said earlier, each element of picture type must be associated with
+  a thumbnail.</li>
+
+  <li>Thumbnails are stored in the sub-directory "thumbnail" of the category
+  directory. The thumbnail is a picture (same filename extensions possible
+  than picture files) which filename is prefixed by the configured
+  "Thumbnail prefix" (see admin panel, Configuration, General).</li>
+
+  <li>Thumbnails don't need to have the same extension as their associated
+  picture (a picture with .jpg extension can have a thumbnail in .GIF
+  extention for instance).</li>
+
+  <li>Advise: use an external module for thumbnails creation.</li>
+
+  <li>You can also use the thumbnail creation page (<span
+  class="pwgScreen">Administration, Pictures, Thumbnails</span>), but it is
+  not recommended. Indeed, thumbnail quality may be poor and it uses a high
+  CPU load which can be a problem if you use free web hosting.</li>
+
+  <li>If you choose to use your hosting provider to create thumbnails, you
+  must give write rights on all category directories and sub-directories
+  "thumbnail" for ugo (user, group, other).</li>
+
+</ul>
+
+<h3>Access authorization</h3>
+
+<ul>
+
+  <li>You can forbid access to categories. Categories can be "public" or
+  "private". Permissions (for groups and users) can be set only if the
+  category is private.</li>
+
+  <li>You can set a category to private by editing a single category (<span
+  class="pwgScreen">Administration, Categories, Manage, edit</span>) or by
+  setting options to your whole category tree (<span
+  class="pwgScreen">Administration, Categories, Public/Private</span>).</li>
+
+  <li>
+
+    <p>Once the category is private, you can manage permissions for groups
+    and users through 3 screens :(administration panel, Permissions).</p>
+
+    <ul>
+
+      <li><span class="pwgScreen">Administration, Identification, Users,
+      permissions action (one link per user)</span></li>
+
+      <li><span class="pwgScreen">Administration, Identification, Groups,
+      permissions action (one link per group)</span></li>
+
+      <li><span class="pwgScreen">Administration, Categories, Manage, edit
+      category permissions action (one link per category)</span></li>
+
+    </ul>
+
+  </li>
+
+</ul>
+
+<h3>Users Groups</h3>
+
+<ul>
+
+  <li>PhpWebGallery is able to manage groups of users. It can be very useful
+  to have common permission access for private categories.</li>
+
+  <li>You can create groups in <span class="pwgScreen">Administration,
+  Identification, Groups</span> and associate users to this group in <span
+  class="pwgScreen">Administration, Identication, Users</span>.</li>
+
+  <li>A user can belong to several groups. The authorization is stronger
+  than prohibition : if user "jack" belongs to groups "family" and
+  "friends", and that only group "family" can see category "Christmas 2003",
+  "jack" will be able to see "Christmas 2003".</li>
+
+</ul>
+
+<h3>Files upload by users</h3>
+
+<p>PhpWebGallery offers the possibility for users to upload images. in
+order to do it:</p>
+
+<ol>
+
+  <li>authorize upload on any categories (<span
+  class="pwgScreen">Administration, Categories, Manage, edit</span> or <span
+  class="pwgScreen">Administration panel, Categories, Upload</span>)</li>
+
+  <li>give write rights on directories for ugo (user, group, other)</li>
+
+</ol>
+
+<p>Files uploaded by users are not directly visible on the website, they
+must be validated by an administrator. For that purpose, an administrator
+must go in <span class="pwgScreen">Administration, Pictures, Waiting</span>
+in order to validate or to refuse the files proposed, then to synchronize
+filesystem with database.</p>
+
+
+<h3>Links between elements and categories, virtual categories</h3>
+
+<ul>
+
+  <li>PhpWebGallery dissociates categories where elements are stored and
+  categories where they are shown.</li>
+
+  <li>By default, elements are shown only in their real categories : the
+  ones corresponding to directories on the web server.</li>
+
+  <li>To link an element to a category, you just have to make the
+  association on the page of element edition (link to this screen on
+  picture.php logged as an administrator) or on the informations of all
+  elements of a category.</li>
+
+  <li>Using this principle, it is possible to create virtual categories : no
+  directory coresponds to this category. You can create virtual categories
+  in <span class="pwgScreen">Administration, Categories, Manage</span>.</li>
+
+</ul>
+
+<h3>Miscellanous informations</h3>
+
+<ul>
+
+  <li>As soon as you created your gallery, modify default display properties
+  in <span class="pwgScreen">Administration panel, Configuration,
+  Default</span>. Indeed, every new registered user will have by default the
+  same display properties.</li>
+
+  <li>If you have any question, do not hesitate to take a look at the forum
+  or ask a question there. The <a
+  href="http://forum.phpwebgallery.net">forum</a> (message board) is
+  available on the presentation site of PhpWebGallery. Check the <a
+  href="http://doc.phpwebgallery.net">official PhpWebGallery
+  documentation</a> for further reading.</li>
+
+</ul>
+
diff --git a/language/en_UK.iso-8859-1/help/cat_modify.html b/language/en_UK.iso-8859-1/help/cat_modify.html
new file mode 100644
index 000000000..52d0d17e0
--- /dev/null
+++ b/language/en_UK.iso-8859-1/help/cat_modify.html
@@ -0,0 +1,95 @@
+<h2>Edit a category</h2>
+
+<p>Modify informations and options of a single category.</p>
+
+<h3>Action links</h3>
+
+<p>This page offers you link to modification page of parent categories and
+action links :</p>
+
+<ul>
+  <li>jump to category</li>
+  <li>manage category elements (if category contains elements)</li>
+  <li>manage sub-categories</li>
+  <li>manage permissions (if category is private)</li>
+  <li>delete category (if category is virtual).</li>
+</ul>
+
+<h3>Move</h3>
+
+<p>If the category is virtual, you can move it. Moving a category means
+changing its parent category.</p>
+
+<h3>Options</h3>
+
+<ul>
+
+  <li><strong>Access type</strong>: Permission management. If you make a
+  category private, all its child categories becomes private. If you make a
+  category public, all its parent categories becomes public.</li>
+
+  <li><strong>Lock</strong>: The category and its sub-categories will
+  temporary been disabled for maintenance.</li>
+
+  <li><strong>Comments</strong>: Authorize users to comment elements of this
+  category.</li>
+
+  <li><strong>Authorize upload</strong>: Authorize users to upload
+  files. This option is available only if category is physical (not
+  virtual).</li>
+
+</ul>
+
+<p>You can also manage these options with multi-categories options
+management screen (screens <span class="pwgScreen">Upload</span>, <span
+class="pwgScreen">Comments</span>, <span class="pwgScreen">Lock</span>,
+<span class="pwgScreen">Public/Private</span>, <span
+class="pwgScreen">Representative</span> in <span
+class="pwgScreen">Administration, Categories</span>).</p>
+
+<h3>Representation</h3>
+
+<p>The representant of the category is the thumbnail displayed to represent
+the category on main page (<span class="pwgScreen">category.php</span>) when
+a category contains only sub-categories (just as the root category).</p>
+
+<p>There are 4 ways to set the representative picture of a category :</p>
+
+<ul>
+
+  <li><span class="pwgScreen">picture.php</span>: in the action buttons bar,
+  one of them let you set the displayed picture as representative for the
+  displayed category. This button is available only for administrators.</li>
+
+  <li><span class="pwgScreen">Modify informations about a picture</span> in
+  administration. This screen can be reach from <span
+  class="pwgScreen">picture.php</span> or <span class="pwgScreen">Batch
+  management</span> in <em>unit mode</em>. See the help of this screen for
+  details.</li>
+
+  <li><span class="pwgScreen">Administration, Categories,
+  Representative</span>. See the help of this screen for details.</li>
+
+  <li><span class="pwgScreen">Edit a category</span> (this screen).</li>
+
+</ul>
+
+<p>The representation depends on configuration parameter
+<code>allow_random_representative</code> (see <span
+class="filename">include/config_default.inc.php</span>).</p>
+
+<p>In default mode (<code>allow_random_representative</code> set to false)
+each category containing at least one element is represented by a fixed
+element. Once set (at category creation), the representative changes only
+when an administrator ask for it. If the representant is not appropriate,
+you can ask to <strong>Find a new representant by random</strong>.</p>
+
+<p>If configuration parameter <code>allow_random_representative</code> is
+set to true, a category containing elements can have no fixed
+representant. Just use <strong>Delete representant</strong> button.</p>
+
+<p>If the category contains no element (but only sub-categories) it can be
+represented by any element thanks to screen <span class="pwgScreen">Modify
+informations about a picture</span>. The only option on the current screen
+is to <strong>Delete representant</strong> button, after using this button,
+no representant option to set anymore.</p>
diff --git a/language/en_UK.iso-8859-1/help/cat_options.html b/language/en_UK.iso-8859-1/help/cat_options.html
new file mode 100644
index 000000000..2db75ed0a
--- /dev/null
+++ b/language/en_UK.iso-8859-1/help/cat_options.html
@@ -0,0 +1,36 @@
+<h2>Category options</h2>
+
+<p>This screen lets the administrator manage categories option for many
+categories at once.</p>
+
+<dl>
+
+  <dt>Upload</dt>
+  <dd>Make categories uploadable for gallery visitors. Only non virtual and
+  non remote categories are shown.</dd>
+
+  <dt>Comments</dt>
+  <dd>Authorize users to add comments on selected categories. By
+  inheritance, an element is commentable if it belongs at least to one
+  commentable category.</dd>
+
+  <dt>Lock</dt>
+  <dd>Selected categories will temporary been disabled for maintenance. If
+  you lock a category, all its child categories become locked. If you unlock
+  a category, all its parent categories become unlocked.</dd>
+
+  <dt>Public / private</dt>
+  <dd>Manage authorizations for selected categories. Selected categories are
+  private : you will need to authorize users and/or groups to access to
+  them. If you make a category private, all its child categories becomes
+  private. If you make a category public, all its parent categories becomes
+  public</dd>
+
+  <dt>Representative</dt>
+  <dd>This option can be managed only if you set configuration parameter
+  <code>allow_random_representative</code> (see <span
+  class="filename">include/config_defaults.inc.php</span>) to
+  <em>true</em>. Each category can be randomly represented or singly
+  represented (by a unique picture).</dd>
+
+</dl>
diff --git a/language/en_UK.iso-8859-1/help/cat_perm.html b/language/en_UK.iso-8859-1/help/cat_perm.html
new file mode 100644
index 000000000..3b3471fb9
--- /dev/null
+++ b/language/en_UK.iso-8859-1/help/cat_perm.html
@@ -0,0 +1,15 @@
+<h2>Manage permissions for a category</h2>
+
+<p>This screen is available only for a private category. Here you can select
+users and groups authorized for this category.</p>
+
+<h3>Groups</h3>
+
+<p>You can deny or grant groups for the current category. By modifying
+groups authorizations, you'll probably modify the list of users granted to
+the category thanks to group belongings.</p>
+
+<h3>Users</h3>
+
+<p>You can deny or grant individual users. Users granted thanks to group
+belongings can be denied or granted specifically.</p>
diff --git a/language/en_UK.iso-8859-1/help/search.html b/language/en_UK.iso-8859-1/help/search.html
new file mode 100644
index 000000000..c98038b2b
--- /dev/null
+++ b/language/en_UK.iso-8859-1/help/search.html
@@ -0,0 +1,24 @@
+<h2>Search</h2>
+
+<p>This page let you search pictures among the whole gallery.</p>
+
+<dl>
+
+  <dt>Search for words</dt>
+  <dd>Search for entered words in all the attributes related to the pictures
+  displayed in the gallery. Use * as a wildcard for partial matches.</dd>
+
+  <dt>Search for Author</dt>
+  <dd>Use * as a wildcard for partial matches.</dd>
+
+  <dt>Search by Date</dt>
+  <dd>Select a date and/or an ending date for your query. Leave date empty
+  if you want to make a "before" query. The year must be entered in the last
+  field in the following format : 0000 (i.e. 2004)</dd>
+
+  <dt>Search in Categories</dt>
+  <dd>Select the category or categories you wish to search in. For speed all
+  subcategories can be searched by selecting the parent and setting enable
+  search subcategories below.</dd>
+
+</dl>
diff --git a/language/en_UK.iso-8859-1/help/synchronize.html b/language/en_UK.iso-8859-1/help/synchronize.html
index 835e0c52e..c1ae424f8 100644
--- a/language/en_UK.iso-8859-1/help/synchronize.html
+++ b/language/en_UK.iso-8859-1/help/synchronize.html
@@ -1 +1,13 @@
 <h2>Synchronize</h2>
+
+<p>There are 2 synchronizations possible : directories/files and file
+metadata. directories/files is about synchronizing your directories tree
+with the category tree in the database. metadata is about updating elements
+informations such as filesize, dimensions in pixels, EXIF or IPTC
+informations.</p>
+
+<p>The first synchronization must be the directories/files one.</p>
+
+<p>Synchronization process may take long (depending on your server load and
+quantity of elements to manage) so it is possible to progress by step:
+category by category.</p>
diff --git a/language/en_UK.iso-8859-1/help/thumbnail.html b/language/en_UK.iso-8859-1/help/thumbnail.html
new file mode 100644
index 000000000..857a266ca
--- /dev/null
+++ b/language/en_UK.iso-8859-1/help/thumbnail.html
@@ -0,0 +1,28 @@
+<h2>Thumbnails creation</h2>
+
+<p>This page let you create missing thumbnails.</p>
+
+<dl>
+
+  <dt>GD version</dt>
+
+  <dd>GD is the picture manipulating library for PHP. Choose the version
+  installed on your server. If you choose the wrong, you'll just have errors
+  messages, come back with your browser and choose the other version. If no
+  version works, it means your server doesn't support GD.</dd>
+
+  <dt>Width and height</dt>
+
+  <dd>Maximum dimensions that thumbnails can take. Aspect ratio is
+  maintained.</dd>
+
+  <dt>Number of thumbnails to create</dt>
+
+  <dd>Do not try to miniaturize too many pictures in the same time. Indeed, miniaturization uses a lot of CPU. If you installed PhpWebGallery on a free provider, a too high CPU load can sometime lead to the deletion of your website.</dd>
+
+  <dt>File format</dt>
+
+  <dd>Only JPEG file format is supported for thumbnail creation. Thumbnails
+  can be created only from PNG and JPEG pictures.</dd>
+
+</dl>
diff --git a/language/en_UK.iso-8859-1/help/user_list.html b/language/en_UK.iso-8859-1/help/user_list.html
new file mode 100644
index 000000000..4bc00081b
--- /dev/null
+++ b/language/en_UK.iso-8859-1/help/user_list.html
@@ -0,0 +1,32 @@
+<h2>Users list</h2>
+
+<p>This is the place where you can manage registered users. Only permissions
+are managed in different several screens.</p>
+
+<h3>Add a user</h3>
+
+<p>Administrator can manually add users.</p>
+
+<h3>Users list</h3>
+
+<p>The list can be filtered on username (use * as wildcard), group or
+status. The list can be order by registration date or username, in ascending
+or descending order.</p>
+
+<p>This screen works be managing several users at once on different actions
+:</p>
+
+<ul>
+
+  <li>delete users (require a confirmation checkbox)</li>
+
+  <li>change status</li>
+
+  <li>associate or dissociate from groups</li>
+
+  <li>modify display properties</li>
+
+</ul>
+
+<p>The target is the set users selected (by default) or all users is
+asked.</p>
diff --git a/search.php b/search.php
index 877ca4e6b..d65bf2434 100644
--- a/search.php
+++ b/search.php
@@ -156,18 +156,15 @@ $template->assign_vars(array(
   'L_SUBMIT' => $lang['submit'],
   'L_RESET' => $lang['reset'],
   'L_SEARCH_KEYWORDS'=>$lang['search_keywords'],
-  'L_SEARCH_KEYWORDS_HINT'=>$lang['search_keywords_hint'],
   'L_SEARCH_ANY_TERMS'=>$lang['search_mode_or'],
   'L_SEARCH_ALL_TERMS'=>$lang['search_mode_and'],
   'L_SEARCH_AUTHOR'=>$lang['search_author'],
   'L_SEARCH_AUTHOR_HINT'=>$lang['search_explain'],
   'L_SEARCH_CATEGORIES'=>$lang['search_categories'],
-  'L_SEARCH_CATEGORIES_HINT'=>$lang['search_categories_hint'],
   'L_SEARCH_SUBFORUMS'=>$lang['search_subcats_included'],
   'L_YES' => $lang['yes'],
   'L_NO' => $lang['no'],
   'L_SEARCH_DATE' => $lang['search_date'],
-  'L_SEARCH_DATE_HINT' => $lang['search_date_hint'],
   'L_TODAY' => $lang['today'],
   'L_SEARCH_DATE_FROM'=>$lang['search_date_from'],
   'L_SEARCH_DATE_TO'=>$lang['search_date_to'],
@@ -183,7 +180,8 @@ $template->assign_vars(array(
   'TODAY_DAY' => date('d', time()),
   'TODAY_MONTH' => date('m', time()),
   'TODAY_YEAR' => date('Y', time()),
-  'S_SEARCH_ACTION' => add_session_id( 'search.php' ),   
+  'S_SEARCH_ACTION' => add_session_id( 'search.php' ),
+  'U_HELP' => PHPWG_ROOT_PATH.'/popuphelp.php?page=search',
   'U_HOME' => add_session_id( 'category.php' )
   )
 );
diff --git a/template/yoga/about.tpl b/template/yoga/about.tpl
index 68d505c01..1344f9c7e 100644
--- a/template/yoga/about.tpl
+++ b/template/yoga/about.tpl
@@ -7,6 +7,6 @@
     <h2>{lang:About}</h2>
   </div>
 
-  {lang:about_message}
+  {ABOUT_MESSAGE}
 
 </div>
diff --git a/template/yoga/admin/cat_modify.tpl b/template/yoga/admin/cat_modify.tpl
index d64df4960..aef85cb37 100644
--- a/template/yoga/admin/cat_modify.tpl
+++ b/template/yoga/admin/cat_modify.tpl
@@ -1,5 +1,10 @@
 <!-- $Id$ -->
-<h2>{lang:title_edit_cat}</h2>
+<div class="titrePage">
+  <ul class="categoryActions">
+    <li><a href="{U_HELP}" onclick="popuphelp(this.href); return false;" title="{lang:Help}"><img src="template/yoga/theme/help.png" alt="(?)"></a></li>
+  </ul>
+  <h2>{lang:title_edit_cat}</h2>
+</div>
 
 <h3>{CATEGORIES_NAV}</h3>
 
@@ -65,21 +70,21 @@
   <legend>{lang:Options}</legend>
   <table>
     <tr>
-      <td><strong>{L_EDIT_STATUS}</strong><br /><span class="small">{L_EDIT_STATUS_INFO}</span></td>
+      <td><strong>{L_EDIT_STATUS}</strong>
       <td>
 	  <input type="radio" name="status" value="public" {STATUS_PUBLIC} />{L_STATUS_PUBLIC}
 	  <input type="radio" name="status" value="private" {STATUS_PRIVATE} />{L_STATUS_PRIVATE}
       </td>
     </tr>
     <tr>
-      <td><strong>{L_EDIT_LOCK}</strong><br /><span class="small">{L_EDIT_LOCK_INFO}</span></td>
+      <td><strong>{L_EDIT_LOCK}</strong>
       <td>
 	  <input type="radio" name="visible" value="false" {LOCKED} />{L_YES}
 	  <input type="radio" name="visible" value="true" {UNLOCKED} />{L_NO}
       </td>
     </tr>
     <tr>
-      <td><strong>{L_EDIT_COMMENTABLE}</strong><br /><span class="small">{L_EDIT_COMMENTABLE_INFO}</span></td>
+      <td><strong>{L_EDIT_COMMENTABLE}</strong>
       <td>
           <input type="radio" name="commentable" value="true" {COMMENTABLE_TRUE} />{L_YES}
           <input type="radio"  name="commentable" value="false" {COMMENTABLE_FALSE} />{L_NO}
@@ -87,7 +92,7 @@
     </tr>
     <!-- BEGIN upload -->
     <tr>
-      <td><strong>{L_EDIT_UPLOADABLE}</strong><br /><span class="small">{L_EDIT_UPLOADABLE_INFO}</span></td>
+      <td><strong>{L_EDIT_UPLOADABLE}</strong>
       <td>
           <input type="radio" name="uploadable" value="true" {UPLOADABLE_TRUE} />{L_YES}
           <input type="radio" name="uploadable" value="false" {UPLOADABLE_FALSE} />{L_NO}
diff --git a/template/yoga/admin/cat_options.tpl b/template/yoga/admin/cat_options.tpl
index 7ee2a945e..052b2a99c 100644
--- a/template/yoga/admin/cat_options.tpl
+++ b/template/yoga/admin/cat_options.tpl
@@ -1,5 +1,10 @@
 <!-- $Id$ -->
-<h2>{lang:title_cat_options}</h2>
+<div class="titrePage">
+  <ul class="categoryActions">
+    <li><a href="{U_HELP}" onclick="popuphelp(this.href); return false;" title="{lang:Help}"><img src="template/yoga/theme/help.png" alt="(?)"></a></li>
+  </ul>
+  <h2>{lang:title_cat_options}</h2>
+</div>
 
 <form method="post" action="{F_ACTION}" id="cat_options">
   <fieldset>
diff --git a/template/yoga/admin/cat_perm.tpl b/template/yoga/admin/cat_perm.tpl
index 39374d5ed..0bc6efbcb 100644
--- a/template/yoga/admin/cat_perm.tpl
+++ b/template/yoga/admin/cat_perm.tpl
@@ -1,4 +1,9 @@
-<h2>{lang:Manage permissions for a category}</h2>
+<div class="titrePage">
+  <ul class="categoryActions">
+    <li><a href="{U_HELP}" onclick="popuphelp(this.href); return false;" title="{lang:Help}"><img src="template/yoga/theme/help.png" alt="(?)"></a></li>
+  </ul>
+  <h2>{lang:Manage permissions for a category}</h2>
+</div>
 
 <h3>{CATEGORIES_NAV}</h3>
 
diff --git a/template/yoga/admin/help.tpl b/template/yoga/admin/help.tpl
deleted file mode 100644
index d2f59b811..000000000
--- a/template/yoga/admin/help.tpl
+++ /dev/null
@@ -1,13 +0,0 @@
-  <!-- BEGIN cat -->
-  <h3>{cat.NAME}</h3>
-  <!-- BEGIN illustration -->
-  <div style="text-align:center;margin:auto;margin-bottom:10px;"><img src="{cat.illustration.SRC_IMG}" style="border:1px solid black;" alt=""/></div>
-  {cat.illustration.CAPTION}
-  <!-- END illustration -->
-  <ul style="text-align:left; margin-right:10px;">
-    <!-- BEGIN item -->
-    <li style="margin-bottom:5px;">{cat.item.CONTENT}</li>
-    <!-- END item -->
-  </ul>
-  <p>&nbsp;</p>
-  <!-- END cat -->
diff --git a/template/yoga/admin/thumbnail.tpl b/template/yoga/admin/thumbnail.tpl
index aa8bbcd0f..9e0d70f5e 100644
--- a/template/yoga/admin/thumbnail.tpl
+++ b/template/yoga/admin/thumbnail.tpl
@@ -1,5 +1,10 @@
 <!-- $Id$ -->
-<h2>{lang:title_thumbnails}</h2>
+<div class="titrePage">
+  <ul class="categoryActions">
+    <li><a href="{U_HELP}" onclick="popuphelp(this.href); return false;" title="{lang:Help}"><img src="template/yoga/theme/help.png" alt="(?)"></a></li>
+  </ul>
+  <h2>{lang:title_thumbnails}</h2>
+</div>
 
 <!-- BEGIN results -->
 <div class="admin">{L_RESULTS}</div>
@@ -53,55 +58,39 @@
 <!-- END results -->
 
 <!-- BEGIN params -->
-<form method="post" action="{params.F_ACTION}">
-  <table style="width:100%;">
-    <tr>
-      <th class="admin" colspan="3">{L_PARAMS}</th>
-    </tr>
-    <tr><td colspan="3">&nbsp;</td></tr>
-    <tr>
-      <td><div class="key">{L_GD}</div></td>
-      <td class="choice">
-        <input type="radio" name="gd" value="2" {params.GD2_CHECKED} />2.x
-        <input type="radio" name="gd" value="1" {params.GD1_CHECKED} />1.x
-      </td>
-      <td style="width:50%;" class="row2">{L_GD_INFO}</td>
-    </tr>
-    <tr>
-      <td><div class="key">{L_WIDTH}</div></td>
-      <td class="choice">
-        <input type="text" name="width" value="{params.WIDTH_TN}"/>
-      </td>
-      <td>{L_WIDTH_INFO}</td>
-    </tr>
-    <tr>
-      <td><div class="key">{L_HEIGHT}</div></td>
-      <td class="choice">
-        <input type="text" name="height" value="{params.HEIGHT_TN}"/>
-      </td>
-      <td>{L_HEIGHT_INFO}</td>
-    </tr>
-    <tr>
-      <td><div class="key">{L_CREATE}</div></td>
-      <td class="choice">
-        <input type="radio" name="n" value="5"   {params.n_5_CHECKED} /> 5
-        <input type="radio" name="n" value="10"  {params.n_10_CHECKED} /> 10
-        <input type="radio" name="n" value="20"  {params.n_20_CHECKED} /> 20
-        <input type="radio" name="n" value="all" {params.n_all_CHECKED} /> {L_ALL}
-      </td>
-      <td>{L_CREATE_INFO}</td>
-    </tr>
-    <tr>
-      <td><div class="key">{L_FORMAT}</div></td>
-      <td class="choice"><span style="font-weight:bold;">jpeg</span></td>
-      <td>{L_FORMAT_INFO}</td>
-    </tr>
-    <tr>
-      <td colspan="3" style="text-align:center;">
-        <input type="submit" name="submit" value="{L_SUBMIT}"/>
-      </td>
-    </tr>
-  </table>
+<form method="post" action="{params.F_ACTION}" class="properties">
+
+  <fieldset>
+    <legend>{L_PARAMS}</legend>
+
+    <ul>
+      <li>
+        <label><strong>{L_GD}</strong></label>
+	<input type="radio" name="gd" value="2" {params.GD2_CHECKED} />2.x
+	<input type="radio" name="gd" value="1" {params.GD1_CHECKED} />1.x
+      </li>
+
+      <li>
+        <label><strong>{L_WIDTH}</strong></label>
+	<input type="text" name="width" value="{params.WIDTH_TN}"/>
+      </li>
+
+      <li>
+        <label><strong>{L_HEIGHT}</strong></label>
+	<input type="text" name="height" value="{params.HEIGHT_TN}"/>
+      </li>
+
+      <li>
+        <label><strong>{lang:Number of thumbnails to create}</strong></label>
+	<input type="radio" name="n" value="5"   {params.n_5_CHECKED} /> 5
+	<input type="radio" name="n" value="10"  {params.n_10_CHECKED} /> 10
+	<input type="radio" name="n" value="20"  {params.n_20_CHECKED} /> 20
+	<input type="radio" name="n" value="all" {params.n_all_CHECKED} /> {L_ALL}
+      </li>
+    </ul>
+  </fieldset>
+
+  <p><input type="submit" name="submit" value="{L_SUBMIT}"/></p>
 </form>
 <!-- END params -->
 
diff --git a/template/yoga/admin/user_list.tpl b/template/yoga/admin/user_list.tpl
index 67e8b131b..4c7c5e0b3 100644
--- a/template/yoga/admin/user_list.tpl
+++ b/template/yoga/admin/user_list.tpl
@@ -1,4 +1,9 @@
-<h2>{lang:title_liste_users}</h2>
+<div class="titrePage">
+  <ul class="categoryActions">
+    <li><a href="{U_HELP}" onclick="popuphelp(this.href); return false;" title="{lang:Help}"><img src="template/yoga/theme/help.png" alt="(?)"></a></li>
+  </ul>
+  <h2>{lang:title_liste_users}</h2>
+</div>
 
 <form class="filter" method="post" name="add_user" action="{F_ADD_ACTION}">
   <fieldset>
diff --git a/template/yoga/content.css b/template/yoga/content.css
index ec060a3a0..4d3775b21 100644
--- a/template/yoga/content.css
+++ b/template/yoga/content.css
@@ -173,3 +173,17 @@ ul.categoryActions {
   padding: 0.5em;
 }
 
+
+/* should be in admin.css ? CSS properties also used in popuphelp */
+
+SPAN.pwgScreen {
+  border-bottom: 1px dotted black;
+}
+
+SPAN.filename:before {
+  content: "[";
+}
+
+SPAN.filename:after {
+  content: "]";
+}
diff --git a/template/yoga/picture.tpl b/template/yoga/picture.tpl
index 8aecc0262..85007a15e 100644
--- a/template/yoga/picture.tpl
+++ b/template/yoga/picture.tpl
@@ -161,7 +161,7 @@
   <!-- BEGIN delete -->
   <p class="userCommentDelete">
   <a href="{comments.comment.delete.U_COMMENT_DELETE}" title="{L_DELETE_COMMENT}">
-    <img src="template/clear/theme/delete.gif" style="border:none;vertical-align:middle; margin-left:5px;" alt="[{L_DELETE}]"/>
+    <img src="template/yoga/theme/delete.png" style="border:none;vertical-align:middle; margin-left:5px;" alt="[{L_DELETE}]"/>
   </a>
   </p>
   <!-- END delete -->
diff --git a/template/yoga/popuphelp.css b/template/yoga/popuphelp.css
index 4c73d212d..b61b7952d 100644
--- a/template/yoga/popuphelp.css
+++ b/template/yoga/popuphelp.css
@@ -17,18 +17,6 @@ BODY#thePopuphelpPage #content UL LI
   margin-bottom: 0.5em;
 }
 
-BODY#thePopuphelpPage #content SPAN.pwgScreen {
-  border-bottom: 1px dotted black;
-}
-
-BODY#thePopuphelpPage #content SPAN.filename:before {
-  content: "[";
-}
-
-BODY#thePopuphelpPage #content SPAN.filename:after {
-  content: "]";
-}
-
 BODY#thePopuphelpPage P#pageBottomActions A {
   border: none;
 }
diff --git a/template/yoga/search.tpl b/template/yoga/search.tpl
index bb2cf08a5..2f5b35dd9 100644
--- a/template/yoga/search.tpl
+++ b/template/yoga/search.tpl
@@ -2,6 +2,7 @@
 
   <div class="titrePage">
     <ul class="categoryActions">
+      <li><a href="{U_HELP}" onclick="popuphelp(this.href); return false;" title="{lang:Help}"><img src="template/yoga/theme/help.png" alt="(?)"></a></li>
       <li><a href="{U_HOME}" title="{lang:return to homepage}"><img src="./template/yoga/theme/home.png" alt="{lang:home}"/></a></li>
     </ul>
     <h2>{lang:Search}</h2>
@@ -20,7 +21,7 @@
 <!-- END errors -->
 <table width="100%" align="center" cellpadding="2">
   <tr> 
-    <td width="50%" colspan="2"><b>{L_SEARCH_KEYWORDS} : </b><br /><span class="small">{L_SEARCH_KEYWORDS_HINT}</span></td>
+    <td width="50%" colspan="2"><b>{L_SEARCH_KEYWORDS} : </b>
     <td colspan="2" valign="top">
 	  <input type="text" style="width: 300px" name="search_allwords" size="30" />
 	  <br />
@@ -29,13 +30,13 @@
 	</td>
   </tr>
   <tr> 
-    <td colspan="2"><b>{L_SEARCH_AUTHOR} :</b><br /><span class="small">{L_SEARCH_AUTHOR_HINT}</span></td>
+    <td colspan="2"><b>{L_SEARCH_AUTHOR} :</b>
     <td colspan="2" valign="middle">
 	  <input type="text" style="width: 300px" name="search_author" size="30" />
 	</td>
   </tr>
   <tr> 
-    <td colspan="2"><b>{L_SEARCH_DATE} :</b><br /><span class="small">{L_SEARCH_DATE_HINT}</span></td>
+    <td colspan="2"><b>{L_SEARCH_DATE} :</b>
     <td colspan="2" valign="middle">
       <table>
         <tr>
@@ -79,7 +80,7 @@
     <th colspan="4">{L_SEARCH_OPTIONS}</th>
   </tr>
   <tr> 
-    <td width="25%" ><b>{L_SEARCH_CATEGORIES} : </b><br /><span class="small">{L_SEARCH_CATEGORIES_HINT}</span></td>
+    <td width="25%" ><b>{L_SEARCH_CATEGORIES} : </b>
     <td width="25%" nowrap="nowrap">
 	  <select style="width:200px" name="cat[]" multiple="multiple" size="8">
       <!-- BEGIN category_option -->