diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2011-11-29 20:09:38 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2011-11-29 20:09:38 +0100 |
| commit | 050fb83dfe8d952163193828553599807c7c3e6e (patch) | |
| tree | 1e3932277868a647885a0cce574474bdfc0854c6 /phpBB | |
| parent | 895501743d10cff338160091b1d2b4bc5d301313 (diff) | |
| parent | e596d2ca7e20e9f9663e99cf2b7943bf88009fe0 (diff) | |
| download | forums-050fb83dfe8d952163193828553599807c7c3e6e.tar forums-050fb83dfe8d952163193828553599807c7c3e6e.tar.gz forums-050fb83dfe8d952163193828553599807c7c3e6e.tar.bz2 forums-050fb83dfe8d952163193828553599807c7c3e6e.tar.xz forums-050fb83dfe8d952163193828553599807c7c3e6e.zip | |
Merge branch 'prep-release-3.0.10' into develop-olympus
* prep-release-3.0.10:
[ticket/10501] Fix description of table prefixes
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/language/en/install.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php index c4b100187f..f69ca40613 100644 --- a/phpBB/language/en/install.php +++ b/phpBB/language/en/install.php @@ -232,7 +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_INVALID_PREFIX'=> 'The prefix you entered is invalid. It must start with a letter and must only contain letters, 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,7 +353,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_EXPLAIN' => 'The prefix must start with a letter and must only contain letters, 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', |