aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language
diff options
context:
space:
mode:
authorNils Adermann <naderman@naderman.de>2006-12-10 17:44:45 +0000
committerNils Adermann <naderman@naderman.de>2006-12-10 17:44:45 +0000
commitf40e2aba2261aaf79ee3b5ebe87b71dd6d30d1cb (patch)
tree9b8bf50649470ecd571d06ee5c7f7eeb91a867c7 /phpBB/language
parent7e47135792a2cbf7e25ccdd184b4934b2a9e764d (diff)
downloadforums-f40e2aba2261aaf79ee3b5ebe87b71dd6d30d1cb.tar
forums-f40e2aba2261aaf79ee3b5ebe87b71dd6d30d1cb.tar.gz
forums-f40e2aba2261aaf79ee3b5ebe87b71dd6d30d1cb.tar.bz2
forums-f40e2aba2261aaf79ee3b5ebe87b71dd6d30d1cb.tar.xz
forums-f40e2aba2261aaf79ee3b5ebe87b71dd6d30d1cb.zip
- finally correctly calculate current time for birthday calculation [Bug #6030]
- allow searching forums with unsearchable subforums [Bug #6056] - addition of an optional HTTP_X_FORWARDED_FOR check in sessions, including bans - do not index forums which have indexing disabled on index recreation [Bug #6060] - properly handle html entities in the theme editor [Bug #6048] - anonymous access is no longer required for the LDAP auth plugin [Bug #6046] - corrected mcp_front queue link to point to approve_details [Bug #6134] - added direct (dis)approval to mcp_front queue items [Bug #6134] - proper mysql version test for fulltext-compatibility [Bug #6054] - added note to style/language "used by" column so it's clear that bots are included - correctly update bot last visit time [Bug #6108] git-svn-id: file:///svn/phpbb/trunk@6740 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/language')
-rw-r--r--phpBB/language/en/acp/board.php25
-rw-r--r--phpBB/language/en/acp/common.php2
-rw-r--r--phpBB/language/en/acp/language.php2
-rw-r--r--phpBB/language/en/acp/styles.php2
4 files changed, 18 insertions, 13 deletions
diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
index e34c65bf90..cfce514ebf 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -281,16 +281,21 @@ $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.',
- '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',
- 'LDAP_EMAIL_EXPLAIN' => 'Set this to the name of your user entry email attribute (if one exists) in order to automatically set the email address for new users. Leaving this empty results in empty email address for users who log in for the first time.',
- 'LDAP_NO_EMAIL' => 'The specified email attribute does not exist.',
- 'LDAP_NO_IDENTITY' => 'Could not find a login identity for %s',
- 'LDAP_SERVER' => 'LDAP server name',
- 'LDAP_SERVER_EXPLAIN' => 'If using LDAP this is the name or IP address of the server.',
- 'LDAP_UID' => 'LDAP <var>uid</var>',
- 'LDAP_UID_EXPLAIN' => 'This is the key under which to search for a given login identity, e.g. <var>uid</var>, <var>sn</var>, etc.',
+ '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',
+ 'LDAP_EMAIL_EXPLAIN' => 'Set this to the name of your user entry email attribute (if one exists) in order to automatically set the email address for new users. Leaving this empty results in empty email address for users who log in for the first time.',
+ 'LDAP_INCORRECT_USER_PASSWORD' => 'Binding to LDAP server failed with specified user/password.',
+ 'LDAP_NO_EMAIL' => 'The specified email attribute does not exist.',
+ 'LDAP_NO_IDENTITY' => 'Could not find a login identity for %s',
+ 'LDAP_PASSWORD' => 'LDAP password',
+ 'LDAP_PASSWORD_EXPLAIN' => 'Leave blank to use anonymous access. Else fill in the password for the above user. <strong>WARNING:</strong> This password will be stored as plain text in the database visible to everybody who can access your database.',
+ 'LDAP_SERVER' => 'LDAP server name',
+ 'LDAP_SERVER_EXPLAIN' => 'If using LDAP this is the name or IP address of the server.',
+ 'LDAP_UID' => 'LDAP <var>uid</var>',
+ 'LDAP_UID_EXPLAIN' => 'This is the key under which to search for a given login identity, e.g. <var>uid</var>, <var>sn</var>, etc.',
+ 'LDAP_USER' => 'LDAP user',
+ 'LDAP_USER_EXPLAIN' => 'Leave blank to use anonymous access. If filled in phpBB will connect to the LDAP server as the specified user.',
));
// Server Settings
diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php
index 096efc9c52..7253334bd3 100644
--- a/phpBB/language/en/acp/common.php
+++ b/phpBB/language/en/acp/common.php
@@ -510,7 +510,7 @@ $lang = array_merge($lang, array(
'LOG_INSTALL_CONVERTED' => '<strong>Converted from %1$s to phpBB %2$s</strong>',
'LOG_INSTALL_INSTALLED' => '<strong>Installed phpBB %s</strong>',
- 'LOG_IP_BROWSER_CHECK' => '<strong>Session IP/browser check failed</strong><br />»User IP "<em>%1$s</em>" checked against session IP "<em>%2$s</em>" and user browser string "<em>%3$s</em>" checked against session browser string "<em>%4$s</em>".',
+ 'LOG_IP_BROWSER_FORWARDED_CHECK' => '<strong>Session IP/browser/X_FORWARDED_FOR check failed</strong><br />»User IP "<em>%1$s</em>" checked against session IP "<em>%2$s</em>", user browser string "<em>%3$s</em>" checked against session browser string "<em>%4$s</em>" and user X_FORWARDED_FOR string "<em>%5$s</em>" checked against session X_FORWARDED_FOR string "<em>%6$s</em>".',
'LOG_JAB_CHANGED' => '<strong>Jabber account changed</strong>',
'LOG_JAB_PASSCHG' => '<strong>Jabber password changed</strong>',
diff --git a/phpBB/language/en/acp/language.php b/phpBB/language/en/acp/language.php
index acfc45e916..1707fbaa3c 100644
--- a/phpBB/language/en/acp/language.php
+++ b/phpBB/language/en/acp/language.php
@@ -58,7 +58,7 @@ $lang = array_merge($lang, array(
'LANGUAGE_PACK_LOCALNAME' => 'Local name',
'LANGUAGE_PACK_NAME' => 'Name',
'LANGUAGE_PACK_NOT_EXIST' => 'The selected language pack does not exist.',
- 'LANGUAGE_PACK_USED_BY' => 'Used by',
+ 'LANGUAGE_PACK_USED_BY' => 'Used by (including robots)',
'LANGUAGE_VARIABLE' => 'Language Variable',
'LANG_AUTHOR' => 'Language Pack Author',
'LANG_ENGLISH_NAME' => 'English name',
diff --git a/phpBB/language/en/acp/styles.php b/phpBB/language/en/acp/styles.php
index 27ecbdb261..4456325bd3 100644
--- a/phpBB/language/en/acp/styles.php
+++ b/phpBB/language/en/acp/styles.php
@@ -354,7 +354,7 @@ $lang = array_merge($lang, array(
'STYLE_NAME' => 'Style name',
'STYLE_TEMPLATE' => 'Template',
'STYLE_THEME' => 'Theme',
- 'STYLE_USED_BY' => 'Used by',
+ 'STYLE_USED_BY' => 'Used by (including robots)',
'TEMPLATE_ADDED' => 'Template set added and stored on filesystem.',
'TEMPLATE_ADDED_DB' => 'Template set added and stored in database.',
generated by cgit v1.2.1 (git 2.21.0) at 2024-11-11 12:17:40 +0000