3 files changed, 320 insertions, 317 deletions
diff --git a/language/zh_CN/about.html b/language/zh_CN/about.html
index 32cddee2f..7de968d1c 100644
--- a/language/zh_CN/about.html
+++ b/language/zh_CN/about.html
@@ -1,18 +1,21 @@
-<p>此相册画廊是基于 Piwigo 的.</p>
+<p>此相册画廊基于Piwigo.</p>
 
-<p>Piwigo 是一个网络的相册画廊软件，她是由一个活跃的社区用户和开发者创建的。
-制作 Piwigo 的自定义扩展是非常容易的。使得 Piwigo 更锦上添花的是，
+<p>Piwigo是一个网络相册画廊软件，她由一群活跃的社区用户和开发者创建。
+制作Piwigo的自定义扩展非常容易。使Piwigo更为锦上添花的是，
 她还是一个完全免费和开源的项目。</p>
 
-<p id="linkToPiwigo"><a href="http://cn.piwigo.org">浏览 Piwigo 网站</a></p>
+<p id="linkToPiwigo"><a href="http://cn.piwigo.org">浏览Piwigo网站</a></p>
 
-<p>以下是 Piwigo 的中文翻译与维护人员 (以字母排序):
+<p>以下是Piwigo的中文翻译与维护人员(以字母排序):
 
- <ul>
+<ul>
      <li><a href="http://cn.piwigo.org/forum/profile.php?id=5407">eliotpoon</a></li>
+     <li><a href="http://cn.piwigo.org/forum/profile.php?id=5960">maramail/Edouardlicn</a></li>
      <li><a href="http://cn.piwigo.org/forum/profile.php?id=5666">mzs777</a></li>
      <li>Ralph.Bai</li>
-	 <li><a href="http://cn.piwigo.org/forum/profile.php?id=4944">winson</a></li>
-	 <li>ZHU</li>
+     <li><a href="http://cn.piwigo.org/forum/profile.php?id=4944">winson</a></li>
+     <li>ZHU</li>
   </ul>
-     .... 感谢他们！</p>
-\ No newline at end of file
+     .... 感谢他们！</p>
+
+Last edited by maramail 
+\ No newline at end of file
diff --git a/language/zh_CN/common.lang.php b/language/zh_CN/common.lang.php
index 5344894a7..68b8e8495 100644
--- a/language/zh_CN/common.lang.php
+++ b/language/zh_CN/common.lang.php
@@ -32,9 +32,10 @@ Author URI: http://piwigo.org
 $lang_info['language_name'] = "简体中文";
 $lang_info['country'] = "中国";
 $lang_info['direction'] = "ltr";
-$lang_info['code'] = "cn";
+$lang_info['code'] = "zh_CN";
 $lang_info['zero_plural'] = "1";
 
+
 $lang['%.2f (rated %d times)'] = "%.2f (已投票 %d 次)";
 $lang['%d Kb'] = "%d Kb";
 $lang['%d album updated'] = "%d 个相册已更新";
@@ -47,21 +48,21 @@ $lang['%d comment'] = "%d 个意见";
 $lang['%d comments'] = "%d 个意见";
 $lang['%d hit'] = "%d 次点击";
 $lang['%d hits'] = "%d 次点击";
-$lang['%d new photo'] = "%d 张新照片";
-$lang['%d new photos'] = "%d 张新照片";
+$lang['%d new photo'] = "%d 张新图片";
+$lang['%d new photos'] = "%d 张新图片";
 $lang['%d new user'] = "%d 个新用户";
 $lang['%d new users'] = "%d 个新用户";
 $lang['About'] = "关于";
 $lang['All tags'] = "所有标签";
 $lang['Any tag'] = "任何标签";
-$lang['At least one listed rule must be satisfied.'] = "列出的标准至少一个需满足。";
-$lang['At least one tag must match'] = "至少一个标签必须对应。";
+$lang['At least one listed rule must be satisfied.'] = "至少要有一个已列出的规则被满足。";
+$lang['At least one tag must match'] = "必须至少匹配一个标签。";
 $lang['Author'] = "作者";
 $lang['Average rate'] = "平均分";
 $lang['Albums'] = "相册";
 $lang['Album'] = "相册";
 $lang['Close this window'] = "关闭此窗口";
-$lang['Complete RSS feed (photos, comments)'] = "完整的 RSS feed (照片，意见)";
+$lang['Complete RSS feed (photos, comments)'] = "完整的 RSS feed (图片，意见)";
 $lang['Confirm Password'] = "确认密码";
 $lang['Connection settings'] = "连接设定";
 $lang['Login'] = "登入";
@@ -70,293 +71,293 @@ $lang['Create a new account'] = "创建新账户";
 $lang['Created on'] = "创建于";
 $lang['Creation date'] = "创建日期";
 $lang['Current password is wrong'] = "目前的密码有误";
-$lang['Dimensions'] = "维";
+$lang['Dimensions'] = "尺寸";
 $lang['Display'] = "显示";
