diff --git a/language/zh_CN/admin.lang.php b/language/zh_CN/admin.lang.php
index 867f82e96..1420177bf 100644
--- a/language/zh_CN/admin.lang.php
+++ b/language/zh_CN/admin.lang.php
@@ -22,15 +22,15 @@ $lang['%d member'] = '%d位成员';
 $lang['%d members'] = '%d位成员';
 $lang['%d tag'] = '%d个标签';
 $lang['%d tags'] = '%d个标签';
-$lang['%d user comment rejected'] = '%d个用户评论未通过审核';
-$lang['%d user comments rejected'] = '%d个用户评论未通过审核';
-$lang['%d user comment validated'] = '%d个用户评论已通过审核';
-$lang['%d user comments validated'] = '%d个用户评论已通过审核';
-$lang['%d user deleted'] = '%d个用户已删除';
-$lang['%d users deleted'] = '%d个用户已删除';
-$lang['%d user'] = '%d个用户';
-$lang['%d users'] = '%d个用户';
-$lang['%d waiting for validation'] = '%d个等待审核';
+$lang['%d user comment rejected'] = '%d条用户评论未通过审核';
+$lang['%d user comments rejected'] = '%d条用户评论未通过审核';
+$lang['%d user comment validated'] = '%d条用户评论已通过审核';
+$lang['%d user comments validated'] = '%d条用户评论已通过审核';
+$lang['%d user deleted'] = '%d位用户已删除';
+$lang['%d users deleted'] = '%d位用户已删除';
+$lang['%d user'] = '%d位用户';
+$lang['%d users'] = '%d位用户';
+$lang['%d waiting for validation'] = '%d条等待审核';
 $lang['Actions'] = '操作';
 $lang['Activate'] = '启用';
 $lang['Add/delete a permalink'] = '添加/删除一个固定链接';
@@ -43,7 +43,7 @@ $lang['Apply to sub-albums'] = '应用到子相册';
 $lang['Associated'] = '已关联';
 $lang['Caddie management'] = '标记图片库管理';
 $lang['Caddie'] = '标记图片库';
-$lang['Albums authorized thanks to group associations'] = '以组成员身份授予访问权的相册';
+$lang['Albums authorized thanks to group associations'] = '作为权限组成员，故可以访问的相册';
 $lang['Album manual order was saved'] = '相册手动排序已保存';
 $lang['Check for upgrade failed for unknown reasons.'] = '因未知原因，更新检查失败。';
 $lang['Check for upgrade'] = '检查更新';
@@ -229,10 +229,10 @@ $lang['With blank value, gallery title will be used'] = '如留空，则将使
 $lang['Notification'] = 'RSS订阅';
 $lang['Error when sending email to %s [%s].'] = '发送邮件给 %s [%s] 时发生了错误。';
 $lang['Mail sent to %s [%s].'] = '邮件已发送至 %s [%s]。';
-$lang['%d mail was sent.'] = '%s份邮件已发送。';
-$lang['%d mails were sent.'] = '%s份邮件已发送。';
-$lang['%d mail was not sent.'] = '%s份邮件未被发送。';
-$lang['%d mails were not sent.'] = '%s份邮件未被发送。';
+$lang['%d mail was sent.'] = '已发送%d封邮件。';
+$lang['%d mails were sent.'] = '已发送%d封邮件。';
+$lang['%d mail was not sent.'] = '%d封邮件未被发送。';
+$lang['%d mails were not sent.'] = '%d封邮件未被发送。';
 $lang['No mail to send.'] = '没有邮件要发送。';
 $lang['There is no available subscribers to mail.'] = '没有用户订阅邮件通知。';
 $lang['Subscribers could be listed (available) only if there is new elements to notify.'] = '只有当有新元素时，才能使用用户邮件通知功能。';
@@ -257,19 +257,19 @@ $lang['Subscribe/unsubscribe users'] = '订阅/取消订阅用户';
 $lang['Unsubscribed'] = '已取消';
 $lang['%d parameter was updated.'] = '%d个参数已更新。';
 $lang['%d parameters were updated.'] = '%d个参数已更新。';
-$lang['%d user was not updated.'] = '%d个用户未被更新。';
-$lang['%d users were not updated.'] = '%d个用户未被更新。';
+$lang['%d user was not updated.'] = '%d位用户未被更新。';
+$lang['%d users were not updated.'] = '%d位用户未被更新。';
 $lang['User %s [%s] was removed from the subscription list.'] = '用户 %s [%s] 已从订阅列表中删除。';
 $lang['User %s [%s] was added to the subscription list.'] = '用户 %s [%s] 已加入订阅列表。';
