diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2016-06-19 18:25:16 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2016-06-19 18:25:16 +0200 |
| commit | a460aec68cf0927b0b145fd19a62d675369dcda9 (patch) | |
| tree | bca2acad593abb700f4e84f1abffb7490a85b4e6 /phpBB/language/en/install.php | |
| parent | 450e5b36b89dc5570a89a3bc28dcd4cf21b1b783 (diff) | |
| parent | c60dbede3ef3e42528b95b9b9b5337473bafda5c (diff) | |
| download | forums-a460aec68cf0927b0b145fd19a62d675369dcda9.tar forums-a460aec68cf0927b0b145fd19a62d675369dcda9.tar.gz forums-a460aec68cf0927b0b145fd19a62d675369dcda9.tar.bz2 forums-a460aec68cf0927b0b145fd19a62d675369dcda9.tar.xz forums-a460aec68cf0927b0b145fd19a62d675369dcda9.zip | |
Merge branch '3.1.x' into 3.2.x
Conflicts:
phpBB/language/en/install.php
Diffstat (limited to 'phpBB/language/en/install.php')
| -rw-r--r-- | phpBB/language/en/install.php | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php index 88cbaf1533..8303d39d83 100644 --- a/phpBB/language/en/install.php +++ b/phpBB/language/en/install.php @@ -178,6 +178,7 @@ $lang = array_merge($lang, array( 'DB_PASSWORD' => 'Database password', 'DB_NAME' => 'Database name', 'DB_USERNAME' => 'Database username', + 'DATABASE_VERSION' => 'Database version', 'TABLE_PREFIX' => 'Prefix for tables in database', 'TABLE_PREFIX_EXPLAIN' => 'The prefix must start with a letter and must only contain letters, numbers and underscores.', @@ -213,6 +214,14 @@ $lang = array_merge($lang, array( // 'EMAIL_CONFIG' => 'E-mail configuration', + // Package info + 'PACKAGE_VERSION' => 'Package version installed', + 'UPDATE_INCOMPLETE' => 'Your phpBB installation has not been correctly updated.', + 'UPDATE_INCOMPLETE_MORE' => 'Please read the information below in order to fix this error.', + 'UPDATE_INCOMPLETE_EXPLAIN' => '<h1>Incomplete update</h1> + + <p>We noticed that the last update of your phpBB installation hasn’t been completed. Visit the <a href="%1$s" title="%1$s">database_update script</a> and run it. If it is missing, please <a href="https://www.phpbb.com/downloads/" title="phpBB downloads">download your package version</a>, upload the "install" folder to your phpBB root directory (where your config.php file is) and <a href="%1$s" title="%1$s">run the database update script</a>.</p>', + // // Server data // @@ -432,6 +441,7 @@ $lang = array_merge($lang, array( 'FILES_NOT_MODIFIED_EXPLAIN' => 'The following files are not modified and represent the original phpBB files from the version you want to update from.', 'FILES_UP_TO_DATE' => 'Already updated files', 'FILES_UP_TO_DATE_EXPLAIN' => 'The following files are already up to date and do not need to be updated.', + 'FILES_VERSION' => 'Files Version', 'TOGGLE_DISPLAY' => 'View/Hide file list', // File updater |