diff options
| author | Jonathan Stanley <shs@users.sourceforge.net> | 2006-10-28 21:17:42 +0000 |
|---|---|---|
| committer | Jonathan Stanley <shs@users.sourceforge.net> | 2006-10-28 21:17:42 +0000 |
| commit | 59d78ec21bce24cbf0746bfb3cf4ecc1e465be4b (patch) | |
| tree | d5ec689915da177beabebf8d474f009b50a836ea /phpBB/language/en | |
| parent | a23103ba54e553be68e1232a7b1841c4a9ca447c (diff) | |
| download | forums-59d78ec21bce24cbf0746bfb3cf4ecc1e465be4b.tar forums-59d78ec21bce24cbf0746bfb3cf4ecc1e465be4b.tar.gz forums-59d78ec21bce24cbf0746bfb3cf4ecc1e465be4b.tar.bz2 forums-59d78ec21bce24cbf0746bfb3cf4ecc1e465be4b.tar.xz forums-59d78ec21bce24cbf0746bfb3cf4ecc1e465be4b.zip | |
#4880
#4882
#4884
#4898
#4910
#4926
#4928
#4930
#4934
#4936
#4938
#4942
#4944
#4946
#4948
#4950
#4952
#4954
#4956
#4960
#4972
#4980
git-svn-id: file:///svn/phpbb/trunk@6535 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/language/en')
20 files changed, 36 insertions, 36 deletions
diff --git a/phpBB/language/en/acp/users.php b/phpBB/language/en/acp/users.php index 9745aa853a..f9d5301b88 100644 --- a/phpBB/language/en/acp/users.php +++ b/phpBB/language/en/acp/users.php @@ -54,7 +54,7 @@ $lang = array_merge($lang, array( 'FORCE_REACTIVATION_SUCCESS' => 'Successfully forced re-activation.', 'FOUNDER' => 'Founder', - 'FOUNDER_EXPLAIN' => 'Founders can never be banned, deleted or altered by non-founder members', + 'FOUNDER_EXPLAIN' => 'Founders have all admin permissions and can never be banned, deleted or altered by non-founder members', 'GROUP_DEFAULT' => 'Default', 'GROUP_DELETE' => 'Delete', diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index 99964c60b3..d7e4cbd50e 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -114,7 +114,7 @@ $lang = array_merge($lang, array( 'CONNECTION_FAILED' => 'Connection failed', 'CONNECTION_SUCCESS' => 'Connection was successful!', 'COOKIES_DELETED' => 'All board cookies successfully deleted.', - 'CURRENT_TIME' => 'The time is %s', + 'CURRENT_TIME' => 'It is currently %s', 'DAY' => 'Day', 'DAYS' => 'Days', diff --git a/phpBB/language/en/email/admin_welcome_activated.txt b/phpBB/language/en/email/admin_welcome_activated.txt index abd1391df8..0e4658b969 100644 --- a/phpBB/language/en/email/admin_welcome_activated.txt +++ b/phpBB/language/en/email/admin_welcome_activated.txt @@ -1,4 +1,4 @@ -Subject: Account Activated +Subject: Account activated Hello {USERNAME}, diff --git a/phpBB/language/en/email/admin_welcome_inactive.txt b/phpBB/language/en/email/admin_welcome_inactive.txt index a9cd4e5db0..8a06683586 100644 --- a/phpBB/language/en/email/admin_welcome_inactive.txt +++ b/phpBB/language/en/email/admin_welcome_inactive.txt @@ -1,4 +1,4 @@ -Subject: Welcome to {SITENAME} Forums +Subject: Welcome to {SITENAME} ({U_BOARD}) {WELCOME_MSG} diff --git a/phpBB/language/en/email/coppa_resend_inactive.txt b/phpBB/language/en/email/coppa_resend_inactive.txt index 8c8b8795ce..b3d745ffbb 100644 --- a/phpBB/language/en/email/coppa_resend_inactive.txt +++ b/phpBB/language/en/email/coppa_resend_inactive.txt @@ -1,4 +1,4 @@ -Subject: Welcome to {SITENAME} Forums +Subject: Welcome to {SITENAME} ({U_BOARD}) {WELCOME_MSG} @@ -13,7 +13,7 @@ OR mail it to: {MAIL_INFO} ------------------------------ CUT HERE ------------------------------ -Permission to Participate at {SITENAME} +Permission to participate at {SITENAME} Username: {USERNAME} Email: {EMAIL_ADDRESS} @@ -23,7 +23,7 @@ I UNDERSTAND THIS INFORMATION CAN BE CHANGED AT ANY TIME BY ENTERING A PASSWORD. I UNDERSTAND THAT I MAY REQUEST FOR THIS INFORMATION TO BE REMOVED FROM {SITENAME} AT ANY TIME. -Parent or Guardian +Parent or guardian (print your name here): _____________________ (sign here): __________________ diff --git a/phpBB/language/en/email/coppa_welcome_inactive.txt b/phpBB/language/en/email/coppa_welcome_inactive.txt index 71431a2712..3acc7e2007 100644 --- a/phpBB/language/en/email/coppa_welcome_inactive.txt +++ b/phpBB/language/en/email/coppa_welcome_inactive.txt @@ -1,4 +1,4 @@ -Subject: Welcome to {SITENAME} Forums +Subject: Welcome to {SITENAME} ({U_BOARD}) {WELCOME_MSG} @@ -13,7 +13,7 @@ OR mail it to: {MAIL_INFO} ------------------------------ CUT HERE ------------------------------ -Permission to Participate at {SITENAME} +Permission to participate at {SITENAME} Username: {USERNAME} Password: {PASSWORD} @@ -24,7 +24,7 @@ I UNDERSTAND THIS INFORMATION CAN BE CHANGED AT ANY TIME BY ENTERING A PASSWORD. I UNDERSTAND THAT I MAY REQUEST FOR THIS INFORMATION TO BE REMOVED FROM {SITENAME} AT ANY TIME. -Parent or Guardian +Parent or guardian (print your name here): _____________________ (sign here): __________________ diff --git a/phpBB/language/en/email/forum_notify.txt b/phpBB/language/en/email/forum_notify.txt index e69046f921..0c84b32d93 100644 --- a/phpBB/language/en/email/forum_notify.txt +++ b/phpBB/language/en/email/forum_notify.txt @@ -1,4 +1,4 @@ -Subject: Forum Post Notification - {FORUM_NAME} +Subject: Forum post notification - {FORUM_NAME} Hello {USERNAME}, @@ -6,7 +6,7 @@ You are receiving this email because you are watching the forum, "{FORUM_NAME}" {U_NEWEST_POST} -If you no longer wish to watch this forum you can either click the "Unsubscribe forum link" found in the forum above, or by clicking the following link: +If you no longer wish to watch this forum you can either click the "Unsubscribe forum" link found in the forum above, or by clicking the following link: {U_STOP_WATCHING_FORUM} diff --git a/phpBB/language/en/email/installed.txt b/phpBB/language/en/email/installed.txt index cb6944ceef..61cd345774 100644 --- a/phpBB/language/en/email/installed.txt +++ b/phpBB/language/en/email/installed.txt @@ -1,4 +1,4 @@ -Subject: phpBB Installed +Subject: phpBB installed Congratulations, @@ -13,8 +13,8 @@ Password: {PASSWORD} Board URL: {U_BOARD} ---------------------------- -Useful information on your phpBB installation can be found in the docs folder of your installation and on our website - http://www.phpbb.com/support/ +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/ -We recommend that in order to stay current with software releases you subscribe to our mailing list, located at the above URL. +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. {EMAIL_SIG}
\ No newline at end of file diff --git a/phpBB/language/en/email/newtopic_notify.txt b/phpBB/language/en/email/newtopic_notify.txt index 3a7dd72a11..5ea7efc6b5 100644 --- a/phpBB/language/en/email/newtopic_notify.txt +++ b/phpBB/language/en/email/newtopic_notify.txt @@ -1,4 +1,4 @@ -Subject: New Topic Notification - {FORUM_NAME} +Subject: New topic notification - {FORUM_NAME} Hello {USERNAME}, @@ -6,7 +6,7 @@ You are receiving this email because you are watching the forum, "{FORUM_NAME}" {U_FORUM} -If you no longer wish to watch this forum you can either click the "Unsubscribe forum link" found in the forum above, or by clicking the following link: +If you no longer wish to watch this forum you can either click the "Unsubscribe forum" link found in the forum above, or by clicking the following link: {U_STOP_WATCHING_FORUM} diff --git a/phpBB/language/en/email/post_approved.txt b/phpBB/language/en/email/post_approved.txt index 5b39c9a236..c38a775d9d 100644 --- a/phpBB/language/en/email/post_approved.txt +++ b/phpBB/language/en/email/post_approved.txt @@ -1,10 +1,10 @@ -Subject: Post Approved - {POST_SUBJECT} +Subject: Post approved - {POST_SUBJECT} Hello {USERNAME}, -You are receiving this email because your post "{POST_SUBJECT}" at {SITENAME} was approved by a moderator or admin. +You are receiving this email because your post "{POST_SUBJECT}" at {SITENAME} was approved by a moderator or administrator. -If you want to view the post click the following link: +If you want to view the post, click the following link: {U_VIEW_POST} If you want to view the topic, click the following link: diff --git a/phpBB/language/en/email/post_disapproved.txt b/phpBB/language/en/email/post_disapproved.txt index 6004abd0df..4c2d8fff14 100644 --- a/phpBB/language/en/email/post_disapproved.txt +++ b/phpBB/language/en/email/post_disapproved.txt @@ -1,8 +1,8 @@ -Subject: Post Disapproved - {POST_SUBJECT} +Subject: Post disapproved - {POST_SUBJECT} Hello {USERNAME}, -You are receiving this email because your post "{POST_SUBJECT}" at {SITENAME} was disapproved by a moderator or admin. +You are receiving this email because your post "{POST_SUBJECT}" at {SITENAME} was disapproved by a moderator or administrator. The following reason was given for the disapproval: diff --git a/phpBB/language/en/email/privmsg_notify.txt b/phpBB/language/en/email/privmsg_notify.txt index 731a7a3ecb..d363df7973 100644 --- a/phpBB/language/en/email/privmsg_notify.txt +++ b/phpBB/language/en/email/privmsg_notify.txt @@ -1,4 +1,4 @@ -Subject: New Private Message has arrived +Subject: New private message has arrived Hello {USERNAME}, diff --git a/phpBB/language/en/email/report_closed.txt b/phpBB/language/en/email/report_closed.txt index 9880aaadeb..02092c7091 100644 --- a/phpBB/language/en/email/report_closed.txt +++ b/phpBB/language/en/email/report_closed.txt @@ -1,8 +1,8 @@ -Subject: Report Closed - {POST_SUBJECT} +Subject: Report closed - {POST_SUBJECT} Hello {USERNAME}, -You are receiving this email because the report you filed on the post "{POST_SUBJECT}" in "{TOPIC_TITLE}" at {SITENAME} was handled by a moderator or by an admin. The report was afterwards closed. If you have further questions contact {CLOSER_NAME} with a personal message. +You are receiving this email because the report you filed on the post "{POST_SUBJECT}" in "{TOPIC_TITLE}" 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. {EMAIL_SIG}
\ No newline at end of file diff --git a/phpBB/language/en/email/report_deleted.txt b/phpBB/language/en/email/report_deleted.txt index 9a851ff980..300b902834 100644 --- a/phpBB/language/en/email/report_deleted.txt +++ b/phpBB/language/en/email/report_deleted.txt @@ -1,8 +1,8 @@ -Subject: Report Closed - {POST_SUBJECT} +Subject: Report deleted - {POST_SUBJECT} Hello {USERNAME}, -You are receiving this email because the report you filed on the post "{POST_SUBJECT}" in "{TOPIC_TITLE}" at {SITENAME} was deleted by a moderator or by an admin. +You are receiving this email because the report you filed on the post "{POST_SUBJECT}" in "{TOPIC_TITLE}" at {SITENAME} was deleted by a moderator or by an administrator. {EMAIL_SIG}
\ No newline at end of file diff --git a/phpBB/language/en/email/topic_approved.txt b/phpBB/language/en/email/topic_approved.txt index 371017fb80..be8aaac35e 100644 --- a/phpBB/language/en/email/topic_approved.txt +++ b/phpBB/language/en/email/topic_approved.txt @@ -1,8 +1,8 @@ -Subject: Topic Approved - {TOPIC_TITLE} +Subject: Topic approved - {TOPIC_TITLE} Hello {USERNAME}, -You are receiving this email because your topic "{TOPIC_TITLE}" at {SITENAME} was approved by a moderator or admin. +You are receiving this email because your topic "{TOPIC_TITLE}" at {SITENAME} was approved by a moderator or administrator. If you want to view the topic, click the following link: {U_VIEW_TOPIC} diff --git a/phpBB/language/en/email/topic_disapproved.txt b/phpBB/language/en/email/topic_disapproved.txt index 52aea1a60b..b3031f6b16 100644 --- a/phpBB/language/en/email/topic_disapproved.txt +++ b/phpBB/language/en/email/topic_disapproved.txt @@ -1,8 +1,8 @@ -Subject: Topic Disapproved - {TOPIC_TITLE} +Subject: Topic disapproved - {TOPIC_TITLE} Hello {USERNAME}, -You are receiving this email because your topic "{TOPIC_TITLE}" at {SITENAME} was disapproved by a moderator or admin. +You are receiving this email because your topic "{TOPIC_TITLE}" at {SITENAME} was disapproved by a moderator or administrator. The following reason was given for the disapproval: diff --git a/phpBB/language/en/email/topic_notify.txt b/phpBB/language/en/email/topic_notify.txt index d5ea583ebe..904b9b9160 100644 --- a/phpBB/language/en/email/topic_notify.txt +++ b/phpBB/language/en/email/topic_notify.txt @@ -1,4 +1,4 @@ -Subject: Topic Reply Notification - {TOPIC_TITLE} +Subject: Topic reply notification - {TOPIC_TITLE} Hello {USERNAME}, @@ -10,7 +10,7 @@ If you want to view the newest post made since your last visit, click the follow If you want to view the topic, click the following link: {U_TOPIC} -If you no longer wish to watch this topic you can either click the "Stop watching this topic link" found at the bottom of the topic above, or by clicking the following link: +If you no longer wish to watch this topic you can either click the "Stop watching this topic" link found at the bottom of the topic above, or by clicking the following link: {U_STOP_WATCHING_TOPIC} diff --git a/phpBB/language/en/email/user_resend_inactive.txt b/phpBB/language/en/email/user_resend_inactive.txt index 29393323a4..3a35c53dd4 100644 --- a/phpBB/language/en/email/user_resend_inactive.txt +++ b/phpBB/language/en/email/user_resend_inactive.txt @@ -1,4 +1,4 @@ -Subject: Welcome to {SITENAME} Forums +Subject: Welcome to {SITENAME} ({U_BOARD}) {WELCOME_MSG} diff --git a/phpBB/language/en/email/user_welcome.txt b/phpBB/language/en/email/user_welcome.txt index 963be09048..6a911d90a2 100644 --- a/phpBB/language/en/email/user_welcome.txt +++ b/phpBB/language/en/email/user_welcome.txt @@ -1,4 +1,4 @@ -Subject: Welcome to {SITENAME} Forums +Subject: Welcome to {SITENAME} ({U_BOARD}) {WELCOME_MSG} diff --git a/phpBB/language/en/email/user_welcome_inactive.txt b/phpBB/language/en/email/user_welcome_inactive.txt index 726abf4d60..4575c7e7bb 100644 --- a/phpBB/language/en/email/user_welcome_inactive.txt +++ b/phpBB/language/en/email/user_welcome_inactive.txt @@ -1,4 +1,4 @@ -Subject: Welcome to {SITENAME} Forums +Subject: Welcome to {SITENAME} ({U_BOARD}) {WELCOME_MSG} |