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 https://github.com/phpbb/phpbb3 into ticket/10631

Browse Source 
Conflicts:
	phpBB/common.php
	phpBB/download/file.php
This commit is contained in:
Unknown Bliss
2012-09-01 21:15:39 +01:00
parent 0c35ee2769 43190ebeca
commit 79da1ea592
47 changed files with 1172 additions and 288 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -269,7 +269,7 @@ $lang = array_merge($lang, array(
'MESSAGE_COLOURS' => 'Message colours',
'MESSAGE_DELETED' => 'Message successfully deleted.',
'MESSAGE_HISTORY' => 'Message history',
'MESSAGE_REMOVED_FROM_OUTBOX' => 'This message has been removed by its author before it was delivered.',
'MESSAGE_REMOVED_FROM_OUTBOX' => 'This message was deleted by its author.',
'MESSAGE_SENT_ON' => 'on',
'MESSAGE_STORED' => 'This message has been sent successfully.',
'MESSAGE_TO' => 'To',