diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2014-10-24 13:22:39 -0700 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2014-10-24 13:22:39 -0700 |
| commit | 14300a147587755ecf07fae038a3767039fd8504 (patch) | |
| tree | 11caf0b3786e05c277db2c719becc9dbf8455a4f /phpBB/language | |
| parent | 08f365236acb48f9017b6e978a9b9c50ab5ed960 (diff) | |
| parent | fdece6cdf3cb375da1ee4ab488d2ec8d854845db (diff) | |
| download | forums-14300a147587755ecf07fae038a3767039fd8504.tar forums-14300a147587755ecf07fae038a3767039fd8504.tar.gz forums-14300a147587755ecf07fae038a3767039fd8504.tar.bz2 forums-14300a147587755ecf07fae038a3767039fd8504.tar.xz forums-14300a147587755ecf07fae038a3767039fd8504.zip | |
Merge remote-tracking branch 'Nicofuma/ticket/13126' into ticket/13211
Diffstat (limited to 'phpBB/language')
| -rw-r--r-- | phpBB/language/en/migrator.php | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/phpBB/language/en/migrator.php b/phpBB/language/en/migrator.php index 7199d21d96..f5a56816c2 100644 --- a/phpBB/language/en/migrator.php +++ b/phpBB/language/en/migrator.php @@ -41,12 +41,16 @@ $lang = array_merge($lang, array( 'GROUP_NOT_EXIST' => 'The group "%s" unexpectedly does not exist.', + 'MIGRATION_APPLY_DEPENDENCIES' => 'Apply dependencies of %s.', 'MIGRATION_DATA_DONE' => 'Installed Data: %1$s; Time: %2$.2f seconds', 'MIGRATION_DATA_IN_PROGRESS' => 'Installing Data: %1$s; Time: %2$.2f seconds', + 'MIGRATION_DATA_RUNNING' => 'Installing Data: %s.', 'MIGRATION_EFFECTIVELY_INSTALLED' => 'Migration already effectively installed (skipped): %s', 'MIGRATION_EXCEPTION_ERROR' => 'Something went wrong during the request and an exception was thrown. The changes made before the error occurred were reversed to the best of our abilities, but you should check the board for errors.', 'MIGRATION_NOT_FULFILLABLE' => 'The migration "%1$s" is not fulfillable, missing migration "%2$s".', + 'MIGRATION_NOT_VALID' => '%s is not a valid migration.', 'MIGRATION_SCHEMA_DONE' => 'Installed Schema: %1$s; Time: %2$.2f seconds', + 'MIGRATION_SCHEMA_RUNNING' => 'Installing Schema: %s.', 'MODULE_ERROR' => 'An error occurred while creating a module: %s', 'MODULE_INFO_FILE_NOT_EXIST' => 'A required module info file is missing: %2$s', |