diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2011-11-14 15:46:58 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2011-11-14 15:46:58 +0100 |
| commit | 34ed1352a63ece56185410385a81d881beb25731 (patch) | |
| tree | 7e555a2c19dadaf62a87ecc41f3a513628d90caf /phpBB/language/en | |
| parent | b21e343b5e80f2c6404fd94ff2a10c3a31d360e0 (diff) | |
| parent | f31da015fcad1efb792e78462af7eb56e1abcabc (diff) | |
| download | forums-34ed1352a63ece56185410385a81d881beb25731.tar forums-34ed1352a63ece56185410385a81d881beb25731.tar.gz forums-34ed1352a63ece56185410385a81d881beb25731.tar.bz2 forums-34ed1352a63ece56185410385a81d881beb25731.tar.xz forums-34ed1352a63ece56185410385a81d881beb25731.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/9066] Move regex into get_preg_expression function and add tests
[ticket/9066] Disallow some database prefix to prevent same errors and problems
Diffstat (limited to 'phpBB/language/en')
| -rw-r--r-- | phpBB/language/en/install.php | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php index 2b5d1cad6b..98b973cfc7 100644 --- a/phpBB/language/en/install.php +++ b/phpBB/language/en/install.php @@ -232,6 +232,7 @@ $lang = array_merge($lang, array( 'INST_ERR' => 'Installation error', 'INST_ERR_DB_CONNECT' => 'Could not connect to the database, see error message below.', 'INST_ERR_DB_FORUM_PATH' => 'The database file specified is within your board directory tree. You should put this file in a non web-accessible location.', + 'INST_ERR_DB_INVALID_PREFIX'=> 'The prefix you entered is invalid. It must start with an alphanumeric character and must only contain alphanumeric characters, numbers and underscores.', 'INST_ERR_DB_NO_ERROR' => 'No error message given.', 'INST_ERR_DB_NO_MYSQLI' => 'The version of MySQL installed on this machine is incompatible with the “MySQL with MySQLi Extension” option you have selected. Please try the “MySQL” option instead.', 'INST_ERR_DB_NO_SQLITE' => 'The version of the SQLite extension you have installed is too old, it must be upgraded to at least 2.8.2.', @@ -353,6 +354,7 @@ $lang = array_merge($lang, array( 'TABLES_MISSING' => 'Could not find these tables<br />» <strong>%s</strong>.', 'TABLE_PREFIX' => 'Prefix for tables in database', + 'TABLE_PREFIX_EXPLAIN' => 'The prefix must start with an alphanumeric character and must only contain alphanumeric characters, numbers and underscores.', 'TABLE_PREFIX_SAME' => 'The table prefix needs to be the one used by the software you are converting from.<br />» Specified table prefix was %s.', 'TESTS_PASSED' => 'Tests passed', 'TESTS_FAILED' => 'Tests failed', |