diff --git a/phpBB/language/lang_arabic/email/admin_activate.tpl b/phpBB/language/lang_arabic/email/admin_activate.tpl
index b47b20f114..73552340af 100644
--- a/phpBB/language/lang_arabic/email/admin_activate.tpl
+++ b/phpBB/language/lang_arabic/email/admin_activate.tpl
@@ -1,3 +1,5 @@
+Subject:
+
,
"{USERNAME}" , ( ) :
diff --git a/phpBB/language/lang_arabic/email/admin_welcome_activated.tpl b/phpBB/language/lang_arabic/email/admin_welcome_activated.tpl
index ce93009333..84ee92ac80 100644
--- a/phpBB/language/lang_arabic/email/admin_welcome_activated.tpl
+++ b/phpBB/language/lang_arabic/email/admin_welcome_activated.tpl
@@ -1,3 +1,5 @@
+Subject:
+
{USERNAME},
"{SITENAME}" , .
diff --git a/phpBB/language/lang_arabic/email/admin_welcome_inactive.tpl b/phpBB/language/lang_arabic/email/admin_welcome_inactive.tpl
index 89f2468fd9..badc19700c 100644
--- a/phpBB/language/lang_arabic/email/admin_welcome_inactive.tpl
+++ b/phpBB/language/lang_arabic/email/admin_welcome_inactive.tpl
@@ -1,3 +1,5 @@
+Subject: {SITENAME}
+
{WELCOME_MSG}
. :
diff --git a/phpBB/language/lang_arabic/email/coppa_welcome_inactive.tpl b/phpBB/language/lang_arabic/email/coppa_welcome_inactive.tpl
index dfa2b459a5..aa61757ced 100644
--- a/phpBB/language/lang_arabic/email/coppa_welcome_inactive.tpl
+++ b/phpBB/language/lang_arabic/email/coppa_welcome_inactive.tpl
@@ -1,3 +1,5 @@
+Subject: {SITENAME}
+
{WELCOME_MSG}
In compliance with the COPPA act your account is currently inactive.
diff --git a/phpBB/language/lang_arabic/email/group_added.tpl b/phpBB/language/lang_arabic/email/group_added.tpl
index 37ea65a4ee..1c389f146d 100644
--- a/phpBB/language/lang_arabic/email/group_added.tpl
+++ b/phpBB/language/lang_arabic/email/group_added.tpl
@@ -1,3 +1,5 @@
+Subject:
+
,
"{GROUP_NAME}" {SITENAME}.
diff --git a/phpBB/language/lang_arabic/email/group_approved.tpl b/phpBB/language/lang_arabic/email/group_approved.tpl
index f615137ec4..7bbf479cfc 100644
--- a/phpBB/language/lang_arabic/email/group_approved.tpl
+++ b/phpBB/language/lang_arabic/email/group_approved.tpl
@@ -1,3 +1,5 @@
+Subject:
+
,
"{GROUP_NAME}" {SITENAME}.
diff --git a/phpBB/language/lang_arabic/email/group_request.tpl b/phpBB/language/lang_arabic/email/group_request.tpl
index 6f6d09fb7f..bd1f5bc90a 100644
--- a/phpBB/language/lang_arabic/email/group_request.tpl
+++ b/phpBB/language/lang_arabic/email/group_request.tpl
@@ -1,3 +1,5 @@
+Subject:
+
/ {GROUP_MODERATOR},
{SITENAME}.
diff --git a/phpBB/language/lang_arabic/email/privmsg_notify.tpl b/phpBB/language/lang_arabic/email/privmsg_notify.tpl
index 64040cec60..fc8d62b39f 100644
--- a/phpBB/language/lang_arabic/email/privmsg_notify.tpl
+++ b/phpBB/language/lang_arabic/email/privmsg_notify.tpl
@@ -1,3 +1,5 @@
+Subject:
+
{USERNAME},
"{SITENAME}" . :
diff --git a/phpBB/language/lang_arabic/email/topic_notify.tpl b/phpBB/language/lang_arabic/email/topic_notify.tpl
index cd265a1866..cfebec2d2d 100644
--- a/phpBB/language/lang_arabic/email/topic_notify.tpl
+++ b/phpBB/language/lang_arabic/email/topic_notify.tpl
@@ -1,3 +1,5 @@
+Subject: - {TOPIC_TITLE}
+
{USERNAME},
, "{TOPIC_TITLE}" {SITENAME}. . , .
diff --git a/phpBB/language/lang_arabic/email/user_activate.tpl b/phpBB/language/lang_arabic/email/user_activate.tpl
index c440544fff..fa85dfd083 100644
--- a/phpBB/language/lang_arabic/email/user_activate.tpl
+++ b/phpBB/language/lang_arabic/email/user_activate.tpl
@@ -1,3 +1,5 @@
+Subject: v
+
{USERNAME},
"{SITENAME}" , . :
diff --git a/phpBB/language/lang_arabic/email/user_activate_passwd.tpl b/phpBB/language/lang_arabic/email/user_activate_passwd.tpl
index f471027d7d..79f5bb3926 100644
--- a/phpBB/language/lang_arabic/email/user_activate_passwd.tpl
+++ b/phpBB/language/lang_arabic/email/user_activate_passwd.tpl
@@ -1,3 +1,5 @@
+Subject: New password activation
+
{USERNAME}
( ) {SITENAME}. , .
diff --git a/phpBB/language/lang_arabic/email/user_welcome.tpl b/phpBB/language/lang_arabic/email/user_welcome.tpl
index 799eb5c82e..444d9be84b 100644
--- a/phpBB/language/lang_arabic/email/user_welcome.tpl
+++ b/phpBB/language/lang_arabic/email/user_welcome.tpl
@@ -1,3 +1,5 @@
+Subject: {SITENAME}
+
{WELCOME_MSG}
. :
diff --git a/phpBB/language/lang_arabic/email/user_welcome_inactive.tpl b/phpBB/language/lang_arabic/email/user_welcome_inactive.tpl
index 984af481f4..1fc985d335 100644
--- a/phpBB/language/lang_arabic/email/user_welcome_inactive.tpl
+++ b/phpBB/language/lang_arabic/email/user_welcome_inactive.tpl
@@ -1,3 +1,5 @@
+Subject: {SITENAME}
+
{WELCOME_MSG}
. :
diff --git a/phpBB/language/lang_bulgarian/email/admin_activate.tpl b/phpBB/language/lang_bulgarian/email/admin_activate.tpl
index 0ead1b693b..498db9f163 100644
--- a/phpBB/language/lang_bulgarian/email/admin_activate.tpl
+++ b/phpBB/language/lang_bulgarian/email/admin_activate.tpl
@@ -1,3 +1,5 @@
+Subject:
+
!
"{USERNAME}" . ( ) :
diff --git a/phpBB/language/lang_bulgarian/email/admin_welcome_activated.tpl b/phpBB/language/lang_bulgarian/email/admin_welcome_activated.tpl
index b1e226df4e..071ad2ea82 100644
--- a/phpBB/language/lang_bulgarian/email/admin_welcome_activated.tpl
+++ b/phpBB/language/lang_bulgarian/email/admin_welcome_activated.tpl
@@ -1,3 +1,5 @@
+Subject:
+
{USERNAME}!
"{SITENAME}" . .
diff --git a/phpBB/language/lang_bulgarian/email/admin_welcome_inactive.tpl b/phpBB/language/lang_bulgarian/email/admin_welcome_inactive.tpl
index 8efe5f331e..20c76ec55c 100644
--- a/phpBB/language/lang_bulgarian/email/admin_welcome_inactive.tpl
+++ b/phpBB/language/lang_bulgarian/email/admin_welcome_inactive.tpl
@@ -1,3 +1,5 @@
+Subject: {SITENAME}
+
{WELCOME_MSG}
! :
diff --git a/phpBB/language/lang_bulgarian/email/coppa_welcome_inactive.tpl b/phpBB/language/lang_bulgarian/email/coppa_welcome_inactive.tpl
index 706f976b24..270c49f5cb 100644
--- a/phpBB/language/lang_bulgarian/email/coppa_welcome_inactive.tpl
+++ b/phpBB/language/lang_bulgarian/email/coppa_welcome_inactive.tpl
@@ -1,3 +1,5 @@
+Subject: {SITENAME}
+
{WELCOME_MSG}
COPPA .
diff --git a/phpBB/language/lang_bulgarian/email/group_added.tpl b/phpBB/language/lang_bulgarian/email/group_added.tpl
index fa9c025f9e..0cb08add1a 100644
--- a/phpBB/language/lang_bulgarian/email/group_added.tpl
+++ b/phpBB/language/lang_bulgarian/email/group_added.tpl
@@ -1,3 +1,5 @@
+Subject:
+
,
() "{GROUP_NAME}" {SITENAME}.
diff --git a/phpBB/language/lang_bulgarian/email/group_approved.tpl b/phpBB/language/lang_bulgarian/email/group_approved.tpl
index aa2e05548f..241a7d67ef 100644
--- a/phpBB/language/lang_bulgarian/email/group_approved.tpl
+++ b/phpBB/language/lang_bulgarian/email/group_approved.tpl
@@ -1,3 +1,5 @@
+Subject:
+
,
"{GROUP_NAME}" {SITENAME} .
diff --git a/phpBB/language/lang_bulgarian/email/group_request.tpl b/phpBB/language/lang_bulgarian/email/group_request.tpl
index 59245f3943..bbb1a159c0 100644
--- a/phpBB/language/lang_bulgarian/email/group_request.tpl
+++ b/phpBB/language/lang_bulgarian/email/group_request.tpl
@@ -1,3 +1,5 @@
+Subject:
+
{GROUP_MODERATOR},
{SITENAME}.
diff --git a/phpBB/language/lang_bulgarian/email/privmsg_notify.tpl b/phpBB/language/lang_bulgarian/email/privmsg_notify.tpl
index 93d35fb972..6259ece9eb 100644
--- a/phpBB/language/lang_bulgarian/email/privmsg_notify.tpl
+++ b/phpBB/language/lang_bulgarian/email/privmsg_notify.tpl
@@ -1,3 +1,5 @@
+Subject:
+
{USERNAME}!
"{SITENAME}". :
diff --git a/phpBB/language/lang_bulgarian/email/topic_notify.tpl b/phpBB/language/lang_bulgarian/email/topic_notify.tpl
index af8699c578..fa69cb96fe 100644
--- a/phpBB/language/lang_bulgarian/email/topic_notify.tpl
+++ b/phpBB/language/lang_bulgarian/email/topic_notify.tpl
@@ -1,3 +1,5 @@
+Subject: - {TOPIC_TITLE}
+
{USERNAME}!
, "{TOPIC_TITLE}" {SITENAME}. . . , .
diff --git a/phpBB/language/lang_bulgarian/email/user_activate.tpl b/phpBB/language/lang_bulgarian/email/user_activate.tpl
index e2a4a9a728..3a75aba14c 100644
--- a/phpBB/language/lang_bulgarian/email/user_activate.tpl
+++ b/phpBB/language/lang_bulgarian/email/user_activate.tpl
@@ -1,3 +1,5 @@
+Subject: - !
+
{USERNAME}!
"{SITENAME}" , - . , :
diff --git a/phpBB/language/lang_bulgarian/email/user_activate_passwd.tpl b/phpBB/language/lang_bulgarian/email/user_activate_passwd.tpl
index e48d590e50..5bc52175c6 100644
--- a/phpBB/language/lang_bulgarian/email/user_activate_passwd.tpl
+++ b/phpBB/language/lang_bulgarian/email/user_activate_passwd.tpl
@@ -1,3 +1,5 @@
+Subject:
+
{USERNAME}!
- ( ) () {SITENAME}. , , , .
diff --git a/phpBB/language/lang_bulgarian/email/user_welcome.tpl b/phpBB/language/lang_bulgarian/email/user_welcome.tpl
index 73b98b8add..8e4fdf4187 100644
--- a/phpBB/language/lang_bulgarian/email/user_welcome.tpl
+++ b/phpBB/language/lang_bulgarian/email/user_welcome.tpl
@@ -1,3 +1,5 @@
+Subject: {SITENAME}
+
{WELCOME_MSG}
-. :
diff --git a/phpBB/language/lang_bulgarian/email/user_welcome_inactive.tpl b/phpBB/language/lang_bulgarian/email/user_welcome_inactive.tpl
index c7da9a3d85..2507d03031 100644
--- a/phpBB/language/lang_bulgarian/email/user_welcome_inactive.tpl
+++ b/phpBB/language/lang_bulgarian/email/user_welcome_inactive.tpl
@@ -1,3 +1,5 @@
+Subject: {SITENAME}
+
{WELCOME_MSG}
! .
diff --git a/phpBB/language/lang_chinese_simplified/email/admin_activate.tpl b/phpBB/language/lang_chinese_simplified/email/admin_activate.tpl
index aad041cc29..34dff62de3 100644
--- a/phpBB/language/lang_chinese_simplified/email/admin_activate.tpl
+++ b/phpBB/language/lang_chinese_simplified/email/admin_activate.tpl
@@ -1,3 +1,5 @@
+Subject: ûʻ
+
,
"{USERNAME}" ʺſܱ˻Ǹע. бҪĻ, ûϸϺʹӼʺ:
diff --git a/phpBB/language/lang_chinese_simplified/email/admin_welcome_activated.tpl b/phpBB/language/lang_chinese_simplified/email/admin_welcome_activated.tpl
index 107996eb3b..16a1fc8080 100644
--- a/phpBB/language/lang_chinese_simplified/email/admin_welcome_activated.tpl
+++ b/phpBB/language/lang_chinese_simplified/email/admin_welcome_activated.tpl
@@ -1,4 +1,6 @@
- {USERNAME} ,
+Subject: ˻
+
+{USERNAME} ,
"{SITENAME}"ʺѾ, ʹյĻԱʺż"{SITENAME}".
diff --git a/phpBB/language/lang_chinese_simplified/email/admin_welcome_inactive.tpl b/phpBB/language/lang_chinese_simplified/email/admin_welcome_inactive.tpl
index ab8e8a641e..cd358deafe 100644
--- a/phpBB/language/lang_chinese_simplified/email/admin_welcome_inactive.tpl
+++ b/phpBB/language/lang_chinese_simplified/email/admin_welcome_inactive.tpl
@@ -1,3 +1,5 @@
+Subject: ӭ {SITENAME} ̳
+
{WELCOME_MSG}
Ʊʼ. ʺ:
diff --git a/phpBB/language/lang_chinese_simplified/email/coppa_welcome_inactive.tpl b/phpBB/language/lang_chinese_simplified/email/coppa_welcome_inactive.tpl
index 9fd5c18624..f16e8edf8c 100644
--- a/phpBB/language/lang_chinese_simplified/email/coppa_welcome_inactive.tpl
+++ b/phpBB/language/lang_chinese_simplified/email/coppa_welcome_inactive.tpl
@@ -1,3 +1,5 @@
+Subject: ӭ {SITENAME} ̳
+
{WELCOME_MSG}
"ͯ·˽"涨, ʺδ.
diff --git a/phpBB/language/lang_chinese_simplified/email/group_added.tpl b/phpBB/language/lang_chinese_simplified/email/group_added.tpl
index b05100e476..69445c1600 100644
--- a/phpBB/language/lang_chinese_simplified/email/group_added.tpl
+++ b/phpBB/language/lang_chinese_simplified/email/group_added.tpl
@@ -1,3 +1,5 @@
+Subject: ѾŶ
+
ϲ,
Ѿɹ"{SITENAME}""{GROUP_NAME}"Ⱥ.
diff --git a/phpBB/language/lang_chinese_simplified/email/group_approved.tpl b/phpBB/language/lang_chinese_simplified/email/group_approved.tpl
index be47bccd18..185f3922df 100644
--- a/phpBB/language/lang_chinese_simplified/email/group_approved.tpl
+++ b/phpBB/language/lang_chinese_simplified/email/group_approved.tpl
@@ -1,3 +1,5 @@
+Subject: Ѿ
+
ϲ,
"{SITENAME}"Ŷ"{GROUP_NAME}"Ѿ.
diff --git a/phpBB/language/lang_chinese_simplified/email/group_request.tpl b/phpBB/language/lang_chinese_simplified/email/group_request.tpl
index 99cd2c8052..20d82fde03 100644
--- a/phpBB/language/lang_chinese_simplified/email/group_request.tpl
+++ b/phpBB/language/lang_chinese_simplified/email/group_request.tpl
@@ -1,3 +1,5 @@
+Subject: ŶӵѾύ
+
װ {GROUP_MODERATOR},
һԱ"{SITENAME}"ĻԱŶ.
diff --git a/phpBB/language/lang_chinese_simplified/email/privmsg_notify.tpl b/phpBB/language/lang_chinese_simplified/email/privmsg_notify.tpl
index 084c365987..3563cbad0a 100644
--- a/phpBB/language/lang_chinese_simplified/email/privmsg_notify.tpl
+++ b/phpBB/language/lang_chinese_simplified/email/privmsg_notify.tpl
@@ -1,3 +1,5 @@
+Subject: µվż
+
{USERNAME} ,
"{SITENAME}"µ˽Ϣ, ҪϵͳԵʼ֪ͨ. ʹµյ˽Ϣ:
diff --git a/phpBB/language/lang_chinese_simplified/email/topic_notify.tpl b/phpBB/language/lang_chinese_simplified/email/topic_notify.tpl
index eb14b80b52..87190abe24 100644
--- a/phpBB/language/lang_chinese_simplified/email/topic_notify.tpl
+++ b/phpBB/language/lang_chinese_simplified/email/topic_notify.tpl
@@ -1,3 +1,5 @@
+Subject: ֪ͨ - {TOPIC_TITLE}
+
{USERNAME} ,
յʼΪ"{SITENAME}""{TOPIC_TITLE}", ϴúµĻظ. ʹĶظ, ԭ֮ǰ, иµѶϢ.
diff --git a/phpBB/language/lang_chinese_simplified/email/user_activate.tpl b/phpBB/language/lang_chinese_simplified/email/user_activate.tpl
index 0b5a6b0eb1..9c3425f571 100644
--- a/phpBB/language/lang_chinese_simplified/email/user_activate.tpl
+++ b/phpBB/language/lang_chinese_simplified/email/user_activate.tpl
@@ -1,3 +1,5 @@
+Subject: ¼˻!
+
{USERNAME} ,
"{SITENAME}"ʺʱ, пܵԭĸ. ʹ¼ʺ:
diff --git a/phpBB/language/lang_chinese_simplified/email/user_activate_passwd.tpl b/phpBB/language/lang_chinese_simplified/email/user_activate_passwd.tpl
index 2b3cf8105e..b85804cbbc 100644
--- a/phpBB/language/lang_chinese_simplified/email/user_activate_passwd.tpl
+++ b/phpBB/language/lang_chinese_simplified/email/user_activate_passwd.tpl
@@ -1,3 +1,5 @@
+Subject: 뼤
+
{USERNAME} ,
յʼΪ (Ҳijð) һµ. ⲻ, 벻ʼ, յżɧ, Ա.
diff --git a/phpBB/language/lang_chinese_simplified/email/user_welcome.tpl b/phpBB/language/lang_chinese_simplified/email/user_welcome.tpl
index 217282b3f0..95e9a08507 100644
--- a/phpBB/language/lang_chinese_simplified/email/user_welcome.tpl
+++ b/phpBB/language/lang_chinese_simplified/email/user_welcome.tpl
@@ -1,3 +1,5 @@
+Subject: ӭ {SITENAME} ̳
+
{WELCOME_MSG}
Ʊʼ. ʺ:
diff --git a/phpBB/language/lang_chinese_simplified/email/user_welcome_inactive.tpl b/phpBB/language/lang_chinese_simplified/email/user_welcome_inactive.tpl
index 542ab09121..7063d5287c 100644
--- a/phpBB/language/lang_chinese_simplified/email/user_welcome_inactive.tpl
+++ b/phpBB/language/lang_chinese_simplified/email/user_welcome_inactive.tpl
@@ -1,3 +1,5 @@
+Subject: ӭ {SITENAME} ̳
+
{WELCOME_MSG}
Ʊʼ. ʺ:
diff --git a/phpBB/language/lang_chinese_traditional_taiwan/email/admin_activate.tpl b/phpBB/language/lang_chinese_traditional_taiwan/email/admin_activate.tpl
index ae27d4c268..f972206337 100644
--- a/phpBB/language/lang_chinese_traditional_taiwan/email/admin_activate.tpl
+++ b/phpBB/language/lang_chinese_traditional_taiwan/email/admin_activate.tpl
@@ -1,3 +1,5 @@
+Subject: s|b
+
zn,
o "{USERNAME}" bbݶ}q (iȮɳQᵲFάO~觹U{). pGn, ХdoӨϥΪ̪, MQΥHUsҥγoӷ|b:
diff --git a/phpBB/language/lang_chinese_traditional_taiwan/email/admin_welcome_activated.tpl b/phpBB/language/lang_chinese_traditional_taiwan/email/admin_welcome_activated.tpl
index 9a36e3a9d9..1a9ed275e6 100644
--- a/phpBB/language/lang_chinese_traditional_taiwan/email/admin_welcome_activated.tpl
+++ b/phpBB/language/lang_chinese_traditional_taiwan/email/admin_welcome_activated.tpl
@@ -1,3 +1,5 @@
+Subject: bwgҥ
+
˷R {USERNAME} zn,
zb"{SITENAME}"bwgҥ, ziHϥΩҦ쪺|bαKXnJ"{SITENAME}".
diff --git a/phpBB/language/lang_chinese_traditional_taiwan/email/admin_welcome_inactive.tpl b/phpBB/language/lang_chinese_traditional_taiwan/email/admin_welcome_inactive.tpl
index a9836997a6..794778aa30 100644
--- a/phpBB/language/lang_chinese_traditional_taiwan/email/admin_welcome_inactive.tpl
+++ b/phpBB/language/lang_chinese_traditional_taiwan/email/admin_welcome_inactive.tpl
@@ -1,3 +1,5 @@
+Subject: wӨ {SITENAME} Qװ
+
{WELCOME_MSG}
ЧOdoʹqll. zbƦpU:
diff --git a/phpBB/language/lang_chinese_traditional_taiwan/email/coppa_welcome_inactive.tpl b/phpBB/language/lang_chinese_traditional_taiwan/email/coppa_welcome_inactive.tpl
index 90cf7ef8e0..e9f4d46a80 100644
--- a/phpBB/language/lang_chinese_traditional_taiwan/email/coppa_welcome_inactive.tpl
+++ b/phpBB/language/lang_chinese_traditional_taiwan/email/coppa_welcome_inactive.tpl
@@ -1,3 +1,5 @@
+Subject: wӨ {SITENAME} Qװ
+
{WELCOME_MSG}
̷"ൣpO@k"Ww, zb|ҥ.
diff --git a/phpBB/language/lang_chinese_traditional_taiwan/email/group_added.tpl b/phpBB/language/lang_chinese_traditional_taiwan/email/group_added.tpl
index c5e63b034c..cce0ac258f 100644
--- a/phpBB/language/lang_chinese_traditional_taiwan/email/group_added.tpl
+++ b/phpBB/language/lang_chinese_traditional_taiwan/email/group_added.tpl
@@ -1,3 +1,5 @@
+Subject: zwgQ[Joӷ|s
+
߱z,
zwg[J"{SITENAME}""{GROUP_NAME}"oӸs.
diff --git a/phpBB/language/lang_chinese_traditional_taiwan/email/group_approved.tpl b/phpBB/language/lang_chinese_traditional_taiwan/email/group_approved.tpl
index 0bedd8784c..81449673a0 100644
--- a/phpBB/language/lang_chinese_traditional_taiwan/email/group_approved.tpl
+++ b/phpBB/language/lang_chinese_traditional_taiwan/email/group_approved.tpl
@@ -1,3 +1,5 @@
+Subject: zШDwgo
+
߱z,
Ab"{SITENAME}"ҥӽХ[Js"{GROUP_NAME}", wgo.
diff --git a/phpBB/language/lang_chinese_traditional_taiwan/email/group_request.tpl b/phpBB/language/lang_chinese_traditional_taiwan/email/group_request.tpl
index 0064de8fc7..7dee7e1343 100644
--- a/phpBB/language/lang_chinese_traditional_taiwan/email/group_request.tpl
+++ b/phpBB/language/lang_chinese_traditional_taiwan/email/group_request.tpl
@@ -1,3 +1,5 @@
+Subject: @ӷ|ӽХ[Jzs
+
˷R {GROUP_MODERATOR} zn,
@ӷ|XӽХ[JAb"{SITENAME}"Һz|s.
diff --git a/phpBB/language/lang_chinese_traditional_taiwan/email/privmsg_notify.tpl b/phpBB/language/lang_chinese_traditional_taiwan/email/privmsg_notify.tpl
index 4acf4cb512..96d1d24bcd 100644
--- a/phpBB/language/lang_chinese_traditional_taiwan/email/privmsg_notify.tpl
+++ b/phpBB/language/lang_chinese_traditional_taiwan/email/privmsg_notify.tpl
@@ -1,3 +1,5 @@
+Subject: "zspHT
+
˷R {USERNAME} zn,
zb"{SITENAME}"spHT, ӥBznDtΥHqllq. ziHQΥHUs˵z覬쪺pHT:
diff --git a/phpBB/language/lang_chinese_traditional_taiwan/email/topic_notify.tpl b/phpBB/language/lang_chinese_traditional_taiwan/email/topic_notify.tpl
index 25619bcf6a..ce0887b6cd 100644
--- a/phpBB/language/lang_chinese_traditional_taiwan/email/topic_notify.tpl
+++ b/phpBB/language/lang_chinese_traditional_taiwan/email/topic_notify.tpl
@@ -1,3 +1,5 @@
+Subject: DD^гq - {TOPIC_TITLE}
+
˷R {USERNAME} zn,
zoʳoʹqllO]zb"{SITENAME}"q\FDD"{TOPIC_TITLE}", oӥDDbzWӳXᦳs^аT. ziHϥΥHUs[ݦ^ЪT, bz[ݭDDe, |sTqz.
diff --git a/phpBB/language/lang_chinese_traditional_taiwan/email/user_activate.tpl b/phpBB/language/lang_chinese_traditional_taiwan/email/user_activate.tpl
index bcd5ecd340..d3659ea1fc 100644
--- a/phpBB/language/lang_chinese_traditional_taiwan/email/user_activate.tpl
+++ b/phpBB/language/lang_chinese_traditional_taiwan/email/user_activate.tpl
@@ -1,3 +1,5 @@
+Subject: zbwg_ҥ!
+
˷R {USERNAME} zn,
zb"{SITENAME}"bȮɳQᵲ, ̦i]O]zLzӤH. ШϥΥHUssҥαzb:
diff --git a/phpBB/language/lang_chinese_traditional_taiwan/email/user_activate_passwd.tpl b/phpBB/language/lang_chinese_traditional_taiwan/email/user_activate_passwd.tpl
index e8c5428e5b..5757dd5419 100644
--- a/phpBB/language/lang_chinese_traditional_taiwan/email/user_activate_passwd.tpl
+++ b/phpBB/language/lang_chinese_traditional_taiwan/email/user_activate_passwd.tpl
@@ -1,3 +1,5 @@
+Subject: sKXҥ
+
˷R {USERNAME} zn,
zoʳoʹqllO]z (Ϊ̬OYH_RzWq) ӽФF@շsKX. poOzHҥӽ, Фβz|oʹqll, OpGzoHZ, бz֦VzHsô.
diff --git a/phpBB/language/lang_chinese_traditional_taiwan/email/user_welcome.tpl b/phpBB/language/lang_chinese_traditional_taiwan/email/user_welcome.tpl
index bcc0b70ca5..baf093ec2c 100644
--- a/phpBB/language/lang_chinese_traditional_taiwan/email/user_welcome.tpl
+++ b/phpBB/language/lang_chinese_traditional_taiwan/email/user_welcome.tpl
@@ -1,3 +1,5 @@
+Subject: wӨ {SITENAME} Qװ
+
{WELCOME_MSG}
ЧOdoʹqll. zbƦpU:
diff --git a/phpBB/language/lang_chinese_traditional_taiwan/email/user_welcome_inactive.tpl b/phpBB/language/lang_chinese_traditional_taiwan/email/user_welcome_inactive.tpl
index d204698544..dcda17924a 100644
--- a/phpBB/language/lang_chinese_traditional_taiwan/email/user_welcome_inactive.tpl
+++ b/phpBB/language/lang_chinese_traditional_taiwan/email/user_welcome_inactive.tpl
@@ -1,3 +1,5 @@
+Subject: wӨ {SITENAME} Qװ
+
{WELCOME_MSG}
ЧOdoʹqll. zbƦpU:
diff --git a/phpBB/language/lang_danish/email/admin_activate.tpl b/phpBB/language/lang_danish/email/admin_activate.tpl
index 2cd099699b..38951e77e4 100644
--- a/phpBB/language/lang_danish/email/admin_activate.tpl
+++ b/phpBB/language/lang_danish/email/admin_activate.tpl
@@ -1,3 +1,5 @@
+Subject: Genaktiver venligst din konto!
+
Hej,
Kontoen, der ejes af "{USERNAME}" er blevet deaktiveret eller lige oprettet. Du burde tjekke oplysningerne om denne bruger (hvis pkrvet) og aktivere den med flgende link:
diff --git a/phpBB/language/lang_danish/email/admin_welcome_activated.tpl b/phpBB/language/lang_danish/email/admin_welcome_activated.tpl
index f056b100c6..1c8be39fda 100644
--- a/phpBB/language/lang_danish/email/admin_welcome_activated.tpl
+++ b/phpBB/language/lang_danish/email/admin_welcome_activated.tpl
@@ -1,3 +1,5 @@
+Subject: Konto aktiveret
+
Hej {USERNAME},
Din konto p "{SITENAME}" er nu aktiveret. Du kan logge p med det brugernavn og password, du modtog i en tidligere email.
diff --git a/phpBB/language/lang_danish/email/admin_welcome_inactive.tpl b/phpBB/language/lang_danish/email/admin_welcome_inactive.tpl
index 2817ab683c..c8dbbb4c21 100644
--- a/phpBB/language/lang_danish/email/admin_welcome_inactive.tpl
+++ b/phpBB/language/lang_danish/email/admin_welcome_inactive.tpl
@@ -1,3 +1,5 @@
+Subject: Velkommen til {SITENAME} Forum
+
{WELCOME_MSG}
Opbevar venligst denne email til fremtidig brug. Din kontoinformation er som flger:
diff --git a/phpBB/language/lang_danish/email/coppa_welcome_inactive.tpl b/phpBB/language/lang_danish/email/coppa_welcome_inactive.tpl
index acc2d6561b..23321dbb4d 100644
--- a/phpBB/language/lang_danish/email/coppa_welcome_inactive.tpl
+++ b/phpBB/language/lang_danish/email/coppa_welcome_inactive.tpl
@@ -1,3 +1,5 @@
+Subject: Velkommen til {SITENAME} Forum
+
{WELCOME_MSG}
I overensstemmelse med COPPA lovgivning er din konto p nuvrende tidspunkt ikke aktiv.
diff --git a/phpBB/language/lang_danish/email/group_added.tpl b/phpBB/language/lang_danish/email/group_added.tpl
index 47e92fbb30..549b9045e8 100644
--- a/phpBB/language/lang_danish/email/group_added.tpl
+++ b/phpBB/language/lang_danish/email/group_added.tpl
@@ -1,3 +1,5 @@
+Subject: Du er nu tilfjet til denne bruger gruppe
+
Tillykke,
Du er blevet tilfjet "{GROUP_NAME}" gruppen p {SITENAME}.
diff --git a/phpBB/language/lang_danish/email/group_approved.tpl b/phpBB/language/lang_danish/email/group_approved.tpl
index 00dd93882f..67f8fbcf99 100644
--- a/phpBB/language/lang_danish/email/group_approved.tpl
+++ b/phpBB/language/lang_danish/email/group_approved.tpl
@@ -1,3 +1,5 @@
+Subject: Din tilmelding er blevet godkendt
+
Tillykke,
Dit nske om blive medlem af "{GROUP_NAME}" gruppen p {SITENAME} er blevet godkendt.
diff --git a/phpBB/language/lang_danish/email/group_request.tpl b/phpBB/language/lang_danish/email/group_request.tpl
index 47cb9f233d..9cabfbbda9 100644
--- a/phpBB/language/lang_danish/email/group_request.tpl
+++ b/phpBB/language/lang_danish/email/group_request.tpl
@@ -1,3 +1,5 @@
+Subject: En bruger nsker at tilmelde sig til din gruppe
+
Kre {GROUP_MODERATOR},
En bruger har bedt om, at blive medlem af en gruppe, som du bestyrer p {SITENAME}.
diff --git a/phpBB/language/lang_danish/email/privmsg_notify.tpl b/phpBB/language/lang_danish/email/privmsg_notify.tpl
index e5a748d7ec..476006f55a 100644
--- a/phpBB/language/lang_danish/email/privmsg_notify.tpl
+++ b/phpBB/language/lang_danish/email/privmsg_notify.tpl
@@ -1,3 +1,5 @@
+Subject: Ny Privat besked er ankommet
+
Hej {USERNAME},
Du har modtaget en ny privat besked til din konto p "{SITENAME}" og du har valgt, at blive orienteret nr det sker. Du kan se din nye besked ved at klikke p flgende link:
diff --git a/phpBB/language/lang_danish/email/topic_notify.tpl b/phpBB/language/lang_danish/email/topic_notify.tpl
index 8196dda9b7..98a2c4e39f 100644
--- a/phpBB/language/lang_danish/email/topic_notify.tpl
+++ b/phpBB/language/lang_danish/email/topic_notify.tpl
@@ -1,3 +1,5 @@
+Subject: Emnet er besvaret - {TOPIC_TITLE}
+
Hej {USERNAME},
Du modtager denne email, fordi du flger med i emnet, "{TOPIC_TITLE}" p {SITENAME}. Dette emne et svar, siden dit sidste besg. Du kan bruge flgende link, for at se de nye svar. Der vil ikke blive afsendt flere orienteringer, fr du besger dette emne.
diff --git a/phpBB/language/lang_danish/email/user_activate.tpl b/phpBB/language/lang_danish/email/user_activate.tpl
index 82aa8d3a8a..1245c0fdb7 100644
--- a/phpBB/language/lang_danish/email/user_activate.tpl
+++ b/phpBB/language/lang_danish/email/user_activate.tpl
@@ -1,3 +1,5 @@
+Subject: Genaktiver venligst din konto!
+
Hej {USERNAME},
Din konto p "{SITENAME}" er blevet deaktiveret, hjst sandsynligt fordi der er sket ndringer i din profil. For at genaktivere din konto skal du klikke p flgende link:
diff --git a/phpBB/language/lang_danish/email/user_activate_passwd.tpl b/phpBB/language/lang_danish/email/user_activate_passwd.tpl
index 1803f878f8..5f466dd38c 100644
--- a/phpBB/language/lang_danish/email/user_activate_passwd.tpl
+++ b/phpBB/language/lang_danish/email/user_activate_passwd.tpl
@@ -1,3 +1,5 @@
+Subject: Aktivering af nyt kodeord
+
Hej {USERNAME}
Du modtager denne email fordi du (eller nogen der lader som om, de er dig) har bedt om et nyt kodeord tilsendt til din konto p {SITENAME}. Hvis du ikke har bedt om denne email, s skal du bare ignorere den. Hvis du bliver ved med at modtage den, kontakt da venligst forumets administrator.
diff --git a/phpBB/language/lang_danish/email/user_welcome.tpl b/phpBB/language/lang_danish/email/user_welcome.tpl
index b430b0e8ba..cf642ea785 100644
--- a/phpBB/language/lang_danish/email/user_welcome.tpl
+++ b/phpBB/language/lang_danish/email/user_welcome.tpl
@@ -1,3 +1,5 @@
+Subject: Velkommen til {SITENAME} Forum
+
{WELCOME_MSG}
Opbevar venligst denne email til fremtidig brug. Din kontoinformation er som flger:
diff --git a/phpBB/language/lang_danish/email/user_welcome_inactive.tpl b/phpBB/language/lang_danish/email/user_welcome_inactive.tpl
index 648bd19662..a9a610311a 100644
--- a/phpBB/language/lang_danish/email/user_welcome_inactive.tpl
+++ b/phpBB/language/lang_danish/email/user_welcome_inactive.tpl
@@ -1,3 +1,5 @@
+Subject: Velkommen til {SITENAME} Forum
+
{WELCOME_MSG}
Opbevar venligst denne email til fremtidig brug. Din kontoinformation er som flger:
diff --git a/phpBB/language/lang_danish/lang_main.php b/phpBB/language/lang_danish/lang_main.php
index df70466c89..d0b9b161d5 100644
--- a/phpBB/language/lang_danish/lang_main.php
+++ b/phpBB/language/lang_danish/lang_main.php
@@ -33,9 +33,9 @@
//setlocale(LC_ALL, "en");
$lang['ENCODING'] = "iso-8859-1";
-$lang['DIRECTION'] = "LTR";
-$lang['LEFT'] = "VENSTRE";
-$lang['RIGHT'] = "HJRE";
+$lang['DIRECTION'] = "ltr";
+$lang['LEFT'] = "left";
+$lang['RIGHT'] = "right";
$lang['DATE_FORMAT'] = "d M Y"; // This should be changed to the default date format for your language, php date() format
//
@@ -993,4 +993,4 @@ $lang['A_critical_error'] = "Der er opst
// That's all Folks!
// -------------------------------------------------
-?>
+?>
\ No newline at end of file
diff --git a/phpBB/language/lang_dutch/email/admin_activate.tpl b/phpBB/language/lang_dutch/email/admin_activate.tpl
index 3dbaa1ba68..bfd2e42513 100644
--- a/phpBB/language/lang_dutch/email/admin_activate.tpl
+++ b/phpBB/language/lang_dutch/email/admin_activate.tpl
@@ -1,3 +1,5 @@
+Subject: Nieuw gebruikers account
+
Hallo,
Het account "{USERNAME}" is net aangemaakt of gedeactiveerd. Kijk aub de
diff --git a/phpBB/language/lang_dutch/email/admin_welcome_activated.tpl b/phpBB/language/lang_dutch/email/admin_welcome_activated.tpl
index 71eb6352bc..b69026ea21 100644
--- a/phpBB/language/lang_dutch/email/admin_welcome_activated.tpl
+++ b/phpBB/language/lang_dutch/email/admin_welcome_activated.tpl
@@ -1,3 +1,5 @@
+Subject: Account Geactiveerd
+
Hallo {USERNAME},
Je account op "{SITENAME}" is nu geactiveerd. Je kan je gebruikersnaam en wachtwoord gebruiken om in te loggen.
diff --git a/phpBB/language/lang_dutch/email/admin_welcome_inactive.tpl b/phpBB/language/lang_dutch/email/admin_welcome_inactive.tpl
index 95b8bff1df..04935fc556 100644
--- a/phpBB/language/lang_dutch/email/admin_welcome_inactive.tpl
+++ b/phpBB/language/lang_dutch/email/admin_welcome_inactive.tpl
@@ -1,3 +1,5 @@
+Subject: Welkom op {SITENAME}
+
{WELCOME_MSG}
Je account is aagemaakt met de volgende gegevens.
diff --git a/phpBB/language/lang_dutch/email/coppa_welcome_inactive.tpl b/phpBB/language/lang_dutch/email/coppa_welcome_inactive.tpl
index 8bc65c5208..f09b6fbeab 100644
--- a/phpBB/language/lang_dutch/email/coppa_welcome_inactive.tpl
+++ b/phpBB/language/lang_dutch/email/coppa_welcome_inactive.tpl
@@ -1,3 +1,5 @@
+Subject: Welkom op {SITENAME}
+
{WELCOME_MSG}
In verband met de COPPA wetgeving is je account nog niet actief.
diff --git a/phpBB/language/lang_dutch/email/group_added.tpl b/phpBB/language/lang_dutch/email/group_added.tpl
index 9eb52a2c6a..779fcd93eb 100644
--- a/phpBB/language/lang_dutch/email/group_added.tpl
+++ b/phpBB/language/lang_dutch/email/group_added.tpl
@@ -1,3 +1,5 @@
+Subject: Je bent toegevoegd aan deze groep
+
Hallo,
Je bent toegevoegd aan de groep "{GROUP_NAME}" groep door een van de
diff --git a/phpBB/language/lang_dutch/email/group_approved.tpl b/phpBB/language/lang_dutch/email/group_approved.tpl
index 6d120842d1..b6221044e9 100644
--- a/phpBB/language/lang_dutch/email/group_approved.tpl
+++ b/phpBB/language/lang_dutch/email/group_approved.tpl
@@ -1,3 +1,5 @@
+Subject: Je aanmelding is goedgekeurd
+
Hallo,
Je verzoek om toegevoegd te worden aan de "{GROUP_NAME}" groep is goedgekeurd.
diff --git a/phpBB/language/lang_dutch/email/group_request.tpl b/phpBB/language/lang_dutch/email/group_request.tpl
index fecb1748c6..55401b7774 100644
--- a/phpBB/language/lang_dutch/email/group_request.tpl
+++ b/phpBB/language/lang_dutch/email/group_request.tpl
@@ -1,3 +1,5 @@
+Subject: Verzoek om lid te worden van een groep
+
Hallo {GROUP_MODERATOR},
Een gebruiker heeft verzocht toegevoegd te worden aan een groep die jij
diff --git a/phpBB/language/lang_dutch/email/privmsg_notify.tpl b/phpBB/language/lang_dutch/email/privmsg_notify.tpl
index 267bfd6844..494c8749d8 100644
--- a/phpBB/language/lang_dutch/email/privmsg_notify.tpl
+++ b/phpBB/language/lang_dutch/email/privmsg_notify.tpl
@@ -1,3 +1,5 @@
+Subject: Er is een nieuw bericht
+
Hallo {USERNAME},
Je heb een nieuw bericht ontvangen op "{SITENAME}" en hebt in je profiel
diff --git a/phpBB/language/lang_dutch/email/topic_notify.tpl b/phpBB/language/lang_dutch/email/topic_notify.tpl
index 0b2797ad4e..54bc28e14b 100644
--- a/phpBB/language/lang_dutch/email/topic_notify.tpl
+++ b/phpBB/language/lang_dutch/email/topic_notify.tpl
@@ -1,3 +1,5 @@
+Subject: Melding van het plaatsen van een reactie - {TOPIC_TITLE}
+
Hallo {USERNAME},
Je hebt deze email ontvangen omdat je geabonneerd bent op het onderwerp:
diff --git a/phpBB/language/lang_dutch/email/user_activate.tpl b/phpBB/language/lang_dutch/email/user_activate.tpl
index e1021d61b5..766b15f393 100644
--- a/phpBB/language/lang_dutch/email/user_activate.tpl
+++ b/phpBB/language/lang_dutch/email/user_activate.tpl
@@ -1,3 +1,5 @@
+Subject: Je moet je account opnieuw activeren!
+
Hallo {USERNAME},
Je account op "{SITENAME}" is gedeactiveerd, waarschijnlijk door veranderingen
diff --git a/phpBB/language/lang_dutch/email/user_activate_passwd.tpl b/phpBB/language/lang_dutch/email/user_activate_passwd.tpl
index 8be5229021..57dbcc2991 100644
--- a/phpBB/language/lang_dutch/email/user_activate_passwd.tpl
+++ b/phpBB/language/lang_dutch/email/user_activate_passwd.tpl
@@ -1,3 +1,5 @@
+Subject: Nieuw wachtwoord activatie
+
Hallo {USERNAME}
Deze email is verstuurd omdat jij (of iemand die zich voordeed als
diff --git a/phpBB/language/lang_dutch/email/user_welcome.tpl b/phpBB/language/lang_dutch/email/user_welcome.tpl
index f680defed3..9c3e118bbb 100644
--- a/phpBB/language/lang_dutch/email/user_welcome.tpl
+++ b/phpBB/language/lang_dutch/email/user_welcome.tpl
@@ -1,3 +1,5 @@
+Subject: Welkom op {SITENAME}
+
{WELCOME_MSG}
Hieronder een overzicht van je login informatie:
diff --git a/phpBB/language/lang_dutch/email/user_welcome_inactive.tpl b/phpBB/language/lang_dutch/email/user_welcome_inactive.tpl
index f4c91c4376..b6cb8bdd9e 100644
--- a/phpBB/language/lang_dutch/email/user_welcome_inactive.tpl
+++ b/phpBB/language/lang_dutch/email/user_welcome_inactive.tpl
@@ -1,3 +1,5 @@
+Subject: Welkom op {SITENAME}
+
{WELCOME_MSG}
Je account is NIET actief. Je kan het account activeren door op onderstaande link te klikken:
diff --git a/phpBB/language/lang_english/email/admin_activate.tpl b/phpBB/language/lang_english/email/admin_activate.tpl
index ece89ca1b0..04c8275491 100644
--- a/phpBB/language/lang_english/email/admin_activate.tpl
+++ b/phpBB/language/lang_english/email/admin_activate.tpl
@@ -1,3 +1,5 @@
+Subject: New user account
+
Hello,
The account owned by "{USERNAME}" has been deactivated or newly created, you should check the details of this user (if required) and activate it using the following link:
diff --git a/phpBB/language/lang_english/email/admin_welcome_activated.tpl b/phpBB/language/lang_english/email/admin_welcome_activated.tpl
index f467754474..abd1391df8 100644
--- a/phpBB/language/lang_english/email/admin_welcome_activated.tpl
+++ b/phpBB/language/lang_english/email/admin_welcome_activated.tpl
@@ -1,3 +1,5 @@
+Subject: Account Activated
+
Hello {USERNAME},
Your account on "{SITENAME}" has now been activated, you may login using the username and password you received in a previous email.
diff --git a/phpBB/language/lang_english/email/admin_welcome_inactive.tpl b/phpBB/language/lang_english/email/admin_welcome_inactive.tpl
index 44b66bf63e..a9cd4e5db0 100644
--- a/phpBB/language/lang_english/email/admin_welcome_inactive.tpl
+++ b/phpBB/language/lang_english/email/admin_welcome_inactive.tpl
@@ -1,3 +1,5 @@
+Subject: Welcome to {SITENAME} Forums
+
{WELCOME_MSG}
Please keep this email for your records. Your account information is as follows:
diff --git a/phpBB/language/lang_english/email/coppa_welcome_inactive.tpl b/phpBB/language/lang_english/email/coppa_welcome_inactive.tpl
index 42a56886c1..a77c7feb02 100644
--- a/phpBB/language/lang_english/email/coppa_welcome_inactive.tpl
+++ b/phpBB/language/lang_english/email/coppa_welcome_inactive.tpl
@@ -1,3 +1,5 @@
+Subject: Welcome to {SITENAME} Forums
+
{WELCOME_MSG}
In compliance with the COPPA act your account is currently inactive.
diff --git a/phpBB/language/lang_english/email/group_added.tpl b/phpBB/language/lang_english/email/group_added.tpl
index e6f0e0bba1..81e87dbfb3 100644
--- a/phpBB/language/lang_english/email/group_added.tpl
+++ b/phpBB/language/lang_english/email/group_added.tpl
@@ -1,3 +1,5 @@
+Subject: You have been added to this usergroup
+
Congratulations,
You have been added to the "{GROUP_NAME}" group on {SITENAME}.
diff --git a/phpBB/language/lang_english/email/group_approved.tpl b/phpBB/language/lang_english/email/group_approved.tpl
index 0e5c226fa1..60def16635 100644
--- a/phpBB/language/lang_english/email/group_approved.tpl
+++ b/phpBB/language/lang_english/email/group_approved.tpl
@@ -1,3 +1,5 @@
+Subject: Your request has been approved
+
Congratulations,
Your request to join the "{GROUP_NAME}" group on {SITENAME} has been approved.
diff --git a/phpBB/language/lang_english/email/group_request.tpl b/phpBB/language/lang_english/email/group_request.tpl
index 36338b21ee..7b2811a764 100644
--- a/phpBB/language/lang_english/email/group_request.tpl
+++ b/phpBB/language/lang_english/email/group_request.tpl
@@ -1,3 +1,5 @@
+Subject: A request to join your group has been made
+
Dear {GROUP_MODERATOR},
A user has requested to join a group you moderator on {SITENAME}.
diff --git a/phpBB/language/lang_english/email/privmsg_notify.tpl b/phpBB/language/lang_english/email/privmsg_notify.tpl
index 4a07aacb82..ef426d58c4 100644
--- a/phpBB/language/lang_english/email/privmsg_notify.tpl
+++ b/phpBB/language/lang_english/email/privmsg_notify.tpl
@@ -1,3 +1,5 @@
+Subject: New Private Message has arrived
+
Hello {USERNAME},
You have received a new private message to your account on "{SITENAME}" and you have requested that you be notified on this event. You can view your new message by clicking on the following link:
diff --git a/phpBB/language/lang_english/email/topic_notify.tpl b/phpBB/language/lang_english/email/topic_notify.tpl
index 0ca46072b8..b34b2d980a 100644
--- a/phpBB/language/lang_english/email/topic_notify.tpl
+++ b/phpBB/language/lang_english/email/topic_notify.tpl
@@ -1,3 +1,5 @@
+Subject: Topic Reply Notification - {TOPIC_TITLE}
+
Hello {USERNAME},
You are receiving this email because you are watching the topic, "{TOPIC_TITLE}" at {SITENAME}. This topic has received a reply since your last visit. You can use the following link to view the replies made, no more notifications will be sent until you visit the topic.
diff --git a/phpBB/language/lang_english/email/user_activate.tpl b/phpBB/language/lang_english/email/user_activate.tpl
index cf8057bc4e..7d7960c4c5 100644
--- a/phpBB/language/lang_english/email/user_activate.tpl
+++ b/phpBB/language/lang_english/email/user_activate.tpl
@@ -1,3 +1,5 @@
+Subject: Reactivate your account
+
Hello {USERNAME},
Your account on "{SITENAME}" has been deactivated, most likely due to changes made to your profile. In order to reactivate your account you must click on the link below:
diff --git a/phpBB/language/lang_english/email/user_activate_passwd.tpl b/phpBB/language/lang_english/email/user_activate_passwd.tpl
index ac17294829..eb60e9af4c 100644
--- a/phpBB/language/lang_english/email/user_activate_passwd.tpl
+++ b/phpBB/language/lang_english/email/user_activate_passwd.tpl
@@ -1,3 +1,5 @@
+Subject: New password activation
+
Hello {USERNAME}
You are receiving this email because you have (or someone pretending to be you has) requested a new password be sent for your account on {SITENAME}. If you did not request this email then please ignore it, if you keep receiving it please contact the board administrator.
diff --git a/phpBB/language/lang_english/email/user_welcome.tpl b/phpBB/language/lang_english/email/user_welcome.tpl
index cd56a43ca9..963be09048 100644
--- a/phpBB/language/lang_english/email/user_welcome.tpl
+++ b/phpBB/language/lang_english/email/user_welcome.tpl
@@ -1,3 +1,5 @@
+Subject: Welcome to {SITENAME} Forums
+
{WELCOME_MSG}
Please keep this email for your records. Your account information is as follows:
diff --git a/phpBB/language/lang_english/email/user_welcome_inactive.tpl b/phpBB/language/lang_english/email/user_welcome_inactive.tpl
index 81e4d41c12..726abf4d60 100644
--- a/phpBB/language/lang_english/email/user_welcome_inactive.tpl
+++ b/phpBB/language/lang_english/email/user_welcome_inactive.tpl
@@ -1,3 +1,5 @@
+Subject: Welcome to {SITENAME} Forums
+
{WELCOME_MSG}
Please keep this email for your records. Your account information is as follows:
diff --git a/phpBB/language/lang_finnish/email/admin_activate.tpl b/phpBB/language/lang_finnish/email/admin_activate.tpl
index 8ea326a06b..491a898faa 100644
--- a/phpBB/language/lang_finnish/email/admin_activate.tpl
+++ b/phpBB/language/lang_finnish/email/admin_activate.tpl
@@ -1,3 +1,5 @@
+Subject: Uusi kyttjtunnus
+
Tervehdys,
Kyttjtunnus nimell "{USERNAME}" on passivoitu tai juuri luotu, sinun tulee tarkistaa tmn kyttjtunnuksen tiedot (jos tarpeen) ja aktivoida tunnus kytten seuraava linkki:
diff --git a/phpBB/language/lang_finnish/email/admin_welcome_activated.tpl b/phpBB/language/lang_finnish/email/admin_welcome_activated.tpl
index 053503676d..d8c384184f 100644
--- a/phpBB/language/lang_finnish/email/admin_welcome_activated.tpl
+++ b/phpBB/language/lang_finnish/email/admin_welcome_activated.tpl
@@ -1,3 +1,5 @@
+Subject: Kyttjtunnus aktivoitu
+
Tervehdys {USERNAME},
Kyttjtunnuksesi sivustolla "{SITENAME}" on nyt aktivoitu. Voit kirjautua sisn kytten kyttjtunnusta ja salasanaa jotka sait edellisess shkpostissa.
diff --git a/phpBB/language/lang_finnish/email/admin_welcome_inactive.tpl b/phpBB/language/lang_finnish/email/admin_welcome_inactive.tpl
index 6a86eaf7ca..49dc3f2431 100644
--- a/phpBB/language/lang_finnish/email/admin_welcome_inactive.tpl
+++ b/phpBB/language/lang_finnish/email/admin_welcome_inactive.tpl
@@ -1,3 +1,5 @@
+Subject: Tervetuloa {SITENAME} Foorumeihin
+
{WELCOME_MSG}
Ole hyv ja silyt tm viesti. Kyttjtietosi ovat seuraavanlaiset:
diff --git a/phpBB/language/lang_finnish/email/coppa_welcome_inactive.tpl b/phpBB/language/lang_finnish/email/coppa_welcome_inactive.tpl
index de8a0698f0..a4b18c218e 100644
--- a/phpBB/language/lang_finnish/email/coppa_welcome_inactive.tpl
+++ b/phpBB/language/lang_finnish/email/coppa_welcome_inactive.tpl
@@ -1,3 +1,5 @@
+Subject: Tervetuloa {SITENAME} Foorumeihin
+
{WELCOME_MSG}
COPPA snnstn mukaisesti kyttjtunnustasi ei ole viel aktivoitu.
diff --git a/phpBB/language/lang_finnish/email/group_added.tpl b/phpBB/language/lang_finnish/email/group_added.tpl
index 04d84131da..3d827611a2 100644
--- a/phpBB/language/lang_finnish/email/group_added.tpl
+++ b/phpBB/language/lang_finnish/email/group_added.tpl
@@ -1,3 +1,5 @@
+Subject: Sinut on listty thn kyttjryhmn
+
Onneksi olkoon,
Sinut on listty ryhmn "{GROUP_NAME}" sivustolla {SITENAME}.
diff --git a/phpBB/language/lang_finnish/email/group_approved.tpl b/phpBB/language/lang_finnish/email/group_approved.tpl
index c2be1caf39..0551870dca 100644
--- a/phpBB/language/lang_finnish/email/group_approved.tpl
+++ b/phpBB/language/lang_finnish/email/group_approved.tpl
@@ -1,3 +1,5 @@
+Subject: Hakemuksesi on hyvksytty
+
Onneksi olkoon,
Hakemuksesi liitty ryhmn "{GROUP_NAME}" sivustolla {SITENAME} on hyvksytty.
diff --git a/phpBB/language/lang_finnish/email/group_request.tpl b/phpBB/language/lang_finnish/email/group_request.tpl
index 12bd5e7bd9..bda906d577 100644
--- a/phpBB/language/lang_finnish/email/group_request.tpl
+++ b/phpBB/language/lang_finnish/email/group_request.tpl
@@ -1,3 +1,5 @@
+Subject: Ryhmn on tehty jseneksi liittymispyynt
+
Arvoisa {GROUP_MODERATOR},
Kyttj on pyytnyt lupaa liitty ryhmn, jonka moderaattori sin olet sivustolla {SITENAME}.
diff --git a/phpBB/language/lang_finnish/email/privmsg_notify.tpl b/phpBB/language/lang_finnish/email/privmsg_notify.tpl
index 8fa32fcd3d..bbe3ff6e38 100644
--- a/phpBB/language/lang_finnish/email/privmsg_notify.tpl
+++ b/phpBB/language/lang_finnish/email/privmsg_notify.tpl
@@ -1,3 +1,5 @@
+Subject: Uusi yksityinen viesti on saapunut
+
Tervehdys {USERNAME},
Olet saanut uuden yksityisen viestin kyttjtunnuksellesi sivustolla "{SITENAME}" ja olet pyytnyt ilmoittamaan tapahtumasta. Voit katsoa uutta viestisi klikkaamalla seuraavaa linkki:
diff --git a/phpBB/language/lang_finnish/email/topic_notify.tpl b/phpBB/language/lang_finnish/email/topic_notify.tpl
index 2f1b21223f..34f4e57228 100644
--- a/phpBB/language/lang_finnish/email/topic_notify.tpl
+++ b/phpBB/language/lang_finnish/email/topic_notify.tpl
@@ -1,3 +1,5 @@
+Subject: Ilmoitus vastauksesta aiheeseen - {TOPIC_TITLE}
+
Tervehdys {USERNAME},
Saat tmn shkpostin koska seuraat aihetta, "{TOPIC_TITLE}" sivustolla {SITENAME}. Thn aiheeseen on tullut vastaus viimeisen kyntisi jlkeen. Voit katsoa vastaukset oheisesta linkist. Sinulle ei lhetet uusia ilmoituksia ennen kuin olet kynyt ko. aiheessa.
diff --git a/phpBB/language/lang_finnish/email/user_activate.tpl b/phpBB/language/lang_finnish/email/user_activate.tpl
index 709fa8f1a0..1bf7906d91 100644
--- a/phpBB/language/lang_finnish/email/user_activate.tpl
+++ b/phpBB/language/lang_finnish/email/user_activate.tpl
@@ -1,3 +1,5 @@
+Subject: Aktivoi uudelleen kyttjtunnuksesi!
+
Tervehdys {USERNAME},
Kyttjtunnuksesi sivustolla "{SITENAME}" on passivoitu. Todennkisesti johtuen muutoksista kyttjtiedoissasi. Kyttjtunnuksen uudelleen aktivoimiseksi klikkaa linkki alapuolella:
diff --git a/phpBB/language/lang_finnish/email/user_activate_passwd.tpl b/phpBB/language/lang_finnish/email/user_activate_passwd.tpl
index d5a38e5622..71c74bc5de 100644
--- a/phpBB/language/lang_finnish/email/user_activate_passwd.tpl
+++ b/phpBB/language/lang_finnish/email/user_activate_passwd.tpl
@@ -1,3 +1,5 @@
+Subject: Uuden salasanan aktivointi
+
Tervehdys {USERNAME}
Saat tmn shkpostin koska olet (tai joku joka vitt olevansa sin) pyytnyt uutta salasanaa lhetettvksi kyttjtunnuksellesi sivustolla {SITENAME}. Jos et pyytnyt tt shkpostia, l piittaa tst. Jos saat tmn toistuvasti ota yhteys jrjestelmn yllpitoon.
diff --git a/phpBB/language/lang_finnish/email/user_welcome.tpl b/phpBB/language/lang_finnish/email/user_welcome.tpl
index a8051bd5bc..5f5c065aaa 100644
--- a/phpBB/language/lang_finnish/email/user_welcome.tpl
+++ b/phpBB/language/lang_finnish/email/user_welcome.tpl
@@ -1,3 +1,5 @@
+Subject: Tervetuloa {SITENAME} Foorumeihin
+
{WELCOME_MSG}
Ole hyv ja talleta tm shkposti. Kyttjtietosi ovat seuraavat:
diff --git a/phpBB/language/lang_finnish/email/user_welcome_inactive.tpl b/phpBB/language/lang_finnish/email/user_welcome_inactive.tpl
index 080f8e3a21..15ba3bc977 100644
--- a/phpBB/language/lang_finnish/email/user_welcome_inactive.tpl
+++ b/phpBB/language/lang_finnish/email/user_welcome_inactive.tpl
@@ -1,3 +1,5 @@
+Subject: Tervetuloa {SITENAME} Foorumeihin
+
{WELCOME_MSG}
Ole hyv ja tallenna tm shkposti. Kyttjtietosi ovat seuraavat:
diff --git a/phpBB/language/lang_finnish/lang_main.php b/phpBB/language/lang_finnish/lang_main.php
index cff3471677..77e8911620 100644
--- a/phpBB/language/lang_finnish/lang_main.php
+++ b/phpBB/language/lang_finnish/lang_main.php
@@ -24,24 +24,11 @@
// http://www.pitro.com/
//
-
-//
-// The format of this file is:
-//
-// ---> $lang['message'] = "text";
-//
-// You should also try to set a locale and a character
-// encoding (plus direction). The encoding and direction
-// will be sent to the template. The locale may or may
-// not work, it's dependent on OS support and the syntax
-// varies ... give it your best guess!
-//
-
-//setlocale(LC_ALL, "en");
+//setlocale(LC_ALL, "fi");
$lang['ENCODING'] = "iso-8859-1";
-$lang['DIRECTION'] = "LTR";
-$lang['LEFT'] = "LEFT";
-$lang['RIGHT'] = "RIGHT";
+$lang['DIRECTION'] = "ltr";
+$lang['LEFT'] = "left";
+$lang['RIGHT'] = "right";
$lang['DATE_FORMAT'] = "d M Y"; // This should be changed to the default date format for your language, php date() format
//
diff --git a/phpBB/language/lang_french/email/admin_activate.tpl b/phpBB/language/lang_french/email/admin_activate.tpl
index c770d4cfa3..0e3bad096e 100644
--- a/phpBB/language/lang_french/email/admin_activate.tpl
+++ b/phpBB/language/lang_french/email/admin_activate.tpl
@@ -1,3 +1,5 @@
+Subject: Nouveau compte utilisateur
+
Hello,
Le compte appartenant "{USERNAME}" vient d'tre dsactiv ou nouvellement cr, vous devriez vrifier les dtails de cet utilisateur (si besoin est) et activer sont compte en utilisant le lien suivant:
diff --git a/phpBB/language/lang_french/email/admin_welcome_activated.tpl b/phpBB/language/lang_french/email/admin_welcome_activated.tpl
index fe265bea26..44fac32406 100644
--- a/phpBB/language/lang_french/email/admin_welcome_activated.tpl
+++ b/phpBB/language/lang_french/email/admin_welcome_activated.tpl
@@ -1,3 +1,5 @@
+Subject: Compte activ
+
Hello {USERNAME},
Votre compte sur "{SITENAME}" vient d'tre activ, vous pouvez vous connecter en utilisant vos nom d'utilisateur et mot de passe que vous avez reu dans un prcdent email.
diff --git a/phpBB/language/lang_french/email/admin_welcome_inactive.tpl b/phpBB/language/lang_french/email/admin_welcome_inactive.tpl
index bc38c6e744..baf420a686 100644
--- a/phpBB/language/lang_french/email/admin_welcome_inactive.tpl
+++ b/phpBB/language/lang_french/email/admin_welcome_inactive.tpl
@@ -1,3 +1,5 @@
+Subject: Bienvenue sur les Forums {SITENAME}
+
{WELCOME_MSG}
Veuillez conserver cet email dans vos archives. Les informations concernant votre compte:
diff --git a/phpBB/language/lang_french/email/coppa_welcome_inactive.tpl b/phpBB/language/lang_french/email/coppa_welcome_inactive.tpl
index e757d4c53f..c0b7a68160 100644
--- a/phpBB/language/lang_french/email/coppa_welcome_inactive.tpl
+++ b/phpBB/language/lang_french/email/coppa_welcome_inactive.tpl
@@ -1,3 +1,5 @@
+Subject: Bienvenue sur les Forums {SITENAME}
+
{WELCOME_MSG}
Conformment l'acte de la COPPA, votre compte est actuellement inactif.
diff --git a/phpBB/language/lang_french/email/group_added.tpl b/phpBB/language/lang_french/email/group_added.tpl
index cb14ecbffb..907904f64c 100644
--- a/phpBB/language/lang_french/email/group_added.tpl
+++ b/phpBB/language/lang_french/email/group_added.tpl
@@ -1,3 +1,5 @@
+Subject: Vous avez t rajout ce groupe d'utilisateurs
+
Flicitations,
Vous avez t ajout au groupe "{GROUP_NAME}" sur {SITENAME}.
diff --git a/phpBB/language/lang_french/email/group_approved.tpl b/phpBB/language/lang_french/email/group_approved.tpl
index 612e6c88ac..3619ea5c11 100644
--- a/phpBB/language/lang_french/email/group_approved.tpl
+++ b/phpBB/language/lang_french/email/group_approved.tpl
@@ -1,3 +1,5 @@
+Subject: Votre requte a t approuve
+
Flicitations,
Votre demande d'adhsion au groupe "{GROUP_NAME}" sur {SITENAME} a t approuve.
diff --git a/phpBB/language/lang_french/email/group_request.tpl b/phpBB/language/lang_french/email/group_request.tpl
index c7cf061e55..75ed6ce707 100644
--- a/phpBB/language/lang_french/email/group_request.tpl
+++ b/phpBB/language/lang_french/email/group_request.tpl
@@ -1,3 +1,5 @@
+Subject: Une requte d'adhsion votre groupe a t faites
+
Cher {GROUP_MODERATOR},
Un utilisateur demande adhrer un groupe duquel vous tes modrateur sur {SITENAME}.
diff --git a/phpBB/language/lang_french/email/privmsg_notify.tpl b/phpBB/language/lang_french/email/privmsg_notify.tpl
index c35a750eb1..c07b6985c9 100644
--- a/phpBB/language/lang_french/email/privmsg_notify.tpl
+++ b/phpBB/language/lang_french/email/privmsg_notify.tpl
@@ -1,3 +1,5 @@
+Subject: Un Nouveau Message Priv vient d'arriver
+
Hello {USERNAME},
Vous avez reu un nouveau message priv sur votre compte sur "{SITENAME}" et avez demand tre averti dans ce cas. Vous pouvez voir votre nouveau message en cliquant sur le lien suivant:
diff --git a/phpBB/language/lang_french/email/topic_notify.tpl b/phpBB/language/lang_french/email/topic_notify.tpl
index 371796de88..3a4abf5f06 100644
--- a/phpBB/language/lang_french/email/topic_notify.tpl
+++ b/phpBB/language/lang_french/email/topic_notify.tpl
@@ -1,3 +1,5 @@
+Subject: Notification de Rponse au Sujet - {TOPIC_TITLE}
+
Bonjour {USERNAME},
Vous recevez cet email parce que vous surveillez le sujet, "{TOPIC_TITLE}" sur {SITENAME}. Ce sujet a reu une rponse depuis votre dernire visite. Vous pouvez utiliser le lien suivant pour voir les rponses qui ont t faites, aucune autre notification ne vous sera envoy jusqu' ce que vous visitez le sujet.
diff --git a/phpBB/language/lang_french/email/user_activate.tpl b/phpBB/language/lang_french/email/user_activate.tpl
index 093c746a35..b72b1746e5 100644
--- a/phpBB/language/lang_french/email/user_activate.tpl
+++ b/phpBB/language/lang_french/email/user_activate.tpl
@@ -1,3 +1,5 @@
+Subject: Ractivez votre compte !
+
Bonjour {USERNAME},
Votre compte sur "{SITENAME}" a t dsactiv, probablement du au changements effectus dans votre profil. Afin de ractiver votre compte, vous devez cliquer sur le lien ci-dessous:
diff --git a/phpBB/language/lang_french/email/user_activate_passwd.tpl b/phpBB/language/lang_french/email/user_activate_passwd.tpl
index a68bd4a65b..54451d8475 100644
--- a/phpBB/language/lang_french/email/user_activate_passwd.tpl
+++ b/phpBB/language/lang_french/email/user_activate_passwd.tpl
@@ -1,3 +1,5 @@
+Subject: Activation d'un nouveau mot de passe
+
Bonjour {USERNAME}
Vous recevez cet email parce que vous avez (ou quelqu'un qui prtend tre vous) demand ce qu'un nouveau mot de passe vous soit envoy pour votre compte sur {SITENAME}. Si vous n'avez pas demand cet email, veuillez l'ignorer alors, si vous continuez le recevoir, veuillez contacter l'administrateur du forum.
diff --git a/phpBB/language/lang_french/email/user_welcome.tpl b/phpBB/language/lang_french/email/user_welcome.tpl
index 900795a58b..213f367901 100644
--- a/phpBB/language/lang_french/email/user_welcome.tpl
+++ b/phpBB/language/lang_french/email/user_welcome.tpl
@@ -1,3 +1,5 @@
+Subject: Bienvenue sur les Forums {SITENAME}
+
{WELCOME_MSG}
Veuillez conserver cet email dans vos archives. Les informations concernant votre compte:
diff --git a/phpBB/language/lang_french/email/user_welcome_inactive.tpl b/phpBB/language/lang_french/email/user_welcome_inactive.tpl
index 05d2fd143a..30388d3b7b 100644
--- a/phpBB/language/lang_french/email/user_welcome_inactive.tpl
+++ b/phpBB/language/lang_french/email/user_welcome_inactive.tpl
@@ -1,3 +1,5 @@
+Subject: Bienvenue sur les Forums {SITENAME}
+
{WELCOME_MSG}
Veuillez conserver cet email dans vos archives. Les informations concernant votre compte:
diff --git a/phpBB/language/lang_french/lang_main.php b/phpBB/language/lang_french/lang_main.php
index 6e4b373850..c9766910b7 100644
--- a/phpBB/language/lang_french/lang_main.php
+++ b/phpBB/language/lang_french/lang_main.php
@@ -25,23 +25,11 @@
//
-//
-// The format of this file is:
-//
-// ---> $lang['message'] = "text";
-//
-// You should also try to set a locale and a character
-// encoding (plus direction). The encoding and direction
-// will be sent to the template. The locale may or may
-// not work, it's dependent on OS support and the syntax
-// varies ... give it your best guess!
-//
-
// setlocale(LC_ALL, "fr");
$lang['ENCODING'] = "ISO-8859-1";
-$lang['DIRECTION'] = "LTR";
-$lang['LEFT'] = "GAUCHE";
-$lang['RIGHT'] = "DROITE";
+$lang['DIRECTION'] = "ltr"; // do not translate this, it's the Left to Right direction of text
+$lang['LEFT'] = "left"; // do not translate this, it's the normal 'left' direction of text
+$lang['RIGHT'] = "right"; // do not translate this, it's the normal 'right' direction of text
$lang['DATE_FORMAT'] = "d M Y"; // This should be changed to the default date format for your language, php date() format
diff --git a/phpBB/language/lang_german/email/admin_activate.tpl b/phpBB/language/lang_german/email/admin_activate.tpl
index b4952de6c7..152ad06aa7 100644
--- a/phpBB/language/lang_german/email/admin_activate.tpl
+++ b/phpBB/language/lang_german/email/admin_activate.tpl
@@ -1,3 +1,5 @@
+Subject: Neuer Benutzeraccount
+
Hallo!
Der Account von "{USERNAME}" wurde deaktiviert oder neu erstellt. Du solltest dir die Details ansehen (wenn ntig) und danach per Klick auf den folgenden Link aktivieren:
diff --git a/phpBB/language/lang_german/email/admin_welcome_activated.tpl b/phpBB/language/lang_german/email/admin_welcome_activated.tpl
index 9788b8973d..575f09ec8c 100644
--- a/phpBB/language/lang_german/email/admin_welcome_activated.tpl
+++ b/phpBB/language/lang_german/email/admin_welcome_activated.tpl
@@ -1,3 +1,5 @@
+Subject: Account aktiviert
+
Hallo {USERNAME}!
Dein Account auf {SITENAME} wurde nun aktiviert. Du kannst dich nun mit deinem Usernamen und Passwort, das du in einer anderen Email bereits erhalten hast, einloggen.
diff --git a/phpBB/language/lang_german/email/admin_welcome_inactive.tpl b/phpBB/language/lang_german/email/admin_welcome_inactive.tpl
index 2c6bf449dd..5e70a7f6fe 100644
--- a/phpBB/language/lang_german/email/admin_welcome_inactive.tpl
+++ b/phpBB/language/lang_german/email/admin_welcome_inactive.tpl
@@ -1,3 +1,5 @@
+Subject: Willkommen auf {SITENAME}
+
{WELCOME_MSG}
Bitte halte diese E-Mail gespeichert, falls du dein Passwort vergessen solltest. Deine Login-Daten sind die folgenden:
diff --git a/phpBB/language/lang_german/email/coppa_welcome_inactive.tpl b/phpBB/language/lang_german/email/coppa_welcome_inactive.tpl
index 7d725ab53a..1146743bf2 100644
--- a/phpBB/language/lang_german/email/coppa_welcome_inactive.tpl
+++ b/phpBB/language/lang_german/email/coppa_welcome_inactive.tpl
@@ -1,3 +1,5 @@
+Subject: Willkommen auf {SITENAME}
+
{WELCOME_MSG}
Gem den COPPA-Richtlinien ist dein Account im Moment inaktiv.
diff --git a/phpBB/language/lang_german/email/group_added.tpl b/phpBB/language/lang_german/email/group_added.tpl
index 7658c488d6..36be14a6e2 100644
--- a/phpBB/language/lang_german/email/group_added.tpl
+++ b/phpBB/language/lang_german/email/group_added.tpl
@@ -1,3 +1,5 @@
+Subject: Du bist dieser Gruppe beigetreten
+
Gratulation,
Du wurdest zur Gruppe "{GROUP_NAME}" auf {SITENAME} hinzugefgt.
diff --git a/phpBB/language/lang_german/email/group_approved.tpl b/phpBB/language/lang_german/email/group_approved.tpl
index 42b679e3f6..ee2ee023a6 100644
--- a/phpBB/language/lang_german/email/group_approved.tpl
+++ b/phpBB/language/lang_german/email/group_approved.tpl
@@ -1,3 +1,5 @@
+Subject: Deine Anfrage wurde akzeptiert
+
Gratulation,
Deine Anfrage fr die Gruppe "{GROUP_NAME}" auf {SITENAME} wurde akzeptiert.
diff --git a/phpBB/language/lang_german/email/group_request.tpl b/phpBB/language/lang_german/email/group_request.tpl
index ab9d440202..0a1d2b4685 100644
--- a/phpBB/language/lang_german/email/group_request.tpl
+++ b/phpBB/language/lang_german/email/group_request.tpl
@@ -1,3 +1,5 @@
+Subject: Eine Anfrage zum Beitritt in diese Gruppe wurde erstellt
+
Hallo {GROUP_MODERATOR}!
Ein User mchte einer Gruppe auf {SITENAME} beitreten, bei der du der Moderator bist.
diff --git a/phpBB/language/lang_german/email/privmsg_notify.tpl b/phpBB/language/lang_german/email/privmsg_notify.tpl
index 7040cf3bc4..4cada24bf9 100644
--- a/phpBB/language/lang_german/email/privmsg_notify.tpl
+++ b/phpBB/language/lang_german/email/privmsg_notify.tpl
@@ -1,3 +1,5 @@
+Subject: Eine neue Private Nachricht ist eingetroffen
+
Hallo {USERNAME}!
Du hast eine neue Privat-Nachricht auf {SITENAME} bekommen und hast angegeben, dass du darber benachrichtigt werden mchtest. Durch klicken auf den folgenden Link kommst du direkt zur Privat-Nachricht:
diff --git a/phpBB/language/lang_german/email/topic_notify.tpl b/phpBB/language/lang_german/email/topic_notify.tpl
index 523a0646ac..cc852c0b83 100644
--- a/phpBB/language/lang_german/email/topic_notify.tpl
+++ b/phpBB/language/lang_german/email/topic_notify.tpl
@@ -1,3 +1,5 @@
+Subject: Benachrichtigen bei Antworten - {TOPIC_TITLE}
+
Hallo {USERNAME}!
Du erhltst diese E-Mail, weil du ber Antworten im Thema "{TOPIC_TITLE}" auf {SITENAME} benachrichtigt werden wolltest. Dieses Thema hat Antworten seit deinem letzten Besuch bekommen. Du kannst den folgenden Link benutzen, um direkt zum Thema zu gelanden:
diff --git a/phpBB/language/lang_german/email/user_activate.tpl b/phpBB/language/lang_german/email/user_activate.tpl
index 7921d68e50..b3a231b48e 100644
--- a/phpBB/language/lang_german/email/user_activate.tpl
+++ b/phpBB/language/lang_german/email/user_activate.tpl
@@ -1,3 +1,5 @@
+Subject: Account wieder aktivieren!
+
Hallo {USERNAME}!
Dein Account auf {SITENAME} wurde deaktiviert, vermutlich durch nderungen an deinem Profil. Klick den folgenden Link an, um den Account wieder zu aktivieren:
diff --git a/phpBB/language/lang_german/email/user_activate_passwd.tpl b/phpBB/language/lang_german/email/user_activate_passwd.tpl
index 5ba968dab8..b65d7307e7 100644
--- a/phpBB/language/lang_german/email/user_activate_passwd.tpl
+++ b/phpBB/language/lang_german/email/user_activate_passwd.tpl
@@ -1,3 +1,5 @@
+Subject: Aktivierung des neuen Passwortes
+
Hallo {USERNAME}!
Du erhltst diese Mail, weil du (oder jemand, der sich fr dich ausgibt), ein neues Passwort fr {SITENAME} angefordert hat. Wenn du diese E-Mail nicht angefordert hast, kannst ud sie ignorieren.
diff --git a/phpBB/language/lang_german/email/user_welcome.tpl b/phpBB/language/lang_german/email/user_welcome.tpl
index 55d88463dc..4f472321d1 100644
--- a/phpBB/language/lang_german/email/user_welcome.tpl
+++ b/phpBB/language/lang_german/email/user_welcome.tpl
@@ -1,3 +1,5 @@
+Subject: Willkommen auf {SITENAME}
+
{WELCOME_MSG}
Bitte halte diese E-Mail gespeichert, falls du dein Passwort vergessen solltest. Deine Login-Daten sind die folgenden:
diff --git a/phpBB/language/lang_german/email/user_welcome_inactive.tpl b/phpBB/language/lang_german/email/user_welcome_inactive.tpl
index e5a3d4130e..7b24397efa 100644
--- a/phpBB/language/lang_german/email/user_welcome_inactive.tpl
+++ b/phpBB/language/lang_german/email/user_welcome_inactive.tpl
@@ -1,3 +1,5 @@
+Subject: Willkommen auf {SITENAME}
+
{WELCOME_MSG}
Bitte halte diese E-Mail gespeichert, falls du dein Passwort vergessen solltest. Deine Login-Daten sind die folgenden:
diff --git a/phpBB/language/lang_greek/email/admin_activate.tpl b/phpBB/language/lang_greek/email/admin_activate.tpl
index b6db4023bc..980a4d6ae3 100644
--- a/phpBB/language/lang_greek/email/admin_activate.tpl
+++ b/phpBB/language/lang_greek/email/admin_activate.tpl
@@ -1,3 +1,5 @@
+Subject:
+
,
"{USERNAME}" , ( ) :
diff --git a/phpBB/language/lang_greek/email/admin_welcome_activated.tpl b/phpBB/language/lang_greek/email/admin_welcome_activated.tpl
index c5bd57017e..c35f24a3f0 100644
--- a/phpBB/language/lang_greek/email/admin_welcome_activated.tpl
+++ b/phpBB/language/lang_greek/email/admin_welcome_activated.tpl
@@ -1,3 +1,5 @@
+Subject:
+
{USERNAME},
"{SITENAME}" , . .
diff --git a/phpBB/language/lang_greek/email/admin_welcome_inactive.tpl b/phpBB/language/lang_greek/email/admin_welcome_inactive.tpl
index ec428bd152..71e4a5e160 100644
--- a/phpBB/language/lang_greek/email/admin_welcome_inactive.tpl
+++ b/phpBB/language/lang_greek/email/admin_welcome_inactive.tpl
@@ -1,3 +1,5 @@
+Subject: {SITENAME}
+
{WELCOME_MSG}
, :
diff --git a/phpBB/language/lang_greek/email/coppa_welcome_inactive.tpl b/phpBB/language/lang_greek/email/coppa_welcome_inactive.tpl
index f19a6f6380..bd97abaa29 100644
--- a/phpBB/language/lang_greek/email/coppa_welcome_inactive.tpl
+++ b/phpBB/language/lang_greek/email/coppa_welcome_inactive.tpl
@@ -1,3 +1,5 @@
+Subject: {SITENAME}
+
{WELCOME_MSG}
COPPA .
diff --git a/phpBB/language/lang_greek/email/group_added.tpl b/phpBB/language/lang_greek/email/group_added.tpl
index 7bbef9bbdb..4634560a9e 100644
--- a/phpBB/language/lang_greek/email/group_added.tpl
+++ b/phpBB/language/lang_greek/email/group_added.tpl
@@ -1,3 +1,5 @@
+Subject:
+
,
"{GROUP_NAME}" {SITENAME}.
diff --git a/phpBB/language/lang_greek/email/group_approved.tpl b/phpBB/language/lang_greek/email/group_approved.tpl
index 32e857b465..ab6934ddff 100644
--- a/phpBB/language/lang_greek/email/group_approved.tpl
+++ b/phpBB/language/lang_greek/email/group_approved.tpl
@@ -1,3 +1,5 @@
+Subject:
+
,
"{GROUP_NAME}" {SITENAME} .
diff --git a/phpBB/language/lang_greek/email/group_request.tpl b/phpBB/language/lang_greek/email/group_request.tpl
index 353ccdaa73..5062579e28 100644
--- a/phpBB/language/lang_greek/email/group_request.tpl
+++ b/phpBB/language/lang_greek/email/group_request.tpl
@@ -1,3 +1,5 @@
+Subject:
+
- {GROUP_MODERATOR},
{SITENAME}.
diff --git a/phpBB/language/lang_greek/email/privmsg_notify.tpl b/phpBB/language/lang_greek/email/privmsg_notify.tpl
index 29d8b2d6f6..d23ef9637a 100644
--- a/phpBB/language/lang_greek/email/privmsg_notify.tpl
+++ b/phpBB/language/lang_greek/email/privmsg_notify.tpl
@@ -1,3 +1,5 @@
+Subject:
+
{USERNAME},
"{SITENAME}" , . :
diff --git a/phpBB/language/lang_greek/email/topic_notify.tpl b/phpBB/language/lang_greek/email/topic_notify.tpl
index 19b425e814..5ea48a5c84 100644
--- a/phpBB/language/lang_greek/email/topic_notify.tpl
+++ b/phpBB/language/lang_greek/email/topic_notify.tpl
@@ -1,3 +1,5 @@
+Subject: . - {TOPIC_TITLE}
+
{USERNAME},
., "{TOPIC_TITLE}" {SITENAME}. . . , ..
diff --git a/phpBB/language/lang_greek/email/user_activate.tpl b/phpBB/language/lang_greek/email/user_activate.tpl
index d66aac5ca6..ee6822609f 100644
--- a/phpBB/language/lang_greek/email/user_activate.tpl
+++ b/phpBB/language/lang_greek/email/user_activate.tpl
@@ -1,3 +1,5 @@
+Subject: !
+
{USERNAME},
"{SITENAME}" , . :
diff --git a/phpBB/language/lang_greek/email/user_activate_passwd.tpl b/phpBB/language/lang_greek/email/user_activate_passwd.tpl
index 380d408540..bf0bba7d70 100644
--- a/phpBB/language/lang_greek/email/user_activate_passwd.tpl
+++ b/phpBB/language/lang_greek/email/user_activate_passwd.tpl
@@ -1,3 +1,5 @@
+Subject:
+
{USERNAME}
, {SITENAME}. , .
diff --git a/phpBB/language/lang_greek/email/user_welcome.tpl b/phpBB/language/lang_greek/email/user_welcome.tpl
index 762de9c844..44a2088c12 100644
--- a/phpBB/language/lang_greek/email/user_welcome.tpl
+++ b/phpBB/language/lang_greek/email/user_welcome.tpl
@@ -1,3 +1,5 @@
+Subject: {SITENAME}
+
{WELCOME_MSG}
. :
diff --git a/phpBB/language/lang_greek/email/user_welcome_inactive.tpl b/phpBB/language/lang_greek/email/user_welcome_inactive.tpl
index 4a8984ceb8..88241e5df7 100644
--- a/phpBB/language/lang_greek/email/user_welcome_inactive.tpl
+++ b/phpBB/language/lang_greek/email/user_welcome_inactive.tpl
@@ -1,3 +1,5 @@
+Subject: {SITENAME}
+
{WELCOME_MSG}
. :
diff --git a/phpBB/language/lang_greek/lang_main.php b/phpBB/language/lang_greek/lang_main.php
index dd2cfa6794..2723ee9c92 100644
--- a/phpBB/language/lang_greek/lang_main.php
+++ b/phpBB/language/lang_greek/lang_main.php
@@ -25,13 +25,14 @@
//
-setlocale(LC_ALL, "el");
+//setlocale(LC_ALL, "el");
$lang['ENCODING'] = "iso-8859-7";
-$lang['DIRECTION'] = "LTR";
-$lang['LEFT'] = "LEFT";
-$lang['RIGHT'] = "RIGHT";
+$lang['DIRECTION'] = "ltr";
+$lang['LEFT'] = "left";
+$lang['RIGHT'] = "right";
$lang['DATE_FORMAT'] = "d M Y"; // This should be changed to the default date format for your language, php date() format
+
//
// Common, these terms are used
// extensively on several pages
diff --git a/phpBB/language/lang_hungarian/email/admin_activate.tpl b/phpBB/language/lang_hungarian/email/admin_activate.tpl
index f8a2c4b918..9c23f0444c 100644
--- a/phpBB/language/lang_hungarian/email/admin_activate.tpl
+++ b/phpBB/language/lang_hungarian/email/admin_activate.tpl
@@ -1,3 +1,5 @@
+Subject: j felhasznli azonost
+
Hell,
A "{USERNAME}" azonost deaktivlva lett, vagy most lett ltrehozva. Tekintse meg a felhasznl adatait (ha szksges) s aktivlja az albbi weboldal felkeressvel:
diff --git a/phpBB/language/lang_hungarian/email/admin_welcome_activated.tpl b/phpBB/language/lang_hungarian/email/admin_welcome_activated.tpl
index 9211359ad1..ce888e8ad7 100644
--- a/phpBB/language/lang_hungarian/email/admin_welcome_activated.tpl
+++ b/phpBB/language/lang_hungarian/email/admin_welcome_activated.tpl
@@ -1,3 +1,5 @@
+Subject: Azonost aktivlva
+
Hell {USERNAME},
Az azonostja a "{SITENAME}" frumon aktivlva lett, bejelentkezhet azzal a felhasznlnvvel s jelszval, amit a korbbiakban kapott levlben.
diff --git a/phpBB/language/lang_hungarian/email/admin_welcome_inactive.tpl b/phpBB/language/lang_hungarian/email/admin_welcome_inactive.tpl
index 2c0ed2fc0a..c111c73694 100644
--- a/phpBB/language/lang_hungarian/email/admin_welcome_inactive.tpl
+++ b/phpBB/language/lang_hungarian/email/admin_welcome_inactive.tpl
@@ -1,3 +1,5 @@
+Subject: dvzljk a {SITENAME} frumn
+
{WELCOME_MSG}
Tartsa meg ezt a levelet, hogy a ksbbiekben segtsgknt felhasznlhassa. Az azonostjnak informcii az albbiak:
diff --git a/phpBB/language/lang_hungarian/email/coppa_welcome_inactive.tpl b/phpBB/language/lang_hungarian/email/coppa_welcome_inactive.tpl
index 3b78e26d79..2b2de3f68f 100644
--- a/phpBB/language/lang_hungarian/email/coppa_welcome_inactive.tpl
+++ b/phpBB/language/lang_hungarian/email/coppa_welcome_inactive.tpl
@@ -1,3 +1,5 @@
+Subject: dvzljk a {SITENAME} frumn
+
{WELCOME_MSG}
A COPPA szablyainak rtelmben az azonostja jelenleg inaktv.
diff --git a/phpBB/language/lang_hungarian/email/group_added.tpl b/phpBB/language/lang_hungarian/email/group_added.tpl
index 65e0fb99e2..ccbc04bd0d 100644
--- a/phpBB/language/lang_hungarian/email/group_added.tpl
+++ b/phpBB/language/lang_hungarian/email/group_added.tpl
@@ -1,3 +1,5 @@
+Subject: Sikeresen csatlakozott a csoporthoz
+
Gratullunk,
Sikeresen csatlakozott a "{GROUP_NAME}" csoporthoz a {SITENAME} frumon.
diff --git a/phpBB/language/lang_hungarian/email/group_approved.tpl b/phpBB/language/lang_hungarian/email/group_approved.tpl
index d2f962ae76..f638d7f8e7 100644
--- a/phpBB/language/lang_hungarian/email/group_approved.tpl
+++ b/phpBB/language/lang_hungarian/email/group_approved.tpl
@@ -1,3 +1,5 @@
+Subject: A krse elfogadva
+
Gratullunk,
A krst a "{GROUP_NAME}" csoporthoz val csatlakozshoz a {SITENAME} frumon elfogadtk.
diff --git a/phpBB/language/lang_hungarian/email/group_request.tpl b/phpBB/language/lang_hungarian/email/group_request.tpl
index bafdb31725..750fba032d 100644
--- a/phpBB/language/lang_hungarian/email/group_request.tpl
+++ b/phpBB/language/lang_hungarian/email/group_request.tpl
@@ -1,3 +1,5 @@
+Subject: A request to join your group has been made
+
Kedves {GROUP_MODERATOR},
Egy felhasznl szeretne csatlakozni egy csoporthoz, aminek a modertora a {SITENAME} frumon.
diff --git a/phpBB/language/lang_hungarian/email/privmsg_notify.tpl b/phpBB/language/lang_hungarian/email/privmsg_notify.tpl
index 087a7a42ba..e4ba95ef4a 100644
--- a/phpBB/language/lang_hungarian/email/privmsg_notify.tpl
+++ b/phpBB/language/lang_hungarian/email/privmsg_notify.tpl
@@ -1,3 +1,5 @@
+Subject: j privt zenete rkezett
+
Hell {USERNAME},
j privt zenete rkezett a "{SITENAME}" frumon lv azonostjra. Az esemnyrl a korbbiakban rtestst krt. Az j zenetet megtekintheti az albbi linkre kattintva:
diff --git a/phpBB/language/lang_hungarian/email/topic_notify.tpl b/phpBB/language/lang_hungarian/email/topic_notify.tpl
index 867a4a1788..9cdd5fb4b8 100644
--- a/phpBB/language/lang_hungarian/email/topic_notify.tpl
+++ b/phpBB/language/lang_hungarian/email/topic_notify.tpl
@@ -1,3 +1,5 @@
+Subject: Tma hozzszls-rtests - {TOPIC_TITLE}
+
Hell {USERNAME},
Ezt a levelet azrt kapta, mert a {SITENAME} frumon a "{TOPIC_TITLE}" tma figyelst krte. A tmra vlasz rkezett, kattintson az albbi linkre a vlasz megtekintshez.
diff --git a/phpBB/language/lang_hungarian/email/user_activate.tpl b/phpBB/language/lang_hungarian/email/user_activate.tpl
index c6e51a62e8..37457f7611 100644
--- a/phpBB/language/lang_hungarian/email/user_activate.tpl
+++ b/phpBB/language/lang_hungarian/email/user_activate.tpl
@@ -1,3 +1,5 @@
+Subject: Aktivlja jra az azonostjt!
+
Hell {USERNAME},
Az azonostja a "{SITENAME}" frumon deaktivlva lett, feltehetleg azrt, mert vltoztatsokat hajtott vgre a profiljban. Az azonost jra aktivlshoz fel kell keresnie az albbi weboldalt:
diff --git a/phpBB/language/lang_hungarian/email/user_activate_passwd.tpl b/phpBB/language/lang_hungarian/email/user_activate_passwd.tpl
index a6e9f699e0..bbc4cd1b43 100644
--- a/phpBB/language/lang_hungarian/email/user_activate_passwd.tpl
+++ b/phpBB/language/lang_hungarian/email/user_activate_passwd.tpl
@@ -1,3 +1,5 @@
+Subject: j jelsz aktivlsa
+
Hell {USERNAME},
Ezt a levelet azrt kapta, mert n (vagy valaki n helyett) j jelsz elkldst krte a {SITENAME} frumon lv azonostjhoz. Amennyiben nem krte ezt az levelet, hagyja figyelmen kvl. Ha a tovbbiakban is kapna ilyen leveleket, vegye fel a kapcsolatot a frum adminisztrtorval.
diff --git a/phpBB/language/lang_hungarian/email/user_welcome.tpl b/phpBB/language/lang_hungarian/email/user_welcome.tpl
index a05e149121..f6207a2625 100644
--- a/phpBB/language/lang_hungarian/email/user_welcome.tpl
+++ b/phpBB/language/lang_hungarian/email/user_welcome.tpl
@@ -1,3 +1,5 @@
+Subject: dvzljk a {SITENAME} frumn
+
{WELCOME_MSG}
Tartsa meg ezt a levelet, hogy a ksbbiekben segtsgknt felhasznlhassa. Az azonostjnak informcii az albbiak:
diff --git a/phpBB/language/lang_hungarian/email/user_welcome_inactive.tpl b/phpBB/language/lang_hungarian/email/user_welcome_inactive.tpl
index f836eed524..be277ac254 100644
--- a/phpBB/language/lang_hungarian/email/user_welcome_inactive.tpl
+++ b/phpBB/language/lang_hungarian/email/user_welcome_inactive.tpl
@@ -1,3 +1,5 @@
+Subject: dvzljk a {SITENAME} frumn
+
{WELCOME_MSG}
Tartsa meg ezt a levelet, hogy a ksbbiekben segtsgknt felhasznlhassa. Az azonostjnak informcii az albbiak:
diff --git a/phpBB/language/lang_hungarian/lang_main.php b/phpBB/language/lang_hungarian/lang_main.php
index b8a16e59c6..f1ebf22587 100644
--- a/phpBB/language/lang_hungarian/lang_main.php
+++ b/phpBB/language/lang_hungarian/lang_main.php
@@ -43,11 +43,11 @@
//setlocale(LC_ALL, "en");
-$lang['TRANSLATION_INFO'] = "Magyar fordts © 2002 Egervry Gergely";
+$lang['TRANSLATION_INFO'] = 'Magyar fordts © 2002 Egervry Gergely';
$lang['ENCODING'] = "iso-8859-2";
-$lang['DIRECTION'] = "LTR";
-$lang['LEFT'] = "LEFT";
-$lang['RIGHT'] = "RIGHT";
+$lang['DIRECTION'] = "ltr";
+$lang['LEFT'] = "left";
+$lang['RIGHT'] = "right";
$lang['DATE_FORMAT'] = "Y M d"; // This should be changed to the default date format for your language, php date() format
//
diff --git a/phpBB/language/lang_italian/email/admin_activate.tpl b/phpBB/language/lang_italian/email/admin_activate.tpl
index 609fe4b860..4209f0fa05 100644
--- a/phpBB/language/lang_italian/email/admin_activate.tpl
+++ b/phpBB/language/lang_italian/email/admin_activate.tpl
@@ -1,3 +1,5 @@
+Subject: Account Nuovo Utente
+
Ciao,
L'account di "{USERNAME}" stato disattivato o ricreato, dovresti controllare i dettagli di questo utente (se richiesto) e attivarlo usando il seguente link:
diff --git a/phpBB/language/lang_italian/email/admin_welcome_activated.tpl b/phpBB/language/lang_italian/email/admin_welcome_activated.tpl
index 22840d22f4..9b72e6ee85 100644
--- a/phpBB/language/lang_italian/email/admin_welcome_activated.tpl
+++ b/phpBB/language/lang_italian/email/admin_welcome_activated.tpl
@@ -1,3 +1,5 @@
+Subject: Account Attivato
+
Ciao {USERNAME},
Il tuo account su "{SITENAME}" stato attivato, puoi entrare usando lo username e la password che hai ricevuto nella precedente email.
diff --git a/phpBB/language/lang_italian/email/admin_welcome_inactive.tpl b/phpBB/language/lang_italian/email/admin_welcome_inactive.tpl
index 36c18f15b4..2867d1f3ca 100644
--- a/phpBB/language/lang_italian/email/admin_welcome_inactive.tpl
+++ b/phpBB/language/lang_italian/email/admin_welcome_inactive.tpl
@@ -1,3 +1,5 @@
+Subject: Benvenuto nel forum di {SITENAME}
+
{WELCOME_MSG}
Per favore conserva questa email per i tuoi dati. Le informazioni sul tuo account sono le seguenti:
diff --git a/phpBB/language/lang_italian/email/coppa_welcome_inactive.tpl b/phpBB/language/lang_italian/email/coppa_welcome_inactive.tpl
index 49315c9139..733bf54651 100644
--- a/phpBB/language/lang_italian/email/coppa_welcome_inactive.tpl
+++ b/phpBB/language/lang_italian/email/coppa_welcome_inactive.tpl
@@ -1,3 +1,5 @@
+Subject: Benvenuto nel forum di {SITENAME}
+
{WELCOME_MSG}
In accordo con l'atto COPPA il tuo account al momento inattivo.
diff --git a/phpBB/language/lang_italian/email/group_added.tpl b/phpBB/language/lang_italian/email/group_added.tpl
index d503689fd6..f551eebd7f 100644
--- a/phpBB/language/lang_italian/email/group_added.tpl
+++ b/phpBB/language/lang_italian/email/group_added.tpl
@@ -1,3 +1,5 @@
+Subject: Sei stato aggiunto a questa gruppo utenti
+
Congratulazioni,
Sei stato aggiunto al gruppo "{GROUP_NAME}" su {SITENAME}.
diff --git a/phpBB/language/lang_italian/email/group_approved.tpl b/phpBB/language/lang_italian/email/group_approved.tpl
index e5f8df1737..fadc03919c 100644
--- a/phpBB/language/lang_italian/email/group_approved.tpl
+++ b/phpBB/language/lang_italian/email/group_approved.tpl
@@ -1,3 +1,5 @@
+Subject: La tua richiesta stata approvata
+
Congratulazioni,
La tua richieta di adesione al gruppo "{GROUP_NAME}" su {SITENAME} stata approvata.
diff --git a/phpBB/language/lang_italian/email/group_request.tpl b/phpBB/language/lang_italian/email/group_request.tpl
index a163656c90..ec77288438 100644
--- a/phpBB/language/lang_italian/email/group_request.tpl
+++ b/phpBB/language/lang_italian/email/group_request.tpl
@@ -1,3 +1,5 @@
+Subject: C' una richiesta di iscrizione al tuo gruppo
+
Caro {GROUP_MODERATOR},
Un utente ha richiesto di aderire ad un gruppo di cui sei moderatore su {SITENAME}.
diff --git a/phpBB/language/lang_italian/email/privmsg_notify.tpl b/phpBB/language/lang_italian/email/privmsg_notify.tpl
index e38c892dab..6697c9e420 100644
--- a/phpBB/language/lang_italian/email/privmsg_notify.tpl
+++ b/phpBB/language/lang_italian/email/privmsg_notify.tpl
@@ -1,3 +1,5 @@
+Subject: Hai un nuovo messaggio privato
+
Ciao {USERNAME},
Hai ricevuto un nuovo messaggio privato sul tuo account su "{SITENAME}" e hai richiesto di esserne informato. Puoi consultare il tuo nuovo messaggio clickando sul seguente link:
diff --git a/phpBB/language/lang_italian/email/topic_notify.tpl b/phpBB/language/lang_italian/email/topic_notify.tpl
index 4909abc709..b5f67754c2 100644
--- a/phpBB/language/lang_italian/email/topic_notify.tpl
+++ b/phpBB/language/lang_italian/email/topic_notify.tpl
@@ -1,3 +1,5 @@
+Subject: Notifica di risposta all'argomento - {TOPIC_TITLE}
+
Ciao {USERNAME},
Hai ricevuto questa email perch stai controllando l'argomento "{TOPIC_TITLE}" su {SITENAME}. Questo argomento ha ricevuto risposte dalla tua ultima visita. Puoi usare il seguente link per vedere le risposte, nessun altro avviso ti sar inviato finch non avrai consultato l'argomento.
diff --git a/phpBB/language/lang_italian/email/user_activate.tpl b/phpBB/language/lang_italian/email/user_activate.tpl
index 591a751b8a..b1906af7e9 100644
--- a/phpBB/language/lang_italian/email/user_activate.tpl
+++ b/phpBB/language/lang_italian/email/user_activate.tpl
@@ -1,3 +1,5 @@
+Subject: Riattiva il tuo account!
+
Ciao {USERNAME},
Il tuo account su "{SITENAME}" stato disattivato, molto probabilmente a causa delle modifiche fatte al tuo profilo. Per riattivare il tuo account devi cliccare sul seguente link:
diff --git a/phpBB/language/lang_italian/email/user_activate_passwd.tpl b/phpBB/language/lang_italian/email/user_activate_passwd.tpl
index 5724114122..da4baab80a 100644
--- a/phpBB/language/lang_italian/email/user_activate_passwd.tpl
+++ b/phpBB/language/lang_italian/email/user_activate_passwd.tpl
@@ -1,3 +1,5 @@
+Subject: Attivazione nuova password
+
Ciao {USERNAME}
Hai ricevuto questa email perch tu (o qualcuno per te) hai richiesto l'invio di una nuova password per il tuo account su {SITENAME}.
diff --git a/phpBB/language/lang_italian/email/user_welcome.tpl b/phpBB/language/lang_italian/email/user_welcome.tpl
index 335d230cad..05d37de1f2 100644
--- a/phpBB/language/lang_italian/email/user_welcome.tpl
+++ b/phpBB/language/lang_italian/email/user_welcome.tpl
@@ -1,3 +1,5 @@
+Subject: Benvenuto nel forum di {SITENAME}
+
{WELCOME_MSG}
Per favore conserva questa email per la tua registrazione. I tuoi dati per l'account sono i seguenti:
diff --git a/phpBB/language/lang_italian/email/user_welcome_inactive.tpl b/phpBB/language/lang_italian/email/user_welcome_inactive.tpl
index bbfee003b9..dd58d0e380 100644
--- a/phpBB/language/lang_italian/email/user_welcome_inactive.tpl
+++ b/phpBB/language/lang_italian/email/user_welcome_inactive.tpl
@@ -1,3 +1,5 @@
+Subject: Benvenuto nel forum di {SITENAME}
+
{WELCOME_MSG}
Per favore conserva questa email. Queste sono le informazioni sul tuo account:
diff --git a/phpBB/language/lang_italian/lang_main.php b/phpBB/language/lang_italian/lang_main.php
index 4ad0d125e1..93c3880505 100644
--- a/phpBB/language/lang_italian/lang_main.php
+++ b/phpBB/language/lang_italian/lang_main.php
@@ -24,23 +24,12 @@
// http://www.snowbox.it/
//
-//
-// The format of this file is:
-//
-// ---> $lang['message'] = "text";
-//
-// You should also try to set a locale and a character
-// encoding (plus direction). The encoding and direction
-// will be sent to the template. The locale may or may
-// not work, it's dependent on OS support and the syntax
-// varies ... give it your best guess!
-//
//setlocale(LC_ALL, "en");
$lang['ENCODING'] = "iso-8859-1";
-$lang['DIRECTION'] = "LTR";
-$lang['LEFT'] = "SINISTRA";
-$lang['RIGHT'] = "DESTRA";
+$lang['DIRECTION'] = "ltr";
+$lang['LEFT'] = "left";
+$lang['RIGHT'] = "right";
$lang['DATE_FORMAT'] = "d M Y"; // This should be changed to the default date format for your language, php date() format
//
diff --git a/phpBB/language/lang_japanese/email/admin_activate.tpl b/phpBB/language/lang_japanese/email/admin_activate.tpl
index 6c5087ba37..487c2ddaab 100644
--- a/phpBB/language/lang_japanese/email/admin_activate.tpl
+++ b/phpBB/language/lang_japanese/email/admin_activate.tpl
@@ -1,3 +1,5 @@
+Subject: V[U[AJEg
+
"{USERNAME}"̃AJEg~A܂͐V쐬܂BKvł̃[U[̏ڍׂmFAL̃NANeBx[VsĂF
{U_ACTIVATE}
diff --git a/phpBB/language/lang_japanese/email/admin_welcome_activated.tpl b/phpBB/language/lang_japanese/email/admin_welcome_activated.tpl
index 45ae9d7d84..d368e72a90 100644
--- a/phpBB/language/lang_japanese/email/admin_welcome_activated.tpl
+++ b/phpBB/language/lang_japanese/email/admin_welcome_activated.tpl
@@ -1,3 +1,5 @@
+Subject: AJEg̓ANeBuɂȂ܂
+
{USERNAME}
Your account on "{SITENAME}"̃AJEgANeBuɂȂ܂BŖOƃpX[hgČfɃOC邱Ƃł܂BAJEg̖OƃpX[h͑OMꂽ[ɍڂĂ܂B
diff --git a/phpBB/language/lang_japanese/email/admin_welcome_inactive.tpl b/phpBB/language/lang_japanese/email/admin_welcome_inactive.tpl
index 7eafd00df5..9726f5c1c8 100644
--- a/phpBB/language/lang_japanese/email/admin_welcome_inactive.tpl
+++ b/phpBB/language/lang_japanese/email/admin_welcome_inactive.tpl
@@ -1,3 +1,5 @@
+Subject: 悤{SITENAME}̌f
+
{WELCOME_MSG}
̃[͑ɕۊǂĂBȂ̃AJEg͈ȉ̒ʂłF
diff --git a/phpBB/language/lang_japanese/email/coppa_welcome_inactive.tpl b/phpBB/language/lang_japanese/email/coppa_welcome_inactive.tpl
index 89f759c9cd..0cd02d7184 100644
--- a/phpBB/language/lang_japanese/email/coppa_welcome_inactive.tpl
+++ b/phpBB/language/lang_japanese/email/coppa_welcome_inactive.tpl
@@ -1,3 +1,5 @@
+Subject: 悤{SITENAME}̌f
+
{WELCOME_MSG}
COPPAiq̃ICEvCoV[ی@jɂAȂ̃AJEg͌݃ANeBuɂȂĂ܂B
diff --git a/phpBB/language/lang_japanese/email/group_added.tpl b/phpBB/language/lang_japanese/email/group_added.tpl
index 09269c8d10..fd5dcfee6e 100644
--- a/phpBB/language/lang_japanese/email/group_added.tpl
+++ b/phpBB/language/lang_japanese/email/group_added.tpl
@@ -1,3 +1,5 @@
+Subject: ̃O[vɒlj܂
+
߂łƂ܂
Ȃ {SITENAME}̃O[vł"{GROUP_NAME}"̃o[ɒlj܂B̍Ƃ̓O[ṽf[^[A܂͊Ǘlɂčs܂BڍׂɂĂ͔ނɖ₢킹ĂB
diff --git a/phpBB/language/lang_japanese/email/group_approved.tpl b/phpBB/language/lang_japanese/email/group_approved.tpl
index f299ffabf2..db77c7695e 100644
--- a/phpBB/language/lang_japanese/email/group_approved.tpl
+++ b/phpBB/language/lang_japanese/email/group_approved.tpl
@@ -1,3 +1,5 @@
+Subject: O[vQ̐\݂͏܂
+
߂łƂ܂
Ȃ{SITENAME}̃O[vł"{GROUP_NAME}"ɑQ܂B
diff --git a/phpBB/language/lang_japanese/email/group_request.tpl b/phpBB/language/lang_japanese/email/group_request.tpl
index c0851461cd..e3d858f22b 100644
--- a/phpBB/language/lang_japanese/email/group_request.tpl
+++ b/phpBB/language/lang_japanese/email/group_request.tpl
@@ -1,3 +1,5 @@
+Subject: O[vQ̐\݂܂
+
{GROUP_MODERATOR}
[U[{SITENAME}̃O[v̎Q\ł܂BQ̏Eۂꍇ́AL̃NNbNĂF
diff --git a/phpBB/language/lang_japanese/email/privmsg_notify.tpl b/phpBB/language/lang_japanese/email/privmsg_notify.tpl
index 17a40d6a5d..51a24c7f8a 100644
--- a/phpBB/language/lang_japanese/email/privmsg_notify.tpl
+++ b/phpBB/language/lang_japanese/email/privmsg_notify.tpl
@@ -1,3 +1,5 @@
+Subject: VbZ[W͂܂
+
{USERNAME}
"{SITENAME}"̌fŁAVvCx[gbZ[WȂɓ͂Ă܂BȂ̃[U[ݒł́AvCx[gbZ[W͂ɍmĂ炤悤ɐݒ肳Ă܂BL̃NNbNƁAMꂽvCx[gbZ[W邱Ƃł܂F
diff --git a/phpBB/language/lang_japanese/email/topic_notify.tpl b/phpBB/language/lang_japanese/email/topic_notify.tpl
index 0dc4868017..84168af0c2 100644
--- a/phpBB/language/lang_japanese/email/topic_notify.tpl
+++ b/phpBB/language/lang_japanese/email/topic_notify.tpl
@@ -1,3 +1,5 @@
+Subject: ԐM̒ʒm - {TOPIC_TITLE}
+
{USERNAME}
{SITENAME}̌f"{TOPIC_TITLE}"Ƃ薼̃gsbNɐVԐM܂B̕ԐḾAȂŌɂ̃gsbNɖKꂽɂԐMłBԐMꍇ́AL̃NNbNĂBgsbNω{܂ł́ÃgsbN̍m͈܂B
diff --git a/phpBB/language/lang_japanese/email/user_activate.tpl b/phpBB/language/lang_japanese/email/user_activate.tpl
index ea6d1decc6..d0257fdc39 100644
--- a/phpBB/language/lang_japanese/email/user_activate.tpl
+++ b/phpBB/language/lang_japanese/email/user_activate.tpl
@@ -1,3 +1,5 @@
+Subject: Reactivate your account!
+
{USERNAME}
"{SITENAME}"ɂAJEg̃ANeBuƂȂ܂B炭[U[ݒ߂ƍl܂BAJEgĂуANeBuɂꍇ́AL̃NNbNĂF
diff --git a/phpBB/language/lang_japanese/email/user_activate_passwd.tpl b/phpBB/language/lang_japanese/email/user_activate_passwd.tpl
index c5ea7c89bc..af2dbf0354 100644
--- a/phpBB/language/lang_japanese/email/user_activate_passwd.tpl
+++ b/phpBB/language/lang_japanese/email/user_activate_passwd.tpl
@@ -1,3 +1,5 @@
+Subject: VpX[h̃ANeBx[V
+
{USERNAME}
̃[́AȂi͂ȂNj{SITENAME}̃AJEg̐VpX[hs郊NGXgs߂ɑM܂BNGXgsĂȂꍇ́Ã[ĂBx[ꍇ́AǗlɖ₢킹ĂB
diff --git a/phpBB/language/lang_japanese/email/user_welcome.tpl b/phpBB/language/lang_japanese/email/user_welcome.tpl
index acf47be5e5..717036fff4 100644
--- a/phpBB/language/lang_japanese/email/user_welcome.tpl
+++ b/phpBB/language/lang_japanese/email/user_welcome.tpl
@@ -1,3 +1,5 @@
+Subject: 悤{SITENAME}̌f
+
{WELCOME_MSG}
diff --git a/phpBB/language/lang_japanese/email/user_welcome_inactive.tpl b/phpBB/language/lang_japanese/email/user_welcome_inactive.tpl
index 1da9869ec2..c80dffe03b 100644
--- a/phpBB/language/lang_japanese/email/user_welcome_inactive.tpl
+++ b/phpBB/language/lang_japanese/email/user_welcome_inactive.tpl
@@ -1,3 +1,5 @@
+Subject: 悤{SITENAME}̌f
+
{WELCOME_MSG}
̃[͑ɕۊǂĂBȂ̃AJEg͈ȉ̒ʂłF
diff --git a/phpBB/language/lang_japanese/lang_main.php b/phpBB/language/lang_japanese/lang_main.php
index 09bcec8edf..faaa34ea55 100644
--- a/phpBB/language/lang_japanese/lang_main.php
+++ b/phpBB/language/lang_japanese/lang_main.php
@@ -27,23 +27,11 @@
// For questions and comments use: yoichi01@rr.iij4u.or.jp
//
-//
-// The format of this file is:
-//
-// ---> $lang['message'] = "text";
-//
-// You should also try to set a locale and a character
-// encoding (plus direction). The encoding and direction
-// will be sent to the template. The locale may or may
-// not work, it's dependent on OS support and the syntax
-// varies ... give it your best guess!
-//
-
-//setlocale(LC_ALL, "en");
+//setlocale(LC_ALL, "jp");
$lang['ENCODING'] = "shift_jis";
-$lang['DIRECTION'] = "LTR";
-$lang['LEFT'] = "LEFT";
-$lang['RIGHT'] = "RIGHT";
+$lang['DIRECTION'] = "ltr";
+$lang['LEFT'] = "left";
+$lang['RIGHT'] = "right";
$lang['DATE_FORMAT'] = "d M Y"; // This should be changed to the default date format for your language, php date() format
//
diff --git a/phpBB/language/lang_korean/email/admin_activate.tpl b/phpBB/language/lang_korean/email/admin_activate.tpl
index ece89ca1b0..0d2d7ed3e2 100644
--- a/phpBB/language/lang_korean/email/admin_activate.tpl
+++ b/phpBB/language/lang_korean/email/admin_activate.tpl
@@ -1,3 +1,5 @@
+Subject: ο ̵
+
Hello,
The account owned by "{USERNAME}" has been deactivated or newly created, you should check the details of this user (if required) and activate it using the following link:
diff --git a/phpBB/language/lang_korean/email/admin_welcome_activated.tpl b/phpBB/language/lang_korean/email/admin_welcome_activated.tpl
index f467754474..b81c91ccc2 100644
--- a/phpBB/language/lang_korean/email/admin_welcome_activated.tpl
+++ b/phpBB/language/lang_korean/email/admin_welcome_activated.tpl
@@ -1,3 +1,5 @@
+Subject: ̵ Ȱ
+
Hello {USERNAME},
Your account on "{SITENAME}" has now been activated, you may login using the username and password you received in a previous email.
diff --git a/phpBB/language/lang_korean/email/admin_welcome_inactive.tpl b/phpBB/language/lang_korean/email/admin_welcome_inactive.tpl
index f85eb5c1ab..a399bed2c1 100644
--- a/phpBB/language/lang_korean/email/admin_welcome_inactive.tpl
+++ b/phpBB/language/lang_korean/email/admin_welcome_inactive.tpl
@@ -1,3 +1,5 @@
+Subject: {SITENAME}
+
{WELCOME_MSG} Դϴ.
Please keep this email for your records. Your account information is as follows:
diff --git a/phpBB/language/lang_korean/email/coppa_welcome_inactive.tpl b/phpBB/language/lang_korean/email/coppa_welcome_inactive.tpl
index dfa2b459a5..4fe00c0a1d 100644
--- a/phpBB/language/lang_korean/email/coppa_welcome_inactive.tpl
+++ b/phpBB/language/lang_korean/email/coppa_welcome_inactive.tpl
@@ -1,3 +1,5 @@
+Subject: {SITENAME}
+
{WELCOME_MSG}
In compliance with the COPPA act your account is currently inactive.
diff --git a/phpBB/language/lang_korean/email/group_added.tpl b/phpBB/language/lang_korean/email/group_added.tpl
index e6f0e0bba1..6503ff9c7c 100644
--- a/phpBB/language/lang_korean/email/group_added.tpl
+++ b/phpBB/language/lang_korean/email/group_added.tpl
@@ -1,3 +1,5 @@
+Subject: 쿡 ߰Ǿϴ.
+
Congratulations,
You have been added to the "{GROUP_NAME}" group on {SITENAME}.
diff --git a/phpBB/language/lang_korean/email/group_approved.tpl b/phpBB/language/lang_korean/email/group_approved.tpl
index 721c5fb1af..fb2edda488 100644
--- a/phpBB/language/lang_korean/email/group_approved.tpl
+++ b/phpBB/language/lang_korean/email/group_approved.tpl
@@ -1,3 +1,5 @@
+Subject: Ǿ ˷帳ϴ.
+
ϵ帳ϴ..
ûϽ {SITENAME} "{GROUP_NAME}" Ǽ̽ϴ.
diff --git a/phpBB/language/lang_korean/email/group_request.tpl b/phpBB/language/lang_korean/email/group_request.tpl
index 551b6b236a..b9d8a29a8c 100644
--- a/phpBB/language/lang_korean/email/group_request.tpl
+++ b/phpBB/language/lang_korean/email/group_request.tpl
@@ -1,3 +1,5 @@
+Subject: ο Բ Ͻû ϼ̽ϴ
+
ȳϼ.. {GROUP_MODERATOR} ..!
{SITENAME} ڿ Դϴ.
diff --git a/phpBB/language/lang_korean/email/privmsg_notify.tpl b/phpBB/language/lang_korean/email/privmsg_notify.tpl
index 4ef5bd2733..ab50186262 100644
--- a/phpBB/language/lang_korean/email/privmsg_notify.tpl
+++ b/phpBB/language/lang_korean/email/privmsg_notify.tpl
@@ -1,3 +1,5 @@
+Subject: ߽ϴ.
+
ȳϼ.. {USERNAME} ..!
{SITENAME} {USERNAME} Կ ߽ϴ.
diff --git a/phpBB/language/lang_korean/email/topic_notify.tpl b/phpBB/language/lang_korean/email/topic_notify.tpl
index c99fd3a8ef..2f9cfba4d9 100644
--- a/phpBB/language/lang_korean/email/topic_notify.tpl
+++ b/phpBB/language/lang_korean/email/topic_notify.tpl
@@ -1,3 +1,5 @@
+Subject: 亯 ϵǾϴ. - {TOPIC_TITLE}
+
ȳϼ.. {USERNAME}.!
{SITENAME} ۼ {TOPIC_TITLE}
diff --git a/phpBB/language/lang_korean/email/user_activate.tpl b/phpBB/language/lang_korean/email/user_activate.tpl
index cf8057bc4e..5fd8afcdc7 100644
--- a/phpBB/language/lang_korean/email/user_activate.tpl
+++ b/phpBB/language/lang_korean/email/user_activate.tpl
@@ -1,3 +1,5 @@
+Subject: ̵ Ȱȭ ּ!
+
Hello {USERNAME},
Your account on "{SITENAME}" has been deactivated, most likely due to changes made to your profile. In order to reactivate your account you must click on the link below:
diff --git a/phpBB/language/lang_korean/email/user_activate_passwd.tpl b/phpBB/language/lang_korean/email/user_activate_passwd.tpl
index d049710d41..1aa79dd7fc 100644
--- a/phpBB/language/lang_korean/email/user_activate_passwd.tpl
+++ b/phpBB/language/lang_korean/email/user_activate_passwd.tpl
@@ -1,3 +1,5 @@
+Subject: ûϽ йȣ Դϴ.
+
ȳϼ.. {USERNAME} ..!
{SITENAME} ûϽ йȣ ߱Ǿϴ.
diff --git a/phpBB/language/lang_korean/email/user_welcome.tpl b/phpBB/language/lang_korean/email/user_welcome.tpl
index afd6e1b81a..3545d5b5b5 100644
--- a/phpBB/language/lang_korean/email/user_welcome.tpl
+++ b/phpBB/language/lang_korean/email/user_welcome.tpl
@@ -1,3 +1,5 @@
+Subject: {SITENAME}
+
ȳϼ..{WELCOME_MSG} Դϴ..
{WELCOME_MSG} ϽŰ ȯմϴ.
Ͻ ϴ.
diff --git a/phpBB/language/lang_korean/email/user_welcome_inactive.tpl b/phpBB/language/lang_korean/email/user_welcome_inactive.tpl
index c31892eb5f..5b4e8d1bdc 100644
--- a/phpBB/language/lang_korean/email/user_welcome_inactive.tpl
+++ b/phpBB/language/lang_korean/email/user_welcome_inactive.tpl
@@ -1,3 +1,5 @@
+Subject: {SITENAME}
+
ȳϼ.. {WELCOME_MSG} Դϴ..
Please keep this email for your records. Your account information is as follows:
diff --git a/phpBB/language/lang_korean/lang_main.php b/phpBB/language/lang_korean/lang_main.php
index 15182fba68..7cedbc1469 100644
--- a/phpBB/language/lang_korean/lang_main.php
+++ b/phpBB/language/lang_korean/lang_main.php
@@ -21,23 +21,12 @@
*
***************************************************************************/
-//
-// The format of this file is:
-//
-// ---> $lang['message'] = "text";
-//
-// You should also try to set a locale and a character
-// encoding (plus direction). The encoding and direction
-// will be sent to the template. The locale may or may
-// not work, it's dependent on OS support and the syntax
-// varies ... give it your best guess!
-//
-//setlocale(LC_ALL, "en");
+//setlocale(LC_ALL, "kr");
$lang['ENCODING'] = "euc-kr";
-$lang['DIRECTION'] = "LTR";
-$lang['LEFT'] = "LEFT";
-$lang['RIGHT'] = "RIGHT";
+$lang['DIRECTION'] = "ltr";
+$lang['LEFT'] = "left";
+$lang['RIGHT'] = "right";
$lang['DATE_FORMAT'] = "Y m d"; // This should be changed to the default date format for your language, php date() format
//
diff --git a/phpBB/language/lang_norwegian/email/admin_activate.tpl b/phpBB/language/lang_norwegian/email/admin_activate.tpl
index 70d02dfebc..01d7839a73 100644
--- a/phpBB/language/lang_norwegian/email/admin_activate.tpl
+++ b/phpBB/language/lang_norwegian/email/admin_activate.tpl
@@ -1,3 +1,5 @@
+Subject: Nytt medlemskap
+
Hei,
Medlemskapet til "{USERNAME}" er deaktivert eller nyopprettet, om nskelig kan du se profilen her:
diff --git a/phpBB/language/lang_norwegian/email/admin_welcome_activated.tpl b/phpBB/language/lang_norwegian/email/admin_welcome_activated.tpl
index d4d31b0af0..ceca4b3522 100644
--- a/phpBB/language/lang_norwegian/email/admin_welcome_activated.tpl
+++ b/phpBB/language/lang_norwegian/email/admin_welcome_activated.tpl
@@ -1,3 +1,5 @@
+Subject: Medlemskapet er aktivert
+
Hei {USERNAME},
Medlemskapet ditt i forumene p "{SITENAME}" er aktivert, du kan logge p med brukernavnet og passordet du fikk tilsendt i en tidligere e-post.
diff --git a/phpBB/language/lang_norwegian/email/admin_welcome_inactive.tpl b/phpBB/language/lang_norwegian/email/admin_welcome_inactive.tpl
index 7aa107dcf1..5510be5c2d 100644
--- a/phpBB/language/lang_norwegian/email/admin_welcome_inactive.tpl
+++ b/phpBB/language/lang_norwegian/email/admin_welcome_inactive.tpl
@@ -1,3 +1,5 @@
+Subject: Velkommen til forumene p {SITENAME}
+
{WELCOME_MSG}
Ta vare p denne e-posten, medlemsinformasjonen din er som flger :
diff --git a/phpBB/language/lang_norwegian/email/coppa_welcome_inactive.tpl b/phpBB/language/lang_norwegian/email/coppa_welcome_inactive.tpl
index 432aaa3d21..b8f1fdc7fb 100644
--- a/phpBB/language/lang_norwegian/email/coppa_welcome_inactive.tpl
+++ b/phpBB/language/lang_norwegian/email/coppa_welcome_inactive.tpl
@@ -1,3 +1,5 @@
+Subject: Velkommen til forumene p {SITENAME}
+
{WELCOME_MSG}
I trd med COPPA er medlemskapet ditt ikke aktivert.
diff --git a/phpBB/language/lang_norwegian/email/group_added.tpl b/phpBB/language/lang_norwegian/email/group_added.tpl
index 515683c5e9..4bfb108ab3 100644
--- a/phpBB/language/lang_norwegian/email/group_added.tpl
+++ b/phpBB/language/lang_norwegian/email/group_added.tpl
@@ -1,3 +1,5 @@
+Subject: Du er n lagt til i denne grupppen
+
Gratulerer,
Du er lagt til som medlem i gruppen, "{GROUP_NAME}", i forumet p {SITENAME}.
diff --git a/phpBB/language/lang_norwegian/email/group_approved.tpl b/phpBB/language/lang_norwegian/email/group_approved.tpl
index 4d5f3ba424..2780b3572a 100644
--- a/phpBB/language/lang_norwegian/email/group_approved.tpl
+++ b/phpBB/language/lang_norwegian/email/group_approved.tpl
@@ -1,3 +1,5 @@
+Subject: Din sknad er innvilget
+
Gratulerer,
Din sknad om medlemskap i "{GROUP_NAME}" i forumet p {SITENAME} er innvilget.
diff --git a/phpBB/language/lang_norwegian/email/group_request.tpl b/phpBB/language/lang_norwegian/email/group_request.tpl
index e5db126ccc..452fc195be 100644
--- a/phpBB/language/lang_norwegian/email/group_request.tpl
+++ b/phpBB/language/lang_norwegian/email/group_request.tpl
@@ -1,3 +1,5 @@
+Subject: En sknad om deltagelse i din gruppe er levert
+
Hei {GROUP_MODERATOR},
Et medlem har skt om medlemskap i en gruppe du modererer p {SITENAME}.
diff --git a/phpBB/language/lang_norwegian/email/privmsg_notify.tpl b/phpBB/language/lang_norwegian/email/privmsg_notify.tpl
index eb36fe360d..69471c70f3 100644
--- a/phpBB/language/lang_norwegian/email/privmsg_notify.tpl
+++ b/phpBB/language/lang_norwegian/email/privmsg_notify.tpl
@@ -1,3 +1,5 @@
+Subject: Du har mottatt en Privat Melding
+
Hei {USERNAME},
Du har mottatt en ny privat melding i forumet p "{SITENAME}", og har bedt om at dette varsles med e-post. Du kan lese meldingen ved klikke p linken under :
diff --git a/phpBB/language/lang_norwegian/email/topic_notify.tpl b/phpBB/language/lang_norwegian/email/topic_notify.tpl
index e3538a24ac..4644911535 100644
--- a/phpBB/language/lang_norwegian/email/topic_notify.tpl
+++ b/phpBB/language/lang_norwegian/email/topic_notify.tpl
@@ -1,3 +1,5 @@
+Subject: Varsel om svar p Tema - {TOPIC_TITLE}
+
Hei {USERNAME},
Du mottar denne e-posten fordi du abonnerer p emnet, "{TOPIC_TITLE}", i forumet p {SITENAME}.
diff --git a/phpBB/language/lang_norwegian/email/user_activate.tpl b/phpBB/language/lang_norwegian/email/user_activate.tpl
index b00ee21e4c..6df6c2dc85 100644
--- a/phpBB/language/lang_norwegian/email/user_activate.tpl
+++ b/phpBB/language/lang_norwegian/email/user_activate.tpl
@@ -1,3 +1,5 @@
+Subject: Reaktiver medlemsskapet ditt!
+
Hei {USERNAME},
Medlemskapet ditt i forumet p "{SITENAME}" er deaktivert, dette er sannsyneligvis pga. endringer du selv har gjort i profilen din. Klikk p linken under for reaktivere medlemskapet ditt.
diff --git a/phpBB/language/lang_norwegian/email/user_activate_passwd.tpl b/phpBB/language/lang_norwegian/email/user_activate_passwd.tpl
index 8ddb25c03c..4a0fd8d682 100644
--- a/phpBB/language/lang_norwegian/email/user_activate_passwd.tpl
+++ b/phpBB/language/lang_norwegian/email/user_activate_passwd.tpl
@@ -1,3 +1,5 @@
+Subject: Aktiver nytt passord
+
Hei {USERNAME}
Du har mottatt denne e-posten fordi du (eller noen som utgir seg for deg) har bedt om at et nytt passord p {SITENAME}. Hvis du ikke har bedt om nytt passord kan du overse denne e-posten, vennligst gi beskjed til forumets administrator.
diff --git a/phpBB/language/lang_norwegian/email/user_welcome.tpl b/phpBB/language/lang_norwegian/email/user_welcome.tpl
index e42d7f6b98..7246ac844f 100644
--- a/phpBB/language/lang_norwegian/email/user_welcome.tpl
+++ b/phpBB/language/lang_norwegian/email/user_welcome.tpl
@@ -1,3 +1,5 @@
+Subject: Velkommen til forumene p {SITENAME}
+
{WELCOME_MSG}
Ta godt vare p denne e-posten, medlemsinformasjonen din er som flger :
diff --git a/phpBB/language/lang_norwegian/email/user_welcome_inactive.tpl b/phpBB/language/lang_norwegian/email/user_welcome_inactive.tpl
index f8449212e7..91d27e4516 100644
--- a/phpBB/language/lang_norwegian/email/user_welcome_inactive.tpl
+++ b/phpBB/language/lang_norwegian/email/user_welcome_inactive.tpl
@@ -1,3 +1,5 @@
+Subject: Velkommen til forumene p {SITENAME}
+
{WELCOME_MSG}
Ta vare p denne e-posten, medlemsinformasjonen din er som flger :
diff --git a/phpBB/language/lang_norwegian/lang_main.php b/phpBB/language/lang_norwegian/lang_main.php
index d606e8431d..9b864a5a0a 100644
--- a/phpBB/language/lang_norwegian/lang_main.php
+++ b/phpBB/language/lang_norwegian/lang_main.php
@@ -23,23 +23,12 @@
// Norwegian translation by lanes, shantra & water
//
-//
-// The format of this file is:
-//
-// ---> $lang['message'] = "text";
-//
-// You should also try to set a locale and a character
-// encoding (plus direction). The encoding and direction
-// will be sent to the template. The locale may or may
-// not work, it's dependent on OS support and the syntax
-// varies ... give it your best guess!
-//
//setlocale(LC_ALL, "no");
$lang['ENCODING'] = "iso-8859-1";
-$lang['DIRECTION'] = "LTR";
-$lang['LEFT'] = "VENSTRE";
-$lang['RIGHT'] = "HYRE";
+$lang['DIRECTION'] = "ltr";
+$lang['LEFT'] = "left";
+$lang['RIGHT'] = "right";
$lang['DATE_FORMAT'] = "d M Y"; // This should be changed to the default date format for your language, php date() format
//
diff --git a/phpBB/language/lang_polish/email/admin_activate.tpl b/phpBB/language/lang_polish/email/admin_activate.tpl
index f3843b7215..6c135d806f 100644
--- a/phpBB/language/lang_polish/email/admin_activate.tpl
+++ b/phpBB/language/lang_polish/email/admin_activate.tpl
@@ -1,3 +1,5 @@
+Subject: Nowe Konto
+
Witamy,
Konto o nazwie "{USERNAME}" zostao deaktywowane lub nowo utworzone, powiniene sprawdzi szczegy tego uytkownika (jeli to konieczne) i aktywowa konto uywajc poniszego odnonika:
diff --git a/phpBB/language/lang_polish/email/admin_welcome_activated.tpl b/phpBB/language/lang_polish/email/admin_welcome_activated.tpl
index 619b026364..eb9f514564 100644
--- a/phpBB/language/lang_polish/email/admin_welcome_activated.tpl
+++ b/phpBB/language/lang_polish/email/admin_welcome_activated.tpl
@@ -1,3 +1,5 @@
+Subject: Konto Aktywowane
+
Witaj {USERNAME},
Twoje konto na "{SITENAME}" zostao wanie aktywowane, moesz zalogowa si korzystajc z loginu i hasa, ktre otrzymae w poprzednim email'u.
diff --git a/phpBB/language/lang_polish/email/admin_welcome_inactive.tpl b/phpBB/language/lang_polish/email/admin_welcome_inactive.tpl
index 034c142776..ede371b4b2 100644
--- a/phpBB/language/lang_polish/email/admin_welcome_inactive.tpl
+++ b/phpBB/language/lang_polish/email/admin_welcome_inactive.tpl
@@ -1,3 +1,5 @@
+Subject: Witamy na Forum {SITENAME}
+
{WELCOME_MSG}
Prosimy o zachowanie lub wydrukowanie tej wiadomoci. Twoje konto ma ponisze dane:
diff --git a/phpBB/language/lang_polish/email/coppa_welcome_inactive.tpl b/phpBB/language/lang_polish/email/coppa_welcome_inactive.tpl
index b8215cf28a..708fcca69a 100644
--- a/phpBB/language/lang_polish/email/coppa_welcome_inactive.tpl
+++ b/phpBB/language/lang_polish/email/coppa_welcome_inactive.tpl
@@ -1,3 +1,5 @@
+Subject: Witamy na Forum {SITENAME}
+
{WELCOME_MSG}
Zgodnie z aktem COPPA Twoje konto jest obecnie nieaktywne.
diff --git a/phpBB/language/lang_polish/email/group_added.tpl b/phpBB/language/lang_polish/email/group_added.tpl
index 13cbdf6a7f..6ff50fc631 100644
--- a/phpBB/language/lang_polish/email/group_added.tpl
+++ b/phpBB/language/lang_polish/email/group_added.tpl
@@ -1,3 +1,5 @@
+Subject: Zostae dodany do tej grupy
+
Gratulacje,
Zostae przyjty do grupy "{GROUP_NAME}" na {SITENAME}.
diff --git a/phpBB/language/lang_polish/email/group_approved.tpl b/phpBB/language/lang_polish/email/group_approved.tpl
index b971029a23..ee215a8321 100644
--- a/phpBB/language/lang_polish/email/group_approved.tpl
+++ b/phpBB/language/lang_polish/email/group_approved.tpl
@@ -1,3 +1,5 @@
+Subject: Twoja proba zostaa zaakceptowana
+
Gratulacje,
Twoja proba o przyjcie do grupy "{GROUP_NAME}" na {SITENAME} zostaa zaakceptowana
diff --git a/phpBB/language/lang_polish/email/group_request.tpl b/phpBB/language/lang_polish/email/group_request.tpl
index c336532ee2..28a590ac01 100644
--- a/phpBB/language/lang_polish/email/group_request.tpl
+++ b/phpBB/language/lang_polish/email/group_request.tpl
@@ -1,3 +1,5 @@
+Subject: Twoja proba o przyczenie do grupy zostaa wysana
+
Drogi {GROUP_MODERATOR},
Jeden z uytkownikw poprosi o czonkostwo w Twojej grupie na {SITENAME}.
diff --git a/phpBB/language/lang_polish/email/privmsg_notify.tpl b/phpBB/language/lang_polish/email/privmsg_notify.tpl
index 20cd62e142..deea00c19c 100644
--- a/phpBB/language/lang_polish/email/privmsg_notify.tpl
+++ b/phpBB/language/lang_polish/email/privmsg_notify.tpl
@@ -1,3 +1,5 @@
+Subject: Nadesza nowa Prywatna Wiadomo
+
Witaj {USERNAME},
Otrzymae now Prywatn Wiadomo na Twoje konto na "{SITENAME}" i prosie by Ciebie o tym powiadomiono. Moesz zobaczy now wiadomo klikajc na poniszy odnonik:
diff --git a/phpBB/language/lang_polish/email/topic_notify.tpl b/phpBB/language/lang_polish/email/topic_notify.tpl
index a9367a4bf6..0a45f761ab 100644
--- a/phpBB/language/lang_polish/email/topic_notify.tpl
+++ b/phpBB/language/lang_polish/email/topic_notify.tpl
@@ -1,3 +1,5 @@
+Subject: Powiadomienie o Odpowiedzi - {TOPIC_TITLE}
+
Witaj {USERNAME},
Otrzymujesz ten email poniewa obserwujesz temat "{TOPIC_TITLE}" na {SITENAME}. W tym temacie pojawia si odpowied od Twojej ostatniej wizyty. Moesz skorzysta z poniszego odnonika aby zobaczy odpowiedzi. Nie dostaniesz wicej powiadomie dopki nie odwiedzisz tego tematu.
diff --git a/phpBB/language/lang_polish/email/user_activate.tpl b/phpBB/language/lang_polish/email/user_activate.tpl
index 04a8b649d6..31e0d4566a 100644
--- a/phpBB/language/lang_polish/email/user_activate.tpl
+++ b/phpBB/language/lang_polish/email/user_activate.tpl
@@ -1,3 +1,5 @@
+Subject: Reaktywuj soje konto!
+
Witaj {USERNAME},
Twoje konto na "{SITENAME}" zostao deaktywowane, prawdopodobnie w zwizku ze zmianami jakie dokonae w swoim profilu. Aby ponownie aktywowa Twoje konto musisz klikn poniszy odnonik:
diff --git a/phpBB/language/lang_polish/email/user_activate_passwd.tpl b/phpBB/language/lang_polish/email/user_activate_passwd.tpl
index 8d2e393bce..9019c5716c 100644
--- a/phpBB/language/lang_polish/email/user_activate_passwd.tpl
+++ b/phpBB/language/lang_polish/email/user_activate_passwd.tpl
@@ -1,3 +1,5 @@
+Subject: Aktywacja nowego hasa
+
Witaj {USERNAME}
Otrzymujesz ten email poniewa Ty (albo kto podajcy si za Ciebie) poprosi o nowe haso dla Twojego konta na {SITENAME}. Jeeli nie prosie o ten email zignoruj go, a jeli otrzymasz go ponownie skontaktuj si z administratorem forum.
diff --git a/phpBB/language/lang_polish/email/user_welcome.tpl b/phpBB/language/lang_polish/email/user_welcome.tpl
index 32455acd57..e8878188e5 100644
--- a/phpBB/language/lang_polish/email/user_welcome.tpl
+++ b/phpBB/language/lang_polish/email/user_welcome.tpl
@@ -1,3 +1,5 @@
+Subject: Witamy na Forum {SITENAME}
+
{WELCOME_MSG}
Prosimy o zachowanie lub wydrukowanie tego email'a. Informacje o Twoim koncie s nastpujce:
diff --git a/phpBB/language/lang_polish/email/user_welcome_inactive.tpl b/phpBB/language/lang_polish/email/user_welcome_inactive.tpl
index 89acaed0aa..a4cdc9492e 100644
--- a/phpBB/language/lang_polish/email/user_welcome_inactive.tpl
+++ b/phpBB/language/lang_polish/email/user_welcome_inactive.tpl
@@ -1,3 +1,5 @@
+Subject: Witamy na Forum {SITENAME}
+
{WELCOME_MSG}
Prosimy o zachowanie lub wydrukowanie tego email'a. Informacje o Twoim koncie s nastpujce:
diff --git a/phpBB/language/lang_polish/lang_main.php b/phpBB/language/lang_polish/lang_main.php
index 939385383c..8ae3ddb0ec 100644
--- a/phpBB/language/lang_polish/lang_main.php
+++ b/phpBB/language/lang_polish/lang_main.php
@@ -27,9 +27,9 @@
//setlocale(LC_ALL, "pl");
$lang['ENCODING'] = "iso-8859-2";
-$lang['DIRECTION'] = "LTR";
-$lang['LEFT'] = "LEFT";
-$lang['RIGHT'] = "RIGHT";
+$lang['DIRECTION'] = "ltr";
+$lang['LEFT'] = "left";
+$lang['RIGHT'] = "right";
$lang['DATE_FORMAT'] = "d M Y"; // This should be changed to the default date format for your language, php date() format
//
@@ -591,9 +591,9 @@ $lang['Signature_too_long'] = "Tw
$lang['Fields_empty'] = "Musisz wypeni wymagane pola";
$lang['Avatar_filetype'] = "Emblemat musi by typu .jpg, .gif lub .png";
$lang['Avatar_filesize'] = "Rozmiar emblematu musi by wikszy ni 0 kB i mniejszy ni"; // followed by xx kB, xx being the size
-$lang['Avatar_imagesize'] = "Emblemat musi by mniejszy ni " . $board_config['avatar_max_width'] . " pikseli szerokoci i " . $board_config['avatar_max_height'] . " pikseli wysokoci";
+$lang['Avatar_imagesize'] = "Emblemat musi by mniejszy ni %d pikseli szerokoci i %d pikseli wysokoci";
-$lang['Welcome_subject'] = "Witamy na Forum " . $board_config['sitename'];
+$lang['Welcome_subject'] = "Witamy na Forum %s";
$lang['New_account_subject'] = "Nowe Konto";
$lang['Account_activated_subject'] = "Konto Aktywowane";
diff --git a/phpBB/language/lang_portuguese/email/admin_activate.tpl b/phpBB/language/lang_portuguese/email/admin_activate.tpl
index 2f3785d9a5..c126f37162 100644
--- a/phpBB/language/lang_portuguese/email/admin_activate.tpl
+++ b/phpBB/language/lang_portuguese/email/admin_activate.tpl
@@ -1,3 +1,5 @@
+Subject: Novo registo de utilizador
+
Ol,
A conta em nome de "{USERNAME}" foi desactivada ou criada de novo. Voc dever verificar os detalhes deste novo utilizador (caso exigvel) e activa-la, usando o seguinte endereo:
diff --git a/phpBB/language/lang_portuguese/email/admin_welcome_activated.tpl b/phpBB/language/lang_portuguese/email/admin_welcome_activated.tpl
index e5e66fe782..0a4ce9ec05 100644
--- a/phpBB/language/lang_portuguese/email/admin_welcome_activated.tpl
+++ b/phpBB/language/lang_portuguese/email/admin_welcome_activated.tpl
@@ -1,3 +1,5 @@
+Subject: Registo activado
+
Ol {USERNAME},
A sua conta em "{SITENAME}" foi agora activada. Pode ligar-se usando o Nome de Utilizador e a Senha que recebeu num email anterior.
diff --git a/phpBB/language/lang_portuguese/email/admin_welcome_inactive.tpl b/phpBB/language/lang_portuguese/email/admin_welcome_inactive.tpl
index 1db9750820..c184280eb8 100644
--- a/phpBB/language/lang_portuguese/email/admin_welcome_inactive.tpl
+++ b/phpBB/language/lang_portuguese/email/admin_welcome_inactive.tpl
@@ -1,3 +1,5 @@
+Subject: Bem-vindo ao Frum {SITENAME}
+
{WELCOME_MSG}
Por favor guardar este email para seu arquivo. A informao da sua conta a seguinte:
diff --git a/phpBB/language/lang_portuguese/email/coppa_welcome_inactive.tpl b/phpBB/language/lang_portuguese/email/coppa_welcome_inactive.tpl
index ca52b0c251..4e94ba4b3e 100644
--- a/phpBB/language/lang_portuguese/email/coppa_welcome_inactive.tpl
+++ b/phpBB/language/lang_portuguese/email/coppa_welcome_inactive.tpl
@@ -1,3 +1,5 @@
+Subject: Bem-vindo ao Frum {SITENAME}
+
{WELCOME_MSG}
De acordo com a acta COPPA a sua conta encontra-se presentemente inactiva.
diff --git a/phpBB/language/lang_portuguese/email/group_added.tpl b/phpBB/language/lang_portuguese/email/group_added.tpl
index 2976418421..5af402bf89 100644
--- a/phpBB/language/lang_portuguese/email/group_added.tpl
+++ b/phpBB/language/lang_portuguese/email/group_added.tpl
@@ -1,3 +1,5 @@
+Subject: Voc foi adicionado a este Grupo de utilizadores
+
Parabns,
Voc foi adicionado ao grupo "{GROUP_NAME}" em {SITENAME}.
diff --git a/phpBB/language/lang_portuguese/email/group_approved.tpl b/phpBB/language/lang_portuguese/email/group_approved.tpl
index 6904b39b30..2f59600427 100644
--- a/phpBB/language/lang_portuguese/email/group_approved.tpl
+++ b/phpBB/language/lang_portuguese/email/group_approved.tpl
@@ -1,3 +1,5 @@
+Subject: O seu pedido foi aceite
+
Parabns,
O seu pedido para entrar no grupo "{GROUP_NAME}" em {SITENAME} foi aprovado.
diff --git a/phpBB/language/lang_portuguese/email/group_request.tpl b/phpBB/language/lang_portuguese/email/group_request.tpl
index b38594f742..93d5a98cec 100644
--- a/phpBB/language/lang_portuguese/email/group_request.tpl
+++ b/phpBB/language/lang_portuguese/email/group_request.tpl
@@ -1,3 +1,5 @@
+Subject: Foi feito um pedido para se juntar ao seu Grupo
+
Estimado {GROUP_MODERATOR},
Um utilizador apresentou um pedido para entrar num grupo no qual voc moderador em {SITENAME}.
diff --git a/phpBB/language/lang_portuguese/email/privmsg_notify.tpl b/phpBB/language/lang_portuguese/email/privmsg_notify.tpl
index 1012e78a5c..41183c03cd 100644
--- a/phpBB/language/lang_portuguese/email/privmsg_notify.tpl
+++ b/phpBB/language/lang_portuguese/email/privmsg_notify.tpl
@@ -1,3 +1,5 @@
+Subject: Chegou uma Mensagem Privada nova
+
Ol {USERNAME},
Recebeu uma Mensagem Privada nova na sua conta em "{SITENAME}" e voc tinha pedido para ser notificado caso tal acontecesse. Pode ver essa mensagem carregando no seguinte endereo:
diff --git a/phpBB/language/lang_portuguese/email/topic_notify.tpl b/phpBB/language/lang_portuguese/email/topic_notify.tpl
index 7fe02d839f..4b68141843 100644
--- a/phpBB/language/lang_portuguese/email/topic_notify.tpl
+++ b/phpBB/language/lang_portuguese/email/topic_notify.tpl
@@ -1,3 +1,5 @@
+Subject: Notificao de Resposta a Tpico - {TOPIC_TITLE}
+
Ol {USERNAME},
Est a receber este email porque se encontra a "Observar" o tpico, "{TOPIC_TITLE}" em {SITENAME}. Este tpico recebeu uma resposta desde a sua ltima visita. Voc pode usar o endereo que se segue para ler as respostas feitas. No sero enviadas mais notificaes enquanto no visitar esse tpico.
diff --git a/phpBB/language/lang_portuguese/email/user_activate.tpl b/phpBB/language/lang_portuguese/email/user_activate.tpl
index 1147acafb5..7d33ef0909 100644
--- a/phpBB/language/lang_portuguese/email/user_activate.tpl
+++ b/phpBB/language/lang_portuguese/email/user_activate.tpl
@@ -1,3 +1,5 @@
+Subject: Reactivar o seu registo!
+
Ol {USERNAME},
A sua conta em "{SITENAME}" foi desactivada, possivelmente devido a mudanas feitas no seu "Perfil". De forma a reactivar a sua conta dever carregar no endereo abaixo.:
diff --git a/phpBB/language/lang_portuguese/email/user_activate_passwd.tpl b/phpBB/language/lang_portuguese/email/user_activate_passwd.tpl
index 42c53d09a5..e353bc22a0 100644
--- a/phpBB/language/lang_portuguese/email/user_activate_passwd.tpl
+++ b/phpBB/language/lang_portuguese/email/user_activate_passwd.tpl
@@ -1,3 +1,5 @@
+Subject: Activao de Senha Nova
+
Ol {USERNAME}
Est a receber este email porque voc (ou algum passando por si) pediu que uma senha nova relativa sua conta em {SITENAME} fosse enviada. Se no solicitou este email por favor ignore-o. Caso continue a recebe-lo por favor contacte o Administrador dos fruns.
diff --git a/phpBB/language/lang_portuguese/email/user_welcome.tpl b/phpBB/language/lang_portuguese/email/user_welcome.tpl
index e5b43564ba..36b1272cfe 100644
--- a/phpBB/language/lang_portuguese/email/user_welcome.tpl
+++ b/phpBB/language/lang_portuguese/email/user_welcome.tpl
@@ -1,3 +1,5 @@
+Subject: Bem-vindo ao Frum {SITENAME}
+
{WELCOME_MSG}
Por favor guardar este email para seu arquivo. A informao da sua conta a seguinte:
diff --git a/phpBB/language/lang_portuguese/email/user_welcome_inactive.tpl b/phpBB/language/lang_portuguese/email/user_welcome_inactive.tpl
index 4131d80290..51b842ee1c 100644
--- a/phpBB/language/lang_portuguese/email/user_welcome_inactive.tpl
+++ b/phpBB/language/lang_portuguese/email/user_welcome_inactive.tpl
@@ -1,3 +1,5 @@
+Subject: Bem-vindo ao Frum {SITENAME}
+
{WELCOME_MSG}
Por favor guardar este email para seu arquivo. A informao da sua conta a seguinte:
diff --git a/phpBB/language/lang_portuguese/lang_main.php b/phpBB/language/lang_portuguese/lang_main.php
index 9e57806c83..016b5fc019 100644
--- a/phpBB/language/lang_portuguese/lang_main.php
+++ b/phpBB/language/lang_portuguese/lang_main.php
@@ -24,11 +24,11 @@
*
***************************************************************************/
-//setlocale(LC_ALL, "en");
+//setlocale(LC_ALL, "pt");
$lang['ENCODING'] = "iso-8859-1";
-$lang['DIRECTION'] = "LTR";
-$lang['LEFT'] = "LEFT";
-$lang['RIGHT'] = "RIGHT";
+$lang['DIRECTION'] = "ltr";
+$lang['LEFT'] = "left";
+$lang['RIGHT'] = "right";
$lang['DATE_FORMAT'] = "d M Y"; // This should be changed to the default date format for your language, php date() format
//
diff --git a/phpBB/language/lang_russian/email/admin_activate.tpl b/phpBB/language/lang_russian/email/admin_activate.tpl
index 816ff40e30..fa766b1ef2 100644
--- a/phpBB/language/lang_russian/email/admin_activate.tpl
+++ b/phpBB/language/lang_russian/email/admin_activate.tpl
@@ -1,3 +1,5 @@
+Subject:
+
,
"{USERNAME}" , :
diff --git a/phpBB/language/lang_russian/email/admin_welcome_activated.tpl b/phpBB/language/lang_russian/email/admin_welcome_activated.tpl
index b935ed2dc1..8ee6400f5a 100644
--- a/phpBB/language/lang_russian/email/admin_welcome_activated.tpl
+++ b/phpBB/language/lang_russian/email/admin_welcome_activated.tpl
@@ -1,3 +1,5 @@
+Subject:
+
, {USERNAME}!
"{SITENAME}" , , .
diff --git a/phpBB/language/lang_russian/email/admin_welcome_inactive.tpl b/phpBB/language/lang_russian/email/admin_welcome_inactive.tpl
index 019ac070b8..22d9d734fe 100644
--- a/phpBB/language/lang_russian/email/admin_welcome_inactive.tpl
+++ b/phpBB/language/lang_russian/email/admin_welcome_inactive.tpl
@@ -1,3 +1,5 @@
+Subject: {SITENAME}
+
{WELCOME_MSG}
. :
diff --git a/phpBB/language/lang_russian/email/coppa_welcome_inactive.tpl b/phpBB/language/lang_russian/email/coppa_welcome_inactive.tpl
index 65119253ee..aa1cf5d6af 100644
--- a/phpBB/language/lang_russian/email/coppa_welcome_inactive.tpl
+++ b/phpBB/language/lang_russian/email/coppa_welcome_inactive.tpl
@@ -1,3 +1,5 @@
+Subject: {SITENAME}
+
{WELCOME_MSG}
'COPPA' .
diff --git a/phpBB/language/lang_russian/email/group_added.tpl b/phpBB/language/lang_russian/email/group_added.tpl
index 9af7dd77d4..d0c94edc47 100644
--- a/phpBB/language/lang_russian/email/group_added.tpl
+++ b/phpBB/language/lang_russian/email/group_added.tpl
@@ -1,3 +1,5 @@
+Subject:
+
!
"{GROUP_NAME}" {SITENAME}.
diff --git a/phpBB/language/lang_russian/email/group_approved.tpl b/phpBB/language/lang_russian/email/group_approved.tpl
index 305b9bc655..02342cbd1c 100644
--- a/phpBB/language/lang_russian/email/group_approved.tpl
+++ b/phpBB/language/lang_russian/email/group_approved.tpl
@@ -1,3 +1,5 @@
+Subject: .
+
!
"{GROUP_NAME}" {SITENAME} .
diff --git a/phpBB/language/lang_russian/email/group_request.tpl b/phpBB/language/lang_russian/email/group_request.tpl
index a8fe4d508d..333a52f757 100644
--- a/phpBB/language/lang_russian/email/group_request.tpl
+++ b/phpBB/language/lang_russian/email/group_request.tpl
@@ -1,3 +1,5 @@
+Subject: .
+
() {GROUP_MODERATOR}!
( {SITENAME}), .
diff --git a/phpBB/language/lang_russian/email/privmsg_notify.tpl b/phpBB/language/lang_russian/email/privmsg_notify.tpl
index 833e680621..af6339148f 100644
--- a/phpBB/language/lang_russian/email/privmsg_notify.tpl
+++ b/phpBB/language/lang_russian/email/privmsg_notify.tpl
@@ -1,3 +1,5 @@
+Subject:
+
, {USERNAME}!
{SITENAME}, . :
diff --git a/phpBB/language/lang_russian/email/topic_notify.tpl b/phpBB/language/lang_russian/email/topic_notify.tpl
index d0be254767..3d20d33bef 100644
--- a/phpBB/language/lang_russian/email/topic_notify.tpl
+++ b/phpBB/language/lang_russian/email/topic_notify.tpl
@@ -1,3 +1,5 @@
+Subject: - {TOPIC_TITLE}
+
, {USERNAME}!
, "{TOPIC_TITLE}" {SITENAME}. . , .
diff --git a/phpBB/language/lang_russian/email/user_activate.tpl b/phpBB/language/lang_russian/email/user_activate.tpl
index 5eb65ab617..963bc77329 100644
--- a/phpBB/language/lang_russian/email/user_activate.tpl
+++ b/phpBB/language/lang_russian/email/user_activate.tpl
@@ -1,3 +1,5 @@
+Subject:
+
, {USERNAME}!
{SITENAME} , - . , :
diff --git a/phpBB/language/lang_russian/email/user_activate_passwd.tpl b/phpBB/language/lang_russian/email/user_activate_passwd.tpl
index 33c4ca5584..2e1bba976a 100644
--- a/phpBB/language/lang_russian/email/user_activate_passwd.tpl
+++ b/phpBB/language/lang_russian/email/user_activate_passwd.tpl
@@ -1,3 +1,5 @@
+Subject:
+
, {USERNAME}!
, ( -, ) {SITENAME}. , , , .
diff --git a/phpBB/language/lang_russian/email/user_welcome.tpl b/phpBB/language/lang_russian/email/user_welcome.tpl
index 71df0e4b93..1d08d52507 100644
--- a/phpBB/language/lang_russian/email/user_welcome.tpl
+++ b/phpBB/language/lang_russian/email/user_welcome.tpl
@@ -1,3 +1,5 @@
+Subject: {SITENAME}
+
{WELCOME_MSG}
. :
diff --git a/phpBB/language/lang_russian/email/user_welcome_inactive.tpl b/phpBB/language/lang_russian/email/user_welcome_inactive.tpl
index 2bf845c325..a4847acfcf 100644
--- a/phpBB/language/lang_russian/email/user_welcome_inactive.tpl
+++ b/phpBB/language/lang_russian/email/user_welcome_inactive.tpl
@@ -1,3 +1,5 @@
+Subject: {SITENAME}
+
{WELCOME_MSG}
. :
diff --git a/phpBB/language/lang_russian/lang_main.php b/phpBB/language/lang_russian/lang_main.php
index fbfab1ba2c..096dbcdc2f 100644
--- a/phpBB/language/lang_russian/lang_main.php
+++ b/phpBB/language/lang_russian/lang_main.php
@@ -27,9 +27,9 @@
//setlocale(LC_ALL, "ru");
$lang['ENCODING'] = "windows-1251";
-$lang['DIRECTION'] = "LTR";
-$lang['LEFT'] = "LEFT";
-$lang['RIGHT'] = "RIGHT";
+$lang['DIRECTION'] = "ltr";
+$lang['LEFT'] = "left";
+$lang['RIGHT'] = "right";
$lang['DATE_FORMAT'] = "d.m.Y"; // This should be changed to the default date format for your language, php date() format
//
diff --git a/phpBB/language/lang_swedish/email/admin_activate.tpl b/phpBB/language/lang_swedish/email/admin_activate.tpl
index 84ad8a0240..a6c4cf6343 100644
--- a/phpBB/language/lang_swedish/email/admin_activate.tpl
+++ b/phpBB/language/lang_swedish/email/admin_activate.tpl
@@ -1,3 +1,5 @@
+Subject: Nytt anvndarkonto
+
Hej,
Kontot som tillhr "{USERNAME}" har inaktiverats eller har nyligen skapats, du borde kontrollera anvndarens uppgifter (om det krvs) och aktivera kontot genom att anvnda fljande lnk:
diff --git a/phpBB/language/lang_swedish/email/admin_welcome_activated.tpl b/phpBB/language/lang_swedish/email/admin_welcome_activated.tpl
index c136476237..121299cf45 100644
--- a/phpBB/language/lang_swedish/email/admin_welcome_activated.tpl
+++ b/phpBB/language/lang_swedish/email/admin_welcome_activated.tpl
@@ -1,3 +1,5 @@
+Subject: Konto Aktiverat
+
Hej {USERNAME},
Ditt konto p "{SITENAME}" har nu aktiverats, du kan logga p genom anvndarnamnet och lsenordet du fick i ett tidigare e-post meddelande.
diff --git a/phpBB/language/lang_swedish/email/admin_welcome_inactive.tpl b/phpBB/language/lang_swedish/email/admin_welcome_inactive.tpl
index 88d4a4ec35..644468e3d0 100644
--- a/phpBB/language/lang_swedish/email/admin_welcome_inactive.tpl
+++ b/phpBB/language/lang_swedish/email/admin_welcome_inactive.tpl
@@ -1,3 +1,5 @@
+Subject: Vlkommen till {SITENAME} Forum
+
{WELCOME_MSG}
Spara detta meddelande fr framtida behov. Dina kontouppgifter r:
diff --git a/phpBB/language/lang_swedish/email/coppa_welcome_inactive.tpl b/phpBB/language/lang_swedish/email/coppa_welcome_inactive.tpl
index 5d87d82259..ca07dbfd07 100644
--- a/phpBB/language/lang_swedish/email/coppa_welcome_inactive.tpl
+++ b/phpBB/language/lang_swedish/email/coppa_welcome_inactive.tpl
@@ -1,3 +1,5 @@
+Subject: Vlkommen till {SITENAME} Forum
+
{WELCOME_MSG}
I enlighet med 'COPPA act' r ditt konto inte aktiverat.
diff --git a/phpBB/language/lang_swedish/email/group_added.tpl b/phpBB/language/lang_swedish/email/group_added.tpl
index fc8579e987..7c8a276cd9 100644
--- a/phpBB/language/lang_swedish/email/group_added.tpl
+++ b/phpBB/language/lang_swedish/email/group_added.tpl
@@ -1,3 +1,5 @@
+Subject: Du har lagts till i den hr anvndar gruppen
+
Gratulera,
Du har godknnts fr "{GROUP_NAME}" gruppen p {SITENAME}.
diff --git a/phpBB/language/lang_swedish/email/group_approved.tpl b/phpBB/language/lang_swedish/email/group_approved.tpl
index b49eb2269d..f169bdf9e2 100644
--- a/phpBB/language/lang_swedish/email/group_approved.tpl
+++ b/phpBB/language/lang_swedish/email/group_approved.tpl
@@ -1,3 +1,5 @@
+Subject: Din frfrgan har blivit godknd
+
Gratulera,
Din frfrgan att delta i "{GROUP_NAME}" grupp p {SITENAME} har godknnts.
diff --git a/phpBB/language/lang_swedish/email/group_request.tpl b/phpBB/language/lang_swedish/email/group_request.tpl
index 2f45af68ed..d15e2a2d0e 100644
--- a/phpBB/language/lang_swedish/email/group_request.tpl
+++ b/phpBB/language/lang_swedish/email/group_request.tpl
@@ -1,3 +1,5 @@
+Subject: En frfrgan att om att bli medlem i din grupp har gjorts
+
Hej {GROUP_MODERATOR},
En anvndare har anskt om att delta i en grupp du ansvarar fr p {SITENAME}.
diff --git a/phpBB/language/lang_swedish/email/privmsg_notify.tpl b/phpBB/language/lang_swedish/email/privmsg_notify.tpl
index 8e039f4fe8..92423595a4 100644
--- a/phpBB/language/lang_swedish/email/privmsg_notify.tpl
+++ b/phpBB/language/lang_swedish/email/privmsg_notify.tpl
@@ -1,3 +1,5 @@
+Subject: Du har ftt ett Privat Meddelande
+
Hej {USERNAME},
Du har ftt ett nytt privatmeddelande till ditt konto p "{SITENAME}" och du har bett att f ett meddelande om detta. Du kan titta p meddelandet genom att klicka p lnken nedan:
diff --git a/phpBB/language/lang_swedish/email/topic_notify.tpl b/phpBB/language/lang_swedish/email/topic_notify.tpl
index 26ddf411da..81250cfaf8 100644
--- a/phpBB/language/lang_swedish/email/topic_notify.tpl
+++ b/phpBB/language/lang_swedish/email/topic_notify.tpl
@@ -1,3 +1,5 @@
+Subject: Meddelande om svar p inlgg - {TOPIC_TITLE}
+
Hej {USERNAME},
Du fr detta meddelande fr att du bevakar mnet, "{TOPIC_TITLE}" p {SITENAME}. mnet har ftt ett svar sedan ditt senaste besk. Du kan anvnder lnken nedan fr att se svaren, inga fler meddelande ska skickas till dig tills du beska mnet.
diff --git a/phpBB/language/lang_swedish/email/user_activate.tpl b/phpBB/language/lang_swedish/email/user_activate.tpl
index 83555d167c..6d909d5efb 100644
--- a/phpBB/language/lang_swedish/email/user_activate.tpl
+++ b/phpBB/language/lang_swedish/email/user_activate.tpl
@@ -1,3 +1,5 @@
+Subject: teraktivera ditt konto!
+
Hej {USERNAME},
Ditt konto p "{SITENAME}" har inaktiverats, troligtvis pga ndringar som gjorts i din profil. Aktivera ditt konto genom att klicka p lnken nedan:
diff --git a/phpBB/language/lang_swedish/email/user_activate_passwd.tpl b/phpBB/language/lang_swedish/email/user_activate_passwd.tpl
index f1bc711dc5..bc8a26f6c0 100644
--- a/phpBB/language/lang_swedish/email/user_activate_passwd.tpl
+++ b/phpBB/language/lang_swedish/email/user_activate_passwd.tpl
@@ -1,3 +1,5 @@
+Subject: Ny lsenords aktivering
+
Hej {USERNAME}
Du fr detta meddelande eftersom du (eller ngon som ger sig ut att vara dig) har begrt ett nytt lsenord till ditt konto p {SITENAME}. Om du inte har begrt detta kan du bortse frn detta meddelande, om du i fortsttningen fr fler sdana meddelanden var god och ta kontakt med administratren.
diff --git a/phpBB/language/lang_swedish/email/user_welcome.tpl b/phpBB/language/lang_swedish/email/user_welcome.tpl
index f2d14ce0b0..b9126834a4 100644
--- a/phpBB/language/lang_swedish/email/user_welcome.tpl
+++ b/phpBB/language/lang_swedish/email/user_welcome.tpl
@@ -1,3 +1,5 @@
+Subject: Vlkommen till {SITENAME} Forum
+
{WELCOME_MSG}
Spara detta meddelande fr framtida behov. Dina kontouppgifter r:
diff --git a/phpBB/language/lang_swedish/email/user_welcome_inactive.tpl b/phpBB/language/lang_swedish/email/user_welcome_inactive.tpl
index dfdcc75069..402738c136 100644
--- a/phpBB/language/lang_swedish/email/user_welcome_inactive.tpl
+++ b/phpBB/language/lang_swedish/email/user_welcome_inactive.tpl
@@ -1,3 +1,5 @@
+Subject: Vlkommen till {SITENAME} Forum
+
{WELCOME_MSG}
Spara detta meddelande fr framtida behov. Dina kontouppgifter r:
diff --git a/phpBB/language/lang_swedish/lang_main.php b/phpBB/language/lang_swedish/lang_main.php
index dad735fa9f..1faaf60b3f 100644
--- a/phpBB/language/lang_swedish/lang_main.php
+++ b/phpBB/language/lang_swedish/lang_main.php
@@ -32,23 +32,11 @@
// bruce@webway.se
//
-//
-// The format of this file is:
-//
-// ---> $lang['message'] = "text";
-//
-// You should also try to set a locale and a character
-// encoding (plus direction). The encoding and direction
-// will be sent to the template. The locale may or may
-// not work, it's dependent on OS support and the syntax
-// varies ... give it your best guess!
-//
-
//setlocale(LC_ALL, "se");
$lang['ENCODING'] = "iso-8859-1";
-$lang['DIRECTION'] = "LTR";
-$lang['LEFT'] = "VNSTER";
-$lang['RIGHT'] = "HGER";
+$lang['DIRECTION'] = "ltr";
+$lang['LEFT'] = "left";
+$lang['RIGHT'] = "right";
$lang['DATE_FORMAT'] = "d M Y"; // This should be changed to the default date format for your language, php date() format
//
diff --git a/phpBB/language/lang_turkish/email/admin_activate.tpl b/phpBB/language/lang_turkish/email/admin_activate.tpl
index 89446de082..e0f9acf7a7 100644
--- a/phpBB/language/lang_turkish/email/admin_activate.tpl
+++ b/phpBB/language/lang_turkish/email/admin_activate.tpl
@@ -1,3 +1,5 @@
+Subject: Yeni kullanc hesab
+
Merhaba,
"{USERNAME}" kullanici ismi deaktif edildi veya yeni alindi. Kullanici hakkindaki bilgileri kontrol edip, aktive etmek icin asagidaki adrese gidiniz.
diff --git a/phpBB/language/lang_turkish/email/admin_welcome_activated.tpl b/phpBB/language/lang_turkish/email/admin_welcome_activated.tpl
index 52d9bedb72..c0d4fa6cee 100644
--- a/phpBB/language/lang_turkish/email/admin_welcome_activated.tpl
+++ b/phpBB/language/lang_turkish/email/admin_welcome_activated.tpl
@@ -1,3 +1,5 @@
+Subject: Hesap aktif hale getirilmitir
+
Merhaba {USERNAME},
"{SITENAME}" de bulunan hesabiniz aktif edildi. Bironceki mailde gelen sifre ve kullanici adiyla login olabilirsiniz.
diff --git a/phpBB/language/lang_turkish/email/admin_welcome_inactive.tpl b/phpBB/language/lang_turkish/email/admin_welcome_inactive.tpl
index b53efdedc0..14359f77e9 100644
--- a/phpBB/language/lang_turkish/email/admin_welcome_inactive.tpl
+++ b/phpBB/language/lang_turkish/email/admin_welcome_inactive.tpl
@@ -1,3 +1,5 @@
+Subject: {SITENAME} Forumlarna Hogeldiniz
+
{WELCOME_MSG}
Lutfen bu msgi saklayiniz. Kullanici bilgileriniz asagida bulunmakta.
diff --git a/phpBB/language/lang_turkish/email/coppa_welcome_inactive.tpl b/phpBB/language/lang_turkish/email/coppa_welcome_inactive.tpl
index 040366f74d..c1f0f629a4 100644
--- a/phpBB/language/lang_turkish/email/coppa_welcome_inactive.tpl
+++ b/phpBB/language/lang_turkish/email/coppa_welcome_inactive.tpl
@@ -1,3 +1,5 @@
+Subject: {SITENAME} Forumlarna Hogeldiniz
+
{WELCOME_MSG}
COPPA ilkelerine gore kullanici hesabiniz suanda inaktif durumdadir.
diff --git a/phpBB/language/lang_turkish/email/group_added.tpl b/phpBB/language/lang_turkish/email/group_added.tpl
index de6dcb583f..6c9b056eb9 100644
--- a/phpBB/language/lang_turkish/email/group_added.tpl
+++ b/phpBB/language/lang_turkish/email/group_added.tpl
@@ -1,3 +1,5 @@
+Subject: Bu gruba eklendiniz
+
Tebrikler,
{SITENAME} de bulunan "{GROUP_NAME}" grubuna katildiniz.
diff --git a/phpBB/language/lang_turkish/email/group_approved.tpl b/phpBB/language/lang_turkish/email/group_approved.tpl
index bc83258de4..d7075948a6 100644
--- a/phpBB/language/lang_turkish/email/group_approved.tpl
+++ b/phpBB/language/lang_turkish/email/group_approved.tpl
@@ -1,3 +1,5 @@
+Subject: Bavurunuz onaylanmtr
+
Tebrikler,
"{GROUP_NAME}" grubuna girme talebiniz kabul edildi. {SITENAME}
diff --git a/phpBB/language/lang_turkish/email/group_request.tpl b/phpBB/language/lang_turkish/email/group_request.tpl
index 7305b8ca92..f115d1092f 100644
--- a/phpBB/language/lang_turkish/email/group_request.tpl
+++ b/phpBB/language/lang_turkish/email/group_request.tpl
@@ -1,3 +1,5 @@
+Subject: Grubunuza katlmak iin bir bavuru var
+
Degerli {GROUP_MODERATOR},
{SITENAME} sitesinde bulunan bir kullanici yoneticisi oldugunuz bir gruba girmek istiyor.
diff --git a/phpBB/language/lang_turkish/email/privmsg_notify.tpl b/phpBB/language/lang_turkish/email/privmsg_notify.tpl
index 3df79cf14d..3ce5e8d228 100644
--- a/phpBB/language/lang_turkish/email/privmsg_notify.tpl
+++ b/phpBB/language/lang_turkish/email/privmsg_notify.tpl
@@ -1,3 +1,5 @@
+Subject: Yeni bir zel mesaj geldi
+
Merhaba {USERNAME},
"{SITENAME}" da bulunan hesabiniza bir ozel msg geldi ve uyarilma sistemini actiginiz icin bu msgi aldiniz. Msgi incelemek icin asagidaki linke tiklayiniz.
diff --git a/phpBB/language/lang_turkish/email/topic_notify.tpl b/phpBB/language/lang_turkish/email/topic_notify.tpl
index b83b28e7aa..58c169d03e 100644
--- a/phpBB/language/lang_turkish/email/topic_notify.tpl
+++ b/phpBB/language/lang_turkish/email/topic_notify.tpl
@@ -1,3 +1,5 @@
+Subject: Cevap gzleme - {TOPIC_TITLE}
+
Merhaba {USERNAME},
Bu msgi almanizin nedeni, {SITENAME} de bulununan "{TOPIC_TITLE}" baslikta yeni msglar olmasidir. Asagidaki linke tiklyarak konuya ulasabilirsiniz.
diff --git a/phpBB/language/lang_turkish/email/user_activate.tpl b/phpBB/language/lang_turkish/email/user_activate.tpl
index f712da492c..ef3c29ff6a 100644
--- a/phpBB/language/lang_turkish/email/user_activate.tpl
+++ b/phpBB/language/lang_turkish/email/user_activate.tpl
@@ -1,3 +1,5 @@
+Subject: Hesabnz yeniden aktif hale getirmelisiniz!
+
Merhaba {USERNAME},
"{SITENAME}" da bulunan hesabiniz deaktif durumda. Bu genellikle profil degisikliklerinde olur. Aktif etmek icin asagidaki linke tiklayin:
diff --git a/phpBB/language/lang_turkish/email/user_activate_passwd.tpl b/phpBB/language/lang_turkish/email/user_activate_passwd.tpl
index 0e85fe0a56..e98eb20284 100644
--- a/phpBB/language/lang_turkish/email/user_activate_passwd.tpl
+++ b/phpBB/language/lang_turkish/email/user_activate_passwd.tpl
@@ -1,3 +1,5 @@
+Subject: Yeni ifre aktivasyonu
+
Merhaba {USERNAME}
{SITENAME} de bulunan hesabinizdan yeni sifre gonderilmesi icin istekte bulunuldu. Eger siz istemediyseniz admin ile iletisime gecin.
diff --git a/phpBB/language/lang_turkish/email/user_welcome.tpl b/phpBB/language/lang_turkish/email/user_welcome.tpl
index 1ee296fab1..0c6f1d87b4 100644
--- a/phpBB/language/lang_turkish/email/user_welcome.tpl
+++ b/phpBB/language/lang_turkish/email/user_welcome.tpl
@@ -1,3 +1,5 @@
+Subject: {SITENAME} Forumlarna Hogeldiniz
+
{WELCOME_MSG}
Lutfen bu msgi saklayiniz. Kullanici bilgileriniz asagida bulunmakta:
diff --git a/phpBB/language/lang_turkish/email/user_welcome_inactive.tpl b/phpBB/language/lang_turkish/email/user_welcome_inactive.tpl
index e8292d6805..ea3e14f728 100644
--- a/phpBB/language/lang_turkish/email/user_welcome_inactive.tpl
+++ b/phpBB/language/lang_turkish/email/user_welcome_inactive.tpl
@@ -1,3 +1,5 @@
+Subject: {SITENAME} Forumlarna Hogeldiniz
+
{WELCOME_MSG}
Lutfen bu msgi saklayiniz. Kullanici bilgileriniz asagidadir.
diff --git a/phpBB/language/lang_turkish/lang_main.php b/phpBB/language/lang_turkish/lang_main.php
index fd55184728..295cc8bd92 100644
--- a/phpBB/language/lang_turkish/lang_main.php
+++ b/phpBB/language/lang_turkish/lang_main.php
@@ -29,11 +29,11 @@
//
-//setlocale(LC_ALL, "en");
+//setlocale(LC_ALL, "tr");
$lang['ENCODING'] = "iso-8859-9";
-$lang['DIRECTION'] = "LTR";
-$lang['LEFT'] = "LEFT";
-$lang['RIGHT'] = "RIGHT";
+$lang['DIRECTION'] = "ltr";
+$lang['LEFT'] = "left";
+$lang['RIGHT'] = "right";
$lang['DATE_FORMAT'] = "d M Y"; // This should be changed to the default date format for your language, php date() format
//