diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2012-06-19 19:51:39 -0400 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2012-06-19 19:51:39 -0400 |
| commit | 820ad818dda3a559b762123e1035cef505fc42c8 (patch) | |
| tree | 5c811d21b62ef31c23525c1f7e64f7dccdf5e065 /phpBB/language | |
| parent | 419d6cd0359ba07bd4b254a98282735a398faa7a (diff) | |
| parent | 96cb75dedb73dc0e36b842492f6a176db9147023 (diff) | |
| download | forums-820ad818dda3a559b762123e1035cef505fc42c8.tar forums-820ad818dda3a559b762123e1035cef505fc42c8.tar.gz forums-820ad818dda3a559b762123e1035cef505fc42c8.tar.bz2 forums-820ad818dda3a559b762123e1035cef505fc42c8.tar.xz forums-820ad818dda3a559b762123e1035cef505fc42c8.zip | |
Merge PR #844 branch 'dhruvgoel92/ticket/10936' into develop
* dhruvgoel92/ticket/10936:
[ticket/10936] remove PCRE and mbstring support check
[ticket/10936] fix language key
Diffstat (limited to 'phpBB/language')
| -rw-r--r-- | phpBB/language/en/acp/search.php | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/phpBB/language/en/acp/search.php b/phpBB/language/en/acp/search.php index 3dc89570bf..2f46856557 100644 --- a/phpBB/language/en/acp/search.php +++ b/phpBB/language/en/acp/search.php @@ -51,13 +51,9 @@ $lang = array_merge($lang, array( 'DELETING_INDEX_IN_PROGRESS' => 'Deleting the index in progress', 'DELETING_INDEX_IN_PROGRESS_EXPLAIN' => 'The search backend is currently cleaning its index. This can take a few minutes.', - 'FULLTEXT_MYSQL_INCOMPATIBLE_VERSION' => 'The MySQL fulltext backend can only be used with MySQL4 and above.', + 'FULLTEXT_MYSQL_INCOMPATIBLE_DATABASE' => 'The MySQL fulltext backend can only be used with MySQL4 and above.', 'FULLTEXT_MYSQL_NOT_MYISAM' => 'MySQL fulltext indexes can only be used with MyISAM tables.', 'FULLTEXT_MYSQL_TOTAL_POSTS' => 'Total number of indexed posts', - 'FULLTEXT_MYSQL_MBSTRING' => 'Support for non-latin UTF-8 characters using mbstring:', - 'FULLTEXT_MYSQL_PCRE' => 'Support for non-latin UTF-8 characters using PCRE:', - 'FULLTEXT_MYSQL_MBSTRING_EXPLAIN' => 'If PCRE does not have unicode character properties, the search backend will try to use mbstring’s regular expression engine.', - 'FULLTEXT_MYSQL_PCRE_EXPLAIN' => 'This search backend requires PCRE unicode character properties, only available in PHP 4.4, 5.1 and above, if you want to search for non-latin characters.', 'FULLTEXT_MYSQL_MIN_SEARCH_CHARS_EXPLAIN' => 'Words with at least this many characters will be indexed for searching. You or your host can only change this setting by changing the mysql configuration.', 'FULLTEXT_MYSQL_MAX_SEARCH_CHARS_EXPLAIN' => 'Words with no more than this many characters will be indexed for searching. You or your host can only change this setting by changing the mysql configuration.', |