diff options
| author | David King <imkingdavid@gmail.com> | 2013-03-04 15:10:48 -0500 |
|---|---|---|
| committer | David King <imkingdavid@gmail.com> | 2013-03-04 15:10:48 -0500 |
| commit | 1a8f72fd659b6c3cc3fd1c59446cd1663a89b110 (patch) | |
| tree | ae2491873f7861df3cba196af5a083f76999dca7 /phpBB/language | |
| parent | e652c078e694082a6cec76cc998bea346e66f02b (diff) | |
| parent | 2aadc5a22c4ad58cab73bb8b56ca0109a95fab0f (diff) | |
| download | forums-1a8f72fd659b6c3cc3fd1c59446cd1663a89b110.tar forums-1a8f72fd659b6c3cc3fd1c59446cd1663a89b110.tar.gz forums-1a8f72fd659b6c3cc3fd1c59446cd1663a89b110.tar.bz2 forums-1a8f72fd659b6c3cc3fd1c59446cd1663a89b110.tar.xz forums-1a8f72fd659b6c3cc3fd1c59446cd1663a89b110.zip | |
Merge remote-tracking branch 'EXreaction/ticket/11394' into develop
# By Nathaniel Guse
# Via Nathaniel Guse
* EXreaction/ticket/11394:
[ticket/11394] Relax Migration Tools
Diffstat (limited to 'phpBB/language')
| -rw-r--r-- | phpBB/language/en/migrator.php | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/phpBB/language/en/migrator.php b/phpBB/language/en/migrator.php index a62da483cf..f94c27be8c 100644 --- a/phpBB/language/en/migrator.php +++ b/phpBB/language/en/migrator.php @@ -35,7 +35,6 @@ if (empty($lang) || !is_array($lang)) // in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine $lang = array_merge($lang, array( - 'CONFIG_ALREADY_EXIST' => 'The config setting "%s" unexpectedly already exists.', 'CONFIG_NOT_EXIST' => 'The config setting "%s" unexpectedly does not exist.', 'GROUP_NOT_EXIST' => 'The group "%s" unexpectedly does not exist.', @@ -46,13 +45,10 @@ $lang = array_merge($lang, array( 'MIGRATION_NOT_FULFILLABLE' => 'The migration "%1$s" is not fulfillable, missing migration "%2$s".', 'MIGRATION_SCHEMA_DONE' => 'Installed Schema: %s', - 'MODULE_ALREADY_EXIST' => 'The module "%s" unexpectedly already exists.', 'MODULE_ERROR' => 'An error occured 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', - 'MODULE_NOT_REMOVABLE' => 'Module %1$s was unable to be removed: %2$s', - 'PERMISSION_ALREADY_EXIST' => 'The permission setting "%s" unexpectedly already exists.', 'PERMISSION_NOT_EXIST' => 'The permission setting "%s" unexpectedly does not exist.', 'ROLE_NOT_EXIST' => 'The permission role "%s" unexpectedly does not exist.', |