diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2016-02-29 21:45:16 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2016-02-29 21:45:16 +0100 |
| commit | b324cf1907e2f35ed9689162eb03ceba2358f358 (patch) | |
| tree | 605f73bdbf7b804be24b772dab801aa25d3a4271 /phpBB/language/en/install.php | |
| parent | 72bdbf52ccd0e504e69947e157d4d24d327d34a8 (diff) | |
| parent | b80cb8e796a107a49b77b0efe9d43ee7ef550655 (diff) | |
| download | forums-b324cf1907e2f35ed9689162eb03ceba2358f358.tar forums-b324cf1907e2f35ed9689162eb03ceba2358f358.tar.gz forums-b324cf1907e2f35ed9689162eb03ceba2358f358.tar.bz2 forums-b324cf1907e2f35ed9689162eb03ceba2358f358.tar.xz forums-b324cf1907e2f35ed9689162eb03ceba2358f358.zip | |
Merge branch '3.2.x'
Diffstat (limited to 'phpBB/language/en/install.php')
| -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 f21023a4e4..39d53ece7b 100644 --- a/phpBB/language/en/install.php +++ b/phpBB/language/en/install.php @@ -121,8 +121,6 @@ $lang = array_merge($lang, array( $lang = array_merge($lang, array( 'INST_ERR_MISSING_DATA' => 'You must fill out all fields in this block.', - 'PHPBB_ALREADY_INSTALLED' => 'phpBB is already installed.', - 'TIMEOUT_DETECTED_TITLE' => 'The installer detected a timeout', 'TIMEOUT_DETECTED_MESSAGE' => 'The installer has detected a timeout, you may try to refresh the page, which may lead to data corruption. We suggest that you either increase your timeout settings or try to use the CLI.', )); @@ -319,12 +317,14 @@ $lang = array_merge($lang, array( // CLI messages $lang = array_merge($lang, array( 'CLI_INSTALL_BOARD' => 'Install phpBB', + 'CLI_UPDATE_BOARD' => 'Update phpBB', 'CLI_INSTALL_SHOW_CONFIG' => 'Show the configuration which will be used', 'CLI_INSTALL_VALIDATE_CONFIG' => 'Validate a configuration file', 'CLI_CONFIG_FILE' => 'Config file to use', 'MISSING_FILE' => 'Unable to access file %1$s', 'MISSING_DATA' => 'Config file is missing data or might contain invalid settings.', 'INVALID_YAML_FILE' => 'Could not parse YAML file %1$s', + 'CONFIGURATION_VALID' => 'The configuration file is valid', )); // Common updater messages |