diff options
author | Tristan Darricau <github@nicofuma.fr> | 2017-01-22 23:15:26 +0100 |
---|---|---|
committer | Tristan Darricau <github@nicofuma.fr> | 2017-01-22 23:15:26 +0100 |
commit | 7c77e333138e6c705ffbfd3028ce1d2002404965 (patch) | |
tree | c0fa7de1eac82faa1cd758fe6ed92920570d311a /phpBB/language/en/install.php | |
parent | f7ccd7af8ef529bd8a43b8a3e0b342f9b228d961 (diff) | |
parent | 085a839963b61e9812aa06601b1ffeb2eb077ab9 (diff) | |
download | forums-7c77e333138e6c705ffbfd3028ce1d2002404965.tar forums-7c77e333138e6c705ffbfd3028ce1d2002404965.tar.gz forums-7c77e333138e6c705ffbfd3028ce1d2002404965.tar.bz2 forums-7c77e333138e6c705ffbfd3028ce1d2002404965.tar.xz forums-7c77e333138e6c705ffbfd3028ce1d2002404965.zip |
Merge branch '3.1.x' into 3.2.x
* 3.1.x:
[ticket/14968] Use earlier version as written in comment
[ticket/14968] Update docblock and ensure method returns array
[ticket/14968] Display possible upgrade on acp index and update page
[ticket/14968] Add method for retrieving updates on current branch
Diffstat (limited to 'phpBB/language/en/install.php')
-rw-r--r-- | phpBB/language/en/install.php | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php index 45ed51f641..264377e494 100644 --- a/phpBB/language/en/install.php +++ b/phpBB/language/en/install.php @@ -224,6 +224,7 @@ $lang = array_merge($lang, array( // Server data // // Form labels + '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.', 'SERVER_CONFIG' => 'Server configuration', 'SCRIPT_PATH' => 'Script path', 'SCRIPT_PATH_EXPLAIN' => 'The path where phpBB is located relative to the domain name, e.g. <samp>/phpBB3</samp>.', |