aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language/en/install.php
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2011-11-29 20:09:51 +0100
committerAndreas Fischer <bantu@phpbb.com>2011-11-29 20:09:51 +0100
commitaf867de77c1e478a5294daabf6f482e19fa1a799 (patch)
tree6a0a3fd71ee764529f55dd6f35661d247bccf22a /phpBB/language/en/install.php
parent705730bfa718bf075bc158cf6aeb2f06e1f26818 (diff)
parent050fb83dfe8d952163193828553599807c7c3e6e (diff)
downloadforums-af867de77c1e478a5294daabf6f482e19fa1a799.tar
forums-af867de77c1e478a5294daabf6f482e19fa1a799.tar.gz
forums-af867de77c1e478a5294daabf6f482e19fa1a799.tar.bz2
forums-af867de77c1e478a5294daabf6f482e19fa1a799.tar.xz
forums-af867de77c1e478a5294daabf6f482e19fa1a799.zip
Merge branch 'develop-olympus' into develop
* develop-olympus: [ticket/10501] Fix description of table prefixes
Diffstat (limited to 'phpBB/language/en/install.php')
-rw-r--r--phpBB/language/en/install.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php
index c85fd49204..57a5de07eb 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.',
@@ -354,7 +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_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',