aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language/en/acp/common.php
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2006-09-01 13:16:22 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2006-09-01 13:16:22 +0000
commit5f30881c2c11ffce73a75c3e5c18d1368e6777da (patch)
tree8e26e09db8abc91b1027e7d2e5756429706200d1 /phpBB/language/en/acp/common.php
parent888bbf6ff4e465ff8f60a34f0859796fe4adc09d (diff)
downloadforums-5f30881c2c11ffce73a75c3e5c18d1368e6777da.tar
forums-5f30881c2c11ffce73a75c3e5c18d1368e6777da.tar.gz
forums-5f30881c2c11ffce73a75c3e5c18d1368e6777da.tar.bz2
forums-5f30881c2c11ffce73a75c3e5c18d1368e6777da.tar.xz
forums-5f30881c2c11ffce73a75c3e5c18d1368e6777da.zip
fix some bugs - hopefully not breaking anything...
git-svn-id: file:///svn/phpbb/trunk@6342 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/language/en/acp/common.php')
-rw-r--r--phpBB/language/en/acp/common.php18
1 files changed, 10 insertions, 8 deletions
diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php
index 0847ff44c9..9ffba39d6a 100644
--- a/phpBB/language/en/acp/common.php
+++ b/phpBB/language/en/acp/common.php
@@ -241,14 +241,16 @@ $lang = array_merge($lang, array(
'OFF' => 'OFF',
'ON' => 'ON',
- 'PARSE_BBCODE' => 'Parse BBCode',
- 'PARSE_SMILIES' => 'Parse Smilies',
- 'PARSE_URLS' => 'Parse Links',
- 'PROCEED_TO_ACP' => '%sProceed to the ACP%s',
- 'REMIND' => 'Remind',
- 'REORDER' => 'Reorder',
- 'RESYNC' => 'Sync',
- 'RETURN_TO' => 'Return to ...',
+ 'PARSE_BBCODE' => 'Parse BBCode',
+ 'PARSE_SMILIES' => 'Parse Smilies',
+ 'PARSE_URLS' => 'Parse Links',
+ 'PERMISSIONS_TRANSFERED' => 'Permissions transfered',
+ 'PERMISSIONS_TRANSFERED_EXPLAIN' => 'You are currently having the permissions from %1$s. You are able to browse the forum with the users permissions but not access the administration control panel since admin permissions were not transfered. You are able to <a href="%2$s"><strong>revert to your permission set</strong></a> at any time.',
+ 'PROCEED_TO_ACP' => '%sProceed to the ACP%s',
+ 'REMIND' => 'Remind',
+ 'REORDER' => 'Reorder',
+ 'RESYNC' => 'Sync',
+ 'RETURN_TO' => 'Return to ...',
'SELECT_ANONYMOUS' => 'Select Anonymous User',
'SELECT_OPTION' => 'Select option',