Merge branch 'master' into stable

* master: (75 commits)
  release preparations
  Romanian language update
  removed 'view original' button from new media manager again (was added in b8a84c03) and made a link around the image instead, as that is a more minor change (as it should be during the RC phase) and is what was originally planned
  corrected old mediaupload introduction text
  Removed obsolete Opera fix that now causes harm FS#2429
  don't limit download sizes in plugin manager
  Disable E_STRICT error reporting
  Make Sitemapper functions static as they were used as static functions
  Make this dummy file empty like all others
  Update copyright year
  Remove testing md5 hash from installer
  Slovak language update
  localization: removed strings from old flashuploader
  Polish language update
  readded missing "view original" button to the new media manager
  always show full filename as tooltip in mediamanager
  Fix sorting in media manager search (FS#2423)
  make the installer check for new media dirs
  do not rely on tmpfile() in the AJAX uploader backend FS#2417
  Galician language update
  ...

1 files changed, 11 insertions, 20 deletions

diff --git a/inc/lang/zh/lang.php b/inc/lang/zh/lang.php
index 6e6dff6f4..8fffc5ed2 100644
--- a/inc/lang/zh/lang.php
+++ b/inc/lang/zh/lang.php
@@ -14,6 +14,7 @@
  * @author Hiphen Lee <jacob.b.leung@gmail.com>
  * @author caii, patent agent in China <zhoucaiqi@gmail.com>
  * @author lainme993@gmail.com
+ * @author Shuo-Ting Jian <shoting@gmail.com>
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'ltr';
@@ -289,21 +290,7 @@ $lang['i_pol1']                = '公共的维基（任何人都有读的权限�
 $lang['i_pol2']                = '关闭的维基（只有注册用户才有读、写、上传的权限）';
 $lang['i_retry']               = '重试';
 $lang['i_license']             = '请选择您希望的内容发布许可协议：';
-$lang['mu_intro']              = '您可以在此一次上传多个文件。点按浏览按钮添加文件到上传队列中，先好后按上传钮。';
-$lang['mu_gridname']           = '文件名';
-$lang['mu_gridsize']           = '大小';
-$lang['mu_gridstat']           = '状态';
-$lang['mu_namespace']          = '名称空间';
-$lang['mu_browse']             = '浏览';
-$lang['mu_toobig']             = '过大';
-$lang['mu_ready']              = '准备好上传';
-$lang['mu_done']               = '完成';
-$lang['mu_fail']               = '失败';
-$lang['mu_authfail']           = '会话过期';
-$lang['mu_progress']           = '@PCT@% 上传完成';
-$lang['mu_filetypes']          = '允许的文件类型';
-$lang['mu_info']               = '文件已上传。';
-$lang['mu_lasterr']            = '最后一个错误：';
+
 $lang['recent_global']         = '您当前看到的是<b>%s</b> 名称空间的变动。你还可以在<a href="%s">查看整个维基的近期变动</a>。';
 $lang['years']                 = '%d年前';
 $lang['months']                = '%d月前';
@@ -315,18 +302,22 @@ $lang['seconds']               = '%d秒前';
 $lang['wordblock']             = '您的更改没有被保存，因为它包含被屏蔽的文字（垃圾信息）。';
 $lang['media_uploadtab']       = '上传';
 $lang['media_searchtab']       = '搜索';
+$lang['media_file']            = '文件';
 $lang['media_viewtab']         = '查看';
 $lang['media_edittab']         = '编辑';
 $lang['media_historytab']      = '历史';
-$lang['media_thumbsview']      = '缩略图';
-$lang['media_listview']        = '列表';
-$lang['media_sort']            = '排序';
+$lang['media_list_thumbs']     = '缩图';
+$lang['media_list_rows']       = '列表';
 $lang['media_sort_name']       = '按名称';
 $lang['media_sort_date']       = '按日期';
+$lang['media_namespaces']      = '选择命名空间';
+$lang['media_files']           = '在 %s 中的文件';
 $lang['media_upload']          = '上传到 <strong>%s</strong> 命名空间。';
 $lang['media_search']          = '在 <strong>%s</strong> 命名空间中搜索。';
-$lang['media_edit']            = '编辑';
-$lang['media_history']         = '这些是文件的旧版本。';
+$lang['media_view']            = '%s 在 %s';
+$lang['media_viewold']         = '%s ';
+$lang['media_edit']            = '编辑 %s';
+$lang['media_history']         = '%s 的历史纪录';
 $lang['media_meta_edited']     = '元数据已编辑';
 $lang['media_perm_read']       = '抱歉，您没有足够权限读取这些文件。';
 $lang['media_perm_upload']     = '抱歉，您没有足够权限来上传文件。';