-$lang['Each listed rule must be satisfied.'] = '必须符合每项标准';
-$lang['Email address is missing. Please specify an email address.'] = '缺少邮箱地址';
-$lang['Email address'] = '邮箱地址';
-$lang['Enter your personnal informations'] = '输入您的个人信息';
-$lang['Error sending email'] = '发送邮件出错';
-$lang['File name'] = '文件名';
-$lang['File'] = '文件';
-$lang['Filesize'] = '文件大小';
-$lang['Filter and display'] = '过滤并显示';
-$lang['Filter'] = '过滤';
-$lang['Forgot your password?'] = '忘记密码?';
-$lang['Go through the gallery as a visitor'] = '以游客身份浏览图库';
-$lang['Help'] = '帮助';
-$lang['Identification'] = '身份鉴别';
-$lang['Photos only RSS feed'] = '图片RSS';
-$lang['Keyword'] = '关键字';
-$lang['Links'] = '链接';
-$lang['N/A'] = '不存在';
-$lang['New on %s'] = '新创于 %s';
-$lang['New password confirmation does not correspond'] = '前后密码不一致';
-$lang['New password sent by email'] = '新密码已发送';
-$lang['No email address'] = '没有邮箱地址';
-$lang['No classic user matches this email address'] = '此邮箱地址不存在';
-$lang['Notification'] = '通知';
-$lang['Number of items'] = '总数';
-$lang['Original dimensions'] = '原始大小';
-$lang['Password forgotten'] = '忘记密码';
-$lang['Password'] = '密码';
-$lang['Post date'] = '上传日期';
-$lang['Posted on'] = '上传于';
-$lang['Profile'] = '用户信息';
-$lang['Quick connect'] = '快速连接';
-$lang['RSS feed'] = 'RSS流';
-$lang['Rate'] = '评分';
-$lang['Register'] = '注册';
-$lang['Registration'] = '注册';
-$lang['Related tags'] = '关联标签';
-$lang['Reset'] = '重新设置';
-$lang['Retrieve password'] = '重新取得密码';
-$lang['Search rules'] = '搜索规则';
-$lang['Search tags'] = '搜索标签';
-$lang['Search'] = '搜索';
-$lang['display available tags'] = '查看现有标签';
-$lang['Send new password'] = '发送新密码';
-$lang['Since'] = '自从';
-$lang['Sort by'] = '排序';
-$lang['Sort order'] = '排序规则';
-$lang['Tag'] = '标签';
-$lang['Tags'] = '标签簇';
-$lang['The RSS notification feed provides notification on news from this website : new photos, updated albums, new comments. Use a RSS feed reader.'] = 'RSS提要，从这个网站上提供新事件的通知：新相片，更新相册，新评论。要使用 RSS 阅读器查看new photos, updated albums, new comments. To be used with a RSS feed reader.';
-$lang['Unknown feed identifier'] = '未知流标识';
-$lang['User comments'] = '用户评论';
-$lang['Username'] = '用户名';
-$lang['Visits'] = '访问';
-$lang['Webmaster'] = '网管';
-$lang['Week %d'] = '星期 %d';
-$lang['About Piwigo'] = '关于Piwigo';
-$lang['You are not authorized to access the requested page'] = '你无权访问此页';
-$lang['add to caddie'] = '放入购物篮';
-$lang['add this photo to your favorites'] = '把图片放到收藏夹';
-$lang['Administration'] = '管理员';
-$lang['all'] = '所有';
-$lang['ascending'] = '升序';
-$lang['author(s) : %s'] = '拥有者 : %s';
-$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) 之间';
-$lang['posted on %s'] = '插入 %s';
-$lang['Best rated'] = '得票最高';
-$lang['display best rated photos'] = '显示得票最高的图片';
-$lang['caddie'] = '购物篮';
-$lang['Calendar'] = '日历';
-$lang['All'] = '所有';
-$lang['display each day with photos, month per month'] = '按时间顺序来显示';
-$lang['View'] = '视图';
-$lang['chronology_monthly_calendar'] = '月历';
-$lang['chronology_monthly_list'] = '月清单';
-$lang['chronology_weekly_list'] = '周清单';
-$lang['Click here if your browser does not automatically forward you'] = '如果你的浏览器不支持自动转页，请按这里。';
-$lang['comment date'] = '评论日期';
-$lang['Comment'] = '评论';
-$lang['Your comment has been registered'] = '评论已保存';
-$lang['Anti-flood system : please wait for a moment before trying to post another comment'] = '反灌水系统 : 请稍候再加评论';
-$lang['Your comment has NOT been registered because it did not pass the validation rules'] = '由于不符合格式规定，你的评论不能被保存';
-$lang['An administrator must authorize your comment before it is visible.'] = '评论需经管理员确认才能显示在页面里。';
-$lang['This login is already used by another user'] = '用户名已存在';
-$lang['Comments'] = '评论';
-$lang['Add a comment'] = '加评论';
-$lang['created after %s (%s)'] = '创建于 %s (%s) 之后';
-$lang['created before %s (%s)'] = '创建于 %s (%s) 之前';
-$lang['created between %s (%s) and %s (%s)'] = '创建于 %s (%s) 和 le %s (%s) 之间';
-$lang['created on %s'] = '创建于 %s';
-$lang['Customize'] = '自定义';
-$lang['Your Gallery Customization'] = '自定义页标题';
-$lang['day'][0] = '星期日';
-$lang['day'][1] = '星期一';
-$lang['day'][2] = '星期二';
-$lang['day'][3] = '星期三';
-$lang['day'][4] = '星期四';
-$lang['day'][5] = '星期五';
-$lang['day'][6] = '星期六';
-$lang['Default'] = '默认';
-$lang['delete this photo from your favorites'] = '从收藏夹中删除此图片';
-$lang['Delete'] = '删除';
-$lang['descending'] = '降序';
-$lang['download'] = '下载';
-$lang['download this file'] = '下载此文件';
-$lang['edit'] = '编辑';
-$lang['wrong date'] = '日期出错';
-$lang['excluded'] = '不包括';
-$lang['Your favorites'] = '收藏夹';
-$lang['display your favorites photos'] = '显示收藏图片';
-$lang['Favorites'] = '收藏';
-$lang['First'] = '首页';
-$lang['The gallery is locked for maintenance. Please, come back later.'] = '系统维护，请稍候再试。';
-$lang['Page generated in'] = '页面创建时间';
-$lang['guest'] = '游客';
-$lang['Hello'] = '你好';
-$lang['available for administrators only'] = '只限于管理者';
-$lang['display this album'] = '显示此相册根目录下的相片';
-$lang['display last user comments'] = '查看最新用户评论';
-$lang['customize the appareance of the gallery'] = '个性化设置';
-$lang['search'] = '搜索';
-$lang['Home'] = '主页';
-$lang['in this album'] = '在此相册里';
-$lang['in %d sub-album'] = '在 %d 子相册里';
-$lang['in %d sub-albums'] = '在n %d 子相册里';
-$lang['included'] = '包括';
-$lang['Invalid password!'] = '密码不正确!';
-$lang['Language'] = '语言';
-$lang['last %d days'] = '最近%d天';
-$lang['Last'] = '最后';
-$lang['Logout'] = '注销';
-$lang['E-mail address'] = $lang['Email address'];
-$lang['obligatory'] = '必需';
-$lang['Maximum photo height'] = '图片的最大长度';
-$lang['Maximum height must be a number superior to 50'] = '图片最大长度必须大于50';
-$lang['Maximum photo width'] = '图片的最大宽度';
-$lang['Maximum width must be a number superior to 50'] = '图片最大宽度必须大于50';
-$lang['display a calendar by creation date'] = '通过创建时间显示日历';
-$lang['display all photos in all sub-albums'] = '显示所有相册和子相册的相片';
-$lang['return to normal view mode'] = '返回到普通模式显示';
-$lang['display a calendar by posted date'] = '通过发送时间来显示日历';
-$lang['month'][10] = '十月';
-$lang['month'][11] = '十一月';
-$lang['month'][12] = '十二月';
-$lang['month'][1] = '一月';
-$lang['month'][2] = '二月';
-$lang['month'][3] = '三月';
-$lang['month'][4] = '四月';
-$lang['month'][5] = '五月';
-$lang['month'][6] = '六月';
-$lang['month'][7] = '七月';
-$lang['month'][8] = '八月';
-$lang['month'][9] = '九月';
-$lang['Most visited'] = '最受喜欢';
-$lang['display most visited photos'] = '显示查看次数最多的图片';
-$lang['The number of photos per row must be a not null scalar'] = '每行图片数必须是非零整数';
-$lang['Number of photos per row'] = '每行图片数';
-$lang['The number of rows per page must be a not null scalar'] = '每页总行数必须是非零整数';
-$lang['Number of rows per page'] = '每页行数';
-$lang['Unknown identifier'] = '帐户不存在';
-$lang['New password'] = '新密码';
-$lang['Rate this photo'] = '对图片投票';
-$lang['Next'] = '下一页';
-$lang['no rate'] = '没有被投票';
-$lang['Photos posted within the last %d day.'] = '只显示最近 %d 天的图片.';
-$lang['Photos posted within the last %d days.'] = '只显示最近 %d 天的图片.';
-$lang['password updated'] = '密码已更新';
-$lang['Recent period must be a positive integer value'] = '再次发表间隔时间必须是正整数';
-$lang['photo'] = '图片';
-$lang['Click on the photo to see it in high definition'] = '点击查看大图片';
-$lang['Show file metadata'] = '显示文件的元数据';
-$lang['Powered by'] = '基于';
-$lang['Preferences'] = '使用偏好';
-$lang['Previous'] = '前页';
-$lang['Random photos'] = '随机图片';
-$lang['display a set of random photos'] = '随机显示图片';
-$lang['Recent albums'] = '最新的相册';
-$lang['display recently updated albums'] = '显示最近更新的相册';
-$lang['Recent period'] = '最近阶段';
-$lang['Recent photos'] = '最新图片';
-$lang['display most recent photos'] = '显示最新图片';
-$lang['Redirection...'] = '转跳至...';
-$lang['Please, enter a login'] = '请输入用户名';
-$lang['login mustn\'t end with a space character'] = '用户名不能以空格结尾';
-$lang['login mustn\'t start with a space character'] = '用户名不能以空格开头';
-$lang['this login is already used'] = '用户名已存在';
-$lang['mail address must be like xxx@yyy.eee (example : jack@altern.org)'] = '邮件地址格式必须符合标准邮件地址格式 xxx@yyy.eee (例如 : jack@altern.org)';
-$lang['please enter your password again'] = '请输入新密码';
-$lang['Auto login'] = '自动连接';
-$lang['remove this tag from the list'] = '删除此标签';
-$lang['representative'] = '代理人';
-$lang['Search for Author'] = '搜索上传者';
-$lang['Search in albums'] = '在相册里搜索';
-$lang['Search by Date'] = '通过日期查询';
-$lang['Date'] = '开始日期';
-$lang['End-Date'] = '最终日期';
-$lang['Kind of date'] = '日期类型';
-$lang['Search for words'] = '关键字';
-$lang['Search for all terms'] = '以与模式查询';
-$lang['Search for any terms'] = '以或模式查询';
-$lang['Empty query. No criteria has been entered.'] = '查询语句不能为空';
-$lang['Search Options'] = '查询选项';
-$lang['Search results'] = '搜索结果';
-$lang['Search in sub-albums'] = '在子相册里搜索';
-$lang['searched words : %s'] = '搜索词 : %s';
-$lang['Contact'] = '联系';
-$lang['set as album representative'] = '设置一个相册代表';
-$lang['Show number of comments'] = '显示评论总数';
-$lang['Show number of hits'] = '显示查看次数';
-$lang['slideshow'] = '幻灯片放映';
-$lang['stop the slideshow'] = '停止幻灯片放映';
-$lang['Specials'] = '特别类';
-$lang['SQL queries in'] = 'sql查询语句';
-$lang['display only recently posted photos'] = '只显示最近内容';
-$lang['return to the display of all photos'] = '返回到所有图片页面';
-$lang['the beginning'] = '开始';
-$lang['Interface theme'] = '主题';
-$lang['Thumbnails'] = '缩略图';
-$lang['Menu'] = '菜单';
-$lang['A comment on your site'] = '网站评论';
-$lang['today'] = '今天';
-$lang['Update your rating'] = '更改投票';
-$lang['wrong filename'] = '文件夹名不合法';
-$lang['the username must be given'] = '缺少用户名';
-$lang['useful when password forgotten'] = '忘记密码';
-$lang['Quick search'] = '快速搜索';
-$lang['Connected user: %s'] = '在线用户: %s';
-$lang['IP: %s'] = 'IP地址: %s';
-$lang['Browser: %s'] = '浏览器: %s';
-$lang['Author: %s'] = '上传者: %s';
-$lang['Comment: %s'] = '评论: %s';
-$lang['Comment by %s'] = '评论人 %s';
-$lang['User: %s'] = '用户: %s';
-$lang['Email: %s'] = '电子邮件: %s';
-$lang['Admin: %s'] = '管理员: %s';
-$lang['Registration of %s'] = '注册 %s';
-$lang['Album: %s'] = '相册: %s';
-$lang['Bad status for user "guest", using default status. Please notify the webmaster.'] = '如果游客反常拥有普通用户才拥有状态，请向网络管理员报告。';
-$lang['Administrator, webmaster and special user cannot use this method'] = '管理员, 网管和特定用户不能使用此方法功能';
-$lang['this email address is already in use'] = '邮箱地址已存在';
-$lang['Album results for'] = '相册的结果';
-$lang['Tag results for'] = '符合查询标签结果';
-$lang['from %s to %s'] = '从 %s 到 %s';
-$lang['Play of slideshow'] = '播放';
-$lang['Pause of slideshow'] = '暂停';
-$lang['Repeat the slideshow'] = '重复播放';
-$lang['Not repeat the slideshow'] = '停止重复播放';
-$lang['Reduce diaporama speed'] = '减慢播放速度';
-$lang['Accelerate diaporama speed'] = '加快播放速度';
-$lang['Submit'] = '确认';
-$lang['Yes'] = '是';
-$lang['No'] = '否';
-$lang['%d photo']='%d 图片';
-$lang['%d photos']='%d 图片';
-$lang['%d photo is also linked to current tags'] = '%d 图片同时与当前标签相关';
-$lang['%d photos are also linked to current tags'] = '%d 图片同时与当前标签相关';
-$lang['display photos linked to this tag'] = '只查看和这标签相关的图片';
-$lang['photos posted during the last %d days'] = '图片在最近%d天里更新';
-$lang['Piwigo Help'] = 'Piwigo帮助';
-$lang['Rank'] = '分类';
-$lang['group by letters'] = '按字母顺序分';
-$lang['letters'] = '字母';
-$lang['show tag cloud'] = '显示标签云';
-$lang['cloud'] = '云';
-$lang['Are you sure?'] = '确定?';
-$lang['delete this comment'] = '删除评论';
-$lang['Reset to default values'] = '重置为默认值';
-$lang['delete all photos from your favorites'] = '删除您的收藏里所有相片';
-$lang['Sent by'] = 'Sent by';
-$lang['Cookies are blocked or not supported by your browser. You must enable cookies to connect.'] = '您的浏览器已关闭或者不支持Cookies. 您必须开启 cookies 才能登录.';
-$lang['edit this comment'] = '修改此评论';
-$lang['Edit a comment'] = '修改一个评论';
-$lang['(!) This comment requires validation'] = '(!) 此评论需要审核';
+$lang['Each listed rule must be satisfied.'] = "每个已列出的准则必须符合";
+$lang['Email address'] = "电子邮件地址";
+$lang['Enter your personnal informations'] = "输入你的个人资料";
+$lang['Error sending email'] = "发送电子邮件时出错";
+$lang['File name'] = "文件名";
+$lang['File'] = "文件";
+$lang['Filesize'] = "文件大小";
+$lang['Filter and display'] = "过滤和显示";
+$lang['Filter'] = "过滤";
+$lang['Forgot your password?'] = "忘记了你自己的密码？";
+$lang['Go through the gallery as a visitor'] = "作为来访者浏览你的画廊";
+$lang['Help'] = "帮助";
+$lang['Identification'] = "确认身份";
+$lang['Photos only RSS feed'] = "图片只在 RSS feed";
+$lang['Keyword'] = "关键字";
+$lang['Links'] = "链接";
+$lang['N/A'] = "N/A";
+$lang['New on %s'] = "有新的在 %s";
+$lang['New password confirmation does not correspond'] = "新密码确认时不匹配";
+$lang['New password sent by email'] = "新密码已通过电子邮件发送";
+$lang['No email address'] = "没有电子邮件地址";
+$lang['No classic user matches this email address'] = "没有用户对应此电子邮件";
+$lang['Notification'] = "提醒";
+$lang['Number of items'] = "项目数量";
+$lang['Original dimensions'] = "原创尺寸";
+$lang['Password forgotten'] = "忘记密码";
+$lang['Password'] = "密码";
+$lang['Post date'] = "发布日期";
+$lang['Posted on'] = "发布在";
+$lang['Profile'] = "档案";
+$lang['Quick connect'] = "快速链接";
+$lang['RSS feed'] = "RSS feed";
+$lang['Rate'] = "比率";
+$lang['Register'] = "注册";
+$lang['Registration'] = "注册";
+$lang['Related tags'] = "相关标签";
+$lang['Reset'] = "重置";
+$lang['Retrieve password'] = "取回密码";
+$lang['Search rules'] = "搜索条件";
+$lang['Search tags'] = "搜索标签";
+$lang['Search'] = "搜索";
+$lang['display available tags'] = "显示可用标签";
+$lang['Send new password'] = "发送新密码";
+$lang['Since'] = "从";
+$lang['Sort by'] = "分类参考";
+$lang['Sort order'] = "分类顺序";
+$lang['Tag'] = "标签";
+$lang['Tags'] = "标签";
+$lang['The RSS notification feed provides notification on news from this website : new photos, updated albums, new comments. Use a RSS feed reader.'] = "RSS提醒功能提醒你这个网站的新消息：新图片、更新过的相片集、新意见。使用一个RSS feed阅读器";
+$lang['Unknown feed identifier'] = "未知的 feed identifier";
+$lang['User comments'] = "用户意见";
+$lang['Username'] = "用户名";
+$lang['Visits'] = "观看";
+$lang['Webmaster'] = "网站管理员";
+$lang['Week %d'] = "周 %d";
+$lang['About Piwigo'] = "关于 Piwigo";
+$lang['You are not authorized to access the requested page'] = "你无权浏览此页面";
+$lang['add to caddie'] = "加入购物车";
+$lang['add this photo to your favorites'] = "将图片加入到你的收藏里";
+$lang['Administration'] = "管理";
+$lang['all'] = "全部";
+$lang['ascending'] = "递增";
+$lang['author(s) : %s'] = "作者 : %s";
+$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) 和 %s (%s)之间";
+$lang['posted on %s'] = "发布在 %s";
+$lang['Best rated'] = "最高评分";
+$lang['display best rated photos'] = "显示最高评分图片";
+$lang['caddie'] = "购物车";
+$lang['Calendar'] = "日历";
+$lang['All'] = "全部";
+$lang['display each day with photos, month per month'] = "显示每天的图片，逐月计算";
+$lang['View'] = "查看";
+$lang['chronology_monthly_calendar'] = "月历";
+$lang['chronology_monthly_list'] = "月度列表";
+$lang['chronology_weekly_list'] = "周度列表";
+$lang['Click here if your browser does not automatically forward you'] = "如果你的浏览器未有自动跳转，请点这里";
+$lang['comment date'] = "意见日期";
+$lang['Comment'] = "意见";
+$lang['Your comment has been registered'] = "你的意见已记录";
+$lang['Anti-flood system : please wait for a moment before trying to post another comment'] = "反灌水机制：请等会再发表另一意见";
+$lang['Your comment has NOT been registered because it did not pass the validation rules'] = "你的意见未能发表因为它并未符合确认规则";
+$lang['An administrator must authorize your comment before it is visible.'] = "你的意见必须经过管理员审核方能可见";
+$lang['This login is already used by another user'] = "这个登录已经被另一用户使用";
+$lang['Comments'] = "意见";
+$lang['Add a comment'] = "增加一项新意见";
+$lang['created after %s (%s)'] = "创建于 %s (%s)以后";
+$lang['created before %s (%s)'] = "创建于 %s (%s)以前";
+$lang['created between %s (%s) and %s (%s)'] = "创建于 %s (%s) 和 %s (%s)之间";
+$lang['created on %s'] = "创建于 %s";
+$lang['Customize'] = "定制";
+$lang['Your Gallery Customization'] = "你的画廊定制";
+$lang['day'][0] = "星期天";
+$lang['day'][1] = "星期一";
+$lang['day'][2] = "星期二";
+$lang['day'][3] = "星期三";
+$lang['day'][4] = "星期四";
+$lang['day'][5] = "星期五";
+$lang['day'][6] = "星期六";
+$lang['Default'] = "默认";
+$lang['delete this photo from your favorites'] = "将此图片从你的收藏里删除";
+$lang['Delete'] = "删除";
+$lang['descending'] = "降序";
+$lang['download'] = "下载";
+$lang['download this file'] = "下载此文件";
+$lang['edit'] = "编辑";
+$lang['wrong date'] = "错误日期";
+$lang['excluded'] = "已执行";
+$lang['Your favorites'] = "你的收藏";
+$lang['display your favorites photos'] = "显示你的收藏图片";
+$lang['Favorites'] = "收藏";
+$lang['First'] = "第一";
+$lang['The gallery is locked for maintenance. Please, come back later.'] = "此画廊因正在维护而被封锁，请晚些时候再来";
+$lang['Page generated in'] = "页面创建于";
+$lang['guest'] = "访客";
+$lang['Hello'] = "Hello";
+$lang['available for administrators only'] = "仅管理员可用";
+$lang['display this album'] = "显示此相册";
+$lang['display last user comments'] = "显示最近的用户意见";
+$lang['customize the appareance of the gallery'] = "设定画廊外观";
+$lang['search'] = "搜索";
+$lang['Home'] = "主页";
+$lang['in this album'] = "在这个相册里";
+$lang['in %d sub-album'] = "在 %d 子相册";
+$lang['in %d sub-albums'] = "在 %d 子相册";
+$lang['included'] = "包括";
+$lang['Invalid password!'] = "密码不正确！";
+$lang['Language'] = "语言";
+$lang['last %d days'] = "最近 %d 天";
+$lang['Last'] = "最近";
+$lang['Logout'] = "登出";
+$lang['E-mail address'] = "电子邮件地址";
+$lang['obligatory'] = "代理者";
+$lang['Maximum photo height'] = "最大图片高度";
+$lang['Maximum height must be a number superior to 50'] = "最大图片高度数必须大于50";
+$lang['Maximum photo width'] = "最大图片宽度";
+$lang['Maximum width must be a number superior to 50'] = "最大图片宽度数必须大于50";
+$lang['display a calendar by creation date'] = "以创建日期显示日历";
+$lang['display all photos in all sub-albums'] = "显示所有子相册中的图片";
+$lang['return to normal view mode'] = "回到默认显示模式";
+$lang['display a calendar by posted date'] = "以提交日期日期显示日历";
+$lang['month'][10] = "10月";
+$lang['month'][11] = "11月";
+$lang['month'][12] = "12月";
+$lang['month'][1] = "1月";
+$lang['month'][2] = "2月";
+$lang['month'][3] = "3月";
+$lang['month'][4] = "4月";
+$lang['month'][5] = "5月";
+$lang['month'][6] = "6月";
+$lang['month'][7] = "7月";
+$lang['month'][8] = "8月";
+$lang['month'][9] = "9月";
+$lang['Most visited'] = "最多观看";
+$lang['display most visited photos'] = "显示最多观看的图片";
+$lang['The number of photos per row must be a not null scalar'] = "每行图片的数量必须为非零整数";
+$lang['Number of photos per row'] = "每行图片的数量";
+$lang['The number of rows per page must be a not null scalar'] = "行数必须为非零整数";
+$lang['Number of rows per page'] = "每页行数";
+$lang['Unknown identifier'] = "未知标识符";
+$lang['New password'] = "新密码";
+$lang['Rate this photo'] = "给这张图片评分";
+$lang['Next'] = "下一个";
+$lang['no rate'] = "没有评分";
+$lang['Photos posted within the last %d day.'] = "仅最近 %d 天上传的图片。";
+$lang['Photos posted within the last %d days.'] = "仅最近 %d 天上传的图片。";
+$lang['password updated'] = "密码已更新";
+$lang['Recent period must be a positive integer value'] = "最近时间必须是一个绝对整数值";
+$lang['photo'] = "图片";
+$lang['Click on the photo to see it in high definition'] = "点击图片以在高分辨率下查看";
+$lang['Show file metadata'] = "显示文件元数据";
+$lang['Powered by'] = "技术支持";
+$lang['Preferences'] = "偏好设定";
+$lang['Previous'] = "上一个";
+$lang['Random photos'] = "随机图片";
+$lang['display a set of random photos'] = "显示一系列随机图片";
+$lang['Recent albums'] = "最近图集";
+$lang['display recently updated albums'] = "显示最近更新的图片集";
+$lang['Recent period'] = "最近时期";
+$lang['Recent photos'] = "最近图片";
+$lang['display most recent photos'] = "显示最近的图片";
+$lang['Redirection...'] = "转向中...";
+$lang['Please, enter a login'] = "请输入一个登录名称";
+$lang['login mustn\'t end with a space character'] = "登录名称不能以空格做结尾";
+$lang['login mustn\'t start with a space character'] = "登录名称不能以空格做开头";
+$lang['this login is already used'] = "此登录名称已被使用";
+$lang['mail address must be like xxx@yyy.eee (example : jack@altern.org)'] = "电邮地址必须像 xxx@yyy.eee 这样(例如 : jack@altern.org)";
+$lang['please enter your password again'] = "请再输入你的密码";
+$lang['Auto login'] = "自动登录";
+$lang['remove this tag from the list'] = "从列表上删除这个标签";
+$lang['representative'] = "代表图片";
+$lang['Search for Author'] = "搜索一个作者";
+$lang['Search in albums'] = "在图片集里搜索";
+$lang['Search by Date'] = "由日期搜索";
+$lang['Date'] = "日期";
+$lang['End-Date'] = "结束日期";
+$lang['Kind of date'] = "日期类型";
+$lang['Search for words'] = "搜索关键字";
+$lang['Search for all terms'] = "搜索所有规则";
+$lang['Search for any terms'] = "搜索任何规则";
+$lang['Empty query. No criteria has been entered.'] = "空白查询。没有输入条件。";
+$lang['Search Options'] = "搜索选项";
+$lang['Search results'] = "搜索结果";
+$lang['Search in sub-albums'] = "在子图集里搜索";
+$lang['searched words : %s'] = "搜索字 : %s";
+$lang['Contact'] = "联系";
+$lang['set as album representative'] = "设置为图片集的代表图片";
+$lang['Show number of comments'] = "显示意见数";
+$lang['Show number of hits'] = "显示点击数";
+$lang['slideshow'] = "幻灯播放";
+$lang['stop the slideshow'] = "停止幻灯播放";
+$lang['Specials'] = "特别制作";
+$lang['SQL queries in'] = "SQL查询于";
+$lang['display only recently posted photos'] = "只显示最近上传图片";
+$lang['return to the display of all photos'] = "回到显示全部图片";
+$lang['the beginning'] = "开始";
+$lang['Interface theme'] = "界面主题";
+$lang['Thumbnails'] = "预览图";
+$lang['Menu'] = "菜单";
+$lang['A comment on your site'] = "你的网站有一个新意见";
+$lang['today'] = "今天";
+$lang['Update your rating'] = "更新你的打分";
+$lang['wrong filename'] = "错误文件名";
+$lang['the username must be given'] = "需要用户名";
+$lang['useful when password forgotten'] = "当你忘记密码时将很有用";
+$lang['Quick search'] = "快速搜素";
+$lang['Connected user: %s'] = "已连接用户: %s";
+$lang['IP: %s'] = "IP地址: %s";
+$lang['Browser: %s'] = "浏览器: %s";
+$lang['Author: %s'] = "作者: %s";
+$lang['Comment: %s'] = "意见: %s";
+$lang['Comment by %s'] = "由 %s 提出的意见";
+$lang['User: %s'] = "用户: %s";
+$lang['Email: %s'] = "电子邮件: %s";
+$lang['Admin: %s'] = "管理员: %s";
+$lang['Registration of %s'] = " %s 的注册";
+$lang['Album: %s'] = "图片集: %s";
+$lang['Bad status for user "guest", using default status. Please notify the webmaster.'] = "“访客”账户出现问题，正在使用默认设置，请提醒管理员。";
+$lang['Administrator, webmaster and special user cannot use this method'] = "管理员，网管和特殊用户不能使用此手段。";
+$lang['this email address is already in use'] = "这个电子邮件地址已经被占用了";
+$lang['Album results for'] = "相册结果对应";
+$lang['Tag results for'] = "标签结果对应";
+$lang['from %s to %s'] = "从 %s 到 %s";
+$lang['Play of slideshow'] = "播放幻灯片";
+$lang['Pause of slideshow'] = "暂停幻灯片";
+$lang['Repeat the slideshow'] = "重复幻灯片";
+$lang['Not repeat the slideshow'] = "不要重复幻灯片";
+$lang['Reduce diaporama speed'] = "减慢幻灯片播放速度";
+$lang['Accelerate diaporama speed'] = "加快幻灯片播放速度";
+$lang['Submit'] = "提交";
+$lang['Yes'] = "是";
+$lang['No'] = "否";
+$lang['%d photo'] = "%d 图片";
+$lang['%d photos'] = "%d 图片";
+$lang['%d photo is also linked to current tags'] = "%d 张图片也与此标签对应";
+$lang['%d photos are also linked to current tags'] = "%d 张图片也与此标签对应";
+$lang['display photos linked to this tag'] = "播放与此标签对应的图片";
+$lang['photos posted during the last %d days'] = "最近 %d 天上传的图片";
+$lang['Piwigo Help'] = "Piwigo帮助";
+$lang['Rank'] = "评分";
+$lang['group by letters'] = "以字母编组";
+$lang['letters'] = "字母";
+$lang['show tag cloud'] = "显示标签云";
+$lang['cloud'] = "云";
+$lang['Reset to default values'] = "恢复默认值";
+$lang['delete all photos from your favorites'] = "从你的收藏中删除所有照片";
+$lang['Sent by'] = "发送者";
+$lang['Cookies are blocked or not supported by your browser. You must enable cookies to connect.'] = "Cookies被阻止或你的浏览器不支持Cookies，你必须启动Cookies以连接";
+$lang['edit this comment'] = "编辑这个意见";
+$lang['Edit a comment'] = "编辑一个意见";
+$lang['Are you sure?'] = "你确定？";
+$lang['(!) This comment requires validation'] = '(!) 这个意见需审核';
 $lang['Welcome'] = '欢迎';
