diff options
| author | Nils Adermann <naderman@naderman.de> | 2012-04-20 01:08:21 +0200 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2012-04-20 01:08:21 +0200 |
| commit | 6ae68a3eb562da08881ab5dfc22e21a03a25fb98 (patch) | |
| tree | 7cc3d346ef839eeee9dd36b81d7647e840b08abb /phpBB/language | |
| parent | 41b23542d3d70694e9c75b4904e0ee22c771ac06 (diff) | |
| parent | 90fc8fe59f5f6e53071a8ccb85d085d62491c466 (diff) | |
| download | forums-6ae68a3eb562da08881ab5dfc22e21a03a25fb98.tar forums-6ae68a3eb562da08881ab5dfc22e21a03a25fb98.tar.gz forums-6ae68a3eb562da08881ab5dfc22e21a03a25fb98.tar.bz2 forums-6ae68a3eb562da08881ab5dfc22e21a03a25fb98.tar.xz forums-6ae68a3eb562da08881ab5dfc22e21a03a25fb98.zip | |
Merge remote-tracking branch 'github-dhruv/ticket/10797' into develop
* github-dhruv/ticket/10797:
[ticket/10797] language key rank moved to common
[ticket/10797] user rank is displayed in mcp_warn.php
Diffstat (limited to 'phpBB/language')
| -rw-r--r-- | phpBB/language/en/common.php | 1 | ||||
| -rw-r--r-- | phpBB/language/en/memberlist.php | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index 12f8edad9e..825ff51f4a 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -492,6 +492,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', diff --git a/phpBB/language/en/memberlist.php b/phpBB/language/en/memberlist.php index c3ab27871e..290f88a367 100644 --- a/phpBB/language/en/memberlist.php +++ b/phpBB/language/en/memberlist.php @@ -111,7 +111,6 @@ $lang = array_merge($lang, array( 'POST_IP' => 'Posted from IP/domain', - 'RANK' => 'Rank', 'REAL_NAME' => 'Recipient name', 'RECIPIENT' => 'Recipient', 'REMOVE_FOE' => 'Remove foe', |