Merge branch 'master' into diff_navigation

* master: (103 commits)
  Add a basic test case for the cache
  Events: Trigger a warning if the default action is not callable
  Fix caching (make the event callback public again)
  translation update
  translation update
  translation update
  translation update
  translation update
  translation update
  translation update
  avoid HTTP image screenshot urls. closes #595
  translation update
  Extension manager: Fix cache extension to be .repo
  adjusted the office type color again
  another instance of empty() where an array key might not exist
  remove placeholder van denied.txt
  updated file icons once more
  removed 'not logged in' text, loginform is shown already
  Revert "added stripped bit to language file"
  fixed index file
  ...

Conflicts:
	inc/html.php

4 files changed, 53 insertions, 0 deletions

diff --git a/lib/plugins/extension/lang/zh/intro_install.txt b/lib/plugins/extension/lang/zh/intro_install.txt
new file mode 100644
index 000000000..640839319
--- /dev/null
+++ b/lib/plugins/extension/lang/zh/intro_install.txt
@@ -0,0 +1 @@
+你可以通过上传或直接提供下载链接来安装插件和模板。
\ No newline at end of file
diff --git a/lib/plugins/extension/lang/zh/intro_search.txt b/lib/plugins/extension/lang/zh/intro_search.txt
new file mode 100644
index 000000000..0059075c0
--- /dev/null
+++ b/lib/plugins/extension/lang/zh/intro_search.txt
@@ -0,0 +1 @@
+这个标签会为你展示所有DokuWiki的第三方插件和模板。但你需要知道这些由第三方提供的代码可能会给你带来**安全方面的风险**，你最好先读一下[[doku>security#plugin_security|插件安全性]]。
\ No newline at end of file
diff --git a/lib/plugins/extension/lang/zh/intro_templates.txt b/lib/plugins/extension/lang/zh/intro_templates.txt
new file mode 100644
index 000000000..20575d381
--- /dev/null
+++ b/lib/plugins/extension/lang/zh/intro_templates.txt
@@ -0,0 +1 @@
+DokuWiki当前所使用的模板已经安装了，你可以在[[?do=admin&page=config|配置管理器]]里选择你要的模板。
\ No newline at end of file
diff --git a/lib/plugins/extension/lang/zh/lang.php b/lib/plugins/extension/lang/zh/lang.php
new file mode 100644
index 000000000..b9db01540
--- /dev/null
+++ b/lib/plugins/extension/lang/zh/lang.php
@@ -0,0 +1,50 @@
+<?php
+
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
+ * @author Cupen <Cupenoruler@foxmail.com>
+ * @author xiqingongzi <Xiqingongzi@Gmail.com>
+ */
+$lang['menu']                  = '扩展管理器';
+$lang['tab_plugins']           = '安装插件';
+$lang['tab_templates']         = '安装模板';
+$lang['tab_search']            = '搜索和安装';
+$lang['tab_install']           = '手动安装';
+$lang['notimplemented']        = '未实现的特性';
+$lang['notinstalled']          = '该扩展未安装';
+$lang['alreadyenabled']        = '该扩展已激活';
+$lang['alreadydisabled']       = '该扩展已关闭';
+$lang['pluginlistsaveerror']   = '保存插件列表时碰到个错误';
+$lang['unknownauthor']         = '未知作者';
+$lang['unknownversion']        = '未知版本';
+$lang['btn_info']              = '查看更多信息';
+$lang['btn_update']            = '更新';
+$lang['btn_uninstall']         = '卸载';
+$lang['btn_enable']            = '激活';
+$lang['btn_disable']           = '关闭';
+$lang['btn_install']           = '安装';
+$lang['btn_reinstall']         = '重新安装';
+$lang['js']['reallydel']       = '确定卸载这个扩展么？';
+$lang['search_for']            = '搜索扩展';
+$lang['search']                = '搜索';
+$lang['extensionby']           = '<strong>%s</strong> by %s';
+$lang['screenshot']            = '%s 的截图';
+$lang['popularity']            = '人气: %s%%';
+$lang['homepage_link']         = '文档';
+$lang['bugs_features']         = '错误';
+$lang['tags']                  = '标签：';
+$lang['author_hint']           = '搜索这个作者的插件';
+$lang['installed']             = '已安装的：';
+$lang['downloadurl']           = '下载地址：';
+$lang['repository']            = '版本库：';
+$lang['unknown']               = '<em>未知的</em>';
+$lang['installed_version']     = '已安装版本：';
+$lang['install_date']          = '您的最后一次升级：';
+$lang['donate']                = '喜欢？';
+$lang['donate_action']         = '捐给作者一杯咖啡钱！';
+$lang['repo_retry']            = '重试';
+$lang['status']                = '现状：';
+$lang['status_installed']      = '已安装的';
+$lang['status_plugin']         = '插件';
+$lang['status_template']       = '模板';