-$lang['Welcome to your Piwigo photo gallery!'] = '欢迎来到您的 Piwigo 画廊!';
-$lang['... or browse your empty gallery'] = '... 或者浏览您的空画廊';
-$lang['... or please deactivate this message, I will find my way by myself'] = '... 或者取消此信息，我会自己找到我的方法';
-$lang['Hello %s, your Piwigo photo gallery is empty!'] = '您好 %s, 您的 Piwigo 画廊是空的!';
-$lang['I want to add photos'] = '我想添加相片';
-$lang['Manage this user comment: %s'] = '管理此用户的评论: %s';
-$lang['This author modified following comment:'] = '此作者修改了以下的评论:';
-$lang['This author removed the comment with id %d'] = '此作者删除了 id 为 %d 的评论';
-$lang['validate this comment'] = '审核此评论';
-$lang['Sent by'] = '发送人';
+$lang['Welcome to your Piwigo photo gallery!'] = '欢迎来到你的Piwigo照片画廊！';
+$lang['... or browse your empty gallery'] = '... 或者浏览你的空的画廊';
+$lang['... or please deactivate this message, I will find my way by myself'] = '... 或者请忽视此消息，我会自己搞定。';
+$lang['Hello %s, your Piwigo photo gallery is empty!'] = 'Hello %s，你的照片画廊现在是空的！';
+$lang['I want to add photos'] = '我想添加图片';
+$lang['Manage this user comment: %s'] = '管理这个用户意见： %s';
+$lang['Email address is missing. Please specify an email address.'] = "没有电子邮件地址，请确定一个电子邮件地址。";
+$lang['This author modified following comment:'] = '这个作者修改了以下意见：';
+$lang['This author removed the comment with id %d'] = '这个作者以 id %d 删除了意见';
+$lang['delete this comment'] = "删除这个意见";
+$lang['validate this comment'] = '确认这个意见';
+$lang['html tags are not allowed in login'] = '登录名中不允许使用html标签';
 ?>
 \ No newline at end of file
