From 39d46e25991de64ed3bf6ff36cdbf349bf666512 Mon Sep 17 00:00:00 2001 From: Mario Skouat Date: Sun, 21 Sep 2014 10:43:10 +0200 Subject: [PATCH 01/11] [ticket/13041] Reordering "Login and Registration Issues" PHPBB3-13041 --- phpBB/language/en/help_faq.php | 50 +++++++++++++++++----------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/phpBB/language/en/help_faq.php b/phpBB/language/en/help_faq.php index 904dc92080..3bc7e8cdd8 100644 --- a/phpBB/language/en/help_faq.php +++ b/phpBB/language/en/help_faq.php @@ -36,33 +36,9 @@ $help = array( 1 => 'Login and Registration Issues' ), array( - 0 => 'Why can’t I login?', - 1 => 'There are several reasons why this could occur. First, ensure your username and password are correct. If they are, contact the board owner to make sure you haven’t been banned. It is also possible the website owner has a configuration error on their end, and they would need to fix it.' - ), - array( - 0 => 'Why do I need to register at all?', + 0 => 'Why do I need to register?', 1 => 'You may not have to, it is up to the administrator of the board as to whether you need to register in order to post messages. However; registration will give you access to additional features not available to guest users such as definable avatar images, private messaging, emailing of fellow users, usergroup subscription, etc. It only takes a few moments to register so it is recommended you do so.' ), - array( - 0 => 'Why do I get logged off automatically?', - 1 => 'If you do not check the Remember me box when you login, the board will only keep you logged in for a preset time. This prevents misuse of your account by anyone else. To stay logged in, check the box during login. This is not recommended if you access the board from a shared computer, e.g. library, internet cafe, university computer lab, etc. If you do not see this checkbox, it means the board administrator has disabled this feature.' - ), - array( - 0 => 'How do I prevent my username appearing in the online user listings?', - 1 => 'Within your User Control Panel, under “Board preferences”, you will find the option Hide your online status. Enable this option with Yes and you will only appear to the administrators, moderators and yourself. You will be counted as a hidden user.' - ), - array( - 0 => 'I’ve lost my password!', - 1 => 'Don’t panic! While your password cannot be retrieved, it can easily be reset. Visit the login page and click I’ve forgotten my password. Follow the instructions and you should be able to log in again shortly.' - ), - array( - 0 => 'I registered but cannot login!', - 1 => 'First, check your username and password. If they are correct, then one of two things may have happened. If COPPA support is enabled and you specified being under 13 years old during registration, you will have to follow the instructions you received. Some boards will also require new registrations to be activated, either by yourself or by an administrator before you can logon; this information was present during registration. If you were sent an email, follow the instructions. If you did not receive an email, you may have provided an incorrect email address or the email may have been picked up by a spam filer. If you are sure the email address you provided is correct, try contacting an administrator.' - ), - array( - 0 => 'I registered in the past but cannot login any more?!', - 1 => 'It is possible an administrator has deactivated or deleted your account for some reason. Also, many boards periodically remove users who have not posted for a long time to reduce the size of the database. If this has happened, try registering again and being more involved in discussions.' - ), array( 0 => 'What is COPPA?', 1 => 'COPPA, or the Child Online Privacy and Protection Act of 1998, is a law in the United States requiring websites which can potentially collect information from minors under the age of 13 to have written parental consent or some other method of legal guardian acknowledgment, allowing the collection of personally identifiable information from a minor under the age of 13. If you are unsure if this applies to you as someone trying to register or to the website you are trying to register on, contact legal counsel for assistance. Please note that the phpBB Limited cannot provide legal advice and is not a point of contact for legal concerns of any kind, except as outlined below.', @@ -71,6 +47,26 @@ $help = array( 0 => 'Why can’t I register?', 1 => 'It is possible the website owner has banned your IP address or disallowed the username you are attempting to register. The website owner could have also disabled registration to prevent new visitors from signing up. Contact a board administrator for assistance.', ), + array( + 0 => 'I registered but cannot login!', + 1 => 'First, check your username and password. If they are correct, then one of two things may have happened. If COPPA support is enabled and you specified being under 13 years old during registration, you will have to follow the instructions you received. Some boards will also require new registrations to be activated, either by yourself or by an administrator before you can logon; this information was present during registration. If you were sent an email, follow the instructions. If you did not receive an email, you may have provided an incorrect email address or the email may have been picked up by a spam filer. If you are sure the email address you provided is correct, try contacting an administrator.' + ), + array( + 0 => 'Why can’t I login?', + 1 => 'There are several reasons why this could occur. First, ensure your username and password are correct. If they are, contact the board owner to make sure you haven’t been banned. It is also possible the website owner has a configuration error on their end, and they would need to fix it.' + ), + array( + 0 => 'I registered in the past but cannot login any more?!', + 1 => 'It is possible an administrator has deactivated or deleted your account for some reason. Also, many boards periodically remove users who have not posted for a long time to reduce the size of the database. If this has happened, try registering again and being more involved in discussions.' + ), + array( + 0 => 'I’ve lost my password!', + 1 => 'Don’t panic! While your password cannot be retrieved, it can easily be reset. Visit the login page and click I’ve forgotten my password. Follow the instructions and you should be able to log in again shortly.' + ), + array( + 0 => 'Why do I get logged off automatically?', + 1 => 'If you do not check the Remember me box when you login, the board will only keep you logged in for a preset time. This prevents misuse of your account by anyone else. To stay logged in, check the box during login. This is not recommended if you access the board from a shared computer, e.g. library, internet cafe, university computer lab, etc. If you do not see this checkbox, it means the board administrator has disabled this feature.' + ), array( 0 => 'What does the “Delete all board cookies” do?', 1 => '“Delete all board cookies” deletes the cookies created by phpBB which keep you authenticated and logged into the board. It also provides functions such as read tracking if they have been enabled by the board owner. If you are having login or logout problems, deleting board cookies may help.', @@ -83,6 +79,10 @@ $help = array( 0 => 'How do I change my settings?', 1 => 'If you are a registered user, all your settings are stored in the board database. To alter them, visit your User Control Panel; a link can usually be found at the top of board pages. This system will allow you to change all your settings and preferences.' ), + array( + 0 => 'How do I prevent my username appearing in the online user listings?', + 1 => 'Within your User Control Panel, under “Board preferences”, you will find the option Hide your online status. Enable this option with Yes and you will only appear to the administrators, moderators and yourself. You will be counted as a hidden user.' + ), array( 0 => 'The times are not correct!', 1 => 'It is possible the time displayed is from a timezone different from the one you are in. If this is the case, visit your User Control Panel and change your timezone to match your particular area, e.g. London, Paris, New York, Sydney, etc. Please note that changing the timezone, like most settings, can only be done by registered users. If you are not registered, this is a good time to do so.' From e816006b8e5e0040f70411495b8722f982811475 Mon Sep 17 00:00:00 2001 From: Mario Skouat Date: Wed, 1 Oct 2014 20:14:30 +0200 Subject: [PATCH 02/11] [ticket/13041] Updating "User Preferences and settings" PHPBB3-13041 --- phpBB/language/en/help_faq.php | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/phpBB/language/en/help_faq.php b/phpBB/language/en/help_faq.php index 3bc7e8cdd8..378c8b7d85 100644 --- a/phpBB/language/en/help_faq.php +++ b/phpBB/language/en/help_faq.php @@ -77,7 +77,7 @@ $help = array( ), array( 0 => 'How do I change my settings?', - 1 => 'If you are a registered user, all your settings are stored in the board database. To alter them, visit your User Control Panel; a link can usually be found at the top of board pages. This system will allow you to change all your settings and preferences.' + 1 => 'If you are a registered user, all your settings are stored in the board database. To alter them, visit your User Control Panel; a link can usually be found by clicking on your username at the top of board pages. This system will allow you to change all your settings and preferences.' ), array( 0 => 'How do I prevent my username appearing in the online user listings?', @@ -93,11 +93,15 @@ $help = array( ), array( 0 => 'My language is not in the list!', - 1 => 'Either the administrator has not installed your language or nobody has translated this board into your language. Try asking the board administrator if they can install the language pack you need. If the language pack does not exist, feel free to create a new translation. More information can be found at the phpBB website (see link at the bottom of board pages).' + 1 => 'Either the administrator has not installed your language or nobody has translated this board into your language. Try asking the board administrator if they can install the language pack you need. If the language pack does not exist, feel free to create a new translation. More information can be found at the phpBB® website.' ), array( - 0 => 'How do I show an image along with my username?', - 1 => 'There are two images which may appear along with a username when viewing posts. One of them may be an image associated with your rank, generally in the form of stars, blocks or dots, indicating how many posts you have made or your status on the board. Another, usually a larger image, is known as an avatar and is generally unique or personal to each user. It is up to the board administrator to enable avatars and to choose the way in which avatars can be made available. If you are unable to use avatars, contact a board administrator and ask them for their reasons.' + 0 => 'What do the images next to my username?', + 1 => 'There are two images which may appear along with a username when viewing posts. One of them may be an image associated with your rank, generally in the form of stars, blocks or dots, indicating how many posts you have made or your status on the board. Another, usually a larger image, is known as an avatar and is generally unique or personal to each user.' + ), + array( + 0 => 'How do I display an avatar?', + 1 => 'Within your User Control Panel, under “Profile” you can add an avatar by using one of the four following methods: Gravatar, Gallery, Remote or Upload. It is up to the board administrator to enable avatars and to choose the way in which avatars can be made available. If you are unable to use avatars, contact a board administrator and ask them for their reasons.' ), array( 0 => 'What is my rank and how do I change it?', From abb1244b443e6564a36879f67804e2c3e6e5909d Mon Sep 17 00:00:00 2001 From: Mario Skouat Date: Thu, 2 Oct 2014 10:27:48 +0200 Subject: [PATCH 03/11] [ticket/13041] Updating "Login and Registration Issues" PHPBB3-13041 --- phpBB/language/en/help_faq.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/phpBB/language/en/help_faq.php b/phpBB/language/en/help_faq.php index 378c8b7d85..5f870744fc 100644 --- a/phpBB/language/en/help_faq.php +++ b/phpBB/language/en/help_faq.php @@ -41,11 +41,11 @@ $help = array( ), array( 0 => 'What is COPPA?', - 1 => 'COPPA, or the Child Online Privacy and Protection Act of 1998, is a law in the United States requiring websites which can potentially collect information from minors under the age of 13 to have written parental consent or some other method of legal guardian acknowledgment, allowing the collection of personally identifiable information from a minor under the age of 13. If you are unsure if this applies to you as someone trying to register or to the website you are trying to register on, contact legal counsel for assistance. Please note that the phpBB Limited cannot provide legal advice and is not a point of contact for legal concerns of any kind, except as outlined below.', + 1 => 'COPPA, or the Child Online Privacy and Protection Act of 1998, is a law in the United States requiring websites which can potentially collect information from minors under the age of 13 to have written parental consent or some other method of legal guardian acknowledgment, allowing the collection of personally identifiable information from a minor under the age of 13. If you are unsure if this applies to you as someone trying to register or to the website you are trying to register on, contact legal counsel for assistance. Please note that the phpBB Limited and board team cannot provide legal advice and is not a point of contact for legal concerns of any kind, except as outlined in question “Who do I contact about abusive and/or legal matters related to this board?”.', ), array( 0 => 'Why can’t I register?', - 1 => 'It is possible the website owner has banned your IP address or disallowed the username you are attempting to register. The website owner could have also disabled registration to prevent new visitors from signing up. Contact a board administrator for assistance.', + 1 => 'It is possible the board owner has disabled registration to prevent new visitors from signing up. The board owner could have also banned your IP address or disallowed the username you are attempting to register. Contact a board administrator for assistance.', ), array( 0 => 'I registered but cannot login!', @@ -61,7 +61,7 @@ $help = array( ), array( 0 => 'I’ve lost my password!', - 1 => 'Don’t panic! While your password cannot be retrieved, it can easily be reset. Visit the login page and click I’ve forgotten my password. Follow the instructions and you should be able to log in again shortly.' + 1 => 'Don’t panic! While your password cannot be retrieved, it can easily be reset. Visit the login page and click I forgot my password. Follow the instructions and you should be able to log in again shortly.
However, if you are not able to reset your password, contact the board administrator.' ), array( 0 => 'Why do I get logged off automatically?', @@ -69,7 +69,7 @@ $help = array( ), array( 0 => 'What does the “Delete all board cookies” do?', - 1 => '“Delete all board cookies” deletes the cookies created by phpBB which keep you authenticated and logged into the board. It also provides functions such as read tracking if they have been enabled by the board owner. If you are having login or logout problems, deleting board cookies may help.', + 1 => '“Delete all board cookies” deletes the cookies created by phpBB3 which keep you authenticated and logged into the board. It also provides functions such as read tracking if they have been enabled by the board owner. If you are having login or logout problems, deleting board cookies may help.', ), array( 0 => '--', From 64eec22884e5e328d9f211aebe24a7704862b0f9 Mon Sep 17 00:00:00 2001 From: Mario Skouat Date: Thu, 2 Oct 2014 11:53:39 +0200 Subject: [PATCH 04/11] [ticket/13041] Updating "Posting Issues" PHPBB3-13041 --- phpBB/language/en/help_faq.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/language/en/help_faq.php b/phpBB/language/en/help_faq.php index 5f870744fc..21ce3c29bf 100644 --- a/phpBB/language/en/help_faq.php +++ b/phpBB/language/en/help_faq.php @@ -117,7 +117,7 @@ $help = array( ), array( 0 => 'How do I post a topic in a forum?', - 1 => 'To post a new topic in a forum, click the relevant button on either the forum or topic screens. You may need to register before you can post a message. A list of your permissions in each forum is available at the bottom of the forum and topic screens. Example: You can post new topics, You can vote in polls, etc.' + 1 => 'To post a new topic in a forum, click the relevant button on either the forum or topic screens. You may need to register before you can post a message. A list of your permissions in each forum is available at the bottom of the forum and topic screens. Example: You can post new topics, You can post attachments, etc.' ), array( 0 => 'How do I edit or delete a post?', From 1fb4ebb34a22f72077d670c22f2d238c70cf4c5e Mon Sep 17 00:00:00 2001 From: Mario Skouat Date: Thu, 2 Oct 2014 11:54:48 +0200 Subject: [PATCH 05/11] [ticket/13041] Updating "Searching the Forums" PHPBB3-13041 --- phpBB/language/en/help_faq.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/language/en/help_faq.php b/phpBB/language/en/help_faq.php index 21ce3c29bf..cb1a5ffea2 100644 --- a/phpBB/language/en/help_faq.php +++ b/phpBB/language/en/help_faq.php @@ -298,7 +298,7 @@ $help = array( ), array( 0 => 'How can I find my own posts and topics?', - 1 => 'Your own posts can be retrieved either by clicking the “Search user’s posts” within the User Control Panel or via your own profile page. To search for your topics, use the Advanced search page and fill in the various options appropriately.' + 1 => 'Your own posts can be retrieved either by clicking the “Show your posts” within the User Control Panel or by clicking “Search user’s posts” via your own profile page. To search for your topics, use the Advanced search page and fill in the various options appropriately.' ), array( 0 => '--', From 8c628a6dc209977d8ed96137b3be209927a5e093 Mon Sep 17 00:00:00 2001 From: Mario Skouat Date: Thu, 2 Oct 2014 12:56:56 +0200 Subject: [PATCH 06/11] [ticket/13041] Updating "phpBB3 Issues" PHPBB3-13041 --- phpBB/language/en/help_faq.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/phpBB/language/en/help_faq.php b/phpBB/language/en/help_faq.php index cb1a5ffea2..249e13cddb 100644 --- a/phpBB/language/en/help_faq.php +++ b/phpBB/language/en/help_faq.php @@ -330,11 +330,11 @@ $help = array( ), array( 0 => '--', - 1 => 'phpBB 3 Issues' + 1 => 'phpBB3 Issues' ), array( 0 => 'Who wrote this bulletin board?', - 1 => 'This software (in its unmodified form) is produced, released and is copyright phpBB Limited. It is made available under the GNU General Public License and may be freely distributed. See the link for more details.' + 1 => 'This software (in its unmodified form) is produced, released and is copyright phpBB Limited. It is made available under the GNU General Public License, version 2 (GPL-2.0) and may be freely distributed. See the link for more details.' ), array( 0 => 'Why isn’t X feature available?', @@ -344,4 +344,8 @@ $help = array( 0 => 'Who do I contact about abusive and/or legal matters related to this board?', 1 => 'Any of the administrators listed on the “The team” page should be an appropriate point of contact for your complaints. If this still gets no response then you should contact the owner of the domain (do a whois lookup) or, if this is running on a free service (e.g. Yahoo!, free.fr, f2s.com, etc.), the management or abuse department of that service. Please note that the phpBB Limited has absolutely no jurisdiction and cannot in any way be held liable over how, where or by whom this board is used. Do not contact the phpBB Limited in relation to any legal (cease and desist, liable, defamatory comment, etc.) matter not directly related to the phpBB.com website or the discrete software of phpBB itself. If you do email phpBB Limited about any third party use of this software then you should expect a terse response or no response at all.' ), + array( + 0 => 'Who do I contact a board administrator?', + 1 => 'All users of the board can use the form “Contact us”, if the option was enabled by the board administrator.
Members of the board, can also use “The team” link.' + ), ); From e5a5933db61e3c6748e62f931c0e07abfb4586e8 Mon Sep 17 00:00:00 2001 From: Mario Skouat Date: Thu, 2 Oct 2014 12:57:17 +0200 Subject: [PATCH 07/11] [ticket/13041] Updating "Topic Subscriptions and Bookmarks" PHPBB3-13041 --- phpBB/language/en/help_faq.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/language/en/help_faq.php b/phpBB/language/en/help_faq.php index 249e13cddb..e75e672413 100644 --- a/phpBB/language/en/help_faq.php +++ b/phpBB/language/en/help_faq.php @@ -310,7 +310,7 @@ $help = array( ), array( 0 => 'How do I subscribe to specific forums or topics?', - 1 => 'To subscribe to a specific forum, click the “Subscribe forum” link upon entering the forum. To subscribe to a topic, reply to the topic with the subscribe checkbox checked or click the “Subscribe topic” link within the topic itself.' + 1 => 'To subscribe to a specific forum, click the “Subscribe forum” link upon entering the forum.
To subscribe to a topic, reply to the topic with the subscribe checkbox checked or click the “Subscribe topic” link by clicking the button “Topic tools”.
These links are usually at the bottom of page.' ), array( 0 => 'How do I remove my subscriptions?', From 97db21882935e31c6f539b2f76d7339e1cd0c07f Mon Sep 17 00:00:00 2001 From: Mario Skouat Date: Wed, 8 Oct 2014 00:14:00 +0200 Subject: [PATCH 08/11] [ticket/13041] Added multiple changes - "phpBB3" replaced by "phpBB" - Added the changes suggested by VSE. - "Subscriptions and Bookmarks" reviewed - Added trailing comma on modified lines PHPBB3-13041 --- phpBB/language/en/help_faq.php | 46 ++++++++++++++++++---------------- 1 file changed, 25 insertions(+), 21 deletions(-) diff --git a/phpBB/language/en/help_faq.php b/phpBB/language/en/help_faq.php index e75e672413..4c73b105ea 100644 --- a/phpBB/language/en/help_faq.php +++ b/phpBB/language/en/help_faq.php @@ -41,11 +41,11 @@ $help = array( ), array( 0 => 'What is COPPA?', - 1 => 'COPPA, or the Child Online Privacy and Protection Act of 1998, is a law in the United States requiring websites which can potentially collect information from minors under the age of 13 to have written parental consent or some other method of legal guardian acknowledgment, allowing the collection of personally identifiable information from a minor under the age of 13. If you are unsure if this applies to you as someone trying to register or to the website you are trying to register on, contact legal counsel for assistance. Please note that the phpBB Limited and board team cannot provide legal advice and is not a point of contact for legal concerns of any kind, except as outlined in question “Who do I contact about abusive and/or legal matters related to this board?”.', + 1 => 'COPPA, or the Child Online Privacy and Protection Act of 1998, is a law in the United States requiring websites which can potentially collect information from minors under the age of 13 to have written parental consent or some other method of legal guardian acknowledgment, allowing the collection of personally identifiable information from a minor under the age of 13. If you are unsure if this applies to you as someone trying to register or to the website you are trying to register on, contact legal counsel for assistance. Please note that phpBB Limited and the owner’s of this board cannot provide legal advice and is not a point of contact for legal concerns of any kind, except as outlined in question “Who do I contact about abusive and/or legal matters related to this board?”.', ), array( 0 => 'Why can’t I register?', - 1 => 'It is possible the board owner has disabled registration to prevent new visitors from signing up. The board owner could have also banned your IP address or disallowed the username you are attempting to register. Contact a board administrator for assistance.', + 1 => 'It is possible a board administrator has disabled registration to prevent new visitors from signing up. A board administrator could have also banned your IP address or disallowed the username you are attempting to register. Contact a board administrator for assistance.', ), array( 0 => 'I registered but cannot login!', @@ -53,7 +53,7 @@ $help = array( ), array( 0 => 'Why can’t I login?', - 1 => 'There are several reasons why this could occur. First, ensure your username and password are correct. If they are, contact the board owner to make sure you haven’t been banned. It is also possible the website owner has a configuration error on their end, and they would need to fix it.' + 1 => 'There are several reasons why this could occur. First, ensure your username and password are correct. If they are, contact a board administrator to make sure you haven’t been banned. It is also possible the website owner has a configuration error on their end, and they would need to fix it.', ), array( 0 => 'I registered in the past but cannot login any more?!', @@ -61,15 +61,15 @@ $help = array( ), array( 0 => 'I’ve lost my password!', - 1 => 'Don’t panic! While your password cannot be retrieved, it can easily be reset. Visit the login page and click I forgot my password. Follow the instructions and you should be able to log in again shortly.
However, if you are not able to reset your password, contact the board administrator.' + 1 => 'Don’t panic! While your password cannot be retrieved, it can easily be reset. Visit the login page and click I forgot my password. Follow the instructions and you should be able to log in again shortly.
However, if you are not able to reset your password, contact the board administrator.', ), array( 0 => 'Why do I get logged off automatically?', - 1 => 'If you do not check the Remember me box when you login, the board will only keep you logged in for a preset time. This prevents misuse of your account by anyone else. To stay logged in, check the box during login. This is not recommended if you access the board from a shared computer, e.g. library, internet cafe, university computer lab, etc. If you do not see this checkbox, it means the board administrator has disabled this feature.' + 1 => 'If you do not check the Remember me box when you login, the board will only keep you logged in for a preset time. This prevents misuse of your account by anyone else. To stay logged in, check the Remember me box during login. This is not recommended if you access the board from a shared computer, e.g. library, internet cafe, university computer lab, etc. If you do not see this checkbox, it means the board administrator has disabled this feature.', ), array( 0 => 'What does the “Delete all board cookies” do?', - 1 => '“Delete all board cookies” deletes the cookies created by phpBB3 which keep you authenticated and logged into the board. It also provides functions such as read tracking if they have been enabled by the board owner. If you are having login or logout problems, deleting board cookies may help.', + 1 => '“Delete all board cookies” deletes the cookies created by phpBB which keep you authenticated and logged into the board. It also provides functions such as read tracking if they have been enabled by the board administrator. If you are having login or logout problems, deleting board cookies may help.', ), array( 0 => '--', @@ -77,7 +77,7 @@ $help = array( ), array( 0 => 'How do I change my settings?', - 1 => 'If you are a registered user, all your settings are stored in the board database. To alter them, visit your User Control Panel; a link can usually be found by clicking on your username at the top of board pages. This system will allow you to change all your settings and preferences.' + 1 => 'If you are a registered user, all your settings are stored in the board database. To alter them, visit your User Control Panel; a link can usually be found by clicking on your username at the top of board pages. This system will allow you to change all your settings and preferences.', ), array( 0 => 'How do I prevent my username appearing in the online user listings?', @@ -93,15 +93,15 @@ $help = array( ), array( 0 => 'My language is not in the list!', - 1 => 'Either the administrator has not installed your language or nobody has translated this board into your language. Try asking the board administrator if they can install the language pack you need. If the language pack does not exist, feel free to create a new translation. More information can be found at the phpBB® website.' + 1 => 'Either the administrator has not installed your language or nobody has translated this board into your language. Try asking the board administrator if they can install the language pack you need. If the language pack does not exist, feel free to create a new translation. More information can be found at the phpBB® website.', ), array( 0 => 'What do the images next to my username?', - 1 => 'There are two images which may appear along with a username when viewing posts. One of them may be an image associated with your rank, generally in the form of stars, blocks or dots, indicating how many posts you have made or your status on the board. Another, usually a larger image, is known as an avatar and is generally unique or personal to each user.' + 1 => 'There are two images which may appear along with a username when viewing posts. One of them may be an image associated with your rank, generally in the form of stars, blocks or dots, indicating how many posts you have made or your status on the board. Another, usually a larger image, is known as an avatar and is generally unique or personal to each user.', ), array( 0 => 'How do I display an avatar?', - 1 => 'Within your User Control Panel, under “Profile” you can add an avatar by using one of the four following methods: Gravatar, Gallery, Remote or Upload. It is up to the board administrator to enable avatars and to choose the way in which avatars can be made available. If you are unable to use avatars, contact a board administrator and ask them for their reasons.' + 1 => 'Within your User Control Panel, under “Profile” you can add an avatar by using one of the four following methods: Gravatar, Gallery, Remote or Upload. It is up to the board administrator to enable avatars and to choose the way in which avatars can be made available. If you are unable to use avatars, contact a board administrator.', ), array( 0 => 'What is my rank and how do I change it?', @@ -117,7 +117,7 @@ $help = array( ), array( 0 => 'How do I post a topic in a forum?', - 1 => 'To post a new topic in a forum, click the relevant button on either the forum or topic screens. You may need to register before you can post a message. A list of your permissions in each forum is available at the bottom of the forum and topic screens. Example: You can post new topics, You can post attachments, etc.' + 1 => 'To post a new topic in a forum, click the relevant button on either the forum or topic screens. You may need to register before you can post a message. A list of your permissions in each forum is available at the bottom of the forum and topic screens. Example: You can post new topics, You can post attachments, etc.', ), array( 0 => 'How do I edit or delete a post?', @@ -286,7 +286,7 @@ $help = array( ), array( 0 => 'Why does my search return no results?', - 1 => 'Your search was probably too vague and included many common terms which are not indexed by phpBB3. Be more specific and use the options available within Advanced search.' + 1 => 'Your search was probably too vague and included many common terms which are not indexed by phpBB. Be more specific and use the options available within Advanced search.', ), array( 0 => 'Why does my search return a blank page!?', @@ -298,19 +298,23 @@ $help = array( ), array( 0 => 'How can I find my own posts and topics?', - 1 => 'Your own posts can be retrieved either by clicking the “Show your posts” within the User Control Panel or by clicking “Search user’s posts” via your own profile page. To search for your topics, use the Advanced search page and fill in the various options appropriately.' + 1 => 'Your own posts can be retrieved either by clicking the “Show your posts” link within the User Control Panel or by clicking the “Search user’s posts” link via your own profile page or by clicking the “Quick links” menu on the top of the board. To search for your topics, use the Advanced search page and fill in the various options appropriately.', ), array( 0 => '--', - 1 => 'Topic Subscriptions and Bookmarks' + 1 => 'Subscriptions and Bookmarks', ), array( 0 => 'What is the difference between bookmarking and subscribing?', - 1 => 'Bookmarking in phpBB3 is much like bookmarking in your web browser. You aren’t alerted when there’s an update, but you can come back to the topic later. Subscribing, however, will notify you when there is an update to the topic or forum on the board via your preferred method or methods.' + 1 => 'With phpBB 3.0, bookmarking a topic was much like bookmarking in your web browser. You were not alerted when there was an update. Since phpBB 3.1, bookmarking is much like subscribing to a topic. You can to be notified when there is an update. However, unlike subscribing, you are not able to bookmark a forum.', ), array( - 0 => 'How do I subscribe to specific forums or topics?', - 1 => 'To subscribe to a specific forum, click the “Subscribe forum” link upon entering the forum.
To subscribe to a topic, reply to the topic with the subscribe checkbox checked or click the “Subscribe topic” link by clicking the button “Topic tools”.
These links are usually at the bottom of page.' + 0 => 'How do I bookmark or subscribe to specific topics?', + 1 => 'You can bookmark or subscribe to a specific topic by clicking the appropriate link in the “Topic tools” menu, conveniently located near the top and bottom of a topic discussion.
You can also subscribe, not bookmark, to a topic by replying to a topic and checking the “Notify me when a reply is posted” checkbox.', + ), + array( + 0 => 'How do I subscribe to specific forums?', + 1 => 'To subscribe to a specific forum, click the “Subscribe forum” link, at the bottom of page, upon entering the forum.', ), array( 0 => 'How do I remove my subscriptions?', @@ -330,11 +334,11 @@ $help = array( ), array( 0 => '--', - 1 => 'phpBB3 Issues' + 1 => 'phpBB Issues', ), array( 0 => 'Who wrote this bulletin board?', - 1 => 'This software (in its unmodified form) is produced, released and is copyright phpBB Limited. It is made available under the GNU General Public License, version 2 (GPL-2.0) and may be freely distributed. See the link for more details.' + 1 => 'This software (in its unmodified form) is produced, released and is copyright phpBB Limited. It is made available under the GNU General Public License, version 2 (GPL-2.0) and may be freely distributed. See the link for more details.', ), array( 0 => 'Why isn’t X feature available?', @@ -345,7 +349,7 @@ $help = array( 1 => 'Any of the administrators listed on the “The team” page should be an appropriate point of contact for your complaints. If this still gets no response then you should contact the owner of the domain (do a whois lookup) or, if this is running on a free service (e.g. Yahoo!, free.fr, f2s.com, etc.), the management or abuse department of that service. Please note that the phpBB Limited has absolutely no jurisdiction and cannot in any way be held liable over how, where or by whom this board is used. Do not contact the phpBB Limited in relation to any legal (cease and desist, liable, defamatory comment, etc.) matter not directly related to the phpBB.com website or the discrete software of phpBB itself. If you do email phpBB Limited about any third party use of this software then you should expect a terse response or no response at all.' ), array( - 0 => 'Who do I contact a board administrator?', - 1 => 'All users of the board can use the form “Contact us”, if the option was enabled by the board administrator.
Members of the board, can also use “The team” link.' + 0 => 'How do I contact a board administrator?', + 1 => 'All users of the board can use the “Contact us” form, if the option was enabled by the board administrator.
Members of the board can also use the “The team” link.', ), ); From 2bc79701e61c05ddacf643724400eae77c0c4bc2 Mon Sep 17 00:00:00 2001 From: Mario Skouat Date: Sat, 11 Oct 2014 10:43:01 +0200 Subject: [PATCH 09/11] [ticket/13041] Added multiple changes - Added the changes reported by VSE. PHPBB3-13041 --- phpBB/language/en/help_faq.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/phpBB/language/en/help_faq.php b/phpBB/language/en/help_faq.php index 4c73b105ea..caa34025a4 100644 --- a/phpBB/language/en/help_faq.php +++ b/phpBB/language/en/help_faq.php @@ -298,7 +298,7 @@ $help = array( ), array( 0 => 'How can I find my own posts and topics?', - 1 => 'Your own posts can be retrieved either by clicking the “Show your posts” link within the User Control Panel or by clicking the “Search user’s posts” link via your own profile page or by clicking the “Quick links” menu on the top of the board. To search for your topics, use the Advanced search page and fill in the various options appropriately.', + 1 => 'Your own posts can be retrieved either by clicking the “Show your posts” link within the User Control Panel or by clicking the “Search user’s posts” link via your own profile page or by clicking the “Quick links” menu at the top of the board. To search for your topics, use the Advanced search page and fill in the various options appropriately.', ), array( 0 => '--', @@ -306,7 +306,7 @@ $help = array( ), array( 0 => 'What is the difference between bookmarking and subscribing?', - 1 => 'With phpBB 3.0, bookmarking a topic was much like bookmarking in your web browser. You were not alerted when there was an update. Since phpBB 3.1, bookmarking is much like subscribing to a topic. You can to be notified when there is an update. However, unlike subscribing, you are not able to bookmark a forum.', + 1 => 'In phpBB 3.0, bookmarking topics worked much like bookmarking in a web browser. You were not alerted when there was an update. As of phpBB 3.1, bookmarking is more like subscribing to a topic. You can be notified when a bookmarked topic is updated. Subscribing, however, will notify you when there is an update to a topic or forum on the board. Notification options for bookmarks and subscriptions can be configured in the User Control Panel.', ), array( 0 => 'How do I bookmark or subscribe to specific topics?', From 737894027acb70eed46d8ee87e4be7c660902fd7 Mon Sep 17 00:00:00 2001 From: Mario Skouat Date: Sat, 18 Oct 2014 13:28:18 +0200 Subject: [PATCH 10/11] [ticket/13041] Added multiple changes - Improper english in some sentences. - Improper use of singular/plural in some sentences - Replace "the board administrator" by "a board administrator" - Update the category "Posting Issues" and "Subscriptions and Bookmarks" PHPBB3-13041 --- phpBB/language/en/help_faq.php | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/phpBB/language/en/help_faq.php b/phpBB/language/en/help_faq.php index caa34025a4..0327fc36eb 100644 --- a/phpBB/language/en/help_faq.php +++ b/phpBB/language/en/help_faq.php @@ -61,15 +61,15 @@ $help = array( ), array( 0 => 'I’ve lost my password!', - 1 => 'Don’t panic! While your password cannot be retrieved, it can easily be reset. Visit the login page and click I forgot my password. Follow the instructions and you should be able to log in again shortly.
However, if you are not able to reset your password, contact the board administrator.', + 1 => 'Don’t panic! While your password cannot be retrieved, it can easily be reset. Visit the login page and click I forgot my password. Follow the instructions and you should be able to log in again shortly.
However, if you are not able to reset your password, contact a board administrator.', ), array( 0 => 'Why do I get logged off automatically?', - 1 => 'If you do not check the Remember me box when you login, the board will only keep you logged in for a preset time. This prevents misuse of your account by anyone else. To stay logged in, check the Remember me box during login. This is not recommended if you access the board from a shared computer, e.g. library, internet cafe, university computer lab, etc. If you do not see this checkbox, it means the board administrator has disabled this feature.', + 1 => 'If you do not check the Remember me box when you login, the board will only keep you logged in for a preset time. This prevents misuse of your account by anyone else. To stay logged in, check the Remember me box during login. This is not recommended if you access the board from a shared computer, e.g. library, internet cafe, university computer lab, etc. If you do not see this checkbox, it means a board administrator has disabled this feature.', ), array( 0 => 'What does the “Delete all board cookies” do?', - 1 => '“Delete all board cookies” deletes the cookies created by phpBB which keep you authenticated and logged into the board. It also provides functions such as read tracking if they have been enabled by the board administrator. If you are having login or logout problems, deleting board cookies may help.', + 1 => '“Delete all board cookies” deletes the cookies created by phpBB which keep you authenticated and logged into the board. They also provide functions such as read tracking if they have been enabled by a board administrator. If you are having login or logout problems, deleting board cookies may help.', ), array( 0 => '--', @@ -93,10 +93,10 @@ $help = array( ), array( 0 => 'My language is not in the list!', - 1 => 'Either the administrator has not installed your language or nobody has translated this board into your language. Try asking the board administrator if they can install the language pack you need. If the language pack does not exist, feel free to create a new translation. More information can be found at the phpBB® website.', + 1 => 'Either the administrator has not installed your language or nobody has translated this board into your language. Try asking a board administrator if he can install the language pack you need. If the language pack does not exist, feel free to create a new translation. More information can be found at the phpBB® website.', ), array( - 0 => 'What do the images next to my username?', + 0 => 'What are the images next to my username?', 1 => 'There are two images which may appear along with a username when viewing posts. One of them may be an image associated with your rank, generally in the form of stars, blocks or dots, indicating how many posts you have made or your status on the board. Another, usually a larger image, is known as an avatar and is generally unique or personal to each user.', ), array( @@ -116,8 +116,8 @@ $help = array( 1 => 'Posting Issues' ), array( - 0 => 'How do I post a topic in a forum?', - 1 => 'To post a new topic in a forum, click the relevant button on either the forum or topic screens. You may need to register before you can post a message. A list of your permissions in each forum is available at the bottom of the forum and topic screens. Example: You can post new topics, You can post attachments, etc.', + 0 => 'How do I create a new topic in a forum or reply to any of them?', + 1 => 'Click the button “New Topic” on the forum screen or “Post Reply” on the topic screens. You may need to register before you can post a message. A list of your permissions in each forum is available at the bottom of the forum screen. Example: You can post new topics, You can post attachments, etc.', ), array( 0 => 'How do I edit or delete a post?', @@ -306,11 +306,11 @@ $help = array( ), array( 0 => 'What is the difference between bookmarking and subscribing?', - 1 => 'In phpBB 3.0, bookmarking topics worked much like bookmarking in a web browser. You were not alerted when there was an update. As of phpBB 3.1, bookmarking is more like subscribing to a topic. You can be notified when a bookmarked topic is updated. Subscribing, however, will notify you when there is an update to a topic or forum on the board. Notification options for bookmarks and subscriptions can be configured in the User Control Panel.', + 1 => 'In phpBB 3.0, bookmarking topics worked much like bookmarking in a web browser. You were not alerted when there was an update. As of phpBB 3.1, bookmarking is more like subscribing to a topic. You can be notified when a bookmarked topic is updated. Subscribing, however, will notify you when there is an update to a topic or forum on the board. Notification options for bookmarks and subscriptions can be configured in the User Control Panel, under “Board preferences”.', ), array( 0 => 'How do I bookmark or subscribe to specific topics?', - 1 => 'You can bookmark or subscribe to a specific topic by clicking the appropriate link in the “Topic tools” menu, conveniently located near the top and bottom of a topic discussion.
You can also subscribe, not bookmark, to a topic by replying to a topic and checking the “Notify me when a reply is posted” checkbox.', + 1 => 'You can add bookmark or subscribe to a specific topic by clicking the appropriate link in the “Topic tools” menu, conveniently located near the top and bottom of a topic discussion.
Replying to a topic with the “Notify me when a reply is posted” option checked will also subscribe you to the topic.', ), array( 0 => 'How do I subscribe to specific forums?', From 4b99ab70667c9aed0ba15943b53e1379eef3a86e Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Tue, 21 Oct 2014 09:54:25 -0700 Subject: [PATCH 11/11] [ticket/13041] Final grammar and language changes to help_faq PHPBB3-13041 --- phpBB/language/en/help_faq.php | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/phpBB/language/en/help_faq.php b/phpBB/language/en/help_faq.php index 0327fc36eb..69cb70df62 100644 --- a/phpBB/language/en/help_faq.php +++ b/phpBB/language/en/help_faq.php @@ -41,7 +41,7 @@ $help = array( ), array( 0 => 'What is COPPA?', - 1 => 'COPPA, or the Child Online Privacy and Protection Act of 1998, is a law in the United States requiring websites which can potentially collect information from minors under the age of 13 to have written parental consent or some other method of legal guardian acknowledgment, allowing the collection of personally identifiable information from a minor under the age of 13. If you are unsure if this applies to you as someone trying to register or to the website you are trying to register on, contact legal counsel for assistance. Please note that phpBB Limited and the owner’s of this board cannot provide legal advice and is not a point of contact for legal concerns of any kind, except as outlined in question “Who do I contact about abusive and/or legal matters related to this board?”.', + 1 => 'COPPA, or the Children’s Online Privacy Protection Act of 1998, is a law in the United States requiring websites which can potentially collect information from minors under the age of 13 to have written parental consent or some other method of legal guardian acknowledgment, allowing the collection of personally identifiable information from a minor under the age of 13. If you are unsure if this applies to you as someone trying to register or to the website you are trying to register on, contact legal counsel for assistance. Please note that phpBB Limited and the owner’s of this board cannot provide legal advice and is not a point of contact for legal concerns of any kind, except as outlined in question “Who do I contact about abusive and/or legal matters related to this board?”.', ), array( 0 => 'Why can’t I register?', @@ -69,7 +69,7 @@ $help = array( ), array( 0 => 'What does the “Delete all board cookies” do?', - 1 => '“Delete all board cookies” deletes the cookies created by phpBB which keep you authenticated and logged into the board. They also provide functions such as read tracking if they have been enabled by a board administrator. If you are having login or logout problems, deleting board cookies may help.', + 1 => '“Delete all board cookies” deletes the cookies created by phpBB which keep you authenticated and logged into the board. Cookies also provide functions such as read tracking if they have been enabled by a board administrator. If you are having login or logout problems, deleting board cookies may help.', ), array( 0 => '--', @@ -81,7 +81,7 @@ $help = array( ), array( 0 => 'How do I prevent my username appearing in the online user listings?', - 1 => 'Within your User Control Panel, under “Board preferences”, you will find the option Hide your online status. Enable this option with Yes and you will only appear to the administrators, moderators and yourself. You will be counted as a hidden user.' + 1 => 'Within your User Control Panel, under “Board preferences”, you will find the option Hide your online status. Enable this option and you will only appear to the administrators, moderators and yourself. You will be counted as a hidden user.' ), array( 0 => 'The times are not correct!', @@ -93,11 +93,11 @@ $help = array( ), array( 0 => 'My language is not in the list!', - 1 => 'Either the administrator has not installed your language or nobody has translated this board into your language. Try asking a board administrator if he can install the language pack you need. If the language pack does not exist, feel free to create a new translation. More information can be found at the phpBB® website.', + 1 => 'Either the administrator has not installed your language or nobody has translated this board into your language. Try asking a board administrator if they can install the language pack you need. If the language pack does not exist, feel free to create a new translation. More information can be found at the phpBB® website.', ), array( 0 => 'What are the images next to my username?', - 1 => 'There are two images which may appear along with a username when viewing posts. One of them may be an image associated with your rank, generally in the form of stars, blocks or dots, indicating how many posts you have made or your status on the board. Another, usually a larger image, is known as an avatar and is generally unique or personal to each user.', + 1 => 'There are two images which may appear along with a username when viewing posts. One of them may be an image associated with your rank, generally in the form of stars, blocks or dots, indicating how many posts you have made or your status on the board. Another, usually larger, image is known as an avatar and is generally unique or personal to each user.', ), array( 0 => 'How do I display an avatar?', @@ -116,8 +116,8 @@ $help = array( 1 => 'Posting Issues' ), array( - 0 => 'How do I create a new topic in a forum or reply to any of them?', - 1 => 'Click the button “New Topic” on the forum screen or “Post Reply” on the topic screens. You may need to register before you can post a message. A list of your permissions in each forum is available at the bottom of the forum screen. Example: You can post new topics, You can post attachments, etc.', + 0 => 'How do I create a new topic or post a reply?', + 1 => 'To post a new topic in a forum, click "New Topic". To post a reply to a topic, click "Post Reply". You may need to register before you can post a message. A list of your permissions in each forum is available at the bottom of the forum and topic screens. Example: You can post new topics, You can post attachments, etc.', ), array( 0 => 'How do I edit or delete a post?', @@ -310,7 +310,7 @@ $help = array( ), array( 0 => 'How do I bookmark or subscribe to specific topics?', - 1 => 'You can add bookmark or subscribe to a specific topic by clicking the appropriate link in the “Topic tools” menu, conveniently located near the top and bottom of a topic discussion.
Replying to a topic with the “Notify me when a reply is posted” option checked will also subscribe you to the topic.', + 1 => 'You can bookmark or subscribe to a specific topic by clicking the appropriate link in the “Topic tools” menu, conveniently located near the top and bottom of a topic discussion.
Replying to a topic with the “Notify me when a reply is posted” option checked will also subscribe you to the topic.', ), array( 0 => 'How do I subscribe to specific forums?', @@ -338,7 +338,7 @@ $help = array( ), array( 0 => 'Who wrote this bulletin board?', - 1 => 'This software (in its unmodified form) is produced, released and is copyright phpBB Limited. It is made available under the GNU General Public License, version 2 (GPL-2.0) and may be freely distributed. See the link for more details.', + 1 => 'This software (in its unmodified form) is produced, released and is copyright phpBB Limited. It is made available under the GNU General Public License, version 2 (GPL-2.0) and may be freely distributed. See About phpBB for more details.', ), array( 0 => 'Why isn’t X feature available?',