More language changes

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9933 89ea8834-ac86-4346-8a33-228a782c2dd0
author: Yuriy Rusko <marshalrusty@phpbb.com> 2009-08-06 09:12:21 +0000
committer: Yuriy Rusko <marshalrusty@phpbb.com> 2009-08-06 09:12:21 +0000
commit: 380b11fe2249f48352d63297119465b6081b1268 (patch)
tree: ccd41f5acbc28340e2d24c243e0a68259868e740 /phpBB
parent: a7509b226a2561b77297b54a1c9391f9fd68d61c (diff)
download: forums-380b11fe2249f48352d63297119465b6081b1268.tar
forums-380b11fe2249f48352d63297119465b6081b1268.tar.gz
forums-380b11fe2249f48352d63297119465b6081b1268.tar.bz2
forums-380b11fe2249f48352d63297119465b6081b1268.tar.xz
forums-380b11fe2249f48352d63297119465b6081b1268.zip
16 files changed, 37 insertions, 37 deletions
diff --git a/phpBB/language/en/acp/prune.php b/phpBB/language/en/acp/prune.php
index 5e313d20e2..8a06225102 100644
--- a/phpBB/language/en/acp/prune.php
+++ b/phpBB/language/en/acp/prune.php
@@ -37,10 +37,10 @@ if (empty($lang) || !is_array($lang))
 
 // User pruning
 $lang = array_merge($lang, array(
-	'ACP_PRUNE_USERS_EXPLAIN'	=> 'Here you can delete (or deactivate) users from your board. This can be done in a variety of ways; by post count, last activity, etc. Each of these criteria can be combined, i.e. you can prune users last active before 2002-01-01 with fewer than 10 posts. Alternatively you can enter a list of users directly into the text box, each on a separate line - any criteria entered will be ignored. Take care with this facility! Once a user is deleted there is no way back.',
+	'ACP_PRUNE_USERS_EXPLAIN'	=> 'This section allows you to delete or deactivate users on your board. Accounts can be filtered in a variety of ways; by post count, most recent activity, etc. Criteria may be combined to narrow down which accounts are affected. For example, you can prune users with fewer than 10 posts, who were also inactive after 2002-01-01. Alternatively, you may skip the criteria selection completely by entering a list of users (each on a separate line) into the text field. Take care with this facility! Once a user is deleted, there is no way to reverse the action.',
 
 	'DEACTIVATE_DELETE'			=> 'Deactivate or delete',
-	'DEACTIVATE_DELETE_EXPLAIN'	=> 'Choose whether to deactivate users or delete them entirely, note there is no undo!',
+	'DEACTIVATE_DELETE_EXPLAIN'	=> 'Choose whether to deactivate users or delete them entirely. Please note that deleted users cannot be restored!',
 	'DELETE_USERS'				=> 'Delete',
 	'DELETE_USER_POSTS'			=> 'Delete pruned user posts',
 	'DELETE_USER_POSTS_EXPLAIN' => 'Removes posts made by deleted users, has no effect if users are deactivated.',
diff --git a/phpBB/language/en/captcha_qa.php b/phpBB/language/en/captcha_qa.php
index b07438f2bb..ef09f65951 100644
--- a/phpBB/language/en/captcha_qa.php
+++ b/phpBB/language/en/captcha_qa.php
@@ -37,27 +37,27 @@ if (empty($lang) || !is_array($lang))
 
 $lang = array_merge($lang, array(
 	'CAPTCHA_QA'				=> 'Q&amp;A CAPTCHA',
-	'CONFIRM_QUESTION_EXPLAIN'	=> 'Please answer this question to avoid automated registrations.',
-	'CONFIRM_QUESTION_WRONG'	=> 'The answer to the confirmation question was not recognized.',
+	'CONFIRM_QUESTION_EXPLAIN'	=> 'The following question is a means of identifying and preventing automated submissions.',
+	'CONFIRM_QUESTION_WRONG'	=> 'You have provided an invalid answer to the confirmation question.',
 
 	'QUESTION_ANSWERS'			=> 'Answers',
-	'ANSWERS_EXPLAIN'			=> 'The Answers. Please write one answer per line.',
+	'ANSWERS_EXPLAIN'			=> 'Please enter valid answers to the question, one per line.',
 	'CONFIRM_QUESTION'			=> 'Question',
 
 	'ANSWER'					=> 'Answer',
 	'EDIT_QUESTION'				=> 'Edit Question',
 	'QUESTIONS'					=> 'Questions',
-	'QUESTIONS_EXPLAIN'			=> 'Here you can add and edit questions to be asked on registration. You have to provide at least one question in the default board language to use this plugin. Questions should be easy for your target audience, but beyond the ability of Google™. Also, remember to change the questions regularly. If your question relies on punctuation, spelling or capitalisation, use the strict setting.',
+	'QUESTIONS_EXPLAIN'			=> 'During registration, users will be asked one of the questions specified here. To use this plugin, at least one question must be set in the default language. These questions should be easy for your target audience to answer, but beyond the ability of a bot capable of running a Google™ search. Using a large and regulary changed set of questions will yield the best results. Enable the strict setting if your question relies on punctuation or capitalisation.',
 	'QUESTION_DELETED'			=> 'Question deleted',
 	'QUESTION_LANG'				=> 'Language',
-	'QUESTION_LANG_EXPLAIN'		=> 'The language this question and its answers is written in.',
+	'QUESTION_LANG_EXPLAIN'		=> 'The language that this question and its answers are written in.',
 	'QUESTION_STRICT'			=> 'Strict check',
-	'QUESTION_STRICT_EXPLAIN'	=> 'If enabled, the check also recognizes capitalization and whitespaces.',
+	'QUESTION_STRICT_EXPLAIN'	=> 'If enabled, capitalisation and whitespace will also be enforced.',
 
 	'QUESTION_TEXT'				=> 'Question',
 	'QUESTION_TEXT_EXPLAIN'		=> 'The question that will be asked on registration.',
 
-	'QA_ERROR_MSG'				=> 'Please fill out all fields and enter at least one answer.',
+	'QA_ERROR_MSG'				=> 'Please fill in all fields and enter at least one answer.',
 ));
 
 ?>
 \ No newline at end of file
diff --git a/phpBB/language/en/captcha_recaptcha.php b/phpBB/language/en/captcha_recaptcha.php
index e2d20ac4eb..897e8a4979 100644
--- a/phpBB/language/en/captcha_recaptcha.php
+++ b/phpBB/language/en/captcha_recaptcha.php
@@ -46,7 +46,7 @@ $lang = array_merge($lang, array(
 	'RECAPTCHA_PRIVATE'				=> 'Private reCaptcha key',
 	'RECAPTCHA_PRIVATE_EXPLAIN'		=> 'Your private reCaptcha key. Keys can be obtained on <a href="http://recaptcha.net">reCaptcha.net</a>.',
 
-	'RECAPTCHA_EXPLAIN'				=> 'Please enter both of the words displayed below into the text field underneath. This is a measure taken to prevent spam.',
+	'RECAPTCHA_EXPLAIN'				=> 'In an effort to prevent automatic submissions, we require that you enter both of the words displayed below into the text field underneath.',
 ));
 
 ?>
 \ No newline at end of file
diff --git a/phpBB/language/en/email/admin_welcome_inactive.txt b/phpBB/language/en/email/admin_welcome_inactive.txt
index f962b8a99c..af3ac9ca87 100644
--- a/phpBB/language/en/email/admin_welcome_inactive.txt
+++ b/phpBB/language/en/email/admin_welcome_inactive.txt
@@ -10,9 +10,9 @@ Username: {USERNAME}
 Board URL: {U_BOARD}
 ----------------------------
 
-Your account is currently inactive, the administrator of the board will need to activate it before you can log in. You will receive another e-mail when this has occurred.
+Your account is currently inactive and will need to be approved by an administrator before you can log in. Another email will be sent when this had occured.
 
-Please do not forget your password as it has been encrypted in our database and we cannot retrieve it for you. However, should you forget your password you can request a new one which will be activated in the same way as this account.
+Your password has been securely stored in our database and cannot be retrieved. In the event that it is forgotten, you will be able to reset it using the email address associated with your account.
 
 Thank you for registering.
 
diff --git a/phpBB/language/en/email/coppa_resend_inactive.txt b/phpBB/language/en/email/coppa_resend_inactive.txt
index 9d43ca4f85..c3e4af576d 100644
--- a/phpBB/language/en/email/coppa_resend_inactive.txt
+++ b/phpBB/language/en/email/coppa_resend_inactive.txt
@@ -2,9 +2,9 @@ Subject: Welcome to "{SITENAME}"
 
 {WELCOME_MSG}
 
-In compliance with the COPPA your account is currently inactive.
+In compliance with the COPPA, your account is currently inactive.
 
-Please print this message out and have your parent or guardian sign and date it. Then fax it to:
+Please print this message and have your parent or guardian sign and date it. Then fax it to:
 
 {FAX_INFO}
 
@@ -33,9 +33,9 @@ Date: _______________
 ------------------------------ CUT HERE ------------------------------
 
 
-Once the administrator has received the above form via fax or regular mail your account will be activated.
+Once the administrator has received the above form via fax or regular mail, your account will be activated.
 
-Please do not forget your password as it has been encrypted in our database and we cannot retrieve it for you. However, should you forget your password you can request a new one which will be activated in the same way as this account.
+Your password has been securely stored in our database and cannot be retrieved. In the event that it is forgotten, you will be able to reset it using the email address associated with your account.
 
 Thank you for registering.
 
diff --git a/phpBB/language/en/email/coppa_welcome_inactive.txt b/phpBB/language/en/email/coppa_welcome_inactive.txt
index 9d43ca4f85..c3e4af576d 100644
--- a/phpBB/language/en/email/coppa_welcome_inactive.txt
+++ b/phpBB/language/en/email/coppa_welcome_inactive.txt
@@ -2,9 +2,9 @@ Subject: Welcome to "{SITENAME}"
 
 {WELCOME_MSG}
 
-In compliance with the COPPA your account is currently inactive.
+In compliance with the COPPA, your account is currently inactive.
 
-Please print this message out and have your parent or guardian sign and date it. Then fax it to:
+Please print this message and have your parent or guardian sign and date it. Then fax it to:
 
 {FAX_INFO}
 
@@ -33,9 +33,9 @@ Date: _______________
 ------------------------------ CUT HERE ------------------------------
 
 
-Once the administrator has received the above form via fax or regular mail your account will be activated.
+Once the administrator has received the above form via fax or regular mail, your account will be activated.
 
-Please do not forget your password as it has been encrypted in our database and we cannot retrieve it for you. However, should you forget your password you can request a new one which will be activated in the same way as this account.
+Your password has been securely stored in our database and cannot be retrieved. In the event that it is forgotten, you will be able to reset it using the email address associated with your account.
 
 Thank you for registering.
 
diff --git a/phpBB/language/en/email/installed.txt b/phpBB/language/en/email/installed.txt
index 72b3d8edeb..2aa03a7f33 100644
--- a/phpBB/language/en/email/installed.txt
+++ b/phpBB/language/en/email/installed.txt
@@ -4,7 +4,7 @@ Congratulations,
 
 You have successfully installed phpBB on your server.
 
-This e-mail contains important information on your installation that you should keep safe. The password has been encrypted in the database and cannot be recovered, although you can request a new password should you lose this one.
+This e-mail contains important information regarding your installation and should be kept for reference. Your password has been securely stored in our database and cannot be retrieved. In the event that it is forgotten, you will be able to reset it using the email address associated with your account.
 
 ----------------------------
 Username: {USERNAME}
@@ -12,8 +12,8 @@ Username: {USERNAME}
 Board URL: {U_BOARD}
 ----------------------------
 
-Useful information on your phpBB installation can be found in the docs folder of your installation and on phpBB.com's support page - http://www.phpbb.com/support/
+Useful information regarding the phpBB software can be found in the docs folder of your installation and on phpBB.com's support page - http://www.phpbb.com/support/
 
-In order to keep the board safe and secure, it is highly recommended that you keep current with software releases which can be easily done by subscribing to phpBB.com's mailing list, located at the above URL.
+In order to keep your board safe and secure, we highly recommended keeping current with software releases. For your convenience, a mailing list is available at the page referenced above.
 
 {EMAIL_SIG}
 \ No newline at end of file
diff --git a/phpBB/language/en/email/pm_report_closed.txt b/phpBB/language/en/email/pm_report_closed.txt
index 752a640867..1b9f4a6658 100644
--- a/phpBB/language/en/email/pm_report_closed.txt
+++ b/phpBB/language/en/email/pm_report_closed.txt
@@ -2,7 +2,7 @@ Subject: Report closed - "{PM_SUBJECT}"
 
 Hello {USERNAME},
 
-You are receiving this notification because the report you filed on the private message "{PM_SUBJECT}" at "{SITENAME}" was handled by a moderator or by an administrator. The report was afterwards closed. If you have further questions contact {CLOSER_NAME} with a personal message.
+You are receiving this notification because the report you filed regarding the private message "{PM_SUBJECT}" at "{SITENAME}" has been tended to by a moderator or administrator. The report is now closed. If you have further questions, please contact {CLOSER_NAME} by private message.
 
 
 {EMAIL_SIG}
 \ No newline at end of file
diff --git a/phpBB/language/en/email/pm_report_deleted.txt b/phpBB/language/en/email/pm_report_deleted.txt
index 04e4bd1404..8cb7fdd6fa 100644
--- a/phpBB/language/en/email/pm_report_deleted.txt
+++ b/phpBB/language/en/email/pm_report_deleted.txt
@@ -2,7 +2,7 @@ Subject: Report deleted - "{PM_SUBJECT}"
 
 Hello {USERNAME},
 
-You are receiving this notification because the report you filed on the post "{PM_SUBJECT}" at "{SITENAME}" was deleted by a moderator or by an administrator.
+You are receiving this notification because the report you filed regarding the post "{PM_SUBJECT}" at "{SITENAME}" was deleted by a moderator or administrator.
 
 
 {EMAIL_SIG}
 \ No newline at end of file
diff --git a/phpBB/language/en/email/user_reactivate_account.txt b/phpBB/language/en/email/user_reactivate_account.txt
index b5639d0b7a..4ef7dd899a 100644
--- a/phpBB/language/en/email/user_reactivate_account.txt
+++ b/phpBB/language/en/email/user_reactivate_account.txt
@@ -9,7 +9,7 @@ Please keep this e-mail for your records. Your account information is as follows
 Username: {USERNAME}
 ----------------------------
 
-Your password has been encrypted in our database. Should you forget your password you can request a new one which will be activated in the same way as this account.
+Your password has been securely stored in our database and cannot be retrieved. In the event that it is forgotten, you will be able to reset it using the email address associated with your account.
 
 Please visit the following link to reactivate your account:
 
diff --git a/phpBB/language/en/email/user_remind_inactive.txt b/phpBB/language/en/email/user_remind_inactive.txt
index 49dea02044..1ba28329f6 100644
--- a/phpBB/language/en/email/user_remind_inactive.txt
+++ b/phpBB/language/en/email/user_remind_inactive.txt
@@ -2,7 +2,7 @@ Subject: Inactive account reminder
 
 Hello {USERNAME},
 
-On {REGISTER_DATE} you registered a new account at "{SITENAME}". To date you have not activated this account which is a prerequisite for board login. For your convenience the activation link is repeated below.
+This notification is a reminder that your account at "{SITENAME}", created on {REGISTER_DATE}, remains inactive. If you would like to activate this account, please visit the following link:
 
 {U_ACTIVATE}
 
diff --git a/phpBB/language/en/email/user_resend_inactive.txt b/phpBB/language/en/email/user_resend_inactive.txt
index 5635801b80..4638d6df63 100644
--- a/phpBB/language/en/email/user_resend_inactive.txt
+++ b/phpBB/language/en/email/user_resend_inactive.txt
@@ -8,9 +8,9 @@ Please keep this e-mail for your records. Your account information is as follows
 Username: {USERNAME}
 ----------------------------
 
-Your password has been encrypted in our database. Should you forget your password you can request a new one which will be activated in the same way as this account.
+Your password has been securely stored in our database and cannot be retrieved. In the event that it is forgotten, you will be able to reset it using the email address associated with your account.
 
-Your account is currently inactive. You cannot use it until you visit the following link:
+Please visit the following link in order to activate your account:
 
 {U_ACTIVATE}
 
diff --git a/phpBB/language/en/email/user_welcome.txt b/phpBB/language/en/email/user_welcome.txt
index ebe42d8f91..2648769dfd 100644
--- a/phpBB/language/en/email/user_welcome.txt
+++ b/phpBB/language/en/email/user_welcome.txt
@@ -10,7 +10,7 @@ Username: {USERNAME}
 Board URL: {U_BOARD}
 ----------------------------
 
-Please do not forget your password as it has been encrypted in our database and we cannot retrieve it for you. However, should you forget your password you can request a new one which will be activated in the same way as this account.
+Your password has been securely stored in our database and cannot be retrieved. In the event that it is forgotten, you will be able to reset it using the email address associated with your account.
 
 Thank you for registering.
 
diff --git a/phpBB/language/en/email/user_welcome_inactive.txt b/phpBB/language/en/email/user_welcome_inactive.txt
index 80ad1b8abd..1b72b1c5a8 100644
--- a/phpBB/language/en/email/user_welcome_inactive.txt
+++ b/phpBB/language/en/email/user_welcome_inactive.txt
@@ -10,11 +10,11 @@ Username: {USERNAME}
 Board URL: {U_BOARD}
 ----------------------------
 
-Your account is currently inactive. You cannot use it until you visit the following link:
+Please visit the following link in order to activate your account:
 
 {U_ACTIVATE}
 
-Please do not forget your password as it has been encrypted in our database and we cannot retrieve it for you. However, should you forget your password you can request a new one which will be activated in the same way as this account.
+Your password has been securely stored in our database and cannot be retrieved. In the event that it is forgotten, you will be able to reset it using the email address associated with your account.
 
 Thank you for registering.
 
diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php
index f55468363c..536d0b5bc7 100644
--- a/phpBB/language/en/install.php
+++ b/phpBB/language/en/install.php
@@ -133,7 +133,7 @@ $lang = array_merge($lang, array(
 	'DB_PASSWORD'				=> 'Database password',
 	'DB_PORT'					=> 'Database server port',
 	'DB_PORT_EXPLAIN'			=> 'Leave this blank unless you know the server operates on a non-standard port.',
-	'DB_UPDATE_NOT_SUPPORTED'	=> 'Sorry, but you are not able to update your phpBB database with this script. This update script updates the phpBB database from at least version “%1$s”, but your version is “%2$s”. Please try to update to an older version of phpBB first or post within our support forums to get more help.',
+	'DB_UPDATE_NOT_SUPPORTED'	=> 'We are sorry, but this script does not support updating from versions of phpBB prior to “%1$s”. The version you currently have installed is “%2$s”. Please update to a previous version before running this script. Assistance with this is available in the Support Forum on phpBB.com.',
 	'DB_USERNAME'				=> 'Database username',
 	'DB_TEST'					=> 'Test connection',
 	'DEFAULT_LANG'				=> 'Default board language',
@@ -185,11 +185,11 @@ $lang = array_merge($lang, array(
 	'INITIAL_CONFIG_EXPLAIN'	=> 'Now that install has determined your server can run phpBB you need to supply some specific information. If you do not know how to connect to your database please contact your hosting provider (in the first instance) or use the phpBB support forums. When entering data please ensure you check it thoroughly before continuing.',
 	'INSTALL_CONGRATS'			=> 'Congratulations!',
 	'INSTALL_CONGRATS_EXPLAIN'	=> '
-		You have now successfully installed phpBB %1$s. From here, you have two options as to what to do with your newly installed phpBB3:</p>
+		You have successfully installed phpBB %1$s. Please proceed by choosing one of the following opions:</p>
 		<h2>Convert an existing board to phpBB3</h2>
-		<p>The phpBB Unified Convertor Framework supports the conversion of phpBB 2.0.x and other board systems to phpBB3. If you have an existing board that you wish to convert, please <a href="%2$s">proceed on to the convertor</a>.</p>
+		<p>The phpBB Unified Convertor Framework supports the conversion of phpBB 2.0.x and other board systems to phpBB3. If you have an existing board that you wish to convert, please <a href="%2$s">proceed to the convertor</a>.</p>
 		<h2>Go live with your phpBB3!</h2>
-		<p>Clicking the button below will take you to your Administration Control Panel (ACP). Take some time to examine the options available to you. Remember that help is available online via the <a href="http://www.phpbb.com/support/documentation/3.0/">Documentation</a> and the <a href="http://www.phpbb.com/community/viewforum.php?f=46">support forums</a>, see the <a href="%3$s">README</a> for further information.</p><p><strong>Please now delete, move or rename the install directory before you use your board. If this directory is still present, only the Administration Control Panel (ACP) will be accessible.</strong>',
+		<p>Clicking the button below will take you to your Administration Control Panel (ACP). Take some time to examine the options available to you. Remember that help is available online via the <a href="http://www.phpbb.com/support/documentation/3.0/">Documentation</a>, <a href="%3$s">README</a> and the <a href="http://www.phpbb.com/community/viewforum.php?f=46">Support Forums</a>.</p><p><strong>Please delete, move or rename the install directory before using your board. While this directory exists, only the Administration Control Panel (ACP) will be accessible.</strong>',
 	'INSTALL_INTRO'				=> 'Welcome to Installation',
 
 	'INSTALL_INTRO_BODY'		=> 'With this option, it is possible to install phpBB3 onto your server.</p><p>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:</p>
diff --git a/phpBB/language/en/memberlist.php b/phpBB/language/en/memberlist.php
index d6892eb31b..e7a9c6b88d 100644
--- a/phpBB/language/en/memberlist.php
+++ b/phpBB/language/en/memberlist.php
@@ -135,7 +135,7 @@ $lang = array_merge($lang, array(
 	'USER_BAN'				=> 'Banning',
 	'USER_FORUM'			=> 'User statistics',
 	'USER_LAST_REMINDED'	=> array(
-		0		=> 'No reminder sent yet',
+		0		=> 'No reminder sent at this time',
 		1		=> '%1$d reminder sent<br />» %2$s',
 	),
 	'USER_ONLINE'			=> 'Online',
author	Yuriy Rusko <marshalrusty@phpbb.com>	2009-08-06 09:12:21 +0000
committer	Yuriy Rusko <marshalrusty@phpbb.com>	2009-08-06 09:12:21 +0000
commit	380b11fe2249f48352d63297119465b6081b1268 (patch)
tree	ccd41f5acbc28340e2d24c243e0a68259868e740 /phpBB
parent	a7509b226a2561b77297b54a1c9391f9fd68d61c (diff)
download	forums-380b11fe2249f48352d63297119465b6081b1268.tar forums-380b11fe2249f48352d63297119465b6081b1268.tar.gz forums-380b11fe2249f48352d63297119465b6081b1268.tar.bz2 forums-380b11fe2249f48352d63297119465b6081b1268.tar.xz forums-380b11fe2249f48352d63297119465b6081b1268.zip