feature 1616: rename "category" into "album" (first commit; still to come)

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

2 files changed, 21 insertions, 21 deletions

diff --git a/language/zh_CN/admin.lang.php b/language/zh_CN/admin.lang.php
index 0dbd00929..38ff5600d 100644
--- a/language/zh_CN/admin.lang.php
+++ b/language/zh_CN/admin.lang.php
@@ -23,14 +23,14 @@
 
 $lang['%d association'] = '%d 相关';
 $lang['%d associations'] = '%d 相关';
-$lang['%d category including'] = '包含 %d 类';
-$lang['%d categories including'] = '包含 %d 等类';
+$lang['%d album including'] = '包含 %d 类';
+$lang['%d albums including'] = '包含 %d 等类';
 $lang['%d physical'] = '物理 %d';
 $lang['%d physical'] = '物理 %d ';
 $lang[' and %d virtual'] = ' 和 虚拟 %d ';
 $lang[' and %d virtual'] = ' 和 虚拟 %d ';
-$lang['%d category moved'] = '%d 类已迁移';
-$lang['%d categories moved'] = '%d 等类已迁移';
+$lang['%d album moved'] = '%d 类已迁移';
+$lang['%d albums moved'] = '%d 等类已迁移';
 $lang['%d group'] = '%d 组';
 $lang['%d groups'] = '%d 组';
 $lang['%d member'] = '%d 成员';
@@ -596,7 +596,7 @@ $lang['overrides existing values with empty ones'] = '用空数据来删除已�
 $lang['manage image ranks'] = '管理图片排序';
 $lang['Manage image ranks'] = '管理图片排序';
 $lang['Edit ranks'] = '修改排序方式';
-$lang['No element in this category'] = '该类中没有图片';
+$lang['No element in this album'] = '该类中没有图片';
 $lang['Images manual order was saved'] = '图片手动排序已保存';
 $lang['ranks'] = '顺序';
 $lang['Drag to re-order'] = '拖放进行排序';
diff --git a/language/zh_CN/common.lang.php b/language/zh_CN/common.lang.php
index 788b681ad..833c76aa1 100644
--- a/language/zh_CN/common.lang.php
+++ b/language/zh_CN/common.lang.php
@@ -30,8 +30,8 @@ $lang_info['zero_plural'] = false;
 
 $lang['%.2f (rated %d times)'] = '%.2f (标注 %d 次)';
 $lang['%d Kb'] = '%d KB';
-$lang['%d category updated'] = '%d 类已更新';
-$lang['%d categories updated'] = '%d 等多类已更新';
+$lang['%d album updated'] = '%d 类已更新';
+$lang['%d albums updated'] = '%d 等多类已更新';
 $lang['%d comment to validate'] = '%d 条用户评论被确认';
 $lang['%d comments to validate'] = '%d 条用户评论被确认';
 $lang['%d new comment'] = '%d 新评论';
@@ -117,7 +117,7 @@ $lang['Sort by'] = '排序';
 $lang['Sort order'] = '排序规则';
 $lang['Tag'] = '标签';
 $lang['Tags'] = '标签簇';
-$lang['The RSS notification feed provides notification on news from this website : new pictures, updated categories, new comments. Use a RSS feed reader.'] = 'RSS提供通知更新事件功能 : 加入新图片, 更新图类, 新的用户评论. 请使用相关软件来获得RSS.';
+$lang['The RSS notification feed provides notification on news from this website : new pictures, updated albums, new comments. Use a RSS feed reader.'] = 'RSS提供通知更新事件功能 : 加入新图片, 更新图类, 新的用户评论. 请使用相关软件来获得RSS.';
 $lang['Unknown feed identifier'] = '未知流标识';
 $lang['User comments'] = '用户评论';
 $lang['Username'] = '用户名';
@@ -133,7 +133,7 @@ $lang['Adviser mode enabled'] = '激活建议模式';
 $lang['all'] = '所有';
 $lang['ascending'] = '升序';
 $lang['author(s) : %s'] = '拥有者 : %s';
-$lang['Expand all categories'] = '展开所有类';
+$lang['Expand all albums'] = '展开所有类';
 $lang['posted after %s (%s)'] = '插入到 %s (%s) 之后';
 $lang['posted before %s (%s)'] = '插入到 %s (%s) 之前';
 $lang['posted between %s (%s) and %s (%s)'] = '插入到 %s (%s) 和 le %s (%s) 之间';
@@ -189,15 +189,15 @@ $lang['Page generated in'] = '页面创建时间';
 $lang['guest'] = '游客';
 $lang['Hello'] = '你好';
 $lang['available for administrators only'] = '只限于管理者';
