diff options
| author | Nathan Guse <nathaniel.guse@gmail.com> | 2012-10-18 18:23:22 -0500 |
|---|---|---|
| committer | Nathan Guse <nathaniel.guse@gmail.com> | 2012-10-18 18:23:22 -0500 |
| commit | 3f27890a5e78849582cb1ffec485ee3492671837 (patch) | |
| tree | 2674de10a4162d90e580b27b057204b2eddc136c /phpBB/language | |
| parent | 4b3264d9bbe81cec987fc6d01b7d12d29585654e (diff) | |
| parent | b3fdf8a0463438e1e86979a5a4e50611228aea52 (diff) | |
| download | forums-3f27890a5e78849582cb1ffec485ee3492671837.tar forums-3f27890a5e78849582cb1ffec485ee3492671837.tar.gz forums-3f27890a5e78849582cb1ffec485ee3492671837.tar.bz2 forums-3f27890a5e78849582cb1ffec485ee3492671837.tar.xz forums-3f27890a5e78849582cb1ffec485ee3492671837.zip | |
Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103
Conflicts:
phpBB/includes/functions.php
Diffstat (limited to 'phpBB/language')
| -rw-r--r-- | phpBB/language/en/ucp.php | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php index a09f0a62a1..7c3960204a 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', |