aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
diff options
context:
space:
mode:
authorNils Adermann <naderman@naderman.de>2013-07-13 13:09:33 -0400
committerNils Adermann <naderman@naderman.de>2013-07-13 13:09:33 -0400
commit1c9604286dd9c591ca1de8ced6a56abe72f72422 (patch)
tree74fcfbb5474e985d35139fd4301dab8098cd3e15 /phpBB
parentb1b37ddde2ddf6bae5d64e634f070c7f7afd251f (diff)
parent9d57c9635cf7d5044c275dfc5dbe19939e0a81b9 (diff)
downloadforums-1c9604286dd9c591ca1de8ced6a56abe72f72422.tar
forums-1c9604286dd9c591ca1de8ced6a56abe72f72422.tar.gz
forums-1c9604286dd9c591ca1de8ced6a56abe72f72422.tar.bz2
forums-1c9604286dd9c591ca1de8ced6a56abe72f72422.tar.xz
forums-1c9604286dd9c591ca1de8ced6a56abe72f72422.zip
Merge branch 'prep-release-3.0.12' into develop-olympus
* prep-release-3.0.12: [ticket/11670] Consistency with logo: Replace "phpBB(tm)" with "phpBB(R)".
Diffstat (limited to 'phpBB')
-rw-r--r--phpBB/language/en/install.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php
index bdc51a5712..4c01fa5522 100644
--- a/phpBB/language/en/install.php
+++ b/phpBB/language/en/install.php
@@ -288,7 +288,7 @@ $lang = array_merge($lang, array(
'NO_LOCATION' => 'Cannot determine location. If you know Imagemagick is installed, you may specify the location later within your administration control panel',
'NO_TABLES_FOUND' => 'No tables found.',
- 'OVERVIEW_BODY' => 'Welcome to phpBB3!<br /><br />phpBB™ is the most widely used open source bulletin board solution in the world. phpBB3 is the latest installment in a package line started in 2000. Like its predecessors, phpBB3 is feature-rich, user-friendly, and fully supported by the phpBB Team. phpBB3 greatly improves on what made phpBB2 popular, and adds commonly requested features that were not present in previous versions. We hope it exceeds your expectations.<br /><br />This installation system will guide you through installing phpBB3, updating to the latest version of phpBB3 from past releases, as well as converting to phpBB3 from a different discussion board system (including phpBB2). For more information, we encourage you to read <a href="../docs/INSTALL.html">the installation guide</a>.<br /><br />To read the phpBB3 license or learn about obtaining support and our stance on it, please select the respective options from the side menu. To continue, please select the appropriate tab above.',
+ 'OVERVIEW_BODY' => 'Welcome to phpBB3!<br /><br />phpBB® is the most widely used open source bulletin board solution in the world. phpBB3 is the latest installment in a package line started in 2000. Like its predecessors, phpBB3 is feature-rich, user-friendly, and fully supported by the phpBB Team. phpBB3 greatly improves on what made phpBB2 popular, and adds commonly requested features that were not present in previous versions. We hope it exceeds your expectations.<br /><br />This installation system will guide you through installing phpBB3, updating to the latest version of phpBB3 from past releases, as well as converting to phpBB3 from a different discussion board system (including phpBB2). For more information, we encourage you to read <a href="../docs/INSTALL.html">the installation guide</a>.<br /><br />To read the phpBB3 license or learn about obtaining support and our stance on it, please select the respective options from the side menu. To continue, please select the appropriate tab above.',
'PCRE_UTF_SUPPORT' => 'PCRE UTF-8 support',
'PCRE_UTF_SUPPORT_EXPLAIN' => 'phpBB will <strong>not</strong> run if your PHP installation is not compiled with UTF-8 support in the PCRE extension.',