diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-05-11 10:48:10 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-05-11 10:48:10 +0200 |
| commit | 6cd7abe2557336a88db0220603c83743f1291642 (patch) | |
| tree | 7c9e18e9ab43653e166739b9392c2f8234ade889 /phpBB/language/en | |
| parent | 9aee2ed03995aca1d0348681bcb68d0042801d3a (diff) | |
| parent | e233f0af3615070a003a49bf055ae9fa582cc899 (diff) | |
| download | forums-6cd7abe2557336a88db0220603c83743f1291642.tar forums-6cd7abe2557336a88db0220603c83743f1291642.tar.gz forums-6cd7abe2557336a88db0220603c83743f1291642.tar.bz2 forums-6cd7abe2557336a88db0220603c83743f1291642.tar.xz forums-6cd7abe2557336a88db0220603c83743f1291642.zip | |
Merge pull request #2420 from prototech/ticket/9388
[ticket/9388] Only display the settings for the selected method in the auth and search ACP pages.
* prototech/ticket/9388:
[ticket/9388] Use "togglable" instead of "toggable"
[ticket/9388] Do not nest the <fieldset> tags in the OAuth settings.
[ticket/9388] Reopen <fieldset> after auth templates.
[ticket/9388] Fix unit tests.
[ticket/9388] Use the new toggle function for the avatar type <select>.
[ticket/9388] Display only the settings for the selected search backend.
[ticket/9388] Display only the settings for the auth method that's selected.
[ticket/9388] Add support for making <select> options able to toggle settings.
Diffstat (limited to 'phpBB/language/en')
| -rw-r--r-- | phpBB/language/en/acp/board.php | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php index 505709d513..b796206261 100644 --- a/phpBB/language/en/acp/board.php +++ b/phpBB/language/en/acp/board.php @@ -406,6 +406,7 @@ $lang = array_merge($lang, array( 'APACHE_SETUP_BEFORE_USE' => 'You have to setup apache authentication before you switch phpBB to this authentication method. Keep in mind that the username you use for apache authentication has to be the same as your phpBB username. Apache authentication can only be used with mod_php (not with a CGI version) and safe_mode disabled.', + 'LDAP' => 'LDAP', 'LDAP_DN' => 'LDAP base <var>dn</var>', 'LDAP_DN_EXPLAIN' => 'This is the Distinguished Name, locating the user information, e.g. <samp>o=My Company,c=US</samp>.', 'LDAP_EMAIL' => 'LDAP email attribute', |