diff options
| author | Andreas Gohr <andi@splitbrain.org> | 2013-02-03 22:57:45 +0100 |
|---|---|---|
| committer | Andreas Gohr <andi@splitbrain.org> | 2013-02-03 22:57:45 +0100 |
| commit | 3da7921f08ecdda929466921ecc50698f1adf99e (patch) | |
| tree | 0e179e504399e874bfd785d0a95eec44b76d5952 /inc/lang/zh | |
| parent | 6cf2bbfa12b776cf47cb69ae40fb8862f715ad01 (diff) | |
| parent | cc4bb766fdac23358d7b586aa3830b9650eed7a8 (diff) | |
| download | rpg-3da7921f08ecdda929466921ecc50698f1adf99e.tar.gz rpg-3da7921f08ecdda929466921ecc50698f1adf99e.tar.bz2 | |
Merge branch 'master' into future
* master: (162 commits)
fixed revision JS for images
upgraded SimplePie to 1.3.1 FS#2708
removed obsolete browser plugin (migrate does it)
adjust spacing to match standard 1.4em grid
added comment on use of whitelist vs blacklist
Updated idfilter() function for IIS
use var and remove suggestions when needed Use variable for maximum number of suggestions for quicksearch. And hide suggestions when search field is emptied, or when no suggestion are found.
added 'home' class to first link in hierarchical breadcrumbs
reduced required max width to go into tablet mode
re-added linear gradients for firefox
added missing styling for disabled form elements (FS#2705)
fixed acronyms in italics (FS#2684)
improved print styles (includes fixes for FS#2645 and FS#2707)
basic styles improvements
Greek language update
Use list in acl help text, for more structure
Galician language update
touch the config on save, even if no changes were made
unwind the width narrowing commit
put some whitespace between form submit button and fieldset bottom border
...
Conflicts:
lib/plugins/config/admin.php
lib/plugins/config/settings/config.class.php
Diffstat (limited to 'inc/lang/zh')
| -rw-r--r-- | inc/lang/zh/lang.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/inc/lang/zh/lang.php b/inc/lang/zh/lang.php index b21a74ed5..e6e568cb5 100644 --- a/inc/lang/zh/lang.php +++ b/inc/lang/zh/lang.php @@ -289,8 +289,8 @@ $lang['i_writeerr'] = '无法创建 <code>%s</code>。您需要检查 $lang['i_badhash'] = '无法识别的或被修改的 dokuwiki.php（值=<code>%s</code>）'; $lang['i_badval'] = '<code>%s</code> - 非法或空值'; $lang['i_success'] = '配置成功完成。您现在可以删除 install.php 了。继续进入 - <a href="doku.php">您全新的 DokuWiki</a>。'; -$lang['i_failure'] = '写入配置文件的时候产生一些错误。在使用 <a href="doku.php">您全新安装的 DokuWiki</a> 前 + <a href="doku.php?id=wiki:welcome">您全新的 DokuWiki</a>。'; +$lang['i_failure'] = '写入配置文件的时候产生一些错误。在使用 <a href="doku.php?id=wiki:welcome">您全新安装的 DokuWiki</a> 前 您需要手动修复它们。'; $lang['i_policy'] = '初始的 ACL 政策'; $lang['i_pol0'] = '开放的维基（任何人都有读、写、上传的权限）'; |