diff options
| author | Nils Adermann <naderman@naderman.de> | 2011-11-18 19:14:06 +0100 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2011-11-18 19:14:06 +0100 |
| commit | addf81f62e69e23b4f31fc48997ac38683b88ebf (patch) | |
| tree | 4078d3786e8c84f253aa80a73214c2d5ad2de00a /phpBB/language/en/install.php | |
| parent | 5068c0588733f80a8433aea1cd6f763819caa9f7 (diff) | |
| parent | 03918f7fd2fd790d5ebd4330f9f913bfcc206f91 (diff) | |
| download | forums-addf81f62e69e23b4f31fc48997ac38683b88ebf.tar forums-addf81f62e69e23b4f31fc48997ac38683b88ebf.tar.gz forums-addf81f62e69e23b4f31fc48997ac38683b88ebf.tar.bz2 forums-addf81f62e69e23b4f31fc48997ac38683b88ebf.tar.xz forums-addf81f62e69e23b4f31fc48997ac38683b88ebf.zip | |
Merge branch 'develop' into feature/extension-manager
* develop: (93 commits)
[ticket/10157] Add notification to update cpfs when installing a language.
[ticket/10185] Always set board startdate on conversion
[ticket/10419] Reword the language strings
[ticket/9361] View correct error messages when editing account information
[ticket/10457] Undefined variable $request, when print-viewing PMs
[ticket/10452] Fix xHTML errors when print-viewing PMs
[ticket/9066] Move regex into get_preg_expression function and add tests
[ticket/10254] Add "phpBB Group" to "Modified by" in prosilver stylesheet.css
[ticket/10254] Removing the subsilver2 NOTE, incompatible with phpBB.com.
[ticket/10254] Removing the NOTE as it is incompatible with phpBB.com.
[ticket/10254] Remove subsilver2 as default style on theme.
[ticket/10254] Remove style names from themes and fix some informations on it.
[ticket/7138] Allow simple header and footer for trigger_error() messages
[ticket/9066] Disallow some database prefix to prevent same errors and problems
[ticket/10365] Fix up S_POST_UNAPPROVED check, make it easier to read
[ticket/10437] Do not display announcements that are waiting for approval
[ticket/10087] Organize bans in acp_baninto optgroups
[ticket/8616] Include old U_INBOX var for BC
[ticket/10435] Remove global announcement from forums total topic count
[ticket/10435] Readd local announcements to total topic count in viewforum
...
Conflicts:
phpBB/install/database_update.php
Diffstat (limited to 'phpBB/language/en/install.php')
| -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', |