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

1 files changed, 0 insertions, 3 deletions

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'] = '文件已存在';