Index: /trunk/admin.php
===================================================================
--- /trunk/admin.php	(revision 8650)
+++ /trunk/admin.php	(revision 8651)
@@ -126,5 +126,4 @@
     'U_CAT_OPTIONS'=> $link_start.'cat_options',
     'U_CAT_UPDATE'=> $link_start.'site_update&amp;site=1',
-    'U_WAITING'=> $link_start.'upload',
     'U_RATING'=> $link_start.'rating',
     'U_CADDIE'=> $link_start.'batch_manager&amp;cat=caddie',
Index: /trunk/admin/cat_modify.php
===================================================================
--- /trunk/admin/cat_modify.php	(revision 8650)
+++ /trunk/admin/cat_modify.php	(revision 8651)
@@ -70,6 +70,4 @@
       'name' => @$_POST['name'],
       'commentable' => isset($_POST['commentable'])?$_POST['commentable']:'false',
-      'uploadable' =>
-        isset($_POST['uploadable']) ? $_POST['uploadable'] : 'false',
       'comment' =>
         $conf['allow_html_descriptions'] ?
@@ -246,5 +244,4 @@
     'CAT_VISIBLE'       => boolean_to_string($category['visible']),
     'CAT_COMMENTABLE'   => boolean_to_string($category['commentable']),
-    'CAT_UPLOADABLE'    => boolean_to_string($category['uploadable']),
 
     'IMG_ORDER_DEFAULT'  => empty($category['image_order']) ?
@@ -305,8 +302,4 @@
       )
     );
-  if (!url_is_remote($category['cat_full_dir']) )
-  {
-    $template->assign('SHOW_UPLOADABLE', true);
-  }
 }
 
Index: /trunk/admin/cat_options.php
===================================================================
--- /trunk/admin/cat_options.php	(revision 8650)
+++ /trunk/admin/cat_options.php	(revision 8651)
@@ -48,14 +48,4 @@
   switch ($_GET['section'])
   {
-    case 'upload' :
-    {
-      $query = '
-UPDATE '.CATEGORIES_TABLE.'
-  SET uploadable = \'false\'
-  WHERE id IN ('.implode(',', $_POST['cat_true']).')
-;';
-      pwg_query($query);
-      break;
-    }
     case 'comments' :
     {
@@ -96,14 +86,4 @@
   switch ($_GET['section'])
   {
-    case 'upload' :
-    {
-      $query = '
-UPDATE '.CATEGORIES_TABLE.'
-  SET uploadable = \'true\'
-  WHERE id IN ('.implode(',', $_POST['cat_false']).')
-;';
-      pwg_query($query);
-      break;
-    }
     case 'comments' :
     {
@@ -163,8 +143,4 @@
 $tabsheet->add('status', l10n('Public / Private'), $opt_link.'status');
 $tabsheet->add('visible', l10n('Lock'), $opt_link.'visible');
-if ($conf['enable_synchronization'])
-{
-  $tabsheet->add('upload', l10n('Upload'), $opt_link.'upload');
-}
 $tabsheet->add('comments', l10n('Comments'), $opt_link.'comments');
 if ($conf['allow_random_representative'])
@@ -183,6 +159,6 @@
 // for each section, categories in the multiselect field can be :
 //
-// - true : uploadable for upload section
-// - false : un-uploadable for upload section
+// - true : commentable for comment section
+// - false : un-commentable for comment section
 // - NA : (not applicable) for virtual categories
 //
@@ -194,29 +170,4 @@
 switch ($page['section'])
 {
-  case 'upload' :
-  {
-    $query_true = '
-SELECT id,name,uppercats,global_rank
-  FROM '.CATEGORIES_TABLE.'
-  WHERE uploadable = \'true\'
-    AND dir IS NOT NULL
-    AND site_id = 1
-;';
-    $query_false = '
-SELECT id,name,uppercats,global_rank
-  FROM '.CATEGORIES_TABLE.'
-  WHERE uploadable = \'false\'
-    AND dir IS NOT NULL
-    AND site_id = 1
-;';
-    $template->assign(
-      array(
-        'L_SECTION' => l10n('Select uploadable albums'),
-        'L_CAT_OPTIONS_TRUE' => l10n('Authorized'),
-        'L_CAT_OPTIONS_FALSE' => l10n('Forbidden'),
-        )
-      );
-    break;
-  }
   case 'comments' :
   {
Index: /trunk/admin/configuration.php
===================================================================
--- /trunk/admin/configuration.php	(revision 8650)
+++ /trunk/admin/configuration.php	(revision 8651)
@@ -59,9 +59,4 @@
     'history_admin',
     'history_guest'
-   );
-
-$upload_checkboxes = array(
-    'upload_link_everytime',
-    'email_admin_on_picture_uploaded',
    );
 
@@ -145,12 +140,4 @@
       break;
     }
-    case 'upload' :
-    {
-      foreach( $upload_checkboxes as $checkbox)
-      {
-        $_POST[$checkbox] = empty($_POST[$checkbox])?'false':'true';
-      }
-      break;
-    }
     case 'default' :
     {
@@ -218,8 +205,4 @@
 $tabsheet->add('history', l10n('History'), $conf_link.'history');
 $tabsheet->add('comments', l10n('Comments'), $conf_link.'comments');
-if ($conf['enable_synchronization'])
-{
-  $tabsheet->add('upload', l10n('Upload'), $conf_link.'upload');
-}
 $tabsheet->add('default', l10n('Guest Settings'), $conf_link.'default');
 // TabSheet selection
@@ -301,26 +284,4 @@
     break;
   }
-  case 'upload' :
-  {
-    $template->assign(
-      'upload',
-      array(
-        'upload_user_access_options'=> get_user_access_level_html_options(ACCESS_GUEST),
-        'upload_user_access_options_selected' => array($conf['upload_user_access'])
-        )
-      );
-    //Necessary for merge_block_vars
-    foreach ($upload_checkboxes as $checkbox)
-    {
-      $template->append(
-          'upload',
-          array(
-            $checkbox => $conf[$checkbox]
-            ),
-          true
-        );
-    }
-    break;
-  }
   case 'default' :
   {
Index: /trunk/admin/help.php
===================================================================
--- /trunk/admin/help.php	(revision 8650)
+++ /trunk/admin/help.php	(revision 8651)
@@ -47,11 +47,4 @@
   'label' => l10n('Groups'),
   );
-if ($conf['enable_synchronization'])
-{
-  $tabs[] = array(
-    'code' => 'user_upload',
-    'label' => l10n('User Upload'),
-    );
-}
 $tabs[] = array(
   'code' => 'virtual_links',
Index: /trunk/admin/include/functions_upgrade.php
===================================================================
--- /trunk/admin/include/functions_upgrade.php	(revision 8650)
+++ /trunk/admin/include/functions_upgrade.php	(revision 8651)
@@ -55,5 +55,4 @@
   define('USER_INFOS_TABLE', $prefixeTable.'user_infos');
   define('USER_FEED_TABLE', $prefixeTable.'user_feed');
-  define('WAITING_TABLE', $prefixeTable.'waiting');
   define('RATE_TABLE', $prefixeTable.'rate');
   define('USER_CACHE_TABLE', $prefixeTable.'user_cache');
Index: /trunk/admin/intro.php
===================================================================
--- /trunk/admin/intro.php	(revision 8650)
+++ /trunk/admin/intro.php	(revision 8651)
@@ -240,23 +240,4 @@
 }
 
-// waiting elements
-$query = '
-SELECT COUNT(*)
-  FROM '.WAITING_TABLE.'
-  WHERE validated=\'false\'
-;';
-list($nb_waiting) = pwg_db_fetch_row(pwg_query($query));
-
-if ($nb_waiting > 0)
-{
-  $template->assign(
-    'waiting',
-    array(
-      'URL' => PHPWG_ROOT_PATH.'admin.php?page=upload',
-      'INFO' => sprintf(l10n('%d waiting for validation'), $nb_waiting)
-      )
-    );
-}
-
 // unvalidated comments
 $query = '
Index: /trunk/admin/site_update.php
===================================================================
--- /trunk/admin/site_update.php	(revision 8650)
+++ /trunk/admin/site_update.php	(revision 8651)
@@ -241,7 +241,4 @@
         'commentable' =>
           boolean_to_string($conf['newcat_default_commentable']),
-        'uploadable'  => $site_is_remote
-          ? 'false'
-          : boolean_to_string($conf['newcat_default_uploadable']),
         'status'      => $conf['newcat_default_status'],
         'visible'     => boolean_to_string($conf['newcat_default_visible']),
@@ -313,5 +310,5 @@
       $dbfields = array(
         'id','dir','name','site_id','id_uppercat','uppercats','commentable',
-        'uploadable','visible','status','rank','global_rank'
+        'visible','status','rank','global_rank'
         );
       mass_inserts(CATEGORIES_TABLE, $dbfields, $inserts);
@@ -360,5 +357,4 @@
 
   $db_elements = array();
-  $db_unvalidated = array();
 
   if (count($cat_ids) > 0)
@@ -374,24 +370,4 @@
         ).')';
     $db_elements = simple_hash_from_query($query, 'id', 'path');
-
-    // searching the unvalidated waiting elements (they must not be taken into
-    // account)
-    $query = '
-SELECT file,storage_category_id
-  FROM '.WAITING_TABLE.'
-  WHERE storage_category_id IN (
-'.wordwrap(implode(', ', $cat_ids), 80, "\n").')
-    AND validated = \'false\'';
-    $result = pwg_query($query);
-    while ($row = pwg_db_fetch_assoc($result))
-    {
-      array_push(
-        $db_unvalidated,
-        array_search(
-          $row['storage_category_id'],
-          $db_fulldirs)
-        .'/'.$row['file']
-        );
-    }
   }
 
@@ -404,5 +380,5 @@
   $insert_links = array();
 
-  foreach (array_diff(array_keys($fs), $db_elements, $db_unvalidated) as $path)
+  foreach (array_diff(array_keys($fs), $db_elements) as $path)
   {
     $insert = array();
@@ -530,58 +506,4 @@
     . get_elapsed_time($start_files, get_moment())
     . ' -->' );
-
-  // retrieving informations given by uploaders
-  if (!$simulate and count($cat_ids) > 0)
-  {
-    $query = '
-SELECT id,file,storage_category_id,infos
-  FROM '.WAITING_TABLE.'
-  WHERE storage_category_id IN (
-'.wordwrap(implode(', ', $cat_ids), 80, "\n").')
-    AND validated = \'true\'';
-    $result = pwg_query($query);
-
-    $datas = array();
-    $fields =
-      array(
-        'primary' => array('id'),
-        'update'  => array('date_creation', 'author', 'name', 'comment')
-        );
-
-    $waiting_to_delete = array();
-
-    while ($row = pwg_db_fetch_assoc($result))
-    {
-      $data = array();
-
-      $query = '
-SELECT id
-  FROM '.IMAGES_TABLE.'
-  WHERE storage_category_id = '.$row['storage_category_id'].'
-    AND file = \''.$row['file'].'\'';
-      list($data['id']) = pwg_db_fetch_row(pwg_query($query));
-
-      foreach ($fields['update'] as $field)
-      {
-        $data[$field] = addslashes( getAttribute($row['infos'], $field) );
-      }
-
-      array_push($datas, $data);
-      array_push($waiting_to_delete, $row['id']);
-    }
-
-    if (count($datas) > 0)
-    {
-      mass_updates(IMAGES_TABLE, $fields, $datas);
-
-      // delete now useless waiting elements
-      $query = '
-DELETE
-  FROM '.WAITING_TABLE.'
-  WHERE id IN ('.implode(',', $waiting_to_delete).')
-;';
-      pwg_query($query);
-    }
-  }
 }
 
Index: /trunk/admin/themes/default/template/admin.tpl
===================================================================
--- /trunk/admin/themes/default/template/admin.tpl	(revision 8650)
+++ /trunk/admin/themes/default/template/admin.tpl	(revision 8651)
@@ -19,7 +19,4 @@
       <ul>
         <li><a href="{$U_ADD_PHOTOS}">{'Add'|@translate}</a></li>
-{if $ENABLE_SYNCHRONIZATION}
-        <li><a href="{$U_WAITING}">{'Waiting'|@translate}</a></li>
-{/if}
         <li><a href="{$U_RATING}">{'Rating'|@translate}</a></li>
         <li><a href="{$U_TAGS}">{'Tags'|@translate}</a></li>
Index: /trunk/admin/themes/default/template/cat_modify.tpl
===================================================================
--- /trunk/admin/themes/default/template/cat_modify.tpl	(revision 8650)
+++ /trunk/admin/themes/default/template/cat_modify.tpl	(revision 8651)
@@ -86,12 +86,4 @@
       </td>
     </tr>
-    {if isset($SHOW_UPLOADABLE) }
-    <tr>
-      <td><strong>{'Authorize upload'|@translate}</strong>
-      <td>
-        {html_radios name='uploadable' values='false,true'|@explode output='No,Yes'|@explode|translate selected=$CAT_UPLOADABLE}
-      </td>
-    </tr>
-    {/if}
   </table>
 </fieldset>
Index: /trunk/admin/themes/default/template/configuration.tpl
===================================================================
--- /trunk/admin/themes/default/template/configuration.tpl	(revision 8650)
+++ /trunk/admin/themes/default/template/configuration.tpl	(revision 8651)
@@ -184,27 +184,4 @@
     </li>
 
-  </ul>
-</fieldset>
-{/if}
-
-{if isset($upload)}
-<fieldset id="uploadConf">
-  <legend></legend>
-  <ul>
-    <li>
-      <label><span class="property">{'Show upload link every time'|@translate}</span>
-      <input type="checkbox" name="upload_link_everytime" {if ($upload.upload_link_everytime)}checked="checked"{/if}></label>
-    </li>
-    <li>
-      <label><span class="property">{'User access level to upload'|@translate}</span>
-      {html_options name="upload_user_access" options=$upload.upload_user_access_options selected=$upload.upload_user_access_options_selected}
-      </label>
-    </li>
-    <li>
-      <label>
-        <span class="property">{'Email admins when a picture is uploaded'|@translate}</span>
-        <input type="checkbox" name="email_admin_on_picture_uploaded" {if ($upload.email_admin_on_picture_uploaded)}checked="checked"{/if}>
-      </label>
-    </li>
   </ul>
 </fieldset>
Index: /trunk/admin/themes/default/template/intro.tpl
===================================================================
--- /trunk/admin/themes/default/template/intro.tpl	(revision 8650)
+++ /trunk/admin/themes/default/template/intro.tpl	(revision 8651)
@@ -38,8 +38,4 @@
       <li>
         {$DB_ELEMENTS}
-        {if isset($waiting)}
-        (<a href="{$waiting.URL}">{$waiting.INFO}</a>)
-        {/if}
-
         {if isset($first_added)}
         ({$first_added.DB_DATE})
Index: unk/admin/themes/default/template/upload.tpl
===================================================================
--- /trunk/admin/themes/default/template/upload.tpl	(revision 8650)
+++ 	(revision )
@@ -1,51 +1,0 @@
-<div class="titrePage">
-  <h2>{'Waiting'|@translate} {$TABSHEET_TITLE}</h2>
-</div>
-
-<h3>{'Pictures waiting for validation'|@translate}</h3>
-
-<form action="{$F_ACTION}" method="post" id="waiting">
-  <table style="width:99%;" >
-    <tr class="throw">
-      <td style="width:20%;">{'Album'|@translate}</td>
-      <td style="width:20%;">{'Date'|@translate}</td>
-      <td style="width:20%;">{'File'|@translate}</td>
-      <td style="width:20%;">{'Thumbnail'|@translate}</td>
-      <td style="width:20%;">{'Author'|@translate}</td>
-      <td style="width:1px;">&nbsp;</td>
-    </tr>
-    
-    {if not empty($pictures) }
-    {foreach from=$pictures item=picture name=picture_loop}
-    <tr class="{if $smarty.foreach.picture_loop.index is odd}row1{else}row2{/if}">
-      <td style="white-space:nowrap;">{$picture.CATEGORY_IMG}</td>
-      <td style="white-space:nowrap;">{$picture.DATE_IMG}</td>
-      <td style="white-space:nowrap;">
-        <a href="{$picture.PREVIEW_URL_IMG}" title="{$picture.FILE_TITLE}">{$picture.FILE_IMG}</a>
-      </td>
-      <td style="white-space:nowrap;">
-        {if not empty($picture.thumbnail) }
-        <a href="{$picture.thumbnail.PREVIEW_URL_TN_IMG}" title="{$picture.thumbnail.FILE_TN_TITLE}">{$picture.thumbnail.FILE_TN_IMG}</a>
-        {/if}
-      </td>
-      <td style="white-space:nowrap;">
-        <a href="mailto:{$picture.UPLOAD_EMAIL}">{$picture.UPLOAD_USERNAME}</a>
-      </td>
-      <td style="white-space:nowrap;">
-        <label><input type="radio" name="action-{$picture.ID_IMG}" value="validate"> {'Validate'|@translate}</label>
-        <label><input type="radio" name="action-{$picture.ID_IMG}" value="reject"> {'Reject'|@translate}</label>
-      </td>
-    </tr>
-    {/foreach}
-    {/if}
-  </table>
-
-  <p class="bottomButtons">
-    <input type="hidden" name="list" value="{$LIST}">
-    <input class="submit" type="submit" name="submit" value="{'Submit'|@translate}">
-    <input class="submit" type="submit" name="validate-all" value="{'Validate All'|@translate}">
-    <input class="submit" type="submit" name="reject-all" value="{'Reject All'|@translate}">
-    <input class="submit" type="reset" value="{'Reset'|@translate}">
-  </p>
-
-</form>
Index: unk/admin/upload.php
===================================================================
--- /trunk/admin/upload.php	(revision 8650)
+++ 	(revision )
@@ -1,205 +1,0 @@
-<?php
-// +-----------------------------------------------------------------------+
-// | Piwigo - a PHP based picture gallery                                  |
-// +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2010 Piwigo Team                  http://piwigo.org |
-// | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
-// | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
-// +-----------------------------------------------------------------------+
-// | 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.                                                                  |
-// +-----------------------------------------------------------------------+
-
-if( !defined("PHPWG_ROOT_PATH") )
-{
-  die ("Hacking attempt!");
-}
-
-include_once(PHPWG_ROOT_PATH.'admin/include/functions.php');
-
-// +-----------------------------------------------------------------------+
-// | Check Access and exit when user status is not ok                      |
-// +-----------------------------------------------------------------------+
-check_status(ACCESS_ADMINISTRATOR);
-
-//--------------------------------------------------------------------- updates
-
-if (isset($_POST))
-{
-  $to_validate = array();
-  $to_reject = array();
-
-  if (isset($_POST['submit']))
-  {
-    foreach (explode(',', $_POST['list']) as $waiting_id)
-    {
-      if (isset($_POST['action-'.$waiting_id]))
-      {
-        switch ($_POST['action-'.$waiting_id])
-        {
-          case 'reject' :
-          {
-            array_push($to_reject, $waiting_id);
-            break;
-          }
-          case 'validate' :
-          {
-            array_push($to_validate, $waiting_id);
-            break;
-          }
-        }
-      }
-    }
-  }
-  elseif (isset($_POST['validate-all']) and !empty($_POST['list']))
-  {
-    $to_validate = explode(',', $_POST['list']);
-  }
-  elseif (isset($_POST['reject-all']) and !empty($_POST['list']))
-  {
-    $to_reject = explode(',', $_POST['list']);
-  }
-
-  if (count($to_validate) > 0)
-  {
-    $query = '
-UPDATE '.WAITING_TABLE.'
-  SET validated = \'true\'
-  WHERE id IN ('.implode(',', $to_validate).')
-;';
-    pwg_query($query);
-
-    array_push(
-      $page['infos'],
-      sprintf(
-        l10n('%d waiting pictures validated'),
-        count($to_validate)
-        )
-      );
-  }
-
-  if (count($to_reject) > 0)
-  {
-    // The uploaded element was refused, we have to delete its reference in
-    // the database and to delete the element as well.
-    $query = '
-SELECT id, storage_category_id, file, tn_ext
-  FROM '.WAITING_TABLE.'
-  WHERE id IN ('.implode(',', $to_reject).')
-;';
-    $result = pwg_query($query);
-    while($row = pwg_db_fetch_assoc($result))
-    {
-      $dir = get_complete_dir($row['storage_category_id']);
-      unlink($dir.$row['file']);
-      $element_info = array(
-        'path' => $dir.$row['file'],
-        'tn_ext' =>
-          (isset($row['tn_ext']) and $row['tn_ext']!='') ? $row['tn_ext']:'jpg'
-        );
-      $tn_path = get_thumbnail_path( $element_info );
-
-      if ( @is_file($tn_path) )
-      {
-        unlink( $tn_path );
-      }
-    }
-
-    $query = '
-DELETE
-  FROM '.WAITING_TABLE.'
-  WHERE id IN ('.implode(',', $to_reject).')
-;';
-    pwg_query($query);
-
-    array_push(
-      $page['infos'],
-      sprintf(
-        l10n('%d waiting pictures rejected'),
-        count($to_reject)
-        )
-      );
-  }
-}
-
-//----------------------------------------------------- template initialization
-$template->set_filenames(array('upload'=>'upload.tpl'));
-
-$template->assign(array(
-  'F_ACTION'=>str_replace( '&', '&amp;', $_SERVER['REQUEST_URI'])
-  ));
-
-//---------------------------------------------------------------- form display
-$cat_names = array();
-$list = array();
-
-$query = 'SELECT * FROM '.WAITING_TABLE;
-$query.= " WHERE validated = 'false'";
-$query.= ' ORDER BY storage_category_id';
-$query.= ';';
-$result = pwg_query( $query );
-while ( $row = pwg_db_fetch_assoc( $result ) )
-{
-  if ( !isset( $cat_names[$row['storage_category_id']] ) )
-  {
-    $cat = get_cat_info( $row['storage_category_id'] );
-    $cat_names[$row['storage_category_id']] = array();
-    $cat_names[$row['storage_category_id']]['dir'] =
-      PHPWG_ROOT_PATH.get_complete_dir( $row['storage_category_id'] );
-    $cat_names[$row['storage_category_id']]['display_name'] =
-      get_cat_display_name($cat['upper_names']);
-  }
-  $preview_url = PHPWG_ROOT_PATH.$cat_names[$row['storage_category_id']]['dir'].$row['file'];
-
-  $tpl_var =
-    array(
-      'CATEGORY_IMG'=>$cat_names[$row['storage_category_id']]['display_name'],
-      'ID_IMG'=>$row['id'],
-      'DATE_IMG' => date('Y-m-d H:i:s', $row['date']),
-      'FILE_TITLE'=>$row['file'],
-      'FILE_IMG' =>
-        (strlen($row['file']) > 10) ?
-          (substr($row['file'], 0, 10)).'...' : $row['file'],
-      'PREVIEW_URL_IMG'=>$preview_url,
-      'UPLOAD_EMAIL'=>get_email_address_as_display_text($row['mail_address']),
-      'UPLOAD_USERNAME'=>stripslashes($row['username'])
-    );
-
-  // is there an existing associated thumnail ?
-  if ( !empty( $row['tn_ext'] ))
-  {
-    $thumbnail = $conf['prefix_thumbnail'];
-    $thumbnail.= get_filename_wo_extension( $row['file'] );
-    $thumbnail.= '.'.$row['tn_ext'];
-	$url = $cat_names[$row['storage_category_id']]['dir'];
-    $url.= $conf['dir_thumbnail'].'/'.$thumbnail;
-
-    $tpl_var['thumbnail'] =
-      array(
-        'PREVIEW_URL_TN_IMG' => $url,
-        'FILE_TN_IMG' =>
-          (strlen($thumbnail) > 10) ?
-            (substr($thumbnail, 0, 10)).'...' : $thumbnail,
-        'FILE_TN_TITLE' => $thumbnail
-      );
-  }
-  $template->append('pictures', $tpl_var);
-  array_push($list, $row['id']);
-}
-
-$template->assign('LIST',implode(',', $list) );
-
-//----------------------------------------------------------- sending html code
-$template->assign_var_from_handle('ADMIN_CONTENT', 'upload');
-?>
Index: /trunk/include/config_default.inc.php
===================================================================
--- /trunk/include/config_default.inc.php	(revision 8650)
+++ /trunk/include/config_default.inc.php	(revision 8651)
@@ -121,8 +121,4 @@
 // or not ?
 $conf['newcat_default_commentable'] = true;
-
-// newcat_default_uploadable : at creation, must a category be uploadable or
-// not ?
-$conf['newcat_default_uploadable'] = false;
 
 // newcat_default_visible : at creation, must a category be visible or not ?
@@ -556,28 +552,4 @@
 // If false it'll be redirected from index.php to identification.php
 $conf['guest_access'] = true;
-
-// +-----------------------------------------------------------------------+
-// |                                upload                                 |
-// +-----------------------------------------------------------------------+
-
-// upload_maxfilesize: maximum filesize for the uploaded pictures. In
-// kilobytes.
-$conf['upload_maxfilesize'] = 200;
-
-// upload_maxheight: maximum height authorized for the uploaded images. In
-// pixels.
-$conf['upload_maxheight'] = 800;
-
-// upload_maxwidth: maximum width authorized for the uploaded images. In
-// pixels.
-$conf['upload_maxwidth'] = 800;
-
-// upload_maxheight_thumbnail: maximum height authorized for the uploaded
-// thumbnails
-$conf['upload_maxheight_thumbnail'] = 128;
-
-// upload_maxwidth_thumbnail: maximum width authorized for the uploaded
-// thumbnails
-$conf['upload_maxwidth_thumbnail'] = 128;
 
 // +-----------------------------------------------------------------------+
Index: /trunk/include/constants.php
===================================================================
--- /trunk/include/constants.php	(revision 8650)
+++ /trunk/include/constants.php	(revision 8651)
@@ -78,6 +78,4 @@
 if (!defined('USER_FEED_TABLE'))
   define('USER_FEED_TABLE', $prefixeTable.'user_feed');
-if (!defined('WAITING_TABLE'))
-  define('WAITING_TABLE', $prefixeTable.'waiting');
 if (!defined('RATE_TABLE'))
   define('RATE_TABLE', $prefixeTable.'rate');
Index: /trunk/include/functions_notification.inc.php
===================================================================
--- /trunk/include/functions_notification.inc.php	(revision 8650)
+++ /trunk/include/functions_notification.inc.php	(revision 8651)
@@ -55,5 +55,5 @@
  *
  * @param string action ('count' or 'info')
- * @param string type of query ('new_comments', 'unvalidated_comments', 'new_elements', 'updated_categories', 'new_users', 'waiting_elements')
+ * @param string type of query ('new_comments', 'unvalidated_comments', 'new_elements', 'updated_categories', 'new_users')
  * @param string start (mysql datetime format)
  * @param string end (mysql datetime format)
@@ -146,10 +146,4 @@
 ;';
       break;
-    case 'waiting_elements':
-      $query = '
-  FROM '.WAITING_TABLE.'
-  WHERE validated = \'false\'
-;';
-      break;
     default:
       // stop this function and return nothing
@@ -177,7 +171,4 @@
         case 'new_users':
           $field_id = 'user_id';
-          break;
-        case 'waiting_elements':
-          $field_id = 'id';
           break;
     }
@@ -206,7 +197,4 @@
           $fields = array('user_id');
           break;
-        case 'waiting_elements':
-          $fields = array('id');
-          break;
       }
 
@@ -345,24 +333,4 @@
 {
   return custom_notification_query('info', 'new_users', $start, $end);
-}
-
-/**
- * currently waiting pictures
- *
- * @return count waiting ids
- */
-function nb_waiting_elements()
-{
-  return custom_notification_query('count', 'waiting_elements', '', '');
-}
-
-/**
- * currently waiting pictures
- *
- * @return array waiting ids
- */
-function waiting_elements()
-{
-  return custom_notification_query('info', 'waiting_elements', $start, $end);
 }
 
@@ -387,6 +355,5 @@
           (nb_updated_categories($start, $end) > 0) or
           ((is_admin()) and (nb_unvalidated_comments($start, $end) > 0)) or
-          ((is_admin()) and (nb_new_users($start, $end) > 0)) or
-          ((is_admin()) and (nb_waiting_elements() > 0))
+          ((is_admin()) and (nb_new_users($start, $end) > 0)))
         );
 }
@@ -454,8 +421,4 @@
         nb_new_users($start, $end), '%d new user', '%d new users',
         get_root_url().'admin.php?page=user_list', $add_url );
-
-    add_news_line( $news,
-        nb_waiting_elements(), '%d waiting element', '%d waiting elements',
-        get_root_url().'admin.php?page=upload', $add_url );
   }
 