-$lang['%d user was updated.'] = '%d个用户已更新。';
-$lang['%d users were updated.'] = '%d个用户已更新。';
+$lang['%d user was updated.'] = '%d位用户已更新。';
+$lang['%d users were updated.'] = '%d位用户已更新。';
 $lang['User %s [%s] was not removed from the subscription list.'] = '用户 %s [%s] 未从订阅列表中删除。';
 $lang['User %s [%s] was not added to the subscription list.'] = '用户 %s [%s] 未加入订阅列表。';
 $lang['User %s [%s] added.'] = '用户 %s [%s] 已添加。';
 $lang['Warning: subscribing or unsubscribing will send mails to users'] = '注意：订阅或取消订阅都会给相关用户发送邮件';
 $lang['Send mail on HTML format'] = '以HTML格式发送邮件';
 $lang['Include display of recent photos grouped by dates'] = '包含显示最近的以日期分组的图片';
-$lang['Available only with HTML format'] = '仅限HTML格式可用';
+$lang['Available only with HTML format'] = '仅支持 HTML 格式';
 $lang['no write access'] = '无法写入';
 $lang['Permissions'] = '权限';
 $lang['private'] = '非公开';
@@ -309,7 +309,7 @@ $lang['Group management'] = '组管理';
 $lang['User list'] = '用户列表';
 $lang['Database synchronization with files'] = '根据文件来同步数据库';
 $lang['all'] = '所有';
-$lang['height must be a number superior to'] = '图片高度必须大于(整数)';
+$lang['height must be a number superior to'] = '图片高度必须大于';
 $lang['width must be a number superior to'] = '图片宽度必须大于（整数）';
 $lang['for the file format'] = '对于文件格式';
 $lang['Photo unreachable or no support'] = '不支持的图片格式或无法获取';
@@ -409,17 +409,17 @@ $lang['Automatic correction'] = '自动修复';
 $lang['Impossible automatic correction'] = '无法自动修复';
 $lang['Correction applied with success'] = '修复成功';
 $lang['Correction applied with error'] = '修复出错';
-$lang['%d anomaly has been detected.'] = '发现了%d个异常。';
-$lang['%d anomalies have been detected.'] = '发现了%d个异常。';
-$lang['%d anomaly has been corrected.'] = '修复了%d个异常。';
-$lang['%d anomalies have been detected corrected.'] = '发现了%d个异常并已修复。';
-$lang['%d anomaly has not been corrected.'] = '%d个异常未被修复。';
-$lang['%d anomalies have not been corrected.'] = '%d个异常未被修复。';
+$lang['%d anomaly has been detected.'] = '已发现%d处异常。';
+$lang['%d anomalies have been detected.'] = '已发现%d处异常。';
+$lang['%d anomaly has been corrected.'] = '已修复%d处异常。';
+$lang['%d anomalies have been detected corrected.'] = '已发现%d处异常并完成修复。';
+$lang['%d anomaly has not been corrected.'] = '%d处异常未被修复。';
+$lang['%d anomalies have not been corrected.'] = '%d处异常未被修复。';
 $lang['Go to %s or %s for more informations'] = '获取更多信息，请到 %s 或者 %s ';
 $lang['the forum'] = '论坛';
 $lang['the wiki'] = 'wiki';
-$lang['%s value is not correct file because exif are not supported'] = '%s 值不正确，因为不支持exif';
-$lang['%s must be to set to false in your local/config/config.inc.php file'] = '在配置文件local/config/config.inc.php中，%s必须设置为"false"';
+$lang['%s value is not correct file because exif are not supported'] = '%s 值不正确，因为 EXIF 不支持';
+$lang['%s must be to set to false in your local/config/config.inc.php file'] = '在配置文件 local/config/config.inc.php 中，%s 必须设置为 "false"';
 $lang['Main "guest" user does not exist'] = '主"游客"帐户不存在';
 $lang['Main "guest" user status is incorrect'] = '主"游客"帐户状态异常';
 $lang['Default user does not exist'] = '默认用户不存在';
@@ -448,8 +448,8 @@ $lang['Ignore selected anomalies'] = '忽略选中的异常';
 $lang['Refresh'] = '刷新';
 $lang['The anomaly will be ignored until next application version'] = '此异常将被忽略，待下个版本中解决';
 $lang['Correction the anomaly will cancel the fact that it\'s ignored'] = '经过修复，此项异常将不再被忽略';
