Changeset 6419 for trunk/language/zh_CN/admin.lang.php

Timestamp:

05/29/10 10:57:34 (3 years ago)

Author:

rvelices

Message:

merge r6418 from branch 2.1 to trunk
- removed multiple definitions of language keys

Files:

• trunk/language/zh_CN/admin.lang.php (modified) (10 diffs)

trunk/language/zh_CN/admin.lang.php

@@ -210 +210 @@
 $lang['Information data registered in database'] = '信息已保存到数据库中';
 $lang['Default display'] = '默认显示';
-$lang['History'] = '历史记录';
 $lang['The gallery URL is not valid.'] = '图库地址不合法.';
 $lang['Main'] = '主页';
@@ -237 +236 @@
 $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'] = '跳转到类';
@@ -298 +296 @@
 $lang['Send'] = '发送';
 $lang['Options'] = '选项';
-$lang['Send'] = '发送';
 $lang['Subscribed'] = '已注册';
 $lang['Subscribe'] = '注册';
@@ -323 +320 @@
 $lang['Permissions'] = '权限';
 $lang['private'] = '私有';
-$lang['Properties'] = '属性';
 $lang['public'] = '公有';
 $lang['Purge never used notification feeds'] = '清除从没使用过的通知回馈';
@@ -359 +355 @@
 $lang['sub-categories'] = '子类';
 $lang['synchronize metadata'] = '同步元数据';
-$lang['synchronize'] = '同步';
 $lang['target'] = '目标';
 $lang['Thumbnail'] = '缩略图';
@@ -441 +436 @@
 $lang['user_status_normal'] = '游客';
 $lang['user_status_webmaster'] = '网管';
-$lang['Users'] = '用户';
 $lang['Virtual category'] = '虚拟类';
 $lang['Waiting'] = '等待';
@@ -458 +452 @@
 $lang['Pictures'] = '图片';
 $lang['Time'] = '时间';
-$lang['User'] = '用户';
 $lang['IP'] = 'IP';
 $lang['Element'] = '图片';
@@ -466 +459 @@
 $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'] = '向组成员发送一份信息邮件';
@@ -479 +471 @@
 $lang['other'] = '另外';
 $lang['Element type'] = "内容类型";
-$lang['User'] = '用户';
 $lang['Image id'] = '图片标识符';
 $lang['Summary'] = '概述';
@@ -573 +564 @@
 $lang['Support'] = '支持';
 $lang['Documentation'] = '文档';
-$lang['Upload'] = '下载';
 $lang['Show upload link every time'] = '总是显示增加图片链接';
 $lang['User access level to upload'] = '用户可上传权限级别';