diff options
| author | Nathaniel Guse <nathaniel.guse@gmail.com> | 2013-02-25 13:12:57 -0600 |
|---|---|---|
| committer | Nathaniel Guse <nathaniel.guse@gmail.com> | 2013-02-25 13:12:57 -0600 |
| commit | e632049e197131df9fbe8c078007cf37cf94c241 (patch) | |
| tree | f305a7163e264f2ad9eb23c0d224c91b8a848e34 /phpBB/language | |
| parent | 7a8ae493009eac3d4f5c97279f0be6e10c588002 (diff) | |
| parent | f6a894f07700627b675c2b16aab4714df5819a23 (diff) | |
| download | forums-e632049e197131df9fbe8c078007cf37cf94c241.tar forums-e632049e197131df9fbe8c078007cf37cf94c241.tar.gz forums-e632049e197131df9fbe8c078007cf37cf94c241.tar.bz2 forums-e632049e197131df9fbe8c078007cf37cf94c241.tar.xz forums-e632049e197131df9fbe8c078007cf37cf94c241.zip | |
Merge branch 'feature/migrations-data' of github.com:EXreaction/phpbb3 into feature/migrations-data
# By Dhruv (19) and others
# Via Nathaniel Guse (3) and others
* 'feature/migrations-data' of github.com:EXreaction/phpbb3: (38 commits)
[feature/migrations] Use the user class for language handling
[feature/migrations] Fully revert the removal of the user_msnm field
[feature/migrations] Revert unrelated change to schema_data.sql
[ticket/11179] remove extra & in function call
[ticket/11179] correct start parameter in sphinx search
[ticket/11179] correct start parameter in native author search
[ticket/11179] correct start parameter in native keyword search
[ticket/11179] fix success query path for postgres
[ticket/11179] fix success query path for mysql
[ticket/11179] minor fixes
[ticket/11179] pass start param by reference in postgres
[ticket/11179] correct start param in author search of postgres
[ticket/11179] correct start parameter in psql keyword search
[ticket/11179] pass start param by reference in author search
[ticket/11179] correct start parameter for author search
[ticket/11179] use FOUND_ROWS query to re-search with changed start param
[ticket/11179] pass start parameter by reference
[ticket/11179] correct the start parameter while retrieving from cache
[ticket/11179] add search query in case initial one fails
[ticket/11359] html escape sphinx config data
...
Diffstat (limited to 'phpBB/language')
| -rw-r--r-- | phpBB/language/en/migrator.php | 56 |
1 files changed, 56 insertions, 0 deletions
diff --git a/phpBB/language/en/migrator.php b/phpBB/language/en/migrator.php new file mode 100644 index 0000000000..84074c391c --- /dev/null +++ b/phpBB/language/en/migrator.php @@ -0,0 +1,56 @@ +<?php +/** +* +* migrator [English] +* +* @package language +* @copyright (c) 2013 phpBB Group +* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 +* +*/ + +/** +* DO NOT CHANGE +*/ +if (!defined('IN_PHPBB')) +{ + exit; +} + +if (empty($lang) || !is_array($lang)) +{ + $lang = array(); +} + +// DEVELOPERS PLEASE NOTE +// +// All language files should use UTF-8 as their encoding and the files must not contain a BOM. +// +// Placeholders can now contain order information, e.g. instead of +// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows +// translators to re-order the output of data while ensuring it remains correct +// +// You do not need this where single placeholders are used, e.g. 'Message %d' is fine +// equally where a string contains only two placeholders which are used to wrap text +// 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.', + + '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.', +)); |