diff options
| author | Unknown Bliss <m@michaelcullum.com> | 2012-09-01 21:15:39 +0100 |
|---|---|---|
| committer | Unknown Bliss <m@michaelcullum.com> | 2012-09-01 21:15:39 +0100 |
| commit | 79da1ea59291ae91acf570fe5b705d80f1d29253 (patch) | |
| tree | 0e69c121b02d38d2be4959e22d5aa67210af5a36 /phpBB/language | |
| parent | 0c35ee2769d3945f25275d5ee7a130b7596d289f (diff) | |
| parent | 43190ebecaeadbc8738da9dcb33b9163652fb9f3 (diff) | |
| download | forums-79da1ea59291ae91acf570fe5b705d80f1d29253.tar forums-79da1ea59291ae91acf570fe5b705d80f1d29253.tar.gz forums-79da1ea59291ae91acf570fe5b705d80f1d29253.tar.bz2 forums-79da1ea59291ae91acf570fe5b705d80f1d29253.tar.xz forums-79da1ea59291ae91acf570fe5b705d80f1d29253.zip | |
Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/10631
Conflicts:
phpBB/common.php
phpBB/download/file.php
Diffstat (limited to 'phpBB/language')
| -rw-r--r-- | phpBB/language/en/ucp.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php index 512a4a5c24..648de587aa 100644 --- a/phpBB/language/en/ucp.php +++ b/phpBB/language/en/ucp.php @@ -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', |