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

3 files changed, 0 insertions, 26 deletions

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>
-