Index: /trunk/install/config.sql
===================================================================
--- /trunk/install/config.sql	(revision 8650)
+++ /trunk/install/config.sql	(revision 8651)
@@ -27,9 +27,6 @@
 INSERT INTO piwigo_config (param,value,comment) VALUES ('email_admin_on_comment','false','Send an email to the administrators when a valid comment is entered');
 INSERT INTO piwigo_config (param,value,comment) VALUES ('email_admin_on_comment_validation','false','Send an email to the administrators when a comment requires validation');
-INSERT INTO piwigo_config (param,value,comment) VALUES ('email_admin_on_picture_uploaded','false','Send an email to the administrators when a picture is uploaded');
 INSERT INTO piwigo_config (param,value,comment) VALUES ('obligatory_user_mail_address','false','Mail address is obligatory for users');
 INSERT INTO piwigo_config (param,value,comment) VALUES ('c13y_ignore',null,'List of ignored anomalies');
-INSERT INTO piwigo_config (param,value,comment) VALUES ('upload_link_everytime','false','Show upload link every time');
-INSERT INTO piwigo_config (param,value,comment) VALUES ('upload_user_access',2 /*ACCESS_CLASSIC*/,'User access level to upload');
 INSERT INTO piwigo_config (param,value,comment) VALUES ('extents_for_templates','a:0:{}','Actived template-extension(s)');
 INSERT INTO piwigo_config (param,value,comment) VALUES ('blk_menubar','','Menubar options');
Index: /trunk/install/db/94-database.php
===================================================================
--- /trunk/install/db/94-database.php	(revision 8651)
+++ /trunk/install/db/94-database.php	(revision 8651)
@@ -0,0 +1,93 @@
+<?php
+// +-----------------------------------------------------------------------+
+// | Piwigo - a PHP based picture gallery                                  |
+// +-----------------------------------------------------------------------+
+// | Copyright(C) 2008-2010 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
+// | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
+// +-----------------------------------------------------------------------+
+// | 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.                                                                  |
+// +-----------------------------------------------------------------------+
+
+if (!defined('PHPWG_ROOT_PATH'))
+{
+  die('Hacking attempt!');
+}
+
+$upgrade_description = 'remove user upload as core feature and save config for Community plugin';
+
+$user_upload_conf = array();
+
+// upload_user_access
+$conf_orig = $conf;
+load_conf_from_db();
+$user_upload_conf['upload_user_access'] = $conf['upload_user_access'];
+$conf = $conf_orig;
+
+// unvalidated photos submitted by users
+$query = '
+SELECT *
+  FROM '.PREFIX_TABLE.'waiting
+;';
+$result = pwg_query($query);
+$user_upload_conf['waiting_rows'] = array();
+while ($row = pwg_db_fetch_assoc($result)) {
+  array_push($user_upload_conf['waiting_rows'], $row);
+}
+
+// uploadable categories
+$query = '
+SELECT id
+  FROM '.CATEGORIES_TABLE.'
+  WHERE uploadable = \'true\'
+;';
+$result = pwg_query($query);
+$user_upload_conf['uploadable_categories'] = array();
+while ($row = pwg_db_fetch_assoc($result)) {
+  array_push($user_upload_conf['uploadable_categories'], $row['id']);
+}
+
+// save configuration for a future use by the Community plugin
+$backup_filepath = $conf['local_data_dir'].'/plugins/core_user_upload_to_community.php';
+mkgetdir(dirname($backup_filepath));
+
+file_put_contents(
+  $backup_filepath,
+  '<?php $user_upload_conf = \''.serialize($user_upload_conf).'\'; ?>'
+  );
+
+//
+// remove all what is related to user upload in the database
+//
+
+// categories.uploadable
+pwg_query('ALTER TABLE '.CATEGORIES_TABLE.' DROP COLUMN uploadable;');
+
+// waiting
+pwg_query('DROP TABLE '.PREFIX_TABLE.'waiting;');
+
+// config parameter settings : upload_user_access, upload_link_everytime
+$query = '
+DELETE FROM '.PREFIX_TABLE.'config
+  WHERE param IN (\'upload_user_access\', \'upload_link_everytime\', \'email_admin_on_picture_uploaded\')
+;';
+pwg_query($query);
+
+echo
+"\n"
+. $upgrade_description
+."\n"
+;
+?>
Index: /trunk/install/piwigo_structure-mysql.sql
===================================================================
--- /trunk/install/piwigo_structure-mysql.sql	(revision 8650)
+++ /trunk/install/piwigo_structure-mysql.sql	(revision 8651)
@@ -31,5 +31,4 @@
   `site_id` tinyint(4) unsigned default '1',
   `visible` enum('true','false') NOT NULL default 'true',
-  `uploadable` enum('true','false') NOT NULL default 'false',
   `representative_picture_id` mediumint(8) unsigned default NULL,
   `uppercats` varchar(255) NOT NULL default '',
@@ -447,20 +446,2 @@
   UNIQUE KEY `users_ui1` (`username`)
 ) TYPE=MyISAM;
-
---
--- Table structure for table `piwigo_waiting`
---
-
-DROP TABLE IF EXISTS `piwigo_waiting`;
-CREATE TABLE `piwigo_waiting` (
-  `id` int(10) unsigned NOT NULL auto_increment,
-  `storage_category_id` smallint(5) unsigned NOT NULL default '0',
-  `file` varchar(255) NOT NULL default '',
-  `username` varchar(255) NOT NULL default '',
-  `mail_address` varchar(255) NOT NULL default '',
-  `date` int(10) unsigned NOT NULL default '0',
-  `tn_ext` char(3) default NULL,
-  `validated` enum('true','false') NOT NULL default 'false',
-  `infos` text,
-  PRIMARY KEY  (`id`)
-) TYPE=MyISAM;
Index: /trunk/install/piwigo_structure-pdo-sqlite.sql
===================================================================
--- /trunk/install/piwigo_structure-pdo-sqlite.sql	(revision 8650)
+++ /trunk/install/piwigo_structure-pdo-sqlite.sql	(revision 8651)
@@ -27,5 +27,4 @@
   "site_id" INTEGER default 1,
   "visible" BOOLEAN default true,
-  "uploadable" BOOLEAN default false,
   "representative_picture_id" INTEGER,
   "uppercats" TEXT,
@@ -538,21 +537,2 @@
 CREATE INDEX "comments_i1" ON "piwigo_comments" ("image_id");
 
------------------------------------------------------------------------------
--- piwigo_waiting
------------------------------------------------------------------------------
-
-DROP TABLE IF EXISTS piwigo_waiting;
-CREATE TABLE piwigo_waiting
-(
-  "id" INTEGER NOT NULL,
-  "storage_category_id" INTEGER default 0 NOT NULL,
-  "file" VARCHAR(255) default '' NOT NULL,
-  "username" VARCHAR(255) default '' NOT NULL,
-  "mail_address" VARCHAR(255) default '' NOT NULL,
-  "date" INTEGER default 0 NOT NULL,
-  "tn_ext" CHAR(3),
-  "validated" BOOLEAN default false,
-  "infos" TEXT,
-  PRIMARY KEY ("id")
-);
-
Index: /trunk/install/piwigo_structure-pgsql.sql
===================================================================
--- /trunk/install/piwigo_structure-pgsql.sql	(revision 8650)
+++ /trunk/install/piwigo_structure-pgsql.sql	(revision 8651)
@@ -34,5 +34,4 @@
   "site_id" INTEGER default 1,
   "visible" BOOLEAN default true,
-  "uploadable" BOOLEAN default false,
   "representative_picture_id" INTEGER,
   "uppercats" TEXT,
@@ -653,26 +652,2 @@
 
 CREATE INDEX "comments_i1" ON "piwigo_comments" ("image_id");
-
------------------------------------------------------------------------------
--- piwigo_waiting
------------------------------------------------------------------------------
-
-DROP TABLE IF EXISTS "piwigo_waiting" CASCADE;
-CREATE TABLE "piwigo_waiting"
-(
-  "id" serial  NOT NULL,
-  "storage_category_id" INTEGER default 0 NOT NULL,
-  "file" VARCHAR(255) default '' NOT NULL,
-  "username" VARCHAR(255) default '' NOT NULL,
-  "mail_address" VARCHAR(255) default '' NOT NULL,
-  "date" INTEGER default 0 NOT NULL,
-  "tn_ext" CHAR(3),
-  "validated" BOOLEAN default false,
-  "infos" TEXT,
-  PRIMARY KEY ("id")
-);
-
-COMMENT ON TABLE "piwigo_waiting" IS '';
-
-
-SET search_path TO public;
Index: /trunk/install/piwigo_structure-sqlite.sql
===================================================================
--- /trunk/install/piwigo_structure-sqlite.sql	(revision 8650)
+++ /trunk/install/piwigo_structure-sqlite.sql	(revision 8651)
@@ -27,5 +27,4 @@
   "site_id" INTEGER default 1,
   "visible" BOOLEAN default true,
-  "uploadable" BOOLEAN default false,
   "representative_picture_id" INTEGER,
   "uppercats" TEXT,
@@ -537,22 +536,2 @@
 CREATE INDEX "comments_i2" ON "piwigo_comments" ("validation_date");
 CREATE INDEX "comments_i1" ON "piwigo_comments" ("image_id");
-
------------------------------------------------------------------------------
--- piwigo_waiting
------------------------------------------------------------------------------
-
-DROP TABLE IF EXISTS piwigo_waiting;
-CREATE TABLE piwigo_waiting
-(
-  "id" INTEGER NOT NULL,
-  "storage_category_id" INTEGER default 0 NOT NULL,
-  "file" VARCHAR(255) default '' NOT NULL,
-  "username" VARCHAR(255) default '' NOT NULL,
-  "mail_address" VARCHAR(255) default '' NOT NULL,
-  "date" INTEGER default 0 NOT NULL,
-  "tn_ext" CHAR(3),
-  "validated" BOOLEAN default false,
-  "infos" TEXT,
-  PRIMARY KEY ("id")
-);
-
Index: /trunk/language/ar_SA/admin.lang.php
===================================================================
--- /trunk/language/ar_SA/admin.lang.php	(revision 8650)
+++ /trunk/language/ar_SA/admin.lang.php	(revision 8651)
@@ -47,6 +47,4 @@
 $lang['%d users'] = '%d مستخدمين';
 $lang['%d waiting for validation'] = '%d ينتظر المصادقة';
-$lang['%d waiting pictures rejected'] = '%d لم يتم المصادقه على الصورة';
-$lang['%d waiting pictures validated'] = '%d تم المصادقة على الصورة';
 $lang['Actions'] = 'الاجراءات';
 $lang['Activate'] = 'تفعيل';
@@ -89,5 +87,4 @@
 $lang['Email admins when a valid comment is entered'] = 'اعلم المدير عند اي تعليق جديد';
 $lang['Email admins when a comment requires validation'] = 'اعلم المدير للمصادقة على تعليقات جديدة';
-$lang['Email admins when a picture is uploaded'] = 'اعلم المدير عن تحميل صورة جديدة';
 $lang['Empty caddie'] = 'الساعد فارغ';
 $lang['Environment'] = 'البيئة';
@@ -148,5 +145,4 @@
 $lang['Rating by guests'] = 'امكانية التقييم للضيوف';
 $lang['Rating'] = 'تقييم';
-$lang['Reject All'] = 'رفض الجميع';
 $lang['Reject'] = 'رفض';
 $lang['Representant'] = ' موصوف أو مُـمثل';
@@ -174,5 +170,4 @@
 $lang['User comments validation'] = 'تعليقات تنتظر التصريح';
 $lang['Users'] = 'المستخدمين';
-$lang['Validate All'] = 'تصريح الكل';
 $lang['Validate'] = 'تصريح';
 $lang['Validation'] = 'التصريح';
@@ -198,5 +193,4 @@
 $lang['Public / Private'] = 'العام/ الخاص';
 $lang['Manage authorizations for selected albums'] = 'ادارة  تصريح التعليقات على الألبومات';
-$lang['Select uploadable albums'] = 'اختيارالألبوم المحمل';
 $lang['Virtual album added'] = 'الألبوم المضاف';
 $lang['Virtual album deleted'] = 'الألبوم المحذوف';
@@ -217,5 +211,4 @@
 $lang['edit album permissions'] = 'تحرير تصاريح الألبوم';
 $lang['Album updated successfully'] = 'تم تحديث معلومات الألبومات بنجاح منقط النظير.';
-$lang['Authorize upload'] = 'السماح بالتحميل';
 $lang['elements per page'] = 'عدد في كل صفحة';
 $lang['elements'] = 'عناصر';
@@ -363,5 +356,4 @@
 $lang['Thumbnail creation'] = 'إنشاء المصغرات';
 $lang['Database synchronization with files'] = 'قاعدة بيانت المزامنة مع الملفات';
-$lang['Pictures waiting for validation'] = 'صور في انتظار التصريح من قبل حضرتكم';
 $lang['all'] = 'الكل';
 $lang['pictures without thumbnail (jpeg and png only)'] = 'صور بدون مصغرات(jpeg و png فقط)';
@@ -553,6 +545,4 @@
 $lang['Can\'t connect to server.'] = 'يمكن\'لا الاتصال بالخادم.';
 $lang['Purge compiled templates'] = 'معالجة جميع النماذج';
-$lang['Show upload link every time'] = 'اظهر رابط التحميل في كل وقت';
-$lang['User access level to upload'] = 'مستوى موصول المستخدمين للتحميل';
 $lang['ACCESS_0'] = 'حرية الوصول';
 $lang['ACCESS_1'] = 'الوصول للجميع';
@@ -728,5 +718,4 @@
 $lang['The following tag was deleted'] = 'هذه الكلمات الدلائلية حُـذفت';
 $lang['Miscellaneous'] = 'متفرقات';
-$lang['User Upload'] = 'مستخدم الرفع';
 $lang['Virtual Links'] = 'روابط ظاهرة';
 $lang['There is no other language available.'] = 'ليس هناك لغة أخرى متاحة.';
Index: /trunk/language/ar_SA/common.lang.php
===================================================================
--- /trunk/language/ar_SA/common.lang.php	(revision 8650)
+++ /trunk/language/ar_SA/common.lang.php	(revision 8651)
@@ -45,6 +45,4 @@
 $lang['%d new user'] = '%d مسخدم جديد';
 $lang['%d new users'] = '%d مستخدمين جدد';
-$lang['%d waiting element'] = '%d انتظار العنصر';
-$lang['%d waiting elements'] = '%d انتظار الصور';
 $lang['About'] = 'لماذا؟؟';
 $lang['All tags'] = 'كل الكلمات الدلائلية';
@@ -328,5 +326,4 @@
 $lang['Picture name: %s'] = 'اسم الصورة: %s';
 $lang['Creation date: %s'] = 'التاريخ الاصلي للصورة: %s';
-$lang['Waiting page: %s'] = 'صفحة تنتظر: %s';
 $lang['Picture uploaded by %s'] = 'حملت الصورة بواسطة  %s';
 $lang['Bad status for user "guest", using default status. Please notify the webmaster.'] = 'وضغ سيئ للضيف "ضيف", استخدم الحالة الافرتاضية. يرجى ابلاغ المسؤول عن الموقع.';
Index: unk/language/ar_SA/help/help_user_upload.html
===================================================================
--- /trunk/language/ar_SA/help/help_user_upload.html	(revision 8650)
+++ 	(revision )
@@ -1,16 +1,0 @@
-<p>يستطيع المستخدم  أن  يرفع صوره  الى المعرض أيضاً</p>
-
-<ol>
-
-  <li>تخصيص ألبومات لرفع الصور عليها
-  (<span class="pwgScreen">الإدارة  &raquo; الألبومات &raquo;  إدارة 
-  &raquo; تحرير  </span> أو <span class="pwgScreen"> إدارة  &raquo;
-  ألبومات  &raquo;  الخصائص  &raquo;  تحميل   </span>). الألبومات الظاهر لا يمكن الرفع عليها.</li>
-
-  <li>منح حق الوصول للكتابة على الدلائل المطابق.</li>
-
-</ol>
-
-<p>
-الصور التي تم رفعها من قبل المستخدمين يتم تصريحها من قبل مدير المعرض في(  <span class="pwgScreen">الإدارة &raquo; الصور  &raquo;
-تحت الانتظار) </span> حتى يمكن ان تظهر في المعرض للزوار و المستخدمين </p>
Index: /trunk/language/ca_ES/admin.lang.php
===================================================================
--- /trunk/language/ca_ES/admin.lang.php	(revision 8650)
+++ /trunk/language/ca_ES/admin.lang.php	(revision 8651)
@@ -47,6 +47,4 @@
 $lang['%d users'] = '%d usuaris';
 $lang['%d waiting for validation'] = '%d s\'està esperant per a que es validi';
-$lang['%d waiting pictures rejected'] = '%d s\'està esperant per rebutjar la imatge';
-$lang['%d waiting pictures validated'] = '%d s\'està esperant per rebutjar les imatges';
 $lang['Actions'] = 'Accions';
 $lang['Activate'] = 'Activa';
@@ -89,5 +87,4 @@
 $lang['Email admins when a valid comment is entered'] = 'Envia un correu electrònic als administradors quan s\'hagi introduït un comentari vàlid';
 $lang['Email admins when a comment requires validation'] = 'Envia un correu electrònic als administradors quan un comentari requereixi validació';
-$lang['Email admins when a picture is uploaded'] = 'Envia un correu electrònic als administradors quan es pugi una imatge';
 $lang['Empty caddie'] = 'Buida carret';
 $lang['Environment'] = 'Entorn';
@@ -148,5 +145,4 @@
 $lang['Rating by guests'] = 'Valoració pels invitats';
 $lang['Rating'] = 'Valoració';
-$lang['Reject All'] = 'Rebutjar tot';
 $lang['Reject'] = 'Rebutja';
 $lang['Representant'] = 'Representant';
@@ -174,5 +170,4 @@
 $lang['User comments validation'] = 'Validació dels comentaris d\'usuari';
 $lang['Users'] = 'Usuaris';
-$lang['Validate All'] = 'Valida\'ls tots';
 $lang['Validate'] = 'Valida';
 $lang['Validation'] = 'Validació';
@@ -198,5 +193,4 @@
 $lang['Public / Private'] = 'Public / Private';
 $lang['Manage authorizations for selected albums'] = 'Manage authorizations for selected categories';
-$lang['Select uploadable albums'] = 'Select uploadable categories';
 $lang['Virtual album added'] = 'Virtual category added';
 $lang['Virtual album deleted'] = 'Virtual category deleted';
@@ -217,5 +211,4 @@
 $lang['edit album permissions'] = 'edita els permisos de la categoria';
 $lang['Album updated successfully'] = 'La informació de la categoria s\'ha actualitat correctament.';
-$lang['Authorize upload'] = 'Autoritza càrrega';
 $lang['elements per page'] = 'elements per pàgina';
 $lang['elements'] = 'elements';
@@ -367,5 +360,4 @@
 $lang['Thumbnail creation'] = 'Creació de miniatures';
 $lang['Database synchronization with files'] = 'Sincronització de la base de dades amb fitxers';
-$lang['Pictures waiting for validation'] = 'Imatges pendents per validar';
 $lang['all'] = 'totes';
 $lang['pictures without thumbnail (jpeg and png only)'] = 'imatges sense miniatura (només jpeg i png)';
@@ -561,6 +553,4 @@
 $lang['Purge compiled templates'] = 'Elimina les plantilles compilades';
 $lang['Upload'] = 'Penja';
-$lang['Show upload link every time'] = 'Mostra l\'enllaç de penjar cada vegada';
-$lang['User access level to upload'] = 'Nivell d\'accés d\'usuari per penjar';
 $lang['ACCESS_0'] = 'Lliure accés';
 $lang['ACCESS_1'] = 'Accés a tothom';
Index: /trunk/language/ca_ES/common.lang.php
===================================================================
--- /trunk/language/ca_ES/common.lang.php	(revision 8650)
+++ /trunk/language/ca_ES/common.lang.php	(revision 8651)
@@ -45,6 +45,4 @@
 $lang['%d new user'] = '%d nou usuari';
 $lang['%d new users'] = '%d nous usuaris';
-$lang['%d waiting element'] = '%d s\'està esperant l\'element';
-$lang['%d waiting elements'] = '%d s\'estan esperant els elements';
 $lang['About'] = 'Quant a';
 $lang['All tags'] = 'Totes les etiquetes';
@@ -321,5 +319,4 @@
 $lang['Picture name: %s'] = 'Nom de la imatge: %s';
 $lang['Creation date: %s'] = 'Data de creació: %s';
-$lang['Waiting page: %s'] = 'Pàgina d\'espera: %s';
 $lang['Picture uploaded by %s'] = 'Imatge carregada per %s';
 // --------- Starting below: New or revised $lang ---- from version 1.7.1
Index: /trunk/language/cs_CZ/admin.lang.php
===================================================================
--- /trunk/language/cs_CZ/admin.lang.php	(revision 8650)
+++ /trunk/language/cs_CZ/admin.lang.php	(revision 8651)
@@ -50,6 +50,4 @@
 $lang['%d users'] = '%d uživatelů';
 $lang['%d waiting for validation'] = '%d čeká na schválení';
-$lang['%d waiting pictures rejected'] = '%d fotografií odmítnuto';
-$lang['%d waiting pictures validated'] = '%d fotografií schváleno';
 $lang['Actions'] = 'Akce';
 $lang['Activate'] = 'Aktivovat';
@@ -92,5 +90,4 @@
 $lang['Email admins when a valid comment is entered'] = 'Poslat e-mail administrátorovi při vložení nového komentáře';
 $lang['Email admins when a comment requires validation'] = 'Poslat e-mail administrátorovi při vložení nového komentáře vyžadujícího schválení.';
-$lang['Email admins when a picture is uploaded'] = 'Poslat e-mail administrátorovi při nahrání nové fotografie.';
 $lang['Empty caddie'] = 'Odstranit obsah košíku';
 $lang['Environment'] = 'Prostředí';
@@ -151,5 +148,4 @@
 $lang['Rating by guests'] = 'Hodnocení hosty';
 $lang['Rating'] = 'Hodnocení';
-$lang['Reject All'] = 'Zamítnout všechny';
 $lang['Reject'] = 'Zamítnout';
 $lang['Representant'] = 'Reprezentant';
@@ -177,5 +173,4 @@
 $lang['User comments validation'] = 'Schválení komentářů uživatelů';
 $lang['Users'] = 'Uživatelé';
-$lang['Validate All'] = 'Schválit všechny';
 $lang['Validate'] = 'Schválit';
 $lang['Validation'] = 'Schválení';
@@ -201,5 +196,4 @@
 $lang['Public / Private'] = 'Veřejná / Soukromá';
 $lang['Manage authorizations for selected albums'] = 'Nastavit oprávnění pro vybraná alba';
-$lang['Select uploadable albums'] = 'Vyber uploadovatelná alba';
 $lang['Virtual album added'] = 'Virtuální album přidáno';
 $lang['Virtual album deleted'] = 'Virtuální album odstraněno';
@@ -220,5 +214,4 @@
 $lang['edit album permissions'] = 'editace oprávnění album';
 $lang['Album updated successfully'] = 'Informace o album uloženy.';
-$lang['Authorize upload'] = 'Povolit nahrávání fotografií';
 $lang['elements per page'] = 'Položek na stránce';
 $lang['elements'] = 'Položky';
@@ -366,5 +359,4 @@
 $lang['Thumbnail creation'] = 'Vytvořit náhledy';
 $lang['Database synchronization with files'] = 'Synchronizace databáze se soubory';
-$lang['Pictures waiting for validation'] = 'Fotografie čekající na schválení';
 $lang['all'] = 'Vše';
 $lang['pictures without thumbnail (jpeg and png only)'] = 'Fotografie bez náhledu (pouze jpeg nebo png)';
@@ -556,6 +548,4 @@
 $lang['Purge compiled templates'] = 'Provést údržbu šablon';
 $lang['Upload'] = 'Nahrát fotografie';
-$lang['Show upload link every time'] = 'Vždy zobrazit odkaz pro nahrání fotografie';
-$lang['User access level to upload'] = 'Povolit uživatelům nahrávat fotografie na server';
 $lang['ACCESS_0'] = 'Volný přístup';
 $lang['ACCESS_1'] = 'Přístupné všem';
@@ -729,5 +719,4 @@
 $lang['The following tag was deleted'] = 'Následující klíčové slovo byl odstraněn';
 $lang['Miscellaneous'] = 'Různé';
-$lang['User Upload'] = 'Uživatelské nahrání fotografií';
 $lang['Virtual Links'] = 'Virtuální odkazy';
 $lang['There is no other language available.'] = 'Není dostupný žádný další jazyk.';
Index: /trunk/language/cs_CZ/common.lang.php
===================================================================
--- /trunk/language/cs_CZ/common.lang.php	(revision 8650)
+++ /trunk/language/cs_CZ/common.lang.php	(revision 8651)
@@ -49,6 +49,4 @@
 $lang['%d new user'] = '%d nový uživatel';
 $lang['%d new users'] = '%d nových uživatelů';
-$lang['%d waiting element'] = '%d čekající objekt';
-$lang['%d waiting elements'] = '%d čekajících objektů';
 $lang['About'] = 'O galerii';
 $lang['All tags'] = 'Všechna klíčová slova';
@@ -326,5 +324,4 @@
 $lang['Picture name: %s'] = '*Název fotografie: %s';
 $lang['Creation date: %s'] = 'Datum vytvoření: %s';
-$lang['Waiting page: %s'] = 'Čekání na stránku: %s';
 $lang['Picture uploaded by %s'] = 'Fotografie nahrána %s';
 
Index: unk/language/cs_CZ/help/help_user_upload.html
===================================================================
--- /trunk/language/cs_CZ/help/help_user_upload.html	(revision 8650)
+++ 	(revision )
@@ -1,18 +1,0 @@
-<p>Také uživatelé mohou nahrávat své fotografie.</p>
-
-<ol>
-
-  <li>Povolit nahrávání lze na jakékoliv fyzické kategorii
-  (<span class="pwgScreen">Administrace &raquo; Kategorie &raquo; Správa
-  &raquo; upravit</span>, nebo <span class="pwgScreen">Administrace &raquo;
-  Kategorie &raquo; Vlastnosti &raquo; Nahrát fotografie</span>). Virtual categories
-  can't receive any upload.</li>
-
-  <li>Give write access on corresponding directories.</li>
-
-</ol>
-
-<p>Photos uploaded by users are not directly visible on the website. An
-administrator must validate uploaded photos
-in <span class="pwgScreen">Administration &raquo; Photos &raquo;
-Waiting</span> to accept or reject the proposed photos.</p>
Index: /trunk/language/da_DK/admin.lang.php
===================================================================
--- /trunk/language/da_DK/admin.lang.php	(revision 8650)
+++ /trunk/language/da_DK/admin.lang.php	(revision 8651)
@@ -49,6 +49,4 @@
 $lang['%d users']     =     ' %d brugere';
 $lang['%d waiting for validation']     =     ' %d venter på validering';
-$lang['%d waiting pictures rejected']     =     ' %d ventende billeder afvist';
-$lang['%d waiting pictures validated']     =     ' %d ventende billeder valideret';
 $lang['Actions']     =     'Handlinger';
 $lang['Activate']     =     'Aktiver';
@@ -91,5 +89,4 @@
 $lang['Email admins when a valid comment is entered']     =     'Email admins når en gyldig kommentar er opført';
 $lang['Email admins when a comment requires validation']     =     'Email admins, når en kommentar kræver validering';
-$lang['Email admins when a picture is uploaded']     =     'Email admins, når et billede er uploadet';
 $lang['Empty caddie']     =     'Tøm caddie';
 $lang['Environment']     =     'Miljø';
@@ -150,5 +147,4 @@
 $lang['Rating by guests']     =     'Bedømmelse af gæster';
 $lang['Rating']     =     'Rating';
-$lang['Reject All']     =     'Afvis alle';
 $lang['Reject']     =     'Afvis';
 $lang['Representant']     =     'Representant';
@@ -176,5 +172,4 @@
 $lang['User comments validation']     =     'Bruger kommentarer validering';
 $lang['Users']     =     'Brugere';
-$lang['Validate All']     =     'Godkend alle';
 $lang['Validate']     =     'Godkend';
 $lang['Validation']     =     'Bekræftelse';
@@ -200,5 +195,4 @@
 $lang['Public / Private']     =     'Offentlige / Private';
 $lang['Manage authorizations for selected albums']     =     'Administrer tilladelser for udvalgte kategorier';
