aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2013-02-03 14:51:39 +0100
committerAndreas Fischer <bantu@phpbb.com>2013-02-03 14:51:39 +0100
commit996f1abee3640848dbcb00062646b681fe5e58af (patch)
tree9a2cbf3542fceb1f2f077fcccc8b62f801bfb6dd /phpBB
parenta0b141b6730a8b32e9fb4fe721360e78fb99ae68 (diff)
parentcf3edb2c6e7f18e143e6627a8f9a5848df74f6ec (diff)
downloadforums-996f1abee3640848dbcb00062646b681fe5e58af.tar
forums-996f1abee3640848dbcb00062646b681fe5e58af.tar.gz
forums-996f1abee3640848dbcb00062646b681fe5e58af.tar.bz2
forums-996f1abee3640848dbcb00062646b681fe5e58af.tar.xz
forums-996f1abee3640848dbcb00062646b681fe5e58af.zip
Merge remote-tracking branch 'Crizz0/ticket/11220' into develop-olympus
* Crizz0/ticket/11220: [ticket/11220] Improvement to the info pop-up from "list="
Diffstat (limited to 'phpBB')
-rw-r--r--phpBB/language/en/posting.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/language/en/posting.php b/phpBB/language/en/posting.php
index 24f3204c57..dfc5065a05 100644
--- a/phpBB/language/en/posting.php
+++ b/phpBB/language/en/posting.php
@@ -54,9 +54,9 @@ $lang = array_merge($lang, array(
'BBCODE_IS_OFF' => '%sBBCode%s is <em>OFF</em>',
'BBCODE_IS_ON' => '%sBBCode%s is <em>ON</em>',
'BBCODE_I_HELP' => 'Italic text: [i]text[/i]',
- 'BBCODE_L_HELP' => 'List: [list]text[/list]',
- 'BBCODE_LISTITEM_HELP' => 'List item: [*]text[/*]',
- 'BBCODE_O_HELP' => 'Ordered list: [list=]text[/list]',
+ 'BBCODE_L_HELP' => 'List: [list][*]text[/list]',
+ 'BBCODE_LISTITEM_HELP' => 'List item: [*]text',
+ 'BBCODE_O_HELP' => 'Ordered list: e.g. [list=1][*]First point[/list] or [list=a][*]Point a[/list]',
'BBCODE_P_HELP' => 'Insert image: [img]http://image_url[/img]',
'BBCODE_Q_HELP' => 'Quote text: [quote]text[/quote]',
'BBCODE_S_HELP' => 'Font colour: [color=red]text[/color] Tip: you can also use color=#FF0000',