diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
index 4bdaa12796..3c1cc89d48 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -458,7 +458,7 @@ $lang = array_merge($lang, array(
'RANKS_PATH' => 'Rank image storage path',
'RANKS_PATH_EXPLAIN' => 'Path under your phpBB root directory, e.g. images/ranks.',
'SCRIPT_PATH' => 'Script path',
- 'SCRIPT_PATH_EXPLAIN' => 'The path where phpBB is located relative to the domain name, e.g. /phpBB3.',
+ 'SCRIPT_PATH_EXPLAIN' => 'The path where phpBB is located relative to the domain name, e.g. /phpBB.',
'SERVER_NAME' => 'Domain name',
'SERVER_NAME_EXPLAIN' => 'The domain name this board runs from (for example: example.com).',
'SERVER_PORT' => 'Server port',
diff --git a/phpBB/language/en/acp/forums.php b/phpBB/language/en/acp/forums.php
index 3ab152345c..6810273f1d 100644
--- a/phpBB/language/en/acp/forums.php
+++ b/phpBB/language/en/acp/forums.php
@@ -77,7 +77,7 @@ $lang = array_merge($lang, array(
'ENABLE_TOPIC_ICONS' => 'Enable topic icons',
'FORUM_ADMIN' => 'Forum administration',
- 'FORUM_ADMIN_EXPLAIN' => 'In phpBB3 everything is forum based. A category is just a special type of forum. Each forum can have an unlimited number of sub-forums and you can determine whether each may be posted to or not (i.e. whether it acts like an old category). Here you can add, edit, delete, lock, unlock individual forums as well as set certain additional controls. If your posts and topics have got out of sync you can also resynchronise a forum. You need to copy or set appropriate permissions for newly created forums to have them displayed.',
+ 'FORUM_ADMIN_EXPLAIN' => 'In phpBB everything is forum based. A category is just a special type of forum. Each forum can have an unlimited number of sub-forums and you can determine whether each may be posted to or not (i.e. whether it acts like an old category). Here you can add, edit, delete, lock, unlock individual forums as well as set certain additional controls. If your posts and topics have got out of sync you can also resynchronise a forum. You need to copy or set appropriate permissions for newly created forums to have them displayed.',
'FORUM_AUTO_PRUNE' => 'Enable auto-pruning',
'FORUM_AUTO_PRUNE_EXPLAIN' => 'Prunes the forum of topics, set the frequency/age parameters below.',
'FORUM_CREATED' => 'Forum created successfully.',
diff --git a/phpBB/language/en/acp/permissions.php b/phpBB/language/en/acp/permissions.php
index 693090139f..cd4085d746 100644
--- a/phpBB/language/en/acp/permissions.php
+++ b/phpBB/language/en/acp/permissions.php
@@ -54,7 +54,7 @@ $lang = array_merge($lang, array(
-
For further information on setting up and managing permissions on your phpBB3 board, please see the section on Setting permissions of our Quick Start Guide.
+ For further information on setting up and managing permissions on your phpBB board, please see the section on Setting permissions of our Quick Start Guide.
',
'ACL_NEVER' => 'Never',
diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php
index 9a73b76c42..ff78e96522 100644
--- a/phpBB/language/en/install.php
+++ b/phpBB/language/en/install.php
@@ -45,18 +45,18 @@ $lang = array_merge($lang, array(
// Introduction page
'INTRODUCTION_TITLE' => 'Introduction',
- 'INTRODUCTION_BODY' => 'Welcome to phpBB3!
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.
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 the installation guide.
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.',
+ 'INTRODUCTION_BODY' => 'Welcome to phpBB!
phpBB® is the most widely used open source bulletin board solution in the world. phpBB is the latest installment in a package line started in 2000. Like its predecessors, phpBB is feature-rich, user-friendly, and fully supported by the phpBB Team. phpBB greatly improves on what made phpBB2 and phpBB3 popular, and adds commonly requested features that were not present in previous versions. We hope it exceeds your expectations.
This installation system will guide you through installing phpBB, updating to the latest version of phpBB from past releases, as well as converting to phpBB from a different discussion board system (including phpBB2). For more information, we encourage you to read the installation guide.
To read the phpBB 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.',
// Support page
'SUPPORT_TITLE' => 'Support',
- 'SUPPORT_BODY' => 'Full support will be provided for the current stable release of phpBB3, free of charge. This includes:- installation
- configuration
- technical questions
- problems relating to potential bugs in the software
- updating from Release Candidate (RC) versions to the latest stable version
- converting from phpBB 2.0.x to phpBB3
- converting from other discussion board software to phpBB3 (please see the Convertors Forum)
We encourage users still running beta versions of phpBB3 to replace their installation with a fresh copy of the latest version.
Extensions / Styles
For issues relating to Extensions, please post in the appropriate Extensions Forum.
For issues relating to styles, templates and themes, please post in the appropriate Styles Forum.
If your question relates to a specific package, please post directly in the topic dedicated to the package.
Obtaining Support
Support Section
Quick Start Guide
To ensure you stay up to date with the latest news and releases, follow us on Twitter and Facebook
',
+ 'SUPPORT_BODY' => 'Full support will be provided for the current stable release of phpBB, free of charge. This includes:
- installation
- configuration
- technical questions
- problems relating to potential bugs in the software
- updating from Release Candidate (RC) versions to the latest stable version
- converting from phpBB 2.0.x to phpBB
- converting from other discussion board software to phpBB (please see the Convertors Forum)
We encourage users still running pre-release versions of phpBB to replace their installation with a fresh copy of the latest version.
Extensions / Styles
For issues relating to Extensions, please post in the appropriate Extensions Forum.
For issues relating to styles, templates and themes, please post in the appropriate Styles Forum.
If your question relates to a specific package, please post directly in the topic dedicated to the package.
Obtaining Support
Support Section
Quick Start Guide
To ensure you stay up to date with the latest news and releases, follow us on Twitter and Facebook
',
// License
'LICENSE_TITLE' => 'General Public License',
// Install page
'INSTALL_INTRO' => 'Welcome to Installation',
- 'INSTALL_INTRO_BODY' => 'With this option, it is possible to install phpBB3 onto your server.
In order to proceed, you will need your database settings. If you do not know your database settings, please contact your host and ask for them. You will not be able to continue without them. You need:
+ 'INSTALL_INTRO_BODY' => 'With this option, it is possible to install phpBB onto your server.In order to proceed, you will need your database settings. If you do not know your database settings, please contact your host and ask for them. You will not be able to continue without them. You need:
- The Database Type - the database you will be using.
@@ -68,7 +68,7 @@ $lang = array_merge($lang, array(
Note: if you are installing using SQLite, you should enter the full path to your database file in the DSN field and leave the username and password fields blank. For security reasons, you should make sure that the database file is not stored in a location accessible from the web.
- phpBB3 supports the following databases:
+ phpBB supports the following databases:
- MySQL 4.1.3 or above (MySQLi required)
- PostgreSQL 8.3+
@@ -235,7 +235,7 @@ $lang = array_merge($lang, array(
'UPGRADE_INSTRUCTIONS' => 'A new feature release %1$s is available. Please read the release announcement 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. /phpBB3.',
+ 'SCRIPT_PATH_EXPLAIN' => 'The path where phpBB is located relative to the domain name, e.g. /phpBB.',
));
// Default database schema entries...
@@ -244,7 +244,7 @@ $lang = array_merge($lang, array(
'CONFIG_SITE_DESC' => 'A short text to describe your forum',
'CONFIG_SITENAME' => 'yourdomain.com',
- 'DEFAULT_INSTALL_POST' => 'This is an example post in your phpBB3 installation. Everything seems to be working. You may delete this post if you like and continue to set up your board. During the installation process your first category and your first forum are assigned an appropriate set of permissions for the predefined usergroups administrators, bots, global moderators, guests, registered users and registered COPPA users. If you also choose to delete your first category and your first forum, do not forget to assign permissions for all these usergroups for all new categories and forums you create. It is recommended to rename your first category and your first forum and copy permissions from these while creating new categories and forums. Have fun!',
+ 'DEFAULT_INSTALL_POST' => 'This is an example post in your phpBB installation. Everything seems to be working. You may delete this post if you like and continue to set up your board. During the installation process your first category and your first forum are assigned an appropriate set of permissions for the predefined usergroups administrators, bots, global moderators, guests, registered users and registered COPPA users. If you also choose to delete your first category and your first forum, do not forget to assign permissions for all these usergroups for all new categories and forums you create. It is recommended to rename your first category and your first forum and copy permissions from these while creating new categories and forums. Have fun!',
'FORUMS_FIRST_CATEGORY' => 'Your first category',
'FORUMS_TEST_FORUM_DESC' => 'Description of your first forum.',
@@ -281,7 +281,7 @@ $lang = array_merge($lang, array(
'SMILIES_VERY_HAPPY' => 'Very Happy',
'SMILIES_WINK' => 'Wink',
- 'TOPICS_TOPIC_TITLE' => 'Welcome to phpBB3',
+ 'TOPICS_TOPIC_TITLE' => 'Welcome to phpBB',
));
// Common navigation items' translation
@@ -365,7 +365,7 @@ $lang = array_merge($lang, array(
How to update your installation with the Full Package
- The recommended way of updating your installation is using the full package. If core phpBB files have been modified in your installation you may wish to use the advanced update package in order to not lose these changes. You are also able to update your installation using the other methods listed within the INSTALL.html document. The steps for updating phpBB3 using the full package are:
+ The recommended way of updating your installation is using the full package. If core phpBB files have been modified in your installation you may wish to use the advanced update package in order to not lose these changes. You are also able to update your installation using the other methods listed within the INSTALL.html document. The steps for updating phpBB using the full package are:
- Backup all board files and the database.
@@ -374,7 +374,7 @@ $lang = array_merge($lang, array(
- Remove (delete) the
config.php
file, and the /images
, /store
and /files
folders from the package (not your site).
- Go to the ACP, Board settings, and make sure prosilver is set as the default style. If not, set it to prosilver.
- Delete the
/vendor
and /cache
folders from the board’s root folder on the host.
- - Via FTP or SSH upload the remaining files and folders (that is, the remaining CONTENTS of the phpBB3 folder) to the root folder of your board installation on the server, overwriting the existing files. (Note: take care not to delete any extensions in your
/ext
folder when uploading the new phpBB3 contents.)
+ - Via FTP or SSH upload the remaining files and folders (that is, the remaining CONTENTS of the phpBB folder) to the root folder of your board installation on the server, overwriting the existing files. (Note: take care not to delete any extensions in your
/ext
folder when uploading the new phpBB contents.)
- Now start the update process by pointing your browser to the install folder.
- Follow the steps to update the database and let that run to completion.
- Via FTP or SSH delete the
/install
folder from the root of your board installation.
@@ -388,7 +388,7 @@ $lang = array_merge($lang, array(
How to update your installation with the Advanced Update Package
- The advanced update package is only recommended for expert users in case core phpBB files have been modified in your installation. You are also able to update your installation using the methods listed within the INSTALL.html document. The steps for updating phpBB3 using the advanced update package are:
+ The advanced update package is only recommended for expert users in case core phpBB files have been modified in your installation. You are also able to update your installation using the methods listed within the INSTALL.html document. The steps for updating phpBB using the advanced update package are:
- Go to the phpBB.com downloads page and download the "Advanced Update Package" archive.
@@ -503,7 +503,7 @@ $lang = array_merge($lang, array(
'CONVERT_NOT_EXIST' => 'The specified convertor does not exist.',
'DEV_NO_TEST_FILE' => 'No value has been specified for the test_file variable in the convertor. If you are a user of this convertor, you should not be seeing this error, please report this message to the convertor author. If you are a convertor author, you must specify the name of a file which exists in the source board to allow the path to it to be verified.',
'COULD_NOT_FIND_PATH' => 'Could not find path to your former board. Please check your settings and try again.
» %s was specified as the source path.',
- 'CONFIG_PHPBB_EMPTY' => 'The phpBB3 config variable for “%s” is empty.',
+ 'CONFIG_PHPBB_EMPTY' => 'The phpBB config variable for “%s” is empty.',
'MAKE_FOLDER_WRITABLE' => 'Please make sure that this folder exists and is writable by the webserver then try again:
»%s.',
'MAKE_FOLDERS_WRITABLE' => 'Please make sure that these folders exist and are writable by the webserver then try again:
»%s.',
@@ -539,7 +539,7 @@ $lang = array_merge($lang, array(
'DEFAULT_PREFIX_IS' => 'The convertor was not able to find tables with the specified prefix. Please make sure you have entered the correct details for the board you are converting from. The default table prefix for %1$s is %2$s.',
'SPECIFY_OPTIONS' => 'Specify conversion options',
'FORUM_PATH' => 'Board path',
- 'FORUM_PATH_EXPLAIN' => 'This is the relative path on disk to your former board from the root of this phpBB3 installation.',
+ 'FORUM_PATH_EXPLAIN' => 'This is the relative path on disk to your former board from the root of this phpBB installation.',
'REFRESH_PAGE' => 'Refresh page to continue conversion',
'REFRESH_PAGE_EXPLAIN' => 'If set to yes, the convertor will refresh the page to continue the conversion after having finished a step. If this is your first conversion for testing purposes and to determine any errors in advance, we suggest to set this to No.',