-$lang['Select uploadable albums']     =     'Vælg uploadable kategorier';
 $lang['Virtual album added']     =     'Virtuel Kategori tilføjet';
 $lang['Virtual album deleted']     =     'Virtuel Kategori slettet';
@@ -219,5 +213,4 @@
 $lang['edit album permissions']     =     'Edit Kategori tilladelser';
 $lang['Album updated successfully']     =     'Kategori informationer opdateret.';
-$lang['Authorize upload']     =     'Godkendelse af upload';
 $lang['elements per page']     =     'Elementer pr side';
 $lang['elements']     =     'Elementer';
@@ -368,5 +361,4 @@
 $lang['Thumbnail creation']     =     'Thumbnail oprettelse';
 $lang['Database synchronization with files']     =     'Database synkronisering med filer';
-$lang['Pictures waiting for validation']     =     'Billeder afventer validering';
 $lang['all']     =     'Alle';
 $lang['pictures without thumbnail (jpeg and png only)']     =     'Billeder uden thumbnail (jpeg og png only)';
@@ -557,6 +549,4 @@
 $lang['Can\'t connect to server.']     =     'Tilslutning til server umuligt.';
 $lang['Purge compiled templates']     =     'Purge udarbejdet skabeloner';
-$lang['Show upload link every time']     =     'Vis upload link hele tiden';
-$lang['User access level to upload']     =     'Bruger adgangsniveau for upload';
 $lang['ACCESS_0']     =     'Fri adgang';
 $lang['ACCESS_1']     =     'Adgang til alle';
@@ -733,5 +723,4 @@
 $lang['The following tag was deleted'] = 'Følgende tag er slettet';
 $lang['Miscellaneous'] = 'Miscellaneous';
-$lang['User Upload'] = 'Bruger Upload';
 $lang['Virtual Links'] = 'Virtual Links';
 $lang['There is no other language available.'] = 'Der er ikke andre sprog til rådighed.';
Index: /trunk/language/da_DK/common.lang.php
===================================================================
--- /trunk/language/da_DK/common.lang.php	(revision 8650)
+++ /trunk/language/da_DK/common.lang.php	(revision 8651)
@@ -45,6 +45,4 @@
 $lang['%d new user'] = '%d ny bruger';
 $lang['%d new users'] = '%d nye brugere';
-$lang['%d waiting element'] = '%d ventende element';
-$lang['%d waiting elements'] = '%d ventende elements';
 $lang['About'] = 'Om';
 $lang['All tags'] = 'Alle tags';
@@ -322,5 +320,4 @@
 $lang['Picture name: %s'] = 'Foto navn: %s';
 $lang['Creation date: %s'] = 'Oprettelses dag: %s';
-$lang['Waiting page: %s'] = 'ventende side: %s';
 $lang['Picture uploaded by %s'] = 'Foto uploaded af %s';
 // --------- Starting below: New or revised $lang ---- from version 1.7.1
Index: /trunk/language/de_DE/admin.lang.php
===================================================================
--- /trunk/language/de_DE/admin.lang.php	(revision 8650)
+++ /trunk/language/de_DE/admin.lang.php	(revision 8651)
@@ -47,6 +47,4 @@
 $lang['%d users'] = '%d Benutzer';
 $lang['%d waiting for validation'] = '%d Warten auf Freischaltung';
-$lang['%d waiting pictures rejected'] = '%d freizuschaltende Elemente abgewiesen';
-$lang['%d waiting pictures validated'] = '%d freizuschaltende Elemente akzeptiert';
 $lang['Actions'] = 'Aktionen';
 $lang['Activate'] = 'Aktivieren';
@@ -89,5 +87,4 @@
 $lang['Email admins when a valid comment is entered'] = 'sende eine E-Mail an den(die) Adminstrator(en) wenn ein Kommentar hinterlassen wurde';
 $lang['Email admins when a comment requires validation'] = 'sende eine E-Mail an den(die) Adminstrator(en) wenn ein Kommentar die Freischaltung durch den Admin erfordert';
-$lang['Email admins when a picture is uploaded'] = 'sende eine E-Mail an den(die) Adminstrator(en) wenn ein Bild hochgeladen wurde';
 $lang['Empty caddie'] = 'leere Sammelkorb';
 $lang['Environment'] = 'Server-Daten';
@@ -148,5 +145,4 @@
 $lang['Rating by guests'] = 'Erlaube Bewertung(en) durch Gäste';
 $lang['Rating'] = 'Bewertungen';
-$lang['Reject All'] = 'alle abweisen';
 $lang['Reject'] = 'abweisen';
 $lang['Representant'] = 'Vorschaubild';
@@ -174,5 +170,4 @@
 $lang['User comments validation'] = 'Kommentare warten auf Freigabe';
 $lang['Users'] = 'Benutzer';
-$lang['Validate All'] = 'Gebe alle frei';
 $lang['Validate'] = 'Freigeben';
 $lang['Validation'] = 'Freigabe der Kommentare durch den Admin';
@@ -198,5 +193,4 @@
 $lang['Public / Private'] = 'Öffentlich / Privat';
 $lang['Manage authorizations for selected albums'] = 'Berechtigungen für ausgewählte Alben verwalten';
-$lang['Select uploadable albums'] = 'Alben auswählen, welche für den Upload freigegeben werden sollen';
 $lang['Virtual album added'] = 'Virtueller Album hinzugefügt';
 $lang['Virtual album deleted'] = 'Virtueller Album entfernt';
@@ -217,5 +211,4 @@
 $lang['edit album permissions'] = 'Albumberechtigungen bearbeiten';
 $lang['Album updated successfully'] = 'Informationen des Albums wurden erfolgreich aktualisiert.';
-$lang['Authorize upload'] = 'Erlaube upload';
 $lang['elements per page'] = 'Elemente pro Seite';
 $lang['elements'] = 'Elemente';
@@ -361,5 +354,4 @@
 $lang['Thumbnail creation'] = 'Erstellung von Miniaturansichten';
 $lang['Database synchronization with files'] = 'Synchronisierung der Datenbank';
-$lang['Pictures waiting for validation'] = 'Bilder warten auf Freigabe';
 $lang['all'] = 'alle';
 $lang['pictures without thumbnail (jpeg and png only)'] = 'Bilder ohne Thumbnail (JPEG-und PNG-only)';
@@ -552,6 +544,4 @@
 $lang['Can\'t connect to server.'] = 'Es konnte keine Verbindung zum Server hergestellt werden.';
 $lang['Purge compiled templates'] = 'Löschen der kompilierten Templates';
-$lang['Show upload link every time'] = 'Den Uploadlink immer anzeigen';
-$lang['User access level to upload'] = 'dürfen Bilder hochladen';
 $lang['ACCESS_0'] = 'Frei';
 $lang['ACCESS_1'] = 'Alle';
@@ -708,5 +698,4 @@
 $lang['Impossible to deactivate this theme, you need at least one theme.'] = 'Es ist nicht möglich dieses Thema zu deaktivieren, du benötigst mindestens ein Thema.';
 $lang['Miscellaneous'] = 'Verschiedenes';
-$lang['User Upload'] = 'Hinzufügen von Benutzers';
 $lang['Virtual Links'] = 'Virtuellen Verbindungen';
 $lang['Download'] = 'Herunterladen';
Index: /trunk/language/de_DE/common.lang.php
===================================================================
--- /trunk/language/de_DE/common.lang.php	(revision 8650)
+++ /trunk/language/de_DE/common.lang.php	(revision 8651)
@@ -45,6 +45,4 @@
 $lang['%d new user'] = '%d neuer Benutzer';
 $lang['%d new users'] = '%d neue Benutzer';
-$lang['%d waiting element'] = '%d Element in der Warteschlange';
-$lang['%d waiting elements'] = '%d Elemente in der Warteschlange';
 $lang['About'] = 'über uns';
 $lang['All tags'] = 'Alle Tags';
@@ -323,5 +321,4 @@
 $lang['Picture name: %s'] = 'Name des Bildes: %s';
 $lang['Creation date: %s'] = 'Erstellungsdatum: %d';
-$lang['Waiting page: %s'] = 'Seite warten: %s';
 $lang['Picture uploaded by %s'] = 'Bild hochgeladen von %s';
 // --------- Starting below: New or revised $lang ---- from version 1.7.1
Index: unk/language/de_DE/help/help_user_upload.html
===================================================================
--- /trunk/language/de_DE/help/help_user_upload.html	(revision 8650)
+++ 	(revision )
@@ -1,13 +1,0 @@
-<p>Benutzer können ihre eigenen Fotos hochladen.</p>
-
-<ol>
-
-    <li>Erlaube den Upload für eine physische Kategorie (ein existierender Ordner) (<span
-  class="pwgScreen">Verwaltung &raquo; Kategorien &raquo; Verwalten &raquo; bearbeite die Informationen in dieser Kategorie</span> or <span
-  class="pwgScreen">Verwaltung &raquo; Kategorien &raquo; Eigenschaften &raquo; Upload</span>). In virtuelle Kategorien kann nichts hochgeladen werden.</li>
-
-
-   <li>Gebe allen Benutzern die Berechtigung zum Upload auf freigegebene Kategorien.</li>
-</ol>
-<p>Die hinzugefügten Dateien sind durch die Benutzer nicht direkt
-sichtbar. Ein Administrator muss die hochgeladenen Fotos in <span class="pwgScreen">Verwaltung &raquo; Bilder &raquo; Wartend auf Freigabe </span>freigeben.</p>
Index: /trunk/language/en_UK/admin.lang.php
===================================================================
--- /trunk/language/en_UK/admin.lang.php	(revision 8650)
+++ /trunk/language/en_UK/admin.lang.php	(revision 8651)
@@ -49,6 +49,4 @@
 $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['Actions'] = "Actions";
 $lang['Activate'] = "Activate";
@@ -91,5 +89,4 @@
 $lang['Email admins when a valid comment is entered'] = "Email admins when a valid comment is entered";
 $lang['Email admins when a comment requires validation'] = "Email admins when a comment requires validation";
-$lang['Email admins when a picture is uploaded'] = "Email admins when a picture is uploaded";
 $lang['Empty caddie'] = "Empty caddie";
 $lang['Environment'] = "Environment";
@@ -150,5 +147,4 @@
 $lang['Rating by guests'] = "Rating by guests";
 $lang['Rating'] = "Rating";
-$lang['Reject All'] = "Reject All";
 $lang['Reject'] = "Reject";
 $lang['Representant'] = "Representant";
@@ -176,5 +172,4 @@
 $lang['User comments validation'] = "User comments validation";
 $lang['Users'] = "Users";
-$lang['Validate All'] = "Validate All";
 $lang['Validate'] = "Validate";
 $lang['Validation'] = "Validation";
@@ -200,5 +195,4 @@
 $lang['Public / Private'] = "Public / Private";
 $lang['Manage authorizations for selected albums'] = "Manage authorizations for selected albums";
-$lang['Select uploadable albums'] = "Select uploadable albums";
 $lang['Virtual album added'] = "Virtual album added";
 $lang['Virtual album deleted'] = "Virtual album deleted";
@@ -219,5 +213,4 @@
 $lang['edit album permissions'] = "edit album permissions";
 $lang['Album updated successfully'] = "Album updated successfully";
-$lang['Authorize upload'] = "Authorize upload";
 $lang['elements per page'] = "elements per page";
 $lang['elements'] = "elements";
@@ -367,5 +360,4 @@
 $lang['Thumbnail creation'] = "Thumbnail creation";
 $lang['Database synchronization with files'] = "Database synchronization with files";
-$lang['Pictures waiting for validation'] = "Pictures awaiting validation";
 $lang['all'] = "all";
 $lang['pictures without thumbnail (jpeg and png only)'] = "pictures without thumbnail (jpeg and png only)";
@@ -556,6 +548,4 @@
 $lang['Can\'t connect to server.'] = "Connection to server impossible.";
 $lang['Purge compiled templates'] = "Purge compiled templates";
-$lang['Show upload link every time'] = "Show upload link all the time";
-$lang['User access level to upload'] = "User access level for uploading";
 $lang['ACCESS_0'] = "Free access";
 $lang['ACCESS_1'] = "Access to all";
@@ -736,5 +726,4 @@
 $lang['The following tag was deleted'] = 'The following tag was deleted';
 $lang['Miscellaneous'] = 'Miscellaneous';
-$lang['User Upload'] = 'User Upload';
 $lang['Virtual Links'] = 'Virtual Links';
 $lang['There is no other language available.'] = 'There is no other language available.';
Index: /trunk/language/en_UK/common.lang.php
===================================================================
--- /trunk/language/en_UK/common.lang.php	(revision 8650)
+++ /trunk/language/en_UK/common.lang.php	(revision 8651)
@@ -45,6 +45,4 @@
 $lang['%d new user'] = "%d new user";
 $lang['%d new users'] = "%d new users";
-$lang['%d waiting element'] = "%d waiting element";
-$lang['%d waiting elements'] = "%d waiting elements";
 $lang['About'] = "About";
 $lang['All tags'] = "All tags";
@@ -320,5 +318,4 @@
 $lang['Picture name: %s'] = "Picture name: %s";
 $lang['Creation date: %s'] = "Creation date: %s";
-$lang['Waiting page: %s'] = "Awaiting page: %s";
 $lang['Picture uploaded by %s'] = "Picture uploaded by %s";
 $lang['Bad status for user "guest", using default status. Please notify the webmaster.'] = "Bad status for user \"guest\", default status will be used. Please notify the webmaster.";
Index: unk/language/en_UK/help/help_user_upload.html
===================================================================
--- /trunk/language/en_UK/help/help_user_upload.html	(revision 8650)
+++ 	(revision )
@@ -1,18 +1,0 @@
-<p>Users can upload their photos too.</p>
-
-<ol>
-
-  <li>Authorize upload on any physical category
-  (<span class="pwgScreen">Administration &raquo; Categories &raquo; Manage
-  &raquo; edit</span> or <span class="pwgScreen">Administration &raquo;
-  Categories &raquo; Properties &raquo; Upload</span>). Virtual categories
-  can't receive any upload.</li>
-
-  <li>Give write access on corresponding directories.</li>
-
-</ol>
-
-<p>Photos uploaded by users are not directly visible on the website. An
-administrator must validate uploaded photos
-in <span class="pwgScreen">Administration &raquo; Photos &raquo;
-Waiting</span> to accept or reject the proposed photos.</p>
Index: /trunk/language/es_AR/common.lang.php
===================================================================
--- /trunk/language/es_AR/common.lang.php	(revision 8650)
+++ /trunk/language/es_AR/common.lang.php	(revision 8651)
@@ -45,6 +45,4 @@
 $lang['%d new user'] = '%d nuevo usuario';
 $lang['%d new users'] = '%d nuevos usuarios';
-$lang['%d waiting element'] = '%d elemento en espera';
-$lang['%d waiting elements'] = '%d elementos en espera';
 $lang['About'] = 'Acerca de';
 $lang['All tags'] = 'Todos los tags';
@@ -321,5 +319,4 @@
 $lang['Picture name: %s'] = 'Nombre de la imagen: %s';
 $lang['Creation date: %s'] = 'Fecha de creación: %d';
-$lang['Waiting page: %s'] = 'Página en espera: %s';
 $lang['Picture uploaded by %s'] = 'Imagen subida por %s';
 // --------- Starting below: New or revised $lang ---- from version 1.7.1
Index: /trunk/language/es_ES/admin.lang.php
===================================================================
--- /trunk/language/es_ES/admin.lang.php	(revision 8650)
+++ /trunk/language/es_ES/admin.lang.php	(revision 8651)
@@ -47,6 +47,4 @@
 $lang['%d users'] = '%d usuarios';
 $lang['%d waiting for validation'] = '%d en espera de validación';
-$lang['%d waiting pictures rejected'] = '%d imágenes rechazadas en espera';
-$lang['%d waiting pictures validated'] = '%d imágenes validadas en espera';
 $lang['Actions'] = 'Acciones';
 $lang['Activate'] = 'activar';
@@ -89,5 +87,4 @@
 $lang['Email admins when a valid comment is entered'] = 'Notificar a los administradores cuando un comentario es registrado';
 $lang['Email admins when a comment requires validation'] = 'Notificar a los administradores cuando un comentario requiere su validación';
-$lang['Email admins when a picture is uploaded'] = 'Notificar a los administradores cuando una imagen es cargada';
 $lang['Empty caddie'] = 'Vaciar la cesta';
 $lang['Environment'] = 'Entorno';
@@ -148,5 +145,4 @@
 $lang['Rating by guests'] = 'Notación por los visitantes';
 $lang['Rating'] = 'Notación';
-$lang['Reject All'] = 'Rechazar todo';
 $lang['Reject'] = 'Rechazar';
 $lang['Representant'] = 'Representante';
@@ -174,5 +170,4 @@
 $lang['User comments validation'] = 'Validación de los comentarios de usuarios';
 $lang['Users'] = 'Usuarios';
-$lang['Validate All'] = 'Validar todo';
 $lang['Validate'] = 'Validar';
 $lang['Validation'] = 'Validación';
@@ -198,5 +193,4 @@
 $lang['Public / Private'] = 'Pública / Privada';
 $lang['Manage authorizations for selected albums'] = 'Administrar los acesos para los àlbumes selectionados';
-$lang['Select uploadable albums'] = 'seleccionar los àlbumes autorizados a sumar';
 $lang['Virtual album added'] = 'Album virtual añadido';
 $lang['Virtual album deleted'] = 'Album virtual borrado';
@@ -217,5 +211,4 @@
 $lang['edit album permissions'] = 'Modificar los permisos del àlbum';
 $lang['Album updated successfully'] = 'Les informationes del àlbum se actualizaron con exito.';
-$lang['Authorize upload'] = 'Autorizar el añadido de imágenes';
 $lang['elements per page'] = 'Elementos por página';
 $lang['elements'] = 'Elementos';
@@ -362,5 +355,4 @@
 $lang['Thumbnail creation'] = 'Creación de las miniaturas';
 $lang['Database synchronization with files'] = 'Sincronización de la base de datos a partir de los ficheros';
-$lang['Pictures waiting for validation'] = 'Imágenes en espera de validación';
 $lang['all'] = 'todo';
 $lang['pictures without thumbnail (jpeg and png only)'] = 'imagen sin miniatura (jpeg y png únicamente)';
@@ -552,6 +544,4 @@
 $lang['Can\'t connect to server.'] = 'Imposible conectarse al servidor.';
 $lang['Purge compiled templates'] = 'purgar los templates compilados';
-$lang['Show upload link every time'] = 'Mostrar el enlace de añadido de imagen todo el tiempo';
-$lang['User access level to upload'] = 'Nivel de acceso usuario para cargar';
 $lang['ACCESS_0'] = 'Acceso libre';
 $lang['ACCESS_1'] = 'Acceso todos';
@@ -723,5 +713,4 @@
 $lang['Set as default language for unregistered and new users'] = 'Idioma por defecto para los invitados y los nuevos usuarios';
 $lang['Miscellaneous'] = 'Mas informaciones';
-$lang['User Upload'] = 'Añadir por los usuarios';
 $lang['Virtual Links'] = 'Enlaces virtuales';
 $lang['Download'] = 'Descargar';
Index: /trunk/language/es_ES/common.lang.php
===================================================================
--- /trunk/language/es_ES/common.lang.php	(revision 8650)
+++ /trunk/language/es_ES/common.lang.php	(revision 8651)
@@ -45,6 +45,4 @@
 $lang['%d new user'] = '%d nuevo usuario';
 $lang['%d new users'] = '%d nuevos usuarios';
-$lang['%d waiting element'] = '%d elemento en espera';
-$lang['%d waiting elements'] = '%d elementos en espera';
 $lang['About'] = 'Acerca de';
 $lang['All tags'] = 'Todas las etiquetas';
@@ -321,5 +319,4 @@
 $lang['Picture name: %s'] = 'Nombre de la imagen: %s';
 $lang['Creation date: %s'] = 'Fecha de creación: %d';
-$lang['Waiting page: %s'] = 'Página de espera: %s';
 $lang['Picture uploaded by %s'] = 'Imagen cargada por %s';
 // --------- Starting below: New or revised $lang ---- from version 1.7.1
Index: unk/language/es_ES/help/help_user_upload.html
===================================================================
--- /trunk/language/es_ES/help/help_user_upload.html	(revision 8650)
+++ 	(revision )
@@ -1,16 +1,0 @@
-<p>Sus usuarios también pueden añadir sus fotos.</p>
-
-<ol>
-
-  <li>Autorice el añadido de imágenes sobre una o varias categorías (<span
-class="pwgScreen">Administation &raquo; Categorías &raquo; Gestión &raquo; Edicto</span> o <span
-class="pwgScreen">Administración &raquo; Categorías &raquo; Propiedades &raquo; Añadido de imágenes</span>). Las categorías virtuales no permiten el añadido de imágenes.</li>
-
-  <li>Dar los derechos en escritura (para todos los usuarios) a los repertorios que corresponden a las categorías que son autorizadas al añadido.</li>
-</ol>
-
-<p>Las fotos añadidas por los usuarios no son directamente visibles sobre el sitio,
- Deben ser validadas por un administrador.
- Para eso, un administrador debe ir en <span class="pwgScreen">Administración &raquo; Fotos &raquo; En espera  &raquo; Imágenes</span> con el fin de aceptar o de rechazar las fotos propuestas.</p>
-
-
Index: /trunk/language/fa_IR/admin.lang.php
===================================================================
--- /trunk/language/fa_IR/admin.lang.php	(revision 8650)
+++ /trunk/language/fa_IR/admin.lang.php	(revision 8651)
@@ -49,6 +49,4 @@
 $lang['%d users'] = "%d کاربر";
 $lang['%d waiting for validation'] = "%d در انتظار تاييد هستند";
-$lang['%d waiting pictures rejected'] = "%d تصوير رد شدند";
-$lang['%d waiting pictures validated'] = "%d تصوير تاييد شدند";
 $lang['Actions'] = "اعمال";
 $lang['Activate'] = "فعال‌کردن";
@@ -91,5 +89,4 @@
 $lang['Email admins when a valid comment is entered'] = "ارسال ايميل به مديران زماني که يک نظر تاييد شده وارد سيستم مي‌شود.";
 $lang['Email admins when a comment requires validation'] = "ارسال ايميل به مديران زماني که يک نظر نياز به تاييد دارد";
-$lang['Email admins when a picture is uploaded'] = "ارسال ايميل به مديران زماني که يک تصوير آپلود مي‌شود.";
 $lang['Empty caddie'] = "تمام محتویات سبد حذف شود.";
 $lang['Environment'] = "محيط(Environment)";
@@ -150,5 +147,4 @@
 $lang['Rating by guests'] = "دادن امتیاز توسط میهمان";
 $lang['Rating'] = "امتیازدهی";
-$lang['Reject All'] = "رد کردن همه";
 $lang['Reject'] = "رد کردن";
 $lang['Representant'] = "نماینده";
@@ -176,5 +172,4 @@
 $lang['User comments validation'] = "تایید نظرات کاربر";
 $lang['Users'] = "کاربران";
-$lang['Validate All'] = "تایید همه";
 $lang['Validate'] = "تایید";
 $lang['Validation'] = "تایید";
@@ -200,5 +195,4 @@
 $lang['Public / Private'] = "عمومی / خصوصی";
 $lang['Manage authorizations for selected albums'] = "مدیریت مجوزهای دسته‌های انتخاب شده";
-$lang['Select uploadable albums'] = "انتخاب دسته‌های قابل آپلود";
 $lang['Virtual album added'] = "دسته مجازی افزوده شد";
 $lang['Virtual album deleted'] = "دسته مجازی حذف شد";
@@ -219,5 +213,4 @@
 $lang['edit album permissions'] = "ویرایش مجوزهای دسته";
 $lang['Album updated successfully'] = "اطلاعات دسته با موفقیت به‌روزرسانی شد.";
-$lang['Authorize upload'] = "اجازه آپلود";
 $lang['elements per page'] = "تعداد آیتم‌ها در صفحه";
 $lang['elements'] = "اشیا";
@@ -368,5 +361,4 @@
 $lang['Thumbnail creation'] = "ایجاد عکس‌ریزه(Thumbnail)";
 $lang['Database synchronization with files'] = "همگام‌سازی پایگاه‌داده با فایل‌ها";
-$lang['Pictures waiting for validation'] = "تصاویر در انتظار تایید";
 $lang['all'] = "همه";
 $lang['pictures without thumbnail (jpeg and png only)'] = "تصاویر بدون عکس‌ریزه(thumbnail) (فقط jpeg و png)";
@@ -557,6 +549,4 @@
 $lang['Can\'t connect to server.'] = "ارتباط با سرور ممکن نیست.";
 $lang['Purge compiled templates'] = "پاک‌ازی قالب واردشده(کامپایل شده)";
-$lang['Show upload link every time'] = "Show upload link all the time";
-$lang['User access level to upload'] = "کاربران اجازه آپلود را داشته باشند.";
 $lang['ACCESS_0'] = "دسترسی آزاد";
 $lang['ACCESS_1'] = "دسترسی برای همه";
@@ -732,5 +722,4 @@
 $lang['The following tag was deleted'] = 'برچسب حذف شد.';
 $lang['Miscellaneous'] = 'متفرقه';
-$lang['User Upload'] = 'آپلود کاربر';
 $lang['Virtual Links'] = 'ارتباط مجازی';
 $lang['There is no other language available.'] = 'در حال حاضر هیچ زبان دیگری موجود نیست.';
Index: /trunk/language/fa_IR/common.lang.php
===================================================================
--- /trunk/language/fa_IR/common.lang.php	(revision 8650)
+++ /trunk/language/fa_IR/common.lang.php	(revision 8651)
@@ -45,6 +45,4 @@
 $lang['%d new user'] = "%d کاربر جدید";
 $lang['%d new users'] = "%d کاربر جدید";
-$lang['%d waiting element'] = "%d در حال انتظار";
-$lang['%d waiting elements'] = "%d در حال انتظار";
 $lang['About'] = "درباره";
 $lang['All tags'] = "همه‌ی برچسب‌ها";
@@ -320,5 +318,4 @@
 $lang['Picture name: %s'] = "نام تصویر: %s";
 $lang['Creation date: %s'] = "تاریخ گرفتن تصویر: %s";
-$lang['Waiting page: %s'] = "صفحات در حال انتظار: %s";
 $lang['Picture uploaded by %s'] = "تصویر توسط %s آپلود شده";
 $lang['Bad status for user "guest", using default status. Please notify the webmaster.'] = "وضعیت بد برای کاربر \"میهمان\" ، وضعیت پیش‌فرض . لطفا این موضوع را با وبمستر(مدیر‌سایت) در میان بگذارید.";
Index: /trunk/language/fr_CA/admin.lang.php
===================================================================
--- /trunk/language/fr_CA/admin.lang.php	(revision 8650)
+++ /trunk/language/fr_CA/admin.lang.php	(revision 8651)
@@ -49,6 +49,4 @@
 $lang['%d users'] = "%d utilisateurs";
 $lang['%d waiting for validation'] = "%d en attente de validation";
-$lang['%d waiting pictures rejected'] = "%d images en attente rejetées";
-$lang['%d waiting pictures validated'] = "%d images en attente validées";
 $lang['Actions'] = "Actions";
 $lang['Activate'] = "Activer";
@@ -91,5 +89,4 @@
 $lang['Email admins when a valid comment is entered'] = "Notifier les administrateurs quand un commentaire est enregistré";
 $lang['Email admins when a comment requires validation'] = "Notifier les administrateurs quand un commentaire requiert leur validation";
-$lang['Email admins when a picture is uploaded'] = "Notifier les administrateurs quand une image est téléchargée";
 $lang['Empty caddie'] = "Vider le panier";
 $lang['Environment'] = "Environnement";
@@ -150,5 +147,4 @@
 $lang['Rating by guests'] = "Notation par les invités";
 $lang['Rating'] = "Notation";
-$lang['Reject All'] = "Tout rejeter";
 $lang['Reject'] = "Rejeter";
 $lang['Representant'] = "Représentant";
@@ -176,5 +172,4 @@
 $lang['User comments validation'] = "Validation des commentaires d'utilisateurs";
 $lang['Users'] = "Utilisateurs";
-$lang['Validate All'] = "Tout valider";
 $lang['Validate'] = "Valider";
 $lang['Validation'] = "Validation";
@@ -200,5 +195,4 @@
 $lang['Public / Private'] = "Publique / Privée";
 $lang['Manage authorizations for selected albums'] = "Gérer le type d'accès pour les catégories sélectionnées";
-$lang['Select uploadable albums'] = "Sélectionner les catégories autorisées à l'ajout";
 $lang['Virtual album added'] = "Catégorie virtuelle ajoutée";
 $lang['Virtual album deleted'] = "Catégorie virtuelle supprimée";
