Merge branch '2.8'

1 files changed, 13 insertions, 4 deletions

diff --git a/language/zh_CN/admin.lang.php b/language/zh_CN/admin.lang.php
index 347c48a49..92a4f66fc 100644
--- a/language/zh_CN/admin.lang.php
+++ b/language/zh_CN/admin.lang.php
@@ -669,7 +669,7 @@ $lang['Apply action'] = '执行操作';
 $lang['automatic order'] = '自动排序';
 $lang['Batch Manager'] = '批量管理';
 $lang['Choose an action'] = '选择一项操作';
-$lang['Delete orphan tags'] = '删除未被关联的标签';
+$lang['Delete orphan tags'] = '删除未关联任何图片的标签';
 $lang['delete photo'] = '删除图片';
 $lang['Duplicates'] = '副本';
 $lang['include child albums'] = '包含子相册';
@@ -678,7 +678,7 @@ $lang['No photo in the current set.'] = '当前集合没有图片。';
 $lang['No photo selected, %d photos in current set'] = '没有图片被选中，当前集合中有 %d 张图片';
 $lang['No photo selected, no action possible.'] = '没有图片被选中，不能执行任何操作。';
 $lang['on the %d selected photos'] = '于此 %d 张所选图片';
-$lang['Orphan tags deleted'] = '无关联图片的标签已被删除';
+$lang['Orphan tags deleted'] = '未关联任何图片的标签已被删除';
 $lang['Refresh photo set'] = '刷新图片集';
 $lang['Remove all filters'] = '删除所有过滤器';
 $lang['remove author'] = '删除作者';
@@ -694,7 +694,7 @@ $lang['The whole set'] = '整个集合';
 $lang['Type here the author name'] = '在此输入作者名称';
 $lang['Type here the title'] = '在此输入标题';
 $lang['Week starts on'] = '星期起始于';
-$lang['You have %d orphan tags: %s.'] = '您有 %d 个无关联图片的标签：%s。';
+$lang['You have %d orphan tags: %s.'] = '您有 %d 个未关联任何图片的标签：%s。';
 $lang['Remove from caddie'] = '从标记图片库中移除';
 $lang['Themes which need upgrade'] = '需更新的主题';
 $lang['Languages which need upgrade'] = '需要更新的语言';
@@ -987,4 +987,13 @@ $lang['between %s and %s MB'] = '在 %s 和 %s MB 之间';
 $lang['date & time'] = '日期与时间';
 $lang['file name'] = '文件名';
 $lang['width & height'] = '宽度&高度';
-$lang['Upload in progress'] = '正在上传';
\ No newline at end of file
+$lang['Upload in progress'] = '正在上传';
+$lang['Each email sent will contain its own automatic authentication key on links, valid for %s.'] = '每封发出的email中的链接将包含自动生成的唯一验证密钥，有效期 %s。';
+$lang['For security reason, authentication keys do not work for administrators.'] = '出于安全原因，验证密钥对管理员不起作用。';
+$lang['Edit user'] = '编辑用户';
+$lang['No recipient selected'] = '未选择收件人';
+$lang['No user is permitted to see this private album'] = '没有用户被允许查看该非公开相册';
+$lang['Recipients'] = '收件人';
+$lang['Y Repeat'] = 'Y轴平铺';
+$lang['Delete %d orphan photos'] = '删除 %d 没有任何关联的图片';
+$lang['Orphans'] = '没有任何关联';
\ No newline at end of file