Merge remote-tracking branch 'remotes/origin/master' into revisions_local

1 files changed, 4 insertions, 2 deletions

diff --git a/inc/lang/zh/lang.php b/inc/lang/zh/lang.php
index 004997d6e..86c2ac20c 100644
--- a/inc/lang/zh/lang.php
+++ b/inc/lang/zh/lang.php
@@ -20,6 +20,8 @@
  * @author Yangyu Huang <yangyu.huang@gmail.com>
  * @author anjianshi <anjianshi@gmail.com>
  * @author oott123 <ip.192.168.1.1@qq.com>
+ * @author Cupen <Cupenoruler@foxmail.com>
+ * @author xiqingongzi <Xiqingongzi@Gmail.com>
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'ltr';
@@ -251,7 +253,7 @@ $lang['admin_register']        = '添加新用户';
 $lang['metaedit']              = '编辑元数据';
 $lang['metasaveerr']           = '写入元数据失败';
 $lang['metasaveok']            = '元数据已保存';
-$lang['img_backto']            = '返回到';
+$lang['btn_img_backto']            = '返回到 %s';
 $lang['img_title']             = '标题';
 $lang['img_caption']           = '说明';
 $lang['img_date']              = '日期';
@@ -264,7 +266,7 @@ $lang['img_camera']            = '相机';
 $lang['img_keywords']          = '关键字';
 $lang['img_width']             = '宽度';
 $lang['img_height']            = '高度';
-$lang['img_manager']           = '在媒体管理器中查看';
+$lang['btn_mediaManager']           = '在媒体管理器中查看';
 $lang['subscr_subscribe_success'] = '添加 %s 到 %s 的订阅列表';
 $lang['subscr_subscribe_error'] = '添加 %s 到 %s 的订阅列表中出现错误';
 $lang['subscr_subscribe_noaddress'] = '没有与您登录信息相关联的地址，您无法被添加到订阅列表';