Merge branch 'develop-olympus' into develop

* develop-olympus:
  [ticket/10873] Change language for notice about undelivered, deleted PM.
This commit is contained in:
Nils Adermann 2012-09-01 16:11:57 +02:00
commit d866624ea7

View file

@ -269,7 +269,7 @@ $lang = array_merge($lang, array(
'MESSAGE_COLOURS' => 'Message colours', 'MESSAGE_COLOURS' => 'Message colours',
'MESSAGE_DELETED' => 'Message successfully deleted.', 'MESSAGE_DELETED' => 'Message successfully deleted.',
'MESSAGE_HISTORY' => 'Message history', '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_SENT_ON' => 'on',
'MESSAGE_STORED' => 'This message has been sent successfully.', 'MESSAGE_STORED' => 'This message has been sent successfully.',
'MESSAGE_TO' => 'To', 'MESSAGE_TO' => 'To',