diff options
| author | Tim Roes <mail@timroes.de> | 2012-05-07 17:08:35 +0200 |
|---|---|---|
| committer | Tim Roes <mail@timroes.de> | 2012-05-07 17:08:35 +0200 |
| commit | efa78c8638547cab77a37006e7f86aed792a1609 (patch) | |
| tree | 492804d80b28f8e32785b3648d9e03e77804b50f /lib/plugins/config/lang/en/lang.php | |
| parent | ae992f53831c105d6deacfef79d7723b22a00033 (diff) | |
| parent | f774b92a94947b3eabd64919b6b4ba74f9c4b5fd (diff) | |
| download | rpg-efa78c8638547cab77a37006e7f86aed792a1609.tar.gz rpg-efa78c8638547cab77a37006e7f86aed792a1609.tar.bz2 | |
Merge branch 'master' of https://github.com/splitbrain/dokuwiki
Diffstat (limited to 'lib/plugins/config/lang/en/lang.php')
| -rw-r--r-- | lib/plugins/config/lang/en/lang.php | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/plugins/config/lang/en/lang.php b/lib/plugins/config/lang/en/lang.php index 42f34de74..83c843b3a 100644 --- a/lib/plugins/config/lang/en/lang.php +++ b/lib/plugins/config/lang/en/lang.php @@ -147,6 +147,7 @@ $lang['notify'] = 'Always send change notifications to this email address'; $lang['registernotify'] = 'Always send info on newly registered users to this email address'; $lang['mailfrom'] = 'Sender email address to use for automatic mails'; $lang['mailprefix'] = 'Email subject prefix to use for automatic mails. Leave blank to use the wiki title'; +$lang['htmlmail'] = 'Send better looking, but larger in size HTML multipart emails. Disable for plain text only mails.'; /* Syndication Settings */ $lang['sitemap'] = 'Generate Google sitemap this often (in days). 0 to disable'; @@ -176,6 +177,9 @@ $lang['renderer_xhtml'] = 'Renderer to use for main (xhtml) wiki output'; $lang['renderer__core'] = '%s (dokuwiki core)'; $lang['renderer__plugin'] = '%s (plugin)'; +/* Network Options */ +$lang['dnslookups'] = 'DokuWiki will lookup hostnames for remote IP addresses of users editing pages. If you have a slow or non working DNS server or don\'t want this feature, disable this option'; + /* Proxy Options */ $lang['proxy____host'] = 'Proxy servername'; $lang['proxy____port'] = 'Proxy port'; |