From d0e1833ac5675deeb98aa6d2df8f8127b6567582 Mon Sep 17 00:00:00 2001 From: "Paul S. Owen" Date: Fri, 17 Jan 2003 17:14:36 +0000 Subject: [PATCH] Fixed email templates git-svn-id: file:///svn/phpbb/branches/phpBB-2_0_0@3334 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/language/lang_icelandic/email/admin_activate.tpl | 4 ++-- phpBB/language/lang_icelandic/email/admin_send_email.tpl | 2 ++ .../language/lang_icelandic/email/admin_welcome_activated.tpl | 3 ++- .../language/lang_icelandic/email/admin_welcome_inactive.tpl | 3 ++- .../language/lang_icelandic/email/coppa_welcome_inactive.tpl | 4 ++-- phpBB/language/lang_icelandic/email/group_added.tpl | 3 ++- phpBB/language/lang_icelandic/email/group_approved.tpl | 3 ++- phpBB/language/lang_icelandic/email/group_request.tpl | 3 ++- phpBB/language/lang_icelandic/email/privmsg_notify.tpl | 3 ++- phpBB/language/lang_icelandic/email/profile_send_email.tpl | 2 ++ phpBB/language/lang_icelandic/email/topic_notify.tpl | 3 ++- phpBB/language/lang_icelandic/email/user_activate.tpl | 3 ++- phpBB/language/lang_icelandic/email/user_activate_passwd.tpl | 2 +- phpBB/language/lang_icelandic/email/user_welcome.tpl | 3 ++- phpBB/language/lang_icelandic/email/user_welcome_inactive.tpl | 3 ++- 15 files changed, 29 insertions(+), 15 deletions(-) diff --git a/phpBB/language/lang_icelandic/email/admin_activate.tpl b/phpBB/language/lang_icelandic/email/admin_activate.tpl index c3d27211f1..6406137a10 100644 --- a/phpBB/language/lang_icelandic/email/admin_activate.tpl +++ b/phpBB/language/lang_icelandic/email/admin_activate.tpl @@ -1,5 +1,5 @@ -Efni : Nýr notandi - +Subject: Nýr notandi +Charset: iso-8859-1 Halló, diff --git a/phpBB/language/lang_icelandic/email/admin_send_email.tpl b/phpBB/language/lang_icelandic/email/admin_send_email.tpl index ae59ef1597..0b6b8390ed 100644 --- a/phpBB/language/lang_icelandic/email/admin_send_email.tpl +++ b/phpBB/language/lang_icelandic/email/admin_send_email.tpl @@ -1,3 +1,5 @@ +Charset: iso-8859-1 + Eftirfarandi póstur er sendur til þín af umsjónarmanni "{SITENAME}". Ef þetta er ruslpóstur, inniheldur móðgandi eða annað sem þér þykja óviðeigandi þá skaltu hafa samband við umsjónarmann þessa umræðu borðs á eftirfarandi netfangi: {BOARD_EMAIL} diff --git a/phpBB/language/lang_icelandic/email/admin_welcome_activated.tpl b/phpBB/language/lang_icelandic/email/admin_welcome_activated.tpl index 11d3551d49..2baf22fbd9 100644 --- a/phpBB/language/lang_icelandic/email/admin_welcome_activated.tpl +++ b/phpBB/language/lang_icelandic/email/admin_welcome_activated.tpl @@ -1,4 +1,5 @@ -Efni : Reikningur gerður virkur +Subject: Reikningur gerður virkur +Charset: iso-8859-1 Halló {USERNAME}, diff --git a/phpBB/language/lang_icelandic/email/admin_welcome_inactive.tpl b/phpBB/language/lang_icelandic/email/admin_welcome_inactive.tpl index 70e71a254f..a64182af17 100644 --- a/phpBB/language/lang_icelandic/email/admin_welcome_inactive.tpl +++ b/phpBB/language/lang_icelandic/email/admin_welcome_inactive.tpl @@ -1,4 +1,5 @@ -Efni : Velkomin til {SITENAME} umræðuhóps +Subject: Velkomin til {SITENAME} umræðuhóps +Charset: iso-8859-1 {WELCOME_MSG} diff --git a/phpBB/language/lang_icelandic/email/coppa_welcome_inactive.tpl b/phpBB/language/lang_icelandic/email/coppa_welcome_inactive.tpl index 8da15fcff2..a290284db8 100644 --- a/phpBB/language/lang_icelandic/email/coppa_welcome_inactive.tpl +++ b/phpBB/language/lang_icelandic/email/coppa_welcome_inactive.tpl @@ -1,5 +1,5 @@ -Efni : Velkomin/n til {SITENAME} umræðuborðs - +Subject: Velkomin/n til {SITENAME} umræðuborðs +Charset: iso-8859-1 {WELCOME_MSG} diff --git a/phpBB/language/lang_icelandic/email/group_added.tpl b/phpBB/language/lang_icelandic/email/group_added.tpl index 927c1526a1..11193a5848 100644 --- a/phpBB/language/lang_icelandic/email/group_added.tpl +++ b/phpBB/language/lang_icelandic/email/group_added.tpl @@ -1,4 +1,5 @@ -Efni : Þér hefur verið bætt við þennan notendahóp +Subject: Þér hefur verið bætt við þennan notendahóp +Charset: iso-8859-1 Til hamingju, diff --git a/phpBB/language/lang_icelandic/email/group_approved.tpl b/phpBB/language/lang_icelandic/email/group_approved.tpl index 1cb245d8ad..65a823c056 100644 --- a/phpBB/language/lang_icelandic/email/group_approved.tpl +++ b/phpBB/language/lang_icelandic/email/group_approved.tpl @@ -1,4 +1,5 @@ -Efni : Umsókn þín hefur verið samþykkt +Subject: Umsókn þín hefur verið samþykkt +Charset: iso-8859-1 Til hamingju, diff --git a/phpBB/language/lang_icelandic/email/group_request.tpl b/phpBB/language/lang_icelandic/email/group_request.tpl index 95d474430c..56f52cf1ba 100644 --- a/phpBB/language/lang_icelandic/email/group_request.tpl +++ b/phpBB/language/lang_icelandic/email/group_request.tpl @@ -1,4 +1,5 @@ -Efni : Beiðni um aðild að notendahóp hefur verið gerð +Subject: Beiðni um aðild að notendahóp hefur verið gerð +Charset: iso-8859-1 Kæri {GROUP_MODERATOR}, diff --git a/phpBB/language/lang_icelandic/email/privmsg_notify.tpl b/phpBB/language/lang_icelandic/email/privmsg_notify.tpl index 4de5475f99..72f6888d23 100644 --- a/phpBB/language/lang_icelandic/email/privmsg_notify.tpl +++ b/phpBB/language/lang_icelandic/email/privmsg_notify.tpl @@ -1,4 +1,5 @@ -Efni : Þér hefur borist einkapóstur +Subject: Þér hefur borist einkapóstur +Charset: iso-8859-1 Halló {USERNAME}, diff --git a/phpBB/language/lang_icelandic/email/profile_send_email.tpl b/phpBB/language/lang_icelandic/email/profile_send_email.tpl index e6325182a8..10edbd417a 100644 --- a/phpBB/language/lang_icelandic/email/profile_send_email.tpl +++ b/phpBB/language/lang_icelandic/email/profile_send_email.tpl @@ -1,3 +1,5 @@ +Charset: iso-8859-1 + Halló {TO_USERNAME}, Eftirfarandi póstur er sendur til þín frá {FROM_USERNAME} um þinn aðgang hjá umræðuhópnum á {SITENAME}. Ef þessi póstur er ruslpóstur, inniheldur dónaskap eða óviðeingandi orð þá skaltu hafa samband við stjórnanda þessa umræðuborðs á eftirfarandi netfangi: diff --git a/phpBB/language/lang_icelandic/email/topic_notify.tpl b/phpBB/language/lang_icelandic/email/topic_notify.tpl index e56eae4a7a..f4dc70cf0e 100644 --- a/phpBB/language/lang_icelandic/email/topic_notify.tpl +++ b/phpBB/language/lang_icelandic/email/topic_notify.tpl @@ -1,4 +1,5 @@ -Efni : Spjallþráða tilkynning - {TOPIC_TITLE} +Subject: Spjallþráða tilkynning - {TOPIC_TITLE} +Charset: iso-8859-1 Halló {USERNAME}, diff --git a/phpBB/language/lang_icelandic/email/user_activate.tpl b/phpBB/language/lang_icelandic/email/user_activate.tpl index 2a3e46366c..2ccba74ed8 100644 --- a/phpBB/language/lang_icelandic/email/user_activate.tpl +++ b/phpBB/language/lang_icelandic/email/user_activate.tpl @@ -1,4 +1,5 @@ -Efni : Gera aðgang þinn virkan aftur +Subject: Gera aðgang þinn virkan aftur +Charset: iso-8859-1 Halló {USERNAME}, diff --git a/phpBB/language/lang_icelandic/email/user_activate_passwd.tpl b/phpBB/language/lang_icelandic/email/user_activate_passwd.tpl index 21655e2fee..9d2d761ccd 100644 --- a/phpBB/language/lang_icelandic/email/user_activate_passwd.tpl +++ b/phpBB/language/lang_icelandic/email/user_activate_passwd.tpl @@ -1,4 +1,4 @@ -Efni : Nýtt aðgangsorð +Subject: Nýtt aðgangsorð Charset: iso-8859-1 Halló {USERNAME} diff --git a/phpBB/language/lang_icelandic/email/user_welcome.tpl b/phpBB/language/lang_icelandic/email/user_welcome.tpl index 0319fabcc8..228f03913f 100644 --- a/phpBB/language/lang_icelandic/email/user_welcome.tpl +++ b/phpBB/language/lang_icelandic/email/user_welcome.tpl @@ -1,4 +1,5 @@ -Efni : Velkomin til umræðuborðs á {SITENAME} +Subject: Velkomin til umræðuborðs á {SITENAME} +Charset: iso-8859-1 {WELCOME_MSG} diff --git a/phpBB/language/lang_icelandic/email/user_welcome_inactive.tpl b/phpBB/language/lang_icelandic/email/user_welcome_inactive.tpl index ab94ac8abc..82be472770 100644 --- a/phpBB/language/lang_icelandic/email/user_welcome_inactive.tpl +++ b/phpBB/language/lang_icelandic/email/user_welcome_inactive.tpl @@ -1,4 +1,5 @@ -Efni : Velkomin til umræðuborðs á {SITENAME} +Subject: Velkomin til umræðuborðs á {SITENAME} +Charset: iso-8859-1 {WELCOME_MSG}