-$lang['shows images at the root of this category'] = '显示所有此类图片';
+$lang['shows images at the root of this album'] = '显示所有此类图片';
 $lang['See last users comments'] = '查看最新用户评论';
 $lang['customize the appareance of the gallery'] = '个性化设置';
 $lang['search'] = '搜索';
 $lang['Home'] = '主页';
 $lang['Identification'] = '身份鉴别';
-$lang['in this category'] = '在此类中';
-$lang['in %d sub-category'] = '在 %d 子类中';
-$lang['in %d sub-categories'] = '在 %d 等子类中';
+$lang['in this album'] = '在此类中';
+$lang['in %d sub-album'] = '在 %d 子类中';
+$lang['in %d sub-albums'] = '在 %d 等子类中';
 $lang['included'] = '包括';
 $lang['Invalid password!'] = '密码不正确!';
 $lang['Language'] = '语言';
@@ -211,7 +211,7 @@ $lang['Maximum height must be a number superior to 50'] = '图片最大长度必
 $lang['Maximum width of the pictures'] = '图片的最大宽度';
 $lang['Maximum width must be a number superior to 50'] = '图片最大宽度必须大于50';
 $lang['display a calendar by creation date'] = '通过创建时间显示日历';
-$lang['display all elements in all sub-categories'] = '平铺显示所有类及其子类图片';
+$lang['display all elements in all sub-albums'] = '平铺显示所有类及其子类图片';
 $lang['return to normal view mode'] = '返回到普通模式显示';
 $lang['display a calendar by posted date'] = '通过发送时间来显示日历';
 $lang['month'][10] = '十月';
@@ -249,8 +249,8 @@ $lang['Preferences'] = '使用偏好';
 $lang['Previous'] = '前页';
 $lang['Random pictures'] = '随机图片';
 $lang['display a set of random pictures'] = '随机显示图片';
-$lang['Recent categories'] = '最近更新的类';
-$lang['display recently updated categories'] = '显示最近更新或创建的类';
+$lang['Recent albums'] = '最近更新的类';
+$lang['display recently updated albums'] = '显示最近更新或创建的类';
 $lang['Recent period'] = '最近阶段';
 $lang['Recent pictures'] = '最新图片';
 $lang['display most recent pictures'] = '显示最新图片';
@@ -266,7 +266,7 @@ $lang['remove this tag from the list'] = '删除此标签';
 $lang['representative'] = '代理人';
 $lang['return to homepage'] = '返回首页';
 $lang['Search for Author'] = '搜索上传者';
-$lang['Search in Categories'] = '在这些类中查询';
+$lang['Search in albums'] = '在这些类中查询';
 $lang['Search by Date'] = '通过日期查询';
 $lang['Date'] = '开始日期';
 $lang['End-Date'] = '最终日期';
@@ -277,10 +277,10 @@ $lang['Search for any terms'] = '以或模式查询';
 $lang['Empty query. No criteria has been entered.'] = '查询语句不能为空';
 $lang['Search Options'] = '查询选项';
 $lang['Search results'] = '搜索结果';
-$lang['Search in subcategories'] = '在子类中搜索';
+$lang['Search in sub-albums'] = '在子类中搜索';
 $lang['searched words : %s'] = '搜索词 : %s';
 $lang['Contact'] = '联系';
-$lang['set as category representative'] = '选择此类代理';
+$lang['set as album representative'] = '选择此类代理';
 $lang['Show number of comments'] = '显示评论总数';
 $lang['Show number of hits'] = '显示查看次数';
 $lang['slideshow'] = '幻灯片放映';
@@ -322,7 +322,7 @@ $lang['User: %s'] = '用户: %s';
 $lang['Email: %s'] = '电子邮件: %s';
 $lang['Admin: %s'] = '管理员: %s';
 $lang['Registration of %s'] = '注册 %s';
-$lang['Category: %s'] = '类别: %s';
+$lang['Album: %s'] = '类别: %s';
 $lang['Picture name: %s'] = '图片名: %s';
 $lang['Creation date: %s'] = '创建日期: %d';
 $lang['Waiting page: %s'] = '等待页面: %s';
@@ -332,7 +332,7 @@ $lang['Bad status for user "guest", using default status. Please notify the webm
 // --------- Starting below: New or revised $lang ---- from Butterfly (2.0)
 $lang['Administrator, webmaster and special user cannot use this method'] = '管理员, 网管和特定用户不能使用此方法功能';
 $lang['a user use already this mail address'] = '邮箱地址已存在';
-$lang['Category results for'] = '符合查询类结果';
+$lang['Album results for'] = '符合查询类结果';
 $lang['Tag results for'] = '符合查询标签结果';
 $lang['from %s to %s'] = '从 %s 到 %s';
 $lang['Play of slideshow'] = '播放';