1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00

Merge remote-tracking branch 'EXreaction/ticket/11021' into develop

* EXreaction/ticket/11021:
  [ticket/11021] Fix the language changes that were lost previously
This commit is contained in:
Andreas Fischer
2012-09-15 18:31:13 +02:00
6 changed files with 9 additions and 9 deletions

View File

@@ -50,9 +50,9 @@ $lang = array_merge($lang, array(
'OVERRIDE_STYLE_EXPLAIN' => 'Replaces users style with the default.',
'SITE_DESC' => 'Site description',
'SITE_HOME_TEXT' => 'Main website text',
'SITE_HOME_TEXT_EXPLAIN' => 'This text will be displayed as a link to your website homepage in the boards breadcrumbs. If not specified, it will default to Home.',
'SITE_HOME_TEXT_EXPLAIN' => 'This text will be displayed as a link to your website homepage in the boards breadcrumbs. If not specified, it will default to Home.',
'SITE_HOME_URL' => 'Main website URL',
'SITE_HOME_URL_EXPLAIN' => 'If specified, a link to this URL will be prepended to your boards breadcrumbs. The board logo will also link to this URL.',
'SITE_HOME_URL_EXPLAIN' => 'If specified, a link to this URL will be prepended to your boards breadcrumbs and the board logo will link to this URL instead of the forum index. An absolute URL is required, e.g. <samp>http://www.phpbb.com</samp>.',
'SITE_NAME' => 'Site name',
'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.',