Merge branch 'develop-olympus' into develop

* develop-olympus: [ticket/10873] Change language for notice about undelivered, deleted PM.
robinro · Sep 1, 2012 · d866624 · d866624
2 parents 790e644 + 0ba2bff
commit d866624
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
@@ -269,7 +269,7 @@
 	'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',