feature 1616: rename category into album, a few language keys were missing

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

2 files changed, 6 insertions, 6 deletions

diff --git a/language/zh_CN/admin.lang.php b/language/zh_CN/admin.lang.php
index c2a8c1f78..b2b5c2c33 100644
--- a/language/zh_CN/admin.lang.php
+++ b/language/zh_CN/admin.lang.php
@@ -349,7 +349,7 @@ $lang['synchronize'] = '同步';
 $lang['update the database from files'] = '根据文件对数据库进行更新';
 $lang['status'] = '状态';
 $lang['Directory'] = '文件夹';
-$lang['sub-categories'] = '子类';
+$lang['sub-albums'] = '子类';
 $lang['synchronize metadata'] = '同步元数据';
 $lang['target'] = '目标';
 $lang['Thumbnail'] = '缩略图';
@@ -400,7 +400,7 @@ $lang['Errors caption'] = '错误说明';
 $lang['Detailed informations'] = '详细信息';
 $lang['File/directory read error'] = '文件/文件夹打开错误';
 $lang['The file or directory cannot be accessed (either it does not exist or the access is denied)'] = '无法打开文件或文件夹(要么根本不存在,要么拒绝访问)';
-$lang['a picture filetype requires a thumbnail. The thumbnail must be present in the sub-directory "thumbnail" of the category directory. The thumbnail filename must start with the configured thumbnail prefix and the extension must be among the following list :'] = '每个图片文件需要一个缩略图.缩略图应该存在于类文件夹下的子文件夹"thumbnail"中. 缩略图文件名应该以设置参数"prefix_thumbnail"开始, 扩展名为:';
+$lang['a picture filetype requires a thumbnail. The thumbnail must be present in the sub-directory "thumbnail" of the album directory. The thumbnail filename must start with the configured thumbnail prefix and the extension must be among the following list :'] = '每个图片文件需要一个缩略图.缩略图应该存在于类文件夹下的子文件夹"thumbnail"中. 缩略图文件名应该以设置参数"prefix_thumbnail"开始, 扩展名为:';
 $lang['missing thumbnail'] = '缺少缩略图';
 $lang['albums deleted in the database'] = '类已从数据库中删除';
 $lang['elements deleted in the database'] = '图片已从数据库中删除';
@@ -432,7 +432,7 @@ $lang['user_status_generic'] = '一般用户';
 $lang['user_status_guest'] = '来宾';
 $lang['user_status_normal'] = '游客';
 $lang['user_status_webmaster'] = '网管';
-$lang['Virtual category'] = '虚拟类';
+$lang['Virtual album'] = '虚拟类';
 $lang['Waiting'] = '等待';
 $lang['default'] = '默认';
 $lang['Toggle \'default group\' property'] = '赋予\'groupe par défaut\'默认组属性';
@@ -458,10 +458,10 @@ $lang['Save page visits by administrators'] = '根据管理员来保存访问页
 $lang['An information email was sent to group "%s"'] = '已向组 "%s" 的所有成员发送了信息邮件';
 $lang['Send an information email to group members'] = '向组成员发送一份信息邮件';
 $lang['Group'] = '组';
-$lang['[%s] Come to visit the category %s'] = '[%s] 访问了类 %s';
+$lang['[%s] Visit album %s'] = '[%s] 访问了类 %s';
 $lang['Hello,'] = '你好,';
 $lang['See you soon.'] = '再见.';
-$lang['Come to discover the category:'] = '挖掘类:';
+$lang['Discover album:'] = '挖掘类:';
 $lang['Mail content'] = '邮件内容';
 $lang['none'] = '没有任何人';
 $lang['high'] = '高';
diff --git a/language/zh_CN/upgrade.lang.php b/language/zh_CN/upgrade.lang.php
index 5665f2383..093543239 100644
--- a/language/zh_CN/upgrade.lang.php
+++ b/language/zh_CN/upgrade.lang.php
@@ -35,7 +35,7 @@ $lang['Perform a maintenance check in [Administration>Tools>Maintenance] if you
 $lang['As a precaution, following plugins have been deactivated. You must check for plugins upgrade before reactiving them:'] = "为了预防万一，以下插件已被停用。在您重新启用它们之前，必须先检查这些插件的更新:";
 $lang['Only administrator can run upgrade: please sign in below.'] = "只有管理员能运行升级操作：请先登录。";
 $lang['You do not have access rights to run upgrade'] = "您没有执行升级程序的权限";
-$lang['All sub-categories of private categories become private'] = "所有私有类别下的子类别都将成为私有。";
+$lang['All sub-albums of private albums become private'] = "所有私有类别下的子类别都将成为私有。";
 $lang['User permissions and group permissions have been erased'] = "用户和组的权限已被清除";
 $lang['Only thumbnails prefix and webmaster mail address have been saved from previous configuration'] = "在前一个配置操作中，只有缩略图的前缀和网站管理员的邮件地址被保存了。";
 $lang['In <i>%s</i>, before <b>?></b>, insert:'] = '在 <i>%s</i>, 之前 <b>?></b>, 插入:';