diff options
| author |   Nathaniel Guse <nathaniel.guse@gmail.com> | 2013-03-03 20:25:31 -0600 |
|---|---|---|
| committer | Nathaniel Guse <nathaniel.guse@gmail.com> | 2013-03-04 14:06:52 -0600 |
| commit | 2aadc5a22c4ad58cab73bb8b56ca0109a95fab0f (patch) | |
| tree | 89b5316ec07c5feb47ede6bf9ccfeb30b31f7f55 /phpBB/language/en/migrator.php | |
| parent | Merge remote-tracking branch 'remotes/upstream/develop-olympus' into develop (diff) | |
| download | phpbb-2aadc5a22c4ad58cab73bb8b56ca0109a95fab0f.tar.gz phpbb-2aadc5a22c4ad58cab73bb8b56ca0109a95fab0f.tar.bz2 phpbb-2aadc5a22c4ad58cab73bb8b56ca0109a95fab0f.zip | |
[ticket/11394] Relax Migration Tools
Do not throw as many exceptions in the migration tools (when something
unexpected occurs but can be safely ignored).
PHPBB3-11394
Diffstat (limited to 'phpBB/language/en/migrator.php')
| -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 84074c391c..59e6f06884 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.', @@ -43,13 +42,10 @@ $lang = array_merge($lang, array( '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".', - '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.', |