aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2014-12-27 13:37:11 +0100
committerJoas Schilling <nickvergessen@gmx.de>2014-12-27 13:37:11 +0100
commit00933ad2879e12a5853371f3b921c7918572bee1 (patch)
tree7805a7bed1c2d8f381a25aceeed98506c9e4f91a /phpBB
parent22948127f88e0163f23ccae529d6f1110083e6ac (diff)
parentaea67c8e37a36a71e98c2de6c69730e246e09e9f (diff)
downloadforums-00933ad2879e12a5853371f3b921c7918572bee1.tar
forums-00933ad2879e12a5853371f3b921c7918572bee1.tar.gz
forums-00933ad2879e12a5853371f3b921c7918572bee1.tar.bz2
forums-00933ad2879e12a5853371f3b921c7918572bee1.tar.xz
forums-00933ad2879e12a5853371f3b921c7918572bee1.zip
Merge branch 'develop-ascraeus' into develop
Diffstat (limited to 'phpBB')
-rw-r--r--phpBB/language/en/acp/search.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/language/en/acp/search.php b/phpBB/language/en/acp/search.php
index 98412cb050..bda965b615 100644
--- a/phpBB/language/en/acp/search.php
+++ b/phpBB/language/en/acp/search.php
@@ -84,7 +84,7 @@ $lang = array_merge($lang, array(
'FULLTEXT_SPHINX_WRONG_DATABASE' => 'The sphinx search for phpBB supports MySQL and PostgreSQL only.',
'FULLTEXT_SPHINX_CONFIG_FILE' => 'Sphinx config file',
'FULLTEXT_SPHINX_CONFIG_FILE_EXPLAIN' => 'The generated content of the sphinx config file. This data needs to be pasted into the sphinx.conf which is used by sphinx search daemon. Replace the [dbuser] and [dbpassword] placeholders with your database credentials.',
- 'FULLTEXT_SPHINX_NO_CONFIG_DATA' => 'The sphinx data and config directory paths are not defined. Please define them to generate the config file.',
+ 'FULLTEXT_SPHINX_NO_CONFIG_DATA' => 'The sphinx data directory path is not defined. Please define the path and submit to generate the config file.',
'GENERAL_SEARCH_SETTINGS' => 'General search settings',
'GO_TO_SEARCH_INDEX' => 'Go to search index page',