1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-10 03:36:31 +02:00

Merge branch 'develop-olympus' into develop

* develop-olympus:
  [ticket/12037] Fix hard-coded text in acp_inactive.html.

Conflicts:
	phpBB/adm/style/acp_inactive.html
This commit is contained in:
Joas Schilling
2013-11-26 11:33:17 +01:00
2 changed files with 2 additions and 1 deletions

View File

@ -140,6 +140,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',