aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language
diff options
context:
space:
mode:
Diffstat (limited to 'phpBB/language')
-rw-r--r--phpBB/language/en/acp/attachments.php4
-rw-r--r--phpBB/language/en/acp/ban.php4
-rw-r--r--phpBB/language/en/acp/email.php4
-rw-r--r--phpBB/language/en/acp/forums.php4
-rw-r--r--phpBB/language/en/acp/groups.php4
-rw-r--r--phpBB/language/en/acp/language.php4
-rw-r--r--phpBB/language/en/acp/modules.php4
-rw-r--r--phpBB/language/en/acp/permissions.php4
-rw-r--r--phpBB/language/en/acp/permissions_phpbb.php4
-rw-r--r--phpBB/language/en/acp/posting.php4
-rw-r--r--phpBB/language/en/acp/profile.php4
-rw-r--r--phpBB/language/en/acp/prune.php4
-rw-r--r--phpBB/language/en/acp/search.php4
-rw-r--r--phpBB/language/en/acp/styles.php4
-rw-r--r--phpBB/language/en/acp/users.php4
-rw-r--r--phpBB/language/en/common.php3
-rw-r--r--phpBB/language/en/email/admin_activate.txt1
-rw-r--r--phpBB/language/en/email/admin_send_email.txt1
-rw-r--r--phpBB/language/en/email/admin_welcome_activated.txt1
-rw-r--r--phpBB/language/en/email/admin_welcome_inactive.txt1
-rw-r--r--phpBB/language/en/email/coppa_resend_inactive.txt1
-rw-r--r--phpBB/language/en/email/coppa_welcome_inactive.txt1
-rw-r--r--phpBB/language/en/email/email_notify.txt1
-rw-r--r--phpBB/language/en/email/forum_notify.txt1
-rw-r--r--phpBB/language/en/email/group_added.txt1
-rw-r--r--phpBB/language/en/email/group_approved.txt1
-rw-r--r--phpBB/language/en/email/group_request.txt1
-rw-r--r--phpBB/language/en/email/installed.txt1
-rw-r--r--phpBB/language/en/email/newtopic_notify.txt1
-rw-r--r--phpBB/language/en/email/post_approved.txt1
-rw-r--r--phpBB/language/en/email/post_disapproved.txt1
-rw-r--r--phpBB/language/en/email/privmsg_notify.txt1
-rw-r--r--phpBB/language/en/email/profile_send_email.txt1
-rw-r--r--phpBB/language/en/email/profile_send_im.txt1
-rw-r--r--phpBB/language/en/email/report_closed.txt1
-rw-r--r--phpBB/language/en/email/report_deleted.txt1
-rw-r--r--phpBB/language/en/email/topic_approved.txt1
-rw-r--r--phpBB/language/en/email/topic_disapproved.txt1
-rw-r--r--phpBB/language/en/email/topic_notify.txt1
-rw-r--r--phpBB/language/en/email/user_activate.txt1
-rw-r--r--phpBB/language/en/email/user_activate_inactive.txt1
-rw-r--r--phpBB/language/en/email/user_activate_passwd.txt1
-rw-r--r--phpBB/language/en/email/user_remind_inactive.txt1
-rw-r--r--phpBB/language/en/email/user_resend_inactive.txt1
-rw-r--r--phpBB/language/en/email/user_welcome.txt1
-rw-r--r--phpBB/language/en/email/user_welcome_inactive.txt1
-rw-r--r--phpBB/language/en/groups.php4
-rw-r--r--phpBB/language/en/help_bbcode.php4
-rw-r--r--phpBB/language/en/help_faq.php4
-rwxr-xr-xphpBB/language/en/install.php2
-rw-r--r--phpBB/language/en/mcp.php2
-rw-r--r--phpBB/language/en/memberlist.php4
-rw-r--r--phpBB/language/en/posting.php4
-rw-r--r--phpBB/language/en/search.php4
-rw-r--r--phpBB/language/en/ucp.php2
-rw-r--r--phpBB/language/en/viewforum.php4
-rw-r--r--phpBB/language/en/viewtopic.php3
57 files changed, 76 insertions, 54 deletions
diff --git a/phpBB/language/en/acp/attachments.php b/phpBB/language/en/acp/attachments.php
index 407de35837..2b25e0b0aa 100644
--- a/phpBB/language/en/acp/attachments.php
+++ b/phpBB/language/en/acp/attachments.php
@@ -18,7 +18,9 @@ if (empty($lang) || !is_array($lang))
$lang = array();
}
-// DEVELOPERS PLEASE NOTE
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
//
// Placeholders can now contain order information, e.g. instead of
// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
diff --git a/phpBB/language/en/acp/ban.php b/phpBB/language/en/acp/ban.php
index 60b1035028..cc9d184d57 100644
--- a/phpBB/language/en/acp/ban.php
+++ b/phpBB/language/en/acp/ban.php
@@ -18,7 +18,9 @@ if (empty($lang) || !is_array($lang))
$lang = array();
}
-// DEVELOPERS PLEASE NOTE
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
//
// Placeholders can now contain order information, e.g. instead of
// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
diff --git a/phpBB/language/en/acp/email.php b/phpBB/language/en/acp/email.php
index 73f061c1db..097909b9a4 100644
--- a/phpBB/language/en/acp/email.php
+++ b/phpBB/language/en/acp/email.php
@@ -18,7 +18,9 @@ if (empty($lang) || !is_array($lang))
$lang = array();
}
-// DEVELOPERS PLEASE NOTE
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
//
// Placeholders can now contain order information, e.g. instead of
// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
diff --git a/phpBB/language/en/acp/forums.php b/phpBB/language/en/acp/forums.php
index 3c72dc688b..89848d4b24 100644
--- a/phpBB/language/en/acp/forums.php
+++ b/phpBB/language/en/acp/forums.php
@@ -18,7 +18,9 @@ if (empty($lang) || !is_array($lang))
$lang = array();
}
-// DEVELOPERS PLEASE NOTE
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
//
// Placeholders can now contain order information, e.g. instead of
// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
diff --git a/phpBB/language/en/acp/groups.php b/phpBB/language/en/acp/groups.php
index 03c02b97fc..1e8dfa3f59 100644
--- a/phpBB/language/en/acp/groups.php
+++ b/phpBB/language/en/acp/groups.php
@@ -18,7 +18,9 @@ if (empty($lang) || !is_array($lang))
$lang = array();
}
-// DEVELOPERS PLEASE NOTE
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
//
// Placeholders can now contain order information, e.g. instead of
// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
diff --git a/phpBB/language/en/acp/language.php b/phpBB/language/en/acp/language.php
index 9aa8c06b9a..e735cd8dae 100644
--- a/phpBB/language/en/acp/language.php
+++ b/phpBB/language/en/acp/language.php
@@ -18,7 +18,9 @@ if (empty($lang) || !is_array($lang))
$lang = array();
}
-// DEVELOPERS PLEASE NOTE
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
//
// Placeholders can now contain order information, e.g. instead of
// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
diff --git a/phpBB/language/en/acp/modules.php b/phpBB/language/en/acp/modules.php
index b5055570c1..0eefb59753 100644
--- a/phpBB/language/en/acp/modules.php
+++ b/phpBB/language/en/acp/modules.php
@@ -18,7 +18,9 @@ if (empty($lang) || !is_array($lang))
$lang = array();
}
-// DEVELOPERS PLEASE NOTE
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
//
// Placeholders can now contain order information, e.g. instead of
// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
diff --git a/phpBB/language/en/acp/permissions.php b/phpBB/language/en/acp/permissions.php
index 07ee227486..089e157707 100644
--- a/phpBB/language/en/acp/permissions.php
+++ b/phpBB/language/en/acp/permissions.php
@@ -18,7 +18,9 @@ if (empty($lang) || !is_array($lang))
$lang = array();
}
-// DEVELOPERS PLEASE NOTE
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
//
// Placeholders can now contain order information, e.g. instead of
// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
diff --git a/phpBB/language/en/acp/permissions_phpbb.php b/phpBB/language/en/acp/permissions_phpbb.php
index 8577210862..4d550965a5 100644
--- a/phpBB/language/en/acp/permissions_phpbb.php
+++ b/phpBB/language/en/acp/permissions_phpbb.php
@@ -19,7 +19,9 @@ if (empty($lang) || !is_array($lang))
$lang = array();
}
-// DEVELOPERS PLEASE NOTE
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
//
// Placeholders can now contain order information, e.g. instead of
// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
diff --git a/phpBB/language/en/acp/posting.php b/phpBB/language/en/acp/posting.php
index 457e65444e..a6c1f0aad8 100644
--- a/phpBB/language/en/acp/posting.php
+++ b/phpBB/language/en/acp/posting.php
@@ -18,7 +18,9 @@ if (empty($lang) || !is_array($lang))
$lang = array();
}
-// DEVELOPERS PLEASE NOTE
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
//
// Placeholders can now contain order information, e.g. instead of
// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
diff --git a/phpBB/language/en/acp/profile.php b/phpBB/language/en/acp/profile.php
index cf40fd1e3d..229b93591a 100644
--- a/phpBB/language/en/acp/profile.php
+++ b/phpBB/language/en/acp/profile.php
@@ -18,7 +18,9 @@ if (empty($lang) || !is_array($lang))
$lang = array();
}
-// DEVELOPERS PLEASE NOTE
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
//
// Placeholders can now contain order information, e.g. instead of
// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
diff --git a/phpBB/language/en/acp/prune.php b/phpBB/language/en/acp/prune.php
index 71f4169fbb..0788eb4fdc 100644
--- a/phpBB/language/en/acp/prune.php
+++ b/phpBB/language/en/acp/prune.php
@@ -18,7 +18,9 @@ if (empty($lang) || !is_array($lang))
$lang = array();
}
-// DEVELOPERS PLEASE NOTE
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
//
// Placeholders can now contain order information, e.g. instead of
// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
diff --git a/phpBB/language/en/acp/search.php b/phpBB/language/en/acp/search.php
index ab6e55a0d4..9766729f35 100644
--- a/phpBB/language/en/acp/search.php
+++ b/phpBB/language/en/acp/search.php
@@ -18,7 +18,9 @@ if (empty($lang) || !is_array($lang))
$lang = array();
}
-// DEVELOPERS PLEASE NOTE
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
//
// Placeholders can now contain order information, e.g. instead of
// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
diff --git a/phpBB/language/en/acp/styles.php b/phpBB/language/en/acp/styles.php
index abf3685cf0..9b875d28ab 100644
--- a/phpBB/language/en/acp/styles.php
+++ b/phpBB/language/en/acp/styles.php
@@ -18,7 +18,9 @@ if (empty($lang) || !is_array($lang))
$lang = array();
}
-// DEVELOPERS PLEASE NOTE
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
//
// Placeholders can now contain order information, e.g. instead of
// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
diff --git a/phpBB/language/en/acp/users.php b/phpBB/language/en/acp/users.php
index 3f36325ab5..70e1520e0b 100644
--- a/phpBB/language/en/acp/users.php
+++ b/phpBB/language/en/acp/users.php
@@ -18,7 +18,9 @@ if (empty($lang) || !is_array($lang))
$lang = array();
}
-// DEVELOPERS PLEASE NOTE
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
//
// Placeholders can now contain order information, e.g. instead of
// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index b0fb089d2b..717064b936 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -20,6 +20,8 @@ if (empty($lang) || !is_array($lang))
// DEVELOPERS PLEASE NOTE
//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
+//
// Placeholders can now contain order information, e.g. instead of
// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
// translators to re-order the output of data while ensuring it remains correct
@@ -30,7 +32,6 @@ if (empty($lang) || !is_array($lang))
$lang = array_merge($lang, array(
'TRANSLATION_INFO' => '',
- 'ENCODING' => 'iso-8859-1',
'DIRECTION' => 'ltr',
'LEFT' => 'left',
'RIGHT' => 'right',
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}
diff --git a/phpBB/language/en/groups.php b/phpBB/language/en/groups.php
index 07b566f3fe..8bdf31168c 100644
--- a/phpBB/language/en/groups.php
+++ b/phpBB/language/en/groups.php
@@ -18,7 +18,9 @@ if (empty($lang) || !is_array($lang))
$lang = array();
}
-// DEVELOPERS PLEASE NOTE
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
//
// Placeholders can now contain order information, e.g. instead of
// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
diff --git a/phpBB/language/en/help_bbcode.php b/phpBB/language/en/help_bbcode.php
index aa6f8d8463..afdd8226f6 100644
--- a/phpBB/language/en/help_bbcode.php
+++ b/phpBB/language/en/help_bbcode.php
@@ -13,7 +13,9 @@
/**
*/
-// DEVELOPERS PLEASE NOTE
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
//
// Placeholders can now contain order information, e.g. instead of
// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
diff --git a/phpBB/language/en/help_faq.php b/phpBB/language/en/help_faq.php
index 31d9a8f5fd..e90db8a1de 100644
--- a/phpBB/language/en/help_faq.php
+++ b/phpBB/language/en/help_faq.php
@@ -13,7 +13,9 @@
/**
*/
-// DEVELOPERS PLEASE NOTE
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
//
// Placeholders can now contain order information, e.g. instead of
// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php
index 90092804f7..6ffb4d9a2b 100755
--- a/phpBB/language/en/install.php
+++ b/phpBB/language/en/install.php
@@ -20,6 +20,8 @@ if (empty($lang) || !is_array($lang))
// DEVELOPERS PLEASE NOTE
//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
+//
// Placeholders can now contain order information, e.g. instead of
// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
// translators to re-order the output of data while ensuring it remains correct
diff --git a/phpBB/language/en/mcp.php b/phpBB/language/en/mcp.php
index 46c9b90418..bdb64075cc 100644
--- a/phpBB/language/en/mcp.php
+++ b/phpBB/language/en/mcp.php
@@ -20,6 +20,8 @@ if (empty($lang) || !is_array($lang))
// DEVELOPERS PLEASE NOTE
//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
+//
// Placeholders can now contain order information, e.g. instead of
// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
// translators to re-order the output of data while ensuring it remains correct
diff --git a/phpBB/language/en/memberlist.php b/phpBB/language/en/memberlist.php
index ec3f044785..08cc977111 100644
--- a/phpBB/language/en/memberlist.php
+++ b/phpBB/language/en/memberlist.php
@@ -18,7 +18,9 @@ if (empty($lang) || !is_array($lang))
$lang = array();
}
-// DEVELOPERS PLEASE NOTE
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
//
// Placeholders can now contain order information, e.g. instead of
// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
diff --git a/phpBB/language/en/posting.php b/phpBB/language/en/posting.php
index 05d58bb4b3..7623583d31 100644
--- a/phpBB/language/en/posting.php
+++ b/phpBB/language/en/posting.php
@@ -18,7 +18,9 @@ if (empty($lang) || !is_array($lang))
$lang = array();
}
-// DEVELOPERS PLEASE NOTE
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
//
// Placeholders can now contain order information, e.g. instead of
// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
diff --git a/phpBB/language/en/search.php b/phpBB/language/en/search.php
index 569c40a53d..b8aa018380 100644
--- a/phpBB/language/en/search.php
+++ b/phpBB/language/en/search.php
@@ -18,7 +18,9 @@ if (empty($lang) || !is_array($lang))
$lang = array();
}
-// DEVELOPERS PLEASE NOTE
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
//
// Placeholders can now contain order information, e.g. instead of
// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index db73d763e4..cf71cfb996 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -20,6 +20,8 @@ if (empty($lang) || !is_array($lang))
// DEVELOPERS PLEASE NOTE
//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
+//
// Placeholders can now contain order information, e.g. instead of
// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
// translators to re-order the output of data while ensuring it remains correct
diff --git a/phpBB/language/en/viewforum.php b/phpBB/language/en/viewforum.php
index 99d2d446d6..f995aa4d78 100644
--- a/phpBB/language/en/viewforum.php
+++ b/phpBB/language/en/viewforum.php
@@ -18,7 +18,9 @@ if (empty($lang) || !is_array($lang))
$lang = array();
}
-// DEVELOPERS PLEASE NOTE
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
//
// Placeholders can now contain order information, e.g. instead of
// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
diff --git a/phpBB/language/en/viewtopic.php b/phpBB/language/en/viewtopic.php
index c4ab86796a..3f37d1b265 100644
--- a/phpBB/language/en/viewtopic.php
+++ b/phpBB/language/en/viewtopic.php
@@ -20,6 +20,8 @@ if (empty($lang) || !is_array($lang))
// DEVELOPERS PLEASE NOTE
//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
+//
// Placeholders can now contain order information, e.g. instead of
// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
// translators to re-order the output of data while ensuring it remains correct
@@ -75,7 +77,6 @@ $lang = array_merge($lang, array(
'POLL_ENDED_AT' => 'Poll ended at %s',
'POLL_RUN_TILL' => 'Poll runs till %s',
'POLL_VOTED_OPTION' => 'You voted for this option',
- 'POST_ENCODING' => 'This post by <strong>%1$s</strong> was made in a character set different to yours. %2$sView this post in its proper encoding%3$s.',
'PRINT_TOPIC' => 'Print view',
'QUICK_MOD' => 'Quick-mod tools',