mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-01 14:30:32 +02:00
Code Issues Releases Wiki Activity

Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/avatars

Browse Source 
Conflicts:
	phpBB/config/services.yml
This commit is contained in:
Marc Alexander
2013-02-07 00:07:59 +01:00
parent 11aff559d4 effaef6bdd
commit c56db535b4
79 changed files with 4450 additions and 411 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
phpBB/language/en/common.php
View File

@@ -119,6 +119,17 @@ $lang = array_merge($lang, array(
1 => 'Users browsing this forum: %2$s and %1$d guest',
2 => 'Users browsing this forum: %2$s and %1$d guests',
),
'BUTTON_EDIT' => 'Edit',
'BUTTON_FORUM_LOCKED' => 'Locked',
'BUTTON_NEW_TOPIC' => 'New Topic',
'BUTTON_PM' => 'PM',
'BUTTON_PM_FORWARD' => 'Forward',
'BUTTON_PM_NEW' => 'New PM',
'BUTTON_PM_REPLY' => 'Send Reply',
'BUTTON_PM_REPLY_ALL' => 'Reply All',
'BUTTON_POST_REPLY' => 'Post Reply',
'BUTTON_QUOTE' => 'Quote',
'BUTTON_TOPIC_LOCKED' => 'Locked',
'BYTES' => 'Bytes',
'CANCEL' => 'Cancel',

6
phpBB/language/en/posting.php
View File

@@ -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',