aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language/en/acp
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2014-05-03 16:39:31 +0200
committerJoas Schilling <nickvergessen@gmx.de>2014-05-03 16:39:31 +0200
commitb60108dc78af581fe5327fce4037731555203320 (patch)
treec0e6807e2a3f106e1ecaf5309d94e02e7716d18d /phpBB/language/en/acp
parent4e529fda036b5aa3611da30277487907b83b55ac (diff)
parenta62b672530f1134af98f27d5318ceeae38b65f05 (diff)
downloadforums-b60108dc78af581fe5327fce4037731555203320.tar
forums-b60108dc78af581fe5327fce4037731555203320.tar.gz
forums-b60108dc78af581fe5327fce4037731555203320.tar.bz2
forums-b60108dc78af581fe5327fce4037731555203320.tar.xz
forums-b60108dc78af581fe5327fce4037731555203320.zip
Merge pull request #2267 from prototech/ticket/10737
[ticket/10737] Add live member search. * prototech/ticket/10737: [ticket/10737] Remove loading indicator. [ticket/10737] Enforce allow_live_searches setting in memberlist.php. [ticket/10737] Add config setting to disable live searches. [ticket/10737] Add loading indicator and alert box code to simple_footer.html. [ticket/10737] Load core.js and ajax.js in simple_footer.html. [ticket/10737] Set the username as the input value instead of redirecting. [ticket/10737] Drop subsilver2 changes. [ticket/10737] Add a more generic live search implementation. [ticket/10737] Clean up memberlist.php. [ticket/10737] Use dropdown for search results container. [ticket/10737] Adding delayed keyup and removing target_blank. [ticket/10737] Using UTF-8 aware alternatives in PHP code. [ticket/10737] Removing obsolete code. [ticket/10737] Avoid hard-coding table row and use case-insensitive search. [ticket/10737] Removing unnecessary/obsolete code. [ticket/10737] Using JQuery events and JSON response. [ticket/10737] Code fixes in AJAX search feature [ticket/10737] Improvements over last commit [ticket/10737] Adding username suggestions in "Find a member" using AJAX
Diffstat (limited to 'phpBB/language/en/acp')
-rw-r--r--phpBB/language/en/acp/board.php2
1 files changed, 2 insertions, 0 deletions
diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
index e21d959e40..505709d513 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -356,6 +356,8 @@ $lang = array_merge($lang, array(
'ALLOW_CDN' => 'Allow usage of third party content delivery networks',
'ALLOW_CDN_EXPLAIN' => 'If this setting is enabled, some files will be served from external third party servers instead of your server. This reduces the network bandwidth required by your server, but may present a privacy issue for some board administrators. In a default phpBB installation, this includes loading “jQuery” and the font “Open Sans” from Google’s content delivery network.',
+ 'ALLOW_LIVE_SEARCHES' => 'Allow live searches',
+ 'ALLOW_LIVE_SEARCHES_EXPLAIN' => 'If this setting is enabled, users are provided with keyword suggestions as they type in certain fields throughout the board.',
'CUSTOM_PROFILE_FIELDS' => 'Custom profile fields',
'LIMIT_LOAD' => 'Limit system load',
'LIMIT_LOAD_EXPLAIN' => 'If the system’s 1-minute load average exceeds this value the board will automatically go offline. A value of 1.0 equals ~100% utilisation of one processor. This only functions on UNIX based servers and where this information is accessible. The value here resets itself to 0 if phpBB was unable to get the load limit.',