aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language/en
diff options
context:
space:
mode:
authorOleg Pudeyev <oleg@bsdpower.com>2012-01-06 02:46:52 -0500
committerOleg Pudeyev <oleg@bsdpower.com>2012-01-06 02:46:52 -0500
commit466acfdd943e37a3e1d98b12143894274fea9143 (patch)
treef1a441e20933cbfad407fb6c7dbda8d8c60eaa20 /phpBB/language/en
parent2f010fe96e878540209f2923d7de807b77fd3420 (diff)
parent95a74c7472ffa56d5fdcbbc2ec883d9f24db1037 (diff)
downloadforums-466acfdd943e37a3e1d98b12143894274fea9143.tar
forums-466acfdd943e37a3e1d98b12143894274fea9143.tar.gz
forums-466acfdd943e37a3e1d98b12143894274fea9143.tar.bz2
forums-466acfdd943e37a3e1d98b12143894274fea9143.tar.xz
forums-466acfdd943e37a3e1d98b12143894274fea9143.zip
Merge branch 'develop-olympus' into develop
* develop-olympus: [ticket/10563] Show deactivated styles below active styles in acp
Diffstat (limited to 'phpBB/language/en')
-rw-r--r--phpBB/language/en/acp/styles.php1
1 files changed, 1 insertions, 0 deletions
diff --git a/phpBB/language/en/acp/styles.php b/phpBB/language/en/acp/styles.php
index ed69e96ea0..59df82477e 100644
--- a/phpBB/language/en/acp/styles.php
+++ b/phpBB/language/en/acp/styles.php
@@ -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',