aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language
diff options
context:
space:
mode:
authorOleg Pudeyev <oleg@bsdpower.com>2012-10-17 22:31:35 -0400
committerOleg Pudeyev <oleg@bsdpower.com>2012-10-17 22:31:35 -0400
commit0a260f80af6f94047a26d9db16a5d2c6407c3958 (patch)
tree684015e715014169312318f1e712de3b5d9e5217 /phpBB/language
parent51cd1129bede65656a94080a8d6042190a0b8e63 (diff)
parentbd4408875784294987c806bf123a121a84ab8363 (diff)
downloadforums-0a260f80af6f94047a26d9db16a5d2c6407c3958.tar
forums-0a260f80af6f94047a26d9db16a5d2c6407c3958.tar.gz
forums-0a260f80af6f94047a26d9db16a5d2c6407c3958.tar.bz2
forums-0a260f80af6f94047a26d9db16a5d2c6407c3958.tar.xz
forums-0a260f80af6f94047a26d9db16a5d2c6407c3958.zip
Merge PR #918 branch 'develop-olympus' into develop
* develop-olympus: [ticket/10568] adding MESSAGE_EDITED to ucp.php and compose_pm
Diffstat (limited to 'phpBB/language')
-rw-r--r--phpBB/language/en/ucp.php1
1 files changed, 1 insertions, 0 deletions
diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index 648de587aa..705b07b170 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -268,6 +268,7 @@ $lang = array_merge($lang, array(
'MESSAGE_BY_AUTHOR' => 'by',
'MESSAGE_COLOURS' => 'Message colours',
'MESSAGE_DELETED' => 'Message successfully deleted.',
+ 'MESSAGE_EDITED' => 'Message successfully edited.',
'MESSAGE_HISTORY' => 'Message history',
'MESSAGE_REMOVED_FROM_OUTBOX' => 'This message was deleted by its author.',
'MESSAGE_SENT_ON' => 'on',