-$lang['%d anomaly has been ignored.'] = '%d个异常已被忽略。';
-$lang['%d anomalies have been ignored.'] = '%d个异常已被忽略。';
+$lang['%d anomaly has been ignored.'] = '已忽略%d处异常。';
+$lang['%d anomalies have been ignored.'] = '已忽略%d处异常。';
 $lang['Plugins which need upgrade'] = '需要更新的插件';
 $lang['Plugin list'] = '插件列表';
 $lang['Check for updates'] = '检查更新';
@@ -457,7 +457,7 @@ $lang['Other plugins'] = '其他可用插件';
 $lang['Last revisions'] = '最新修订版';
 $lang['Are you sure you want to install this plugin?'] = '确定要安装此插件？';
 $lang['Are you sure you want to delete this plugin?'] = '确定要删除此插件？';
-$lang['Are you sure to install this upgrade? You must verify if this version does not need uninstallation.'] = '确定安装此更新？您必须确定此版本是否无需先进行卸载操作。';
+$lang['Are you sure to install this upgrade? You must verify if this version does not need uninstallation.'] = '确定安装此更新？请务必确认该扩展无需先卸载旧版，可以直接覆盖升级。';
 $lang['Plugin has been successfully copied'] = '插件复制成功';
 $lang['Can\'t create temporary file.'] = '无法创建临时文件。';
 $lang['Can\'t download archive.'] = '无法下载归档文件。';
@@ -473,8 +473,8 @@ $lang['ACCESS_1'] = '对所有人开放';
 $lang['ACCESS_2'] = '只对注册用户开放';
 $lang['ACCESS_3'] = '只对管理员开放';
 $lang['ACCESS_4'] = '只对站长开放';
-$lang['ACCESS_5'] = '不开放';
-$lang['A new version of Piwigo is available.'] = 'Piwigo新版发布。';
+$lang['ACCESS_5'] = '不对任何人开放';
+$lang['A new version of Piwigo is available.'] = 'Piwigo 发布新版本了。';
 $lang['Piwigo Administration'] = 'Piwigo管理';
 $lang['Piwigo version'] = 'Piwigo版本';
 $lang['You are running the latest version of Piwigo.'] = '您运行的是Piwigo最新版。';
@@ -490,7 +490,7 @@ $lang['Replacers (customized templates)'] = '替换（自定义模板）';
 $lang['Original templates'] = '原模板';
 $lang['Optional URL keyword'] = '可选URL关键字';
 $lang['Templates configuration has been recorded.'] = '模板设置已保存。';
-$lang['All optimizations have been successfully completed.'] = '优化成功。';
+$lang['All optimizations have been successfully completed.'] = '优化完成。';
 $lang['Optimizations have been completed with some errors.'] = '优化完成，但发生了一些错误。';
 $lang['Modify information'] = '修改信息';
 $lang['nothing'] = '没有内容';
