aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language/en/install.php
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2010-11-06 18:56:01 +0100
committerAndreas Fischer <bantu@phpbb.com>2010-11-06 18:56:01 +0100
commitb60892d200247b4d608806f2172f681001cfa64b (patch)
tree7b673d1e7e0d7e37cb955c901a71aeecdb7a9ec6 /phpBB/language/en/install.php
parentf164906d77d3c8cb5650bb1e70db8e233f726d4c (diff)
parent516282dfa9f07bc0534f260462eceabc5531d33b (diff)
downloadforums-b60892d200247b4d608806f2172f681001cfa64b.tar
forums-b60892d200247b4d608806f2172f681001cfa64b.tar.gz
forums-b60892d200247b4d608806f2172f681001cfa64b.tar.bz2
forums-b60892d200247b4d608806f2172f681001cfa64b.tar.xz
forums-b60892d200247b4d608806f2172f681001cfa64b.zip
Merge branch 'develop-olympus' into develop
* develop-olympus: [ticket/9827] No longer emulate Internet Explorer 7 when using IE9. [ticket/9850] Display upgrade instructions for feature release in acp [ticket/9835] subsilver2: Don't show "To prevent automated ..." when logging in
Diffstat (limited to 'phpBB/language/en/install.php')
-rw-r--r--phpBB/language/en/install.php1
1 files changed, 1 insertions, 0 deletions
diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php
index 4e58de8d90..14923e836e 100644
--- a/phpBB/language/en/install.php
+++ b/phpBB/language/en/install.php
@@ -559,6 +559,7 @@ $lang = array_merge($lang, array(
'UPDATING_DATA' => 'Updating data',
'UPDATING_TO_LATEST_STABLE' => 'Updating database to latest stable release',
'UPDATED_VERSION' => 'Updated version',
+ 'UPGRADE_INSTRUCTIONS' => 'A new feature release <strong>%1$s</strong> is available. Please read <a href="%2$s" title="%2$s"><strong>the release announcement</strong></a> to learn about what it has to offer, and how to upgrade.',
'UPLOAD_METHOD' => 'Upload method',
'UPDATE_DB_SUCCESS' => 'Database update was successful.',