aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language
diff options
context:
space:
mode:
authorNils Adermann <naderman@naderman.de>2012-09-01 16:11:57 +0200
committerNils Adermann <naderman@naderman.de>2012-09-01 16:11:57 +0200
commitd866624ea7cbc4ff8e5515f66dbb984cbd565414 (patch)
tree66479290c045229f3f543edafe8bbbc558fdd3e3 /phpBB/language
parent790e64433d26da1e819c9eaa96ad812c402286db (diff)
parent0ba2bfffe2df64e1f67ec23061365cdac2238a34 (diff)
downloadforums-d866624ea7cbc4ff8e5515f66dbb984cbd565414.tar
forums-d866624ea7cbc4ff8e5515f66dbb984cbd565414.tar.gz
forums-d866624ea7cbc4ff8e5515f66dbb984cbd565414.tar.bz2
forums-d866624ea7cbc4ff8e5515f66dbb984cbd565414.tar.xz
forums-d866624ea7cbc4ff8e5515f66dbb984cbd565414.zip
Merge branch 'develop-olympus' into develop
* develop-olympus: [ticket/10873] Change language for notice about undelivered, deleted PM.
Diffstat (limited to 'phpBB/language')
-rw-r--r--phpBB/language/en/ucp.php2
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',