Merge remote-tracking branch 'origin/master' into FS#2697searchpagereadonly

Conflicts:
	inc/lang/hr/searchpage.txt
	inc/lang/ko/searchpage.txt

5 files changed, 95 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_plugins.txt b/lib/plugins/extension/lang/zh/intro_plugins.txt
new file mode 100644
index 000000000..69cb343b3
--- /dev/null
+++ b/lib/plugins/extension/lang/zh/intro_plugins.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..0264f3e9c
--- /dev/null
+++ b/lib/plugins/extension/lang/zh/lang.php
@@ -0,0 +1,91 @@
+<?php
+
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
+ * @author Cupen <Cupenoruler@foxmail.com>
+ * @author xiqingongzi <Xiqingongzi@Gmail.com>
+ * @author qinghao <qingxianhao@gmail.com>
+ * @author lainme <lainme993@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['available_version']     = '可用版本：';
+$lang['compatible']            = '兼容于：';
+$lang['depends']               = '依赖于：';
+$lang['similar']               = '相似于：';
+$lang['conflicts']             = '冲突于：';
+$lang['donate']                = '喜欢？';
+$lang['donate_action']         = '捐给作者一杯咖啡钱！';
+$lang['repo_retry']            = '重试';
+$lang['provides']              = '提供：';
+$lang['status']                = '现状：';
+$lang['status_installed']      = '已安装的';
+$lang['status_not_installed']  = '未安装';
+$lang['status_protected']      = '受保护';
+$lang['status_enabled']        = '启用';
+$lang['status_disabled']       = '禁用';
+$lang['status_unmodifiable']   = '不可修改';
+$lang['status_plugin']         = '插件';
+$lang['status_template']       = '模板';
+$lang['status_bundled']        = '内建';
+$lang['msg_enabled']           = '插件 %s 已启用';
+$lang['msg_disabled']          = '插件 %s 已禁用';
+$lang['msg_delete_success']    = '插件已经卸载';
+$lang['msg_template_install_success'] = '模板 %s 安装成功';
+$lang['msg_template_update_success'] = '模板 %s 更新成功';
+$lang['msg_plugin_install_success'] = '插件 %s 安装成功';
+$lang['msg_plugin_update_success'] = '插件 %s 更新成功';
+$lang['msg_upload_failed']     = '上传文件失败';
+$lang['missing_dependency']    = '<strong>缺少或者被禁用依赖：</strong> %s';
+$lang['security_issue']        = '<strong>安全问题：</strong> %s';
+$lang['security_warning']      = '<strong>安全警告：</strong> %s';
+$lang['update_available']      = '<strong>更新：</strong>新版本 %s 已经可用。';
+$lang['wrong_folder']          = '<strong>插件安装不正确：</strong>重命名插件目录 "%s" 为 "%s"。';
+$lang['url_change']            = '<strong>URL已改变：</strong>自上次下载以来的下载 URL 已经改变。请在更新扩展前检查新 URL 是否有效。<br />新的：%s<br />旧的：%s';
+$lang['error_badurl']          = 'URL 应当以 http 或者 https 作为开头';
+$lang['error_dircreate']       = '无法创建用于保存下载的临时文件夹';
+$lang['error_download']        = '无法下载文件：%s';
+$lang['error_decompress']      = '无法解压下载的文件。这可能是由于文件损坏，在这种情况下您可以重试。这也可能是由于压缩格式是未知的，在这种情况下您需要手动下载并且安装。';
+$lang['error_findfolder']      = '无法识别扩展目录，您需要手动下载和安装';
+$lang['error_copy']            = '在尝试安装文件到目录 <em>%s</em> 时出现文件复制错误：磁盘可能已满或者文件访问权限不正确。这可能导致插件被部分安装并使您的维基处在不稳定状态';
+$lang['noperms']               = '扩展目录不可写';
+$lang['notplperms']            = '模板目录不可写';
+$lang['nopluginperms']         = '插件目录不可写';
+$lang['git']                   = '这个扩展是通过 git 安装的，您可能不想在这里升级它';
+$lang['install_url']           = '从 URL 安装：';
+$lang['install_upload']        = '上传扩展：';
+$lang['repo_error']            = '无法连接到插件仓库。请确定您的服务器可以连接 www.dokuwiki.org 并检查您的代理设置。';