diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2012-06-04 18:09:35 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2012-06-04 18:09:35 +0200 |
| commit | 8f027b68d64c1baa99b272d45f382c17310f1480 (patch) | |
| tree | 396e3a0db22b10060c42ad3cec8640e87a96c3c2 /phpBB/language/en/acp/board.php | |
| parent | 4af503e11bc2c42654cf783f031bdb074fdd91ed (diff) | |
| parent | b672fc7ae113c0e01f1d7ce4ffae3eb26e57b586 (diff) | |
| download | forums-8f027b68d64c1baa99b272d45f382c17310f1480.tar forums-8f027b68d64c1baa99b272d45f382c17310f1480.tar.gz forums-8f027b68d64c1baa99b272d45f382c17310f1480.tar.bz2 forums-8f027b68d64c1baa99b272d45f382c17310f1480.tar.xz forums-8f027b68d64c1baa99b272d45f382c17310f1480.zip | |
Merge branch 'feature/new-tz-handling' of https://github.com/p/phpbb3 into feature/new-tz-handling
Conflicts:
phpBB/includes/functions_profile_fields.php
phpBB/includes/session.php
phpBB/install/database_update.php
Diffstat (limited to 'phpBB/language/en/acp/board.php')
| -rw-r--r-- | phpBB/language/en/acp/board.php | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php index 384bce75bf..0754884473 100644 --- a/phpBB/language/en/acp/board.php +++ b/phpBB/language/en/acp/board.php @@ -50,7 +50,6 @@ $lang = array_merge($lang, array( 'OVERRIDE_STYLE_EXPLAIN' => 'Replaces user’s style with the default.', 'SITE_DESC' => 'Site description', 'SITE_NAME' => 'Site name', - 'SYSTEM_DST' => 'Enable Summer Time/<abbr title="Daylight Saving Time">DST</abbr>', 'SYSTEM_TIMEZONE' => 'Guest timezone', 'SYSTEM_TIMEZONE_EXPLAIN' => 'Timezone to use for displaying times to users who are not logged in (guests, bots). Logged in users set their timezone during registration and can change it in their user control panel.', 'WARNINGS_EXPIRE' => 'Warning duration', |