aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorplegall <plg@piwigo.org>2011-01-13 15:24:18 +0000
committerplegall <plg@piwigo.org>2011-01-13 15:24:18 +0000
commitfe569ab1bf4baa44a808a2d6e81bcddc28d61b62 (patch)
treed24dd5bb2db62ce6e8c5143412d549469fc33176
parentf03dcee21a4c5ef3b790de15decddff6c6c23b35 (diff)
feature 2108 added: user upload removed from core. It will come back as a
"new generation" user upload in the Community plugin. git-svn-id: http://piwigo.org/svn/trunk@8651 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r--admin.php1
-rw-r--r--admin/cat_modify.php7
-rw-r--r--admin/cat_options.php53
-rw-r--r--admin/configuration.php39
-rw-r--r--admin/help.php7
-rw-r--r--admin/include/functions_upgrade.php1
-rw-r--r--admin/intro.php19
-rw-r--r--admin/site_update.php82
-rw-r--r--admin/themes/default/template/admin.tpl3
-rw-r--r--admin/themes/default/template/cat_modify.tpl8
-rw-r--r--admin/themes/default/template/configuration.tpl23
-rw-r--r--admin/themes/default/template/intro.tpl4
-rw-r--r--admin/themes/default/template/upload.tpl51
-rw-r--r--admin/upload.php205
-rw-r--r--include/config_default.inc.php28
-rw-r--r--include/constants.php2
-rw-r--r--include/functions_notification.inc.php41
-rw-r--r--install/config.sql3
-rw-r--r--install/db/94-database.php93
-rw-r--r--install/piwigo_structure-mysql.sql19
-rw-r--r--install/piwigo_structure-pdo-sqlite.sql20
-rw-r--r--install/piwigo_structure-pgsql.sql25
-rw-r--r--install/piwigo_structure-sqlite.sql21
-rw-r--r--language/ar_SA/admin.lang.php11
-rw-r--r--language/ar_SA/common.lang.php3
-rw-r--r--language/ar_SA/help/help_user_upload.html16
-rw-r--r--language/ca_ES/admin.lang.php10
-rw-r--r--language/ca_ES/common.lang.php3
-rw-r--r--language/cs_CZ/admin.lang.php11
-rw-r--r--language/cs_CZ/common.lang.php3
-rw-r--r--language/cs_CZ/help/help_user_upload.html18
-rw-r--r--language/da_DK/admin.lang.php11
-rw-r--r--language/da_DK/common.lang.php3
-rw-r--r--language/de_DE/admin.lang.php11
-rw-r--r--language/de_DE/common.lang.php3
-rw-r--r--language/de_DE/help/help_user_upload.html13
-rw-r--r--language/en_UK/admin.lang.php11
-rw-r--r--language/en_UK/common.lang.php3
-rw-r--r--language/en_UK/help/help_user_upload.html18
-rw-r--r--language/es_AR/common.lang.php3
-rw-r--r--language/es_ES/admin.lang.php11
-rw-r--r--language/es_ES/common.lang.php3
-rw-r--r--language/es_ES/help/help_user_upload.html16
-rw-r--r--language/fa_IR/admin.lang.php11
-rw-r--r--language/fa_IR/common.lang.php3
-rw-r--r--language/fr_CA/admin.lang.php11
-rw-r--r--language/fr_CA/common.lang.php3
-rw-r--r--language/fr_CA/help/help_user_upload.html14
-rw-r--r--language/fr_FR/admin.lang.php11
-rw-r--r--language/fr_FR/common.lang.php3
-rw-r--r--language/fr_FR/help/help_user_upload.html14
-rw-r--r--language/he_IL/admin.lang.php11
-rw-r--r--language/he_IL/common.lang.php3
-rw-r--r--language/hr_HR/admin.lang.php11
-rw-r--r--language/hr_HR/common.lang.php3
-rw-r--r--language/hu_HU/admin.lang.php11
-rw-r--r--language/hu_HU/common.lang.php3
-rw-r--r--language/hu_HU/help/help_user_upload.html18
-rw-r--r--language/it_IT/admin.lang.php11
-rw-r--r--language/it_IT/common.lang.php3
-rw-r--r--language/it_IT/help/help_user_upload.html14
-rw-r--r--language/ja_JP/admin.lang.php11
-rw-r--r--language/ja_JP/common.lang.php3
-rw-r--r--language/ja_JP/help/help_user_upload.html6
-rw-r--r--language/ka_GE/admin.lang.php11
-rw-r--r--language/ka_GE/common.lang.php3
-rw-r--r--language/ka_GE/help/help_user_upload.html15
-rw-r--r--language/lv_LV/admin.lang.php11
-rw-r--r--language/lv_LV/common.lang.php3
-rw-r--r--language/lv_LV/help/help_user_upload.html12
-rw-r--r--language/mk_MK/common.lang.php3
-rw-r--r--language/nl_NL/admin.lang.php11
-rw-r--r--language/nl_NL/common.lang.php3
-rw-r--r--language/nl_NL/help/help_user_upload.html13
-rw-r--r--language/no_NO/admin.lang.php11
-rw-r--r--language/no_NO/common.lang.php3
-rw-r--r--language/no_NO/help/help_user_upload.html15
-rw-r--r--language/pl_PL/admin.lang.php11
-rw-r--r--language/pl_PL/common.lang.php3
-rw-r--r--language/pl_PL/help/help_user_upload.html14
-rw-r--r--language/pt_BR/admin.lang.php11
-rw-r--r--language/pt_BR/common.lang.php3
-rw-r--r--language/pt_BR/help/help_user_upload.html15
-rw-r--r--language/pt_PT/admin.lang.php11
-rw-r--r--language/pt_PT/common.lang.php3
-rw-r--r--language/pt_PT/help/help_user_upload.html15
-rw-r--r--language/ro_RO/common.lang.php3
-rw-r--r--language/ru_RU/admin.lang.php11
-rw-r--r--language/ru_RU/common.lang.php3
-rw-r--r--language/ru_RU/help/help_user_upload.html18
-rw-r--r--language/sh_RS/admin.lang.php11
-rw-r--r--language/sh_RS/common.lang.php3
-rw-r--r--language/sk_SK/admin.lang.php11
-rw-r--r--language/sk_SK/common.lang.php3
-rw-r--r--language/sk_SK/help/help_user_upload.html18
-rw-r--r--language/sl_SL/common.lang.php3
-rw-r--r--language/sr_RS/admin.lang.php11
-rw-r--r--language/sr_RS/common.lang.php3
-rw-r--r--language/sv_SE/admin.lang.php11
-rw-r--r--language/sv_SE/common.lang.php3
-rw-r--r--language/sv_SE/help/help_user_upload.html17
-rw-r--r--language/tr_TR/admin.lang.php11
-rw-r--r--language/tr_TR/common.lang.php3
-rw-r--r--language/vi_VN/admin.lang.php11
-rw-r--r--language/vi_VN/common.lang.php3
-rw-r--r--language/zh_CN/admin.lang.php11
-rw-r--r--language/zh_CN/common.lang.php3
-rw-r--r--language/zh_CN/help/help_user_upload.html12
-rw-r--r--upload.php431
109 files changed, 99 insertions, 1829 deletions
diff --git a/admin.php b/admin.php
index 7b79f6fce..f03a34e9d 100644
--- a/admin.php
+++ b/admin.php
@@ -125,7 +125,6 @@ $template->assign(
'U_MOVE'=> $link_start.'cat_move',
'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',
'U_RECENT_SET'=> $link_start.'batch_manager&amp;cat=recent',
diff --git a/admin/cat_modify.php b/admin/cat_modify.php
index a30fea4ba..4c0504428 100644
--- a/admin/cat_modify.php
+++ b/admin/cat_modify.php
@@ -69,8 +69,6 @@ if (isset($_POST['submit']))
'id' => $_GET['cat_id'],
'name' => @$_POST['name'],
'commentable' => isset($_POST['commentable'])?$_POST['commentable']:'false',
- 'uploadable' =>
- isset($_POST['uploadable']) ? $_POST['uploadable'] : 'false',
'comment' =>
$conf['allow_html_descriptions'] ?
@$_POST['comment'] : strip_tags(@$_POST['comment']),
@@ -245,7 +243,6 @@ $template->assign(
'CAT_STATUS' => $category['status'],
'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']) ?
'checked="checked"' : '',
@@ -304,10 +301,6 @@ else
$category['cat_full_dir'] )
)
);
- if (!url_is_remote($category['cat_full_dir']) )
- {
- $template->assign('SHOW_UPLOADABLE', true);
- }
}
// image order management
diff --git a/admin/cat_options.php b/admin/cat_options.php
index 638757cb0..3d7a4dd75 100644
--- a/admin/cat_options.php
+++ b/admin/cat_options.php
@@ -47,16 +47,6 @@ if (isset($_POST['falsify'])
{
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' :
{
$query = '
@@ -95,16 +85,6 @@ else if (isset($_POST['trueify'])
{
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' :
{
$query = '
@@ -162,10 +142,6 @@ $tabsheet = new tabsheet();
$opt_link = $link_start.'cat_options&amp;section=';
$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'])
{
@@ -182,8 +158,8 @@ $tabsheet->assign();
// 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
//
// for true and false status, we associates an array of category ids,
@@ -193,31 +169,6 @@ $cats_true = array();
$cats_false = array();
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' :
{
$query_true = '
diff --git a/admin/configuration.php b/admin/configuration.php
index 0f2e8bd34..154538c0f 100644
--- a/admin/configuration.php
+++ b/admin/configuration.php
@@ -60,11 +60,6 @@ $history_checkboxes = array(
'history_guest'
);
-$upload_checkboxes = array(
- 'upload_link_everytime',
- 'email_admin_on_picture_uploaded',
- );
-
$comments_checkboxes = array(
'comments_forall',
'comments_validation',
@@ -144,14 +139,6 @@ if (isset($_POST['submit']))
}
break;
}
- case 'upload' :
- {
- foreach( $upload_checkboxes as $checkbox)
- {
- $_POST[$checkbox] = empty($_POST[$checkbox])?'false':'true';
- }
- break;
- }
case 'default' :
{
// Never go here
@@ -217,10 +204,6 @@ $tabsheet->add('main', l10n('Main'), $conf_link.'main');
$tabsheet->add('display', l10n('Display'), $conf_link.'display');
$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
$tabsheet->select($page['section']);
@@ -300,28 +283,6 @@ switch ($page['section'])
}
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' :
{
$edit_user = build_user($conf['guest_id'], false);
diff --git a/admin/help.php b/admin/help.php
index e2eafd1e8..f61542fc2 100644
--- a/admin/help.php
+++ b/admin/help.php
@@ -46,13 +46,6 @@ $tabs[] = array(
'code' => 'groups',
'label' => l10n('Groups'),
);
-if ($conf['enable_synchronization'])
-{
- $tabs[] = array(
- 'code' => 'user_upload',
- 'label' => l10n('User Upload'),
- );
-}
$tabs[] = array(
'code' => 'virtual_links',
'label' => l10n('Virtual Links'),
diff --git a/admin/include/functions_upgrade.php b/admin/include/functions_upgrade.php
index 50150f64a..dfc2bad41 100644
--- a/admin/include/functions_upgrade.php
+++ b/admin/include/functions_upgrade.php
@@ -54,7 +54,6 @@ function prepare_conf_upgrade()
define('USERS_TABLE', $prefixeTable.'users');
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');
define('USER_CACHE_CATEGORIES_TABLE', $prefixeTable.'user_cache_categories');
diff --git a/admin/intro.php b/admin/intro.php
index 3908891d9..38d944183 100644
--- a/admin/intro.php
+++ b/admin/intro.php
@@ -239,25 +239,6 @@ SELECT MIN(date_available)
);
}
-// 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 = '
SELECT COUNT(*)
diff --git a/admin/site_update.php b/admin/site_update.php
index d0577070c..abd239da8 100644
--- a/admin/site_update.php
+++ b/admin/site_update.php
@@ -240,9 +240,6 @@ SELECT id_uppercat, MAX(rank)+1 AS next_rank
'site_id' => $site_id,
'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']),
);
@@ -312,7 +309,7 @@ SELECT id_uppercat, MAX(rank)+1 AS next_rank
{
$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);
}
@@ -359,7 +356,6 @@ if (isset($_POST['submit']) and $_POST['sync'] == 'files'
$cat_ids = array_diff(array_keys($db_categories), $to_delete);
$db_elements = array();
- $db_unvalidated = array();
if (count($cat_ids) > 0)
{
@@ -373,26 +369,6 @@ SELECT id, path
"\n"
).')';
$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']
- );
- }
}
// next element id available
@@ -403,7 +379,7 @@ SELECT file,storage_category_id
$inserts = array();
$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();
// storage category must exist
@@ -529,60 +505,6 @@ SELECT file,storage_category_id
$template->append('footer_elements', '<!-- scanning files : '
. 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);
- }
- }
}
// +-----------------------------------------------------------------------+
diff --git a/admin/themes/default/template/admin.tpl b/admin/themes/default/template/admin.tpl
index 415fbe3ee..43e9d7105 100644
--- a/admin/themes/default/template/admin.tpl
+++ b/admin/themes/default/template/admin.tpl
@@ -18,9 +18,6 @@ jQuery(document).ready(function(){ldelim}
<dd>
<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>
<li><a href="{$U_CADDIE}">{'Caddie'|@translate}</a></li>
diff --git a/admin/themes/default/template/cat_modify.tpl b/admin/themes/default/template/cat_modify.tpl
index d3fd98c1c..6fe92a6f5 100644
--- a/admin/themes/default/template/cat_modify.tpl
+++ b/admin/themes/default/template/cat_modify.tpl
@@ -85,14 +85,6 @@
{html_radios name='commentable' values='false,true'|@explode output='No,Yes'|@explode|translate selected=$CAT_COMMENTABLE}
</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>
diff --git a/admin/themes/default/template/configuration.tpl b/admin/themes/default/template/configuration.tpl
index 903255baf..8d8395206 100644
--- a/admin/themes/default/template/configuration.tpl
+++ b/admin/themes/default/template/configuration.tpl
@@ -187,29 +187,6 @@
</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>
-{/if}
-
</div> <!-- configContent -->
{if isset($default)}
diff --git a/admin/themes/default/template/intro.tpl b/admin/themes/default/template/intro.tpl
index b3dbfbbac..81d1d163f 100644
--- a/admin/themes/default/template/intro.tpl
+++ b/admin/themes/default/template/intro.tpl
@@ -37,10 +37,6 @@ jQuery().ready(function(){ldelim}
<ul>
<li>
{$DB_ELEMENTS}
- {if isset($waiting)}
- (<a href="{$waiting.URL}">{$waiting.INFO}</a>)
- {/if}
-
{if isset($first_added)}
({$first_added.DB_DATE})
{/if}
diff --git a/admin/themes/default/template/upload.tpl b/admin/themes/default/template/upload.tpl
deleted file mode 100644
index 44578c715..000000000
--- a/admin/themes/default/template/upload.tpl
+++ /dev/null
@@ -1,51 +0,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>
diff --git a/admin/upload.php b/admin/upload.php
deleted file mode 100644
index e97198b18..000000000
--- a/admin/upload.php
+++ /dev/null
@@ -1,205 +0,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');
-?>
diff --git a/include/config_default.inc.php b/include/config_default.inc.php
index acec278e8..f6d164827 100644
--- a/include/config_default.inc.php
+++ b/include/config_default.inc.php
@@ -121,10 +121,6 @@ $conf['calendar_month_cell_height']=80;
// 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 ?
// Warning : if the parent category is invisible, the category is
// automatically create invisible. (invisible = locked)
@@ -557,30 +553,6 @@ $conf['webmaster_id'] = 1;
$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;
-
-// +-----------------------------------------------------------------------+
// | history |
// +-----------------------------------------------------------------------+
diff --git a/include/constants.php b/include/constants.php
index db55673b4..8135147eb 100644
--- a/include/constants.php
+++ b/include/constants.php
@@ -77,8 +77,6 @@ if (!defined('USER_INFOS_TABLE'))
define('USER_INFOS_TABLE', $prefixeTable.'user_infos');
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');
if (!defined('USER_CACHE_TABLE'))
diff --git a/include/functions_notification.inc.php b/include/functions_notification.inc.php
index a89eb11f9..18700e062 100644
--- a/include/functions_notification.inc.php
+++ b/include/functions_notification.inc.php
@@ -54,7 +54,7 @@ function get_std_sql_where_restrict_filter($prefix_condition, $img_field='ic.ima
* Execute custom notification query
*
* @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)
*
@@ -145,12 +145,6 @@ function custom_notification_query($action, $type, $start, $end)
$query .= '
;';
break;
- case 'waiting_elements':
- $query = '
- FROM '.WAITING_TABLE.'
- WHERE validated = \'false\'
-;';
- break;
default:
// stop this function and return nothing
return;
@@ -177,9 +171,6 @@ function custom_notification_query($action, $type, $start, $end)
case 'new_users':
$field_id = 'user_id';
break;
- case 'waiting_elements':
- $field_id = 'id';
- break;
}
$query = 'SELECT count(distinct '.$field_id.') as CountId
'.$query;
@@ -205,9 +196,6 @@ function custom_notification_query($action, $type, $start, $end)
case 'new_users':
$fields = array('user_id');
break;
- case 'waiting_elements':
- $fields = array('id');
- break;
}
$query = 'SELECT distinct '.implode(', ', $fields).'
@@ -347,26 +335,6 @@ function 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);
-}
-
-/**
* There are new between two dates ?
*
* Informations : number of new comments, number of new elements, number of
@@ -386,8 +354,7 @@ function news_exists($start, $end)
(nb_new_elements($start, $end) > 0) or
(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)))
);
}
@@ -453,10 +420,6 @@ function news($start, $end, $exclude_img_cats=false, $add_url=false)
add_news_line( $news,
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 );
}
return $news;
diff --git a/install/config.sql b/install/config.sql
index 02f6f71a1..e96a7cf30 100644
--- a/install/config.sql
+++ b/install/config.sql
@@ -26,11 +26,8 @@ INSERT INTO piwigo_config (param,value,comment) VALUES ('nbm_send_recent_post_da
INSERT INTO piwigo_config (param,value,comment) VALUES ('email_admin_on_new_user','false','Send an email to theadministrators when a user registers');
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');
INSERT INTO piwigo_config (param,value,comment) VALUES ('menubar_filter_icon','true','Display filter icon');
diff --git a/install/db/94-database.php b/install/db/94-database.php
new file mode 100644
index 000000000..fbaa5a3cf
--- /dev/null
+++ b/install/db/94-database.php
@@ -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"
+;
+?>
diff --git a/install/piwigo_structure-mysql.sql b/install/piwigo_structure-mysql.sql
index a241ab1f4..39184daab 100644
--- a/install/piwigo_structure-mysql.sql
+++ b/install/piwigo_structure-mysql.sql
@@ -30,7 +30,6 @@ CREATE TABLE `piwigo_categories` (
`status` enum('public','private') NOT NULL default 'public',
`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 '',
`commentable` enum('true','false') NOT NULL default 'true',
@@ -446,21 +445,3 @@ CREATE TABLE `piwigo_users` (
PRIMARY KEY (`id`),
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;
diff --git a/install/piwigo_structure-pdo-sqlite.sql b/install/piwigo_structure-pdo-sqlite.sql
index 0c38b4008..c01f55892 100644
--- a/install/piwigo_structure-pdo-sqlite.sql
+++ b/install/piwigo_structure-pdo-sqlite.sql
@@ -26,7 +26,6 @@ CREATE TABLE "piwigo_categories"
"status" VARCHAR(50) default 'public',
"site_id" INTEGER default 1,
"visible" BOOLEAN default true,
- "uploadable" BOOLEAN default false,
"representative_picture_id" INTEGER,
"uppercats" TEXT,
"commentable" BOOLEAN default true,
@@ -537,22 +536,3 @@ CREATE TABLE piwigo_comments
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")
-);
-
diff --git a/install/piwigo_structure-pgsql.sql b/install/piwigo_structure-pgsql.sql
index 5f9d5a8cf..feab9acc3 100644
--- a/install/piwigo_structure-pgsql.sql
+++ b/install/piwigo_structure-pgsql.sql
@@ -33,7 +33,6 @@ CREATE TABLE "piwigo_categories"
"status" CATEGORIES_STATUS default 'public'::CATEGORIES_STATUS,
"site_id" INTEGER default 1,
"visible" BOOLEAN default true,
- "uploadable" BOOLEAN default false,
"representative_picture_id" INTEGER,
"uppercats" TEXT,
"commentable" BOOLEAN default true,
@@ -652,27 +651,3 @@ SET search_path TO public;
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" 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; \ No newline at end of file
diff --git a/install/piwigo_structure-sqlite.sql b/install/piwigo_structure-sqlite.sql
index 0c38b4008..54e2f0d12 100644
--- a/install/piwigo_structure-sqlite.sql
+++ b/install/piwigo_structure-sqlite.sql
@@ -26,7 +26,6 @@ CREATE TABLE "piwigo_categories"
"status" VARCHAR(50) default 'public',
"site_id" INTEGER default 1,
"visible" BOOLEAN default true,
- "uploadable" BOOLEAN default false,
"representative_picture_id" INTEGER,
"uppercats" TEXT,
"commentable" BOOLEAN default true,
@@ -536,23 +535,3 @@ CREATE TABLE piwigo_comments
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")
-);
-
diff --git a/language/ar_SA/admin.lang.php b/language/ar_SA/admin.lang.php
index 3e2d353f0..ce736e3e2 100644
--- a/language/ar_SA/admin.lang.php
+++ b/language/ar_SA/admin.lang.php
@@ -46,8 +46,6 @@ $lang['%d users deleted'] = '%d تم حذف المستخدمين';
$lang['%d user'] = '%d مستخدم';
$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'] = 'تفعيل';
$lang['Add/delete a permalink'] = 'اضافة/حذف الرابط الدائم';
@@ -88,7 +86,6 @@ $lang['Elements'] = 'العناصر';
$lang['Email admins when a new user registers'] = 'ارسل للمدير عند تسجيل مستخدم جديد';
$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'] = 'البيئة';
$lang['Form'] = 'نموذج';
@@ -147,7 +144,6 @@ $lang['Random picture'] = 'صورة عشوائية';
$lang['Rate date'] = 'تاريخ التقييم';
$lang['Rating by guests'] = 'امكانية التقييم للضيوف';
$lang['Rating'] = 'تقييم';
-$lang['Reject All'] = 'رفض الجميع';
$lang['Reject'] = 'رفض';
$lang['Representant'] = ' موصوف أو مُـمثل';
$lang['Representation of albums'] = 'توصيف الألبومات';
@@ -173,7 +169,6 @@ $lang['Uninstall'] = 'إلغاء التثبيت';
$lang['Use the default image sort order (defined in the configuration file)']='استخدام الصورة الافتراضية من أجل نوع (المحددة في ملف)';
$lang['User comments validation'] = 'تعليقات تنتظر التصريح';
$lang['Users'] = 'المستخدمين';
-$lang['Validate All'] = 'تصريح الكل';
$lang['Validate'] = 'تصريح';
$lang['Validation'] = 'التصريح';
$lang['Version'] = 'الاصدار';
@@ -197,7 +192,6 @@ $lang['Public'] = 'ألبوم عام';
$lang['Find a new representant by random'] = 'اظهر جديد التواصيف او التمثيل بطريقة عشوائية';
$lang['Public / Private'] = 'العام/ الخاص';
$lang['Manage authorizations for selected albums'] = 'ادارة تصريح التعليقات على الألبومات';
-$lang['Select uploadable albums'] = 'اختيارالألبوم المحمل';
$lang['Virtual album added'] = 'الألبوم المضاف';
$lang['Virtual album deleted'] = 'الألبوم المحذوف';
$lang['Access type'] = 'طريقة الدخول';
@@ -216,7 +210,6 @@ $lang['Dissociate from album'] = 'فصل من الألبوم';
$lang['dissociate from group'] = 'فصل من المجموعه';
$lang['edit album permissions'] = 'تحرير تصاريح الألبوم';
$lang['Album updated successfully'] = 'تم تحديث معلومات الألبومات بنجاح منقط النظير.';
-$lang['Authorize upload'] = 'السماح بالتحميل';
$lang['elements per page'] = 'عدد في كل صفحة';
$lang['elements'] = 'عناصر';
$lang['High definition enabled'] = 'تمكين ابعاد الارتفاع';
@@ -362,7 +355,6 @@ $lang['User list'] = 'قائمة المستخدم';
$lang['Modify informations about a picture'] = 'تعديل معلومات عن الصورة';
$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 فقط)';
$lang['height must be a number superior to'] = 'يجب عن يكون عدد الارتفاع يتعدى';
@@ -552,8 +544,6 @@ $lang['An error occured during extraction (%s).'] = ' (%s)حدث خطأ أثنا
$lang['Please check "plugins" folder and sub-folders permissions (CHMOD).'] = 'ارجوا فحص "الاضافات" المجلدو المجلد الفرعي (CHMOD).';
$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'] = 'الوصول للجميع';
$lang['ACCESS_2'] = 'للمشتركين فقط';
@@ -727,7 +717,6 @@ $lang['Add Photos'] = 'أضف صور';
$lang['Download'] = 'تحميل';
$lang['The following tag was deleted'] = 'هذه الكلمات الدلائلية حُـذفت';
$lang['Miscellaneous'] = 'متفرقات';
-$lang['User Upload'] = 'مستخدم الرفع';
$lang['Virtual Links'] = 'روابط ظاهرة';
$lang['There is no other language available.'] = 'ليس هناك لغة أخرى متاحة.';
$lang['There is no other plugin available.'] = 'ليس هناك اضافة أخرى متاحة.';
diff --git a/language/ar_SA/common.lang.php b/language/ar_SA/common.lang.php
index 95a629538..d755f3d6c 100644
--- a/language/ar_SA/common.lang.php
+++ b/language/ar_SA/common.lang.php
@@ -44,8 +44,6 @@ $lang['%d new image'] = '%d صورة جديدة';
$lang['%d new images'] = '%d صور جديدة';
$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'] = 'كل الكلمات الدلائلية';
$lang['Any tag'] = 'أي كلمة';
@@ -327,7 +325,6 @@ $lang['Registration of %s'] = 'تسجيل %s';
$lang['Album: %s'] = 'الألبوم: %s';
$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.'] = 'وضغ سيئ للضيف "ضيف", استخدم الحالة الافرتاضية. يرجى ابلاغ المسؤول عن الموقع.';
$lang['Administrator, webmaster and special user cannot use this method'] = 'خاصية للادارة فقط لايمكنك استخدامها';
diff --git a/language/ar_SA/help/help_user_upload.html b/language/ar_SA/help/help_user_upload.html
deleted file mode 100644
index 6e4766389..000000000
--- a/language/ar_SA/help/help_user_upload.html
+++ /dev/null
@@ -1,16 +0,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>
diff --git a/language/ca_ES/admin.lang.php b/language/ca_ES/admin.lang.php
index 92bbaeca8..b76d4207b 100644
--- a/language/ca_ES/admin.lang.php
+++ b/language/ca_ES/admin.lang.php
@@ -46,8 +46,6 @@ $lang['%d users deleted'] = '%d usuaris eliminats';
$lang['%d user'] = '%d usuari';
$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';
$lang['Add/delete a permalink'] = 'Afegeix/elimina un enllaç permanent';
@@ -88,7 +86,6 @@ $lang['Elements'] = 'Elements';
$lang['Email admins when a new user registers'] = 'Envia un correu electrònic als administradors quan un usuari nou es registri';
$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';
$lang['Form'] = 'Form';
@@ -147,7 +144,6 @@ $lang['Random picture'] = 'Imatge aleatòria';
$lang['Rate date'] = 'Data valoració';
$lang['Rating by guests'] = 'Valoració pels invitats';
$lang['Rating'] = 'Valoració';
-$lang['Reject All'] = 'Rebutjar tot';
$lang['Reject'] = 'Rebutja';
$lang['Representant'] = 'Representant';
$lang['Representation of albums'] = 'Representació de categories';
@@ -173,7 +169,6 @@ $lang['Uninstall'] = 'Desinstal·lar';
$lang['Use the default image sort order (defined in the configuration file)']='Utilitza l\'ordenació predeterminada (definida en el fitxer de configuració)';
$lang['User comments validation'] = 'Validació dels comentaris d\'usuari';
$lang['Users'] = 'Usuaris';
-$lang['Validate All'] = 'Valida\'ls tots';
$lang['Validate'] = 'Valida';
$lang['Validation'] = 'Validació';
$lang['Version'] = 'Versió';
@@ -197,7 +192,6 @@ $lang['Public'] = 'Public category';
$lang['Find a new representant by random'] = 'Find a new representant by random';
$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';
$lang['Access type'] = 'Tipus d\'accès';
@@ -216,7 +210,6 @@ $lang['Dissociate from album'] = 'desassòcia de la categoria';
$lang['dissociate from group'] = 'desassòcia del grup';
$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';
$lang['High definition enabled'] = 'Alta definicio habilitat';
@@ -366,7 +359,6 @@ $lang['User list'] = 'Llista d\'usuaris';
$lang['Modify informations about a picture'] = 'Modifica la informació sobre una imatge';
$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)';
$lang['height must be a number superior to'] = 'l\'alçada ha de ser un número superior a';
@@ -560,8 +552,6 @@ $lang['Please check "plugins" folder and sub-folders permissions (CHMOD).'] = 'S
$lang['Can\'t connect to server.'] = 'No es pot conectar al servidor.';
$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';
$lang['ACCESS_2'] = 'Accés als qui estan subscripts';
diff --git a/language/ca_ES/common.lang.php b/language/ca_ES/common.lang.php
index 6dcae3552..962e1f968 100644
--- a/language/ca_ES/common.lang.php
+++ b/language/ca_ES/common.lang.php
@@ -44,8 +44,6 @@ $lang['%d new image'] = '%d nova imatge';
$lang['%d new images'] = '%d noves imatges';
$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';
$lang['Any tag'] = 'Qualsevol etiqueta';
@@ -320,7 +318,6 @@ $lang['Registration of %s'] = 'Registrat de %s';
$lang['Album: %s'] = 'Categoria: %s';
$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
$lang['Bad status for user "guest", using default status. Please notify the webmaster.'] = 'Estat erroni de l\'usuari "invitat", s\'està utilitzant l\'estat predeterminat. Si us plau informeu-ho a l\'administrador de la web.';
diff --git a/language/cs_CZ/admin.lang.php b/language/cs_CZ/admin.lang.php
index c0cfddc40..0d762cca2 100644
--- a/language/cs_CZ/admin.lang.php
+++ b/language/cs_CZ/admin.lang.php
@@ -49,8 +49,6 @@ $lang['%d users deleted'] = '%d uživatelů smazáno';
$lang['%d user'] = '%d uživatel';
$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';
$lang['Add/delete a permalink'] = 'Přidat/odebrat pernamentní odkaz';
@@ -91,7 +89,6 @@ $lang['Elements'] = 'Položky';
$lang['Email admins when a new user registers'] = 'Poslat e-mail administrátorovi při registraci nového uživatele';
$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í';
$lang['Form'] = 'Formulář';
@@ -150,7 +147,6 @@ $lang['Random picture'] = 'Náhodná fotografie';
$lang['Rate date'] = 'Datum hodnocení';
$lang['Rating by guests'] = 'Hodnocení hosty';
$lang['Rating'] = 'Hodnocení';
-$lang['Reject All'] = 'Zamítnout všechny';
$lang['Reject'] = 'Zamítnout';
$lang['Representant'] = 'Reprezentant';
$lang['Representation of albums'] = 'Alba reprezentace';
@@ -176,7 +172,6 @@ $lang['Uninstall'] = 'Odinstalovat';
$lang['Use the default image sort order (defined in the configuration file)'] = 'Použít výchozí řazení (definované v konfiguračním souboru)';
$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í';
$lang['Version'] = 'Verze';
@@ -200,7 +195,6 @@ $lang['Public'] = 'Veřejné album';
$lang['Find a new representant by random'] = 'Najít reprezentativní obrázek pomocí náhodného výběru';
$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';
$lang['Access type'] = 'Druh přístupu';
@@ -219,7 +213,6 @@ $lang['Dissociate from album'] = 'oddělit od album';
$lang['dissociate from group'] = 'Oddělit od skupiny';
$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';
$lang['High definition enabled'] = 'Vysoké rozlišení povoleno';
@@ -365,7 +358,6 @@ $lang['User list'] = 'Seznam uživatelů';
$lang['Modify informations about a picture'] = 'Upravit informace o fotografii';
$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)';
$lang['height must be a number superior to'] = 'Výška musí být větší než';
@@ -555,8 +547,6 @@ $lang['Please check "plugins" folder and sub-folders permissions (CHMOD).'] = 'P
$lang['Can\'t connect to server.'] = 'Nelze se připojit k serveru.';
$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';
$lang['ACCESS_2'] = 'Přístupné přihlášeným';
@@ -728,7 +718,6 @@ $lang['Add Photos'] = 'Přidat fotografie';
$lang['Download'] = 'Stáhnout';
$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.';
$lang['There is no other plugin available.'] = 'Není dostupný žádný další doplněk.';
diff --git a/language/cs_CZ/common.lang.php b/language/cs_CZ/common.lang.php
index 2331e85aa..f5397e324 100644
--- a/language/cs_CZ/common.lang.php
+++ b/language/cs_CZ/common.lang.php
@@ -48,8 +48,6 @@ $lang['%d new image'] = '%d nový objekt';
$lang['%d new images'] = '%d nových objektů';
$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';
$lang['Any tag'] = 'Kterékoliv klíčové slovo';
@@ -325,7 +323,6 @@ $lang['Registration of %s'] = 'Registrace %s';
$lang['Album: %s'] = 'Album: %s';
$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';
$lang['Bad status for user "guest", using default status. Please notify the webmaster.'] = 'Špatný stav pro uživatele "host", bude použit výchozí stav. Prosím informujte administrátora.';
diff --git a/language/cs_CZ/help/help_user_upload.html b/language/cs_CZ/help/help_user_upload.html
deleted file mode 100644
index 6d5bea63a..000000000
--- a/language/cs_CZ/help/help_user_upload.html
+++ /dev/null
@@ -1,18 +0,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>
diff --git a/language/da_DK/admin.lang.php b/language/da_DK/admin.lang.php
index 60763ad45..27ee6f109 100644
--- a/language/da_DK/admin.lang.php
+++ b/language/da_DK/admin.lang.php
@@ -48,8 +48,6 @@ $lang['%d users deleted'] = ' %d brugere slettet';
$lang['%d user'] = ' %d bruger';
$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';
$lang['Add/delete a permalink'] = 'Tilføj / slette en permalink';
@@ -90,7 +88,6 @@ $lang['Elements'] = 'Elements';
$lang['Email admins when a new user registers'] = 'Email admins, når en ny bruger registrerer sig';
$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ø';
$lang['Form'] = 'Form';
@@ -149,7 +146,6 @@ $lang['Random picture'] = 'Random billede';
$lang['Rate date'] = 'Rating dato';
$lang['Rating by guests'] = 'Bedømmelse af gæster';
$lang['Rating'] = 'Rating';
-$lang['Reject All'] = 'Afvis alle';
$lang['Reject'] = 'Afvis';
$lang['Representant'] = 'Representant';
$lang['Representation of albums'] = 'Kategorier repræsentation';
@@ -175,7 +171,6 @@ $lang['Uninstall'] = 'Afinstaller';
$lang['Use the default image sort order (defined in the configuration file)'] = 'Brug standard image sorteringsrækkefølge (defineret i konfigurationsfilen)';
$lang['User comments validation'] = 'Bruger kommentarer validering';
$lang['Users'] = 'Brugere';
-$lang['Validate All'] = 'Godkend alle';
$lang['Validate'] = 'Godkend';
$lang['Validation'] = 'Bekræftelse';
$lang['Version'] = 'Version';
@@ -199,7 +194,6 @@ $lang['Public'] = 'Offentlige Kategori';
$lang['Find a new representant by random'] = 'Find en ny tilfældig representant';
$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';
$lang['Access type'] = 'Adgang type';
@@ -218,7 +212,6 @@ $lang['Dissociate from album'] = 'Adskille fra Kategori';
$lang['dissociate from group'] = 'Adskille fra Gruppe';
$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';
$lang['High definition enabled'] = 'High definition er slået til';
@@ -367,7 +360,6 @@ $lang['User list'] = 'Brugere liste';
$lang['Modify informations about a picture'] = 'Rediger billede information';
$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)';
$lang['height must be a number superior to'] = 'Højde skal være et tal større end';
@@ -556,8 +548,6 @@ $lang['An error occured during extraction (%s).'] = 'En fejl opstod unde
$lang['Please check "plugins" folder and sub-folders permissions (CHMOD).'] = 'Check \'plugins \' folder og sub-folder tilladelser (CHMOD).';
$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';
$lang['ACCESS_2'] = 'Adgang til registrerede brugere';
@@ -732,7 +722,6 @@ $lang['Add Photos'] = 'Tilføj fotos';
$lang['Download'] = 'Download';
$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.';
$lang['There is no other plugin available.'] = 'Der er ikke andre plugins tilgængelige.';
diff --git a/language/da_DK/common.lang.php b/language/da_DK/common.lang.php
index 896b1c103..ea10503e3 100644
--- a/language/da_DK/common.lang.php
+++ b/language/da_DK/common.lang.php
@@ -44,8 +44,6 @@ $lang['%d new image'] = '%d nyt element';
$lang['%d new images'] = '%d nye elementer';
$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';
$lang['Any tag'] = 'Enhver tag';
@@ -321,7 +319,6 @@ $lang['Registration of %s'] = 'Registrering af %s';
$lang['Album: %s'] = 'kategori: %s';
$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
$lang['Bad status for user "guest", using default status. Please notify the webmaster.'] = 'Forket status for gæste bruger. Kontakt webmaster.';
diff --git a/language/de_DE/admin.lang.php b/language/de_DE/admin.lang.php
index d48e4f208..092123d81 100644
--- a/language/de_DE/admin.lang.php
+++ b/language/de_DE/admin.lang.php
@@ -46,8 +46,6 @@ $lang['%d users deleted'] = '%d Benutzer gelöscht';
$lang['%d user'] = '%d Benutzer';
$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';
$lang['Add/delete a permalink'] = 'Hinzufügen/Löschen einer dauerhafte Verbindung (Permalink)';
@@ -88,7 +86,6 @@ $lang['Elements'] = 'Elemente';
$lang['Email admins when a new user registers'] = 'sende eine E-Mail an den(die) Adminstrator(en) wenn sich ein neuer Benutzer registriert hat';
$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';
$lang['Form'] = 'Formular';
@@ -147,7 +144,6 @@ $lang['Random picture'] = 'zufälliges Bild';
$lang['Rate date'] = 'Bewertungsdatum';
$lang['Rating by guests'] = 'Erlaube Bewertung(en) durch Gäste';
$lang['Rating'] = 'Bewertungen';
-$lang['Reject All'] = 'alle abweisen';
$lang['Reject'] = 'abweisen';
$lang['Representant'] = 'Vorschaubild';
$lang['Representation of albums'] = 'Galerievorschaubild';
@@ -173,7 +169,6 @@ $lang['Uninstall'] = 'Deinstallieren';
$lang['Use the default image sort order (defined in the configuration file)']='Nutze die Voreingestellte Sortieroption (Festgelegt in der Konfigurationsdatei)';
$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';
$lang['Version'] = 'Version';
@@ -197,7 +192,6 @@ $lang['Public'] = 'Öffentlicher Album';
$lang['Find a new representant by random'] = 'Bestimme ein neues zufälliges Vorschaubild';
$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';
$lang['Access type'] = 'Zugangsart';
@@ -216,7 +210,6 @@ $lang['Dissociate from album'] = 'Vom Album abtrennen';
$lang['dissociate from group'] = 'Von Gruppe abtrennen';
$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';
$lang['High definition enabled'] = 'High definition eingeschaltet';
@@ -360,7 +353,6 @@ $lang['User list'] = 'Liste der Benutzer';
$lang['Modify informations about a picture'] = 'ändern der Informationen eines Bildes';
$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)';
$lang['height must be a number superior to'] = 'die Höhe muss größer sein als';
@@ -551,8 +543,6 @@ $lang['An error occured during extraction (%s).'] = 'Fehler beim entpacken des A
$lang['Please check "plugins" folder and sub-folders permissions (CHMOD).'] = 'überprüfen Sie die Berechtigungen des Ordners "Plugins" und dessen Unterordner (CHMOD).';
$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';
$lang['ACCESS_2'] = 'Mitglieder';
@@ -707,7 +697,6 @@ $lang['None'] = 'Nichts';
$lang['Invert'] = 'Umkehren';
$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';
$lang['Webmaster status is required.'] = 'Sie benötigen Webmaster-berechtigung.';
diff --git a/language/de_DE/common.lang.php b/language/de_DE/common.lang.php
index 0b2086fed..9064b3c1b 100644
--- a/language/de_DE/common.lang.php
+++ b/language/de_DE/common.lang.php
@@ -44,8 +44,6 @@ $lang['%d new image'] = '%d neues Element';
$lang['%d new images'] = '%d neue Elemente';
$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';
$lang['Any tag'] = 'Beliebigen Tag';
@@ -322,7 +320,6 @@ $lang['Registration of %s'] = 'Registrierung von %s';
$lang['Album: %s'] = 'Album: %s';
$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
$lang['Bad status for user "guest", using default status. Please notify the webmaster.'] = 'Status der Benutzer "guest" nicht entspricht, Verwendung des Standard. Bitte kontaktieren Sie den Webmaster.';
diff --git a/language/de_DE/help/help_user_upload.html b/language/de_DE/help/help_user_upload.html
deleted file mode 100644
index 4ae6f3ae2..000000000
--- a/language/de_DE/help/help_user_upload.html
+++ /dev/null
@@ -1,13 +0,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>
diff --git a/language/en_UK/admin.lang.php b/language/en_UK/admin.lang.php
index 47bf089ee..bbcc73204 100644
--- a/language/en_UK/admin.lang.php
+++ b/language/en_UK/admin.lang.php
@@ -48,8 +48,6 @@ $lang['%d users deleted'] = "%d users deleted";
$lang['%d user'] = "%d user";
$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";
$lang['Add/delete a permalink'] = "Add/delete a permalink";
@@ -90,7 +88,6 @@ $lang['Elements'] = "Elements";
$lang['Email admins when a new user registers'] = "Email admins when a new user registers";
$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";
$lang['Form'] = "Form";
@@ -149,7 +146,6 @@ $lang['Random picture'] = "Random picture";
$lang['Rate date'] = "Rating date";
$lang['Rating by guests'] = "Rating by guests";
$lang['Rating'] = "Rating";
-$lang['Reject All'] = "Reject All";
$lang['Reject'] = "Reject";
$lang['Representant'] = "Representant";
$lang['Representation of albums'] = "Representation of albums";
@@ -175,7 +171,6 @@ $lang['Uninstall'] = "Uninstall";
$lang['Use the default image sort order (defined in the configuration file)'] = "Use default image sort order (defined in the configuration file)";
$lang['User comments validation'] = "User comments validation";
$lang['Users'] = "Users";
-$lang['Validate All'] = "Validate All";
$lang['Validate'] = "Validate";
$lang['Validation'] = "Validation";
$lang['Version'] = "Version";
@@ -199,7 +194,6 @@ $lang['Public'] = "Public";
$lang['Find a new representant by random'] = "Find a new random representant";
$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";
$lang['Access type'] = "Access type";
@@ -218,7 +212,6 @@ $lang['Dissociate from album'] = "Dissociate from album";
$lang['dissociate from group'] = "dissociate from group";
$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";
$lang['High definition enabled'] = "High definition enabled";
@@ -366,7 +359,6 @@ $lang['User list'] = "Users list";
$lang['Modify informations about a picture'] = "Modify picture information";
$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)";
$lang['height must be a number superior to'] = "height must be a number greater than";
@@ -555,8 +547,6 @@ $lang['An error occured during extraction (%s).'] = "An error occured during the
$lang['Please check "plugins" folder and sub-folders permissions (CHMOD).'] = "Please check \"plugins\" folder and sub-folders permissions (CHMOD).";
$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";
$lang['ACCESS_2'] = "Access to registered users";
@@ -735,7 +725,6 @@ $lang['Add Photos'] = 'Add Photos';
$lang['Download'] = 'Download';
$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.';
$lang['There is no other plugin available.'] = 'There is no other plugin available.';
diff --git a/language/en_UK/common.lang.php b/language/en_UK/common.lang.php
index 3457ffa72..b5f6fbc7a 100644
--- a/language/en_UK/common.lang.php
+++ b/language/en_UK/common.lang.php
@@ -44,8 +44,6 @@ $lang['%d new image'] = "%d new image";
$lang['%d new images'] = "%d new images";
$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";
$lang['Any tag'] = "Any tag";
@@ -319,7 +317,6 @@ $lang['Registration of %s'] = "Registration of %s";
$lang['Album: %s'] = "Album: %s";
$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.";
$lang['Administrator, webmaster and special user cannot use this method'] = "Administrator, webmaster and special user cannot use this method";
diff --git a/language/en_UK/help/help_user_upload.html b/language/en_UK/help/help_user_upload.html
deleted file mode 100644
index 46c99a83e..000000000
--- a/language/en_UK/help/help_user_upload.html
+++ /dev/null
@@ -1,18 +0,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>
diff --git a/language/es_AR/common.lang.php b/language/es_AR/common.lang.php
index 17242bebc..683945ced 100644
--- a/language/es_AR/common.lang.php
+++ b/language/es_AR/common.lang.php
@@ -44,8 +44,6 @@ $lang['%d new image'] = '%d nueva imagen';
$lang['%d new images'] = '%d nuevas imágenes';
$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';
$lang['Any tag'] = 'Cualquier tag';
@@ -320,7 +318,6 @@ $lang['Registration of %s'] = 'Registro de %s';
$lang['Album: %s'] = 'Categoría: %s';
$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
$lang['Bad status for user "guest", using default status. Please notify the webmaster.'] = 'El estatuto de usuario "huésped" no corresponde, se utilizará el estatuto por defecto. Por favor avísele al webmaster.';
diff --git a/language/es_ES/admin.lang.php b/language/es_ES/admin.lang.php
index 85dcddc55..457e10713 100644
--- a/language/es_ES/admin.lang.php
+++ b/language/es_ES/admin.lang.php
@@ -46,8 +46,6 @@ $lang['%d users deleted'] = '%d usuarios suprimidos';
$lang['%d user'] = '%d usuario';
$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';
$lang['Add/delete a permalink'] = 'Añadir / borrar un enlace permanente';
@@ -88,7 +86,6 @@ $lang['Elements'] = 'Elementos';
$lang['Email admins when a new user registers'] = 'Notificar a los administradores en el momento de inscripción de un usuario';
$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';
$lang['Form'] = 'Formulario';
@@ -147,7 +144,6 @@ $lang['Random picture'] = 'Al azar';
$lang['Rate date'] = 'Fecha de notación';
$lang['Rating by guests'] = 'Notación por los visitantes';
$lang['Rating'] = 'Notación';
-$lang['Reject All'] = 'Rechazar todo';
$lang['Reject'] = 'Rechazar';
$lang['Representant'] = 'Representante';
$lang['Representation of albums'] = 'Représentacion de los àlbumes';
@@ -173,7 +169,6 @@ $lang['Uninstall'] = 'Desinstalar';
$lang['Use the default image sort order (defined in the configuration file)']='Utilizar la orden de selección de las imágenes por defecto (definido en el fichero de configuración)';
$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';
$lang['Version'] = 'Versión';
@@ -197,7 +192,6 @@ $lang['Public'] = 'Album publico';
$lang['Find a new representant by random'] = 'Encontrar a un nuevo representante al azar';
$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';
$lang['Access type'] = 'Tipo de acceso';
@@ -216,7 +210,6 @@ $lang['Dissociate from album'] = 'Separar del àlbum';
$lang['dissociate from group'] = 'Disociar del grupo';
$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';
$lang['High definition enabled'] = 'Alta definición activo';
@@ -361,7 +354,6 @@ $lang['User list'] = 'Lista usuarios';
$lang['Modify informations about a picture'] = 'Modificar las informaciones de una imagen';
$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)';
$lang['height must be a number superior to'] = 'La altura debe ser un entero superior a';
@@ -551,8 +543,6 @@ $lang['An error occured during extraction (%s).'] = 'Un error sobrevino durante
$lang['Please check "plugins" folder and sub-folders permissions (CHMOD).'] = 'Compruebe las autorizaciones del expediente " plugins " y de sus subexpedientes (CHMOD).';
$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';
$lang['ACCESS_2'] = 'Acceso inscritos';
@@ -722,7 +712,6 @@ $lang['Inactive Languages'] = 'Idiomas desactivadas';
$lang['Make this language available to users'] = 'Devolver esta idioma disponible para los usuarios';
$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';
$lang['Add Photos'] = 'Añadir fotos';
diff --git a/language/es_ES/common.lang.php b/language/es_ES/common.lang.php
index 90efb9a0a..d72efd1c8 100644
--- a/language/es_ES/common.lang.php
+++ b/language/es_ES/common.lang.php
@@ -44,8 +44,6 @@ $lang['%d new image'] = '%d nuevo elemento';
$lang['%d new images'] = '%d nuevos Elementos';
$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';
$lang['Any tag'] = 'Cualquier etiqueta';
@@ -320,7 +318,6 @@ $lang['Registration of %s'] = 'Registro de %s';
$lang['Album: %s'] = 'Album : %s';
$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
$lang['Bad status for user "guest", using default status. Please notify the webmaster.'] = 'El estatus del usuario "guest" no es conforme, se utilizará el estatus por defecto. Por favor, informe al administrador del sitio.';
diff --git a/language/es_ES/help/help_user_upload.html b/language/es_ES/help/help_user_upload.html
deleted file mode 100644
index f811aecfb..000000000
--- a/language/es_ES/help/help_user_upload.html
+++ /dev/null
@@ -1,16 +0,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>
-
-
diff --git a/language/fa_IR/admin.lang.php b/language/fa_IR/admin.lang.php
index 66ab01280..e063a7117 100644
--- a/language/fa_IR/admin.lang.php
+++ b/language/fa_IR/admin.lang.php
@@ -48,8 +48,6 @@ $lang['%d users deleted'] = "%d کاربر حذف شد";
$lang['%d user'] = "%d کاربر";
$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'] = "فعال‌کردن";
$lang['Add/delete a permalink'] = "افزودن/حذف لينک ثابت";
@@ -90,7 +88,6 @@ $lang['Elements'] = "اشياء";
$lang['Email admins when a new user registers'] = "ارسال ايميل به به مديران زماني که يک کاربر جديد ثبت نام مي‌کند";
$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)";
$lang['Form'] = "فرم";
@@ -149,7 +146,6 @@ $lang['Random picture'] = "تصاویر تصادفی";
$lang['Rate date'] = "تاریخ امتیازدهی";
$lang['Rating by guests'] = "دادن امتیاز توسط میهمان";
$lang['Rating'] = "امتیازدهی";
-$lang['Reject All'] = "رد کردن همه";
$lang['Reject'] = "رد کردن";
$lang['Representant'] = "نماینده";
$lang['Representation of albums'] = "نماینده دسته‌ها";
@@ -175,7 +171,6 @@ $lang['Uninstall'] = "حذف";
$lang['Use the default image sort order (defined in the configuration file)'] = "استفاده از پیش‌فرض برای مرتب کردن تصاویر (پیش‌فرض در فایل پیکربندی(Configuration) است";
$lang['User comments validation'] = "تایید نظرات کاربر";
$lang['Users'] = "کاربران";
-$lang['Validate All'] = "تایید همه";
$lang['Validate'] = "تایید";
$lang['Validation'] = "تایید";
$lang['Version'] = "نسخه";
@@ -199,7 +194,6 @@ $lang['Public'] = "دسته‌های عمومی";
$lang['Find a new representant by random'] = "پیداکردن یک نماینده جدید به صورت تصادفی";
$lang['Public / Private'] = "عمومی / خصوصی";
$lang['Manage authorizations for selected albums'] = "مدیریت مجوزهای دسته‌های انتخاب شده";
-$lang['Select uploadable albums'] = "انتخاب دسته‌های قابل آپلود";
$lang['Virtual album added'] = "دسته مجازی افزوده شد";
$lang['Virtual album deleted'] = "دسته مجازی حذف شد";
$lang['Access type'] = "نوع دسترسی";
@@ -218,7 +212,6 @@ $lang['Dissociate from album'] = "جداکردن از دسته";
$lang['dissociate from group'] = "جدا کردن از گروه";
$lang['edit album permissions'] = "ویرایش مجوزهای دسته";
$lang['Album updated successfully'] = "اطلاعات دسته با موفقیت به‌روزرسانی شد.";
-$lang['Authorize upload'] = "اجازه آپلود";
$lang['elements per page'] = "تعداد آیتم‌ها در صفحه";
$lang['elements'] = "اشیا";
$lang['High definition enabled'] = "High definition enabled";
@@ -367,7 +360,6 @@ $lang['User list'] = "لیست کاربران";
$lang['Modify informations about a picture'] = "تغییر اطلاعات تصویر";
$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)";
$lang['height must be a number superior to'] = "طول باید عددی بزرگتر از";
@@ -556,8 +548,6 @@ $lang['An error occured during extraction (%s).'] = "یک خطا در بازکر
$lang['Please check "plugins" folder and sub-folders permissions (CHMOD).'] = "لطفا سطح دسترسی پوشه \"plugins\" و پوشه‌های زیر مجموعه آن را چک کنید (CHMOD).";
$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'] = "دسترسی برای همه";
$lang['ACCESS_2'] = "دستری برای کاربران ثبت‌نام شذه";
@@ -731,7 +721,6 @@ $lang['Add Photos'] = 'افزودن تصاویر';
$lang['Download'] = 'دریافت(دانلود)';
$lang['The following tag was deleted'] = 'برچسب حذف شد.';
$lang['Miscellaneous'] = 'متفرقه';
-$lang['User Upload'] = 'آپلود کاربر';
$lang['Virtual Links'] = 'ارتباط مجازی';
$lang['There is no other language available.'] = 'در حال حاضر هیچ زبان دیگری موجود نیست.';
$lang['There is no other plugin available.'] = 'در حال حاضر پلاگین دیگری موجود نیست.';
diff --git a/language/fa_IR/common.lang.php b/language/fa_IR/common.lang.php
index 52c7cf034..1c93f6bd3 100644
--- a/language/fa_IR/common.lang.php
+++ b/language/fa_IR/common.lang.php
@@ -44,8 +44,6 @@ $lang['%d new image'] = "%d عکس جدید";
$lang['%d new images'] = "%d عکس جدید";
$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'] = "همه‌ی برچسب‌ها";
$lang['Any tag'] = "هر برچسبی";
@@ -319,7 +317,6 @@ $lang['Registration of %s'] = "Registration of %s";
$lang['Album: %s'] = "Category: %s";
$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.'] = "وضعیت بد برای کاربر \"میهمان\" ، وضعیت پیش‌فرض . لطفا این موضوع را با وبمستر(مدیر‌سایت) در میان بگذارید.";
$lang['Administrator, webmaster and special user cannot use this method'] = "مدیر ، وب‌مستر و کاربر ویژه نمی‌توانند از این متد استفاده نمایند.";
diff --git a/language/fr_CA/admin.lang.php b/language/fr_CA/admin.lang.php
index 17f268010..309d41073 100644
--- a/language/fr_CA/admin.lang.php
+++ b/language/fr_CA/admin.lang.php
@@ -48,8 +48,6 @@ $lang['%d users deleted'] = "%d utilisateurs supprimés";
$lang['%d user'] = "%d utilisateur";
$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";
$lang['Add/delete a permalink'] = "Ajouter/effacer un lien permanent";
@@ -90,7 +88,6 @@ $lang['Elements'] = "Éléments";
$lang['Email admins when a new user registers'] = "Notifier les administrateurs lors de l'inscription d'un utilisateur";
$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";
$lang['Form'] = "Formulaire";
@@ -149,7 +146,6 @@ $lang['Random picture'] = "Image au hasard";
$lang['Rate date'] = "Date de notation";
$lang['Rating by guests'] = "Notation par les invités";
$lang['Rating'] = "Notation";
-$lang['Reject All'] = "Tout rejeter";
$lang['Reject'] = "Rejeter";
$lang['Representant'] = "Représentant";
$lang['Representation of albums'] = "Représentation des catégories";
@@ -175,7 +171,6 @@ $lang['Uninstall'] = "Désinstaller";
$lang['Use the default image sort order (defined in the configuration file)'] = "Utiliser l'ordre de tri des images par défaut (défini dans le fichier de configuration)";
$lang['User comments validation'] = "Validation des commentaires d'utilisateurs";
$lang['Users'] = "Utilisateurs";
-$lang['Validate All'] = "Tout valider";
$lang['Validate'] = "Valider";
$lang['Validation'] = "Validation";
$lang['Version'] = "Version";
@@ -199,7 +194,6 @@ $lang['Public'] = "Catégorie publique";
$lang['Find a new representant by random'] = "Trouver un nouveau représentant au hasard";
$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";
$lang['Access type'] = "Type d'accès";
@@ -218,7 +212,6 @@ $lang['Dissociate from album'] = "Dissocier de la catégorie";
$lang['dissociate from group'] = "Dissocier du groupe";
$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";
$lang['High definition enabled'] = "Haute définition actif";
@@ -370,7 +363,6 @@ $lang['User list'] = "Liste des utilisateurs";
$lang['Modify informations about a picture'] = "Modifier les informations d'une image";
$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)";
$lang['height must be a number superior to'] = "la hauteur doit un entier supérieur à";
@@ -564,8 +556,6 @@ $lang['Please check "plugins" folder and sub-folders permissions (CHMOD).'] = "V
$lang['Can\'t connect to server.'] = "Impossible de se connecter au serveur.";
$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";
$lang['ACCESS_2'] = "Accès aux utilisateurs inscrits";
@@ -740,7 +730,6 @@ $lang['Add Photos'] = 'Ajouter des photos';
$lang['Download'] = 'Télécharger';
$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.';
$lang['There is no other plugin available.'] = 'Il n\'y a pas d\'autre plugin disponible.';
diff --git a/language/fr_CA/common.lang.php b/language/fr_CA/common.lang.php
index 281f2d1d9..abc06da66 100644
--- a/language/fr_CA/common.lang.php
+++ b/language/fr_CA/common.lang.php
@@ -44,8 +44,6 @@ $lang['%d new image'] = '%d nouvelle image';
$lang['%d new images'] = '%d nouvelles images';
$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';
$lang['Any tag'] = 'N\'importe quel mot clé';
@@ -322,7 +320,6 @@ $lang['Registration of %s'] = 'Enregistrement de %s';
$lang['Album: %s'] = 'Catégorie : %s';
$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
$lang['Bad status for user "guest", using default status. Please notify the webmaster.'] = 'Statut de l\'utilisateur "guest" non conforme, utilisation du statut par défaut. Veuillez prévenir le webmestre.';
diff --git a/language/fr_CA/help/help_user_upload.html b/language/fr_CA/help/help_user_upload.html
deleted file mode 100644
index 57e723eeb..000000000
--- a/language/fr_CA/help/help_user_upload.html
+++ /dev/null
@@ -1,14 +0,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>
diff --git a/language/fr_FR/admin.lang.php b/language/fr_FR/admin.lang.php
index 4e49136d6..cba97a803 100644
--- a/language/fr_FR/admin.lang.php
+++ b/language/fr_FR/admin.lang.php
@@ -48,8 +48,6 @@ $lang['%d users deleted'] = "%d utilisateurs supprimés";
$lang['%d user'] = "%d utilisateur";
$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";
$lang['Add/delete a permalink'] = "Ajouter/effacer un lien permanent";
@@ -90,7 +88,6 @@ $lang['Elements'] = "Éléments";
$lang['Email admins when a new user registers'] = "Notifier les administrateurs lors de l'inscription d'un utilisateur";
$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";
$lang['Form'] = "Formulaire";
@@ -149,7 +146,6 @@ $lang['Random picture'] = "Image au hasard";
$lang['Rate date'] = "Date de notation";
$lang['Rating by guests'] = "Notation par les invités";
$lang['Rating'] = "Notation";
-$lang['Reject All'] = "Tout rejeter";
$lang['Reject'] = "Rejeter";
$lang['Representant'] = "Représentant";
$lang['Representation of albums'] = 'Représentation des albums';
@@ -175,7 +171,6 @@ $lang['Uninstall'] = "Désinstaller";
$lang['Use the default image sort order (defined in the configuration file)'] = "Utiliser l'ordre de tri des images par défaut (défini dans le fichier de configuration)";
$lang['User comments validation'] = "Validation des commentaires d'utilisateurs";
$lang['Users'] = "Utilisateurs";
-$lang['Validate All'] = "Tout valider";
$lang['Validate'] = "Valider";
$lang['Validation'] = "Validation";
$lang['Version'] = "Version";
@@ -199,7 +194,6 @@ $lang['Public'] = 'Album public';
$lang['Find a new representant by random'] = "Trouver un nouveau représentant au hasard";
$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é';
$lang['Access type'] = "Type d'accès";
@@ -218,7 +212,6 @@ $lang['Dissociate from album'] = 'Dissocier de l\'album';
$lang['dissociate from group'] = "Dissocier du groupe";
$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";
$lang['High definition enabled'] = "Haute définition actif";
@@ -366,7 +359,6 @@ $lang['User list'] = "Liste des utilisateurs";
$lang['Modify informations about a picture'] = "Modifier les informations d'une image";
$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)";
$lang['height must be a number superior to'] = "la hauteur doit un entier supérieur à";
@@ -555,8 +547,6 @@ $lang['An error occured during extraction (%s).'] = "Une erreur est survenue pen
$lang['Please check "plugins" folder and sub-folders permissions (CHMOD).'] = "Vérifiez les permissions du dossier \"plugins\" et de ses sous-dossiers (CHMOD).";
$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";
$lang['ACCESS_2'] = "Accès aux utilisateurs inscrits";
@@ -738,7 +728,6 @@ $lang['Add Photos'] = 'Ajouter des photos';
$lang['Download'] = 'Télécharger';
$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.';
$lang['There is no other plugin available.'] = 'Il n\'y a pas d\'autre plugin disponible.';
diff --git a/language/fr_FR/common.lang.php b/language/fr_FR/common.lang.php
index fbdf2b348..0e0d62fb5 100644
--- a/language/fr_FR/common.lang.php
+++ b/language/fr_FR/common.lang.php
@@ -44,8 +44,6 @@ $lang['%d new image'] = '%d nouvelle image';
$lang['%d new images'] = '%d nouvelles images';
$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';
$lang['Any tag'] = 'N\'importe quel tag';
@@ -319,7 +317,6 @@ $lang['Registration of %s'] = 'Enregistrement de %s';
$lang['Album: %s'] = 'Album : %s';
$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
$lang['Bad status for user "guest", using default status. Please notify the webmaster.'] = 'Statut de l\'utilisateur "guest" non conforme, utilisation du statut par défaut. Veuillez prévenir le webmestre.';
diff --git a/language/fr_FR/help/help_user_upload.html b/language/fr_FR/help/help_user_upload.html
deleted file mode 100644
index 0c2e2c445..000000000
--- a/language/fr_FR/help/help_user_upload.html
+++ /dev/null
@@ -1,14 +0,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>
diff --git a/language/he_IL/admin.lang.php b/language/he_IL/admin.lang.php
index 186890a5a..a76241744 100644
--- a/language/he_IL/admin.lang.php
+++ b/language/he_IL/admin.lang.php
@@ -46,8 +46,6 @@ $lang['%d users deleted'] = '%d המשתמשים נמחקו';
$lang['%d user'] = '%d משתמש';
$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'] = 'להפעיל';
$lang['Add/delete a permalink'] = 'הוספה / מחיקה של קישורית';
@@ -88,7 +86,6 @@ $lang['Elements'] = 'פריטים';
$lang['Email admins when a new user registers'] = 'שלח מייל למנהל כאשר נרשם משתמש חדש';
$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'] = 'סביבה';
$lang['Form'] = 'טופס';
@@ -147,7 +144,6 @@ $lang['Random picture'] = 'תמונה אקראית';
$lang['Rate date'] = 'תאריך דירוג';
$lang['Rating by guests'] = 'דירוג על ידי אורחים';
$lang['Rating'] = 'דירוג';
-$lang['Reject All'] = 'דחה את כל';
$lang['Reject'] = 'דחה';
$lang['Representant'] = 'נציג';
$lang['Representation of albums'] = 'ייצוג קטגוריות';
@@ -173,7 +169,6 @@ $lang['Uninstall'] = 'הסר';
$lang['Use the default image sort order (defined in the configuration file)'] = 'השתמש תמונת ברירת המחדל להרשמה קצרה (מוגדרים בקובץ התצורה)';
$lang['User comments validation'] = 'תגובות מאושרות של המשתמש';
$lang['Users'] = 'משתמשים';
-$lang['Validate All'] = 'אמת כל';
$lang['Validate'] = 'אמת';
$lang['Validation'] = 'אימות';
$lang['Version'] = 'גרסה';
@@ -197,7 +192,6 @@ $lang['Public'] = 'קטגוריה ציבורית';
$lang['Find a new representant by random'] = 'מצא ייצוג אקראי חדש';
$lang['Public / Private'] = 'ציבורי / פרטי';
$lang['Manage authorizations for selected albums'] = 'נהל הרשאות עבור הקטגוריות שנבחרו';
-$lang['Select uploadable albums'] = 'בחר קטגוריות הניתנות להעלאה';
$lang['Virtual album added'] = 'קטגוריה וירטואלית נוספה';
$lang['Virtual album deleted'] = 'קטגוריה וירטואלית נמחקה';
$lang['Access type'] = 'סוג גישה';
@@ -216,7 +210,6 @@ $lang['Dissociate from album'] = 'נתק מהקטגוריה';
$lang['dissociate from group'] = 'נתק מהקבוצה';
$lang['edit album permissions'] = 'ערוך הרשאות לקטגוריה';
$lang['Album updated successfully'] = 'מידע על הקטגוריה עודכן בהצלחה.';
-$lang['Authorize upload'] = 'הרשה להעלות';
$lang['elements per page'] = 'פריטים בעמוד';
$lang['elements'] = 'פריטים';
$lang['High definition enabled'] = 'איכות גבוהה מופעלת';
@@ -365,7 +358,6 @@ $lang['User list'] = 'רשימת משתמשים';
$lang['Modify informations about a picture'] = 'שינוי פרטים בתמונה';
$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 בלבד)';
$lang['height must be a number superior to'] = 'גובה חייב להיות מספר גדול יותר';
@@ -554,8 +546,6 @@ $lang['An error occured during extraction (%s).'] = 'אירעה שגיאה במ
$lang['Please check "plugins" folder and sub-folders permissions (CHMOD).'] = 'בבקשה בדוק את ההרשאות לתיקיה "plugins" ולתת תיקיות שלה (CHMOD)';
$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'] = 'גישה לכל';
$lang['ACCESS_2'] = 'גישה למשתמשים רשומים';
@@ -729,7 +719,6 @@ $lang['Add Photos'] = 'הוספת תמונות';
$lang['Download'] = 'הורד';
$lang['The following tag was deleted'] = 'התווית הבאה נמחקה';
$lang['Miscellaneous'] = 'שונות';
-$lang['User Upload'] = 'משתמש העלה';
$lang['Virtual Links'] = 'קישורים וירטואלית';
$lang['There is no other language available.'] = 'אין שפה אחרת זמינה.';
$lang['There is no other plugin available.'] = 'אין שום תוספים אחרים זמינים.';
diff --git a/language/he_IL/common.lang.php b/language/he_IL/common.lang.php
index 35cea58b3..96aed8eaa 100644
--- a/language/he_IL/common.lang.php
+++ b/language/he_IL/common.lang.php
@@ -43,8 +43,6 @@ $lang['%d new image'] = "%d תמונה חדשה";
$lang['%d new images'] = "%d תמונות חדשות";
$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'] = "כל התוויות";
$lang['Any tag'] = "כל תווית";
@@ -319,7 +317,6 @@ $lang['Registration of %s'] = "רישום של %s";
$lang['Album: %s'] = "קטגוריה: %s";
$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.'] = 'מצב לא טוב עבור המשתמש "האורח", השתמש במצב ברירת מחדל. עדכן בבקשה את מנהל האתר.';
$lang['Administrator, webmaster and special user cannot use this method'] = "מנהל ראשי, מנהל האתר ו ומשתמשים מסויימים לא יכולים להשתמש בmethod הזה";
diff --git a/language/hr_HR/admin.lang.php b/language/hr_HR/admin.lang.php
index bfa36d103..129b61ef7 100644
--- a/language/hr_HR/admin.lang.php
+++ b/language/hr_HR/admin.lang.php
@@ -46,8 +46,6 @@ $lang['%d users deleted'] = '%d korisnika izbrisano';
$lang['%d user'] = '%d korisnik';
$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';
$lang['Add/delete a permalink'] = 'Dodaj/izbriši stalnu poveznicu';
@@ -88,7 +86,6 @@ $lang['Elements'] = 'Stavke';
$lang['Email admins when a new user registers'] = 'E-mail upraviteljima pri upisu novih korisnika';
$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';
$lang['Form'] = 'Oblik';
@@ -146,7 +143,6 @@ $lang['Random picture'] = 'Slika slučajnog odabira';
$lang['Rate date'] = 'Nadnevak ocjene';
$lang['Rating by guests'] = 'Ocjene gostiju';
$lang['Rating'] = 'Ocjenjivanje';
-$lang['Reject All'] = 'Odbaci Sve';
$lang['Reject'] = 'Odbaci';
$lang['Representant'] = 'Predstavnik';
$lang['Representation of albums'] = 'Predstavljanje skupina';
@@ -172,7 +168,6 @@ $lang['Uninstall'] = 'Ukloni';
$lang['Use the default image sort order (defined in the configuration file)']='Koristi pretpostavljeni redoslijed slaganja slika (određeno u zapisu postave)';
$lang['User comments validation'] = 'Ovjera korisničkih komentara';
$lang['Users'] = 'Korisnici';
-$lang['Validate All'] = 'Ovjeri Sve';
$lang['Validate'] = 'Ovjeri';
$lang['Validation'] = 'Ovjera';
$lang['Version'] = 'Inačica';
@@ -196,7 +191,6 @@ $lang['Public'] = 'Javna skupina';
$lang['Find a new representant by random'] = 'Izbor novog predstavnika slučajnim odabirom';
$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';
$lang['Access type'] = 'Vrsta pristupa';
@@ -215,7 +209,6 @@ $lang['Dissociate from album'] = 'odspoji od skupine';
$lang['dissociate from group'] = 'odspoji od grupe';
$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';
$lang['High definition enabled'] = 'Visoka razlučljivost omogućena';
@@ -359,7 +352,6 @@ $lang['User list'] = 'Popis korisnika';
$lang['Modify informations about a picture'] = 'Promjena podataka o slici';
$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)';
$lang['height must be a number superior to'] = 'visina mora biti broj veći od ';
@@ -549,8 +541,6 @@ $lang['An error occured during extraction (%s).'] = 'Došlo je do greške prilik
$lang['Please check "plugins" folder and sub-folders permissions (CHMOD).'] = 'Provjerite "plugins" mapu i dozvole podmapa (CHMOD).';
$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';
$lang['ACCESS_2'] = 'Pristup pretplatnicima';
@@ -723,7 +713,6 @@ $lang['Add Photos'] = 'Dodaj Slike';
$lang['Download'] = 'Preuzmi';
$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.';
$lang['There is no other plugin available.'] = 'Nema dostupnih drugih dodataka.';
diff --git a/language/hr_HR/common.lang.php b/language/hr_HR/common.lang.php
index af6c941ba..b33acefed 100644
--- a/language/hr_HR/common.lang.php
+++ b/language/hr_HR/common.lang.php
@@ -44,8 +44,6 @@ $lang['%d new image'] = '%d nova slika';
$lang['%d new images'] = '%d nove slike';
$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';
$lang['Any tag'] = 'Bilo koji tag';
@@ -321,7 +319,6 @@ $lang['Registration of %s'] = 'Upis od %s';
$lang['Album: %s'] = 'Skupina: %s';
$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
$lang['Bad status for user "guest", using default status. Please notify the webmaster.'] = 'Loš status za korisnika "guest", koristi se pretpostavljeni status. Molimo obavjestite webmaster-a.';
diff --git a/language/hu_HU/admin.lang.php b/language/hu_HU/admin.lang.php
index 58a0b830a..b4595b8ba 100644
--- a/language/hu_HU/admin.lang.php
+++ b/language/hu_HU/admin.lang.php
@@ -46,8 +46,6 @@ $lang['%d users deleted'] = '%d törölt felhasználó';
$lang['%d user'] = '%d felhasználó';
$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';
$lang['Add/delete a permalink'] = 'Közvetlen link hozzáadása/törlése';
@@ -88,7 +86,6 @@ $lang['Elements'] = 'Elemek';
$lang['Email admins when a new user registers'] = 'Email-küldés, ha egy új felhasználó regisztrál';
$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';
$lang['Form'] = 'Űrlap';
@@ -147,7 +144,6 @@ $lang['Random picture'] = 'Véletlen kép';
$lang['Rate date'] = 'Értékelés időpontja';
$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';
$lang['Representation of albums'] = 'Albumok reprezentálása';
@@ -172,7 +168,6 @@ $lang['Uninstall'] = 'Eltávolítás';
$lang['Use the default image sort order (defined in the configuration file)']='Alapértelmezett kép sorrend (konfigurációs fájl definiálás)';
$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';
$lang['Version'] = 'Verzió';
@@ -196,7 +191,6 @@ $lang['Public'] = 'Nyilvános album';
$lang['Find a new representant by random'] = 'Új album-képviselő véletlenszerű kiválasztása';
$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';
$lang['Access type'] = 'Hozzáférés típusa';
@@ -214,7 +208,6 @@ $lang['Dissociate from album'] = 'Eltávolítás az albumból';
$lang['dissociate from group'] = 'Eltávolítás a csoportból';
$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';
$lang['High definition enabled'] = 'Kiemelt hozzáférés engedélyezése';
@@ -360,7 +353,6 @@ $lang['User list'] = 'Felhasználók listája';
$lang['Modify informations about a picture'] = 'Képinformációk módosítása';
$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)';
$lang['height must be a number superior to'] = 'a magasságnak ennél nagyobbnak kell lennie:';
@@ -553,8 +545,6 @@ $lang['Can\'t connect to server.'] = 'Nem sikerült csatlakozni a szerverhez.';
$lang['Purge compiled templates'] = 'Összeállított sablonok törlése';
$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';
$lang['ACCESS_2'] = 'Regisztráltak';
@@ -727,7 +717,6 @@ $lang['Add Photos'] = 'Képek hozzáadása';
$lang['Download'] = 'Letöltés';
$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.';
$lang['There is no other plugin available.'] = 'Egyéb bővítmény nem áll rendelkezésre.';
diff --git a/language/hu_HU/common.lang.php b/language/hu_HU/common.lang.php
index 342b0b6e0..f29f73a7b 100644
--- a/language/hu_HU/common.lang.php
+++ b/language/hu_HU/common.lang.php
@@ -44,8 +44,6 @@ $lang['%d new image'] = '%d új elem';
$lang['%d new images'] = '%d új elem';
$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';
$lang['Any tag'] = 'Bármely címke';
@@ -322,7 +320,6 @@ $lang['Registration of %s'] = 'Bejegyezte: %s';
$lang['Album: %s'] = 'Album: %s';
$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
$lang['Bad status for user "guest", using default status. Please notify the webmaster.'] = 'Rossz felhasználói állapot "vendég", az alapértelmezett állapot. Kérjük, küldjön értesítést a webmesternek.';
diff --git a/language/hu_HU/help/help_user_upload.html b/language/hu_HU/help/help_user_upload.html
deleted file mode 100644
index 90683e119..000000000
--- a/language/hu_HU/help/help_user_upload.html
+++ /dev/null
@@ -1,18 +0,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>
diff --git a/language/it_IT/admin.lang.php b/language/it_IT/admin.lang.php
index 37be3553a..0eafed42c 100644
--- a/language/it_IT/admin.lang.php
+++ b/language/it_IT/admin.lang.php
@@ -48,8 +48,6 @@ $lang['%d users deleted'] = '%d utenti cancellati';
$lang['%d user'] = '%d utente';
$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';
$lang['Add/delete a permalink'] = 'Aggiungere/cancellare un permalink';
@@ -90,7 +88,6 @@ $lang['Elements'] = 'Elementi';
$lang['Email admins when a new user registers'] = 'Notificare gli amministratori dell\'iscrizione di un nuovo utente';
$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';
$lang['Form'] = 'Modulo';
@@ -149,7 +146,6 @@ $lang['Random picture'] = 'Immagine a caso';
$lang['Rate date'] = 'Data del voto';
$lang['Rating by guests'] = 'Voti degli ospiti';
$lang['Rating'] = 'Voto';
-$lang['Reject All'] = 'Rifiutare tutto';
$lang['Reject'] = 'Rifiutare';
$lang['Representant'] = 'Copertina';
$lang['Representation of albums'] = 'Rappresentazione degli album';
@@ -175,7 +171,6 @@ $lang['Uninstall'] = 'Disinstallare';
$lang['Use the default image sort order (defined in the configuration file)']='Usare l\'ordinamento delle immagini di default (cosi come definito nel file di configurazione)';
$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';
$lang['Version'] = 'Versione';
@@ -199,7 +194,6 @@ $lang['Public'] = 'Album pubblico';
$lang['Find a new representant by random'] = 'Scegliere una nuova copertina a caso';
$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';
$lang['Access type'] = 'Tipo di accesso';
@@ -218,7 +212,6 @@ $lang['Dissociate from album'] = 'Dissociare dall\'album';
$lang['dissociate from group'] = 'Dissociare dal gruppo';
$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';
$lang['High definition enabled'] = 'Alta definizione attiva';
@@ -366,7 +359,6 @@ $lang['User list'] = 'Elenco utenti';
$lang['Modify informations about a picture'] = 'Modificare le informazioni dell\'immagine';
$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)';
$lang['height must be a number superior to'] = 'l\'altezza deve essere un numero superiore a';
@@ -555,8 +547,6 @@ $lang['An error occured during extraction (%s).'] = 'Si è verificato un\'errore
$lang['Please check "plugins" folder and sub-folders permissions (CHMOD).'] = 'Verificate i permessi della cartella "plugins" e delle sue sotto cartelle (CHMOD).';
$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';
$lang['ACCESS_2'] = 'Accesso agli iscritti';
@@ -738,7 +728,6 @@ $lang['Add Photos'] = 'Aggiungere delle foto';
$lang['Download'] = 'Download';
$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.';
$lang['There is no other plugin available.'] = 'Non ci sono altri plugin disponibili.';
diff --git a/language/it_IT/common.lang.php b/language/it_IT/common.lang.php
index 3ab6ef7f3..0a1649962 100644
--- a/language/it_IT/common.lang.php
+++ b/language/it_IT/common.lang.php
@@ -44,8 +44,6 @@ $lang['%d new image'] = '%d nuovo elemento';
$lang['%d new images'] = '%d nuovi elementi';
$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';
$lang['Any tag'] = 'Qualsiasi tag';
@@ -319,7 +317,6 @@ $lang['Registration of %s'] = 'Registrazione di %s';
$lang['Album: %s'] = 'Album: %s';
$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
$lang['Bad status for user "guest", using default status. Please notify the webmaster.'] = 'Lo status dell\'utente "guest" non è conforme, viene usato lo status di default. Per favore avvisa il webmaster.';
diff --git a/language/it_IT/help/help_user_upload.html b/language/it_IT/help/help_user_upload.html
deleted file mode 100644
index dbfc40064..000000000
--- a/language/it_IT/help/help_user_upload.html
+++ /dev/null
@@ -1,14 +0,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>
diff --git a/language/ja_JP/admin.lang.php b/language/ja_JP/admin.lang.php
index 8c549b176..fe735e403 100644
--- a/language/ja_JP/admin.lang.php
+++ b/language/ja_JP/admin.lang.php
@@ -46,8 +46,6 @@ $lang['%d users deleted'] = '%d ユーザが削除されました。';
$lang['%d user'] = 'ユーザ:%d';
$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'] = '有効化';
$lang['Add/delete a permalink'] = 'パーマリンクを追加/削除する';
@@ -88,7 +86,6 @@ $lang['Elements'] = 'エレメント';
$lang['Email admins when a new user registers'] = '新しいユーザ登録時、管理者にメールする';
$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'] = '環境';
$lang['Form'] = 'フォーム';
@@ -147,7 +144,6 @@ $lang['Random picture'] = 'ランダム写真';
$lang['Rate date'] = '評価日';
$lang['Rating by guests'] = 'ゲストによる評価';
$lang['Rating'] = '評価';
-$lang['Reject All'] = 'すべてを拒否する';
$lang['Reject'] = '拒否';
$lang['Representant'] = '見本';
$lang['Representation of albums'] = 'カテゴリ見本';
@@ -172,7 +168,6 @@ $lang['Uninstall'] = 'アンインストール';
$lang['Use the default image sort order (defined in the configuration file)']='デフォルトの (設定ファイルで定義された) イメージ並び順を使用する';
$lang['User comments validation'] = 'ユーザコメント承認';
$lang['Users'] = 'ユーザ';
-$lang['Validate All'] = 'すべてを承認する';
$lang['Validate'] = '承認';
$lang['Validation'] = '承認';
$lang['Version'] = 'バージョン';
@@ -196,7 +191,6 @@ $lang['Public'] = 'パブリックカテゴリ';
$lang['Find a new representant by random'] = '新しい見本をランダムに探す';
$lang['Public / Private'] = 'パブリック / プライベート';
$lang['Manage authorizations for selected albums'] = '選択したカテゴリの権限を管理する';
-$lang['Select uploadable albums'] = 'アップロード可能なカテゴリを選択する';
$lang['Virtual album added'] = 'バーチャルカテゴリが追加されました。';
$lang['Virtual album deleted'] = 'バーチャルカテゴリが削除されました。';
$lang['Access type'] = 'アクセスタイプ';
@@ -214,7 +208,6 @@ $lang['Dissociate from album'] = 'カテゴリから関連付けを解除する'
$lang['dissociate from group'] = 'グループから関連付けを解除する';
$lang['edit album permissions'] = 'カテゴリパーミッションを編集する';
$lang['Album updated successfully'] = 'カテゴリ情報が正常に更新されました。';
-$lang['Authorize upload'] = 'アップロードを許可する';
$lang['elements per page'] = '1ページあたりのエレメント';
$lang['elements'] = 'エレメント';
$lang['High definition enabled'] = '高解像度を有効にする';
@@ -361,7 +354,6 @@ $lang['User list'] = 'ユーザリスト';
$lang['Modify informations about a picture'] = '写真情報を修正する';
$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のみ)';
$lang['height must be a number superior to'] = '高さは、次の値より大きくしてください:';
@@ -552,8 +544,6 @@ $lang['An error occured during extraction (%s).'] = '解凍中にエラーが発
$lang['Please check "plugins" folder and sub-folders permissions (CHMOD).'] = '「プラグイン」フォルダおよびサブフォルダのパーミッションをチェック (CHMOD) してください。';
$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'] = 'すべてのユーザがアクセスできる';
$lang['ACCESS_2'] = '登録ユーザのみアクセスできる';
@@ -697,7 +687,6 @@ $lang['Activate field "%s"'] = '"%s"のフィールドを有効する';
$lang['Photo Properties'] = '写真のプロパティ';
$lang['Allow user customization'] = 'ユーザーのカスタマイズを有効にする';
$lang['Miscellaneous'] = 'その他の情報';
-$lang['User Upload'] = 'ユーザによるアップロード';
$lang['Virtual Links'] = 'バーチャルのリンク';
$lang['Languages'] = '言語';
$lang['Installed Languages'] = 'インストールされた言語';
diff --git a/language/ja_JP/common.lang.php b/language/ja_JP/common.lang.php
index 8591744b2..61c7385c6 100644
--- a/language/ja_JP/common.lang.php
+++ b/language/ja_JP/common.lang.php
@@ -44,8 +44,6 @@ $lang['%d new image'] = '新しいイメージ: %d';
$lang['%d new images'] = '新しいイメージ: %d';
$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'] = 'すべてのタグ';
$lang['Any tag'] = 'すべてのtag';
@@ -320,7 +318,6 @@ $lang['Registration of %s'] = '%s の登録';
$lang['Album: %s'] = 'カテゴリ: %s';
$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
$lang['Bad status for user "guest", using default status. Please notify the webmaster.'] = 'デフォルトステータスの使用に関して、ユーザ「ゲスト」は正しくないステータスです。ウェブマスタにご連絡ください。';
diff --git a/language/ja_JP/help/help_user_upload.html b/language/ja_JP/help/help_user_upload.html
deleted file mode 100644
index e588b4361..000000000
--- a/language/ja_JP/help/help_user_upload.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<p>ユーザは自分の写真をアップロードすることもできます。</p>
-
-<p>物理カテゴリにアップロードを許可します (「<span class="pwgScreen">管理 &raquo; カテゴリ &raquo; 管理 &raquo; 編集</span>」または「<span class="pwgScreen">管理 > カテゴリ > プロパティ > アップロード</span>」)。バーチャルカテゴリには、アップロードすることができません。</p>
-
-<p>対応するディレクトリに書込み権を与えてください。</p>
-
diff --git a/language/ka_GE/admin.lang.php b/language/ka_GE/admin.lang.php
index 79e7b7edb..52f25277a 100644
--- a/language/ka_GE/admin.lang.php
+++ b/language/ka_GE/admin.lang.php
@@ -46,8 +46,6 @@ $lang['%d users deleted'] = '%d მომხმარებელი წაშ
$lang['%d user'] = '%d მომხმარებელი';
$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'] = 'აქტივაცია';
$lang['Add/delete a permalink'] = 'დავამატოთ/წავშალოთ მუდმივი ბმული';
@@ -88,7 +86,6 @@ $lang['Elements'] = 'ელემენტები';
$lang['Email admins when a new user registers'] = 'შევატყობინოთ ადმინისტრატორს ახალი მომხმარებლის რეგისტრაცია';
$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'] = 'გარემოცვა';
$lang['Form'] = 'მოქმედებები';
@@ -147,7 +144,6 @@ $lang['Random picture'] = 'შემთხვევითი ფოტო';
$lang['Rate date'] = 'თარიღი';
$lang['Rating by guests'] = 'სტუმრების შეფასება';
$lang['Rating'] = 'შეფასება';
-$lang['Reject All'] = 'უარი ყველას';
$lang['Reject'] = 'უარი';
$lang['Representant'] = 'წარმომადგენელი';
$lang['Representation of albums'] = 'წარმოდგენილი კატეგორიები';
@@ -172,7 +168,6 @@ $lang['Uninstall'] = 'დეინსტალაცია';
$lang['Use the default image sort order (defined in the configuration file)']='სურათების სორტირება ძირითადად (როგორც კონფიგურაციის ფაილშია)';
$lang['User comments validation'] = 'მომხმარებლების კომენტარების შემოწმება';
$lang['Users'] = 'მომხმარებლები';
-$lang['Validate All'] = 'მივიღოთ ყველა';
$lang['Validate'] = 'მივიღოთ';
$lang['Validation'] = 'შემოწმება';
$lang['Version'] = 'ვერსია';
@@ -196,7 +191,6 @@ $lang['Public'] = 'საერთო კატეგორია';
$lang['Find a new representant by random'] = 'ვიპოვოტ ახალი წარმომადგენელი შემთხვევითი მეთოდით';
$lang['Public / Private'] = 'საერთო / პრივატული';
$lang['Manage authorizations for selected albums'] = 'ავტორიზაციის მართვა არჩეული კატეგორიებისათვის';
-$lang['Select uploadable albums'] = 'კატეგორიის არჩევა რომელშიც შესაძლებელია ატვირთვა';
$lang['Virtual album added'] = 'ვირტუალური კატეგორია დამატებულია';
$lang['Virtual album deleted'] = 'ვირტუალური კატეგორია წაშლილია';
$lang['Access type'] = 'დაშვების ტიპი';
@@ -214,7 +208,6 @@ $lang['Dissociate from album'] = 'მოვაშოროთ კატეგო
$lang['dissociate from group'] = 'მოვაშოროთ ჯგუფს';
$lang['edit album permissions'] = 'კატეგორიის უფლებების რედაქტირება';
$lang['Album updated successfully'] = 'ინფორმაცია კატეგორიაზე წარმატებით განახლებულია.';
-$lang['Authorize upload'] = 'დაუშვათ გადმოწერა';
$lang['elements per page'] = 'მინიატურები გვერდზე';
$lang['elements'] = 'ელემენტები';
$lang['High definition enabled'] = 'არსებობს დიდი გაფართოებით';
@@ -364,7 +357,6 @@ $lang['User list'] = 'მომხმარებლების სია';
$lang['Modify informations about a picture'] = 'შევცვალოთ ინფორმაცია ფოტოზე';
$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)';
$lang['height must be a number superior to'] = 'სიმაღლე უნდა იყოს მეტი რიცხვი';
@@ -560,8 +552,6 @@ $lang['Please check "plugins" folder and sub-folders permissions (CHMOD).'] = '
$lang['Can\'t connect to server.'] = 'სერვერთან დაკავშირება შეუძლებელია.';
$lang['Purge compiled templates'] = 'გავასუფთაოთ შექმნილი შაბლონები';
$lang['Upload'] = 'ატვირთვები';
-$lang['Show upload link every time'] = 'ვაჩვენოთ ჩამოსატვირთი ბმული მუდმივად';
-$lang['User access level to upload'] = 'მომხმარებლის დაშვების ხარისხი ასატვირთად';
$lang['ACCESS_0'] = 'თავისუფალი დაშვება';
$lang['ACCESS_1'] = 'დაშვებულია ყველასთვის';
$lang['ACCESS_2'] = 'დაშვებულია რჩეულებისათვის';
@@ -734,7 +724,6 @@ $lang['Add Photos'] = 'ფოტოს დამატება';
$lang['Download'] = 'ჩამოვტვირთოთ';
$lang['The following tag was deleted'] = 'შემდეგი ნიშნულები წაშლილია';
$lang['Miscellaneous'] = 'სხვა და სხვა';
-$lang['User Upload'] = 'ატვირთვა მომხმარებლის მიერ';
$lang['Virtual Links'] = 'ვირტ.ბმულები';
$lang['Templates configuration has been recorded.'] = 'შაბლონის კონფიგურაცის გადაწერილია.';
$lang['Modify information'] = 'ინფორმაცია ცვლილებების შესახებ';
diff --git a/language/ka_GE/common.lang.php b/language/ka_GE/common.lang.php
index 9f305d0e7..9f03727f4 100644
--- a/language/ka_GE/common.lang.php
+++ b/language/ka_GE/common.lang.php
@@ -44,8 +44,6 @@ $lang['%d new image'] = '%d ახალი ელემენტი';
$lang['%d new images'] = '%d ახალი ელემენტები';
$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'] = 'ყველა სიტყვა';
$lang['Any tag'] = 'ნებისმიერი სიტყვა';
@@ -324,7 +322,6 @@ $lang['Registration of %s'] = 'რეგისტრაცია %s';
$lang['Album: %s'] = 'კატეგორია: %s';
$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
$lang['Bad status for user "guest", using default status. Please notify the webmaster.'] = 'მომხმარებლის არასწორი სტატუსი "სტუმარი", გამოიყენეთ ძირითადი სტატუსი. გთხოვთ შეატყობინოთ ადმინისტრატორს.';
diff --git a/language/ka_GE/help/help_user_upload.html b/language/ka_GE/help/help_user_upload.html
deleted file mode 100644
index 9bed9d458..000000000
--- a/language/ka_GE/help/help_user_upload.html
+++ /dev/null
@@ -1,15 +0,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>
-
diff --git a/language/lv_LV/admin.lang.php b/language/lv_LV/admin.lang.php
index dd85a1992..e8f597bfc 100644
--- a/language/lv_LV/admin.lang.php
+++ b/language/lv_LV/admin.lang.php
@@ -44,8 +44,6 @@ $lang['%d users deleted'] = '%d lietotāji izdzēsti';
$lang['%d user'] = '%d lietotājs';
$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';
$lang['Add/delete a permalink'] = 'Pievienot/dzēst pamatsaiti';
@@ -86,7 +84,6 @@ $lang['Elements'] = 'Elementi';
$lang['Email admins when a new user registers'] = 'Paziņot adminam, kad jauns lietotājs reģistrējas';
$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';
$lang['Form'] = 'Forma';
@@ -145,7 +142,6 @@ $lang['Random picture'] = 'Gadījuma bilde';
$lang['Rate date'] = 'Vērtēšanas datums';
$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';
$lang['Representation of albums'] = 'Albūma attēlojums';
@@ -171,7 +167,6 @@ $lang['Uninstall'] = 'Atinstalēt';
$lang['Use the default image sort order (defined in the configuration file)'] = 'Attēlu kārtošanas secība pēc noklusējuma (definēta konfigurācijas failā)';
$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';
$lang['Version'] = 'Versija';
@@ -195,7 +190,6 @@ $lang['Public'] = 'Publiska albūms';
$lang['Find a new representant by random'] = 'Atrast jaunu pārstāvi nejauši';
$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';
$lang['Access type'] = 'Piekļuves tips';
@@ -213,7 +207,6 @@ $lang['Dissociate from album'] = 'atsaistīt no albūma';
$lang['dissociate from group'] = 'atsaistīt no grupas';
$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';
$lang['High definition enabled'] = 'Augstā izšķirtspēja iespējota';
@@ -359,7 +352,6 @@ $lang['User list'] = 'Lietotāju saraksts';
$lang['Modify informations about a picture'] = 'Izmainīt informnāciju par attēlu ';
$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)';
$lang['height must be a number superior to'] = 'augstuman jābūt skaitlim lielākam par';
@@ -547,8 +539,6 @@ $lang['An error occured during extraction (%s).'] = 'Kļūda izpakojot (%s).';
$lang['Please check "plugins" folder and sub-folders permissions (CHMOD).'] = 'Lūdzu pārbaudiet "spraudņu" mapes and tās apakšdirektoriju atļaujas (CHMOD).';
$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';
$lang['ACCESS_2'] = 'Piekļuve tikai reģistrētiem lietotājiem';
@@ -719,7 +709,6 @@ $lang['Add Photos'] = 'Pievienot attēlus';
$lang['Download'] = 'Lejupielādēt';
$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.';
$lang['There is no other plugin available.'] = 'Cits spraudnis nav pieejams.';
diff --git a/language/lv_LV/common.lang.php b/language/lv_LV/common.lang.php
index d7eb0b6db..de9bc88d1 100644
--- a/language/lv_LV/common.lang.php
+++ b/language/lv_LV/common.lang.php
@@ -44,8 +44,6 @@ $lang['%d new image'] = "%d jauns attēls";
$lang['%d new images'] = "%d jauni attēli";
$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";
$lang['Any tag'] = "Jabkurš tags";
@@ -319,7 +317,6 @@ $lang['Registration of %s'] = "Reģistrācija %s";
$lang['Album: %s'] = 'Albūms: %s';
$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.";
$lang['Administrator, webmaster and special user cannot use this method'] = 'Administrātors, webmāsters un īpašais lietotājs var izmantot šo metodi';
diff --git a/language/lv_LV/help/help_user_upload.html b/language/lv_LV/help/help_user_upload.html
deleted file mode 100644
index 9ad2cacd0..000000000
--- a/language/lv_LV/help/help_user_upload.html
+++ /dev/null
@@ -1,12 +0,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>
diff --git a/language/mk_MK/common.lang.php b/language/mk_MK/common.lang.php
index c990345f0..5367ca201 100644
--- a/language/mk_MK/common.lang.php
+++ b/language/mk_MK/common.lang.php
@@ -52,8 +52,6 @@ $lang['%d image'] = '%d фотографија';
$lang['%d images'] = '%d фотографии';
$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'] = 'Сите етикети';
$lang['Any tag'] = 'Било која етикета';
@@ -330,7 +328,6 @@ $lang['Registration of %s'] = 'Registration of %s';
$lang['Album: %s'] = 'Категорија: %s';
$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.'] = 'Грешка при најавувањето како гостин.';
$lang['Submit'] = 'Поднесува';
diff --git a/language/nl_NL/admin.lang.php b/language/nl_NL/admin.lang.php
index 6bc4c51ac..fcb6ff605 100644
--- a/language/nl_NL/admin.lang.php
+++ b/language/nl_NL/admin.lang.php
@@ -46,8 +46,6 @@ $lang['%d users deleted'] = '%d gebruikers verwijderd';
$lang['%d user'] = '%d gebruiker';
$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';
$lang['Add/delete a permalink'] = 'Toevoegen/verwijderen van een permalink';
@@ -88,7 +86,6 @@ $lang['Elements'] = 'Afbeeldingen';
$lang['Email admins when a new user registers'] = 'Stuur email naar beheerders wanneer een nieuwe gebruiker zich heeft geregistreerd';
$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';
$lang['Form'] = 'Formulier';
@@ -147,7 +144,6 @@ $lang['Random picture'] = 'Willekeurig plaatje';
$lang['Rate date'] = 'Waarderingsdatum';
$lang['Rating by guests'] = 'Ook gasten kunnen waarderen';
$lang['Rating'] = 'Waardering';
-$lang['Reject All'] = 'Alles afwijzen';
$lang['Reject'] = 'Afwijzen';
$lang['Representant'] = 'Representant';
$lang['Representation of albums'] = 'Representatieve categorieën';
@@ -173,7 +169,6 @@ $lang['Uninstall'] = 'Deinstaleer';
$lang['Use the default image sort order (defined in the configuration file)']='Gebruik de standaard sortering (gedefinieerd in het configuratiebestand)';
$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';
$lang['Version'] = 'Versie';
@@ -197,7 +192,6 @@ $lang['Public'] = 'Openbare categorie';
$lang['Find a new representant by random'] = 'Vindt een willekeurige nieuwe representant';
$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';
$lang['Access type'] = 'Toegangstype';
@@ -215,7 +209,6 @@ $lang['Dissociate from album'] = 'Verwijder link aan categorie';
$lang['dissociate from group'] = 'Verwijder link aan groep';
$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';
$lang['High definition enabled'] = 'Hoge kwaliteit ingeschakeld';
@@ -360,7 +353,6 @@ $lang['User list'] = 'Gebruikerslijst';
$lang['Modify informations about a picture'] = 'Verander de informatie van een plaatje';
$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)';
$lang['height must be a number superior to'] = 'Hoogte moet groter zijn dan';
@@ -551,8 +543,6 @@ $lang['Can\'t connect to server.'] = 'Kan niet met de server verbinden.';
$lang['Purge compiled templates'] = 'Verwijder samengestelde sjablonen';
$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';
$lang['ACCESS_2'] = 'Toegang tot geabonneerde';
@@ -721,7 +711,6 @@ $lang['Inactive Languages'] = 'Niet actieve talen';
$lang['Make this language available to users'] = 'Stel deze taal beschikbaar aan gebruikers';
$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';
$lang['Download'] = 'Download';
diff --git a/language/nl_NL/common.lang.php b/language/nl_NL/common.lang.php
index 89398349f..a6c8be92e 100644
--- a/language/nl_NL/common.lang.php
+++ b/language/nl_NL/common.lang.php
@@ -44,8 +44,6 @@ $lang['%d new image'] = '%d nieuwe afbeelding';
$lang['%d new images'] = '%d nieuwe afbeeldingen';
$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';
$lang['Any tag'] = 'Elke tag';
@@ -320,7 +318,6 @@ $lang['Registration of %s'] = 'Registratie van %s';
$lang['Album: %s'] = 'Categorie: %s';
$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
$lang['Bad status for user "guest", using default status. Please notify the webmaster.'] = 'Foutieve status voor gebruiker "guest", gebruik standaard status. Waarschuw de webbeheerder.';
diff --git a/language/nl_NL/help/help_user_upload.html b/language/nl_NL/help/help_user_upload.html
deleted file mode 100644
index ee5a4bf9f..000000000
--- a/language/nl_NL/help/help_user_upload.html
+++ /dev/null
@@ -1,13 +0,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>
-
diff --git a/language/no_NO/admin.lang.php b/language/no_NO/admin.lang.php
index 3c8e2edf5..d53cc8851 100644
--- a/language/no_NO/admin.lang.php
+++ b/language/no_NO/admin.lang.php
@@ -44,8 +44,6 @@ $lang['%d users deleted'] = '%d brukere slettet';
$lang['%d user'] = '%d bruker';
$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';
$lang['Add/delete a permalink'] = 'Legg til/Slett en permalink';
@@ -86,7 +84,6 @@ $lang['Elements'] = 'Elementer';
$lang['Email admins when a new user registers'] = 'Email administrator når en ny bruker registreres';
$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ø';
$lang['Form'] = 'Skjema';
@@ -145,7 +142,6 @@ $lang['Random picture'] = 'Tilfeldig bilde';
$lang['Rate date'] = 'Stemme dato';
$lang['Rating by guests'] = 'Stemt på av gjester';
$lang['Rating'] = 'Stemming';
-$lang['Reject All'] = 'Avvis alle';
$lang['Reject'] = 'Avvis';
$lang['Representant'] = 'Representant';
$lang['Representation of albums'] = 'Representant til album';
@@ -171,7 +167,6 @@ $lang['Uninstall'] = 'Avinstaller';
$lang['Use the default image sort order (defined in the configuration file)'] = 'bruk standard bilde sortering (definert i konfigurasjons filen)';
$lang['User comments validation'] = 'Brukerkommentar validering';
$lang['Users'] = 'Brukere';
-$lang['Validate All'] = 'Valider Alle';
$lang['Validate'] = 'Valider';
$lang['Validation'] = 'Validering';
$lang['Version'] = 'Versjon';
@@ -195,7 +190,6 @@ $lang['Public'] = 'Offentlig';
$lang['Find a new representant by random'] = 'Finn en ny tilfeldig representant';
$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';
$lang['Access type'] = 'Tilgangstype type';
@@ -213,7 +207,6 @@ $lang['Dissociate from album'] = 'Skill fra album';
$lang['dissociate from group'] = 'Skill fra gruppe';
$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';
$lang['High definition enabled'] = 'Høy oppløsning aktivert';
@@ -359,7 +352,6 @@ $lang['User list'] = 'Bruker liste';
$lang['Modify informations about a picture'] = 'Endre bilde informasjon';
$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)';
$lang['height must be a number superior to'] = 'høyde må være et nummer høyere en';
@@ -547,8 +539,6 @@ $lang['An error occured during extraction (%s).'] = 'En feil oppstod under utpak
$lang['Please check "plugins" folder and sub-folders permissions (CHMOD).'] = 'Vennligst sjekk "plugins" mappe og under-mappers rettigheter (CHMOD).';
$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';
$lang['ACCESS_2'] = 'Tilgjengelig for registrerte brukere';
@@ -719,7 +709,6 @@ $lang['Add Photos'] = 'Legg til bilder';
$lang['Download'] = 'Last ned';
$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.';
$lang['There is no other plugin available.'] = 'Det er ingen andre tilleggsprogrammer tilgjengelig.';
diff --git a/language/no_NO/common.lang.php b/language/no_NO/common.lang.php
index 2fb35d0d2..a8274eb66 100644
--- a/language/no_NO/common.lang.php
+++ b/language/no_NO/common.lang.php
@@ -42,7 +42,6 @@ $lang['Admin: %s'] = "Admin: %s";
$lang['Registration of %s'] = "Registrering av %s";
$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.";
$lang['Administrator, webmaster and special user cannot use this method'] = "Administrator, webmaster og spesial bruker kan ikke bruke denne metoden";
@@ -140,8 +139,6 @@ $lang['%d new image'] = '%d nytt bilde';
$lang['%d new images'] = '%d nye bilder';
$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';
$lang['Any tag'] = 'Valgte ord';
diff --git a/language/no_NO/help/help_user_upload.html b/language/no_NO/help/help_user_upload.html
deleted file mode 100644
index 9f39aae74..000000000
--- a/language/no_NO/help/help_user_upload.html
+++ /dev/null
@@ -1,15 +0,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>
diff --git a/language/pl_PL/admin.lang.php b/language/pl_PL/admin.lang.php
index ff7003025..c438a1125 100644
--- a/language/pl_PL/admin.lang.php
+++ b/language/pl_PL/admin.lang.php
@@ -46,8 +46,6 @@ $lang['%d users deleted'] = '%d usuniętych użytkowników';
$lang['%d user'] = '%d użytkownik';
$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';
$lang['Add/delete a permalink'] = 'Dodaj/Usuń permalink';
@@ -88,7 +86,6 @@ $lang['Elements'] = 'Elementy';
$lang['Email admins when a new user registers'] = 'Wyślij wiadomość do administratora gdy zarejestruje się nowy użytkownik';
$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';
$lang['Form'] = 'Formularz';
@@ -147,7 +144,6 @@ $lang['Random picture'] = 'Losowy obraz';
$lang['Rate date'] = 'Oceny po dacie';
$lang['Rating by guests'] = 'Oceny przez gości';
$lang['Rating'] = 'Oceny';
-$lang['Reject All'] = 'Odrzuć wszystkie';
$lang['Reject'] = 'Odrzuć';
$lang['Representant'] = 'Reprezentant';
$lang['Representation of albums'] = 'Reprezentacja albumu';
@@ -172,7 +168,6 @@ $lang['Uninstall'] = 'Odinstaluj';
$lang['Use the default image sort order (defined in the configuration file)']='Użyj domyślnego sortowania obrazów (zdefiniowane w pliku konfiguracyjnym)';
$lang['User comments validation'] = 'Zatwierdzanie komentarzy użytkowników';
$lang['Users'] = 'Użytkownicy';
-$lang['Validate All'] = 'Zatwierdź wszystkie';
$lang['Validate'] = 'Zatwierdź';
$lang['Validation'] = 'Zatwierdzanie';
$lang['Version'] = 'Wersja';
@@ -196,7 +191,6 @@ $lang['Public'] = 'Album dostępny publicznie';
$lang['Find a new representant by random'] = 'Znajdź losowo nowego reprezentanta';
$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';
$lang['Access type'] = 'Typ dostępu';
@@ -214,7 +208,6 @@ $lang['Dissociate from album'] = 'usuń powiązanie z albumem';
$lang['dissociate from group'] = 'usuń powiązanie od grupy';
$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';
$lang['High definition enabled'] = 'Wysoka jakość włączona';
@@ -360,7 +353,6 @@ $lang['User list'] = 'Lista użytkowników';
$lang['Modify informations about a picture'] = 'Edytuj informacje o obrazie';
$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)';
$lang['height must be a number superior to'] = 'wysokość musi być liczbą większą od';
@@ -551,8 +543,6 @@ $lang['An error occured during extraction (%s).'] = 'Błąd podczas rozpakowywan
$lang['Please check "plugins" folder and sub-folders permissions (CHMOD).'] = 'Sprawdź uprawnienia (CHMOD) do katalogu "plugins" oraz podfolderów.';
$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';
$lang['ACCESS_2'] = 'Dostęp dla zapisanych';
@@ -726,7 +716,6 @@ $lang['Set as default language for unregistered and new users'] = 'Ustaw jako do
$lang['Add Photos'] = 'Dodaj zdjęcia';
$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.';
$lang['There is no other plugin available.'] = 'Nie ma dostępnej innej wtyczki.';
diff --git a/language/pl_PL/common.lang.php b/language/pl_PL/common.lang.php
index 8ec65e90c..caa6da7d3 100644
--- a/language/pl_PL/common.lang.php
+++ b/language/pl_PL/common.lang.php
@@ -44,8 +44,6 @@ $lang['%d new image'] = '%d nowy element';
$lang['%d new images'] = '%d nowych elementów';
$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';
$lang['Any tag'] = 'Dowolny tag';
@@ -321,7 +319,6 @@ $lang['Registration of %s'] = 'Rejestracja %s';
$lang['Album: %s'] = 'Album: %s';
$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
$lang['Bad status for user "guest", using default status. Please notify the webmaster.'] = 'Zły status dla użytkownika "gość", używam domyślnego';
diff --git a/language/pl_PL/help/help_user_upload.html b/language/pl_PL/help/help_user_upload.html
deleted file mode 100644
index 6bfab006c..000000000
--- a/language/pl_PL/help/help_user_upload.html
+++ /dev/null
@@ -1,14 +0,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>
-
diff --git a/language/pt_BR/admin.lang.php b/language/pt_BR/admin.lang.php
index e5b05be2c..aadeab6e0 100644
--- a/language/pt_BR/admin.lang.php
+++ b/language/pt_BR/admin.lang.php
@@ -46,8 +46,6 @@ $lang['%d users deleted'] = '%d usuários apagados';
$lang['%d user'] = '%d usuário';
$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';
$lang['Add/delete a permalink'] = 'Adicionar/apagar um link';
@@ -88,7 +86,6 @@ $lang['Elements'] = 'Itens';
$lang['Email admins when a new user registers'] = 'Notificar os administradores quando um novo usuário se registrar';
$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';
$lang['Form'] = 'Formulário';
@@ -147,7 +144,6 @@ $lang['Random picture'] = 'Imagem randômica';
$lang['Rate date'] = 'Data da votação';
$lang['Rating by guests'] = 'Votado(a) pelos visitantes';
$lang['Rating'] = 'Avaliação';
-$lang['Reject All'] = 'Rejeitar tudo';
$lang['Reject'] = 'Rejeitar';
$lang['Representant'] = 'Representante';
$lang['Representation of albums'] = 'Representante das categorias';
@@ -173,7 +169,6 @@ $lang['Uninstall'] = 'Desinstalar';
$lang['Use the default image sort order (defined in the configuration file)']='Usar a ordem de exibição padrão (definida no arquivo de configuração)';
$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';
$lang['Version'] = 'Versão';
@@ -197,7 +192,6 @@ $lang['Public'] = 'Categorias públicas';
$lang['Find a new representant by random'] = 'Encontrar um novo representante aleatoriamente';
$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';
$lang['Access type'] = 'Tipo de acesso';
@@ -215,7 +209,6 @@ $lang['Dissociate from album'] = 'desassociar da categoria';
$lang['dissociate from group'] = 'desassociar do grupo';
$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';
$lang['High definition enabled'] = 'Auta definição ativada';
@@ -362,7 +355,6 @@ $lang['User list'] = 'Lista de usuário';
$lang['Modify informations about a picture'] = 'Modificar informações sobre uma imagem';
$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)';
$lang['height must be a number superior to'] = 'altura deve ser um número superior a';
@@ -553,8 +545,6 @@ $lang['An error occured during extraction (%s).'] = 'Houve um erro durante a ext
$lang['Please check "plugins" folder and sub-folders permissions (CHMOD).'] = 'Por favor, checar as permissões das pastas e subpastas de plugins (CHMOD).';
$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';
$lang['ACCESS_2'] = 'Acesso a assinantes';
@@ -609,7 +599,6 @@ $lang['Subscribe %s to Piwigo Announcements Newsletter'] = 'Fazer %s assinar o b
$lang['Purge search history'] = 'Limpar o histórico da pesquisa';
$lang['Hide'] = 'Esconder';
$lang['Miscellaneous'] = 'Outras informações';
-$lang['User Upload'] = 'Upload de usuários';
$lang['Virtual Links'] = 'Links virtuais';
$lang['Menu Management'] = 'Menu';
?>
diff --git a/language/pt_BR/common.lang.php b/language/pt_BR/common.lang.php
index e7ae7f162..83163a63d 100644
--- a/language/pt_BR/common.lang.php
+++ b/language/pt_BR/common.lang.php
@@ -44,8 +44,6 @@ $lang['%d new image'] = '%d imagem nova';
$lang['%d new images'] = '%d imagens novas';
$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';
$lang['Any tag'] = 'qualquer tag';
@@ -321,7 +319,6 @@ $lang['Registration of %s'] = 'Registro de %s';
$lang['Album: %s'] = 'Categoria: %s';
$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
$lang['Bad status for user "guest", using default status. Please notify the webmaster.'] = 'Status ruim para o usuário "guest", será usado status padrão. Por favor, avise o administrador do site.';
diff --git a/language/pt_BR/help/help_user_upload.html b/language/pt_BR/help/help_user_upload.html
deleted file mode 100644
index 572cda2f0..000000000
--- a/language/pt_BR/help/help_user_upload.html
+++ /dev/null
@@ -1,15 +0,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>
-
diff --git a/language/pt_PT/admin.lang.php b/language/pt_PT/admin.lang.php
index 5ccd0abfd..fb719628a 100644
--- a/language/pt_PT/admin.lang.php
+++ b/language/pt_PT/admin.lang.php
@@ -46,8 +46,6 @@ $lang['%d users deleted'] = '%d usuários apagados';
$lang['%d user'] = '%d usuário';
$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';
$lang['Add/delete a permalink'] = 'Adicionar/apagar um link';
@@ -88,7 +86,6 @@ $lang['Elements'] = 'Elementos';
$lang['Email admins when a new user registers'] = 'Notificar os administradores quando um novo usuário se registrar';
$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';
$lang['Form'] = 'Formulário';
@@ -147,7 +144,6 @@ $lang['Random picture'] = 'Imagem randômica';
$lang['Rate date'] = 'Data da votação';
$lang['Rating by guests'] = 'Votado(a) pelos visitantes';
$lang['Rating'] = 'Avaliação';
-$lang['Reject All'] = 'Rejeitar tudo';
$lang['Reject'] = 'Rejeitar';
$lang['Representant'] = 'Representante';
$lang['Representation of albums'] = 'Representante das categorias';
@@ -173,7 +169,6 @@ $lang['Uninstall'] = 'Desinstalar';
$lang['Use the default image sort order (defined in the configuration file)']='Usar a ordem de exibição padrão (definida no arquivo de configuração)';
$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';
$lang['Version'] = 'Versão';
@@ -197,7 +192,6 @@ $lang['Public'] = 'Categorias públicas';
$lang['Find a new representant by random'] = 'Encontrar um novo representante aleatoriamente';
$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';
$lang['Access type'] = 'Tipo de acesso';
@@ -215,7 +209,6 @@ $lang['Dissociate from album'] = 'desassociar da categoria';
$lang['dissociate from group'] = 'desassociar do grupo';
$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';
$lang['High definition enabled'] = 'Alta definição ativada';
@@ -362,7 +355,6 @@ $lang['User list'] = 'Lista de usuários';
$lang['Modify informations about a picture'] = 'Modificar informações sobre uma imagem';
$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)';
$lang['height must be a number superior to'] = 'altura deve ser um número superior a';
@@ -553,8 +545,6 @@ $lang['An error occured during extraction (%s).'] = 'Houve um erro durante a ext
$lang['Please check "plugins" folder and sub-folders permissions (CHMOD).'] = 'Por favor, verifique as permissões das pastas e subpastas de plugins (CHMOD).';
$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';
$lang['ACCESS_2'] = 'Acesso a assinantes';
@@ -608,7 +598,6 @@ $lang['Subscribe %s to Piwigo Announcements Newsletter'] = 'Fazer %s assinar o b
$lang['Purge search history'] = 'Limpar o histórico da pesquisa';
$lang['Hide'] = 'Esconder';
$lang['Miscellaneous'] = 'Outras informações';
-$lang['User Upload'] = 'Upload de usuários';
$lang['Virtual Links'] = 'Links virtuais';
$lang['Menu Management'] = 'Menu';
?>
diff --git a/language/pt_PT/common.lang.php b/language/pt_PT/common.lang.php
index 09cf88573..1f4caacfe 100644
--- a/language/pt_PT/common.lang.php
+++ b/language/pt_PT/common.lang.php
@@ -44,8 +44,6 @@ $lang['%d new image'] = '%d imagem nova';
$lang['%d new images'] = '%d imagens novas';
$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';
$lang['Any tag'] = 'qualquer tag';
@@ -321,7 +319,6 @@ $lang['Registration of %s'] = 'Registro de %s';
$lang['Album: %s'] = 'Categoria: %s';
$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
$lang['Bad status for user "guest", using default status. Please notify the webmaster.'] = 'Status ruim para o usuário "guest", será usado status padrão. Por favor, avise o administrador do site.';
diff --git a/language/pt_PT/help/help_user_upload.html b/language/pt_PT/help/help_user_upload.html
deleted file mode 100644
index 572cda2f0..000000000
--- a/language/pt_PT/help/help_user_upload.html
+++ /dev/null
@@ -1,15 +0,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>
-
diff --git a/language/ro_RO/common.lang.php b/language/ro_RO/common.lang.php
index 7be3335aa..a70553c2b 100644
--- a/language/ro_RO/common.lang.php
+++ b/language/ro_RO/common.lang.php
@@ -47,8 +47,6 @@ $lang['%d new image'] = '%d imagine nouă';
$lang['%d new images'] = '%d imagini noi';
$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';
$lang['Any tag'] = 'Orice eticheta';
@@ -312,7 +310,6 @@ $lang['Registration of %s'] = 'Înregistrare de %s';
$lang['Album: %s'] = 'Categorie : %s';
$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.';
$lang['Administrator, webmaster and special user cannot use this method'] = 'Administratorul, webmasterul şi utilizatorul special nu pot folosi aceasta metodă';
diff --git a/language/ru_RU/admin.lang.php b/language/ru_RU/admin.lang.php
index 8dbb6b346..9e134f6cd 100644
--- a/language/ru_RU/admin.lang.php
+++ b/language/ru_RU/admin.lang.php
@@ -46,8 +46,6 @@ $lang['%d users deleted'] = '%d пользователей удалено';
$lang['%d user'] = '%d пользователь';
$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'] = 'Активировать';
$lang['Add/delete a permalink'] = 'Добавить/удалить постоянную ссылку';
@@ -88,7 +86,6 @@ $lang['Elements'] = 'Элементы';
$lang['Email admins when a new user registers'] = 'Сообщать администратору когда зарегистрировался новый посетитель';
$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'] = 'Окружение';
$lang['Form'] = 'Действия';
@@ -147,7 +144,6 @@ $lang['Random picture'] = 'Случайное изображение';
$lang['Rate date'] = 'Rate date';
$lang['Rating by guests'] = 'Оценки от гостей';
$lang['Rating'] = 'Оценки';
-$lang['Reject All'] = 'Отклонить все';
$lang['Reject'] = 'Отклонить';
$lang['Representant'] = 'Представитель';
$lang['Representation of albums'] = 'Представитель альбомов';
@@ -172,7 +168,6 @@ $lang['Uninstall'] = 'Деинсталляция';
$lang['Use the default image sort order (defined in the configuration file)']='Сортировка изображений по умолчанию (как определено в файле конфигурации)';
$lang['User comments validation'] = 'Проверка комментариев посетителей';
$lang['Users'] = 'Пользователи';
-$lang['Validate All'] = 'Принять все';
$lang['Validate'] = 'Принять';
$lang['Validation'] = 'Проверка';
$lang['Version'] = 'Версия';
@@ -196,7 +191,6 @@ $lang['Public'] = 'Общедоступные альбомы';
$lang['Find a new representant by random'] = 'Найти нового представителя случайным образом';
$lang['Public / Private'] = 'Общедоступные / Приватные';
$lang['Manage authorizations for selected albums'] = 'Управление авторизацией для выбранных альбомов';
-$lang['Select uploadable albums'] = 'Выбор альбомов, доступных для загрузки';
$lang['Virtual album added'] = 'Виртуальный альбом добавлен';
$lang['Virtual album deleted'] = 'Виртуальный альбом удален';
$lang['Access type'] = 'Тип доступа';
@@ -213,7 +207,6 @@ $lang['Dissociate from album'] = 'отделить альбом';
$lang['dissociate from group'] = 'отвязать от группы';
$lang['edit album permissions'] = 'редактировать разрешения альбома';
$lang['Album updated successfully'] = 'Информация об альбоме успешно добавлена.';
-$lang['Authorize upload'] = 'Разрешить загрузку';
$lang['elements per page'] = 'миниатюр на странице';
$lang['elements'] = 'элементы';
$lang['High definition enabled'] = 'Доступно высокое разрешение';
@@ -359,7 +352,6 @@ $lang['User list'] = 'Список пользователей';
$lang['Modify informations about a picture'] = 'Изменить информацию об изображении';
$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)';
$lang['height must be a number superior to'] = 'высота должна быть числом больше';
@@ -550,8 +542,6 @@ $lang['An error occured during extraction (%s).'] = 'Ошибка в проце
$lang['Please check "plugins" folder and sub-folders permissions (CHMOD).'] = 'Пожалуйста, проверьте права папки "plugins" и подпапок (CHMOD).';
$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'] = 'Доступно для всех';
$lang['ACCESS_2'] = 'Доступно для избранных';
@@ -724,7 +714,6 @@ $lang['Add Photos'] = 'Добавить фотографии';
$lang['Download'] = 'Загрузить';
$lang['The following tag was deleted'] = 'Следущие метки были удалены';
$lang['Miscellaneous'] = 'Разное';
-$lang['User Upload'] = 'Загрузка пользователем';
$lang['Virtual Links'] = 'Виртуальные ссылки';
$lang['Templates configuration has been recorded.'] = 'Конфигурация шаблона перезаписана.';
$lang['Modify information'] = 'Информация по изменению';
diff --git a/language/ru_RU/common.lang.php b/language/ru_RU/common.lang.php
index 551ac4fc5..26731c0ac 100644
--- a/language/ru_RU/common.lang.php
+++ b/language/ru_RU/common.lang.php
@@ -44,8 +44,6 @@ $lang['%d new image'] = '%d новый элемент';
$lang['%d new images'] = '%d новых элементов';
$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'] = 'Все слова';
$lang['Any tag'] = 'Любое из слов';
@@ -321,7 +319,6 @@ $lang['Registration of %s'] = 'Регистрация %s';
$lang['Album: %s'] = 'Альбом: %s';
$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
$lang['Bad status for user "guest", using default status. Please notify the webmaster.'] = 'Неверный статус пользователя "гость", используйте статус по умолчанию. Пожалуйста сообщите вебмастеру.';
diff --git a/language/ru_RU/help/help_user_upload.html b/language/ru_RU/help/help_user_upload.html
deleted file mode 100644
index e2561f2c9..000000000
--- a/language/ru_RU/help/help_user_upload.html
+++ /dev/null
@@ -1,18 +0,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>
-
diff --git a/language/sh_RS/admin.lang.php b/language/sh_RS/admin.lang.php
index a18076c70..b84943b59 100644
--- a/language/sh_RS/admin.lang.php
+++ b/language/sh_RS/admin.lang.php
@@ -46,8 +46,6 @@ $lang['%d users deleted'] = '%d korisnika izbrisano';
$lang['%d user'] = '%d korisnik';
$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';
$lang['Add/delete a permalink'] = 'Dodaj/izbriši stalnu vezu';
@@ -88,7 +86,6 @@ $lang['Elements'] = 'Elementi';
$lang['Email admins when a new user registers'] = 'E-mail administratorima pri upisu novih korisnika';
$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';
$lang['Form'] = 'Oblik';
@@ -147,7 +144,6 @@ $lang['Random picture'] = 'Slika slučajnog izbora';
$lang['Rate date'] = 'Datum ocene';
$lang['Rating by guests'] = 'Ocene gostiju';
$lang['Rating'] = 'Ocenjivanje';
-$lang['Reject All'] = 'Odbaci Sve';
$lang['Reject'] = 'Odbaci';
$lang['Representant'] = 'Predstavnik';
$lang['Representation of albums'] = 'Predstavljanje kategorija';
@@ -173,7 +169,6 @@ $lang['Uninstall'] = 'Ukloni';
$lang['Use the default image sort order (defined in the configuration file)']='Koristi podrazumevani redosled slaganja slika (određeno u datoteci za podešavanje)';
$lang['User comments validation'] = 'Overa korisničkih komentara';
$lang['Users'] = 'Korisnici';
-$lang['Validate All'] = 'Overi Sve';
$lang['Validate'] = 'Overi';
$lang['Validation'] = 'Overa';
$lang['Version'] = 'Verzija';
@@ -197,7 +192,6 @@ $lang['Public'] = 'Javna kategorija';
$lang['Find a new representant by random'] = 'Izbor novog predstavnika slučajnim izborom';
$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';
$lang['Access type'] = 'Vrsta pristupa';
@@ -215,7 +209,6 @@ $lang['Dissociate from album'] = 'odvoji od kategorije';
$lang['dissociate from group'] = 'odvoji od grupe';
$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';
$lang['High definition enabled'] = 'Visoka rezolucija omogućena';
@@ -362,7 +355,6 @@ $lang['User list'] = 'Lista korisnika';
$lang['Modify informations about a picture'] = 'Promena podataka o slici';
$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)';
$lang['height must be a number superior to'] = 'visina mora biti broj veći od ';
@@ -553,8 +545,6 @@ $lang['An error occured during extraction (%s).'] = 'Došlo je do greške prilik
$lang['Please check "plugins" folder and sub-folders permissions (CHMOD).'] = 'Proverite "plugins" direktorijum i dozvole poddirektorijuma (CHMOD).';
$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';
$lang['ACCESS_2'] = 'Pristup pretplatnicima';
@@ -726,7 +716,6 @@ $lang['Add Photos'] = 'Dodaj fotografije';
$lang['Download'] = 'Snimi na računar';
$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.';
$lang['There is no other plugin available.'] = 'Drugi dodatak nije dostupan.';
diff --git a/language/sh_RS/common.lang.php b/language/sh_RS/common.lang.php
index cfcbdb843..7c03aef02 100644
--- a/language/sh_RS/common.lang.php
+++ b/language/sh_RS/common.lang.php
@@ -44,8 +44,6 @@ $lang['%d new image'] = '%d nova slika';
$lang['%d new images'] = '%d nove slike';
$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';
$lang['Any tag'] = 'Bilo koji tag';
@@ -321,7 +319,6 @@ $lang['Registration of %s'] = 'Prijava od %s';
$lang['Album: %s'] = 'Kategorija: %s';
$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
$lang['Bad status for user "guest", using default status. Please notify the webmaster.'] = 'Loš status za korisnika "guest", koristi se podrazumevani status. Molimo obavestite webmaster-a.';
diff --git a/language/sk_SK/admin.lang.php b/language/sk_SK/admin.lang.php
index 72c554dc3..d91db859d 100644
--- a/language/sk_SK/admin.lang.php
+++ b/language/sk_SK/admin.lang.php
@@ -47,8 +47,6 @@ $lang['%d users deleted'] = '%d používateľov zmazaných';
$lang['%d user'] = '%d používateľ';
$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ť';
$lang['Add/delete a permalink'] = 'Pridať/odobrať pernamentný odkaz';
@@ -89,7 +87,6 @@ $lang['Elements'] = 'Položky';
$lang['Email admins when a new user registers'] = 'Poslať e-mail administrátorom pri registrácii nového používateľa';
$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';
$lang['Form'] = 'Formulár';
@@ -148,7 +145,6 @@ $lang['Random picture'] = 'Náhodná fotografia';
$lang['Rate date'] = 'Dátum hodnotenia';
$lang['Rating by guests'] = 'Hodnotenie hosťami';
$lang['Rating'] = 'Hodnotenie';
-$lang['Reject All'] = 'Zamietnuť všetky';
$lang['Reject'] = 'Zamietnuť';
$lang['Representant'] = 'Ukážkové';
$lang['Representation of albums'] = 'Reprezentatívna fotografia pre albumy';
@@ -174,7 +170,6 @@ $lang['Uninstall'] = 'Odinštalovať';
$lang['Use the default image sort order (defined in the configuration file)'] = 'Použiť východzie radenie (definované v konfiguračnom súbore)';
$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';
$lang['Version'] = 'Verzia';
@@ -198,7 +193,6 @@ $lang['Public'] = 'Verejný album';
$lang['Find a new representant by random'] = 'Nájsť ukážkovú fotografiu pomocou náhodného výberu';
$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ý';
$lang['Access type'] = 'Druh prístupu';
@@ -217,7 +211,6 @@ $lang['Dissociate from album'] = 'oddeliť z albumu';
$lang['dissociate from group'] = 'oddeliť od skupiny';
$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';
$lang['High definition enabled'] = 'Vysoké rozlíšenie povolené';
@@ -362,7 +355,6 @@ $lang['User list'] = 'Zoznam používateľov';
$lang['Modify informations about a picture'] = 'Upraviť informácie o fotografii';
$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)';
$lang['height must be a number superior to'] = 'výška musí byť väčšia ako';
@@ -551,8 +543,6 @@ $lang['Please check "plugins" folder and sub-folders permissions (CHMOD).'] = 'P
$lang['Can\'t connect to server.'] = 'Nie je možné sa pripojiť k serveru.';
$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';
$lang['ACCESS_2'] = 'Prístupné prihláseným';
@@ -728,7 +718,6 @@ $lang['Add Photos'] = 'Pridať fotografie';
$lang['Download'] = 'Stiahnuť';
$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.';
$lang['There is no other plugin available.'] = 'Nie je dostupný žiadny ďalší doplnok.';
diff --git a/language/sk_SK/common.lang.php b/language/sk_SK/common.lang.php
index 57641d6db..dbeb10fce 100644
--- a/language/sk_SK/common.lang.php
+++ b/language/sk_SK/common.lang.php
@@ -48,8 +48,6 @@ $lang['%d new image'] = '%d nový objekt';
$lang['%d new images'] = '%d nových objektov';
$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á';
$lang['Any tag'] = 'Akékoľvek kľúčové slovo';
@@ -325,7 +323,6 @@ $lang['Registration of %s'] = 'Registrácia %s';
$lang['Album: %s'] = 'Album: %s';
$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.';
$lang['Administrator, webmaster and special user cannot use this method'] = 'Administrátor, webmaster a špeciálny používateľ nemôžu použiť túto metódu.';
diff --git a/language/sk_SK/help/help_user_upload.html b/language/sk_SK/help/help_user_upload.html
deleted file mode 100644
index 299d641d9..000000000
--- a/language/sk_SK/help/help_user_upload.html
+++ /dev/null
@@ -1,18 +0,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>
diff --git a/language/sl_SL/common.lang.php b/language/sl_SL/common.lang.php
index e94f94b15..60bd504ad 100644
--- a/language/sl_SL/common.lang.php
+++ b/language/sl_SL/common.lang.php
@@ -41,8 +41,6 @@ $lang['%d hit'] = '%d zadetek';
$lang['%d hits'] = '%d zadetkov';
$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';
$lang['Any tag'] = 'Katerakoli označba';
@@ -299,7 +297,6 @@ $lang['Registration of %s'] = 'Prijavljenih %s';
$lang['Album: %s'] = 'Kategorija: %s';
$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.';
$lang['Administrator, webmaster and special user cannot use this method'] = 'Administrator, skrbnik in posebni uporabnik ne morejo uporabljati te metode';
diff --git a/language/sr_RS/admin.lang.php b/language/sr_RS/admin.lang.php
index c9e9b62f7..30336945e 100644
--- a/language/sr_RS/admin.lang.php
+++ b/language/sr_RS/admin.lang.php
@@ -46,8 +46,6 @@ $lang['%d users deleted'] = '%d корисника избрисано';
$lang['%d user'] = '%d корисник';
$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'] = 'Укључи';
$lang['Add/delete a permalink'] = 'Додај/избриши сталну везу';
@@ -88,7 +86,6 @@ $lang['Elements'] = 'Елементи';
$lang['Email admins when a new user registers'] = 'Пошаљи електронску пошту администраторима при упису нових корисника';
$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'] = 'Окружење';
$lang['Form'] = 'Облик';
@@ -147,7 +144,6 @@ $lang['Random picture'] = 'Слика случајног избора';
$lang['Rate date'] = 'Датум оцене';
$lang['Rating by guests'] = 'Оцене гостију';
$lang['Rating'] = 'Оцењивање';
-$lang['Reject All'] = 'Одбаци све';
$lang['Reject'] = 'Одбаци';
$lang['Representant'] = 'Представник';
$lang['Representation of albums'] = 'Представљање категорија';
@@ -173,7 +169,6 @@ $lang['Uninstall'] = 'Уклони';
$lang['Use the default image sort order (defined in the configuration file)']='Користи подразумевани редослед слагања слика (одређено у датотеци за подешавање)';
$lang['User comments validation'] = 'Овера корисничких коментара';
$lang['Users'] = 'Корисници';
-$lang['Validate All'] = 'Овери све';
$lang['Validate'] = 'Овери';
$lang['Validation'] = 'Овера';
$lang['Version'] = 'Верзија';
@@ -197,7 +192,6 @@ $lang['Public'] = 'Јавна категорија';
$lang['Find a new representant by random'] = 'Избор новог представника случајним избором';
$lang['Public / Private'] = 'Јавно / Лично';
$lang['Manage authorizations for selected albums'] = 'Управљање овлашћењима за одабране категорије';
-$lang['Select uploadable albums'] = 'Одаберите категорије у којима је могуће слање';
$lang['Virtual album added'] = 'Виртуелна категорија додата';
$lang['Virtual album deleted'] = 'Виртуелна категорија избрисана';
$lang['Access type'] = 'Врста приступа';
@@ -215,7 +209,6 @@ $lang['Dissociate from album'] = 'одвоји од категорије';
$lang['dissociate from group'] = 'одвоји од групе';
$lang['edit album permissions'] = 'уреди дозволе категорије';
$lang['Album updated successfully'] = 'Подаци категорије успешно обновљени.';
-$lang['Authorize upload'] = 'Одобри слање';
$lang['elements per page'] = 'елемената по страници';
$lang['elements'] = 'елементи';
$lang['High definition enabled'] = 'Висока резолуција омогућена';
@@ -362,7 +355,6 @@ $lang['User list'] = 'Листа корисника';
$lang['Modify informations about a picture'] = 'Промена података о слици';
$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)';
$lang['height must be a number superior to'] = 'висина мора бити број већи од ';
@@ -553,8 +545,6 @@ $lang['An error occured during extraction (%s).'] = 'Дошло је до гре
$lang['Please check "plugins" folder and sub-folders permissions (CHMOD).'] = 'Проверите "plugins" директоријум и дозволе поддиректоријума (CHMOD).';
$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'] = 'Приступ свима';
$lang['ACCESS_2'] = 'Приступ претплатницима';
@@ -726,7 +716,6 @@ $lang['Add Photos'] = 'Додај фотографије';
$lang['Download'] = 'Сними на рачунар';
$lang['The following tag was deleted'] = 'Текућа ознака је обрисана';
$lang['Miscellaneous'] = 'Остало';
-$lang['User Upload'] = 'Корисници послали';
$lang['Virtual Links'] = 'Виртуалне везе';
$lang['There is no other language available.'] = 'Други језик није доступан.';
$lang['There is no other plugin available.'] = 'Други додатак није доступан.';
diff --git a/language/sr_RS/common.lang.php b/language/sr_RS/common.lang.php
index 615ca6425..428a743ac 100644
--- a/language/sr_RS/common.lang.php
+++ b/language/sr_RS/common.lang.php
@@ -44,8 +44,6 @@ $lang['%d new image'] = 'број нових слика: %d';
$lang['%d new images'] = 'нове слике - %d';
$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'] = 'Све ознаке';
$lang['Any tag'] = 'Било која ознака';
@@ -321,7 +319,6 @@ $lang['Registration of %s'] = 'Пријава од %s';
$lang['Album: %s'] = 'Категорија: %s';
$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
$lang['Bad status for user "guest", using default status. Please notify the webmaster.'] = 'Лош статус за корисника "гост", користи се подразумевани статус. Молимо обавестите мајстора интернет страница.';
diff --git a/language/sv_SE/admin.lang.php b/language/sv_SE/admin.lang.php
index 9700b925c..098c82c89 100644
--- a/language/sv_SE/admin.lang.php
+++ b/language/sv_SE/admin.lang.php
@@ -46,8 +46,6 @@ $lang['%d users deleted'] = '%d användare borttagna';
$lang['%d user'] = '%d användare';
$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';
$lang['Add/delete a permalink'] = 'Lägg till/Ta bort en permalink';
@@ -88,7 +86,6 @@ $lang['Elements'] = 'Element';
$lang['Email admins when a new user registers'] = 'Sänd mail till admin när en ny användare registreas';
$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ö';
$lang['Form'] = 'Formulär';
@@ -147,7 +144,6 @@ $lang['Random picture'] = 'Slumpad bild';
$lang['Rate date'] = 'Röst datum';
$lang['Rating by guests'] = 'Röstning av gäster';
$lang['Rating'] = 'Röstning';
-$lang['Reject All'] = 'Neka Alla';
$lang['Reject'] = 'Neka';
$lang['Representant'] = 'Representant';
$lang['Representation of albums'] = 'Kategori representation';
@@ -173,7 +169,6 @@ $lang['Uninstall'] = 'Avinstallera';
$lang['Use the default image sort order (defined in the configuration file)'] = 'Använd standard ordning för bild sortering (definerad i konfigurationsfilen)';
$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';
$lang['Version'] = 'Version';
@@ -197,7 +192,6 @@ $lang['Public'] = 'Allmänn ';
$lang['Find a new representant by random'] = 'Hitta en ny slumpad representant';
$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';
$lang['Access type'] = 'Typ av tillgång';
@@ -215,7 +209,6 @@ $lang['Dissociate from album'] = 'skilj från kategori';
$lang['dissociate from group'] = 'skilj från grupp';
$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';
$lang['High definition enabled'] = 'High definition aktiverad';
@@ -361,7 +354,6 @@ $lang['User list'] = 'Användarlista';
$lang['Modify informations about a picture'] = 'Modifiera bildinformation';
$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)';
$lang['height must be a number superior to'] = 'bildens höjd måste vara större än';
@@ -549,8 +541,6 @@ $lang['An error occured during extraction (%s).'] = 'Ett fel uppstod när följa
$lang['Please check "plugins" folder and sub-folders permissions (CHMOD).'] = 'Kontrollera "plugins" mapp och eventuella undermappars behörigheter (CHMOD).';
$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';
$lang['ACCESS_2'] = 'Tillgänglighet för registrerade användare';
@@ -727,7 +717,6 @@ $lang['Add Photos'] = 'Lägg till foton';
$lang['Download'] = 'Ladda ner';
$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.';
$lang['There is no other plugin available.'] = 'Det finns inget annat plugin tillgängligt.';
diff --git a/language/sv_SE/common.lang.php b/language/sv_SE/common.lang.php
index 1ac310870..00c1358fc 100644
--- a/language/sv_SE/common.lang.php
+++ b/language/sv_SE/common.lang.php
@@ -44,7 +44,6 @@ $lang['Registration of %s'] = 'Registrering av %s';
$lang['Album: %s'] = 'Kategori: %s';
$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..';
$lang['Administrator, webmaster and special user cannot use this method'] = 'Administratör, webmaster och speciell användare kan inte använda denna metod';
@@ -125,8 +124,6 @@ $lang['Identification'] = 'Identifiering';
$lang['Image only RSS feed'] = 'Endast bilder RSS-flöde';
$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';
$lang['No email address'] = 'Inga e-post adresser';
diff --git a/language/sv_SE/help/help_user_upload.html b/language/sv_SE/help/help_user_upload.html
deleted file mode 100644
index 1ef55fa69..000000000
--- a/language/sv_SE/help/help_user_upload.html
+++ /dev/null
@@ -1,17 +0,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>
diff --git a/language/tr_TR/admin.lang.php b/language/tr_TR/admin.lang.php
index e094340e7..a3da99e46 100644
--- a/language/tr_TR/admin.lang.php
+++ b/language/tr_TR/admin.lang.php
@@ -44,8 +44,6 @@ $lang['%d users deleted'] = '%d kullanicilar silindi';
$lang['%d user'] = '%d kullanici';
$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';
$lang['Add/delete a permalink'] = 'permalink ekle / sil';
@@ -86,7 +84,6 @@ $lang['Elements'] = 'içerikler';
$lang['Email admins when a new user registers'] = 'Yeni kullanici kaydi oldugunda yöneticiye e-posta gönder';
$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';
$lang['Form'] = 'Biçim';
@@ -145,7 +142,6 @@ $lang['Random picture'] = 'Karisik resim';
$lang['Rate date'] = 'Reyting tarihi';
$lang['Rating by guests'] = 'Misafir Puanları';
$lang['Rating'] = 'Puan';
-$lang['Reject All'] = 'Hepsini reddet';
$lang['Reject'] = 'Reddet';
$lang['Representant'] = 'Temsilen';
$lang['Representation of albums'] = 'Albüm gösterimi';
@@ -171,7 +167,6 @@ $lang['Uninstall'] = 'Kaldir';
$lang['Use the default image sort order (defined in the configuration file)'] = 'Varsayilan görüntü siralama düzenini kullan';
$lang['User comments validation'] = 'Kullanici yorumlari dogrulama';
$lang['Users'] = 'Kullanicilar';
-$lang['Validate All'] = 'Hepsini dogrula';
$lang['Validate'] = 'Dogrula';
$lang['Validation'] = 'Dogrula';
$lang['Version'] = 'Versiyon';
@@ -195,7 +190,6 @@ $lang['Public'] = 'Genel albüm';
$lang['Find a new representant by random'] = 'Rasgele yeni bir temsilci bul';
$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';
$lang['Access type'] = 'Erisim türü';
@@ -213,7 +207,6 @@ $lang['Dissociate from album'] = 'albümden ayır';
$lang['dissociate from group'] = 'Gruptan ayirmak';
$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';
$lang['High definition enabled'] = 'Yüksek çözünürlüklü etkin';
@@ -359,7 +352,6 @@ $lang['User list'] = 'Kullanicilar listesi';
$lang['Modify informations about a picture'] = 'Resim bilgilerini düzenle';
$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)';
$lang['height must be a number superior to'] = 'yüksekligi bir sayi olmali';
@@ -547,8 +539,6 @@ $lang['An error occured during extraction (%s).'] = '(%s) dosyaları ayıklanır
$lang['Please check "plugins" folder and sub-folders permissions (CHMOD).'] = 'Lütfen "plugins" klasörünü ve alt klasörler izinleri (CHMOD) kontrol edin.';
$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';
$lang['ACCESS_2'] = 'Kayıtlı kullanıcılara erişim';
@@ -684,7 +674,6 @@ $lang['Add Photos'] = 'Resim ekle';
$lang['Download'] = 'İndir';
$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.';
$lang['There is no other plugin available.'] = 'Kullanılabilir başka bir eklenti yok.';
diff --git a/language/tr_TR/common.lang.php b/language/tr_TR/common.lang.php
index d6e212321..b7b20d2d1 100644
--- a/language/tr_TR/common.lang.php
+++ b/language/tr_TR/common.lang.php
@@ -43,8 +43,6 @@ $lang['%d new image'] = '%d Yeni resim';
$lang['%d new images'] = '%d Yeni resimler';
$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';
$lang['Any tag'] = 'Herhangi Etiket';
@@ -276,7 +274,6 @@ $lang['Registration of %s'] = 'Tescil Eden: %s';
$lang['Album: %s'] = 'Albüm: %s';
$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';
$lang['Administrator, webmaster and special user cannot use this method'] = 'Yönetici, webmaster ve özel kullanıcı bu metodu kullanamaz';
diff --git a/language/vi_VN/admin.lang.php b/language/vi_VN/admin.lang.php
index e79ba28b4..4adfeb54f 100644
--- a/language/vi_VN/admin.lang.php
+++ b/language/vi_VN/admin.lang.php
@@ -46,8 +46,6 @@ $lang['%d users deleted'] = '%d tên thành viên đã được xóa';
$lang['%d user'] = '%d thành viên';
$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';
$lang['Add/delete a permalink'] = 'Thêm/xoá một link cố định';
@@ -88,7 +86,6 @@ $lang['Elements'] = 'Thành phần';
$lang['Email admins when a new user registers'] = 'Gởi email cho quản trị khi có một thành viên mới đăng ký';
$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';
$lang['Form'] = 'Form';
@@ -147,7 +144,6 @@ $lang['Random picture'] = 'Hình ngẫu nhiên';
$lang['Rate date'] = 'Ngày tháng đánh giá';
$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';
$lang['Representation of albums'] = 'Hình đại diện cho các đề mục';
@@ -173,7 +169,6 @@ $lang['Uninstall'] = 'Tháo bỏ';
$lang['Use the default image sort order (defined in the configuration file)']='Sử dụng tính năng sắp xếp vị trí hình ảnh mặc định (được chỉ ra trong file cấu hình)';
$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';
$lang['Version'] = 'Phiên bản';
@@ -197,7 +192,6 @@ $lang['Public'] = 'Đề mục chung (công cộng)';
$lang['Find a new representant by random'] = 'Tìm ngẫu nhiên hình ảnh đại diện mới';
$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á';
$lang['Access type'] = 'Kiểu truy cập';
@@ -215,7 +209,6 @@ $lang['Dissociate from album'] = 'không kết hợp với đề mục';
$lang['dissociate from group'] = 'Không kết hợp với nhóm người dùng';
$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';
$lang['High definition enabled'] = 'Bật chế độ xem hình lớn';
@@ -361,7 +354,6 @@ $lang['User list'] = 'Danh sách thành viên';
$lang['Modify informations about a picture'] = 'Chỉnh sửa thông tin của hình ảnh';
$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)';
$lang['height must be a number superior to'] = 'chiều cao hình phải là số lớn hơn';
@@ -552,8 +544,6 @@ $lang['An error occured during extraction (%s).'] = 'Có lỗi xuất hiện tro
$lang['Please check "plugins" folder and sub-folders permissions (CHMOD).'] = 'Vui lòng kiểm tra quyền truy xuất của thư mục "plugins" và thư mục con (CHMOD).';
$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ả';
$lang['ACCESS_2'] = 'Truy xuất vào mục đăng ký nhân bản tin';
@@ -728,7 +718,6 @@ $lang['Add Photos'] = 'Thêm ảnh';
$lang['Download'] = 'Tải xuống';
$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.';
$lang['There is no other plugin available.'] = 'Không có plugin nào có thể dùng được.';
diff --git a/language/vi_VN/common.lang.php b/language/vi_VN/common.lang.php
index 06e6e183e..ad680eb1e 100644
--- a/language/vi_VN/common.lang.php
+++ b/language/vi_VN/common.lang.php
@@ -44,8 +44,6 @@ $lang['%d new image'] = '%d hình mới';
$lang['%d new images'] = '%d hình mới';
$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';
$lang['Any tag'] = 'Tất cả các tag';
@@ -319,7 +317,6 @@ $lang['Registration of %s'] = 'Mục đăng ký của %s';
$lang['Album: %s'] = 'Đề mục: %s';
$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
$lang['Bad status for user "guest", using default status. Please notify the webmaster.'] = 'Status xấu đối với thành viên đăng thuộc nhóm "khách", sử dụng status mặc định. Thông báo ngay cho Quản trị';
diff --git a/language/zh_CN/admin.lang.php b/language/zh_CN/admin.lang.php
index 47cbd77ec..35c3507be 100644
--- a/language/zh_CN/admin.lang.php
+++ b/language/zh_CN/admin.lang.php
@@ -46,8 +46,6 @@ $lang['%d users deleted'] = '%d 用户已删除';
$lang['%d user'] = '%d 用户';
$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'] = '激活';
$lang['Add/delete a permalink'] = '增加/删除一个固定链接';
@@ -88,7 +86,6 @@ $lang['Elements'] = '成员';
$lang['Email admins when a new user registers'] = '一旦用户注册就通知管理员';
$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'] = '环境';
$lang['Form'] = '表单';
@@ -147,7 +144,6 @@ $lang['Random picture'] = '随机';
$lang['Rate date'] = '投票日期';
$lang['Rating by guests'] = '游客投票数';
$lang['Rating'] = '投票';
-$lang['Reject All'] = '取消所有修改';
$lang['Reject'] = '取消';
$lang['Representant'] = '代理人';
$lang['Representation of albums'] = '相册代表';
@@ -173,7 +169,6 @@ $lang['Uninstall'] = '卸载';
$lang['Use the default image sort order (defined in the configuration file)']='使用默认图片排序(在配置文件中定义)';
$lang['User comments validation'] = '确认用户评论';
$lang['Users'] = '用户';
-$lang['Validate All'] = '确认所有评论';
$lang['Validate'] = '确认';
$lang['Validation'] = '确认';
$lang['Version'] = '版本';
@@ -197,7 +192,6 @@ $lang['Public'] = '公共相册';
$lang['Find a new representant by random'] = '随机寻找代理人';
$lang['Public / Private'] = '公有 / 私有';
$lang['Manage authorizations for selected albums'] = '管理所选相册的授权';
-$lang['Select uploadable albums'] = '选择可上传的相册';
$lang['Virtual album added'] = '虚拟相册已添加';
$lang['Virtual album deleted'] = '虚拟相册已删除';
$lang['Access type'] = '权限类型';
@@ -215,7 +209,6 @@ $lang['Dissociate from album'] = '从相册里分离';
$lang['dissociate from group'] = '取消组关联';
$lang['edit album permissions'] = '修改相册权限';
$lang['Album updated successfully'] = '相册信息已上传成功.';
-$lang['Authorize upload'] = '允许上传图片';
$lang['elements per page'] = '每页图片';
$lang['elements'] = '图';
$lang['High definition enabled'] = '激活高清功能';
@@ -361,7 +354,6 @@ $lang['User list'] = '用户名单';
$lang['Modify informations about a picture'] = '修改图片信息';
$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)';
$lang['height must be a number superior to'] = '图片高度必须超过(整数)';
@@ -554,8 +546,6 @@ $lang['Can\'t connect to server.'] = '无法连接到服务器.';
$lang['Purge compiled templates'] = '清除编译模板';
$lang['Support'] = '支持';
$lang['Documentation'] = '文档';
-$lang['Show upload link every time'] = '总是显示增加图片链接';
-$lang['User access level to upload'] = '用户可上传权限级别';
$lang['ACCESS_0'] = '自由存取';
$lang['ACCESS_1'] = '对所有人开放';
$lang['ACCESS_2'] = '只对注册用户开放';
@@ -718,7 +708,6 @@ $lang['Add Photos'] = '添加相片';
$lang['Download'] = '下载';
$lang['The following tag was deleted'] = '以下标签已删除';
$lang['Miscellaneous'] = '杂项';
-$lang['User Upload'] = '用户上传';
$lang['Virtual Links'] = '虚拟链接';
$lang['There is no other language available.'] = '没有其他可用的语言.';
$lang['There is no other plugin available.'] = '没有其他可用的插件.';
diff --git a/language/zh_CN/common.lang.php b/language/zh_CN/common.lang.php
index 06acc719d..710408e0f 100644
--- a/language/zh_CN/common.lang.php
+++ b/language/zh_CN/common.lang.php
@@ -44,8 +44,6 @@ $lang['%d new image'] = '%d 新图片';
$lang['%d new images'] = '%d 新图片';
$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'] = '所有标签';
$lang['Any tag'] = '任何标签';
@@ -320,7 +318,6 @@ $lang['Registration of %s'] = '注册 %s';
$lang['Album: %s'] = '相册: %s';
$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
$lang['Bad status for user "guest", using default status. Please notify the webmaster.'] = '如果游客反常拥有普通用户才拥有状态,请向网络管理员报告。';
diff --git a/language/zh_CN/help/help_user_upload.html b/language/zh_CN/help/help_user_upload.html
deleted file mode 100644
index 5e4c4e211..000000000
--- a/language/zh_CN/help/help_user_upload.html
+++ /dev/null
@@ -1,12 +0,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>
-
diff --git a/upload.php b/upload.php
deleted file mode 100644
index 948f0acda..000000000
--- a/upload.php
+++ /dev/null
@@ -1,431 +0,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 prsence 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');
-?>