@@ -219,5 +213,4 @@
 $lang['edit album permissions'] = "Modifier les permissions de la catégorie";
 $lang['Album updated successfully'] = "Les informations de la catégorie ont été mises à jour avec succès.";
-$lang['Authorize upload'] = "Autoriser l'ajout d'images";
 $lang['elements per page'] = "Nombre d'éléments par page à afficher";
 $lang['elements'] = "éléments";
@@ -371,5 +364,4 @@
 $lang['Thumbnail creation'] = "Création des miniatures";
 $lang['Database synchronization with files'] = "Synchronisation de la base à partir des fichiers de";
-$lang['Pictures waiting for validation'] = "Images en attente de validation";
 $lang['all'] = "Tout";
 $lang['pictures without thumbnail (jpeg and png only)'] = "images sans miniature (jpeg et png uniquement)";
@@ -565,6 +557,4 @@
 $lang['Purge compiled templates'] = "Purger les templates compilés";
 $lang['Upload'] = "Ajout";
-$lang['Show upload link every time'] = "Afficher tout le temps le lien d'ajout d'image";
-$lang['User access level to upload'] = "Niveau d'accès utilisateur pour l'ajout";
 $lang['ACCESS_0'] = "Accès libre";
 $lang['ACCESS_1'] = "Accès à tous";
@@ -741,5 +731,4 @@
 $lang['Miscellaneous'] = 'Divers';
 $lang['The following tag was deleted'] = 'Le mot clé suivant a été supprimé';
-$lang['User Upload'] = 'Ajout utilisateur';
 $lang['Virtual Links'] = 'Liens virtuels';
 $lang['There is no other language available.'] = 'Il n\'y a pas d\'autre langue disponible.';
Index: /trunk/language/fr_CA/common.lang.php
===================================================================
--- /trunk/language/fr_CA/common.lang.php	(revision 8650)
+++ /trunk/language/fr_CA/common.lang.php	(revision 8651)
@@ -45,6 +45,4 @@
 $lang['%d new user'] = '%d nouvel utilisateur';
 $lang['%d new users'] = '%d nouveaux utilisateurs';
-$lang['%d waiting element'] = '%d élément en attente';
-$lang['%d waiting elements'] = '%d éléments en attente';
 $lang['About'] = 'À propos';
 $lang['All tags'] = 'Tous les mots clés';
@@ -323,5 +321,4 @@
 $lang['Picture name: %s'] = 'Nom de l\'image : %s';
 $lang['Creation date: %s'] = 'Date de création : %d';
-$lang['Waiting page: %s'] = 'Page en attente : %s';
 $lang['Picture uploaded by %s'] = 'Image téléchargée par %s';
 // --------- Starting below: New or revised $lang ---- from version 1.7.1
Index: unk/language/fr_CA/help/help_user_upload.html
===================================================================
--- /trunk/language/fr_CA/help/help_user_upload.html	(revision 8650)
+++ 	(revision )
@@ -1,14 +1,0 @@
-<p>Vos utilisateurs peuvent également ajouter leurs photos.</p>
-
-<ol>
-
-  <li>Autorisez l'ajout d'images sur n'importe quelle catégorie physique (<span
-class="pwgScreen">Administration &raquo; Catégories &raquo; Gérer &raquo; éditer</span> ou <span
-class="pwgScreen">Administration &raquo; Catégories &raquo; Propriétés &raquo; Ajout d'images</span>). Les catégories virtuelles ne peuvent être utilisées pour ajouter des images.</li>
-
-  <li>Donnez les droits en écriture (pour tous les utilisateurs) sur les
-répertoires correspondant aux catégories autorisées à l'ajout.</li>
-</ol>
-
-<p>Les photos ajoutées par les utilisateurs ne sont pas directement
-visibles sur le site, elles doivent être préalablement validées par un administrateur. À cet effet, un administrateur doit se rendre dans <span class="pwgScreen">Administration &raquo; Photos &raquo; En attente</span> afin d'accepter ou de rejeter les photos proposées.</p>
Index: /trunk/language/fr_FR/admin.lang.php
===================================================================
--- /trunk/language/fr_FR/admin.lang.php	(revision 8650)
+++ /trunk/language/fr_FR/admin.lang.php	(revision 8651)
@@ -49,6 +49,4 @@
 $lang['%d users'] = "%d utilisateurs";
 $lang['%d waiting for validation'] = "%d en attente de validation";
-$lang['%d waiting pictures rejected'] = "%d images en attente rejetées";
-$lang['%d waiting pictures validated'] = "%d images en attente validées";
 $lang['Actions'] = "Actions";
 $lang['Activate'] = "Activer";
@@ -91,5 +89,4 @@
 $lang['Email admins when a valid comment is entered'] = "Notifier les administrateurs quand un commentaire est enregistré";
 $lang['Email admins when a comment requires validation'] = "Notifier les administrateurs quand un commentaire requiert leur validation";
-$lang['Email admins when a picture is uploaded'] = "Notifier les administrateurs quand une image est téléchargée";
 $lang['Empty caddie'] = "Vider le panier";
 $lang['Environment'] = "Environnement";
@@ -150,5 +147,4 @@
 $lang['Rating by guests'] = "Notation par les invités";
 $lang['Rating'] = "Notation";
-$lang['Reject All'] = "Tout rejeter";
 $lang['Reject'] = "Rejeter";
 $lang['Representant'] = "Représentant";
@@ -176,5 +172,4 @@
 $lang['User comments validation'] = "Validation des commentaires d'utilisateurs";
 $lang['Users'] = "Utilisateurs";
-$lang['Validate All'] = "Tout valider";
 $lang['Validate'] = "Valider";
 $lang['Validation'] = "Validation";
@@ -200,5 +195,4 @@
 $lang['Public / Private'] = "Publique / Privée";
 $lang['Manage authorizations for selected albums'] = 'Gérer le type d\'accès pour les albums sélectionnés';
-$lang['Select uploadable albums'] = 'Sélectionner les albums autorisés à l\'ajout';
 $lang['Virtual album added'] = 'Album virtuel ajouté';
 $lang['Virtual album deleted'] = 'Album virtuel supprimé';
@@ -219,5 +213,4 @@
 $lang['edit album permissions'] = 'Modifier les permissions de l\'album';
 $lang['Album updated successfully'] = 'Les informations de l\'album ont été mises à jour avec succès.';
-$lang['Authorize upload'] = "Autoriser l'ajout d'images";
 $lang['elements per page'] = "Nombre d'éléments par page à afficher";
 $lang['elements'] = "éléments";
@@ -367,5 +360,4 @@
 $lang['Thumbnail creation'] = "Création des miniatures";
 $lang['Database synchronization with files'] = "Synchronisation de la base à partir des fichiers de";
-$lang['Pictures waiting for validation'] = "Images en attente de validation";
 $lang['all'] = "Tout";
 $lang['pictures without thumbnail (jpeg and png only)'] = "images sans miniature (jpeg et png uniquement)";
@@ -556,6 +548,4 @@
 $lang['Can\'t connect to server.'] = "Impossible de se connecter au serveur.";
 $lang['Purge compiled templates'] = "Purger les templates compilés";
-$lang['Show upload link every time'] = "Afficher tout le temps le lien d'ajout d'image";
-$lang['User access level to upload'] = "Niveau d'accès utilisateur pour l'ajout";
 $lang['ACCESS_0'] = "Accès libre";
 $lang['ACCESS_1'] = "Accès à tous";
@@ -739,5 +729,4 @@
 $lang['Miscellaneous'] = 'Divers';
 $lang['The following tag was deleted'] = 'Le tag suivant a été supprimé';
-$lang['User Upload'] = 'Ajout utilisateur';
 $lang['Virtual Links'] = 'Liens virtuels';
 $lang['There is no other language available.'] = 'Il n\'y a pas d\'autre langue disponible.';
Index: /trunk/language/fr_FR/common.lang.php
===================================================================
--- /trunk/language/fr_FR/common.lang.php	(revision 8650)
+++ /trunk/language/fr_FR/common.lang.php	(revision 8651)
@@ -45,6 +45,4 @@
 $lang['%d new user'] = '%d nouvel utilisateur';
 $lang['%d new users'] = '%d nouveaux utilisateurs';
-$lang['%d waiting element'] = '%d élément en attente';
-$lang['%d waiting elements'] = '%d éléments en attente';
 $lang['About'] = 'À propos';
 $lang['All tags'] = 'Tous les tags';
@@ -320,5 +318,4 @@
 $lang['Picture name: %s'] = 'Nom de l\'image : %s';
 $lang['Creation date: %s'] = 'Date de création : %d';
-$lang['Waiting page: %s'] = 'Page en attente : %s';
 $lang['Picture uploaded by %s'] = 'Image téléchargée par %s';
 // --------- Starting below: New or revised $lang ---- from version 1.7.1
Index: unk/language/fr_FR/help/help_user_upload.html
===================================================================
--- /trunk/language/fr_FR/help/help_user_upload.html	(revision 8650)
+++ 	(revision )
@@ -1,14 +1,0 @@
-<p>Vos utilisateurs peuvent également ajouter leurs photos.</p>
-
-<ol>
-
-  <li>Autorisez l'ajout d'images sur n'importe quelle catégorie physique (<span
-class="pwgScreen">Administration &raquo; Catégories &raquo; Gestion &raquo; Edit</span> ou <span
-class="pwgScreen">Administration &raquo; Catégories &raquo; Propriétés &raquo; Ajout d'images</span>). Les catégories virtuelles ne peuvent être utilisées pour ajouter des images.</li>
-
-  <li>Donnez les droits en écriture (pour tous les utilisateurs) sur les
-répertoires correspondant aux catégories autorisées à l'ajout.</li>
-</ol>
-
-<p>Les photos ajoutées par les utilisateurs ne sont pas directement
-visibles sur le site, elles doivent être préalablement validées par un administrateur. A cet effet, un administrateur doit se rendre dans <span class="pwgScreen">Administration &raquo; Photos &raquo; En attente</span> afin d'accepter ou de rejeter les photos proposées.</p>
Index: /trunk/language/he_IL/admin.lang.php
===================================================================
--- /trunk/language/he_IL/admin.lang.php	(revision 8650)
+++ /trunk/language/he_IL/admin.lang.php	(revision 8651)
@@ -47,6 +47,4 @@
 $lang['%d users'] = '%d משתמשים';
 $lang['%d waiting for validation'] = '%d מחכה לאימות';
-$lang['%d waiting pictures rejected'] = '%d התמונות נדחו';
-$lang['%d waiting pictures validated'] = '%d התמונות אושרו';
 $lang['Actions'] = 'פעולות';
 $lang['Activate'] = 'להפעיל';
@@ -89,5 +87,4 @@
 $lang['Email admins when a valid comment is entered'] = 'שלח מייל למנהל כאשר נרשמת תגובה';
 $lang['Email admins when a comment requires validation'] = 'שלח מייל למנהל כאשר נדרש אימות לתגובה';
-$lang['Email admins when a picture is uploaded'] = 'שלח מייל למנהל כאשר נוספת תמונה חדשה';
 $lang['Empty caddie'] = 'רוקן את הסל';
 $lang['Environment'] = 'סביבה';
@@ -148,5 +145,4 @@
 $lang['Rating by guests'] = 'דירוג על ידי אורחים';
 $lang['Rating'] = 'דירוג';
-$lang['Reject All'] = 'דחה את כל';
 $lang['Reject'] = 'דחה';
 $lang['Representant'] = 'נציג';
@@ -174,5 +170,4 @@
 $lang['User comments validation'] = 'תגובות מאושרות של המשתמש';
 $lang['Users'] = 'משתמשים';
-$lang['Validate All'] = 'אמת כל';
 $lang['Validate'] = 'אמת';
 $lang['Validation'] = 'אימות';
@@ -198,5 +193,4 @@
 $lang['Public / Private'] = 'ציבורי / פרטי';
 $lang['Manage authorizations for selected albums'] = 'נהל הרשאות עבור הקטגוריות שנבחרו';
-$lang['Select uploadable albums'] = 'בחר קטגוריות הניתנות להעלאה';
 $lang['Virtual album added'] = 'קטגוריה וירטואלית נוספה';
 $lang['Virtual album deleted'] = 'קטגוריה וירטואלית נמחקה';
@@ -217,5 +211,4 @@
 $lang['edit album permissions'] = 'ערוך הרשאות לקטגוריה';
 $lang['Album updated successfully'] = 'מידע על הקטגוריה עודכן בהצלחה.';
-$lang['Authorize upload'] = 'הרשה להעלות';
 $lang['elements per page'] = 'פריטים בעמוד';
 $lang['elements'] = 'פריטים';
@@ -366,5 +359,4 @@
 $lang['Thumbnail creation'] = 'יצירת תמונה';
 $lang['Database synchronization with files'] = 'מסד נתונים לסינכרון עם קבצים';
-$lang['Pictures waiting for validation'] = 'תמונות ממתינה אימות';
 $lang['all'] = 'כל';
 $lang['pictures without thumbnail (jpeg and png only)'] = 'תמונות ללא תמונה (JPEG ו-PNG בלבד)';
@@ -555,6 +547,4 @@
 $lang["Can't connect to server."] = 'החיבור לשרת בלתי אפשרי.';
 $lang['Purge compiled templates'] = 'הידור הטיהור תבניות';
-$lang['Show upload link every time'] = 'הצג להעלות קישור כל הזמן';
-$lang['User access level to upload'] = 'גישה ברמת המשתמש על העלאת';
 $lang['ACCESS_0'] = 'גישה חופשית';
 $lang['ACCESS_1'] = 'גישה לכל';
@@ -730,5 +720,4 @@
 $lang['The following tag was deleted'] = 'התווית הבאה נמחקה';
 $lang['Miscellaneous'] = 'שונות';
-$lang['User Upload'] = 'משתמש העלה';
 $lang['Virtual Links'] = 'קישורים וירטואלית';
 $lang['There is no other language available.'] = 'אין שפה אחרת זמינה.';
Index: /trunk/language/he_IL/common.lang.php
===================================================================
--- /trunk/language/he_IL/common.lang.php	(revision 8650)
+++ /trunk/language/he_IL/common.lang.php	(revision 8651)
@@ -44,6 +44,4 @@
 $lang['%d new user'] = "%d משתמש חדש";
 $lang['%d new users'] = "%d משתמשים חדשים";
-$lang['%d waiting element'] = "%d פריט מחכה";
-$lang['%d waiting elements'] = "%d פריטים מחכים";
 $lang['About'] = "על";
 $lang['All tags'] = "כל התוויות";
@@ -320,5 +318,4 @@
 $lang['Picture name: %s'] = "שם התמונה: %s";
 $lang['Creation date: %s'] = "תאריך יצירה: %s";
-$lang['Waiting page: %s'] = "דף ממתין: %s";
 $lang['Picture uploaded by %s'] = "התמונה הועלתה על ידי %s";
 $lang['Bad status for user "guest", using default status. Please notify the webmaster.'] = 'מצב לא טוב עבור המשתמש "האורח", השתמש במצב ברירת מחדל. עדכן בבקשה את מנהל האתר.';
Index: /trunk/language/hr_HR/admin.lang.php
===================================================================
--- /trunk/language/hr_HR/admin.lang.php	(revision 8650)
+++ /trunk/language/hr_HR/admin.lang.php	(revision 8651)
@@ -47,6 +47,4 @@
 $lang['%d users'] = '%d korisnika';
 $lang['%d waiting for validation'] = '%d čekanje na ovjeri';
-$lang['%d waiting pictures rejected'] = '%d slika na čekanju odbačeno';
-$lang['%d waiting pictures validated'] = '%d slika na čekanju odobreno';
 $lang['Actions'] = 'Postupci';
 $lang['Activate'] = 'Uključi';
@@ -89,5 +87,4 @@
 $lang['Email admins when a valid comment is entered'] = 'E-mail upraviteljima pri upisu novih komentara';
 $lang['Email admins when a comment requires validation'] = 'Email upraviteljima kada komentar treba ovjeru';
-$lang['Email admins when a picture is uploaded'] = 'Email upraviteljima pri prebačaju novih slika';
 $lang['Empty caddie'] = 'Isprazni ladicu';
 $lang['Environment'] = 'Okruženje';
@@ -147,5 +144,4 @@
 $lang['Rating by guests'] = 'Ocjene gostiju';
 $lang['Rating'] = 'Ocjenjivanje';
-$lang['Reject All'] = 'Odbaci Sve';
 $lang['Reject'] = 'Odbaci';
 $lang['Representant'] = 'Predstavnik';
@@ -173,5 +169,4 @@
 $lang['User comments validation'] = 'Ovjera korisničkih komentara';
 $lang['Users'] = 'Korisnici';
-$lang['Validate All'] = 'Ovjeri Sve';
 $lang['Validate'] = 'Ovjeri';
 $lang['Validation'] = 'Ovjera';
@@ -197,5 +192,4 @@
 $lang['Public / Private'] = 'Javno / Osobno';
 $lang['Manage authorizations for selected albums'] = 'Upravljanje ovlastima za odabrane skupine';
-$lang['Select uploadable albums'] = 'Odaberite skupine za prebačaj';
 $lang['Virtual album added'] = 'Nestvarna skupina dodana';
 $lang['Virtual album deleted'] = 'Nestvarna skupina izbrisana';
@@ -216,5 +210,4 @@
 $lang['edit album permissions'] = 'uredi ovlasti skupine';
 $lang['Album updated successfully'] = 'Podaci skupine uspješno obnovljeni.';
-$lang['Authorize upload'] = 'Odobri prebačaj';
 $lang['elements per page'] = 'stavaka po stranici';
 $lang['elements'] = 'stavke';
@@ -360,5 +353,4 @@
 $lang['Thumbnail creation'] = 'Izrada poveznij sličica';
 $lang['Database synchronization with files'] = 'Usklađivanje baze podataka sa zapisima';
-$lang['Pictures waiting for validation'] = 'Slike na čekanju ovjere';
 $lang['all'] = 'sve';
 $lang['pictures without thumbnail (jpeg and png only)'] = 'slike bez poveznih sličica (samo jpeg i png)';
@@ -550,6 +542,4 @@
 $lang['Can\'t connect to server.'] = 'Ne mogu se povezati na poslužitelj.';
 $lang['Purge compiled templates'] = 'Isprazni obrađene predloške';
-$lang['Show upload link every time'] = 'Prikaži poveznicu prebačaja svaki put';
-$lang['User access level to upload'] = 'Pristupna korisnička razina potrebna za prebačaj';
 $lang['ACCESS_0'] = 'Slobodan pristup';
 $lang['ACCESS_1'] = 'Pristup svima';
@@ -724,5 +714,4 @@
 $lang['The following tag was deleted'] = 'Slijedeći tag je izbrisan';
 $lang['Miscellaneous'] = 'Razno';
-$lang['User Upload'] = 'Korisničko Prebacivanje';
 $lang['Virtual Links'] = 'Prividne Poveznice';
 $lang['There is no other language available.'] = 'Neme dostupnih drugih jezika.';
Index: /trunk/language/hr_HR/common.lang.php
===================================================================
--- /trunk/language/hr_HR/common.lang.php	(revision 8650)
+++ /trunk/language/hr_HR/common.lang.php	(revision 8651)
@@ -45,6 +45,4 @@
 $lang['%d new user'] = '%d novi korisnik';
 $lang['%d new users'] = '%d novi korisnici';
-$lang['%d waiting element'] = '%d stavka na čekanju';
-$lang['%d waiting elements'] = '%d stavke na čekanju';
 $lang['About'] = 'O...';
 $lang['All tags'] = 'Svi tagovi';
@@ -322,5 +320,4 @@
 $lang['Picture name: %s'] = 'Naziv slike: %s';
 $lang['Creation date: %s'] = 'Nadnevak izrade: %s';
-$lang['Waiting page: %s'] = 'Stranica počeka: %s';
 $lang['Picture uploaded by %s'] = 'Sliku prebacio %s';
 // --------- Starting below: New or revised $lang ---- from version 1.7.1
Index: /trunk/language/hu_HU/admin.lang.php
===================================================================
--- /trunk/language/hu_HU/admin.lang.php	(revision 8650)
+++ /trunk/language/hu_HU/admin.lang.php	(revision 8651)
@@ -47,6 +47,4 @@
 $lang['%d users'] = '%d felhasználó';
 $lang['%d waiting for validation'] = '%d vár elfogadásra';
-$lang['%d waiting pictures rejected'] = '%d várakozó kép eldobva';
-$lang['%d waiting pictures validated'] = '%d várakozó kép elfogadva';
 $lang['Actions'] = 'Műveletek';
 $lang['Activate'] = 'Bekapcsolás';
@@ -89,5 +87,4 @@
 $lang['Email admins when a valid comment is entered'] = 'Email-küldés, ha egy érvényes hozzászólás érkezik ';
 $lang['Email admins when a comment requires validation'] = 'Email-küldés, ha egy hozzászólás jóváhagyásra vár ';
-$lang['Email admins when a picture is uploaded'] = 'Email-küldés, ha valaki képet töltött fel';
 $lang['Empty caddie'] = 'Kosár kiürítése';
 $lang['Environment'] = 'Környezet';
@@ -148,5 +145,4 @@
 $lang['Rating by guests'] = 'Vendégek által értékelhető';
 $lang['Rating'] = 'Értékelés';
-$lang['Reject All'] = 'Mind elvetése';
 $lang['Reject'] = 'Elvetés';
 $lang['Representant'] = 'Reprezentál';
@@ -173,5 +169,4 @@
 $lang['User comments validation'] = 'Felhasználói hozzászólások engedélyezése';
 $lang['Users'] = 'Felhasználók';
-$lang['Validate All'] = 'Összes engedélyezése';
 $lang['Validate'] = 'Engedélyezés';
 $lang['Validation'] = 'Engedélyezés szükséges';
@@ -197,5 +192,4 @@
 $lang['Public / Private'] = 'Nyilvános / Privát';
 $lang['Manage authorizations for selected albums'] = 'A kiválasztott albumok engedélyeinek kezelése';
-$lang['Select uploadable albums'] = 'Feltöltés engedélyezése a kiválasztott albumokba';
 $lang['Virtual album added'] = 'Virtuális album hozzáadva';
 $lang['Virtual album deleted'] = 'Virtuális album törölve';
@@ -215,5 +209,4 @@
 $lang['edit album permissions'] = 'Albumok hozzáféréseinek módosítása';
 $lang['Album updated successfully'] = 'Az album információinak módosítása megtörtént.';
-$lang['Authorize upload'] = 'Feltöltés engedélyezése';
 $lang['elements per page'] = 'Képek száma oldalanként';
 $lang['elements'] = 'Kép';
@@ -361,5 +354,4 @@
 $lang['Thumbnail creation'] = 'Bélyegképek létrehozása';
 $lang['Database synchronization with files'] = 'Adatbázis szinkronizálása ezzel a mappával';
-$lang['Pictures waiting for validation'] = 'Jóváhagyásra váró képek';
 $lang['all'] = 'összes';
 $lang['pictures without thumbnail (jpeg and png only)'] = 'csak bélyegkép nélküli képek (jpeg és png)';
@@ -554,6 +546,4 @@
 $lang['Support'] = 'Támogatás';
 $lang['Documentation'] = 'Dokumentációk';
-$lang['Show upload link every time'] = 'Jelenjen meg a Kép hozzáadása menüpont';
-$lang['User access level to upload'] = 'képeit töltse fel';
 $lang['ACCESS_0'] = 'Ingyenes hozzáférés';
 $lang['ACCESS_1'] = 'Mindenki';
@@ -728,5 +718,4 @@
 $lang['The following tag was deleted'] = 'Címke törlése sikeres';
 $lang['Miscellaneous'] = 'Egyéb';
-$lang['User Upload'] = 'Feltöltés';
 $lang['Virtual Links'] = 'Virtuális Linkek';
 $lang['There is no other language available.'] = 'Egyéb nyelv nem áll rendelkezésre.';
Index: /trunk/language/hu_HU/common.lang.php
===================================================================
--- /trunk/language/hu_HU/common.lang.php	(revision 8650)
+++ /trunk/language/hu_HU/common.lang.php	(revision 8651)
@@ -45,6 +45,4 @@
 $lang['%d new user'] = '%d új felhasználó';
 $lang['%d new users'] = '%d új felhasználó';
-$lang['%d waiting element'] = '%d várakozó elem';
-$lang['%d waiting elements'] = '%d várakozó elem';
 $lang['About'] = 'Impresszum';
 $lang['All tags'] = 'Összes címke';
@@ -323,5 +321,4 @@
 $lang['Picture name: %s'] = 'Kép neve: %s';
 $lang['Creation date: %s'] = 'Létrehozás dátuma: %d';
-$lang['Waiting page: %s'] = 'Tovább a jóváhagyásra váró képek oldalra: %s';
 $lang['Picture uploaded by %s'] = 'A képet feltöltötte: %s';
 // --------- Starting below: New or revised $lang ---- from version 1.7.1
Index: unk/language/hu_HU/help/help_user_upload.html
===================================================================
--- /trunk/language/hu_HU/help/help_user_upload.html	(revision 8650)
+++ 	(revision )
@@ -1,18 +1,0 @@
-<p>A felhasználóknak lehetőségük van képek feltöltésére is.</p>
-
-<ol>
-
-  <li>A képek feltöltésének engedélyezése bármely fizikai albumba az
-  (<span class="pwgScreen">Adminisztráció &raquo; Albumok &raquo; Kezelés
-  &raquo; javítás</span> vagy az <span class="pwgScreen">Adminisztráció &raquo;
-  Albumok &raquo; Tulajdonságok &raquo; Feltöltés</span>) útvonalon lehetséges. 
-  Virtuális albumba nincs lehetőség feltöltésre.</li>
-
-  <li>Az érintett könyvtárakhoz írási jogosultságot kell adni.</li>
-
-</ol>
-
-<p>A felhasználók által feltöltött képek nem jelennek meg automatikusan a honlapon. 
-Az adminisztrátor az <span class="pwgScreen">Adminisztráció &raquo; Képek &raquo;
-Várakozó elemek &raquo; Képek</span> útvonalon engedélyezheti, vagy törölheti a 
-felhasználók által feltöltött képeket.</p>
Index: /trunk/language/it_IT/admin.lang.php
===================================================================
--- /trunk/language/it_IT/admin.lang.php	(revision 8650)
+++ /trunk/language/it_IT/admin.lang.php	(revision 8651)
@@ -49,6 +49,4 @@
 $lang['%d users'] = '%d utenti';
 $lang['%d waiting for validation'] = '%d in attesa di accettazione';
-$lang['%d waiting pictures rejected'] = '%d immagini in attesa rifiutate';
-$lang['%d waiting pictures validated'] = '%d immagini in attesa accettate';
 $lang['Actions'] = 'Azioni';
 $lang['Activate'] = 'Attivare';
@@ -91,5 +89,4 @@
 $lang['Email admins when a valid comment is entered'] = 'Notificare gli amministratori della presenza di un nuovo commento';
 $lang['Email admins when a comment requires validation'] = 'Notificare gli amministratori quando un commento richiede un\'approvazione';
-$lang['Email admins when a picture is uploaded'] = 'Notificare gli amministratori quando un\'immagine viene caricata';
 $lang['Empty caddie'] = 'Svuotare il cestino';
 $lang['Environment'] = 'Ambiente';
@@ -150,5 +147,4 @@
 $lang['Rating by guests'] = 'Voti degli ospiti';
 $lang['Rating'] = 'Voto';
-$lang['Reject All'] = 'Rifiutare tutto';
 $lang['Reject'] = 'Rifiutare';
 $lang['Representant'] = 'Copertina';
@@ -176,5 +172,4 @@
 $lang['User comments validation'] = 'Approvare i commenti degli utenti';
 $lang['Users'] = 'Utenti';
-$lang['Validate All'] = 'Approvare tutto';
 $lang['Validate'] = 'Approvare';
 $lang['Validation'] = 'Richiedere l\'approvazione';
@@ -200,5 +195,4 @@
 $lang['Public / Private'] = 'Pubblica / Privata';
 $lang['Manage authorizations for selected albums'] = 'Gestire le autorizzazioni per gli album selezionati';
-$lang['Select uploadable albums'] = 'Selezionare gli album sui quali è possibile caricare nuove immagini';
 $lang['Virtual album added'] = 'Album virtuale aggiunto';
 $lang['Virtual album deleted'] = 'Album virtuale cancellato';
@@ -219,5 +213,4 @@
 $lang['edit album permissions'] = 'modificare i permessi dell\'album';
 $lang['Album updated successfully'] = 'Le informazioni dell\'album sono state aggiornate con successo.';
