diff options
author | Marc Alexander <admin@m-a-styles.de> | 2016-08-31 21:41:17 +0200 |
---|---|---|
committer | Marc Alexander <admin@m-a-styles.de> | 2016-08-31 21:41:17 +0200 |
commit | dff950162cd4d79d5e199e833e46a98d381397dc (patch) | |
tree | 344a365547b8a99a7f57cd8dcba79cc1fc839643 /phpBB/language/en/migrator.php | |
parent | 05e6ed04ed48e321990125059e64e2d1592d69c4 (diff) | |
parent | f008708d5cebfea7ef6efef4c876e99f819bff71 (diff) | |
download | forums-dff950162cd4d79d5e199e833e46a98d381397dc.tar forums-dff950162cd4d79d5e199e833e46a98d381397dc.tar.gz forums-dff950162cd4d79d5e199e833e46a98d381397dc.tar.bz2 forums-dff950162cd4d79d5e199e833e46a98d381397dc.tar.xz forums-dff950162cd4d79d5e199e833e46a98d381397dc.zip |
Merge branch '3.1.x' into 3.2.x
Conflicts:
phpBB/phpbb/db/migration/tool/module.php
Diffstat (limited to 'phpBB/language/en/migrator.php')
-rw-r--r-- | phpBB/language/en/migrator.php | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/phpBB/language/en/migrator.php b/phpBB/language/en/migrator.php index 78364319a1..8a82d40be5 100644 --- a/phpBB/language/en/migrator.php +++ b/phpBB/language/en/migrator.php @@ -69,9 +69,12 @@ $lang = array_merge($lang, array( '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_EXISTS' => 'A module already exists: %s', + 'MODULE_EXIST_MULTIPLE' => 'Several modules with the given parent module langname already exist: %s. Try using before/after keys to clarify the module placement.', 'MODULE_INFO_FILE_NOT_EXIST' => 'A required module info file is missing: %2$s', 'MODULE_NOT_EXIST' => 'A required module does not exist: %s', + 'PARENT_MODULE_FIND_ERROR' => 'Unable to determine the parent module identifier: %s', 'PERMISSION_NOT_EXIST' => 'The permission setting "%s" unexpectedly does not exist.', 'ROLE_NOT_EXIST' => 'The permission role "%s" unexpectedly does not exist.', |