diff options
| author | Gerrit Uitslag <klapinklapin@gmail.com> | 2014-05-26 20:44:02 +0200 |
|---|---|---|
| committer | Gerrit Uitslag <klapinklapin@gmail.com> | 2014-05-26 20:44:02 +0200 |
| commit | e5e6f447ba17ba51957a1228e55fe53d8087776a (patch) | |
| tree | f59213d66fcb910725f8fd34def06e89d88e5241 /inc/lang/en/lang.php | |
| parent | b66e5840006078112b8da741b2c612e446afd452 (diff) | |
| parent | 8f2758f6b53b11db38d83ea9ad838ed802a6e635 (diff) | |
| download | rpg-e5e6f447ba17ba51957a1228e55fe53d8087776a.tar.gz rpg-e5e6f447ba17ba51957a1228e55fe53d8087776a.tar.bz2 | |
Merge remote-tracking branch 'origin/master' into trailingcolons
Conflicts:
inc/lang/cs/lang.php
inc/lang/hu/lang.php
Diffstat (limited to 'inc/lang/en/lang.php')
| -rw-r--r-- | inc/lang/en/lang.php | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/inc/lang/en/lang.php b/inc/lang/en/lang.php index 7493c50e6..9c1e5dacd 100644 --- a/inc/lang/en/lang.php +++ b/inc/lang/en/lang.php @@ -307,6 +307,7 @@ $lang['i_modified'] = 'For security reasons this script will only wor <a href="http://dokuwiki.org/install">Dokuwiki installation instructions</a>'; $lang['i_funcna'] = 'PHP function <code>%s</code> is not available. Maybe your hosting provider disabled it for some reason?'; $lang['i_phpver'] = 'Your PHP version <code>%s</code> is lower than the needed <code>%s</code>. You need to upgrade your PHP install.'; +$lang['i_mbfuncoverload'] = 'mbstring.func_overload must be disabled in php.ini to run DokuWiki.'; $lang['i_permfail'] = '<code>%s</code> is not writable by DokuWiki. You need to fix the permission settings of this directory!'; $lang['i_confexists'] = '<code>%s</code> already exists'; $lang['i_writeerr'] = 'Unable to create <code>%s</code>. You will need to check directory/file permissions and create the file manually.'; |