1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-12 03:34:04 +02:00

Merge branch 'develop-olympus' into develop

* develop-olympus:
  [ticket/10563] Show deactivated styles below active styles in acp
This commit is contained in:
Oleg Pudeyev
2012-01-06 02:46:52 -05:00
3 changed files with 10 additions and 0 deletions

View File

@@ -233,6 +233,7 @@ $lang = array_merge($lang, array(
'IMG_USER_ICON9' => 'User defined image 9',
'IMG_USER_ICON10' => 'User defined image 10',
'INACTIVE_STYLES' => 'Inactive styles',
'INCLUDE_DIMENSIONS' => 'Include dimensions',
'INCLUDE_TEMPLATE' => 'Include template',
'INCLUDE_THEME' => 'Include theme',