diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2013-05-26 18:24:29 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2013-05-26 18:24:29 +0200 |
| commit | 2b356e766f8d0f3e9dfc2d1fdd6bc857fdb63497 (patch) | |
| tree | b8b1bb07ef8cd5e070099445ef497ab92d321747 /phpBB/language | |
| parent | 4a935608708c28f2996c732517d877bb0cd80738 (diff) | |
| parent | cd1da92d8540d6b4aa0fa1ccf2bcafe68007288a (diff) | |
| download | forums-2b356e766f8d0f3e9dfc2d1fdd6bc857fdb63497.tar forums-2b356e766f8d0f3e9dfc2d1fdd6bc857fdb63497.tar.gz forums-2b356e766f8d0f3e9dfc2d1fdd6bc857fdb63497.tar.bz2 forums-2b356e766f8d0f3e9dfc2d1fdd6bc857fdb63497.tar.xz forums-2b356e766f8d0f3e9dfc2d1fdd6bc857fdb63497.zip | |
Merge remote-tracking branch 'marc1706/ticket/11538' into develop-olympus
* marc1706/ticket/11538:
[ticket/11538] Add optional switch as argument to hex colour validation
[ticket/11538] Modify test colour values
[ticket/11538] Limit comment in acp_groups to 80 characters per line
[ticket/11538] Move group ID into abstract test class and add more test cases
[ticket/11538] Merge calls to validate_data() in acp_groups
[ticket/11538] Rename phpbb_validate_colour to phpbb_validate_hex_colour
[ticket/11538] Use abstract class for functional test cases for group colour
[ticket/11538] Add function phpbb_validate_colour for validating colours
[ticket/11538] Make sure regex doesn't allow multiple color values
[ticket/11538] Add tests for acp group manage page
[ticket/11538] Simplify colour value check and remove support for '#'
[ticket/11538] Fix incorrect regex and test for duplicate # in color string
[ticket/11538] Use regex for testing color value and improve tests
[ticket/11538] Make sure group color can't exceed maximum of 6 characters
Diffstat (limited to 'phpBB/language')
| -rw-r--r-- | phpBB/language/en/common.php | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index baf398b146..c986e8213d 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -722,6 +722,7 @@ $lang = array_merge($lang, array( 'WHO_IS_ONLINE' => 'Who is online', 'WRONG_PASSWORD' => 'You entered an incorrect password.', + 'WRONG_DATA_COLOUR' => 'The colour value you entered is invalid.', 'WRONG_DATA_ICQ' => 'The number you entered is not a valid ICQ number.', 'WRONG_DATA_JABBER' => 'The name you entered is not a valid Jabber account name.', 'WRONG_DATA_LANG' => 'The language you specified is not valid.', |