From e5008b025d5d3cff433a9f0b77da6da9ff098f0d Mon Sep 17 00:00:00 2001 From: Jonathan Stanley Date: Fri, 13 Apr 2007 05:33:42 +0000 Subject: [PATCH] #9759 Completely reworded the FAQ for Summer Time, purged Americanism (well, ed them :P) and removed the un-used GROUP_DST var. git-svn-id: file:///svn/phpbb/trunk@7346 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/language/en/acp/board.php | 2 +- phpBB/language/en/acp/groups.php | 1 - phpBB/language/en/common.php | 2 +- phpBB/language/en/help_faq.php | 2 +- phpBB/language/en/ucp.php | 2 +- 5 files changed, 4 insertions(+), 5 deletions(-) diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php index 68fea544ab..529ae051fa 100644 --- a/phpBB/language/en/acp/board.php +++ b/phpBB/language/en/acp/board.php @@ -45,7 +45,7 @@ $lang = array_merge($lang, array( 'RELATIVE_DAYS' => 'Relative days', 'SITE_DESC' => 'Site description', 'SITE_NAME' => 'Site name', - 'SYSTEM_DST' => 'Enable Daylight Savings Time', + 'SYSTEM_DST' => 'Enable Summer Time/DST', 'SYSTEM_TIMEZONE' => 'System timezone', 'WARNINGS_EXPIRE' => 'Warning duration', 'WARNINGS_EXPIRE_EXPLAIN' => 'Number of days that will elapse before the warning will automatically expire from a user’s record', diff --git a/phpBB/language/en/acp/groups.php b/phpBB/language/en/acp/groups.php index fa49030ccb..05cbb9625c 100644 --- a/phpBB/language/en/acp/groups.php +++ b/phpBB/language/en/acp/groups.php @@ -56,7 +56,6 @@ $lang = array_merge($lang, array( 'GROUP_DEMOTE' => 'Demote group leader', 'GROUP_DESC' => 'Group description', 'GROUP_DETAILS' => 'Group details', - 'GROUP_DST' => 'Group daylight savings', 'GROUP_EDIT_EXPLAIN' => 'Here you can edit an existing group. You can change its name, description and type (open, closed, etc.). You can also set certain groupwide options such as colouration, rank, etc. Changes made here override users current settings. Please note that group members can alter their avatar unless you set appropriate user permissions.', 'GROUP_ERR_USERS_EXIST' => 'The specified users are already members of this group', 'GROUP_FOUNDER_MANAGE' => 'Founder manage only', diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index ffd257ce28..eb62f3a495 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -730,7 +730,7 @@ $lang = array_merge($lang, array( '12.75' => 'UTC + 12:45 hours', '13' => 'UTC + 13 hours', '14' => 'UTC + 14 hours', - 'dst' => '[ DST ]', + 'dst' => '[ DST ]', ), 'tz_zones' => array( diff --git a/phpBB/language/en/help_faq.php b/phpBB/language/en/help_faq.php index a3e6a0ab4a..1dc2219bb3 100644 --- a/phpBB/language/en/help_faq.php +++ b/phpBB/language/en/help_faq.php @@ -84,7 +84,7 @@ $help = array( ), array( 0 => 'I changed the timezone and the time is still wrong!', - 1 => 'If you are sure you have set the timezone correctly and the time is still different the most likely answer is daylight savings time (or summer time as it is known in the UK and other places). The board is not designed to handle the changeovers between standard and daylight time so during summer months the time may be an hour different from the real local time.' + 1 => 'If you are sure you have set the timezone and Summer Time/DST correctly and the time is still different, then the time as stored on the servers clock is incorrect and the Administrators will need to make the correction.' ), array( 0 => 'My language is not in the list!', diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php index ca656b7a84..1c47dc5db2 100644 --- a/phpBB/language/en/ucp.php +++ b/phpBB/language/en/ucp.php @@ -93,7 +93,7 @@ $lang = array_merge($lang, array( 'BIRTHDAY_EXPLAIN' => 'Setting a year will list your age when it is your birthday.', 'BOARD_DATE_FORMAT' => 'My date format', 'BOARD_DATE_FORMAT_EXPLAIN' => 'The syntax used is identical to the PHP date() function', - 'BOARD_DST' => 'Daylight Saving Time is in effect', + 'BOARD_DST' => 'Summer Time/DST is in effect', 'BOARD_LANGUAGE' => 'My language', 'BOARD_STYLE' => 'My board style', 'BOARD_TIMEZONE' => 'My timezone',