aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language/en
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2013-11-26 11:31:43 +0100
committerJoas Schilling <nickvergessen@gmx.de>2013-11-26 11:31:43 +0100
commitafb4585dd904de6f5ce4be2607cc90d0cb9def09 (patch)
tree4dccbd2b9a4afe6bc74d9f2830e1b3477ca14aa1 /phpBB/language/en
parentaf3417ce86edb39b35a6c7f2227bd13b3af93ea8 (diff)
parente111d7bd13edae6bb8d010da8ef3cecab0c68a28 (diff)
downloadforums-afb4585dd904de6f5ce4be2607cc90d0cb9def09.tar
forums-afb4585dd904de6f5ce4be2607cc90d0cb9def09.tar.gz
forums-afb4585dd904de6f5ce4be2607cc90d0cb9def09.tar.bz2
forums-afb4585dd904de6f5ce4be2607cc90d0cb9def09.tar.xz
forums-afb4585dd904de6f5ce4be2607cc90d0cb9def09.zip
Merge remote-tracking branch 'prototech/ticket/12037' into develop-olympus
* prototech/ticket/12037: [ticket/12037] Fix hard-coded text in acp_inactive.html.
Diffstat (limited to 'phpBB/language/en')
-rw-r--r--phpBB/language/en/memberlist.php1
1 files changed, 1 insertions, 0 deletions
diff --git a/phpBB/language/en/memberlist.php b/phpBB/language/en/memberlist.php
index 7dc5e6b74a..f59efd3b95 100644
--- a/phpBB/language/en/memberlist.php
+++ b/phpBB/language/en/memberlist.php
@@ -138,6 +138,7 @@ $lang = array_merge($lang, array(
),
'USER_ONLINE' => 'Online',
'USER_PRESENCE' => 'Board presence',
+ 'USERS_PER_PAGE' => 'Users per page',
'VIEWING_PROFILE' => 'Viewing profile - %s',
'VISITED' => 'Last visited',