diff --git a/language/zh_CN/upgrade.lang.php b/language/zh_CN/upgrade.lang.php
index 8e83e5658..ab2d7b136 100644
--- a/language/zh_CN/upgrade.lang.php
+++ b/language/zh_CN/upgrade.lang.php
@@ -23,21 +23,20 @@
 
 
 $lang['Upgrade'] = "升级";
-$lang['This page proposes to upgrade your database corresponding to your old version of Piwigo to the current version. The upgrade assistant thinks you are currently running a <strong>release %s</strong> (or equivalent).'] = "此页面将把您的 Piwigo 旧版本的数据库升级为新版本。
-升级助手将会认为您正在运行 <strong>版本 %s</strong> (或者相同的版本).";
-$lang['Upgrade from version %s to %s'] = "从 %s 版升级到 %s";
-$lang['Statistics'] = "统计";
-$lang['total upgrade time'] = "总共升级时间";
-$lang['total SQL time'] = "总共 SQL 时间";
+$lang['This page proposes to upgrade your database corresponding to your old version of Piwigo to the current version. The upgrade assistant thinks you are currently running a <strong>release %s</strong> (or equivalent).'] = "这个页面试图更新你的与Piwigo相关的数据库。 更新助手认为你现在正在运行 <strong>版本 %s</strong> （或相同的对应版本）。";
+$lang['Upgrade from version %s to %s'] = "从 %s 版本升级到 %s 版本";
+$lang['Statistics'] = "统计量";
+$lang['total upgrade time'] = "总升级时间";
+$lang['total SQL time'] = "总 SQL 时间";
 $lang['SQL queries'] = "SQL 查询";
 $lang['Upgrade informations'] = "升级信息";
-$lang['Perform a maintenance check in [Administration>Tools>Maintenance] if you encounter any problem.'] = "如果您遇到任何问题，请在[管理员>工具>维护]执行维护检测";
-$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-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>, 插入:';
-$lang['As a precaution, following themes have been deactivated. You must check for themes upgrade before reactiving them:'] = '作为预防措施，以下主题均已被停用。在您重新启用它们之前，请必须先检测一下是否有更新:';
+$lang['Perform a maintenance check in [Administration>Tools>Maintenance] if you encounter any problem.'] = "如果你遇上任何问题请到 [管理>工具>维护] 运行一次维护检查";
+$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-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>之前，插入';
+$lang['As a precaution, following themes have been deactivated. You must check for themes upgrade before reactiving them:'] = '请注意,以下主题已被禁用，你在激活它们之前必须先检查主题的更新：';
 ?>
 \ No newline at end of file