diff options
| author | Nils Adermann <naderman@naderman.de> | 2006-09-17 22:02:28 +0000 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2006-09-17 22:02:28 +0000 |
| commit | ea065f3e67ee0c0cb28c88569042461dd8cf2c27 (patch) | |
| tree | 69f31f549e0020a741f6320000cd20f822bf7bc5 /phpBB/language/en/email | |
| parent | e2ac2f9d7dda112adb9a548c8913108f83fb6391 (diff) | |
| download | forums-ea065f3e67ee0c0cb28c88569042461dd8cf2c27.tar forums-ea065f3e67ee0c0cb28c88569042461dd8cf2c27.tar.gz forums-ea065f3e67ee0c0cb28c88569042461dd8cf2c27.tar.bz2 forums-ea065f3e67ee0c0cb28c88569042461dd8cf2c27.tar.xz forums-ea065f3e67ee0c0cb28c88569042461dd8cf2c27.zip | |
- no more encoding mixture, say hello to UTF-8 (I'll add a validation solution for PHP 4.3.3/4 ASAP) [side effect: fixes Bug #3762]
- take local server time into consideration for birthday/age calculation
- faster active topic search
- allow changing active topic time frame [Bug #4150]
- reload stylesheet on language change [Bug #4222]
git-svn-id: file:///svn/phpbb/trunk@6380 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/language/en/email')
30 files changed, 0 insertions, 30 deletions
diff --git a/phpBB/language/en/email/admin_activate.txt b/phpBB/language/en/email/admin_activate.txt index ea0af53880..04c8275491 100644 --- a/phpBB/language/en/email/admin_activate.txt +++ b/phpBB/language/en/email/admin_activate.txt @@ -1,5 +1,4 @@ Subject: New user account -Charset: iso-8859-1 Hello, diff --git a/phpBB/language/en/email/admin_send_email.txt b/phpBB/language/en/email/admin_send_email.txt index 5fd5592f7c..b778496258 100644 --- a/phpBB/language/en/email/admin_send_email.txt +++ b/phpBB/language/en/email/admin_send_email.txt @@ -1,4 +1,3 @@ -Charset: iso-8859-1 The following is an email sent to you by an administrator of "{SITENAME}". If this message is spam, contains abusive or other comments you find offensive please contact the webmaster of the board at the following address: diff --git a/phpBB/language/en/email/admin_welcome_activated.txt b/phpBB/language/en/email/admin_welcome_activated.txt index 3b7aa48362..abd1391df8 100644 --- a/phpBB/language/en/email/admin_welcome_activated.txt +++ b/phpBB/language/en/email/admin_welcome_activated.txt @@ -1,5 +1,4 @@ Subject: Account Activated -Charset: iso-8859-1 Hello {USERNAME}, diff --git a/phpBB/language/en/email/admin_welcome_inactive.txt b/phpBB/language/en/email/admin_welcome_inactive.txt index 905e71696b..a9cd4e5db0 100644 --- a/phpBB/language/en/email/admin_welcome_inactive.txt +++ b/phpBB/language/en/email/admin_welcome_inactive.txt @@ -1,5 +1,4 @@ Subject: Welcome to {SITENAME} Forums -Charset: iso-8859-1 {WELCOME_MSG} diff --git a/phpBB/language/en/email/coppa_resend_inactive.txt b/phpBB/language/en/email/coppa_resend_inactive.txt index d65367e31b..8c8b8795ce 100644 --- a/phpBB/language/en/email/coppa_resend_inactive.txt +++ b/phpBB/language/en/email/coppa_resend_inactive.txt @@ -1,5 +1,4 @@ Subject: Welcome to {SITENAME} Forums -Charset: iso-8859-1 {WELCOME_MSG} diff --git a/phpBB/language/en/email/coppa_welcome_inactive.txt b/phpBB/language/en/email/coppa_welcome_inactive.txt index 4aac4ce5bd..71431a2712 100644 --- a/phpBB/language/en/email/coppa_welcome_inactive.txt +++ b/phpBB/language/en/email/coppa_welcome_inactive.txt @@ -1,5 +1,4 @@ Subject: Welcome to {SITENAME} Forums -Charset: iso-8859-1 {WELCOME_MSG} diff --git a/phpBB/language/en/email/email_notify.txt b/phpBB/language/en/email/email_notify.txt index 0543165627..4f65f17566 100644 --- a/phpBB/language/en/email/email_notify.txt +++ b/phpBB/language/en/email/email_notify.txt @@ -1,5 +1,4 @@ Subject: {SITENAME} - Email a friend -Charset: iso-8859-1 Hello {TO_USERNAME}, diff --git a/phpBB/language/en/email/forum_notify.txt b/phpBB/language/en/email/forum_notify.txt index af9e9e3bab..e69046f921 100644 --- a/phpBB/language/en/email/forum_notify.txt +++ b/phpBB/language/en/email/forum_notify.txt @@ -1,5 +1,4 @@ Subject: Forum Post Notification - {FORUM_NAME} -Charset: iso-8859-1 Hello {USERNAME}, diff --git a/phpBB/language/en/email/group_added.txt b/phpBB/language/en/email/group_added.txt index 4f07fdb9cd..e2a6d22ec0 100644 --- a/phpBB/language/en/email/group_added.txt +++ b/phpBB/language/en/email/group_added.txt @@ -1,5 +1,4 @@ Subject: You have been added to this usergroup -Charset: iso-8859-1 Congratulations, diff --git a/phpBB/language/en/email/group_approved.txt b/phpBB/language/en/email/group_approved.txt index b2134f86f9..bc31d88b3e 100644 --- a/phpBB/language/en/email/group_approved.txt +++ b/phpBB/language/en/email/group_approved.txt @@ -1,5 +1,4 @@ Subject: Your request has been approved -Charset: iso-8859-1 Congratulations, diff --git a/phpBB/language/en/email/group_request.txt b/phpBB/language/en/email/group_request.txt index 7b51823067..5b6bbcb33f 100644 --- a/phpBB/language/en/email/group_request.txt +++ b/phpBB/language/en/email/group_request.txt @@ -1,5 +1,4 @@ Subject: A request to join your group has been made -Charset: iso-8859-1 Dear {USERNAME}, diff --git a/phpBB/language/en/email/installed.txt b/phpBB/language/en/email/installed.txt index b69e9189ae..cb6944ceef 100644 --- a/phpBB/language/en/email/installed.txt +++ b/phpBB/language/en/email/installed.txt @@ -1,5 +1,4 @@ Subject: phpBB Installed -Charset: iso-8859-1 Congratulations, diff --git a/phpBB/language/en/email/newtopic_notify.txt b/phpBB/language/en/email/newtopic_notify.txt index 93c62fe9e2..3a7dd72a11 100644 --- a/phpBB/language/en/email/newtopic_notify.txt +++ b/phpBB/language/en/email/newtopic_notify.txt @@ -1,5 +1,4 @@ Subject: New Topic Notification - {FORUM_NAME} -Charset: iso-8859-1 Hello {USERNAME}, diff --git a/phpBB/language/en/email/post_approved.txt b/phpBB/language/en/email/post_approved.txt index 3d7c4902c5..5b39c9a236 100644 --- a/phpBB/language/en/email/post_approved.txt +++ b/phpBB/language/en/email/post_approved.txt @@ -1,5 +1,4 @@ Subject: Post Approved - {POST_SUBJECT} -Charset: iso-8859-1 Hello {USERNAME}, diff --git a/phpBB/language/en/email/post_disapproved.txt b/phpBB/language/en/email/post_disapproved.txt index c6055cb28e..6004abd0df 100644 --- a/phpBB/language/en/email/post_disapproved.txt +++ b/phpBB/language/en/email/post_disapproved.txt @@ -1,5 +1,4 @@ Subject: Post Disapproved - {POST_SUBJECT} -Charset: iso-8859-1 Hello {USERNAME}, diff --git a/phpBB/language/en/email/privmsg_notify.txt b/phpBB/language/en/email/privmsg_notify.txt index 7dae75ecc9..731a7a3ecb 100644 --- a/phpBB/language/en/email/privmsg_notify.txt +++ b/phpBB/language/en/email/privmsg_notify.txt @@ -1,5 +1,4 @@ Subject: New Private Message has arrived -Charset: iso-8859-1 Hello {USERNAME}, diff --git a/phpBB/language/en/email/profile_send_email.txt b/phpBB/language/en/email/profile_send_email.txt index 00dcde1e46..5dd8fd0e9c 100644 --- a/phpBB/language/en/email/profile_send_email.txt +++ b/phpBB/language/en/email/profile_send_email.txt @@ -1,4 +1,3 @@ -Charset: iso-8859-1 Hello {TO_USERNAME}, diff --git a/phpBB/language/en/email/profile_send_im.txt b/phpBB/language/en/email/profile_send_im.txt index 5220bdd906..d2fea692a0 100644 --- a/phpBB/language/en/email/profile_send_im.txt +++ b/phpBB/language/en/email/profile_send_im.txt @@ -1,4 +1,3 @@ -Charset: iso-8859-1 Hello {TO_USERNAME}, diff --git a/phpBB/language/en/email/report_closed.txt b/phpBB/language/en/email/report_closed.txt index 7da2026fb3..9880aaadeb 100644 --- a/phpBB/language/en/email/report_closed.txt +++ b/phpBB/language/en/email/report_closed.txt @@ -1,5 +1,4 @@ Subject: Report Closed - {POST_SUBJECT} -Charset: iso-8859-1 Hello {USERNAME}, diff --git a/phpBB/language/en/email/report_deleted.txt b/phpBB/language/en/email/report_deleted.txt index 9fed2a590f..9a851ff980 100644 --- a/phpBB/language/en/email/report_deleted.txt +++ b/phpBB/language/en/email/report_deleted.txt @@ -1,5 +1,4 @@ Subject: Report Closed - {POST_SUBJECT} -Charset: iso-8859-1 Hello {USERNAME}, diff --git a/phpBB/language/en/email/topic_approved.txt b/phpBB/language/en/email/topic_approved.txt index 28927b5a29..371017fb80 100644 --- a/phpBB/language/en/email/topic_approved.txt +++ b/phpBB/language/en/email/topic_approved.txt @@ -1,5 +1,4 @@ Subject: Topic Approved - {TOPIC_TITLE} -Charset: iso-8859-1 Hello {USERNAME}, diff --git a/phpBB/language/en/email/topic_disapproved.txt b/phpBB/language/en/email/topic_disapproved.txt index 52c1578861..52aea1a60b 100644 --- a/phpBB/language/en/email/topic_disapproved.txt +++ b/phpBB/language/en/email/topic_disapproved.txt @@ -1,5 +1,4 @@ Subject: Topic Disapproved - {TOPIC_TITLE} -Charset: iso-8859-1 Hello {USERNAME}, diff --git a/phpBB/language/en/email/topic_notify.txt b/phpBB/language/en/email/topic_notify.txt index 274fe0995a..d5ea583ebe 100644 --- a/phpBB/language/en/email/topic_notify.txt +++ b/phpBB/language/en/email/topic_notify.txt @@ -1,5 +1,4 @@ Subject: Topic Reply Notification - {TOPIC_TITLE} -Charset: iso-8859-1 Hello {USERNAME}, diff --git a/phpBB/language/en/email/user_activate.txt b/phpBB/language/en/email/user_activate.txt index 0adeb5bff2..7d7960c4c5 100644 --- a/phpBB/language/en/email/user_activate.txt +++ b/phpBB/language/en/email/user_activate.txt @@ -1,5 +1,4 @@ Subject: Reactivate your account -Charset: iso-8859-1 Hello {USERNAME}, diff --git a/phpBB/language/en/email/user_activate_inactive.txt b/phpBB/language/en/email/user_activate_inactive.txt index 439437940f..cbef5c780c 100644 --- a/phpBB/language/en/email/user_activate_inactive.txt +++ b/phpBB/language/en/email/user_activate_inactive.txt @@ -1,5 +1,4 @@ Subject: Your account has been deactivated -Charset: iso-8859-1 Hello {USERNAME}, diff --git a/phpBB/language/en/email/user_activate_passwd.txt b/phpBB/language/en/email/user_activate_passwd.txt index 0c2adc82ec..019ee963f7 100644 --- a/phpBB/language/en/email/user_activate_passwd.txt +++ b/phpBB/language/en/email/user_activate_passwd.txt @@ -1,5 +1,4 @@ Subject: New password activation -Charset: iso-8859-1 Hello {USERNAME} diff --git a/phpBB/language/en/email/user_remind_inactive.txt b/phpBB/language/en/email/user_remind_inactive.txt index be0cf3e76b..806f9f3a63 100644 --- a/phpBB/language/en/email/user_remind_inactive.txt +++ b/phpBB/language/en/email/user_remind_inactive.txt @@ -1,5 +1,4 @@ Subject: Inactive account reminder -Charset: iso-8859-1 Hello {USERNAME}, diff --git a/phpBB/language/en/email/user_resend_inactive.txt b/phpBB/language/en/email/user_resend_inactive.txt index bc4dd02d2d..29393323a4 100644 --- a/phpBB/language/en/email/user_resend_inactive.txt +++ b/phpBB/language/en/email/user_resend_inactive.txt @@ -1,5 +1,4 @@ Subject: Welcome to {SITENAME} Forums -Charset: iso-8859-1 {WELCOME_MSG} diff --git a/phpBB/language/en/email/user_welcome.txt b/phpBB/language/en/email/user_welcome.txt index 42dc56df3b..963be09048 100644 --- a/phpBB/language/en/email/user_welcome.txt +++ b/phpBB/language/en/email/user_welcome.txt @@ -1,5 +1,4 @@ Subject: Welcome to {SITENAME} Forums -Charset: iso-8859-1 {WELCOME_MSG} diff --git a/phpBB/language/en/email/user_welcome_inactive.txt b/phpBB/language/en/email/user_welcome_inactive.txt index 6ece2d4faf..726abf4d60 100644 --- a/phpBB/language/en/email/user_welcome_inactive.txt +++ b/phpBB/language/en/email/user_welcome_inactive.txt @@ -1,5 +1,4 @@ Subject: Welcome to {SITENAME} Forums -Charset: iso-8859-1 {WELCOME_MSG} |