-$lang['Authorize upload'] = 'Autorizzare l\'aggiunta d\'immagini';
 $lang['elements per page'] = 'Numero di elementi da visualizzare per pagina';
 $lang['elements'] = 'Elementi';
@@ -367,5 +360,4 @@
 $lang['Thumbnail creation'] = 'Creazione delle miniature';
 $lang['Database synchronization with files'] = 'Sincronizzazione database con i files';
-$lang['Pictures waiting for validation'] = 'Immagini in attesa di convalida';
 $lang['all'] = 'Tutto';
 $lang['pictures without thumbnail (jpeg and png only)'] = 'immagini senza miniature (solo jpeg e png)';
@@ -556,6 +548,4 @@
 $lang['Can\'t connect to server.'] = 'Non è possibile connettersi al server.';
 $lang['Purge compiled templates'] = 'Ripulire i templates compilati';
-$lang['Show upload link every time'] = 'Mostra sempre il link per caricare le immagini';
-$lang['User access level to upload'] = 'Livello d\'accesso utente per il caricamento delle foto';
 $lang['ACCESS_0'] = 'Accesso libero';
 $lang['ACCESS_1'] = 'Accesso a tutti';
@@ -739,5 +729,4 @@
 $lang['Miscellaneous'] = 'Informazioni';
 $lang['The following tag was deleted'] = 'Il tag seguente è stato cancellato';
-$lang['User Upload'] = 'Immagini caricate dagli utenti';
 $lang['Virtual Links'] = 'Collegamenti virtuali';
 $lang['There is no other language available.'] = 'Non ci sono altre lingue disponibili.';
Index: /trunk/language/it_IT/common.lang.php
===================================================================
--- /trunk/language/it_IT/common.lang.php	(revision 8650)
+++ /trunk/language/it_IT/common.lang.php	(revision 8651)
@@ -45,6 +45,4 @@
 $lang['%d new user'] = '%d nuovo utente';
 $lang['%d new users'] = '%d nuovi utenti';
-$lang['%d waiting element'] = '%d elemento in attesa';
-$lang['%d waiting elements'] = '%d elementi in attesa';
 $lang['About'] = 'Informazioni su...';
 $lang['All tags'] = 'Tutti i tags';
@@ -320,5 +318,4 @@
 $lang['Picture name: %s'] = 'Nome dell\'immagine: %s';
 $lang['Creation date: %s'] = 'Data di creazione: %d';
-$lang['Waiting page: %s'] = 'Pagina in attesa: %s';
 $lang['Picture uploaded by %s'] = 'Immagine caricata da %s';
 // --------- Starting below: New or revised $lang ---- from version 1.7.1
Index: unk/language/it_IT/help/help_user_upload.html
===================================================================
--- /trunk/language/it_IT/help/help_user_upload.html	(revision 8650)
+++ 	(revision )
@@ -1,14 +1,0 @@
-<p>Anche gli utenti possono caricare le loro foto.</p>
-
-<ol>
-
-  <li>Autorizzare l'upload su una o più categorie fisiche (<span
-class="pwgScreen">Amministrazione &raquo; Categorie &raquo; Gestire &raquo; Modificare</span> o <span
-class="pwgScreen">Amministrazione &raquo; Categorie &raquo; Proprietà &raquo; Caricare</span>). Le categorie virtuali non permettono l'upload.</li>
-
-  <li>Dare gli accessi in scrittura (per tutti gli utenti) sulle 
-directory delle categorie autorizzate all'aggiunta dei file</li>
-</ol>
-
-<p>Le foto aggiunte dagli utenti non sono direttamente visibili
-sul sito. Devono essere approvate da un amministratore. Per ciò, un amministratore deve andare in <span class="pwgScreen">Amministrazione &raquo; Foto &raquo; In attesa &raquo; Immagini</span> per approvare o scartare le immagini proposte.</p>
Index: /trunk/language/ja_JP/admin.lang.php
===================================================================
--- /trunk/language/ja_JP/admin.lang.php	(revision 8650)
+++ /trunk/language/ja_JP/admin.lang.php	(revision 8651)
@@ -47,6 +47,4 @@
 $lang['%d users'] = 'ユーザ:%d';
 $lang['%d waiting for validation'] = '承認待ち: %d 件';
-$lang['%d waiting pictures rejected'] = '拒否待ちの写真: %d 件';
-$lang['%d waiting pictures validated'] = '承認待ちの写真: %d 件';
 $lang['Actions'] = '操作';
 $lang['Activate'] = '有効化';
@@ -89,5 +87,4 @@
 $lang['Email admins when a valid comment is entered'] = '有効なコメントが入力された場合、管理者にメールする';
 $lang['Email admins when a comment requires validation'] = 'コメントの承認が必要な場合、管理者にメールする';
-$lang['Email admins when a picture is uploaded'] = '写真がアップロードされた場合、管理者にメールする';
 $lang['Empty caddie'] = 'キャディーを空にする';
 $lang['Environment'] = '環境';
@@ -148,5 +145,4 @@
 $lang['Rating by guests'] = 'ゲストによる評価';
 $lang['Rating'] = '評価';
-$lang['Reject All'] = 'すべてを拒否する';
 $lang['Reject'] = '拒否';
 $lang['Representant'] = '見本';
@@ -173,5 +169,4 @@
 $lang['User comments validation'] = 'ユーザコメント承認';
 $lang['Users'] = 'ユーザ';
-$lang['Validate All'] = 'すべてを承認する';
 $lang['Validate'] = '承認';
 $lang['Validation'] = '承認';
@@ -197,5 +192,4 @@
 $lang['Public / Private'] = 'パブリック / プライベート';
 $lang['Manage authorizations for selected albums'] = '選択したカテゴリの権限を管理する';
-$lang['Select uploadable albums'] = 'アップロード可能なカテゴリを選択する';
 $lang['Virtual album added'] = 'バーチャルカテゴリが追加されました。';
 $lang['Virtual album deleted'] = 'バーチャルカテゴリが削除されました。';
@@ -215,5 +209,4 @@
 $lang['edit album permissions'] = 'カテゴリパーミッションを編集する';
 $lang['Album updated successfully'] = 'カテゴリ情報が正常に更新されました。';
-$lang['Authorize upload'] = 'アップロードを許可する';
 $lang['elements per page'] = '1ページあたりのエレメント';
 $lang['elements'] = 'エレメント';
@@ -362,5 +355,4 @@
 $lang['Thumbnail creation'] = 'サムネイル作成';
 $lang['Database synchronization with files'] = 'ファイルおよびデータベースの同期化';
-$lang['Pictures waiting for validation'] = '承認待ちの写真';
 $lang['all'] = 'すべて';
 $lang['pictures without thumbnail (jpeg and png only)'] = 'サムネイルなしの写真 (jpegおよびpngのみ)';
@@ -553,6 +545,4 @@
 $lang['Can\'t connect to server.'] = 'サーバに接続できません。';
 $lang['Purge compiled templates'] = 'コンパイル済みテンプレートを削除する';
-$lang['Show upload link every time'] = '毎回アップロードリンクを表示する';
-$lang['User access level to upload'] = 'アップロードに関するユーザアクセスレベル';
 $lang['ACCESS_0'] = 'フリーアクセス';
 $lang['ACCESS_1'] = 'すべてのユーザがアクセスできる';
@@ -698,5 +688,4 @@
 $lang['Allow user customization'] = 'ユーザーのカスタマイズを有効にする';
 $lang['Miscellaneous'] = 'その他の情報';
-$lang['User Upload'] = 'ユーザによるアップロード';
 $lang['Virtual Links'] = 'バーチャルのリンク';
 $lang['Languages'] = '言語';
Index: /trunk/language/ja_JP/common.lang.php
===================================================================
--- /trunk/language/ja_JP/common.lang.php	(revision 8650)
+++ /trunk/language/ja_JP/common.lang.php	(revision 8651)
@@ -45,6 +45,4 @@
 $lang['%d new user'] = '新しいユーザ: %d';
 $lang['%d new users'] = '新しいユーザ: %d';
-$lang['%d waiting element'] = '待ちエレメント: %d';
-$lang['%d waiting elements'] = '待ちエレメント: %d';
 $lang['About'] = 'About';
 $lang['All tags'] = 'すべてのタグ';
@@ -321,5 +319,4 @@
 $lang['Picture name: %s'] = '写真名: %s';
 $lang['Creation date: %s'] = '作成日: %s';
-$lang['Waiting page: %s'] = '待ちページ: %s';
 $lang['Picture uploaded by %s'] = '%s によりアップロードされた写真';
 // --------- Starting below: New or revised $lang ---- from version 1.7.1
Index: unk/language/ja_JP/help/help_user_upload.html
===================================================================
--- /trunk/language/ja_JP/help/help_user_upload.html	(revision 8650)
+++ 	(revision )
@@ -1,6 +1,0 @@
-<p>ユーザは自分の写真をアップロードすることもできます。</p>
-
-<p>物理カテゴリにアップロードを許可します (「<span class="pwgScreen">管理 &raquo; カテゴリ &raquo; 管理 &raquo; 編集</span>」または「<span class="pwgScreen">管理 > カテゴリ > プロパティ > アップロード</span>」)。バーチャルカテゴリには、アップロードすることができません。</p>
-
-<p>対応するディレクトリに書込み権を与えてください。</p>
-
Index: /trunk/language/ka_GE/admin.lang.php
===================================================================
--- /trunk/language/ka_GE/admin.lang.php	(revision 8650)
+++ /trunk/language/ka_GE/admin.lang.php	(revision 8651)
@@ -47,6 +47,4 @@
 $lang['%d users'] = '%d მომხმარებელი';
 $lang['%d waiting for validation'] = '%d უცდის შემოწმებას';
-$lang['%d waiting pictures rejected'] = '%d შესამოწმებელი ფოტო აცილებულია';
-$lang['%d waiting pictures validated'] = '%d შესამოწმებელი ფოტო მიღებულია';
 $lang['Actions'] = 'მოქმედება';
 $lang['Activate'] = 'აქტივაცია';
@@ -89,5 +87,4 @@
 $lang['Email admins when a valid comment is entered'] = 'შევატყობინოთ ადმინისტრატორს ახალი კომენტარის შესახებ';
 $lang['Email admins when a comment requires validation'] = 'შევატყობინოთ ადმინისტრატორს შესამოწმებელი კომანტარის შესახებ';
-$lang['Email admins when a picture is uploaded'] = 'შევატყობინოთ ადმინისტრატორს ფოტოს ატვირთვის შესახებ';
 $lang['Empty caddie'] = 'გავასუფთაოთ კალათა';
 $lang['Environment'] = 'გარემოცვა';
@@ -148,5 +145,4 @@
 $lang['Rating by guests'] = 'სტუმრების შეფასება';
 $lang['Rating'] = 'შეფასება';
-$lang['Reject All'] = 'უარი ყველას';
 $lang['Reject'] = 'უარი';
 $lang['Representant'] = 'წარმომადგენელი';
@@ -173,5 +169,4 @@
 $lang['User comments validation'] = 'მომხმარებლების კომენტარების შემოწმება';
 $lang['Users'] = 'მომხმარებლები';
-$lang['Validate All'] = 'მივიღოთ ყველა';
 $lang['Validate'] = 'მივიღოთ';
 $lang['Validation'] = 'შემოწმება';
@@ -197,5 +192,4 @@
 $lang['Public / Private'] = 'საერთო / პრივატული';
 $lang['Manage authorizations for selected albums'] = 'ავტორიზაციის მართვა არჩეული კატეგორიებისათვის';
-$lang['Select uploadable albums'] = 'კატეგორიის არჩევა რომელშიც შესაძლებელია ატვირთვა';
 $lang['Virtual album added'] = 'ვირტუალური კატეგორია დამატებულია';
 $lang['Virtual album deleted'] = 'ვირტუალური კატეგორია წაშლილია';
@@ -215,5 +209,4 @@
 $lang['edit album permissions'] = 'კატეგორიის უფლებების რედაქტირება';
 $lang['Album updated successfully'] = 'ინფორმაცია კატეგორიაზე წარმატებით განახლებულია.';
-$lang['Authorize upload'] = 'დაუშვათ გადმოწერა';
 $lang['elements per page'] = 'მინიატურები გვერდზე';
 $lang['elements'] = 'ელემენტები';
@@ -365,5 +358,4 @@
 $lang['Thumbnail creation'] = 'მინიატურების შექმნა';
 $lang['Database synchronization with files'] = 'მონაცემთა ბაზის სინქრონიზაცია ფაილებთან';
-$lang['Pictures waiting for validation'] = 'გამოგზავნილი ფოტოების შემოწმება';
 $lang['all'] = 'ყველა';
 $lang['pictures without thumbnail (jpeg and png only)'] = 'ფოტოები მინიატურების გარეშე (მხოლოდ jpeg და png)';
@@ -561,6 +553,4 @@
 $lang['Purge compiled templates'] = 'გავასუფთაოთ შექმნილი შაბლონები';
 $lang['Upload'] = 'ატვირთვები';
-$lang['Show upload link every time'] = 'ვაჩვენოთ ჩამოსატვირთი ბმული მუდმივად';
-$lang['User access level to upload'] = 'მომხმარებლის დაშვების ხარისხი ასატვირთად';
 $lang['ACCESS_0'] = 'თავისუფალი დაშვება';
 $lang['ACCESS_1'] = 'დაშვებულია ყველასთვის';
@@ -735,5 +725,4 @@
 $lang['The following tag was deleted'] = 'შემდეგი ნიშნულები წაშლილია';
 $lang['Miscellaneous'] = 'სხვა და სხვა';
-$lang['User Upload'] = 'ატვირთვა მომხმარებლის მიერ';
 $lang['Virtual Links'] = 'ვირტ.ბმულები';
 $lang['Templates configuration has been recorded.'] = 'შაბლონის კონფიგურაცის გადაწერილია.';
Index: /trunk/language/ka_GE/common.lang.php
===================================================================
--- /trunk/language/ka_GE/common.lang.php	(revision 8650)
+++ /trunk/language/ka_GE/common.lang.php	(revision 8651)
@@ -45,6 +45,4 @@
 $lang['%d new user'] = '%d ახალი მნახველი';
 $lang['%d new users'] = '%d ახალი მნახველები';
-$lang['%d waiting element'] = '%d ელემენტი რიგში';
-$lang['%d waiting elements'] = '%d ელემენტები რიგში';
 $lang['About'] = 'საიტის ძრავი';
 $lang['All tags'] = 'ყველა სიტყვა';
@@ -325,5 +323,4 @@
 $lang['Picture name: %s'] = 'სახელი: %s';
 $lang['Creation date: %s'] = 'გადაღების დრო: %s';
-$lang['Waiting page: %s'] = 'მოცდის გვერდი: %s';
 $lang['Picture uploaded by %s'] = 'ფოტო ატვირთულია %s';
 // --------- Starting below: New or revised $lang ---- from version 1.7.1
Index: unk/language/ka_GE/help/help_user_upload.html
===================================================================
--- /trunk/language/ka_GE/help/help_user_upload.html	(revision 8650)
+++ 	(revision )
@@ -1,15 +1,0 @@
-<p>Piwigo აძლევს მომხმარებლებს საშუალებას ატვირთონ ფოტოები. ამისათვის საჭიროა:</p>
-
-<ol>
-
-  <li> დართოთ ნება ატვირთვაზე რომელიმე კატეგორიაში (<span
-  class="pwgScreen"> ადმინისტრირება, გალერეა, მართვა, რედაქტირება </span> ან <span
-  class="pwgScreen"> ადმინისტრირება, გალერეა, თვისება, ატვირთვა </span>)</li>
-
-  <li>მისცეთ ჩაწერის უფლება ფოლდერში მომხმარებელს ugo (მომხმარებელი, ჯგუფი, სხვა)</li>
-
-</ol>
-
-<p>მომხმარებლის მიერ ატვირთული სურათები ეგრევე არ ჩანს საიტზე, ისინი შემოწმებული უნდა იქნეს ადმინისტრატორის მიერ. ამისათვის ადმინისტრატორი უნდა გადავიდეს <span class="pwgScreen"> ადმინისტრირება, ფოტოები, მოცდის პროცესში </span>
-და მიიღოს ან უარი თქვას შეთავაზებულ ფოტოებზე, რის შემდეგაც სინქრონიზაცია უნდა გააკეთოს ფაილებისა მონაცემთა ბაზასთან.</p>
-
Index: /trunk/language/lv_LV/admin.lang.php
===================================================================
--- /trunk/language/lv_LV/admin.lang.php	(revision 8650)
+++ /trunk/language/lv_LV/admin.lang.php	(revision 8651)
@@ -45,6 +45,4 @@
 $lang['%d users'] = '%d lietotāji';
 $lang['%d waiting for validation'] = '%d gaida apstiprinājumu';
-$lang['%d waiting pictures rejected'] = '%d pārbaudāmo attēlu noraidīts';
-$lang['%d waiting pictures validated'] = '%d pārbaudāmo attēlu apstiprināts';
 $lang['Actions'] = 'Darbības';
 $lang['Activate'] = 'Aktivēt';
@@ -87,5 +85,4 @@
 $lang['Email admins when a valid comment is entered'] = 'Paziņot adminam, kad derīgs komentārs ievadīts';
 $lang['Email admins when a comment requires validation'] = 'Paziņot adminam, kad parādījies komentārs, kas jāpārbauda';
-$lang['Email admins when a picture is uploaded'] = 'Paziņot adminam, kad bilde tiek augšupielādēta';
 $lang['Empty caddie'] = 'Tukšs grozs';
 $lang['Environment'] = 'Vide';
@@ -146,5 +143,4 @@
 $lang['Rating by guests'] = 'Viesu novērtējums';
 $lang['Rating'] = 'Vērtējums';
-$lang['Reject All'] = 'Noraidīt Visu';
 $lang['Reject'] = 'Noraidīt';
 $lang['Representant'] = 'Pārstāvis';
@@ -172,5 +168,4 @@
 $lang['User comments validation'] = 'Lietotāju komentāru pārbaude';
 $lang['Users'] = 'Lietotāji';
-$lang['Validate All'] = 'Apstiprināt visu';
 $lang['Validate'] = 'Apstiprināt';
 $lang['Validation'] = 'Apstiprināšana';
@@ -196,5 +191,4 @@
 $lang['Public / Private'] = 'Publisks / Privāts';
 $lang['Manage authorizations for selected albums'] = 'Pārvaldīt izvēlēto albūmu autorizācijas';
-$lang['Select uploadable albums'] = 'Atlasīt augšuplādējamos albūmus';
 $lang['Virtual album added'] = 'Virtuālais albūms pievienots';
 $lang['Virtual album deleted'] = 'Virtuālais albūms izdzēsts';
@@ -214,5 +208,4 @@
 $lang['edit album permissions'] = 'rediģēt piekļuves atļaujas albūmam';
 $lang['Album updated successfully'] = 'Informācija par albūmu veiksmīgi atjaunota.';
-$lang['Authorize upload'] = 'Atļaut augšupielādi';
 $lang['elements per page'] = 'elementu skaits lapā';
 $lang['elements'] = 'elementi';
@@ -360,5 +353,4 @@
 $lang['Thumbnail creation'] = 'Piktogrammu izveide';
 $lang['Database synchronization with files'] = 'Datu bāzes sinhronizācija ar failiem';
-$lang['Pictures waiting for validation'] = 'Atsūtīto attēlu pārbaude';
 $lang['all'] = 'viss';
 $lang['pictures without thumbnail (jpeg and png only)'] = 'attēli bez piktogrammām ( tikai jpeg and png)';
@@ -548,6 +540,4 @@
 $lang['Can\'t connect to server.'] = 'Neiespējams savienojums ar serveri.';
 $lang['Purge compiled templates'] = 'Dzēst izveidotās veidnes';
-$lang['Show upload link every time'] = 'Rādīt augšupielādes saiti katru reizi';
-$lang['User access level to upload'] = 'Lietotāja piekļuves līmenis augšupielādei';
 $lang['ACCESS_0'] = 'Brīva piekļuve';
 $lang['ACCESS_1'] = 'Piekļuve visiem';
@@ -720,5 +710,4 @@
 $lang['The following tag was deleted'] = 'Izdzēsta sekojošas iezīme';
 $lang['Miscellaneous'] = 'Dažāds';
-$lang['User Upload'] = 'Lietotāja augšupielāde';
 $lang['Virtual Links'] = 'Virtuālās saites';
 $lang['There is no other language available.'] = 'Cita valoda nav pieejama.';
Index: /trunk/language/lv_LV/common.lang.php
===================================================================
--- /trunk/language/lv_LV/common.lang.php	(revision 8650)
+++ /trunk/language/lv_LV/common.lang.php	(revision 8651)
@@ -45,6 +45,4 @@
 $lang['%d new user'] = "%d jauns lietotājs";
 $lang['%d new users'] = "%d jauni lietotāji";
-$lang['%d waiting element'] = "%d gaidīt elementu";
-$lang['%d waiting elements'] = "%d gaidīt elementus";
 $lang['About'] = "Par";
 $lang['All tags'] = "Visi tagi";
@@ -320,5 +318,4 @@
 $lang['Picture name: %s'] = "Attēla vārds: %s";
 $lang['Creation date: %s'] = "Izveides datums: %s";
-$lang['Waiting page: %s'] = "Gaida lapu: %s";
 $lang['Picture uploaded by %s'] = "Attēlu augšupielādējis %s";
 $lang['Bad status for user "guest", using default status. Please notify the webmaster.'] = "Lietotāja \"viesis\" nepareizs satuss, lietojiet statusu pēc noklusējuma. Lūdzu informējiet webmasteru.";
Index: unk/language/lv_LV/help/help_user_upload.html
===================================================================
--- /trunk/language/lv_LV/help/help_user_upload.html	(revision 8650)
+++ 	(revision )
@@ -1,12 +1,0 @@
-<p>Arī lietotāji var augšupielādēt savus attēlus.</p>
-
-<ol>
-
-<li>Atļauj augšuplādēt jebkurā reālā kategorijā (<span class="pwgScreen">Administrēšanas &raquo; Kategorijas &raquo; Pārvaldes &raquo; rediģēt</span> vai <span class="pwgScreen">Administrēšanas &raquo; Kategorijas &raquo; Rekvizītu &raquo; Augšupielāde</span>). Virtuālajās kategorijās nav iespējams augšuplādēt.</li>
-
-<li>Piešķirt rakstīšanas tiesības attiecīgajām mapēm.</li>
-
-</ol>
-
-<p>Lietotāju augšupielādētie attēli uzreiz nav redzami web lapā. Administratoram jāratificē augšuplādētie attēli <span class="pwgScreen">Administrēšanas &raquo; Attēlu &raquo;
-Jāgaida</span> kamēr piedāvātie attēli tiek vainu akceptēti vai noraidīti.</p>
Index: /trunk/language/mk_MK/common.lang.php
===================================================================
--- /trunk/language/mk_MK/common.lang.php	(revision 8650)
+++ /trunk/language/mk_MK/common.lang.php	(revision 8651)
@@ -53,6 +53,4 @@
 $lang['%d image is also linked to current tags'] = '%d фотографија е поврзана со овие етикети';
 $lang['%d images are also linked to current tags'] = '%d фотографии се поврзани со овие етикети';
-$lang['%d waiting element'] = '%d елемент во редот на чекање';
-$lang['%d waiting elements'] = '%d елементи во редот на чекање';
 $lang['About'] = 'Помош';
 $lang['All tags'] = 'Сите етикети';
@@ -331,5 +329,4 @@
 $lang['Picture name: %s'] = 'Име на фотографијата: %s';
 $lang['Creation date: %s'] = 'Дата на создавање: %s';
-$lang['Waiting page: %s'] = 'Страна на чекање: %s';
 $lang['Picture uploaded by %s'] = 'Фотографијата е прикачена од %s';
 $lang['Bad status for user "guest", using default status. Please notify the webmaster.'] = 'Грешка при најавувањето како гостин.';
Index: /trunk/language/nl_NL/admin.lang.php
===================================================================
--- /trunk/language/nl_NL/admin.lang.php	(revision 8650)
+++ /trunk/language/nl_NL/admin.lang.php	(revision 8651)
@@ -47,6 +47,4 @@
 $lang['%d users'] = '%d gebruikers';
 $lang['%d waiting for validation'] = '%d wachten op bevestiging';
-$lang['%d waiting pictures rejected'] = '%d plaatje\'s afgewezen';
-$lang['%d waiting pictures validated'] = '%d plaatje\'s toegestaan';
 $lang['Actions'] = 'Acties';
 $lang['Activate'] = 'Activeer';
@@ -89,5 +87,4 @@
 $lang['Email admins when a valid comment is entered'] = 'Stuur email naar beheerders wannneer een geldig commentaar is ingevuld';
 $lang['Email admins when a comment requires validation'] = 'Stuur email naar beheerders wanneer een commantaar validatie nodig heeft';
-$lang['Email admins when a picture is uploaded'] = 'Stuur email naar beheerders wanneer een afbeelding is ge-upload';
 $lang['Empty caddie'] = 'Verwijder alle afbeeldingen uit het winkelmandje';
 $lang['Environment'] = 'Omgeving';
@@ -148,5 +145,4 @@
 $lang['Rating by guests'] = 'Ook gasten kunnen waarderen';
 $lang['Rating'] = 'Waardering';
-$lang['Reject All'] = 'Alles afwijzen';
 $lang['Reject'] = 'Afwijzen';
 $lang['Representant'] = 'Representant';
@@ -174,5 +170,4 @@
 $lang['User comments validation'] = 'Gebruikers-commentaren die wachten op validatie';
 $lang['Users'] = 'Gebruikers';
-$lang['Validate All'] = 'Valideer alles';
 $lang['Validate'] = 'Valideren';
 $lang['Validation'] = 'Validatie van commentaar voor plaatsing is nodig';
@@ -198,5 +193,4 @@
 $lang['Public / Private'] = 'Openbaar / Privé';
 $lang['Manage authorizations for selected albums'] = 'Beheer toegang voor geselecteerde categorieën';
-$lang['Select uploadable albums'] = 'Selecteer categorieën waarnaar geupload mag worden';
 $lang['Virtual album added'] = 'Virtuele categorie toegevoegd';
 $lang['Virtual album deleted'] = 'Virtuele categorie verwijderd';
@@ -216,5 +210,4 @@
 $lang['edit album permissions'] = 'bewerk categorie rechten';
 $lang['Album updated successfully'] = 'Categorie informatie is met succes bijgewerkt.';
-$lang['Authorize upload'] = 'Toestaan van uploads';
 $lang['elements per page'] = 'Afbeeldingen per pagina';
 $lang['elements'] = 'Afbeeldingen';
@@ -361,5 +354,4 @@
 $lang['Thumbnail creation'] = 'Mini-afbeeldingen maken';
 $lang['Database synchronization with files'] = 'Database synchronisatie met bestanden';
-$lang['Pictures waiting for validation'] = 'Afbeeldingen die wachten op validatie';
 $lang['all'] = 'Allen';
 $lang['pictures without thumbnail (jpeg and png only)'] = 'afbeeldingen zonder mini-afbeelding (alleen jpeg en png)';
@@ -552,6 +544,4 @@
 $lang['Support'] = 'Piwigo Forum';
 $lang['Documentation'] = 'Documentatie';
-$lang['Show upload link every time'] = 'Geef de upload link altijd weer op het scherm';
-$lang['User access level to upload'] = 'Welk toegangsniveau heeft de gebruiker nodig om te kunnen uploaden';
 $lang['ACCESS_0'] = 'Vrije toegang';
 $lang['ACCESS_1'] = 'Toegang tot alles';
@@ -722,5 +712,4 @@
 $lang['Set as default language for unregistered and new users'] = 'Stel in als standaardtaal voor niet geregistreerde en nieuwe gebruikers';
 $lang['Miscellaneous'] = 'Diverse';
-$lang['User Upload'] = 'Upload door gebruikers';
 $lang['Virtual Links'] = 'Virtuele Links';
 $lang['Add Photos'] = 'Afbeeldingen toevoegen';
Index: /trunk/language/nl_NL/common.lang.php
===================================================================
--- /trunk/language/nl_NL/common.lang.php	(revision 8650)
+++ /trunk/language/nl_NL/common.lang.php	(revision 8651)
@@ -45,6 +45,4 @@
 $lang['%d new user'] = '%d nieuwe gebruiker';
 $lang['%d new users'] = '%d nieuwe gebruikers';
-$lang['%d waiting element'] = '%d wachtende afbeelding';
-$lang['%d waiting elements'] = '%d wachtende afbeeldingen';
 $lang['About'] = 'Over';
 $lang['All tags'] = 'Alle tags';
