diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2011-07-30 19:33:41 -0400 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2011-07-30 19:33:41 -0400 |
| commit | edb745e9516b236c370b9d1213598dfac69860c4 (patch) | |
| tree | b8a5541a5d864ca119aa8105cda07dfc081a2d89 /phpBB/language | |
| parent | 5653be8e1604022d0e912162686ede5c8d5c68d1 (diff) | |
| parent | 9c6339fb57d44caf86af43624d3308f6413b2c7d (diff) | |
| download | forums-edb745e9516b236c370b9d1213598dfac69860c4.tar forums-edb745e9516b236c370b9d1213598dfac69860c4.tar.gz forums-edb745e9516b236c370b9d1213598dfac69860c4.tar.bz2 forums-edb745e9516b236c370b9d1213598dfac69860c4.tar.xz forums-edb745e9516b236c370b9d1213598dfac69860c4.zip | |
Merge remote-tracking branch 'callumacrae/ticket/8173' into develop-olympus
* callumacrae/ticket/8173:
[ticket/8173] Removed some redundant code in the BBCode JavaScript.
Conflicts:
phpBB/adm/style/acp_users_signature.html
Diffstat (limited to 'phpBB/language')
| -rw-r--r-- | phpBB/language/en/posting.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/language/en/posting.php b/phpBB/language/en/posting.php index 8016a233fd..f8d265dddd 100644 --- a/phpBB/language/en/posting.php +++ b/phpBB/language/en/posting.php @@ -48,7 +48,7 @@ $lang = array_merge($lang, array( 'BBCODE_A_HELP' => 'Inline uploaded attachment: [attachment=]filename.ext[/attachment]', 'BBCODE_B_HELP' => 'Bold text: [b]text[/b]', 'BBCODE_C_HELP' => 'Code display: [code]code[/code]', - 'BBCODE_E_HELP' => 'List: Add list element', + 'BBCODE_D_HELP' => 'Flash: [flash=width,height]http://url[/flash]', 'BBCODE_F_HELP' => 'Font size: [size=85]small text[/size]', 'BBCODE_IS_OFF' => '%sBBCode%s is <em>OFF</em>', 'BBCODE_IS_ON' => '%sBBCode%s is <em>ON</em>', @@ -61,7 +61,7 @@ $lang = array_merge($lang, array( 'BBCODE_S_HELP' => 'Font colour: [color=red]text[/color] Tip: you can also use color=#FF0000', 'BBCODE_U_HELP' => 'Underline text: [u]text[/u]', 'BBCODE_W_HELP' => 'Insert URL: [url]http://url[/url] or [url=http://url]URL text[/url]', - 'BBCODE_D_HELP' => 'Flash: [flash=width,height]http://url[/flash]', + 'BBCODE_Y_HELP' => 'List: Add list element', 'BUMP_ERROR' => 'You cannot bump this topic so soon after the last post.', 'CANNOT_DELETE_REPLIED' => 'Sorry but you may only delete posts which have not been replied to.', |