mirror of
https://github.com/phpbb/phpbb.git
synced 2025-07-30 21:40:43 +02:00
- correctly display subcategories
- use L_TRANSLATION_INFO [Bug #2357] - always begin with ACL_UNSET in permission trace - allow copy permissions when editing a forum - default to parent forum for copying permissions - no duplication of the breadcrumps on registration [Bug #2307] git-svn-id: file:///svn/phpbb/trunk@6107 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
@@ -29,6 +29,7 @@ if (empty($lang) || !is_array($lang))
|
||||
// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
|
||||
|
||||
$lang = array_merge($lang, array(
|
||||
'TRANSLATION_INFO' => 'blah',
|
||||
'ENCODING' => 'iso-8859-1',
|
||||
'DIRECTION' => 'ltr',
|
||||
'LEFT' => 'left',
|
||||
@@ -50,6 +51,7 @@ $lang = array_merge($lang, array(
|
||||
'ACTIVE_ERROR' => 'You have specified an inactive username. Please activate your account and try again. If you continue to have problems please contact a board administrator.',
|
||||
'ADMINISTRATOR' => 'Administrator',
|
||||
'ADMINISTRATORS' => 'Administrators',
|
||||
'AGE' => 'Age',
|
||||
'ALLOWED' => 'Allowed',
|
||||
'ALL_FILES' => 'All files',
|
||||
'ALL_FORUMS' => 'All forums',
|
||||
|
Reference in New Issue
Block a user