@@ -321,5 +319,4 @@
 $lang['Picture name: %s'] = 'Afbeeldingsnaam: %s';
 $lang['Creation date: %s'] = 'Aanmaakdatum: %s';
-$lang['Waiting page: %s'] = 'Wacht pagina: %s';
 $lang['Picture uploaded by %s'] = 'Afbeelding ge-uploaded door %s';
 // --------- Starting below: New or revised $lang ---- from version 1.7.1
Index: unk/language/nl_NL/help/help_user_upload.html
===================================================================
--- /trunk/language/nl_NL/help/help_user_upload.html	(revision 8650)
+++ 	(revision )
@@ -1,13 +1,0 @@
-<!--TODO--><p>Users can upload their photos too.</p>
-
-<ol>
-
-  <!--TODO--><li>Authorize upload on any physical categories (<span class="pwgScreen">Administration &raquo; Categories &raquo; Manage &raquo; edit</span> or <span class="pwgScreen">Administration &raquo; Categories &raquo; Properties &raquo; Upload</span>). Virtual categories can't receive any upload.</li>
-
-  <li>geef rechten op de mappen 777 (gebruiker, groepen, wereld)</li>
-
-</ol>
-
-<!--TODO--><p>Photos uploaded by users are not directly visible on the website. An administrator
-must validate uploaded photos in <span class="pwgScreen">Administration &raquo; Pictures &raquo; Waiting</span>.</p>
-
Index: /trunk/language/no_NO/admin.lang.php
===================================================================
--- /trunk/language/no_NO/admin.lang.php	(revision 8650)
+++ /trunk/language/no_NO/admin.lang.php	(revision 8651)
@@ -45,6 +45,4 @@
 $lang['%d users'] = '%d brukere';
 $lang['%d waiting for validation'] = '%d venter på validering';
-$lang['%d waiting pictures rejected'] = '%d ventende bilder avvist';
-$lang['%d waiting pictures validated'] = '%d ventende bilder validert';
 $lang['Actions'] = 'Tiltak';
 $lang['Activate'] = 'Aktiver';
@@ -87,5 +85,4 @@
 $lang['Email admins when a valid comment is entered'] = 'Email administrator når en kommentar blir lagt til';
 $lang['Email admins when a comment requires validation'] = 'Email administrator når en kommentar trenger godkjenning';
-$lang['Email admins when a picture is uploaded'] = 'Email administrator når et bilde er lastet opp';
 $lang['Empty caddie'] = 'Tøm kurv';
 $lang['Environment'] = 'Miljø';
@@ -146,5 +143,4 @@
 $lang['Rating by guests'] = 'Stemt på av gjester';
 $lang['Rating'] = 'Stemming';
-$lang['Reject All'] = 'Avvis alle';
 $lang['Reject'] = 'Avvis';
 $lang['Representant'] = 'Representant';
@@ -172,5 +168,4 @@
 $lang['User comments validation'] = 'Brukerkommentar validering';
 $lang['Users'] = 'Brukere';
-$lang['Validate All'] = 'Valider Alle';
 $lang['Validate'] = 'Valider';
 $lang['Validation'] = 'Validering';
@@ -196,5 +191,4 @@
 $lang['Public / Private'] = 'Offentlig / Privat';
 $lang['Manage authorizations for selected albums'] = 'Behandle autorisasjoner for valgt album';
-$lang['Select uploadable albums'] = 'Velg opplastbare album';
 $lang['Virtual album added'] = 'Virtuelt album lagt til';
 $lang['Virtual album deleted'] = 'Virtuelt album slettet';
@@ -214,5 +208,4 @@
 $lang['edit album permissions'] = 'rediger album rettigheter';
 $lang['Album updated successfully'] = 'Album vellykket oppdatert';
-$lang['Authorize upload'] = 'Godkjenn opplasting';
 $lang['elements per page'] = 'elementer per side';
 $lang['elements'] = 'elementer';
@@ -360,5 +353,4 @@
 $lang['Thumbnail creation'] = 'Lag miniatyr bilder';
 $lang['Database synchronization with files'] = 'Database synkronisering med filer';
-$lang['Pictures waiting for validation'] = 'Bilder som avventer validering';
 $lang['all'] = 'alle';
 $lang['pictures without thumbnail (jpeg and png only)'] = 'bilder uten miniatyrer (kun jpeg og png)';
@@ -548,6 +540,4 @@
 $lang['Can\'t connect to server.'] = 'Tilkobling til server ikke mulig.';
 $lang['Purge compiled templates'] = 'Tøm kompilerte maler (templates)';
-$lang['Show upload link every time'] = 'Vis "last opp" link hele tiden';
-$lang['User access level to upload'] = 'Bruker tilgangs nivå for opplasting';
 $lang['ACCESS_0'] = 'Fri tillgang';
 $lang['ACCESS_1'] = 'Tilgjengelig for alle';
@@ -720,5 +710,4 @@
 $lang['The following tag was deleted'] = 'Følgende tag er slettet';
 $lang['Miscellaneous'] = 'Diverse';
-$lang['User Upload'] = 'Bruker opplasting';
 $lang['Virtual Links'] = 'Virtuelle Linker';
 $lang['There is no other language available.'] = 'Det er ingen andre språk tilgjengelig.';
Index: /trunk/language/no_NO/common.lang.php
===================================================================
--- /trunk/language/no_NO/common.lang.php	(revision 8650)
+++ /trunk/language/no_NO/common.lang.php	(revision 8651)
@@ -43,5 +43,4 @@
 $lang['Picture name: %s'] = "Bilde navn: %s";
 $lang['Creation date: %s'] = "Dato opprettet: %s";
-$lang['Waiting page: %s'] = "Avventer side: %s";
 $lang['Picture uploaded by %s'] = "Bilde opplastet av %s";
 $lang['Bad status for user "guest", using default status. Please notify the webmaster.'] = "Feil status for bruker \"gjest\", default status vil bli brukt. Vennligst kontakt webmaster.";
@@ -141,6 +140,4 @@
 $lang['%d new user'] = '%d ny bruker';
 $lang['%d new users'] = '%d nye brukere';
-$lang['%d waiting element'] = '%d ventende element';
-$lang['%d waiting elements'] = '%d ventende elementer';
 $lang['About'] = 'Om';
 $lang['All tags'] = 'Alle ord';
Index: unk/language/no_NO/help/help_user_upload.html
===================================================================
--- /trunk/language/no_NO/help/help_user_upload.html	(revision 8650)
+++ 	(revision )
@@ -1,15 +1,0 @@
-<p>Brukere kan også laste opp sine bilder.</p>
-
-<ol>
-
-  <li>Tillat opplasting på hvilket som helst fysisk album(<span class="pwgScreen">Administrasjon &raquo; Album &raquo; Behandle
-  &raquo; rediger album</span> eller <span class="pwgScreen">Administrasjon &raquo;
-  Album &raquo; Egenskaper &raquo; Last opp</span>). Virtuelle album kan ikke lastes opp til.</li>
-
-  <li>Gi skrive tilgang på gjeldende album.</li>
-
-</ol>
-
-<p>Bilder lastet opp av brukere blir ikke direkte synlige på siden. En
-administrator må validere opllastede bilder i <span class="pwgScreen">Administrasjon &raquo; Foto &raquo;
-Avventer</span> for å akseptere eller avvise de foreslåtte bildene.</p>
Index: /trunk/language/pl_PL/admin.lang.php
===================================================================
--- /trunk/language/pl_PL/admin.lang.php	(revision 8650)
+++ /trunk/language/pl_PL/admin.lang.php	(revision 8651)
@@ -47,6 +47,4 @@
 $lang['%d users'] = '%d użytkowników';
 $lang['%d waiting for validation'] = '%d oczekujących na zatwierdzenie';
-$lang['%d waiting pictures rejected'] = '%d oczekujących zdjęć odrzuconych';
-$lang['%d waiting pictures validated'] = '%d oczekujących zdjęć zatwierdzonych';
 $lang['Actions'] = 'Akcje';
 $lang['Activate'] = 'Aktywacja';
@@ -89,5 +87,4 @@
 $lang['Email admins when a valid comment is entered'] = 'Wyślij wiadomość do administratora gdy zostanie wprowadzony poprawny komentarz';
 $lang['Email admins when a comment requires validation'] = 'Wyślij wiadomość do administratora gdy komentarz wymaga weryfikacji';
-$lang['Email admins when a picture is uploaded'] = 'Wyślij wiadomość do administratora gdy został wgrany nowy obraz';
 $lang['Empty caddie'] = 'Wyczyść koszyk';
 $lang['Environment'] = 'Środowisko';
@@ -148,5 +145,4 @@
 $lang['Rating by guests'] = 'Oceny przez gości';
 $lang['Rating'] = 'Oceny';
-$lang['Reject All'] = 'Odrzuć wszystkie';
 $lang['Reject'] = 'Odrzuć';
 $lang['Representant'] = 'Reprezentant';
@@ -173,5 +169,4 @@
 $lang['User comments validation'] = 'Zatwierdzanie komentarzy użytkowników';
 $lang['Users'] = 'Użytkownicy';
-$lang['Validate All'] = 'Zatwierdź wszystkie';
 $lang['Validate'] = 'Zatwierdź';
 $lang['Validation'] = 'Zatwierdzanie';
@@ -197,5 +192,4 @@
 $lang['Public / Private'] = 'Publiczne / Prywatne';
 $lang['Manage authorizations for selected albums'] = 'Zarządzaj autoryzacjami do zaznaczonych albumów';
-$lang['Select uploadable albums'] = 'Wybierz albumy umożliwiające upload';
 $lang['Virtual album added'] = 'Album wirtualny dodany';
 $lang['Virtual album deleted'] = 'Album wirtualny usunięty';
@@ -215,5 +209,4 @@
 $lang['edit album permissions'] = 'edytuj uprawnienia albumu';
 $lang['Album updated successfully'] = 'Informacje o albumie zostały zaktualizowane pomyślnie.';
-$lang['Authorize upload'] = 'Zautoryzuj upload';
 $lang['elements per page'] = 'elementów na stronę';
 $lang['elements'] = 'elementy';
@@ -361,5 +354,4 @@
 $lang['Thumbnail creation'] = 'Tworzenie miniatur';
 $lang['Database synchronization with files'] = 'Synchronizacja bazy danych z plikami';
-$lang['Pictures waiting for validation'] = 'Obrazy oczekujące na akceptację';
 $lang['all'] = 'wszystkie';
 $lang['pictures without thumbnail (jpeg and png only)'] = 'obrazy bez miniatur (tylko pliki jpeg i png)';
@@ -552,6 +544,4 @@
 $lang['Can\'t connect to server.'] = 'Nie można połączyć się do serwera.';
 $lang['Purge compiled templates'] = 'Usuń skompilowane szablony';
-$lang['Show upload link every time'] = 'Zawsze pokazuj link wgrywania';
-$lang['User access level to upload'] = 'Poziom uprawnień użytkowników dla wgrywania';
 $lang['ACCESS_0'] = 'Wolny dostęp';
 $lang['ACCESS_1'] = 'Dostęp dla wszystkich';
@@ -727,5 +717,4 @@
 $lang['Download'] = 'Pobierz';
 $lang['The following tag was deleted'] = 'Ten tag został usunięty';
-$lang['User Upload'] = 'Upload użytkowników';
 $lang['Virtual Links'] = 'Wirtualne linki';
 $lang['There is no other language available.'] = 'Nie ma dostępnego innego języka.';
Index: /trunk/language/pl_PL/common.lang.php
===================================================================
--- /trunk/language/pl_PL/common.lang.php	(revision 8650)
+++ /trunk/language/pl_PL/common.lang.php	(revision 8651)
@@ -45,6 +45,4 @@
 $lang['%d new user'] = '%d nowy użytkownik';
 $lang['%d new users'] = '%d nowi użytkownicy';
-$lang['%d waiting element'] = '%d oczekujący element';
-$lang['%d waiting elements'] = '%d oczekujących elementów';
 $lang['About'] = 'O Piwigo';
 $lang['All tags'] = 'Wszystkie tagi';
@@ -322,5 +320,4 @@
 $lang['Picture name: %s'] = 'Nazwa zdjęcia: %s';
 $lang['Creation date: %s'] = 'Data utworzenia: %s';
-$lang['Waiting page: %s'] = 'Strona oczekująca: %s';
 $lang['Picture uploaded by %s'] = 'Zdjęcie wgrane przez %s';
 // --------- Starting below: New or revised $lang ---- from version 1.7.1
Index: unk/language/pl_PL/help/help_user_upload.html
===================================================================
--- /trunk/language/pl_PL/help/help_user_upload.html	(revision 8650)
+++ 	(revision )
@@ -1,14 +1,0 @@
-<p>Piwigo oferuje możliwość wgrywania plików przez użytkowników..</p>
-
-<ol>
-
-  <li>Aby włączyć upload na kategorii (<span
-  class="pwgScreen">Administracja &raquo; Kategorie &raquo; Zarządzaj &raquo; edit</span> or <span
-  class="pwgScreen">Administracja &raquo; Kategorie &raquo; Properties &raquo; Upload</span>). Nie ma możliwości wgrywania plików do kategorii wirtualnych.</li>
-
-  <li>Musisz nadać uprawnienia do zapisu na odpowiednich katalogach.</li>
-
-</ol>
-
-<p>Pliki wgrane przez użytkowników nie są od razu widoczne na stronie, ale oczekują na zatwierdzenie przez administratora. W tym celu, administrator musi przejść do <span class="pwgScreen">Administracja &raquo; Obrazy &raquo; Oczekujące</span>.</p>
-
Index: /trunk/language/pt_BR/admin.lang.php
===================================================================
--- /trunk/language/pt_BR/admin.lang.php	(revision 8650)
+++ /trunk/language/pt_BR/admin.lang.php	(revision 8651)
@@ -47,6 +47,4 @@
 $lang['%d users'] = '%d usuários';
 $lang['%d waiting for validation'] = '%d aguardando aprovação';
-$lang['%d waiting pictures rejected'] = '%d imagens à espera foram rejeitadas';
-$lang['%d waiting pictures validated'] = '%d imagens à espera foram aprovadas';
 $lang['Actions'] = 'Acões';
 $lang['Activate'] = 'Ativar';
@@ -89,5 +87,4 @@
 $lang['Email admins when a valid comment is entered'] = 'Notificar os administradores quando um comentário aprovado for incluído';
 $lang['Email admins when a comment requires validation'] = 'Notificar os administradores quando um comentário necessitar de aprovação';
-$lang['Email admins when a picture is uploaded'] = 'Notificar os administradores quando uma imagem for enviada';
 $lang['Empty caddie'] = 'Cesta vazia';
 $lang['Environment'] = 'Arredores';
@@ -148,5 +145,4 @@
 $lang['Rating by guests'] = 'Votado(a) pelos visitantes';
 $lang['Rating'] = 'Avaliação';
-$lang['Reject All'] = 'Rejeitar tudo';
 $lang['Reject'] = 'Rejeitar';
 $lang['Representant'] = 'Representante';
@@ -174,5 +170,4 @@
 $lang['User comments validation'] = 'Validação dos comentários de usuário';
 $lang['Users'] = 'Usuários';
-$lang['Validate All'] = 'Aprovar tudo';
 $lang['Validate'] = 'Aprovar';
 $lang['Validation'] = 'Aprovação';
@@ -198,5 +193,4 @@
 $lang['Public / Private'] = 'Público / Privado';
 $lang['Manage authorizations for selected albums'] = 'Gerenciar as autorizações para categorias selecionadas';
-$lang['Select uploadable albums'] = 'Selecionar categorias uploadable';
 $lang['Virtual album added'] = 'Categoria virtual adicionada';
 $lang['Virtual album deleted'] = 'Categoria virtual apagada';
@@ -216,5 +210,4 @@
 $lang['edit album permissions'] = 'editar as permissões da categoria';
 $lang['Album updated successfully'] = 'As informações da categoria foram atualizadas com sucesso.';
-$lang['Authorize upload'] = 'Upload (envio) autorizado';
 $lang['elements per page'] = 'itens por página';
 $lang['elements'] = 'itens';
@@ -363,5 +356,4 @@
 $lang['Thumbnail creation'] = 'Criação de thumbnail (miniatura)';
 $lang['Database synchronization with files'] = 'Sincronização da base de dados com os arquivos';
-$lang['Pictures waiting for validation'] = 'Imagens esperando serem aprovadas';
 $lang['all'] = 'tudo';
 $lang['pictures without thumbnail (jpeg and png only)'] = 'imagens sem miniatura (jpeg e png apenas)';
@@ -554,6 +546,4 @@
 $lang['Can\'t connect to server.'] = 'Não foi possível a conexão com o servidor.';
 $lang['Purge compiled templates'] = 'Limpar os modelos compilados';
-$lang['Show upload link every time'] = 'Mostar o link de upload (envio) todo o tempo';
-$lang['User access level to upload'] = 'Nível de acesso de usuário para fazer upload (enviar)';
 $lang['ACCESS_0'] = 'Acesso livre';
 $lang['ACCESS_1'] = 'Acesso a todos';
@@ -610,5 +600,4 @@
 $lang['Hide'] = 'Esconder';
 $lang['Miscellaneous'] = 'Outras informações';
-$lang['User Upload'] = 'Upload de usuários';
 $lang['Virtual Links'] = 'Links virtuais';
 $lang['Menu Management'] = 'Menu';
Index: /trunk/language/pt_BR/common.lang.php
===================================================================
--- /trunk/language/pt_BR/common.lang.php	(revision 8650)
+++ /trunk/language/pt_BR/common.lang.php	(revision 8651)
@@ -45,6 +45,4 @@
 $lang['%d new user'] = '%d usuário novo';
 $lang['%d new users'] = '%d usuários novos';
-$lang['%d waiting element'] = '%d elemento à espera';
-$lang['%d waiting elements'] = '%d elementos à espera';
 $lang['About'] = 'Sobre';
 $lang['All tags'] = 'Todas as tags';
@@ -322,5 +320,4 @@
 $lang['Picture name: %s'] = 'Nome da imagem: %s';
 $lang['Creation date: %s'] = 'Data de criação: %d';
-$lang['Waiting page: %s'] = 'Página de espera: %s';
 $lang['Picture uploaded by %s'] = 'Imagem enviada por %s';
 // --------- Starting below: New or revised $lang ---- from version 1.7.1
Index: unk/language/pt_BR/help/help_user_upload.html
===================================================================
--- /trunk/language/pt_BR/help/help_user_upload.html	(revision 8650)
+++ 	(revision )
@@ -1,15 +1,0 @@
-<p>Os usuários também podem enviar suas fotos.</p>
-
-<ol>
-
-  <li>Você pode autorizar o upload em qualquer categoria física (<span
-  class="pwgScreen">Administração &raquo; Categorias &raquo; Gerenciar &raquo; editar</span> ou <span
-  class="pwgScreen">Administração &raquo; Categorias &raquo; Propriedades &raquo; Upload</span>). Categorias virtuais não podem receber uploads.</li>
-
-  <li>Dê acesso de escrita nos diretórios correspondentes.</li>
-
-</ol>
-
-<p>As fotos enviadas por usuários não são diretamente visíveis no website. Um administrador
-deve validar as fotos enviadas em <span class="pwgScreen">Administração &raquo; Imagens &raquo; Aguardando</span>.</p>
-
Index: /trunk/language/pt_PT/admin.lang.php
===================================================================
--- /trunk/language/pt_PT/admin.lang.php	(revision 8650)
+++ /trunk/language/pt_PT/admin.lang.php	(revision 8651)
@@ -47,6 +47,4 @@
 $lang['%d users'] = '%d usuários';
 $lang['%d waiting for validation'] = '%d aguardando aprovação';
-$lang['%d waiting pictures rejected'] = '%d imagens à espera foram rejeitadas';
-$lang['%d waiting pictures validated'] = '%d imagens à espera foram aprovadas';
 $lang['Actions'] = 'Acões';
 $lang['Activate'] = 'Ativar';
@@ -89,5 +87,4 @@
 $lang['Email admins when a valid comment is entered'] = 'Notificar os administradores quando um comentário aprovado for incluído';
 $lang['Email admins when a comment requires validation'] = 'Notificar os administradores quando um comentário necessitar uma aprovação';
-$lang['Email admins when a picture is uploaded'] = 'Notificar os administradores quando uma imagem for enviada';
 $lang['Empty caddie'] = 'Carrinho vazio';
 $lang['Environment'] = 'Arredores';
@@ -148,5 +145,4 @@
 $lang['Rating by guests'] = 'Votado(a) pelos visitantes';
 $lang['Rating'] = 'Avaliação';
-$lang['Reject All'] = 'Rejeitar tudo';
 $lang['Reject'] = 'Rejeitar';
 $lang['Representant'] = 'Representante';
@@ -174,5 +170,4 @@
 $lang['User comments validation'] = 'Validação dos comentários de usuário';
 $lang['Users'] = 'Usuários';
-$lang['Validate All'] = 'Aprovar tudo';
 $lang['Validate'] = 'Aprovar';
 $lang['Validation'] = 'Aprovação';
@@ -198,5 +193,4 @@
 $lang['Public / Private'] = 'Público / Privado';
 $lang['Manage authorizations for selected albums'] = 'Gerenciar as autorizações para categorias selecionadas';
-$lang['Select uploadable albums'] = 'Selecionar categorias uploadable';
 $lang['Virtual album added'] = 'Categoria virtual adicionada';
 $lang['Virtual album deleted'] = 'Categoria virtual apagada';
@@ -216,5 +210,4 @@
 $lang['edit album permissions'] = 'editar as permissões da categoria';
 $lang['Album updated successfully'] = 'As informações da categoria foram atualizadas com sucesso.';
-$lang['Authorize upload'] = 'Upload (envio) autorizado';
 $lang['elements per page'] = 'elementos por página';
 $lang['elements'] = 'elementos';
@@ -363,5 +356,4 @@
 $lang['Thumbnail creation'] = 'Criação de thumbnail (miniatura)';
 $lang['Database synchronization with files'] = 'Sincronização da base de dados com os arquivos';
-$lang['Pictures waiting for validation'] = 'Imagens esperando serem aprovadas';
 $lang['all'] = 'tudo';
 $lang['pictures without thumbnail (jpeg and png only)'] = 'imagens sem miniatura (jpeg e png apenas)';
@@ -554,6 +546,4 @@
 $lang['Can\'t connect to server.'] = 'Não foi possível a conexão com o servidor.';
 $lang['Purge compiled templates'] = 'Limpar os modelos compilados';
-$lang['Show upload link every time'] = 'Mostar o link de upload (envio) todo o tempo';
-$lang['User access level to upload'] = 'Nível de acesso de usuário para fazer upload (enviar)';
 $lang['ACCESS_0'] = 'Acesso livre';
 $lang['ACCESS_1'] = 'Acesso a todos';
@@ -609,5 +599,4 @@
 $lang['Hide'] = 'Esconder';
 $lang['Miscellaneous'] = 'Outras informações';
-$lang['User Upload'] = 'Upload de usuários';
 $lang['Virtual Links'] = 'Links virtuais';
 $lang['Menu Management'] = 'Menu';
Index: /trunk/language/pt_PT/common.lang.php
===================================================================
--- /trunk/language/pt_PT/common.lang.php	(revision 8650)
+++ /trunk/language/pt_PT/common.lang.php	(revision 8651)
@@ -45,6 +45,4 @@
 $lang['%d new user'] = '%d usuário novo';
 $lang['%d new users'] = '%d usuários novos';
-$lang['%d waiting element'] = '%d elemento à espera';
-$lang['%d waiting elements'] = '%d elementos à espera';
 $lang['About'] = 'Sobre';
 $lang['All tags'] = 'Todas as tags';
@@ -322,5 +320,4 @@
 $lang['Picture name: %s'] = 'Nome da imagem: %s';
 $lang['Creation date: %s'] = 'Data de criação: %d';
-$lang['Waiting page: %s'] = 'Página de espera: %s';
 $lang['Picture uploaded by %s'] = 'Imagem enviada por %s';
 // --------- Starting below: New or revised $lang ---- from version 1.7.1
Index: unk/language/pt_PT/help/help_user_upload.html
===================================================================
--- /trunk/language/pt_PT/help/help_user_upload.html	(revision 8650)
+++ 	(revision )
@@ -1,15 +1,0 @@
-<p>Os usuários também podem enviar suas fotos.</p>
-
-<ol>
-
-  <li>Você pode autorizar o upload em qualquer categoria física (<span
-  class="pwgScreen">Administração &raquo; Categorias &raquo; Gerenciar &raquo; editar</span> ou <span
-  class="pwgScreen">Administração &raquo; Categorias &raquo; Propriedades &raquo; Upload</span>). Categorias virtuais não podem receber uploads.</li>
-
-  <li>Dê acesso de escrita nos diretórios correspondentes.</li>
-
-</ol>
-
-<p>As fotos enviadas por usuários não são diretamente visíveis no website. Um administrador
-deve validar as fotos enviadas em <span class="pwgScreen">Administração &raquo; Imagens &raquo; Aguardando</span>.</p>
-
Index: /trunk/language/ro_RO/common.lang.php
===================================================================
--- /trunk/language/ro_RO/common.lang.php	(revision 8650)
+++ /trunk/language/ro_RO/common.lang.php	(revision 8651)
@@ -48,6 +48,4 @@
 $lang['%d new user'] = '%d utilizator nou';
 $lang['%d new users'] = '%d utilizatori noi';
-$lang['%d waiting element'] = '%d element în aşteptare';
-$lang['%d waiting elements'] = '%d elemente în aşteptare';
 $lang['About'] = 'Despre';
 $lang['All tags'] = 'Toate etichetele';
@@ -313,5 +311,4 @@
 $lang['Picture name: %s'] = 'Numele imaginii : %s';
 $lang['Creation date: %s'] = 'Data creării : %d';
-$lang['Waiting page: %s'] = 'Pagina de aşteptare : %s';
 $lang['Picture uploaded by %s'] = 'Imagine adăugată de %s';
 $lang['Bad status for user "guest", using default status. Please notify the webmaster.'] = 'Statutul utilizatorului "invitat" este eronat, se vor folosi  parametrii impliciţi. Va rugăm sa informaţi webmasterul.';
Index: /trunk/language/ru_RU/admin.lang.php
===================================================================
--- /trunk/language/ru_RU/admin.lang.php	(revision 8650)
+++ /trunk/language/ru_RU/admin.lang.php	(revision 8651)
@@ -47,6 +47,4 @@
 $lang['%d users'] = '%d пользователей';
 $lang['%d waiting for validation'] = '%d ожидает проверки';
-$lang['%d waiting pictures rejected'] = '%d проверяемых картинок отклонено';
-$lang['%d waiting pictures validated'] = '%d проверяемых картинок принято';
 $lang['Actions'] = 'Действия';
 $lang['Activate'] = 'Активировать';
@@ -89,5 +87,4 @@
 $lang['Email admins when a valid comment is entered'] = 'Сообщать администратору когда появился комментарий';
 $lang['Email admins when a comment requires validation'] = 'Сообщать администратору когда появился комментарий для проверки';
-$lang['Email admins when a picture is uploaded'] = 'Сообщать администратору когда загружена фотография';
 $lang['Empty caddie'] = 'Очистить корзину';
 $lang['Environment'] = 'Окружение';
@@ -148,5 +145,4 @@
 $lang['Rating by guests'] = 'Оценки от гостей';
 $lang['Rating'] = 'Оценки';
-$lang['Reject All'] = 'Отклонить все';
 $lang['Reject'] = 'Отклонить';
 $lang['Representant'] = 'Представитель';
@@ -173,5 +169,4 @@
 $lang['User comments validation'] = 'Проверка комментариев посетителей';
 $lang['Users'] = 'Пользователи';
-$lang['Validate All'] = 'Принять все';
 $lang['Validate'] = 'Принять';
 $lang['Validation'] = 'Проверка';
@@ -197,5 +192,4 @@
 $lang['Public / Private'] = 'Общедоступные / Приватные';
 $lang['Manage authorizations for selected albums'] = 'Управление авторизацией для выбранных альбомов';
-$lang['Select uploadable albums'] = 'Выбор альбомов, доступных для загрузки';
 $lang['Virtual album added'] = 'Виртуальный альбом добавлен';
 $lang['Virtual album deleted'] = 'Виртуальный альбом удален';
@@ -214,5 +208,4 @@
 $lang['edit album permissions'] = 'редактировать разрешения альбома';
 $lang['Album updated successfully'] = 'Информация об альбоме успешно добавлена.';
-$lang['Authorize upload'] = 'Разрешить загрузку';
 $lang['elements per page'] = 'миниатюр на странице';
 $lang['elements'] = 'элементы';
