mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
Code Issues Releases Wiki Activity

Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103

Browse Source 
Conflicts:
	phpBB/includes/functions.php
This commit is contained in:
Nathan Guse
2012-10-18 18:23:22 -05:00
parent 4b3264d9bb b3fdf8a046
commit 3f27890a5e
8 changed files with 139 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
phpBB/language/en/ucp.php
View File

@@ -268,6 +268,7 @@ $lang = array_merge($lang, array(
'MESSAGE_BY_AUTHOR' => 'by',
'MESSAGE_COLOURS' => 'Message colours',
'MESSAGE_DELETED' => 'Message successfully deleted.',
'MESSAGE_EDITED' => 'Message successfully edited.',
'MESSAGE_HISTORY' => 'Message history',
'MESSAGE_REMOVED_FROM_OUTBOX' => 'This message was deleted by its author.',
'MESSAGE_SENT_ON' => 'on',