diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2006-11-26 12:22:56 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2006-11-26 12:22:56 +0000 |
| commit | 52717466fbcc0f25c22c05dbdfaf0aba64a6b5dd (patch) | |
| tree | c807bd2f48b1e37907e9ace5be1d5f980c91fb70 /phpBB/language/en/install.php | |
| parent | 870a3a1d8acc5f3b1632db3210ef499c0a01a4eb (diff) | |
| download | forums-52717466fbcc0f25c22c05dbdfaf0aba64a6b5dd.tar forums-52717466fbcc0f25c22c05dbdfaf0aba64a6b5dd.tar.gz forums-52717466fbcc0f25c22c05dbdfaf0aba64a6b5dd.tar.bz2 forums-52717466fbcc0f25c22c05dbdfaf0aba64a6b5dd.tar.xz forums-52717466fbcc0f25c22c05dbdfaf0aba64a6b5dd.zip | |
some tiny changes
git-svn-id: file:///svn/phpbb/trunk@6656 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/language/en/install.php')
| -rwxr-xr-x | phpBB/language/en/install.php | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php index 36fe45d5c8..7dbf0106e6 100755 --- a/phpBB/language/en/install.php +++ b/phpBB/language/en/install.php @@ -199,9 +199,9 @@ $lang = array_merge($lang, array( 'INST_ERR_FTP_LOGIN' => 'Could not login to FTP server, check your username and password', 'INST_ERR_MISSING_DATA' => 'You must fill out all fields in this block', 'INST_ERR_NO_DB' => 'Cannot load the PHP module for the selected database type', - 'INST_ERR_PASSWORD_MISMATCH' => 'The passwords you entered did not match.', - 'INST_ERR_PASSWORD_TOO_LONG' => 'The password you entered is too long. The maximum length is 30 characters.', - 'INST_ERR_PASSWORD_TOO_SHORT' => 'The password you entered is too short. The minimum length is 6 characters.', + 'INST_ERR_PASSWORD_MISMATCH' => 'The passwords you entered did not match.', + 'INST_ERR_PASSWORD_TOO_LONG' => 'The password you entered is too long. The maximum length is 30 characters.', + 'INST_ERR_PASSWORD_TOO_SHORT' => 'The password you entered is too short. The minimum length is 6 characters.', 'INST_ERR_PREFIX' => 'Tables with the specified prefix already exist, please choose an alternative.', 'INST_ERR_PREFIX_INVALID' => 'The table prefix you have specified is invalid for your database. Please try another, removing characters such as the hyphen', 'INST_ERR_PREFIX_TOO_LONG' => 'The table prefix you have specified is too long. The maximum length is %d characters.', @@ -255,7 +255,7 @@ $lang = array_merge($lang, array( 'STAGE_ADVANCED_EXPLAIN' => 'The settings on this page are only necessary to set if you know that you require something different from the default. If unsure, just proceed to the next page, this can be altered from the Administration Panel later.', 'STAGE_CONFIG_FILE' => 'Configuration File', 'STAGE_CREATE_TABLE' => 'Create Database Tables', - 'STAGE_CREATE_TABLE_EXPLAIN' => 'The database tables used by phpBB 3.0 have been created and populated with some initial data. Proceed to the next screen to finish installing phpBB.', + 'STAGE_CREATE_TABLE_EXPLAIN' => 'The database tables used by phpBB 3.0 have been created and populated with some initial data. Proceed to the next screen to finish installing phpBB.', 'STAGE_DATABASE' => 'Database Settings', 'STAGE_FINAL' => 'Final Stage', 'STAGE_INTRO' => 'Introduction', @@ -301,8 +301,8 @@ $lang = array_merge($lang, array( 'CHECK_FILES_AGAIN' => 'Check files again', 'CHECK_FILES_EXPLAIN' => 'Within the next step all files will be checked against the update files - this can take a while if this is the first file check.', 'CHECK_FILES_UP_TO_DATE' => 'According to your database your version is up to date. You may want to proceed with the file check to make sure all files are really up to date with the latest phpBB version.', - 'COLLECTED_INFORMATION' => 'Information on collected files', - 'COLLECTED_INFORMATION_EXPLAIN'=> 'The list below shows information about the files needing an update. Please read the information in front of every status block to see what they mean and what you may need to do to perform a successful update.', + 'COLLECTED_INFORMATION' => 'Information on collected files', + 'COLLECTED_INFORMATION_EXPLAIN' => 'The list below shows information about the files needing an update. Please read the information in front of every status block to see what they mean and what you may need to do to perform a successful update.', 'COMPLETE_LOGIN_TO_BOARD' => 'You should now <a href="../ucp.php?mode=login">login to your board</a> and check if everything is working fine. Don’t forget to delete, rename or move your install directory!', 'CURRENT_FILE' => 'Current original file', 'CURRENT_VERSION' => 'Current version', @@ -325,6 +325,7 @@ $lang = array_merge($lang, array( 'ERROR' => 'Error', 'FILE_ALREADY_UP_TO_DATE' => 'File is already up to date', + 'FILE_DIFF_NOT_ALLOWED' => 'File not allowed to be diffed', 'FILE_USED' => 'Information used from', // Single file 'FILES_CONFLICT' => 'Conflict files', 'FILES_CONFLICT_EXPLAIN' => 'The following files are modified and do not represent the original files from the old version. phpBB determined that these files create conflicts if they are tried to be merged. Please investigate the conflicts and try to manually resolve them or continue the update choosing the preferred merging method. If you resolve the conflicts manually check the files again after you modified the them. You are also able to choose between the preferred merge method for every file. The first one will result in a file where the conflicting lines from your old file will be lost, the other one will result in loosing the changes from the newer file.', |