@@ -360,5 +353,4 @@
 $lang['Thumbnail creation'] = 'Создание миниатюр';
 $lang['Database synchronization with files'] = 'Синхронизация базы данных с файлами';
-$lang['Pictures waiting for validation'] = 'Проверка присланных фотографий';
 $lang['all'] = 'все';
 $lang['pictures without thumbnail (jpeg and png only)'] = 'изображения без миниатюр (только jpeg и png)';
@@ -551,6 +543,4 @@
 $lang['Can\'t connect to server.'] = 'Невозможно соединиться с сервером.';
 $lang['Purge compiled templates'] = 'Очистить созданные шаблоны';
-$lang['Show upload link every time'] = 'Показывать ссылку на загрузку постоянно';
-$lang['User access level to upload'] = 'Уровень доступа пользователя для загрузки';
 $lang['ACCESS_0'] = 'Свободный доступ';
 $lang['ACCESS_1'] = 'Доступно для всех';
@@ -725,5 +715,4 @@
 $lang['The following tag was deleted'] = 'Следущие метки были удалены';
 $lang['Miscellaneous'] = 'Разное';
-$lang['User Upload'] = 'Загрузка пользователем';
 $lang['Virtual Links'] = 'Виртуальные ссылки';
 $lang['Templates configuration has been recorded.'] = 'Конфигурация шаблона перезаписана.';
Index: /trunk/language/ru_RU/common.lang.php
===================================================================
--- /trunk/language/ru_RU/common.lang.php	(revision 8650)
+++ /trunk/language/ru_RU/common.lang.php	(revision 8651)
@@ -45,6 +45,4 @@
 $lang['%d new user'] = '%d новый посетитель';
 $lang['%d new users'] = '%d новые посетители';
-$lang['%d waiting element'] = '%d элемент в очереди';
-$lang['%d waiting elements'] = '%d элементов в очереди';
 $lang['About'] = 'О движке';
 $lang['All tags'] = 'Все слова';
@@ -322,5 +320,4 @@
 $lang['Picture name: %s'] = 'Название: %s';
 $lang['Creation date: %s'] = 'Дата съемки: %s';
-$lang['Waiting page: %s'] = 'Страница ожидания: %s';
 $lang['Picture uploaded by %s'] = 'Фотография загружена %s';
 // --------- Starting below: New or revised $lang ---- from version 1.7.1
Index: unk/language/ru_RU/help/help_user_upload.html
===================================================================
--- /trunk/language/ru_RU/help/help_user_upload.html	(revision 8650)
+++ 	(revision )
@@ -1,18 +1,0 @@
-<p>Piwigo предлагает возможность пользователям загружать изображения. Для этого нужно:</p>
-
-<ol>
-
-  <li>разрешить загрузку для какой-либо категории (<span
-  class="pwgScreen">Администрирование, Галереи, Управление, редактировать</span> или <span
-  class="pwgScreen">Администрирование, Галереи, Свойства, Загрузка</span>)</li>
-
-  <li>дать права на запись в папку для ugo (user, group, other)</li>
-
-</ol>
-
-<p>Файлы, загруженные пользователями не видны сразу на сайте, они должны быть
-проверены администратором. Чтобы это сделать, администратор
-должен посетить <span class="pwgScreen">Администрирование, Фотографии, Ожидающие</span>
-и принять или отклонить предложенные файлы, после чего синхронизировать систему
-файлов с базой данных.</p>
-
Index: /trunk/language/sh_RS/admin.lang.php
===================================================================
--- /trunk/language/sh_RS/admin.lang.php	(revision 8650)
+++ /trunk/language/sh_RS/admin.lang.php	(revision 8651)
@@ -47,6 +47,4 @@
 $lang['%d users'] = '%d korisnika';
 $lang['%d waiting for validation'] = '%d čekanje na overu';
-$lang['%d waiting pictures rejected'] = '%d slika na čekanju odbačeno';
-$lang['%d waiting pictures validated'] = '%d slika na čekanju odobreno';
 $lang['Actions'] = 'Postupci';
 $lang['Activate'] = 'Uključi';
@@ -89,5 +87,4 @@
 $lang['Email admins when a valid comment is entered'] = 'E-mail administratorima pri upisu novih komentara';
 $lang['Email admins when a comment requires validation'] = 'Email administratorima kada komentar treba overu';
-$lang['Email admins when a picture is uploaded'] = 'Email administratorima pri slanju novih slika';
 $lang['Empty caddie'] = 'Isprazni fioku';
 $lang['Environment'] = 'Okruženje';
@@ -148,5 +145,4 @@
 $lang['Rating by guests'] = 'Ocene gostiju';
 $lang['Rating'] = 'Ocenjivanje';
-$lang['Reject All'] = 'Odbaci Sve';
 $lang['Reject'] = 'Odbaci';
 $lang['Representant'] = 'Predstavnik';
@@ -174,5 +170,4 @@
 $lang['User comments validation'] = 'Overa korisničkih komentara';
 $lang['Users'] = 'Korisnici';
-$lang['Validate All'] = 'Overi Sve';
 $lang['Validate'] = 'Overi';
 $lang['Validation'] = 'Overa';
@@ -198,5 +193,4 @@
 $lang['Public / Private'] = 'Javno / Lično';
 $lang['Manage authorizations for selected albums'] = 'Upravljanje ovlašćenjima za odabrane kategorije';
-$lang['Select uploadable albums'] = 'Odaberite kategorije u kojima je moguće slanje';
 $lang['Virtual album added'] = 'Virtuelna kategorija dodata';
 $lang['Virtual album deleted'] = 'Virtuelna kategorija izbrisana';
@@ -216,5 +210,4 @@
 $lang['edit album permissions'] = 'uredi dozvole kategorije';
 $lang['Album updated successfully'] = 'Podaci kategorije uspešno obnovljeni.';
-$lang['Authorize upload'] = 'Odobri slanje';
 $lang['elements per page'] = 'elemenata po stranici';
 $lang['elements'] = 'elementi';
@@ -363,5 +356,4 @@
 $lang['Thumbnail creation'] = 'Izrada poveznih sličica';
 $lang['Database synchronization with files'] = 'Sinhronizacija baze podataka sa datotekama';
-$lang['Pictures waiting for validation'] = 'Slike na čekanju overe';
 $lang['all'] = 'sve';
 $lang['pictures without thumbnail (jpeg and png only)'] = 'slike bez poveznih sličica (samo jpeg i png)';
@@ -554,6 +546,4 @@
 $lang['Can\'t connect to server.'] = 'Ne mogu se povezati na server.';
 $lang['Purge compiled templates'] = 'Isprazni obrađene šablone';
-$lang['Show upload link every time'] = 'Prikaži vezu za slanje svaki put';
-$lang['User access level to upload'] = 'Korisnički pristupni nivo potreban za slanje';
 $lang['ACCESS_0'] = 'Slobodan pristup';
 $lang['ACCESS_1'] = 'Pristup svima';
@@ -727,5 +717,4 @@
 $lang['The following tag was deleted'] = 'Tekuća oznaka je obrisana';
 $lang['Miscellaneous'] = 'Ostalo';
-$lang['User Upload'] = 'Korisnici poslali';
 $lang['Virtual Links'] = 'Virtualne veze';
 $lang['There is no other language available.'] = 'Drugi jezik nije dostupan.';
Index: /trunk/language/sh_RS/common.lang.php
===================================================================
--- /trunk/language/sh_RS/common.lang.php	(revision 8650)
+++ /trunk/language/sh_RS/common.lang.php	(revision 8651)
@@ -45,6 +45,4 @@
 $lang['%d new user'] = '%d novi korisnik';
 $lang['%d new users'] = '%d novi korisnici';
-$lang['%d waiting element'] = '%d stavka na čekanju';
-$lang['%d waiting elements'] = '%d stavke na čekanju';
 $lang['About'] = 'O...';
 $lang['All tags'] = 'Svi tagovi';
@@ -322,5 +320,4 @@
 $lang['Picture name: %s'] = 'Naziv slike: %s';
 $lang['Creation date: %s'] = 'Datum izrade: %s';
-$lang['Waiting page: %s'] = 'Stranica čekanja: %s';
 $lang['Picture uploaded by %s'] = 'Sliku prebacio %s';
 // --------- Starting below: New or revised $lang ---- from version 1.7.1
Index: /trunk/language/sk_SK/admin.lang.php
===================================================================
--- /trunk/language/sk_SK/admin.lang.php	(revision 8650)
+++ /trunk/language/sk_SK/admin.lang.php	(revision 8651)
@@ -48,6 +48,4 @@
 $lang['%d users'] = '%d používateľov';
 $lang['%d waiting for validation'] = '%d čaká na schválenie';
-$lang['%d waiting pictures rejected'] = '%d fotografií odmietnutých';
-$lang['%d waiting pictures validated'] = '%d fotografií schválených';
 $lang['Actions'] = 'Akcia';
 $lang['Activate'] = 'Aktivovať';
@@ -90,5 +88,4 @@
 $lang['Email admins when a valid comment is entered'] = 'Poslať e-mail administrátorom pri vložení nového komentára';
 $lang['Email admins when a comment requires validation'] = 'Poslať e-mail administrátorom pri vložení nového komentára vyžadujúceho schválenie.';
-$lang['Email admins when a picture is uploaded'] = 'Poslať e-mail administrátorom pri nahraní novej fotografie.';
 $lang['Empty caddie'] = 'Odstrániť obsah košíku';
 $lang['Environment'] = 'Prostredie';
@@ -149,5 +146,4 @@
 $lang['Rating by guests'] = 'Hodnotenie hosťami';
 $lang['Rating'] = 'Hodnotenie';
-$lang['Reject All'] = 'Zamietnuť všetky';
 $lang['Reject'] = 'Zamietnuť';
 $lang['Representant'] = 'Ukážkové';
@@ -175,5 +171,4 @@
 $lang['User comments validation'] = 'Schválenie komentárov používateľa';
 $lang['Users'] = 'Používatelia';
-$lang['Validate All'] = 'Schváliť všetky';
 $lang['Validate'] = 'Schváliť';
 $lang['Validation'] = 'Schválenie';
@@ -199,5 +194,4 @@
 $lang['Public / Private'] = 'Verejná / Súkromná';
 $lang['Manage authorizations for selected albums'] = 'Nastaviť oprávnenie pre vybrané albumy';
-$lang['Select uploadable albums'] = 'Zvoliť albumy s možnosťou nahrávania obsahu';
 $lang['Virtual album added'] = 'Virtuálny album pridaný';
 $lang['Virtual album deleted'] = 'Virtuálny album zmazaný';
@@ -218,5 +212,4 @@
 $lang['edit album permissions'] = 'upraviť oprávnenie k albumu';
 $lang['Album updated successfully'] = 'Informácie o albume boli úspěšne aktualizované.';
-$lang['Authorize upload'] = 'Povoliť nahrávanie fotografií';
 $lang['elements per page'] = 'položiek na stránke';
 $lang['elements'] = 'položky';
@@ -363,5 +356,4 @@
 $lang['Thumbnail creation'] = 'Vytvoriť náhľad';
 $lang['Database synchronization with files'] = 'Synchronizácia databázy so súbormi';
-$lang['Pictures waiting for validation'] = 'Fotografie čakajúce na schválenie';
 $lang['all'] = 'všetko';
 $lang['pictures without thumbnail (jpeg and png only)'] = 'fotografie bez náhľadu (len jpeg alebo png)';
@@ -552,6 +544,4 @@
 $lang['Purge compiled templates'] = 'Previesť údržbu šablón';
 $lang['Upload'] = 'Nahrať fotografie';
-$lang['Show upload link every time'] = 'Vždy zobraziť odkaz pre nahratie fotografie';
-$lang['User access level to upload'] = 'Povoliť používateľom nahrávať fotografie na server';
 $lang['ACCESS_0'] = 'Voľný prístup';
 $lang['ACCESS_1'] = 'Prístupné všetkým';
@@ -729,5 +719,4 @@
 $lang['The following tag was deleted'] = 'Nasledujúce kľúčové slovo bolo odstránené';
 $lang['Miscellaneous'] = 'Rôzne';
-$lang['User Upload'] = 'Používateľské nahrávanie fotografií';
 $lang['Virtual Links'] = 'Virtuálne odkazy';
 $lang['There is no other language available.'] = 'Nie je dostupný žiadny ďalší jazyk.';
Index: /trunk/language/sk_SK/common.lang.php
===================================================================
--- /trunk/language/sk_SK/common.lang.php	(revision 8650)
+++ /trunk/language/sk_SK/common.lang.php	(revision 8651)
@@ -49,6 +49,4 @@
 $lang['%d new user'] = '%d nový používateľ';
 $lang['%d new users'] = '%d nových používateľov';
-$lang['%d waiting element'] = '%d čakajúci objekt';
-$lang['%d waiting elements'] = '%d čakajúcich objektov';
 $lang['About'] = 'O galérii';
 $lang['All tags'] = 'Všetky kľúčové slová';
@@ -326,5 +324,4 @@
 $lang['Picture name: %s'] = '*Názov fotografie: %s';
 $lang['Creation date: %s'] = 'Dátum vytvorenia: %s';
-$lang['Waiting page: %s'] = 'Čakanie na stránku: %s';
 $lang['Picture uploaded by %s'] = 'Fotografia nahraná %s';
 $lang['Bad status for user "guest", using default status. Please notify the webmaster.'] = 'Zlý stav pre používateľa "hosť", bude použitý východzí stav. Prosím informujte webmastra.';
Index: unk/language/sk_SK/help/help_user_upload.html
===================================================================
--- /trunk/language/sk_SK/help/help_user_upload.html	(revision 8650)
+++ 	(revision )
@@ -1,18 +1,0 @@
-<p>Tiež používatelia môžu nahrávať svoje fotografie.</p>
-
-<ol>
-
-  <li>Povoliť nahrávanie je možné povoliť na akejkoľvek fyzickej kategórii
-  (<span class="pwgScreen">Administrácia &raquo; Kategória &raquo; Správa
-  &raquo; upraviť</span>, alebo <span class="pwgScreen">Administrácia &raquo;
-  Kategória &raquo; Vlastnosti &raquo; Nahrať fotografie</span>). Do virtuálnych kategórii
-  nie je možné uploadovať.</li>
-
-  <li>Povoliť zapisovanie do príslušných adresárov.</li>
-
-</ol>
-
-<p>Fotografie nahrané používateľmi nie su automaticky viditeľné na web stránke. Administrátor
-musí schváliť nahrané fotky
-v <span class="pwgScreen">Administrácia &raquo; Fotografie &raquo;
-Čakajúce</span> na schválenie alebo odmietnutie na uverejnenie fotiek.</p>
Index: /trunk/language/sl_SL/common.lang.php
===================================================================
--- /trunk/language/sl_SL/common.lang.php	(revision 8650)
+++ /trunk/language/sl_SL/common.lang.php	(revision 8651)
@@ -42,6 +42,4 @@
 $lang['%d new user'] = '%d novi uporabnik';
 $lang['%d new users'] = '%d novih uporabnikov';
-$lang['%d waiting element'] = '%d čakajoč element';
-$lang['%d waiting elements'] = '%d čakajočih elementov';
 $lang['About'] = 'Vizitka';
 $lang['All tags'] = 'Vse označbe';
@@ -300,5 +298,4 @@
 $lang['Picture name: %s'] = 'Ime slike: %s';
 $lang['Creation date: %s'] = 'Datum nastanka: %s';
-$lang['Waiting page: %s'] = 'Čakajoče strani: %s';
 $lang['Picture uploaded by %s'] = 'Sliko naložil %s';
 $lang['Bad status for user "guest", using default status. Please notify the webmaster.'] = 'Nepravilen status uporabnika "guest", uporabljen bo privzeti status. Prosim obvestite skrbnika.';
Index: /trunk/language/sr_RS/admin.lang.php
===================================================================
--- /trunk/language/sr_RS/admin.lang.php	(revision 8650)
+++ /trunk/language/sr_RS/admin.lang.php	(revision 8651)
@@ -47,6 +47,4 @@
 $lang['%d users'] = '%d корисника';
 $lang['%d waiting for validation'] = '%d чекање на оверу';
-$lang['%d waiting pictures rejected'] = '%d слика на чекању одбачено';
-$lang['%d waiting pictures validated'] = '%d слика на чекању одобрено';
 $lang['Actions'] = 'Поступци';
 $lang['Activate'] = 'Укључи';
@@ -89,5 +87,4 @@
 $lang['Email admins when a valid comment is entered'] = 'Пошаљи електронску пошту администраторима при упису нових коментара';
 $lang['Email admins when a comment requires validation'] = 'Пошаљи електронску пошту администраторима када коментар треба оверу';
-$lang['Email admins when a picture is uploaded'] = 'Пошаљи електронску пошту администраторима при слању нових слика';
 $lang['Empty caddie'] = 'Испразни фиоку';
 $lang['Environment'] = 'Окружење';
@@ -148,5 +145,4 @@
 $lang['Rating by guests'] = 'Оцене гостију';
 $lang['Rating'] = 'Оцењивање';
-$lang['Reject All'] = 'Одбаци све';
 $lang['Reject'] = 'Одбаци';
 $lang['Representant'] = 'Представник';
@@ -174,5 +170,4 @@
 $lang['User comments validation'] = 'Овера корисничких коментара';
 $lang['Users'] = 'Корисници';
-$lang['Validate All'] = 'Овери све';
 $lang['Validate'] = 'Овери';
 $lang['Validation'] = 'Овера';
@@ -198,5 +193,4 @@
 $lang['Public / Private'] = 'Јавно / Лично';
 $lang['Manage authorizations for selected albums'] = 'Управљање овлашћењима за одабране категорије';
-$lang['Select uploadable albums'] = 'Одаберите категорије у којима је могуће слање';
 $lang['Virtual album added'] = 'Виртуелна категорија додата';
 $lang['Virtual album deleted'] = 'Виртуелна категорија избрисана';
@@ -216,5 +210,4 @@
 $lang['edit album permissions'] = 'уреди дозволе категорије';
 $lang['Album updated successfully'] = 'Подаци категорије успешно обновљени.';
-$lang['Authorize upload'] = 'Одобри слање';
 $lang['elements per page'] = 'елемената по страници';
 $lang['elements'] = 'елементи';
@@ -363,5 +356,4 @@
 $lang['Thumbnail creation'] = 'Израда повезних сличица';
 $lang['Database synchronization with files'] = 'Синхронизација базе података са датотекама';
-$lang['Pictures waiting for validation'] = 'Слике на чекању овере';
 $lang['all'] = 'све';
 $lang['pictures without thumbnail (jpeg and png only)'] = 'слике без повезних сличица (само jpeg и png)';
@@ -554,6 +546,4 @@
 $lang['Can\'t connect to server.'] = 'Не могу се повезати на сервер.';
 $lang['Purge compiled templates'] = 'Испразни обрађене шаблоне';
-$lang['Show upload link every time'] = 'Прикажи везу за слање сваки пут';
-$lang['User access level to upload'] = 'Кориснички приступни ниво потребан за слање';
 $lang['ACCESS_0'] = 'Слободан приступ';
 $lang['ACCESS_1'] = 'Приступ свима';
@@ -727,5 +717,4 @@
 $lang['The following tag was deleted'] = 'Текућа ознака је обрисана';
 $lang['Miscellaneous'] = 'Остало';
-$lang['User Upload'] = 'Корисници послали';
 $lang['Virtual Links'] = 'Виртуалне везе';
 $lang['There is no other language available.'] = 'Други језик није доступан.';
Index: /trunk/language/sr_RS/common.lang.php
===================================================================
--- /trunk/language/sr_RS/common.lang.php	(revision 8650)
+++ /trunk/language/sr_RS/common.lang.php	(revision 8651)
@@ -45,6 +45,4 @@
 $lang['%d new user'] = '%d нови корисник';
 $lang['%d new users'] = '%d нови корисници';
-$lang['%d waiting element'] = '%d ставка на чекању';
-$lang['%d waiting elements'] = '%d ставке на чекању';
 $lang['About'] = 'O...';
 $lang['All tags'] = 'Све ознаке';
@@ -322,5 +320,4 @@
 $lang['Picture name: %s'] = 'Назив слике: %s';
 $lang['Creation date: %s'] = 'Датум израде: %s';
-$lang['Waiting page: %s'] = 'Страница чекања: %s';
 $lang['Picture uploaded by %s'] = 'Слику пребацио %s';
 // --------- Starting below: New or revised $lang ---- from version 1.7.1
Index: /trunk/language/sv_SE/admin.lang.php
===================================================================
--- /trunk/language/sv_SE/admin.lang.php	(revision 8650)
+++ /trunk/language/sv_SE/admin.lang.php	(revision 8651)
@@ -47,6 +47,4 @@
 $lang['%d users'] = '%d användare';
 $lang['%d waiting for validation'] = '%d väntar på godkännande';
-$lang['%d waiting pictures rejected'] = '%d väntande bilder nekade';
-$lang['%d waiting pictures validated'] = '%d väntande bilder godkända';
 $lang['Actions'] = 'Åtgärder';
 $lang['Activate'] = 'Aktivera';
@@ -89,5 +87,4 @@
 $lang['Email admins when a valid comment is entered'] = 'Sänd mail till admin när en giltig kommentar är inlagd';
 $lang['Email admins when a comment requires validation'] = 'Sänd mail till admin när en kommentar väntar på godkännande';
-$lang['Email admins when a picture is uploaded'] = 'Sänd mail till administratörer när en bild är uppladdad';
 $lang['Empty caddie'] = 'Töm korg';
 $lang['Environment'] = 'Miljö';
@@ -148,5 +145,4 @@
 $lang['Rating by guests'] = 'Röstning av gäster';
 $lang['Rating'] = 'Röstning';
-$lang['Reject All'] = 'Neka Alla';
 $lang['Reject'] = 'Neka';
 $lang['Representant'] = 'Representant';
@@ -174,5 +170,4 @@
 $lang['User comments validation'] = 'Validera användar kommentarer';
 $lang['Users'] = 'Användare';
-$lang['Validate All'] = 'Godkänn Alla';
 $lang['Validate'] = 'Godkänn';
 $lang['Validation'] = 'Godkänn';
@@ -198,5 +193,4 @@
 $lang['Public / Private'] = 'Allmän / Privat';
 $lang['Manage authorizations for selected albums'] = 'Hantera behörigheter för markerade kategorier';
-$lang['Select uploadable albums'] = 'Välj kategorier att ladda upp i';
 $lang['Virtual album added'] = 'Virtuell kategori tillagd';
 $lang['Virtual album deleted'] = 'Virtuell kategori borttagen';
@@ -216,5 +210,4 @@
 $lang['edit album permissions'] = 'ändra kategori behörigheter';
 $lang['Album updated successfully'] = 'Kategori informationen har uppdaterats.';
-$lang['Authorize upload'] = 'Godkänn upladdning';
 $lang['elements per page'] = 'element per sida';
 $lang['elements'] = 'element';
@@ -362,5 +355,4 @@
 $lang['Thumbnail creation'] = 'Skapa miniatyrer';
 $lang['Database synchronization with files'] = 'Synkronisera databas med filer';
-$lang['Pictures waiting for validation'] = 'Bilder som väntar på godkännande';
 $lang['all'] = 'alla';
 $lang['pictures without thumbnail (jpeg and png only)'] = 'bilder utan miniatyrbild (enbart jpeg och png)';
@@ -550,6 +542,4 @@
 $lang['Can\'t connect to server.'] = 'Kunde inte ansluta till servern.';
 $lang['Purge compiled templates'] = 'Rensa sammanställda mallar (templates)';
-$lang['Show upload link every time'] = 'Visa "ladda upp" länk hela tiden';
-$lang['User access level to upload'] = 'Tillgänglighets nivå för uppladdning';
 $lang['ACCESS_0'] = 'Fritt tillträde';
 $lang['ACCESS_1'] = 'Tillgänglighet för alla';
@@ -728,5 +718,4 @@
 $lang['The following tag was deleted'] = 'Följande tagg blev borttagen';
 $lang['Miscellaneous'] = 'Diverse';
-$lang['User Upload'] = 'Uppladdning av användare';
 $lang['Virtual Links'] = 'Virtuella Länkar';
 $lang['There is no other language available.'] = 'Det finns inget annat språk tillgängligt.';
Index: /trunk/language/sv_SE/common.lang.php
===================================================================
--- /trunk/language/sv_SE/common.lang.php	(revision 8650)
+++ /trunk/language/sv_SE/common.lang.php	(revision 8651)
@@ -45,5 +45,4 @@
 $lang['Picture name: %s'] = 'Bild namn: %s';
 $lang['Creation date: %s'] = 'Skapad datum: %s';
-$lang['Waiting page: %s'] = 'Väntar på sidan: %s';
 $lang['Picture uploaded by %s'] = 'Bild upp laddad av %s';
 $lang['Bad status for user "guest", using default status. Please notify the webmaster.'] = 'dålig status för användare \"gäst\", default status kommer används Vanligen meddela webmastern..';
@@ -126,6 +125,4 @@
 $lang['Keyword'] = 'sökord';
 $lang['Links'] = 'sökord';
-$lang['%d waiting element'] = '%d avvaktar process';
-$lang['%d waiting elements'] = '%d avvaktar processer';
 $lang['New password confirmation does not correspond'] = 'Nytt lösenord matchar inte';
 $lang['New password sent by email'] = 'Nytt lösenord skickas med e-post';
Index: unk/language/sv_SE/help/help_user_upload.html
===================================================================
--- /trunk/language/sv_SE/help/help_user_upload.html	(revision 8650)
+++ 	(revision )
@@ -1,17 +1,0 @@
-<p>Användare kan också uppladda sina bilder..</p>
-
-<ol>
-
-  <li>Tillåt uppladdning på vilken fysisk kategori du vill
-  (<span class="pwgScreen">Administration &raquo; Kategorier &raquo; Hantera
-  &raquo; ändra</span> eller <span class="pwgScreen">Administration &raquo;
-  Kategorier &raquo; Inställningar &raquo; Ladda upp</span>). Det går inte att tillåta uppladdning till virtuella kategorier.</li>
-
-  <li>Tillåt folk att skriva till motsvarande kataloger.</li>
-
-</ol>
-
-<p>Foton uppladdade av användare visas inte på hemsidan på en gång.
-En administratör måste ta hand om uppladdade foton
-i <span class="pwgScreen">Administration &raquo; Väntande &raquo;
-Foton</span> och godkänna eller neka föreslagna foton.</p>
Index: /trunk/language/tr_TR/admin.lang.php
===================================================================
--- /trunk/language/tr_TR/admin.lang.php	(revision 8650)
+++ /trunk/language/tr_TR/admin.lang.php	(revision 8651)
@@ -45,6 +45,4 @@
 $lang['%d users'] = '%d kullanicilar';
 $lang['%d waiting for validation'] = '%d onay bekleniyor';
-$lang['%d waiting pictures rejected'] = '%d onay bekleyen imaj reddedildi.';
-$lang['%d waiting pictures validated'] = '%d onay bekleyen imajlar reddedildi.';
 $lang['Actions'] = 'Aksiyonlar';
 $lang['Activate'] = 'Aktif';
@@ -87,5 +85,4 @@
 $lang['Email admins when a valid comment is entered'] = 'yeni yorum eklendiginde yöneticiye e-posta gönder';
 $lang['Email admins when a comment requires validation'] = 'yorum onayi oldugunda yöneticiye e-posta gönder';
-$lang['Email admins when a picture is uploaded'] = 'imaj / resim gönderildiginde yöneticiye e-posta gönder';
 $lang['Empty caddie'] = 'Yardimci bos';
 $lang['Environment'] = 'Ortam / Çevre';
@@ -146,5 +143,4 @@
 $lang['Rating by guests'] = 'Misafir Puanları';
 $lang['Rating'] = 'Puan';
-$lang['Reject All'] = 'Hepsini reddet';
 $lang['Reject'] = 'Reddet';
 $lang['Representant'] = 'Temsilen';
@@ -172,5 +168,4 @@
 $lang['User comments validation'] = 'Kullanici yorumlari dogrulama';
 $lang['Users'] = 'Kullanicilar';
-$lang['Validate All'] = 'Hepsini dogrula';
 $lang['Validate'] = 'Dogrula';
 $lang['Validation'] = 'Dogrula';
@@ -196,5 +191,4 @@
 $lang['Public / Private'] = 'Genel / Özel';
 $lang['Manage authorizations for selected albums'] = 'Seçilen albümler için yetkileri yönetimi';
-$lang['Select uploadable albums'] = 'yüklenebilir albümleri seç';
 $lang['Virtual album added'] = 'sanal albüm eklendi';
 $lang['Virtual album deleted'] = 'sanal albüm silindi';
