aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language
diff options
context:
space:
mode:
authorDavid King <imkingdavid@gmail.com>2013-02-26 14:20:12 -0500
committerDavid King <imkingdavid@gmail.com>2013-02-26 14:20:12 -0500
commit82b20cc2579f8109e2d3370866699c21a1b658bf (patch)
treee4bc81e705718a69ea634180ba37a1ef5bd92c85 /phpBB/language
parent9b38c4579e80a9013b6ecad71fce38e930b67838 (diff)
parente632049e197131df9fbe8c078007cf37cf94c241 (diff)
downloadforums-82b20cc2579f8109e2d3370866699c21a1b658bf.tar
forums-82b20cc2579f8109e2d3370866699c21a1b658bf.tar.gz
forums-82b20cc2579f8109e2d3370866699c21a1b658bf.tar.bz2
forums-82b20cc2579f8109e2d3370866699c21a1b658bf.tar.xz
forums-82b20cc2579f8109e2d3370866699c21a1b658bf.zip
Merge remote-tracking branch 'EXreaction/feature/migrations-data' into develop
# By Nathan Guse (14) and Nathaniel Guse (4) # Via Nathaniel Guse * EXreaction/feature/migrations-data: [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.php3
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',