@@ -537,11 +537,11 @@ $lang['Give write access (chmod 777) to "%s" directory at the root of your Piwig
 $lang['existing album'] = '现有的相册';
 $lang['create a new album'] = '创建一个新相册';
 $lang['Album name'] = '相册名称';
-$lang['Album "%s" has been added'] = '相册 "%s" 已添加';
+$lang['Album "%s" has been added'] = '新增相册“%s” ';
 $lang['Uploaded Photos'] = '已上传的图片';
 $lang['%d photos uploaded'] = '%d张图片已上传';
 $lang['Privacy level set to "%s"'] = '隐私级别设置为 "%s"';
-$lang['Album "%s" now contains %d photos'] = '相册 "%s" 现包含 %d 张图片';
+$lang['Album "%s" now contains %d photos'] = '相册“%s”现包含 %d 张图片';
 $lang['Manage this set of %d photos'] = '管理本集合的 %d 张图片';
 $lang['Select files'] = '选择文件';
 $lang['Everybody'] = '每个人';
@@ -582,7 +582,7 @@ $lang['Main Page'] = '主页';
 $lang['Photo Page'] = '图片页';
 $lang['Activate Navigation Bar'] = '启用导航条';
 $lang['Activate Navigation Thumbnails'] = '启用缩略图导航';
-$lang['Activate icon "%s"'] = '启用图标 "%s"';
+$lang['Activate icon "%s"'] = '启用“%s”图标';
 $lang['Photo Properties'] = '图片属性';
 $lang['Allow user customization'] = '允许用户自定义';
 $lang['Languages'] = '语言';
@@ -643,12 +643,12 @@ $lang['Failed to write file to disk'] = '文件写入失败';
 $lang['File upload stopped by extension'] = '文件上传被扩展中止';
 $lang['Unknown upload error'] = '未知上传错误';
 $lang['Error on file "%s" : %s'] = '文件"%s"上有错误：%s';
-$lang['%d of %d photos selected'] = '%d 张已选 / 总 %d 张图片';
+$lang['%d of %d photos selected'] = '已选择 %d 张图片，共 %d 张';
 $lang['Action'] = '操作';
 $lang['Add a filter'] = '添加过滤器';
 $lang['Album photos associated to the following albums: %s'] = '图片已关联到以下相册：%s';
 $lang['Albums automatically sorted'] = '相册已自动排序';
-$lang['All %d photos are selected'] = '全部 %d 张图片已选中';
+$lang['All %d photos are selected'] = '已选中全部 %d 张图片';
 $lang['Apply action'] = '执行操作';
 $lang['automatic order'] = '自动排序';
 $lang['Batch Manager'] = '批量管理';
@@ -661,7 +661,7 @@ $lang['manual order'] = '手动排序';
 $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['on the %d selected photos'] = '于所选的 %d 张图片';
 $lang['Orphan tags deleted'] = '未关联任何图片的标签已被删除';
 $lang['Refresh photo set'] = '刷新图片集';
 $lang['Remove all filters'] = '删除所有过滤器';
@@ -704,9 +704,9 @@ $lang['Type in a search term'] = '输入搜索关键字';
 
 
 $lang['display'] = '显示';
-$lang['Average rate'] = "平均分";
+$lang['Average rate'] = '平均评分';
 $lang['Rate'] = '评分';
-$lang['Activate icon "new" next to albums and pictures'] = '启用相册和图片旁边的"new"图标';
+$lang['Activate icon "new" next to albums and pictures'] = '启用相册和图片旁边的“新建”图标';
 $lang['Add a criteria'] = '添加条件';
 $lang['Deactivate all'] = '停用所有';
 $lang['Default photos order'] = '默认图片排序';
@@ -756,7 +756,7 @@ $lang['You are using the Flash uploader. Problems? Try the <a href="%s">Browser
 $lang['You are using the Browser uploader. Try the <a href="%s">Flash uploader</a> instead.'] = '您正在使用网页上传方式，若有问题，请尝试<a href="%s">Flash上传</a>。';
 $lang['Maximum file size: %sB.'] = '文件最大体积：%sB。';
 $lang['Allowed file types: %s.'] = '允许的文件类型：%s。';
-$lang['Approximate maximum resolution: %dM pixels (that\'s %dx%d pixels).'] = '最大的分辨率约：%dM 像素 (即 %dx%d 像素)。';
+$lang['Approximate maximum resolution: %dM pixels (that\'s %dx%d pixels).'] = '最大的分辨率约：%dM 像素（即 %dx%d 像素）。';
 $lang['Manage Permissions'] = '管理权限';
 $lang['Learn more'] = '了解更多';
 $lang['Photo %s of %s'] = 'Photo %s of %s';
@@ -771,7 +771,7 @@ $lang['No destination tag selected'] = '没有选中的目的标签';
 $lang['Tags <em>%s</em> merged into tag <em>%s</em>'] = '标签<em>%s</em>已并入标签<em>%s</em>';
 $lang['Select at least two tags for merging'] = '请至少选择2个标签以合并';
 $lang['Select an album'] = '选择一个相册';
-$lang['By default, Piwigo will create a new websize from the HD (high definition) version of your photo.'] = '默认情况下，Piwigo将基于图片的HD（高清）版本为图片创建一个新的网页尺寸。';
+$lang['By default, Piwigo will create a new websize from the HD (high definition) version of your photo.'] = '默认情况下，Piwigo 将为高清图片生成一个用于网页上显示的较小版本。';
 $lang['If no HD is available and if the current websize is bigger than resize dimensions, Piwigo will move it as HD and create a downsized websize photo from it.'] = '若无高清图片且当前网页尺寸的图片大于重置尺寸，Piwigo会将其视为高清图片并用它生成较小尺寸的网页尺寸图片。';
 $lang['An error has occured during upgrade.'] = '在升级过程中出现了一个错误。';
 $lang['An error has occured during extract. Please check files permissions of your piwigo installation.<br><a href="%s">Click here to show log error</a>.'] = '在解压时出现了一个错误。请检查您 piwigo 安装文件的读写权限。<br><a href="%s">点此查看错误日志</a>';
@@ -810,7 +810,7 @@ $lang['This album contains %d photos, added between %s and %s.'] = '此相册包
 $lang['This album contains %d photos, added on %s.'] = '此相册包含%d张图片，添加于%s。';
 $lang['This album contains no photo.'] = '此相册中没有图片。';
 $lang['Unlock gallery'] = '解锁图库';
-$lang['<em>Piwigo for iOS</em> application empowers you to connect to your Piwigo gallery from your iPhone, iPad or iPod Touch, create some albums and upload several photos at once.'] = '<em>Piwigo iOS版</em> 使您能够从iPhone、iPad或iPod Touch连接到您的Piwigo图库，方便您随时随地创建相册和上传图片。';
+$lang['<em>Piwigo for iOS</em> application empowers you to connect to your Piwigo gallery from your iPhone, iPad or iPod Touch, create some albums and upload several photos at once.'] = '您可以在iPhone、iPad或iPod Touch上安装<em>Piwigo iOS版</em>，以便随时随地连接到您的Piwigo图库，创建相册和上传图片。';
 $lang['Applications'] = '应用程序';
 $lang['apply automatic sort order'] = '应用自动排序';
 $lang['Automatic sort order'] = '自动排序';
@@ -886,8 +886,8 @@ $lang['%d seconds'] = '%d秒';
 $lang['%d second'] = '%d秒';
 $lang['%d years'] = '%d年';
 $lang['%d year'] = '%d年';
-$lang['%s ago'] = '%s以前';
-$lang['%s in the future'] = '%s in the future';
+$lang['%s ago'] = '%s前';
+$lang['%s in the future'] = '%s后的未来';
 $lang['Added by %s'] = '由%s添加';
 $lang['Numeric identifier : %d'] = '数字ID：%d';
 $lang['Original file : %s'] = '原文件：%s';
@@ -944,19 +944,19 @@ $lang['Update user'] = '更新用户';
 $lang['User %s added'] = '用户 %s 已添加';
 $lang['User %s updated'] = '用户 %s 已更新';
 $lang['Users modified'] = '用户已修改';
-$lang['on the %d selected users'] = '于 %d 个已选中的用户';
-$lang['All %d users are selected'] = '已选中全部 %d 个用户';
+$lang['on the %d selected users'] = '于所选的 %d 位用户';
+$lang['All %d users are selected'] = '已选中全部 %d 位用户';
 $lang['Change password'] = '更改密码';
 $lang['Change username'] = '更改用户名';
 $lang['Last visit on %s, %s.'] = '于 %s, %s 的最后访问。';
 $lang['Loading...'] = '加载中…';
 $lang['No matching user found'] = '未发现匹配的用户';
-$lang['%d of %d users selected'] = '已选中用户数/总数：%d / %d';
-$lang['(filtered from %s total users)'] = '（已从 %s 个总用户中过滤）';
+$lang['%d of %d users selected'] = '已选择 %d 位用户，共 %d 位';
+$lang['(filtered from %s total users)'] = '（从系统中共 %s 位用户中筛选出）';
 $lang['Close user details'] = '关闭用户明细';
 $lang['Open user details'] = '打开用户明细';
 $lang['close'] = '关闭';
-$lang['Activate it now'] = '马上激活';
+$lang['Activate it now'] = '立即启用';
 $lang['Allow users to add a link to their website'] = '允许用户添加一个链接到其网站';
 $lang['Empty caddie'] = '清空标记图片库';
 $lang['Impossible to deactivate the default theme.'] = '默认主题无法被停用。';
@@ -967,7 +967,7 @@ $lang['based on'] = '基于';
 $lang['between %s and %s MB'] = '在 %s 和 %s MB 之间';
 $lang['date & time'] = '日期与时间';
 $lang['file name'] = '文件名';
-$lang['width & height'] = '宽度&高度';
+$lang['width & height'] = '宽度和高度';
 $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.'] = '出于安全原因，验证密钥对管理员不起作用。';
@@ -1000,7 +1000,7 @@ $lang['Dashboard'] = '面板';
 $lang['delete album and the %d orphan photos'] = '删除相册和 %d 张无关联图片';
 $lang['orphans to delete'] = '要删除的无关联图片';
 $lang['delete only album, not photos'] = '仅删除相册，不删除图片';
-$lang['%d checksums were added'] = '%d 校验码已添加';
+$lang['%d checksums were added'] = '已为%d张图片添加校验码';
 $lang['Compute %d missing checksums'] = '计算 %d 缺失的校验码';
 $lang['Create a first album'] = '创建第一个相册';
 $lang['Deletion in progress'] = '正在删除';