aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
diff options
context:
space:
mode:
authorTristan Darricau <tristan.darricau@sensiolabs.com>2015-05-04 10:57:17 +0200
committerTristan Darricau <tristan.darricau@sensiolabs.com>2015-05-04 10:57:17 +0200
commit98546a738bcdef318c0b1850ae7d04abc2927786 (patch)
tree6a3d3cf1a558989419148acb598366c9197bcde1 /phpBB
parentda68cfb7758d5b4faeac7b725d011700f398cc10 (diff)
parent0e7448e2b339ef1855428a00808afb0c55c996c5 (diff)
downloadforums-98546a738bcdef318c0b1850ae7d04abc2927786.tar
forums-98546a738bcdef318c0b1850ae7d04abc2927786.tar.gz
forums-98546a738bcdef318c0b1850ae7d04abc2927786.tar.bz2
forums-98546a738bcdef318c0b1850ae7d04abc2927786.tar.xz
forums-98546a738bcdef318c0b1850ae7d04abc2927786.zip
Merge branch '3.1.x'
Diffstat (limited to 'phpBB')
-rw-r--r--phpBB/language/en/migrator.php7
1 files changed, 7 insertions, 0 deletions
diff --git a/phpBB/language/en/migrator.php b/phpBB/language/en/migrator.php
index f5a56816c2..244a5faadf 100644
--- a/phpBB/language/en/migrator.php
+++ b/phpBB/language/en/migrator.php
@@ -52,6 +52,13 @@ $lang = array_merge($lang, array(
'MIGRATION_SCHEMA_DONE' => 'Installed Schema: %1$s; Time: %2$.2f seconds',
'MIGRATION_SCHEMA_RUNNING' => 'Installing Schema: %s.',
+ 'MIGRATION_INVALID_DATA_MISSING_CONDITION' => 'A migration is invalid. An if statement helper is missing a condition.',
+ 'MIGRATION_INVALID_DATA_MISSING_STEP' => 'A migration is invalid. An if statement helper is missing a valid call to a migration step.',
+ 'MIGRATION_INVALID_DATA_CUSTOM_NOT_CALLABLE' => 'A migration is invalid. A custom callable function could not be called.',
+ 'MIGRATION_INVALID_DATA_UNKNOWN_TYPE' => 'A migration is invalid. An unknown migration tool type was encountered.',
+ 'MIGRATION_INVALID_DATA_UNDEFINED_TOOL' => 'A migration is invalid. An undefined migration tool was encountered.',
+ 'MIGRATION_INVALID_DATA_UNDEFINED_METHOD' => 'A migration is invalid. An undefined migration tool method was encountered.',
+
'MODULE_ERROR' => 'An error occurred while creating a module: %s',
'MODULE_INFO_FILE_NOT_EXIST' => 'A required module info file is missing: %2$s',
'MODULE_NOT_EXIST' => 'A required module does not exist: %s',