1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-08 17:56:52 +02:00

Merge remote-tracking branch 'github-dhruv/ticket/10797' into develop-olympus

* github-dhruv/ticket/10797:
  [ticket/10797] language key rank moved to common
  [ticket/10797] user rank is displayed in mcp_warn.php
This commit is contained in:
Nils Adermann
2012-04-20 01:11:00 +02:00
3 changed files with 3 additions and 3 deletions

View File

@@ -460,6 +460,7 @@ $lang = array_merge($lang, array(
'PRIVATE_MESSAGING' => 'Private messaging',
'PROFILE' => 'User Control Panel',
'RANK' => 'Rank',
'READING_FORUM' => 'Viewing topics in %s',
'READING_GLOBAL_ANNOUNCE' => 'Reading global announcement',
'READING_LINK' => 'Following forum link %s',

View File

@@ -110,7 +110,6 @@ $lang = array_merge($lang, array(
'POST_IP' => 'Posted from IP/domain',
'RANK' => 'Rank',
'REAL_NAME' => 'Recipient name',
'RECIPIENT' => 'Recipient',
'REMOVE_FOE' => 'Remove foe',