merge r6418 from branch 2.1 to trunk

- removed multiple definitions of language keys

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

2 files changed, 0 insertions, 13 deletions

diff --git a/language/zh_CN/admin.lang.php b/language/zh_CN/admin.lang.php
index 279f72775..6e2a33ed6 100644
--- a/language/zh_CN/admin.lang.php
+++ b/language/zh_CN/admin.lang.php
@@ -209,7 +209,6 @@ $lang['Access type'] = '权限类型';
 $lang['Comments'] = '评论';
 $lang['Information data registered in database'] = '信息已保存到数据库中';
 $lang['Default display'] = '默认显示';
-$lang['History'] = '历史记录';
 $lang['The gallery URL is not valid.'] = '图库地址不合法.';
 $lang['Main'] = '主页';
 $lang['The number of comments a page must be between 5 and 50 included.'] = '每页用户评论数必须在5和50之间.';
@@ -236,7 +235,6 @@ $lang['group "%s" updated'] = '更新 "%s" 组';
 $lang['group'] = '组';
 $lang['The name of a group must not contain " or \' or be empty.'] = '组名不能包含 " 或 \' 并不能为空.';
 $lang['This name is already used by another group.'] = '组名已存在.';
-$lang['Groups'] = '组';
 $lang['High definition'] = '高清';
 $lang['jump to category'] = '跳转到类';
 $lang['jump to image'] = '跳转到图';
@@ -297,7 +295,6 @@ $lang['Send mail as'] = '发送邮件作为';
 $lang['Send mail to users'] = '给用户发送邮件';
 $lang['Send'] = '发送';
 $lang['Options'] = '选项';
-$lang['Send'] = '发送';
 $lang['Subscribed'] = '已注册';
 $lang['Subscribe'] = '注册';
 $lang['Parameters'] = '设置参数';
@@ -322,7 +319,6 @@ $lang['Available only with HTML format'] = '只能以HTML格式';
 $lang['no write access'] = '不能写入';
 $lang['Permissions'] = '权限';
 $lang['private'] = '私有';
-$lang['Properties'] = '属性';
 $lang['public'] = '公有';
 $lang['Purge never used notification feeds'] = '清除从没使用过的通知回馈';
 $lang['Purge sessions'] = '清除会话';
@@ -358,7 +354,6 @@ $lang['status'] = '状态';
 $lang['Directory'] = '文件夹';
 $lang['sub-categories'] = '子类';
 $lang['synchronize metadata'] = '同步元数据';
-$lang['synchronize'] = '同步';
 $lang['target'] = '目标';
 $lang['Thumbnail'] = '缩略图';
 $lang['title'] = '标题';
@@ -440,7 +435,6 @@ $lang['user_status_generic'] = '一般用户';
 $lang['user_status_guest'] = '来宾';
 $lang['user_status_normal'] = '游客';
 $lang['user_status_webmaster'] = '网管';
-$lang['Users'] = '用户';
 $lang['Virtual category'] = '虚拟类';
 $lang['Waiting'] = '等待';
 $lang['default'] = '默认';
@@ -457,7 +451,6 @@ $lang['Day'] = '日';
 $lang['Pages seen'] = '已访问过的页面';
 $lang['Pictures'] = '图片';
 $lang['Time'] = '时间';
-$lang['User'] = '用户';
 $lang['IP'] = 'IP';
 $lang['Element'] = '图片';
 $lang['Section'] = '区域';
@@ -465,7 +458,6 @@ $lang['Tags'] = '标签';
 $lang['Save page visits by guests'] = '根据来宾来保存访问页面';
 $lang['Save page visits by users'] = '根据用户来保存访问页面';
 $lang['Save page visits by administrators'] = '根据管理员来保存访问页面';
-$lang['Properties'] = '属性';
 $lang['An information email was sent to group "%s"'] = '已向组 "%s" 的所有成员发送了信息邮件';
 $lang['Send an information email to group members'] = '向组成员发送一份信息邮件';
 $lang['Group'] = '组';
@@ -478,7 +470,6 @@ $lang['none'] = '没有任何人';
 $lang['high'] = '高';
 $lang['other'] = '另外';
 $lang['Element type'] = "内容类型";
-$lang['User'] = '用户';
 $lang['Image id'] = '图片标识符';
 $lang['Summary'] = '概述';
 $lang['%d line filtered'] = '%d 行被过滤';
@@ -572,7 +563,6 @@ $lang['Purge compiled templates'] = '清除编译模板';
 $lang['Caddie is currently empty'] = '目前购物篮为空.';
 $lang['Support'] = '支持';
 $lang['Documentation'] = '文档';
-$lang['Upload'] = '下载';
 $lang['Show upload link every time'] = '总是显示增加图片链接';
 $lang['User access level to upload'] = '用户可上传权限级别';
 $lang['ACCESS_0'] = '自由存取';
diff --git a/language/zh_CN/common.lang.php b/language/zh_CN/common.lang.php
index 2d58d1534..788b681ad 100644
--- a/language/zh_CN/common.lang.php
+++ b/language/zh_CN/common.lang.php
@@ -236,7 +236,6 @@ $lang['Unknown identifier'] = '帐户不存在';
 $lang['New password'] = '新密码';
 $lang['Rate this picture'] = '对图片投票';
 $lang['Next'] = '下一页';
-$lang['Home'] = '主页';
 $lang['no rate'] = '没有被投票';
 $lang['Elements posted within the last %d day.'] = '只显示最近 %d 天的图片.';
 $lang['Elements posted within the last %d days.'] = '只显示最近 %d 天的图片.';
@@ -279,7 +278,6 @@ $lang['Empty query. No criteria has been entered.'] = '查询语句不能为空'
 $lang['Search Options'] = '查询选项';
 $lang['Search results'] = '搜索结果';
 $lang['Search in subcategories'] = '在子类中搜索';
-$lang['Search'] = '搜索';
 $lang['searched words : %s'] = '搜索词 : %s';
 $lang['Contact'] = '联系';
 $lang['set as category representative'] = '选择此类代理';
@@ -304,7 +302,6 @@ $lang['the picture must be to the fileformat jpg, gif or png'] = '支持图片�
 $lang['the height of the picture must not exceed :'] = '上传图片最大长度 : ';
 $lang['Optional, but recommended : choose a thumbnail to associate to'] = '此选项可选, 但强烈推荐 : 选择相对应的缩略图';
 $lang['the width of the picture must not exceed :'] = '上传图片最大宽度 : ';
-$lang['Author'] = '上传者';
 $lang['can\'t upload the picture on the server'] = '上传失败';
 $lang['the username must be given'] = '缺少用户名';
 $lang['A picture\'s name already used'] = '文件已存在';