mirror of
https://github.com/phpbb/phpbb.git
synced 2025-02-24 12:03:21 +01:00
Merge branch 'develop-olympus' into develop
* develop-olympus: [ticket/11220] Improvement to the info pop-up from "list="
This commit is contained in:
commit
34c564062a
@ -53,9 +53,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',
|
||||
|
Loading…
x
Reference in New Issue
Block a user