aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2014-12-27 13:29:17 +0100
committerJoas Schilling <nickvergessen@gmx.de>2014-12-27 13:29:17 +0100
commitbd3ef49e0b22b107d3d05194550cbd1c006e1013 (patch)
tree9396416115d0d8f6f23f44a027feec11d86892e0
parent892aa43eee0a3abdf110149f3533f32d5203eec6 (diff)
parenta66e4770c167744bacd1261bbb60b2f5181fd212 (diff)
downloadforums-bd3ef49e0b22b107d3d05194550cbd1c006e1013.tar
forums-bd3ef49e0b22b107d3d05194550cbd1c006e1013.tar.gz
forums-bd3ef49e0b22b107d3d05194550cbd1c006e1013.tar.bz2
forums-bd3ef49e0b22b107d3d05194550cbd1c006e1013.tar.xz
forums-bd3ef49e0b22b107d3d05194550cbd1c006e1013.zip
Merge branch 'develop-ascraeus' into develop
-rw-r--r--phpBB/language/en/acp/common.php1
1 files changed, 1 insertions, 0 deletions
diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php
index 91fc1215fc..fdbc4aebd0 100644
--- a/phpBB/language/en/acp/common.php
+++ b/phpBB/language/en/acp/common.php
@@ -558,6 +558,7 @@ $lang = array_merge($lang, array(
'LOG_LOCK_POST' => '<strong>Locked post</strong><br />» %s',
'LOG_MERGE' => '<strong>Merged posts</strong> into topic<br />» %s',
'LOG_MOVE' => '<strong>Moved topic</strong><br />» from %1$s to %2$s',
+ 'LOG_MOVED_TOPIC' => '<strong>Moved topic</strong><br />» %s',
'LOG_PM_REPORT_CLOSED' => '<strong>Closed PM report</strong><br />» %s',
'LOG_PM_REPORT_DELETED' => '<strong>Deleted PM report</strong><br />» %s',
'LOG_POST_APPROVED' => '<strong>Approved post</strong><br />» %s',