@@ -214,5 +208,4 @@
 $lang['edit album permissions'] = 'albüm yetkilerini düzenle';
 $lang['Album updated successfully'] = 'Albüm bilgileri güncellendi.';
-$lang['Authorize upload'] = 'Yükleme izni';
 $lang['elements per page'] = 'Safya basina içerikler';
 $lang['elements'] = 'içerikler';
@@ -360,5 +353,4 @@
 $lang['Thumbnail creation'] = 'Thumbnail olusturma';
 $lang['Database synchronization with files'] = 'Dosya ile veritabani senkronize';
-$lang['Pictures waiting for validation'] = 'Dogrulama bekliyen resimler';
 $lang['all'] = 'tüm';
 $lang['pictures without thumbnail (jpeg and png only)'] = 'thumbnail olmayan resimler (jpeg ve sadece png)';
@@ -548,6 +540,4 @@
 $lang['Can\'t connect to server.'] = 'Sunucuya bağlantı imkansız.';
 $lang['Purge compiled templates'] = 'Derlenmiş şablonları temizle';
-$lang['Show upload link every time'] = 'Yükleme linkini her zaman göster';
-$lang['User access level to upload'] = 'Yüklemek için kullanıcı erişim seviyesi';
 $lang['ACCESS_0'] = 'Ücretsiz erişim';
 $lang['ACCESS_1'] = 'Herkese erişim';
@@ -685,5 +675,4 @@
 $lang['The following tag was deleted'] = 'Aşağıdaki etiketi silindi';
 $lang['Miscellaneous'] = 'Karışık';
-$lang['User Upload'] = 'Kullanıcı yükleme';
 $lang['Virtual Links'] = 'Sanal Linkler';
 $lang['There is no other language available.'] = 'Kullanılabilir başka bir dil yok.';
Index: /trunk/language/tr_TR/common.lang.php
===================================================================
--- /trunk/language/tr_TR/common.lang.php	(revision 8650)
+++ /trunk/language/tr_TR/common.lang.php	(revision 8651)
@@ -44,6 +44,4 @@
 $lang['%d new user'] = '%d Yeni kullanıcı';
 $lang['%d new users'] = '%d Yeni kullanıcılar';
-$lang['%d waiting element'] = '%d Bekleyen Element';
-$lang['%d waiting elements'] = '%d Bekleyen Elementler';
 $lang['About'] = 'Hakkımızda';
 $lang['All tags'] = 'Tüm Etiketler';
@@ -277,5 +275,4 @@
 $lang['Picture name: %s'] = 'resim Adı: %s';
 $lang['Creation date: %s'] = 'Yaratma Tarihi: %s';
-$lang['Waiting page: %s'] = 'Beklenen Sayfa: %s';
 $lang['Picture uploaded by %s'] = 'resimi Gönderen %s';
 $lang['Bad status for user "guest", using default status. Please notify the webmaster.'] = 'Kullanıcı için kötü statü "ziyaretçi", varsayılan statü kullanılıyor. Lütfen webmaster\'a bildirin';
Index: /trunk/language/vi_VN/admin.lang.php
===================================================================
--- /trunk/language/vi_VN/admin.lang.php	(revision 8650)
+++ /trunk/language/vi_VN/admin.lang.php	(revision 8651)
@@ -47,6 +47,4 @@
 $lang['%d users'] = '%d thành viên';
 $lang['%d waiting for validation'] = 'Có %d hình đang đợi xác nhận';
-$lang['%d waiting pictures rejected'] = 'Đã từ chối %d hình ảnh đang đợi xác nhận';
-$lang['%d waiting pictures validated'] = 'Có %d hình ảnh đang đợi xác nhận để được hiển thị trên gallery';
 $lang['Actions'] = 'Hành động';
 $lang['Activate'] = 'Kích hoạt';
@@ -89,5 +87,4 @@
 $lang['Email admins when a valid comment is entered'] = 'Gởi email cho quản trị khi có một lời bình đã xác nhận được gởi lên gallery.';
 $lang['Email admins when a comment requires validation'] = 'Gởi email cho quản trị khi có một mời bình cần được xác nhận';
-$lang['Email admins when a picture is uploaded'] = 'Gởi email cho quản trị khi có một hình ảnh mới được đăng lên gallery';
 $lang['Empty caddie'] = 'Xoá hết trong caddie';
 $lang['Environment'] = 'Môi trường';
@@ -148,5 +145,4 @@
 $lang['Rating by guests'] = 'Đánh giá bởi khách';
 $lang['Rating'] = 'Đánh giá';
-$lang['Reject All'] = 'Từ chối tất cả';
 $lang['Reject'] = 'Từ chối';
 $lang['Representant'] = 'Hình đại diện';
@@ -174,5 +170,4 @@
 $lang['User comments validation'] = 'Xác nhận lời bình của thành viên';
 $lang['Users'] = 'Thành viên';
-$lang['Validate All'] = 'Xác nhận tất cả';
 $lang['Validate'] = 'Xác nhận';
 $lang['Validation'] = 'Xác nhận';
@@ -198,5 +193,4 @@
 $lang['Public / Private'] = 'Chung / Riêng tư';
 $lang['Manage authorizations for selected albums'] = 'Quản lý sự cho phép đối với những đề mục được chọn';
-$lang['Select uploadable albums'] = 'Chọn những đề mục có thể được phép upload hình ảnh';
 $lang['Virtual album added'] = 'Đề mục ảo đã được thêm vào';
 $lang['Virtual album deleted'] = 'Đề mục ảo đã bị xoá';
@@ -216,5 +210,4 @@
 $lang['edit album permissions'] = 'thay đổi quyền truy cập của đề mục';
 $lang['Album updated successfully'] = 'Thông tin của đề mục đã được cập nhập thành công.';
-$lang['Authorize upload'] = 'Được phép gởi hình';
 $lang['elements per page'] = 'thành phần trên mỗi trang';
 $lang['elements'] = 'thành phần';
@@ -362,5 +355,4 @@
 $lang['Thumbnail creation'] = 'Khởi tạo hình thu nhỏ';
 $lang['Database synchronization with files'] = 'Đồng bộ hóa cơ sở dữ liệu với tệp tin';
-$lang['Pictures waiting for validation'] = 'Hình ảnh đang đợi xác nhận';
 $lang['all'] = 'tất cả';
 $lang['pictures without thumbnail (jpeg and png only)'] = 'hình ảnh không có hình thu nhỏ (chỉ áp dụng cho định dạng jpeg và png)';
@@ -553,6 +545,4 @@
 $lang['Can\'t connect to server.'] = 'Không thể kết nối với máy chủ.';
 $lang['Purge compiled templates'] = 'Don dẹp những template kết hợp';
-$lang['Show upload link every time'] = 'Hiển thị link gởi hình mọi lúc';
-$lang['User access level to upload'] = 'Cấp độ truy xuất của thành viên để được phép gởi hình';
 $lang['ACCESS_0'] = 'Truy xuất tự to';
 $lang['ACCESS_1'] = 'Truy xuất vào tất cả';
@@ -729,5 +719,4 @@
 $lang['The following tag was deleted'] = 'Thẻ sau đây đã bị xóa';
 $lang['Miscellaneous'] = 'Linh tinh';
-$lang['User Upload'] = 'Gởi hình bởi người dùng';
 $lang['Virtual Links'] = 'Liên kết ảo';
 $lang['There is no other language available.'] = 'Không có gói ngôn ngữ nào có thể dùng được.';
Index: /trunk/language/vi_VN/common.lang.php
===================================================================
--- /trunk/language/vi_VN/common.lang.php	(revision 8650)
+++ /trunk/language/vi_VN/common.lang.php	(revision 8651)
@@ -45,6 +45,4 @@
 $lang['%d new user'] = '%d thành viên mới';
 $lang['%d new users'] = '%d thành viên mới';
-$lang['%d waiting element'] = '%d chi tiết hình đang chờ';
-$lang['%d waiting elements'] = '%d chi tiết hình đang chờ';
 $lang['About'] = 'Thông tin về Piwgo';
 $lang['All tags'] = 'Tất cả các tags';
@@ -320,5 +318,4 @@
 $lang['Picture name: %s'] = 'Tên hình: %s';
 $lang['Creation date: %s'] = 'Ngày gởi: %s';
-$lang['Waiting page: %s'] = 'Trang đợi: %s';
 $lang['Picture uploaded by %s'] = 'Hình được gởi bởi %s';
 // --------- Starting below: New or revised $lang ---- from version 1.7.1
Index: /trunk/language/zh_CN/admin.lang.php
===================================================================
--- /trunk/language/zh_CN/admin.lang.php	(revision 8650)
+++ /trunk/language/zh_CN/admin.lang.php	(revision 8651)
@@ -47,6 +47,4 @@
 $lang['%d users'] = '%d 用户';
 $lang['%d waiting for validation'] = '%d 等待确认有效';
-$lang['%d waiting pictures rejected'] = '%d 图片等待被删除';
-$lang['%d waiting pictures validated'] = '%d 图片等待被确认有效';
 $lang['Actions'] = '实施';
 $lang['Activate'] = '激活';
@@ -89,5 +87,4 @@
 $lang['Email admins when a valid comment is entered'] = '当用户发表评论时就通知管理员';
 $lang['Email admins when a comment requires validation'] = '当用户要求确认他的评论时通知管理员';
-$lang['Email admins when a picture is uploaded'] = '当图片被下载时通知管理员';
 $lang['Empty caddie'] = '清空购物篮';
 $lang['Environment'] = '环境';
@@ -148,5 +145,4 @@
 $lang['Rating by guests'] = '游客投票数';
 $lang['Rating'] = '投票';
-$lang['Reject All'] = '取消所有修改';
 $lang['Reject'] = '取消';
 $lang['Representant'] = '代理人';
@@ -174,5 +170,4 @@
 $lang['User comments validation'] = '确认用户评论';
 $lang['Users'] = '用户';
-$lang['Validate All'] = '确认所有评论';
 $lang['Validate'] = '确认';
 $lang['Validation'] = '确认';
@@ -198,5 +193,4 @@
 $lang['Public / Private'] = '公有 / 私有';
 $lang['Manage authorizations for selected albums'] = '管理所选相册的授权';
-$lang['Select uploadable albums'] = '选择可上传的相册';
 $lang['Virtual album added'] = '虚拟相册已添加';
 $lang['Virtual album deleted'] = '虚拟相册已删除';
@@ -216,5 +210,4 @@
 $lang['edit album permissions'] = '修改相册权限';
 $lang['Album updated successfully'] = '相册信息已上传成功.';
-$lang['Authorize upload'] = '允许上传图片';
 $lang['elements per page'] = '每页图片';
 $lang['elements'] = '图';
@@ -362,5 +355,4 @@
 $lang['Thumbnail creation'] = '创建缩略图';
 $lang['Database synchronization with files'] = '根据文件来同步数据库';
-$lang['Pictures waiting for validation'] = '图片等待确认';
 $lang['all'] = '所有';
 $lang['pictures without thumbnail (jpeg and png only)'] = '没有缩略图的图片 (只有jpeg和png)';
@@ -555,6 +547,4 @@
 $lang['Support'] = '支持';
 $lang['Documentation'] = '文档';
-$lang['Show upload link every time'] = '总是显示增加图片链接';
-$lang['User access level to upload'] = '用户可上传权限级别';
 $lang['ACCESS_0'] = '自由存取';
 $lang['ACCESS_1'] = '对所有人开放';
@@ -719,5 +709,4 @@
 $lang['The following tag was deleted'] = '以下标签已删除';
 $lang['Miscellaneous'] = '杂项';
-$lang['User Upload'] = '用户上传';
 $lang['Virtual Links'] = '虚拟链接';
 $lang['There is no other language available.'] = '没有其他可用的语言.';
Index: /trunk/language/zh_CN/common.lang.php
===================================================================
--- /trunk/language/zh_CN/common.lang.php	(revision 8650)
+++ /trunk/language/zh_CN/common.lang.php	(revision 8651)
@@ -45,6 +45,4 @@
 $lang['%d new user'] = '%d 新用户';
 $lang['%d new users'] = '%d 新用户';
-$lang['%d waiting element'] = '%d 等待项';
-$lang['%d waiting elements'] = '%d 等待项';
 $lang['About'] = '关于';
 $lang['All tags'] = '所有标签';
@@ -321,5 +319,4 @@
 $lang['Picture name: %s'] = '图片名: %s';
 $lang['Creation date: %s'] = '创建日期: %d';
-$lang['Waiting page: %s'] = '等待页面: %s';
 $lang['Picture uploaded by %s'] = '图片上载者 %s';
 // --------- Starting below: New or revised $lang ---- from version 1.7.1
Index: unk/language/zh_CN/help/help_user_upload.html
===================================================================
--- /trunk/language/zh_CN/help/help_user_upload.html	(revision 8650)
+++ 	(revision )
@@ -1,12 +1,0 @@
-<p>用户也可以上传他们的相片。</p>
-
-<ol>
-
-  <li>可以给予任何的物理类别上传权限 (<span class="pwgScreen">管理员 &raquo; 类 &raquo; 管理 &raquo; 修改</span> 或者在 <span class="pwgScreen">管理员 &raquo; 类 &raquo; 属性 &raquo; 上传</span>)。虚拟类别不能上传。</li>
-
-  <li>给予相关的文件夹写权限。</li>
-
-</ol>
-
-<p>用户不可以直接把相片上传到网站服务器。管理员必须在 <span class="pwgScreen">管理员 &raquo; 相片 &raquo; 等待</span> 验证上传照片。</p>
-
Index: unk/upload.php
===================================================================
--- /trunk/upload.php	(revision 8650)
+++ 	(revision )
@@ -1,431 +1,0 @@
-<?php
-// +-----------------------------------------------------------------------+
-// | Piwigo - a PHP based picture gallery                                  |
-// +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2010 Piwigo Team                  http://piwigo.org |
-// | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
-// | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
-// +-----------------------------------------------------------------------+
-// | 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.                                                                  |
-// +-----------------------------------------------------------------------+
-
-define('PHPWG_ROOT_PATH','./');
-
-// +-----------------------------------------------------------------------+
-// | Includes                                                              |
-// +-----------------------------------------------------------------------+
-include_once(PHPWG_ROOT_PATH.'include/common.inc.php');
-
-// +-----------------------------------------------------------------------+
-// | Check Access and exit when user status is not ok                      |
-// +-----------------------------------------------------------------------+
-check_status($conf['upload_user_access']);
-
-$username = !empty($_POST['username']) ? $_POST['username']:(is_classic_user() ? $user['username'] : '');
-$mail_address = !empty($_POST['mail_address']) ? $_POST['mail_address'] : (is_classic_user() ? $user['email'] : '');
-$name = !empty($_POST['name']) ? $_POST['name'] : '';
-$author = !empty($_POST['author']) ? $_POST['author'] : (is_classic_user() ? $user['username'] : '');
-$date_creation = !empty($_POST['date_creation']) ? $_POST['date_creation'] : '';
-$comment = !empty($_POST['comment']) ? $_POST['comment'] : '';
-
-//------------------------------------------------------------------- functions
-// The validate_upload function checks if the image of the given path is valid.
-// A picture is valid when :
-//     - width, height and filesize are not higher than the maximum
-//       filesize authorized by the administrator
-//     - the type of the picture is among jpg, gif and png
-// The function returns an array containing :
-//     - $result['type'] contains the type of the image ('jpg', 'gif' or 'png')
-//     - $result['error'] contains an array with the different errors
-//       found with the picture
-function validate_upload( $temp_name, $my_max_file_size,
-                          $image_max_width, $image_max_height )
-{
-  global $conf, $lang, $page, $mail_address;
-
-  $result = array();
-  $result['error'] = array();
-  //echo $_FILES['picture']['name']."<br />".$temp_name;
-  $extension = get_extension( $_FILES['picture']['name'] );
-  if (!in_array($extension, $conf['picture_ext']))
-  {
-    array_push( $result['error'], l10n('the picture must be to the fileformat jpg, gif or png') );
-    return $result;
-  }
-  if ( !isset( $_FILES['picture'] ) )
-  {
-    // do we even have a file?
-    array_push( $result['error'], "You did not upload anything!" );
-  }
-  else if ( $_FILES['picture']['size'] > $my_max_file_size * 1024 )
-  {
-    array_push( $result['error'],
-                l10n('the filesize of the picture must not exceed :').$my_max_file_size.' KB' );
-  }
-  else
-  {
-    // check if we are allowed to upload this file_type
-    // upload de la photo sous un nom temporaire
-    if ( !move_uploaded_file( $_FILES['picture']['tmp_name'], $temp_name ) )
-    {
-      array_push( $result['error'], l10n('can\'t upload the picture on the server') );
-    }
-    else
-    {
-      $size = getimagesize( $temp_name );
-      if ( isset( $image_max_width )
-           and $image_max_width != ""
-           and $size[0] > $image_max_width )
-      {
-        array_push( $result['error'],
-                    l10n('the width of the picture must not exceed :').$image_max_width.' px' );
-      }
-      if ( isset( $image_max_height )
-           and $image_max_height != ""
-           and $size[1] > $image_max_height )
-      {
-        array_push( $result['error'],
-                    l10n('the height of the picture must not exceed :').$image_max_height.' px' );
-      }
-      // $size[2] == 1 means GIF
-      // $size[2] == 2 means JPG
-      // $size[2] == 3 means PNG
-      switch ( $size[2] )
-      {
-      case 1 : $result['type'] = 'gif'; break;
-      case 2 : $result['type'] = 'jpg'; break;
-      case 3 : $result['type'] = 'png'; break;
-      default :
-        array_push( $result['error'], l10n('the picture must be to the fileformat jpg, gif or png') );
-      }
-    }
-  }
-  if ( sizeof( $result['error'] ) > 0 )
-  {
-    // destruction de l'image avec le nom temporaire
-    @unlink( $temp_name );
-  }
-  else
-  {
-    @chmod( $temp_name, 0644);
-  }
-
-  //------------------------------------------------------------ log informations
-  pwg_log();
-
-  return $result;
-}
-
-//-------------------------------------------------- access authorization check
-if (isset($_POST['category']) and is_numeric($_POST['category']))
-{
-  $page['category'] = $_POST['category'];
-}
-else
-if (isset($_GET['cat']) and is_numeric($_GET['cat']))
-{
-  $page['category'] = $_GET['cat'];
-}
-else
-{
-  $page['category'] = null;
-}
-
-if (! empty($page['category']))
-{
-  check_restrictions($page['category']);
-  $category = get_cat_info($page['category']);
-  $category['cat_dir'] = get_complete_dir($page['category']);
-
-  if (url_is_remote($category['cat_dir']) or !$category['uploadable'])
-  {
-    page_forbidden('upload not allowed');
-  }
-}
-else
-{
-  if (isset($_POST['submit']))
-  {
-    // $page['category'] may be set by a futur plugin but without it
-    bad_request('invalid parameters');
-  }
-  else
-  {
-    $category = null;
-  }
-}
-
-$error = array();
-$page['upload_successful'] = false;
-if ( isset( $_GET['waiting_id'] ) )
-{
-  $page['waiting_id'] = $_GET['waiting_id'];
-}
-
-//-------------------------------------------------------------- picture upload
-// verfying fields
-if ( isset( $_POST['submit'] ) and !isset( $_GET['waiting_id'] ) )
-{
-  $path = $category['cat_dir'].$_FILES['picture']['name'];
-  if ( @is_file( $path ) )
-  {
-    array_push( $error, l10n('A picture\'s name already used') );
-  }
-  // test de la présence des champs obligatoires
-  if ( empty($_FILES['picture']['name']))
-  {
-    array_push( $error, l10n('You must choose a picture fileformat for the image') );
-  }
-  if ( !preg_match( '/([_a-z0-9-]+(\.[_a-z0-9-]+)*@[a-z0-9-]+(\.[a-z0-9-]+)+)/',
-             $_POST['mail_address'] ) )
-  {
-    array_push( $error, l10n('mail address must be like xxx@yyy.eee (example : jack@altern.org)') );
-  }
-  if ( empty($_POST['username']) )
-  {
-    array_push( $error, l10n('the username must be given') );
-  }
-
-  $date_creation = '';
-  if ( !empty($_POST['date_creation']) )
-  {
-    list( $day,$month,$year ) = explode( '/', $_POST['date_creation'] );
-    // int checkdate ( int month, int day, int year)
-    if (checkdate($month, $day, $year))
-    {
-      $date_creation = $year.'-'.$month.'-'.$day;
-    }
-    else
-    {
-      array_push( $error, l10n('wrong date') );
-    }
-  }
-  // creation of the "infos" field :
-  // <infos author="Pierrick LE GALL" comment="my comment"
-  //        date_creation="2004-08-14" name="" />
-  $xml_infos = '<infos ';
-  $xml_infos.= encodeAttribute('author', $_POST['author']);
-  $xml_infos.= encodeAttribute('comment', $_POST['comment']);
-  $xml_infos.= encodeAttribute('date_creation', $date_creation);
-  $xml_infos.= encodeAttribute('name', $_POST['name']);
-  $xml_infos.= ' />';
-
-  if ( !preg_match( '/^[a-zA-Z0-9-_.]+$/', $_FILES['picture']['name'] ) )
-  {
-    array_push( $error, l10n('wrong filename') );
-  }
-
-  if ( sizeof( $error ) == 0 )
-  {
-    $result = validate_upload( $path, $conf['upload_maxfilesize'],
-                               $conf['upload_maxwidth'],
-                               $conf['upload_maxheight']  );
-    for ( $j = 0; $j < sizeof( $result['error'] ); $j++ )
-    {
-      array_push( $error, $result['error'][$j] );
-    }
-  }
-
-  if ( sizeof( $error ) == 0 )
-  {
-    $query = 'insert into '.WAITING_TABLE;
-    $query.= ' (storage_category_id,file,username,mail_address,date,infos)';
-    $query.= ' values ';
-    $query.= '('.$page['category'].",'".$_FILES['picture']['name']."'";
-    $query.= ",'".htmlspecialchars( $_POST['username'], ENT_QUOTES)."'";
-    $query.= ",'".$_POST['mail_address']."',".time().",'".$xml_infos."')";
-    $query.= ';';
-    pwg_query( $query );
-    $page['waiting_id'] = pwg_db_insert_id(WAITING_TABLE);
-
-    if ($conf['email_admin_on_picture_uploaded'])
-    {
-      include_once(PHPWG_ROOT_PATH.'include/functions_mail.inc.php');
-
-      $waiting_url = get_absolute_root_url().'admin.php?page=upload';
-
-      $keyargs_content = array
-      (
-        get_l10n_args('Album: %s', get_cat_display_name($category['upper_names'], null, false)),
-        get_l10n_args('Picture name: %s', $_FILES['picture']['name']),
-        get_l10n_args('User: %s', $_POST['username']),
-        get_l10n_args('Email: %s', $_POST['mail_address']),
-        get_l10n_args('Picture name: %s', $_POST['name']),
-        get_l10n_args('Author: %s', $_POST['author']),
-        get_l10n_args('Creation date: %s', $_POST['date_creation']),
-        get_l10n_args('Comment: %s', $_POST['comment']),
-        get_l10n_args('', ''),
-        get_l10n_args('Waiting page: %s', $waiting_url)
-      );
-
-      pwg_mail_notification_admins
-      (
-        get_l10n_args('Picture uploaded by %s', $_POST['username']),
-        $keyargs_content
-      );
-    }
-  }
-}
-
-//------------------------------------------------------------ thumbnail upload
-if ( isset( $_POST['submit'] ) and isset( $_GET['waiting_id'] ) )
-{
-  // upload of the thumbnail
-  $query = 'select file';
-  $query.= ' from '.WAITING_TABLE;
-  $query.= ' where id = '.$_GET['waiting_id'];
-  $query.= ';';
-  $result= pwg_query( $query );
-  $row = pwg_db_fetch_assoc( $result );
-  $file = substr ( $row['file'], 0, strrpos ( $row['file'], ".") );
-  $extension = get_extension( $_FILES['picture']['name'] );
-
-  if (($path = mkget_thumbnail_dir($category['cat_dir'], $error)) != false)
-  {
-    $path.= '/'.$conf['prefix_thumbnail'].$file.'.'.$extension;
-    $result = validate_upload( $path, $conf['upload_maxfilesize'],
-                               $conf['upload_maxwidth_thumbnail'],
-                               $conf['upload_maxheight_thumbnail']  );
-    for ( $j = 0; $j < sizeof( $result['error'] ); $j++ )
-    {
-      array_push( $error, $result['error'][$j] );
-    }
-  }
-
-  if ( sizeof( $error ) == 0 )
-  {
-    $query = 'update '.WAITING_TABLE;
-    $query.= " set tn_ext = '".$extension."'";
-    $query.= ' where id = '.$_GET['waiting_id'];
-    $query.= ';';
-    pwg_query( $query );
-    $page['upload_successful'] = true;
-  }
-}
-
-//
-// Start output of page
-//
-$title= l10n('Upload a picture');
-$page['body_id'] = 'theUploadPage';
-include(PHPWG_ROOT_PATH.'include/page_header.php');
-$template->set_filenames(array('upload'=>'upload.tpl'));
-
-// Load category list
-$query = '
-SELECT
-  id, name, uppercats, global_rank
-FROM '.CATEGORIES_TABLE.' INNER JOIN '.USER_CACHE_CATEGORIES_TABLE.'
-  ON id = cat_id and user_id = '.$user['id'].'
-WHERE
-  uploadable = \'true\'
-  '.get_sql_condition_FandF
-    (
-      array
-        (
-          'visible_categories' => 'id',
-        ),
-      'AND'
-    ).'
-;';
-display_select_cat_wrapper($query, array($page['category']), 'categories');
-
-$u_form = PHPWG_ROOT_PATH.'upload.php?cat='.$page['category'];
-if ( isset( $page['waiting_id'] ) )
-{
-$u_form.= '&amp;waiting_id='.$page['waiting_id'];
-}
-
-if ( isset( $page['waiting_id'] ) )
-{
-  $advise_title = l10n('Optional, but recommended : choose a thumbnail to associate to').' '.$_FILES['picture']['name'];
-}
-else
-{
-  $advise_title = l10n('Choose an image');
-}
-
-$template->assign(
-  array(
-    'ADVISE_TITLE' => $advise_title,
-    'NAME' => stripslashes($username),
-    'EMAIL' => $mail_address,
-    'NAME_IMG' => $name,
-    'AUTHOR_IMG' => stripslashes($author),
-    'DATE_IMG' => $date_creation,
-    'COMMENT_IMG' => $comment,
-
-    'F_ACTION' => $u_form,
-
-    'U_RETURN' => make_index_url(array('category' => $category)),
-    )
-  );
-
-$template->assign('errors', $error);
-$template->assign('UPLOAD_SUCCESSFUL', $page['upload_successful'] );
-
-if ( !$page['upload_successful'] )
-{
-//--------------------------------------------------------------------- advises
-  if ( !empty($conf['upload_maxfilesize']) )
-  {
-    $content = l10n('the filesize of the picture must not exceed :');
-    $content.= $conf['upload_maxfilesize'].' KB';
-    $template->append('advises', $content);
-  }
-
-  if ( isset( $page['waiting_id'] ) )
-  {
-    if ( $conf['upload_maxwidth_thumbnail'] != '' )
-    {
-      $content = l10n('the width of the picture must not exceed :');
-      $content.= $conf['upload_maxwidth_thumbnail'].' px';
-      $template->append('advises', $content);
-    }
-    if ( $conf['upload_maxheight_thumbnail'] != '' )
-    {
-      $content = l10n('the height of the picture must not exceed :');
-      $content.= $conf['upload_maxheight_thumbnail'].' px';
-      $template->append('advises', $content);
-    }
-  }
-  else
-  {
-    if ( $conf['upload_maxwidth'] != '' )
-    {
-      $content = l10n('the width of the picture must not exceed :');
-      $content.= $conf['upload_maxwidth'].' px';
-      $template->append('advises', $content);
-    }
-    if ( $conf['upload_maxheight'] != '' )
-    {
-      $content = l10n('the height of the picture must not exceed :');
-      $content.= $conf['upload_maxheight'].' px';
-      $template->append('advises', $content);
-    }
-  }
-  $template->append('advises', l10n('the picture must be to the fileformat jpg, gif or png'));
-
-//----------------------------------------- optionnal username and mail address
-  if ( !isset( $page['waiting_id'] ) )
-  {
-    $template->assign('SHOW_FORM_FIELDS', true);
-  }
-}
-
-//----------------------------------------------------------- html code display
-$template->parse('upload');
-include(PHPWG_ROOT_PATH.'include/page_tail.php');
-?>
