diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2013-02-03 14:51:52 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2013-02-03 14:51:52 +0100 |
| commit | 34c564062a95b9306487fbc6bbd17c7c9c8a63c4 (patch) | |
| tree | 7d2c355a3a8d99a21c5ef5e8f31d8413ad332605 /phpBB/language | |
| parent | 01045a6bb06e65108097d4e11f10786d5d13aee8 (diff) | |
| parent | 996f1abee3640848dbcb00062646b681fe5e58af (diff) | |
| download | forums-34c564062a95b9306487fbc6bbd17c7c9c8a63c4.tar forums-34c564062a95b9306487fbc6bbd17c7c9c8a63c4.tar.gz forums-34c564062a95b9306487fbc6bbd17c7c9c8a63c4.tar.bz2 forums-34c564062a95b9306487fbc6bbd17c7c9c8a63c4.tar.xz forums-34c564062a95b9306487fbc6bbd17c7c9c8a63c4.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/11220] Improvement to the info pop-up from "list="
Diffstat (limited to 'phpBB/language')
| -rw-r--r-- | phpBB/language/en/posting.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/language/en/posting.php b/phpBB/language/en/posting.php index 086bd6ffb0..f5478dded5 100644 --- a/phpBB/language/en/posting.php +++ b/phpBB/language/en/posting.php @@ -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', |