aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language/en
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2012-09-15 17:48:51 +0200
committerAndreas Fischer <bantu@phpbb.com>2012-09-15 17:48:51 +0200
commit5dc7aba18ffa1e47d835c80bdb6f921293fc0c18 (patch)
tree6c2814183f45f4cefe9e347e53b5d23ab5288552 /phpBB/language/en
parentf1fb555ea32fdd06dfdcae35c072e44b6c243126 (diff)
parent480e3daede1cba1e0c62878be3bd12810e4ccf37 (diff)
downloadforums-5dc7aba18ffa1e47d835c80bdb6f921293fc0c18.tar
forums-5dc7aba18ffa1e47d835c80bdb6f921293fc0c18.tar.gz
forums-5dc7aba18ffa1e47d835c80bdb6f921293fc0c18.tar.bz2
forums-5dc7aba18ffa1e47d835c80bdb6f921293fc0c18.tar.xz
forums-5dc7aba18ffa1e47d835c80bdb6f921293fc0c18.zip
Merge remote-tracking branch 'EXreaction/ticket/11021' into develop
* EXreaction/ticket/11021: [ticket/11021] Remove unnecessary line spacing in functions.php [ticket/11021] Use L_SITE_HOME instead of L_HOME [ticket/11021] Better language strings for site home url/text [ticket/11021] subsilver2 support [ticket/11021] Add the option to specify a Site home URL and text
Diffstat (limited to 'phpBB/language/en')
-rw-r--r--phpBB/language/en/acp/board.php6
1 files changed, 5 insertions, 1 deletions
diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
index 0754884473..b80aec1f4a 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -45,10 +45,14 @@ $lang = array_merge($lang, array(
'DISABLE_BOARD' => 'Disable board',
'DISABLE_BOARD_EXPLAIN' => 'This will make the board unavailable to users. You can also enter a short (255 character) message to display if you wish.',
'DISPLAY_LAST_SUBJECT' => 'Display subject of last added post on forum list',
- 'DISPLAY_LAST_SUBJECT_EXPLAIN' => 'The subject of the last added post will be displayed in the forum list with a hyperlink to the post. Subjects from password protected forums and forums in which user doesn’t have read access are not shown.',
+ 'DISPLAY_LAST_SUBJECT_EXPLAIN' => 'The subject of the last added post will be displayed in the forum list with a hyperlink to the post. Subjects from password protected forums and forums in which user doesn’t have read access are not shown.',
'OVERRIDE_STYLE' => 'Override user style',
'OVERRIDE_STYLE_EXPLAIN' => 'Replaces user’s 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 board’s 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 board’s breadcrumbs. The board logo will also link to this URL.',
'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.',