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/help_faq.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/help_faq.php')
| -rw-r--r-- | phpBB/language/en/help_faq.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/language/en/help_faq.php b/phpBB/language/en/help_faq.php index f21a8d866e..5c99f81c06 100644 --- a/phpBB/language/en/help_faq.php +++ b/phpBB/language/en/help_faq.php @@ -87,7 +87,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 and Summer Time/DST correctly and the time is still incorrect, then the time stored on the server clock is incorrect. Please notify an administrator to correct the problem.' + 1 => 'If you are sure you have set the timezone correctly and the time is still incorrect, then the time stored on the server clock is incorrect. Please notify an administrator to correct the problem.' ), array( 0 => 'My language is not in the list!', |