diff options
author | Joas Schilling <nickvergessen@gmx.de> | 2013-02-27 00:12:51 +0100 |
---|---|---|
committer | Joas Schilling <nickvergessen@gmx.de> | 2013-02-27 00:12:51 +0100 |
commit | f76f36c6693d8c4545d45f1454db102b1b313d07 (patch) | |
tree | f28782ba502d833e5f95491a420dd0f8c31b04a9 /phpBB/language | |
parent | d61eb95b4868377cfc2a7a98b03a7d908418b1af (diff) | |
parent | 80bd78a5e5e1069773c05073cd47662a311bda79 (diff) | |
download | forums-f76f36c6693d8c4545d45f1454db102b1b313d07.tar forums-f76f36c6693d8c4545d45f1454db102b1b313d07.tar.gz forums-f76f36c6693d8c4545d45f1454db102b1b313d07.tar.bz2 forums-f76f36c6693d8c4545d45f1454db102b1b313d07.tar.xz forums-f76f36c6693d8c4545d45f1454db102b1b313d07.zip |
Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/10411-2
* 'develop' of https://github.com/phpbb/phpbb3:
[ticket/11367] Always freeresult
[ticket/11367] Migrator throws error if migrations table does not exist
[feature/migrations] Inject migrator rather than the container.
[feature/migrations] Use the user class for language handling
[feature/migrations] Fully revert the removal of the user_msnm field
[feature/migrations] Revert unrelated change to schema_data.sql
[feature/migrations] Remove user_msnm migration
[feature/migrations] Correct depends_on
[feature/migrations] Subdirectories for migration data
[feature/migrations] Reports table schema changes in recent develop
[feature/migrations] Automatically populate migrations table on install
[feature/migrations] effectively installed check for migration data
[feature/migrations] Comments for the return in the custom functions
[feature/migrations] Order the migrations schema in schema_data.sql
[feature/migrations] Fix migrations installer, schema for schema_data.sql
[feature/migrations] Make depends_on static to call it without dependencies
[feature/migrations] Remove hardcoded language, use lang instead.
[feature/migrations] Revert schema for migration data
[feature/migrations] Replace database_update.php with migrations updater
[feature/migrations] Rebuilding migrations data on develop
Diffstat (limited to 'phpBB/language')
-rw-r--r-- | phpBB/language/en/install.php | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php index f7820714e1..7607512eab 100644 --- a/phpBB/language/en/install.php +++ b/phpBB/language/en/install.php @@ -397,7 +397,10 @@ $lang = array_merge($lang, array( 'CURRENT_VERSION' => 'Current version', 'DATABASE_TYPE' => 'Database type', + 'DATABASE_UPDATE_COMPLETE' => 'Database updater has completed!', + 'DATABASE_UPDATE_CONTINUE' => 'Continue database update.', 'DATABASE_UPDATE_INFO_OLD' => 'The database update file within the install directory is outdated. Please make sure you uploaded the correct version of the file.', + 'DATABASE_UPDATE_NOT_COMPLETED' => 'The database update has not yet completed.', 'DELETE_USER_REMOVE' => 'Delete user and remove posts', 'DELETE_USER_RETAIN' => 'Delete user but keep posts', 'DESTINATION' => 'Destination file', |