From 4b48ebcb4c737efa109f283e6337b4bd8e182528 Mon Sep 17 00:00:00 2001 From: "Paul S. Owen" Date: Fri, 17 May 2002 13:14:05 +0000 Subject: [PATCH] More updates ... added Date and Content-type/encoding output for the emails, updated all email templates git-svn-id: file:///svn/phpbb/branches/phpBB-2_0_0@2587 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/includes/emailer.php | 145 ++++++++---------- phpBB/includes/functions_admin.php | 2 +- phpBB/includes/functions_post.php | 53 +++---- phpBB/includes/usercp_email.php | 32 ++-- .../lang_albanian/email/admin_activate.tpl | 1 + .../lang_albanian/email/admin_send_email.tpl | 2 + .../email/admin_welcome_activated.tpl | 1 + .../email/admin_welcome_inactive.tpl | 1 + .../email/coppa_welcome_inactive.tpl | 1 + .../lang_albanian/email/group_added.tpl | 1 + .../lang_albanian/email/group_approved.tpl | 1 + .../lang_albanian/email/group_request.tpl | 1 + .../lang_albanian/email/privmsg_notify.tpl | 1 + .../email/profile_send_email.tpl | 2 + .../lang_albanian/email/topic_notify.tpl | 1 + .../lang_albanian/email/user_activate.tpl | 1 + .../email/user_activate_passwd.tpl | 1 + .../lang_albanian/email/user_welcome.tpl | 1 + .../email/user_welcome_inactive.tpl | 1 + .../lang_arabic/email/admin_activate.tpl | 1 + .../lang_arabic/email/admin_send_email.tpl | 2 + .../email/admin_welcome_activated.tpl | 1 + .../email/admin_welcome_inactive.tpl | 1 + .../email/coppa_welcome_inactive.tpl | 1 + .../lang_arabic/email/group_added.tpl | 1 + .../lang_arabic/email/group_approved.tpl | 1 + .../lang_arabic/email/group_request.tpl | 1 + .../lang_arabic/email/privmsg_notify.tpl | 1 + .../lang_arabic/email/profile_send_email.tpl | 2 + .../lang_arabic/email/topic_notify.tpl | 1 + .../lang_arabic/email/user_activate.tpl | 1 + .../email/user_activate_passwd.tpl | 1 + .../lang_arabic/email/user_welcome.tpl | 1 + .../email/user_welcome_inactive.tpl | 1 + .../lang_bulgarian/email/admin_activate.tpl | 17 +- .../lang_bulgarian/email/admin_send_email.tpl | 18 ++- .../email/admin_welcome_activated.tpl | 13 +- .../email/admin_welcome_inactive.tpl | 35 +++-- .../email/coppa_welcome_inactive.tpl | 1 + .../lang_bulgarian/email/group_added.tpl | 23 +-- .../lang_bulgarian/email/group_approved.tpl | 21 +-- .../lang_bulgarian/email/group_request.tpl | 21 +-- .../lang_bulgarian/email/privmsg_notify.tpl | 19 +-- .../email/profile_send_email.tpl | 22 +-- .../lang_bulgarian/email/topic_notify.tpl | 25 +-- .../lang_bulgarian/email/user_activate.tpl | 17 +- .../email/user_activate_passwd.tpl | 33 ++-- .../lang_bulgarian/email/user_welcome.tpl | 31 ++-- .../email/user_welcome_inactive.tpl | 39 ++--- .../email/admin_activate.tpl | 17 +- .../email/admin_send_email.tpl | 22 +-- .../email/admin_welcome_activated.tpl | 13 +- .../email/admin_welcome_inactive.tpl | 35 +++-- .../email/coppa_welcome_inactive.tpl | 105 ++++++------- .../email/group_added.tpl | 21 +-- .../email/group_approved.tpl | 21 +-- .../email/group_request.tpl | 19 +-- .../email/privmsg_notify.tpl | 21 +-- .../email/profile_send_email.tpl | 26 ++-- .../email/topic_notify.tpl | 25 +-- .../email/user_activate.tpl | 17 +- .../email/user_activate_passwd.tpl | 33 ++-- .../email/user_welcome.tpl | 31 ++-- .../email/user_welcome_inactive.tpl | 39 ++--- .../email/admin_activate.tpl | 14 +- .../email/admin_send_email.tpl | 22 +-- .../email/admin_welcome_activated.tpl | 10 +- .../email/admin_welcome_inactive.tpl | 32 ++-- .../email/coppa_welcome_inactive.tpl | 102 ++++++------ .../email/group_added.tpl | 20 +-- .../email/group_approved.tpl | 16 +- .../email/group_denied.tpl | 18 ++- .../email/group_request.tpl | 16 +- .../email/privmsg_notify.tpl | 18 ++- .../email/profile_send_email.tpl | 24 +-- .../email/topic_notify.tpl | 22 +-- .../email/user_activate.tpl | 14 +- .../email/user_activate_passwd.tpl | 30 ++-- .../email/user_welcome.tpl | 28 ++-- .../email/user_welcome_inactive.tpl | 36 +++-- .../lang_danish/email/admin_activate.tpl | 1 + .../lang_danish/email/admin_send_email.tpl | 2 + .../email/admin_welcome_activated.tpl | 1 + .../email/admin_welcome_inactive.tpl | 1 + .../email/coppa_welcome_inactive.tpl | 1 + .../lang_danish/email/group_added.tpl | 1 + .../lang_danish/email/group_approved.tpl | 1 + .../lang_danish/email/group_request.tpl | 1 + .../lang_danish/email/privmsg_notify.tpl | 1 + .../lang_danish/email/profile_send_email.tpl | 2 + .../lang_danish/email/topic_notify.tpl | 1 + .../lang_danish/email/user_activate.tpl | 1 + .../email/user_activate_passwd.tpl | 1 + .../lang_danish/email/user_welcome.tpl | 1 + .../email/user_welcome_inactive.tpl | 1 + .../lang_dutch/email/admin_activate.tpl | 1 + .../lang_dutch/email/admin_send_email.tpl | 2 + .../email/admin_welcome_activated.tpl | 1 + .../email/admin_welcome_inactive.tpl | 1 + .../email/coppa_welcome_inactive.tpl | 1 + .../language/lang_dutch/email/group_added.tpl | 1 + .../lang_dutch/email/group_approved.tpl | 1 + .../lang_dutch/email/group_request.tpl | 1 + .../lang_dutch/email/privmsg_notify.tpl | 1 + .../lang_dutch/email/profile_send_email.tpl | 2 + .../lang_dutch/email/topic_notify.tpl | 1 + .../lang_dutch/email/user_activate.tpl | 1 + .../lang_dutch/email/user_activate_passwd.tpl | 1 + .../lang_dutch/email/user_welcome.tpl | 1 + .../email/user_welcome_inactive.tpl | 1 + .../lang_english/email/admin_activate.tpl | 1 + .../lang_english/email/admin_send_email.tpl | 2 + .../email/admin_welcome_activated.tpl | 1 + .../email/admin_welcome_inactive.tpl | 1 + .../email/coppa_welcome_inactive.tpl | 1 + .../lang_english/email/group_added.tpl | 1 + .../lang_english/email/group_approved.tpl | 1 + .../lang_english/email/group_request.tpl | 1 + .../lang_english/email/privmsg_notify.tpl | 1 + .../lang_english/email/profile_send_email.tpl | 2 + .../lang_english/email/topic_notify.tpl | 1 + .../lang_english/email/user_activate.tpl | 1 + .../email/user_activate_passwd.tpl | 1 + .../lang_english/email/user_welcome.tpl | 1 + .../email/user_welcome_inactive.tpl | 1 + .../lang_finnish/email/admin_activate.tpl | 17 +- .../lang_finnish/email/admin_send_email.tpl | 2 + .../email/admin_welcome_activated.tpl | 13 +- .../email/admin_welcome_inactive.tpl | 35 +++-- .../email/coppa_welcome_inactive.tpl | 1 + .../lang_finnish/email/group_added.tpl | 23 +-- .../lang_finnish/email/group_approved.tpl | 1 + .../lang_finnish/email/group_request.tpl | 21 +-- .../lang_finnish/email/privmsg_notify.tpl | 1 + .../lang_finnish/email/profile_send_email.tpl | 2 + .../lang_finnish/email/topic_notify.tpl | 1 + .../lang_finnish/email/user_activate.tpl | 1 + .../email/user_activate_passwd.tpl | 33 ++-- .../lang_finnish/email/user_welcome.tpl | 31 ++-- .../email/user_welcome_inactive.tpl | 39 ++--- .../lang_french/email/admin_activate.tpl | 1 + .../lang_french/email/admin_send_email.tpl | 2 + .../email/admin_welcome_activated.tpl | 1 + .../email/admin_welcome_inactive.tpl | 1 + .../email/coppa_welcome_inactive.tpl | 1 + .../lang_french/email/group_added.tpl | 1 + .../lang_french/email/group_approved.tpl | 1 + .../lang_french/email/group_request.tpl | 1 + .../lang_french/email/privmsg_notify.tpl | 1 + .../lang_french/email/profile_send_email.tpl | 2 + .../lang_french/email/topic_notify.tpl | 1 + .../lang_french/email/user_activate.tpl | 1 + .../email/user_activate_passwd.tpl | 1 + .../lang_french/email/user_welcome.tpl | 1 + .../email/user_welcome_inactive.tpl | 2 + .../lang_german/email/admin_activate.tpl | 1 + .../lang_german/email/admin_send_email.tpl | 2 + .../email/admin_welcome_activated.tpl | 1 + .../email/admin_welcome_inactive.tpl | 1 + .../email/coppa_welcome_inactive.tpl | 1 + .../lang_german/email/group_added.tpl | 1 + .../lang_german/email/group_approved.tpl | 1 + .../lang_german/email/group_request.tpl | 1 + .../lang_german/email/privmsg_notify.tpl | 1 + .../lang_german/email/profile_send_email.tpl | 2 + .../lang_german/email/topic_notify.tpl | 1 + .../lang_german/email/user_activate.tpl | 1 + .../email/user_activate_passwd.tpl | 1 + .../lang_german/email/user_welcome.tpl | 1 + .../email/user_welcome_inactive.tpl | 1 + .../lang_greek/email/admin_activate.tpl | 17 +- .../lang_greek/email/admin_send_email.tpl | 2 + .../email/admin_welcome_activated.tpl | 1 + .../email/admin_welcome_inactive.tpl | 1 + .../email/coppa_welcome_inactive.tpl | 1 + .../language/lang_greek/email/group_added.tpl | 1 + .../lang_greek/email/group_approved.tpl | 1 + .../lang_greek/email/group_request.tpl | 1 + .../lang_greek/email/privmsg_notify.tpl | 1 + .../lang_greek/email/profile_send_email.tpl | 2 + .../lang_greek/email/topic_notify.tpl | 1 + .../lang_greek/email/user_activate.tpl | 1 + .../lang_greek/email/user_activate_passwd.tpl | 1 + .../lang_greek/email/user_welcome.tpl | 1 + .../email/user_welcome_inactive.tpl | 1 + .../lang_hebrew/email/admin_activate.tpl | 1 + .../lang_hebrew/email/admin_send_email.tpl | 2 + .../email/admin_welcome_activated.tpl | 1 + .../email/admin_welcome_inactive.tpl | 1 + .../email/coppa_welcome_inactive.tpl | 1 + .../lang_hebrew/email/group_added.tpl | 1 + .../lang_hebrew/email/group_approved.tpl | 1 + .../lang_hebrew/email/group_request.tpl | 1 + .../lang_hebrew/email/privmsg_notify.tpl | 1 + .../lang_hebrew/email/profile_send_email.tpl | 2 + .../lang_hebrew/email/topic_notify.tpl | 1 + .../lang_hebrew/email/user_activate.tpl | 1 + .../email/user_activate_passwd.tpl | 1 + .../lang_hebrew/email/user_welcome.tpl | 1 + .../email/user_welcome_inactive.tpl | 1 + phpBB/language/lang_hebrew/lang_main.php | 8 +- .../lang_hungarian/email/admin_activate.tpl | 19 +-- .../lang_hungarian/email/admin_send_email.tpl | 24 +-- .../email/admin_welcome_activated.tpl | 15 +- .../email/admin_welcome_inactive.tpl | 37 ++--- .../email/coppa_welcome_inactive.tpl | 105 ++++++------- .../lang_hungarian/email/group_added.tpl | 25 +-- .../lang_hungarian/email/group_approved.tpl | 23 +-- .../lang_hungarian/email/group_request.tpl | 23 +-- .../lang_hungarian/email/privmsg_notify.tpl | 23 +-- .../email/profile_send_email.tpl | 28 ++-- .../lang_hungarian/email/topic_notify.tpl | 27 ++-- .../lang_hungarian/email/user_activate.tpl | 19 +-- .../email/user_activate_passwd.tpl | 35 +++-- .../lang_hungarian/email/user_welcome.tpl | 33 ++-- .../email/user_welcome_inactive.tpl | 41 ++--- .../lang_italian/email/admin_activate.tpl | 1 + .../lang_italian/email/admin_send_email.tpl | 2 + .../email/admin_welcome_activated.tpl | 1 + .../email/admin_welcome_inactive.tpl | 1 + .../email/coppa_welcome_inactive.tpl | 1 + .../lang_italian/email/group_added.tpl | 1 + .../lang_italian/email/group_approved.tpl | 1 + .../lang_italian/email/group_request.tpl | 1 + .../lang_italian/email/privmsg_notify.tpl | 1 + .../lang_italian/email/profile_send_email.tpl | 2 + .../lang_italian/email/topic_notify.tpl | 1 + .../lang_italian/email/user_activate.tpl | 1 + .../email/user_activate_passwd.tpl | 1 + .../lang_italian/email/user_welcome.tpl | 1 + .../email/user_welcome_inactive.tpl | 1 + .../lang_japanese/email/admin_activate.tpl | 13 +- .../lang_japanese/email/admin_send_email.tpl | 22 +-- .../email/admin_welcome_activated.tpl | 13 +- .../email/admin_welcome_inactive.tpl | 35 +++-- .../email/coppa_welcome_inactive.tpl | 99 ++++++------ .../lang_japanese/email/group_added.tpl | 21 +-- .../lang_japanese/email/group_approved.tpl | 21 +-- .../lang_japanese/email/group_request.tpl | 19 +-- .../lang_japanese/email/privmsg_notify.tpl | 21 +-- .../email/profile_send_email.tpl | 26 ++-- .../lang_japanese/email/topic_notify.tpl | 25 +-- .../lang_japanese/email/user_activate.tpl | 17 +- .../email/user_activate_passwd.tpl | 33 ++-- .../lang_japanese/email/user_welcome.tpl | 35 +++-- .../email/user_welcome_inactive.tpl | 41 ++--- .../lang_korean/email/admin_activate.tpl | 1 + .../lang_korean/email/admin_send_email.tpl | 16 +- .../email/admin_welcome_activated.tpl | 1 + .../email/admin_welcome_inactive.tpl | 1 + .../email/coppa_welcome_inactive.tpl | 1 + .../lang_korean/email/group_added.tpl | 1 + .../lang_korean/email/group_approved.tpl | 21 +-- .../lang_korean/email/group_request.tpl | 25 +-- .../lang_korean/email/privmsg_notify.tpl | 31 ++-- .../lang_korean/email/profile_send_email.tpl | 16 +- .../lang_korean/email/topic_notify.tpl | 33 ++-- .../lang_korean/email/user_activate.tpl | 1 + .../email/user_activate_passwd.tpl | 29 ++-- .../lang_korean/email/user_welcome.tpl | 41 ++--- .../email/user_welcome_inactive.tpl | 31 ++-- .../lang_norwegian/email/admin_activate.tpl | 1 + .../lang_norwegian/email/admin_send_email.tpl | 2 + .../email/admin_welcome_activated.tpl | 1 + .../email/admin_welcome_inactive.tpl | 1 + .../email/coppa_welcome_inactive.tpl | 1 + .../lang_norwegian/email/group_added.tpl | 1 + .../lang_norwegian/email/group_approved.tpl | 1 + .../lang_norwegian/email/group_request.tpl | 1 + .../lang_norwegian/email/privmsg_notify.tpl | 1 + .../email/profile_send_email.tpl | 2 + .../lang_norwegian/email/topic_notify.tpl | 1 + .../lang_norwegian/email/user_activate.tpl | 1 + .../email/user_activate_passwd.tpl | 1 + .../lang_norwegian/email/user_welcome.tpl | 1 + .../email/user_welcome_inactive.tpl | 1 + .../lang_polish/email/admin_activate.tpl | 17 +- .../lang_polish/email/admin_send_email.tpl | 2 + .../email/admin_welcome_activated.tpl | 13 +- .../email/admin_welcome_inactive.tpl | 1 + .../email/coppa_welcome_inactive.tpl | 1 + .../lang_polish/email/group_added.tpl | 1 + .../lang_polish/email/group_approved.tpl | 1 + .../lang_polish/email/group_request.tpl | 21 +-- .../lang_polish/email/privmsg_notify.tpl | 21 +-- .../lang_polish/email/profile_send_email.tpl | 2 + .../lang_polish/email/topic_notify.tpl | 1 + .../lang_polish/email/user_activate.tpl | 1 + .../email/user_activate_passwd.tpl | 33 ++-- .../lang_polish/email/user_welcome.tpl | 1 + .../email/user_welcome_inactive.tpl | 1 + .../lang_portuguese/email/admin_activate.tpl | 2 + .../email/admin_send_email.tpl | 2 + .../email/admin_welcome_activated.tpl | 2 + .../email/admin_welcome_inactive.tpl | 2 + .../email/coppa_welcome_inactive.tpl | 2 + .../lang_portuguese/email/group_added.tpl | 2 + .../lang_portuguese/email/group_approved.tpl | 2 + .../lang_portuguese/email/group_request.tpl | 2 + .../lang_portuguese/email/privmsg_notify.tpl | 2 + .../email/profile_send_email.tpl | 2 + .../lang_portuguese/email/topic_notify.tpl | 2 + .../lang_portuguese/email/user_activate.tpl | 2 + .../email/user_activate_passwd.tpl | 2 + .../lang_portuguese/email/user_welcome.tpl | 2 + .../email/user_welcome_inactive.tpl | 2 + .../email/admin_activate.tpl | 1 + .../email/admin_send_email.tpl | 2 + .../email/admin_welcome_activated.tpl | 1 + .../email/admin_welcome_inactive.tpl | 1 + .../email/coppa_welcome_inactive.tpl | 1 + .../email/group_added.tpl | 1 + .../email/group_approved.tpl | 1 + .../email/group_request.tpl | 1 + .../email/privmsg_notify.tpl | 1 + .../email/profile_send_email.tpl | 2 + .../email/topic_notify.tpl | 1 + .../email/user_activate.tpl | 1 + .../email/user_activate_passwd.tpl | 1 + .../email/user_welcome.tpl | 1 + .../email/user_welcome_inactive.tpl | 1 + .../lang_russian/email/admin_activate.tpl | 17 +- .../lang_russian/email/admin_send_email.tpl | 22 +-- .../email/admin_welcome_activated.tpl | 13 +- .../email/admin_welcome_inactive.tpl | 35 +++-- .../email/coppa_welcome_inactive.tpl | 103 +++++++------ .../lang_russian/email/group_added.tpl | 23 +-- .../lang_russian/email/group_approved.tpl | 21 +-- .../lang_russian/email/group_request.tpl | 21 +-- .../lang_russian/email/privmsg_notify.tpl | 21 +-- .../lang_russian/email/profile_send_email.tpl | 24 +-- .../lang_russian/email/topic_notify.tpl | 25 +-- .../lang_russian/email/user_activate.tpl | 17 +- .../email/user_activate_passwd.tpl | 33 ++-- .../lang_russian/email/user_welcome.tpl | 31 ++-- .../email/user_welcome_inactive.tpl | 39 ++--- .../lang_spanish/email/admin_activate.tpl | 1 + .../lang_spanish/email/admin_send_email.tpl | 2 + .../email/admin_welcome_activated.tpl | 1 + .../email/admin_welcome_inactive.tpl | 1 + .../email/coppa_welcome_inactive.tpl | 1 + .../lang_spanish/email/group_added.tpl | 1 + .../lang_spanish/email/group_approved.tpl | 1 + .../lang_spanish/email/group_request.tpl | 1 + .../lang_spanish/email/privmsg_notify.tpl | 1 + .../lang_spanish/email/profile_send_email.tpl | 2 + .../lang_spanish/email/topic_notify.tpl | 1 + .../lang_spanish/email/user_activate.tpl | 1 + .../email/user_activate_passwd.tpl | 1 + .../lang_spanish/email/user_welcome.tpl | 1 + .../email/user_welcome_inactive.tpl | 1 + .../lang_swedish/email/admin_activate.tpl | 1 + .../lang_swedish/email/admin_send_email.tpl | 2 + .../email/admin_welcome_activated.tpl | 1 + .../email/admin_welcome_inactive.tpl | 1 + .../email/coppa_welcome_inactive.tpl | 1 + .../lang_swedish/email/group_added.tpl | 1 + .../lang_swedish/email/group_approved.tpl | 1 + .../lang_swedish/email/group_request.tpl | 1 + .../lang_swedish/email/privmsg_notify.tpl | 1 + .../lang_swedish/email/profile_send_email.tpl | 2 + .../lang_swedish/email/topic_notify.tpl | 1 + .../lang_swedish/email/user_activate.tpl | 1 + .../email/user_activate_passwd.tpl | 1 + .../lang_swedish/email/user_welcome.tpl | 1 + .../email/user_welcome_inactive.tpl | 1 + .../lang_turkish/email/admin_activate.tpl | 1 + .../lang_turkish/email/admin_send_email.tpl | 2 + .../email/admin_welcome_activated.tpl | 1 + .../email/admin_welcome_inactive.tpl | 1 + .../email/coppa_welcome_inactive.tpl | 1 + .../lang_turkish/email/group_added.tpl | 1 + .../lang_turkish/email/group_approved.tpl | 1 + .../lang_turkish/email/group_request.tpl | 1 + .../lang_turkish/email/privmsg_notify.tpl | 1 + .../lang_turkish/email/profile_send_email.tpl | 2 + .../lang_turkish/email/topic_notify.tpl | 1 + .../lang_turkish/email/user_activate.tpl | 1 + .../email/user_activate_passwd.tpl | 1 + .../lang_turkish/email/user_welcome.tpl | 1 + .../email/user_welcome_inactive.tpl | 1 + phpBB/viewforum.php | 2 +- 382 files changed, 2078 insertions(+), 1618 deletions(-) diff --git a/phpBB/includes/emailer.php b/phpBB/includes/emailer.php index 331d8fc3e8..b95d719a0c 100755 --- a/phpBB/includes/emailer.php +++ b/phpBB/includes/emailer.php @@ -38,8 +38,8 @@ class emailer $this->use_smtp = $use_smtp; $this->tpl_file = NULL; $this->address = NULL; - $this->msg = ""; - $this->mimeOut = ""; + $this->msg = ''; + $this->mimeOut = ''; } // @@ -47,11 +47,11 @@ class emailer // function reset() { - $this->tpl_file = ""; - $this->address = ""; - $this->msg = ""; - $this->memOut = ""; - $this->vars = ""; + $this->tpl_file = ''; + $this->address = ''; + $this->msg = ''; + $this->memOut = ''; + $this->vars = ''; } // @@ -59,13 +59,8 @@ class emailer // function email_address($address) { - - $success = true; - $this->address = ''; $this->address .= $address; - - return $success; } // @@ -84,30 +79,27 @@ class emailer $this->extra_headers = $headers; } - function use_template($template_file, $template_lang = "") + function use_template($template_file, $template_lang = '') { global $board_config, $phpbb_root_path; - if( $template_lang == "" ) + if ( $template_lang == '' ) { $template_lang = $board_config['default_lang']; } - $template_file = $phpbb_root_path . "language/lang_" . $template_lang . "/email/" . $template_file . ".tpl"; - if( !file_exists($template_file) ) + $this->tpl_file = $phpbb_root_path . 'language/lang_' . $template_lang . '/email/' . $template_file . '.tpl'; + if ( !file_exists($this->tpl_file) ) { - message_die(GENERAL_ERROR, "Couldn't find template file: $template_file", "", __LINE__, __FILE__); - } - else - { - $this->tpl_file = $template_file; - if( !$this->load_msg() ) - { - message_die(GENERAL_ERROR, "Couldn't load template file: $template_file", "", __LINE__, __FILE__); - } + message_die(GENERAL_ERROR, 'Could not find email template file ' . $template_file, '', __LINE__, __FILE__); } - return TRUE; + if ( !$this->load_msg() ) + { + message_die(GENERAL_ERROR, 'Could not load email template file ' . $template_file, '', __LINE__, __FILE__); + } + + return true; } // @@ -115,35 +107,25 @@ class emailer // function load_msg() { - if ($this->tpl_file == NULL) + if ( $this->tpl_file == NULL ) { - message_die(GENERAL_ERROR, "No template file set", "", __LINE__, __FILE__); + message_die(GENERAL_ERROR, 'No template file set', '', __LINE__, __FILE__); } - else + + if ( !($fd = fopen($this->tpl_file, 'r')) ) { - if(!($fd = fopen($this->tpl_file, 'r'))) - { - message_die(GENERAL_ERROR, "fopen failed opening template file", "", __LINE__, __FILE__); - } - else - { - $this->msg .= fread($fd, filesize($this->tpl_file)); - fclose($fd); - } + message_die(GENERAL_ERROR, 'Failed opening template file', '', __LINE__, __FILE__); } - return TRUE; + + $this->msg .= fread($fd, filesize($this->tpl_file)); + fclose($fd); + + return true; } function assign_vars($vars) { - if(empty($this->vars)) - { - $this->vars = $vars; - } - else - { - $this->vars .= $vars; - } + $this->vars = ( empty($this->vars) ) ? $vars : $this->vars . $vars; } function parse_email() @@ -165,12 +147,13 @@ class emailer // do this here because the subject may contain a variable // $match = array(); - preg_match("/^(Subject:(.*?)[\r\n]+?)?(.*?)$/is", $this->msg, $match); + preg_match("/^(Subject:(.*?)[\r\n]+?)?(Charset:(.*?)[\r\n]+?)?(.*?)$/is", $this->msg, $match); - $this->msg = ( isset($match[3]) ) ? trim($match[3]) : ''; + $this->msg = ( isset($match[5]) ) ? trim($match[5]) : ''; $this->subject = ( $this->subject != '' ) ? $this->subject : trim($match[2]); + $this->encoding = ( trim($match[4]) != '' ) ? trim($match[4]) : 'iso-8859-1'; - return TRUE; + return true; } // @@ -180,45 +163,53 @@ class emailer { global $phpEx, $phpbb_root_path; - if ($this->address == NULL) + if ( $this->address == NULL ) { - message_die(GENERAL_ERROR, "No email address set", "", __LINE__, __FILE__); + message_die(GENERAL_ERROR, 'No email address set', '', __LINE__, __FILE__); + } + + if ( !$this->parse_email() ) + { + return false; + } + + // + // Add date and encoding type + // + $universal_extra = "MIME-Version: 1.0\r\nContent-type: text/plain; charset=" . $this->encoding . "\r\nContent-transfer-encoding: 8bit\r\nDate: " . gmdate('D, d M Y H:i:s', time()) . " UT\r\n"; + $this->extra_headers = $universal_extra . $this->extra_headers; + + if ( $this->use_smtp ) + { + if ( !defined('SMTP_INCLUDED') ) + { + include($phpbb_root_path . 'includes/smtp.' . $phpEx); + } + + $result = smtpmail($this->address, $this->subject, $this->msg, $this->extra_headers); } else { - if(!$this->parse_email()) - { - return FALSE; - } - if($this->use_smtp) - { - if(!defined('SMTP_INCLUDED')) - { - include($phpbb_root_path . "includes/smtp.".$phpEx); - } - if(!smtpmail($this->address, $this->subject, $this->msg, $this->extra_headers)) - { - message_die(GENERAL_ERROR, "Sending via SMTP failed", "", __LINE__, __FILE__); - } - } - else - { - @mail($this->address, $this->subject, $this->msg, $this->extra_headers); - } + $result = @mail($this->address, $this->subject, $this->msg, $this->extra_headers); } - return TRUE; + if ( !$result ) + { + message_die(GENERAL_ERROR, 'Failed sending email', '', __LINE__, __FILE__); + } + + return true; } // - // Attach files via MIME. + // Attach files via MIME. // - function attachFile($filename, $mimetype="application/octet-stream", $szFromAddress, $szFilenameToDisplay) + function attachFile($filename, $mimetype = "application/octet-stream", $szFromAddress, $szFilenameToDisplay) { $mime_boundary = "--==================_846811060==_"; - $this->mailMsg = "--".$mime_boundary."\nContent-Type: text/plain;\n\tcharset=\"iso-8859-1\"\n\n".$this->mailMsg; + $this->mailMsg = '--' . $mime_boundary . "\nContent-Type: text/plain;\n\tcharset=\"iso-8859-1\"\n\n" . $this->mailMsg; if ($mime_filename) { @@ -234,11 +225,11 @@ class emailer $this->mimeOut .= "Content-Transfer-Encoding: quoted-printable\n"; $this->mimeOut .= "Content-Disposition: attachment;\n\tfilename=\"$szFilenameToDisplay\"\n\n"; - if ($mimetype == "message/rfc822") + if ( $mimetype == "message/rfc822" ) { $this->mimeOut .= "From: ".$szFromAddress."\n"; $this->mimeOut .= "To: ".$this->emailAddress."\n"; - $this->mimeOut .= "Date: ".date("D, d M Y G:i:s ").$this->getTimeZoneInEmailFormat()."\n"; + $this->mimeOut .= "Date: ".date("D, d M Y H:i:s") . " UT\n"; $this->mimeOut .= "Reply-To:".$szFromAddress."\n"; $this->mimeOut .= "Subject: ".$this->mailSubject."\n"; $this->mimeOut .= "X-Mailer: PHP/".phpversion()."\n"; diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php index 42f763d24b..2a640bb046 100644 --- a/phpBB/includes/functions_admin.php +++ b/phpBB/includes/functions_admin.php @@ -55,7 +55,7 @@ function make_forum_select($box_name, $ignore_forum = false) // // Synchronise functions for forums/topics // -function sync($type, $id) +function sync($type, $id = false) { global $db; diff --git a/phpBB/includes/functions_post.php b/phpBB/includes/functions_post.php index 934b8bf5c8..735f6ce15c 100644 --- a/phpBB/includes/functions_post.php +++ b/phpBB/includes/functions_post.php @@ -267,7 +267,7 @@ function submit_post($mode, &$post_data, &$message, &$meta, &$forum_id, &$topic_ { $topic_vote = ( !empty($poll_title) && count($poll_options) >= 2 ) ? 1 : 0; $sql = ( $mode != "editpost" ) ? "INSERT INTO " . TOPICS_TABLE . " (topic_title, topic_poster, topic_time, forum_id, topic_status, topic_type, topic_vote) VALUES ('$post_subject', " . $userdata['user_id'] . ", $current_time, $forum_id, " . TOPIC_UNLOCKED . ", $topic_type, $topic_vote)" : "UPDATE " . TOPICS_TABLE . " SET topic_title = '$post_subject', topic_type = $topic_type, topic_vote = $topic_vote WHERE topic_id = $topic_id"; - if ( !($result = $db->sql_query($sql)) ) + if ( !$db->sql_query($sql) ) { message_die(GENERAL_ERROR, 'Error in posting', '', __LINE__, __FILE__, $sql); } @@ -280,7 +280,7 @@ function submit_post($mode, &$post_data, &$message, &$meta, &$forum_id, &$topic_ $edited_sql = ( $mode == 'editpost' && !$post_data['last_post'] && $post_data['poster_post'] ) ? ", post_edit_time = $current_time, post_edit_count = post_edit_count + 1 " : ""; $sql = ( $mode != "editpost" ) ? "INSERT INTO " . POSTS_TABLE . " (topic_id, forum_id, poster_id, post_username, post_time, poster_ip, enable_bbcode, enable_html, enable_smilies, enable_sig) VALUES ($topic_id, $forum_id, " . $userdata['user_id'] . ", '$post_username', $current_time, '$user_ip', $bbcode_on, $html_on, $smilies_on, $attach_sig)" : "UPDATE " . POSTS_TABLE . " SET enable_bbcode = $bbcode_on, enable_html = $html_on, enable_smilies = $smilies_on, enable_sig = $attach_sig" . $edited_sql . " WHERE post_id = $post_id"; - if ( !($result = $db->sql_query($sql, BEGIN_TRANSACTION)) ) + if ( !$db->sql_query($sql, BEGIN_TRANSACTION) ) { message_die(GENERAL_ERROR, 'Error in posting', '', __LINE__, __FILE__, $sql); } @@ -291,7 +291,7 @@ function submit_post($mode, &$post_data, &$message, &$meta, &$forum_id, &$topic_ } $sql = ( $mode != 'editpost' ) ? "INSERT INTO " . POSTS_TEXT_TABLE . " (post_id, post_subject, bbcode_uid, post_text) VALUES ($post_id, '$post_subject', '$bbcode_uid', '$post_message')" : "UPDATE " . POSTS_TEXT_TABLE . " SET post_text = '$post_message', bbcode_uid = '$bbcode_uid', post_subject = '$post_subject' WHERE post_id = $post_id"; - if ( !($result = $db->sql_query($sql)) ) + if ( !$db->sql_query($sql) ) { message_die(GENERAL_ERROR, 'Error in posting', '', __LINE__, __FILE__, $sql); } @@ -304,7 +304,7 @@ function submit_post($mode, &$post_data, &$message, &$meta, &$forum_id, &$topic_ if ( ( $mode == 'newtopic' || $mode == 'editpost' ) && !empty($poll_title) && count($poll_options) >= 2 ) { $sql = ( !$post_data['has_poll'] ) ? "INSERT INTO " . VOTE_DESC_TABLE . " (topic_id, vote_text, vote_start, vote_length) VALUES ($topic_id, '$poll_title', $current_time, " . ( $poll_length * 86400 ) . ")" : "UPDATE " . VOTE_DESC_TABLE . " SET vote_text = '$poll_title', vote_length = " . ( $poll_length * 86400 ) . " WHERE topic_id = $topic_id"; - if ( !($result = $db->sql_query($sql)) ) + if ( !$db->sql_query($sql) ) { message_die(GENERAL_ERROR, 'Error in posting', '', __LINE__, __FILE__, $sql); } @@ -348,7 +348,7 @@ function submit_post($mode, &$post_data, &$message, &$meta, &$forum_id, &$topic_ $poll_result = ( $mode == "editpost" && isset($old_poll_result[$option_id]) ) ? $old_poll_result[$option_id] : 0; $sql = ( $mode != "editpost" || !isset($old_poll_result[$option_id]) ) ? "INSERT INTO " . VOTE_RESULTS_TABLE . " (vote_id, vote_option_id, vote_option_text, vote_result) VALUES ($poll_id, $poll_option_id, '$option_text', $poll_result)" : "UPDATE " . VOTE_RESULTS_TABLE . " SET vote_option_text = '$option_text', vote_result = $poll_result WHERE vote_option_id = $option_id AND vote_id = $poll_id"; - if ( !($result = $db->sql_query($sql)) ) + if ( !$db->sql_query($sql) ) { message_die(GENERAL_ERROR, 'Error in posting', '', __LINE__, __FILE__, $sql); } @@ -359,8 +359,9 @@ function submit_post($mode, &$post_data, &$message, &$meta, &$forum_id, &$topic_ if ( $delete_option_sql != '' ) { $sql = "DELETE FROM " . VOTE_RESULTS_TABLE . " - WHERE vote_option_id IN ($delete_option_sql)"; - if ( !($result = $db->sql_query($sql)) ) + WHERE vote_option_id IN ($delete_option_sql) + AND vote_id = $poll_id"; + if ( !$db->sql_query($sql) ) { message_die(GENERAL_ERROR, 'Error deleting pruned poll options', '', __LINE__, __FILE__, $sql); } @@ -395,12 +396,12 @@ function update_post_stats(&$mode, &$post_data, &$forum_id, &$topic_id, &$post_i else { - $topic_update_sql .= "topic_replies = topic_replies - 1"; + $topic_update_sql .= 'topic_replies = topic_replies - 1'; $sql = "SELECT MAX(post_id) AS last_post_id FROM " . POSTS_TABLE . " WHERE topic_id = $topic_id"; - if ( !($db->sql_query($sql)) ) + if ( !($result = $db->sql_query($sql)) ) { message_die(GENERAL_ERROR, 'Error in deleting post', '', __LINE__, __FILE__, $sql); } @@ -416,7 +417,7 @@ function update_post_stats(&$mode, &$post_data, &$forum_id, &$topic_id, &$post_i $sql = "SELECT MAX(post_id) AS last_post_id FROM " . POSTS_TABLE . " WHERE forum_id = $forum_id"; - if ( !($db->sql_query($sql)) ) + if ( !($result = $db->sql_query($sql)) ) { message_die(GENERAL_ERROR, 'Error in deleting post', '', __LINE__, __FILE__, $sql); } @@ -432,7 +433,7 @@ function update_post_stats(&$mode, &$post_data, &$forum_id, &$topic_id, &$post_i $sql = "SELECT MIN(post_id) AS first_post_id FROM " . POSTS_TABLE . " WHERE topic_id = $topic_id"; - if ( !($db->sql_query($sql)) ) + if ( !($result = $db->sql_query($sql)) ) { message_die(GENERAL_ERROR, 'Error in deleting post', '', __LINE__, __FILE__, $sql); } @@ -460,7 +461,7 @@ function update_post_stats(&$mode, &$post_data, &$forum_id, &$topic_id, &$post_i $sql = "UPDATE " . FORUMS_TABLE . " SET $forum_update_sql WHERE forum_id = $forum_id"; - if ( !($result = $db->sql_query($sql)) ) + if ( !$db->sql_query($sql) ) { message_die(GENERAL_ERROR, 'Error in posting', '', __LINE__, __FILE__, $sql); } @@ -471,7 +472,7 @@ function update_post_stats(&$mode, &$post_data, &$forum_id, &$topic_id, &$post_i $topic_update_sql WHERE topic_id = $topic_id OR topic_moved_id = $topic_id"; - if ( !($result = $db->sql_query($sql)) ) + if ( !$db->sql_query($sql) ) { message_die(GENERAL_ERROR, 'Error in posting', '', __LINE__, __FILE__, $sql); } @@ -482,7 +483,7 @@ function update_post_stats(&$mode, &$post_data, &$forum_id, &$topic_id, &$post_i $sql = "UPDATE " . USERS_TABLE . " SET user_posts = user_posts $sign WHERE user_id = $user_id"; - if ( !($result = $db->sql_query($sql, END_TRANSACTION)) ) + if ( !$db->sql_query($sql, END_TRANSACTION) ) { message_die(GENERAL_ERROR, 'Error in posting', '', __LINE__, __FILE__, $sql); } @@ -505,14 +506,14 @@ function delete_post($mode, &$post_data, &$message, &$meta, &$forum_id, &$topic_ { $sql = "DELETE FROM " . POSTS_TABLE . " WHERE post_id = $post_id"; - if ( !($db->sql_query($sql)) ) + if ( !$db->sql_query($sql) ) { message_die(GENERAL_ERROR, 'Error in deleting post', '', __LINE__, __FILE__, $sql); } $sql = "DELETE FROM " . POSTS_TEXT_TABLE . " WHERE post_id = $post_id"; - if ( !($db->sql_query($sql)) ) + if ( !$db->sql_query($sql) ) { message_die(GENERAL_ERROR, 'Error in deleting post', '', __LINE__, __FILE__, $sql); } @@ -525,14 +526,14 @@ function delete_post($mode, &$post_data, &$message, &$meta, &$forum_id, &$topic_ $sql = "DELETE FROM " . TOPICS_TABLE . " WHERE topic_id = $topic_id OR topic_moved_id = $topic_id"; - if ( !($db->sql_query($sql)) ) + if ( !$db->sql_query($sql) ) { message_die(GENERAL_ERROR, 'Error in deleting post', '', __LINE__, __FILE__, $sql); } $sql = "DELETE FROM " . TOPICS_WATCH_TABLE . " WHERE topic_id = $topic_id"; - if ( !($db->sql_query($sql)) ) + if ( !$db->sql_query($sql) ) { message_die(GENERAL_ERROR, 'Error in deleting post', '', __LINE__, __FILE__, $sql); } @@ -546,21 +547,21 @@ function delete_post($mode, &$post_data, &$message, &$meta, &$forum_id, &$topic_ { $sql = "DELETE FROM " . VOTE_DESC_TABLE . " WHERE topic_id = $topic_id"; - if ( !($db->sql_query($sql)) ) + if ( !$db->sql_query($sql) ) { message_die(GENERAL_ERROR, 'Error in deleting poll', '', __LINE__, __FILE__, $sql); } $sql = "DELETE FROM " . VOTE_RESULTS_TABLE . " WHERE vote_id = $poll_id"; - if ( !($db->sql_query($sql)) ) + if ( !$db->sql_query($sql) ) { message_die(GENERAL_ERROR, 'Error in deleting poll', '', __LINE__, __FILE__, $sql); } $sql = "DELETE FROM " . VOTE_USERS_TABLE . " WHERE vote_id = $poll_id"; - if ( !($db->sql_query($sql)) ) + if ( !$db->sql_query($sql) ) { message_die(GENERAL_ERROR, 'Error in deleting poll', '', __LINE__, __FILE__, $sql); } @@ -596,7 +597,7 @@ function user_notification($mode, &$post_data, &$forum_id, &$topic_id, &$post_id { $delete_sql = ( !$post_data['first_post'] && !$post_data['last_post'] ) ? " AND user_id = " . $userdata['user_id'] : ''; $sql = "DELETE FROM " . TOPICS_WATCH_TABLE . " WHERE topic_id = $topic_id" . $delete_sql; - if ( !($result = $db->sql_query($sql)) ) + if ( !$db->sql_query($sql) ) { message_die(GENERAL_ERROR, 'Could not change topic notify data', '', __LINE__, __FILE__, $sql); } @@ -646,7 +647,7 @@ function user_notification($mode, &$post_data, &$forum_id, &$topic_id, &$post_id $server_protocol = ( $board_config['cookie_secure'] ) ? 'https://' : 'http://'; $server_port = ( $board_config['server_port'] <> 80 ) ? ':' . trim($board_config['server_port']) . '/' : '/'; - $email_headers = 'From: ' . $board_config['board_email'] . "\nReturn-Path: " . $board_config['board_email'] . "\r\n"; + $email_headers = 'From: ' . $board_config['board_email'] . "\r\nReturn-Path: " . $board_config['board_email'] . "\r\n"; $update_watched_sql = ''; if ( $row = $db->sql_fetchrow($result) ) @@ -659,7 +660,7 @@ function user_notification($mode, &$post_data, &$forum_id, &$topic_id, &$post_id { $emailer->use_template('topic_notify', $row['user_lang']); $emailer->email_address($row['user_email']); - $emailer->set_subject();//$lang['Topic_reply_notification'] + $emailer->set_subject(); $emailer->extra_headers($email_headers); $emailer->assign_vars(array( @@ -707,7 +708,7 @@ function user_notification($mode, &$post_data, &$forum_id, &$topic_id, &$post_id $sql = "DELETE FROM " . TOPICS_WATCH_TABLE . " WHERE topic_id = $topic_id AND user_id = " . $userdata['user_id']; - if ( !$result = $db->sql_query($sql) ) + if ( !$db->sql_query($sql) ) { message_die(GENERAL_ERROR, 'Could not delete topic watch information', '', __LINE__, __FILE__, $sql); } @@ -716,7 +717,7 @@ function user_notification($mode, &$post_data, &$forum_id, &$topic_id, &$post_id { $sql = "INSERT INTO " . TOPICS_WATCH_TABLE . " (user_id, topic_id, notify_status) VALUES (" . $userdata['user_id'] . ", $topic_id, 0)"; - if ( !($result = $db->sql_query($sql)) ) + if ( !$db->sql_query($sql) ) { message_die(GENERAL_ERROR, 'Could not insert topic watch information', '', __LINE__, __FILE__, $sql); } diff --git a/phpBB/includes/usercp_email.php b/phpBB/includes/usercp_email.php index 0878da61ba..38330494fd 100644 --- a/phpBB/includes/usercp_email.php +++ b/phpBB/includes/usercp_email.php @@ -94,15 +94,10 @@ if ( $result = $db->sql_query($sql) ) include($phpbb_root_path . 'includes/emailer.'.$phpEx); $emailer = new emailer($board_config['smtp_delivery']); - $email_headers = 'From: ' . $userdata['user_email'] . "\n"; - if ( !empty($HTTP_POST_VARS['cc_email']) ) - { - $email_headers .= "Cc: " . $userdata['user_email'] . "\n"; - } - $email_headers .= 'Return-Path: ' . $userdata['user_email'] . "\n"; - $email_headers .= 'X-AntiAbuse: Board servername - ' . $server_name . "\n"; - $email_headers .= 'X-AntiAbuse: User_id - ' . $userdata['user_id'] . "\n"; - $email_headers .= 'X-AntiAbuse: Username - ' . $userdata['username'] . "\n"; + $email_headers = 'Return-Path: ' . $userdata['user_email'] . "\r\nFrom: " . $userdata['user_email'] . "\r\n"; + $email_headers .= 'X-AntiAbuse: Board servername - ' . $server_name . "\r\n"; + $email_headers .= 'X-AntiAbuse: User_id - ' . $userdata['user_id'] . "\r\n"; + $email_headers .= 'X-AntiAbuse: Username - ' . $userdata['username'] . "\r\n"; $email_headers .= 'X-AntiAbuse: User IP - ' . decode_ip($user_ip) . "\r\n"; $emailer->use_template('profile_send_email', $user_lang); @@ -120,6 +115,25 @@ if ( $result = $db->sql_query($sql) ) $emailer->send(); $emailer->reset(); + if ( !empty($HTTP_POST_VARS['cc_email']) ) + { + $email_headers = 'Return-Path: ' . $userdata['user_email'] . "\r\nFrom: " . $userdata['user_email'] . "\r\n"; + $emailer->use_template('profile_send_email'); + $emailer->email_address($userdata['user_email']); + $emailer->set_subject($subject); + $emailer->extra_headers($email_headers); + + $emailer->assign_vars(array( + 'SITENAME' => $board_config['sitename'], + 'BOARD_EMAIL' => $board_config['board_email'], + 'FROM_USERNAME' => $userdata['username'], + 'TO_USERNAME' => $username, + 'MESSAGE' => $message) + ); + $emailer->send(); + $emailer->reset(); + } + $template->assign_vars(array( 'META' => '') ); diff --git a/phpBB/language/lang_albanian/email/admin_activate.tpl b/phpBB/language/lang_albanian/email/admin_activate.tpl index 32748dbf45..7573afbd48 100644 --- a/phpBB/language/lang_albanian/email/admin_activate.tpl +++ b/phpBB/language/lang_albanian/email/admin_activate.tpl @@ -1,4 +1,5 @@ Subject: Llogari e re +Charset: iso-8859-1 Pлrshлndetje, diff --git a/phpBB/language/lang_albanian/email/admin_send_email.tpl b/phpBB/language/lang_albanian/email/admin_send_email.tpl index 6adbe05a66..720fad5e0f 100644 --- a/phpBB/language/lang_albanian/email/admin_send_email.tpl +++ b/phpBB/language/lang_albanian/email/admin_send_email.tpl @@ -1,3 +1,5 @@ +Charset: iso-8859-1 + Mesazhi i mлposhtлm лshtл dлrguar nga njл administrator i "{SITENAME}". Nqs ky mesazh лshtл i padлshirueshлm, abuzues apo pлrmban material tл pahijshлm ju lutem kontaktoni webmasterin tek adresa: {BOARD_EMAIL} diff --git a/phpBB/language/lang_albanian/email/admin_welcome_activated.tpl b/phpBB/language/lang_albanian/email/admin_welcome_activated.tpl index 6ecbbad115..5176a9bf79 100644 --- a/phpBB/language/lang_albanian/email/admin_welcome_activated.tpl +++ b/phpBB/language/lang_albanian/email/admin_welcome_activated.tpl @@ -1,4 +1,5 @@ Subject: Llogaria u aktivizia +Charset: iso-8859-1 Pлrshлndetje {USERNAME}, diff --git a/phpBB/language/lang_albanian/email/admin_welcome_inactive.tpl b/phpBB/language/lang_albanian/email/admin_welcome_inactive.tpl index 2dc8db26e5..c462279db6 100644 --- a/phpBB/language/lang_albanian/email/admin_welcome_inactive.tpl +++ b/phpBB/language/lang_albanian/email/admin_welcome_inactive.tpl @@ -1,4 +1,5 @@ Subject: Mirsevini tek forumi i {SITENAME} +Charset: iso-8859-1 {WELCOME_MSG} diff --git a/phpBB/language/lang_albanian/email/coppa_welcome_inactive.tpl b/phpBB/language/lang_albanian/email/coppa_welcome_inactive.tpl index da72fbb922..c98f8b8d0a 100644 --- a/phpBB/language/lang_albanian/email/coppa_welcome_inactive.tpl +++ b/phpBB/language/lang_albanian/email/coppa_welcome_inactive.tpl @@ -1,4 +1,5 @@ Subject: Mirsevini tek forumi i {SITENAME} +Charset: iso-8859-1 {WELCOME_MSG} diff --git a/phpBB/language/lang_albanian/email/group_added.tpl b/phpBB/language/lang_albanian/email/group_added.tpl index dd3622879a..a884274013 100644 --- a/phpBB/language/lang_albanian/email/group_added.tpl +++ b/phpBB/language/lang_albanian/email/group_added.tpl @@ -1,4 +1,5 @@ Subject: Jeni anлtar i kлtij grupi tashmл +Charset: iso-8859-1 Urime, diff --git a/phpBB/language/lang_albanian/email/group_approved.tpl b/phpBB/language/lang_albanian/email/group_approved.tpl index b3553aa43f..360d8701fb 100644 --- a/phpBB/language/lang_albanian/email/group_approved.tpl +++ b/phpBB/language/lang_albanian/email/group_approved.tpl @@ -1,4 +1,5 @@ Subject: Kлrkesa juaj u aprovua +Charset: iso-8859-1 Urime, diff --git a/phpBB/language/lang_albanian/email/group_request.tpl b/phpBB/language/lang_albanian/email/group_request.tpl index 3fecdc60c7..8562129513 100644 --- a/phpBB/language/lang_albanian/email/group_request.tpl +++ b/phpBB/language/lang_albanian/email/group_request.tpl @@ -1,4 +1,5 @@ Subject: Dikush ka bлrл kлrkesл pлr anлtarлsim tek grupi juaj +Charset: iso-8859-1 I nderuar {GROUP_MODERATOR}, diff --git a/phpBB/language/lang_albanian/email/privmsg_notify.tpl b/phpBB/language/lang_albanian/email/privmsg_notify.tpl index bfa9eace6d..4c5409bfb9 100644 --- a/phpBB/language/lang_albanian/email/privmsg_notify.tpl +++ b/phpBB/language/lang_albanian/email/privmsg_notify.tpl @@ -1,4 +1,5 @@ Subject: Sapo keni marrл mesazh privat tл ri +Charset: iso-8859-1 Pлrshлndetje {USERNAME}, diff --git a/phpBB/language/lang_albanian/email/profile_send_email.tpl b/phpBB/language/lang_albanian/email/profile_send_email.tpl index 2ac8fdbfc6..a551586633 100644 --- a/phpBB/language/lang_albanian/email/profile_send_email.tpl +++ b/phpBB/language/lang_albanian/email/profile_send_email.tpl @@ -1,3 +1,5 @@ +Charset: iso-8859-1 + Pлrshлndetje {TO_USERNAME}, Mesazhi i mлposhtлm u dлrgua pлr ju nga {FROM_USERNAME} nлpлrmjet llogarisл tuaj tek {SITENAME}. Nqs ky mesazh лshtл i padлshirueshлm, abuzues apo pлrmban material tл pahijshлm ju lutem kontaktoni webmasterin tek adresa: diff --git a/phpBB/language/lang_albanian/email/topic_notify.tpl b/phpBB/language/lang_albanian/email/topic_notify.tpl index aa56d6baea..b17e652d4b 100644 --- a/phpBB/language/lang_albanian/email/topic_notify.tpl +++ b/phpBB/language/lang_albanian/email/topic_notify.tpl @@ -1,4 +1,5 @@ Subject: Pлrgjigje tek tema - {TOPIC_TITLE} +Charset: iso-8859-1 Pлrshлndetje {USERNAME}, diff --git a/phpBB/language/lang_albanian/email/user_activate.tpl b/phpBB/language/lang_albanian/email/user_activate.tpl index 009e2099d9..5c6d644d6f 100644 --- a/phpBB/language/lang_albanian/email/user_activate.tpl +++ b/phpBB/language/lang_albanian/email/user_activate.tpl @@ -1,4 +1,5 @@ Subject: Riaktivizoni llogarinл tuaj +Charset: iso-8859-1 Pлrshлndetje {USERNAME}, diff --git a/phpBB/language/lang_albanian/email/user_activate_passwd.tpl b/phpBB/language/lang_albanian/email/user_activate_passwd.tpl index 749fca6a61..5d6d6b6de0 100644 --- a/phpBB/language/lang_albanian/email/user_activate_passwd.tpl +++ b/phpBB/language/lang_albanian/email/user_activate_passwd.tpl @@ -1,4 +1,5 @@ Subject: Aktivizoni fjalлkalimin e ri +Charset: iso-8859-1 Pлrshлndetje {USERNAME} diff --git a/phpBB/language/lang_albanian/email/user_welcome.tpl b/phpBB/language/lang_albanian/email/user_welcome.tpl index d3c7202881..6524313a15 100644 --- a/phpBB/language/lang_albanian/email/user_welcome.tpl +++ b/phpBB/language/lang_albanian/email/user_welcome.tpl @@ -1,4 +1,5 @@ Subject: Mirsevini tek forumi i {SITENAME} +Charset: iso-8859-1 {WELCOME_MSG} diff --git a/phpBB/language/lang_albanian/email/user_welcome_inactive.tpl b/phpBB/language/lang_albanian/email/user_welcome_inactive.tpl index 8498ce3f9f..41c2f7215f 100644 --- a/phpBB/language/lang_albanian/email/user_welcome_inactive.tpl +++ b/phpBB/language/lang_albanian/email/user_welcome_inactive.tpl @@ -1,4 +1,5 @@ Subject: Mirsevini tek forumi i {SITENAME} +Charset: iso-8859-1 {WELCOME_MSG} diff --git a/phpBB/language/lang_arabic/email/admin_activate.tpl b/phpBB/language/lang_arabic/email/admin_activate.tpl index 73552340af..249c5977df 100644 --- a/phpBB/language/lang_arabic/email/admin_activate.tpl +++ b/phpBB/language/lang_arabic/email/admin_activate.tpl @@ -1,4 +1,5 @@ Subject: гФКСЯ МПнП +Charset: windows-1256 гСНИЗ, diff --git a/phpBB/language/lang_arabic/email/admin_send_email.tpl b/phpBB/language/lang_arabic/email/admin_send_email.tpl index a1a0fc35fe..659c096dca 100644 --- a/phpBB/language/lang_arabic/email/admin_send_email.tpl +++ b/phpBB/language/lang_arabic/email/admin_send_email.tpl @@ -1,3 +1,5 @@ +Charset: windows-1256 + еРе СУЗбЙ гд гПнС "{SITENAME}". ЗРЗ ЯЗдК еРе ЗбСУЗбЙ ЗЪбЗдЗК, КНКжн Ъбм бЫЙ ИРнЖЙ Гж Зн ЯбЗг ЫнС гбЗЖг ЗбСМЗБ гСЗУбЙ гУДжб ЗбгжЮЪ Ъбм ЗбЪджЗд ЗбКЗбн: {BOARD_EMAIL} diff --git a/phpBB/language/lang_arabic/email/admin_welcome_activated.tpl b/phpBB/language/lang_arabic/email/admin_welcome_activated.tpl index 84ee92ac80..ef20f8bbc7 100644 --- a/phpBB/language/lang_arabic/email/admin_welcome_activated.tpl +++ b/phpBB/language/lang_arabic/email/admin_welcome_activated.tpl @@ -1,4 +1,5 @@ Subject: Кг КФЫнб ЗбЗФКСЗЯ +Charset: windows-1256 гСНИЗ {USERNAME}, diff --git a/phpBB/language/lang_arabic/email/admin_welcome_inactive.tpl b/phpBB/language/lang_arabic/email/admin_welcome_inactive.tpl index badc19700c..8904ba82ad 100644 --- a/phpBB/language/lang_arabic/email/admin_welcome_inactive.tpl +++ b/phpBB/language/lang_arabic/email/admin_welcome_inactive.tpl @@ -1,4 +1,5 @@ Subject: ГебЗ жУебЗ ИЯг Эн гдКПм {SITENAME} +Charset: windows-1256 {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 aa61757ced..a8cdbd9139 100644 --- a/phpBB/language/lang_arabic/email/coppa_welcome_inactive.tpl +++ b/phpBB/language/lang_arabic/email/coppa_welcome_inactive.tpl @@ -1,4 +1,5 @@ Subject: ГебЗ жУебЗ ИЯг Эн гдКПм {SITENAME} +Charset: windows-1256 {WELCOME_MSG} diff --git a/phpBB/language/lang_arabic/email/group_added.tpl b/phpBB/language/lang_arabic/email/group_added.tpl index 1c389f146d..405f5397c2 100644 --- a/phpBB/language/lang_arabic/email/group_added.tpl +++ b/phpBB/language/lang_arabic/email/group_added.tpl @@ -1,4 +1,5 @@ Subject: Кг ЗЦЗЭКЯ ббгМгжЪЙ +Charset: windows-1256 гИСжЯ, diff --git a/phpBB/language/lang_arabic/email/group_approved.tpl b/phpBB/language/lang_arabic/email/group_approved.tpl index 7bbf479cfc..aad158db50 100644 --- a/phpBB/language/lang_arabic/email/group_approved.tpl +++ b/phpBB/language/lang_arabic/email/group_approved.tpl @@ -1,4 +1,5 @@ Subject: КгК ЗбгжЗЭЮЙ Ъбм ШбИЯ +Charset: windows-1256 гИСжЯ, diff --git a/phpBB/language/lang_arabic/email/group_request.tpl b/phpBB/language/lang_arabic/email/group_request.tpl index bd1f5bc90a..dbda9b9dd6 100644 --- a/phpBB/language/lang_arabic/email/group_request.tpl +++ b/phpBB/language/lang_arabic/email/group_request.tpl @@ -1,4 +1,5 @@ Subject: Кг КЮПнг ШбИЯ ббЗФКСЗЯ Эн ЗбгМгжЪЙ +Charset: windows-1256 ЗбУнП/Й {GROUP_MODERATOR}, diff --git a/phpBB/language/lang_arabic/email/privmsg_notify.tpl b/phpBB/language/lang_arabic/email/privmsg_notify.tpl index fc8d62b39f..65b38c6f52 100644 --- a/phpBB/language/lang_arabic/email/privmsg_notify.tpl +++ b/phpBB/language/lang_arabic/email/privmsg_notify.tpl @@ -1,4 +1,5 @@ Subject: бЮП жХбК СУЗбЙ ОЗХЙ +Charset: windows-1256 гСНИЗ {USERNAME}, diff --git a/phpBB/language/lang_arabic/email/profile_send_email.tpl b/phpBB/language/lang_arabic/email/profile_send_email.tpl index 94bf5eeb8e..44d80a04f6 100644 --- a/phpBB/language/lang_arabic/email/profile_send_email.tpl +++ b/phpBB/language/lang_arabic/email/profile_send_email.tpl @@ -1,3 +1,5 @@ +Charset: windows-1256 + гСНИЗ {TO_USERNAME}, еРе ЗбСУЗбЙ ЮП ЗСУбеЗ {FROM_USERNAME} бНУЗИЯ Эн ЗбгжЮЪ {SITENAME}. ЗРЗ ЯЗдК еРе ЗбСУЗбЙ ЗЪбЗдЗК, КНКжн Ъбм бЫЙ ИРнЖЙ Гж Зн ЯбЗг ЫнС гбЗЖг ЗбСМЗБ гСЗУбЙ гУДжб ЗбгжЮЪ Ъбм ЗбЪджЗд ЗбКЗбн: diff --git a/phpBB/language/lang_arabic/email/topic_notify.tpl b/phpBB/language/lang_arabic/email/topic_notify.tpl index cfebec2d2d..d35de172ee 100644 --- a/phpBB/language/lang_arabic/email/topic_notify.tpl +++ b/phpBB/language/lang_arabic/email/topic_notify.tpl @@ -1,4 +1,5 @@ Subject: ЗбКРЯнС ИЗбСПжП Ъбм ЗбгжЗЦнЪ - {TOPIC_TITLE} +Charset: windows-1256 гСНИЗ {USERNAME}, diff --git a/phpBB/language/lang_arabic/email/user_activate.tpl b/phpBB/language/lang_arabic/email/user_activate.tpl index fa85dfd083..24ebf733ff 100644 --- a/phpBB/language/lang_arabic/email/user_activate.tpl +++ b/phpBB/language/lang_arabic/email/user_activate.tpl @@ -1,4 +1,5 @@ Subject: v +Charset: windows-1256 гСНИЗ {USERNAME}, diff --git a/phpBB/language/lang_arabic/email/user_activate_passwd.tpl b/phpBB/language/lang_arabic/email/user_activate_passwd.tpl index 79f5bb3926..5fdd6e3eff 100644 --- a/phpBB/language/lang_arabic/email/user_activate_passwd.tpl +++ b/phpBB/language/lang_arabic/email/user_activate_passwd.tpl @@ -1,4 +1,5 @@ Subject: New password activation +Charset: windows-1256 гСНИЗ {USERNAME} diff --git a/phpBB/language/lang_arabic/email/user_welcome.tpl b/phpBB/language/lang_arabic/email/user_welcome.tpl index 444d9be84b..9cf5804da6 100644 --- a/phpBB/language/lang_arabic/email/user_welcome.tpl +++ b/phpBB/language/lang_arabic/email/user_welcome.tpl @@ -1,4 +1,5 @@ Subject: ГебЗ жУебЗ ИЯг Эн гдКПм {SITENAME} +Charset: windows-1256 {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 1fc985d335..2f406a0384 100644 --- a/phpBB/language/lang_arabic/email/user_welcome_inactive.tpl +++ b/phpBB/language/lang_arabic/email/user_welcome_inactive.tpl @@ -1,4 +1,5 @@ Subject: ГебЗ жУебЗ ИЯг Эн гдКПм {SITENAME} +Charset: windows-1256 {WELCOME_MSG} diff --git a/phpBB/language/lang_bulgarian/email/admin_activate.tpl b/phpBB/language/lang_bulgarian/email/admin_activate.tpl index c3c42b8f37..6dd099207e 100644 --- a/phpBB/language/lang_bulgarian/email/admin_activate.tpl +++ b/phpBB/language/lang_bulgarian/email/admin_activate.tpl @@ -1,9 +1,10 @@ -Subject: Нов потребител - -Здравейте! - -Потребителя "{USERNAME}" е бил деактивиран или създаден наскоро. Проверете детайлите за този потребител (ако е нужно) и го активирайте със следната връзка: - -{U_ACTIVATE} - +Subject: Нов потребител +Charset: windows-1251 + +Здравейте! + +Потребителя "{USERNAME}" е бил деактивиран или създаден наскоро. Проверете детайлите за този потребител (ако е нужно) и го активирайте със следната връзка: + +{U_ACTIVATE} + {EMAIL_SIG} \ No newline at end of file diff --git a/phpBB/language/lang_bulgarian/email/admin_send_email.tpl b/phpBB/language/lang_bulgarian/email/admin_send_email.tpl index 3c0f51baa7..befaa8236d 100644 --- a/phpBB/language/lang_bulgarian/email/admin_send_email.tpl +++ b/phpBB/language/lang_bulgarian/email/admin_send_email.tpl @@ -1,8 +1,10 @@ -Това е мейл, пратен от администратора на "{SITENAME}". Ако това съобщение е спам, съдържа неприлични или други коментари които вие намирате за обидни, моля свържете се с webmaster-а на следния е-мейл адрес: - -{BOARD_EMAIL} - -Съобщението пратено до вас: -~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -{MESSAGE} +Charset: windows-1251 + +Това е мейл, пратен от администратора на "{SITENAME}". Ако това съобщение е спам, съдържа неприлични или други коментари които вие намирате за обидни, моля свържете се с webmaster-а на следния е-мейл адрес: + +{BOARD_EMAIL} + +Съобщението пратено до вас: +~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +{MESSAGE} diff --git a/phpBB/language/lang_bulgarian/email/admin_welcome_activated.tpl b/phpBB/language/lang_bulgarian/email/admin_welcome_activated.tpl index 7ce7592239..ca9baa88f2 100644 --- a/phpBB/language/lang_bulgarian/email/admin_welcome_activated.tpl +++ b/phpBB/language/lang_bulgarian/email/admin_welcome_activated.tpl @@ -1,7 +1,8 @@ -Subject: Потребителя е активиран - -Здравейте {USERNAME}! - -Вашия потребител "{SITENAME}" е вече активиран. Можете да го използвате с паролата която ви е пратена в предишния мейл. - +Subject: Потребителя е активиран +Charset: windows-1251 + +Здравейте {USERNAME}! + +Вашия потребител "{SITENAME}" е вече активиран. Можете да го използвате с паролата която ви е пратена в предишния мейл. + {EMAIL_SIG} \ No newline at end of file diff --git a/phpBB/language/lang_bulgarian/email/admin_welcome_inactive.tpl b/phpBB/language/lang_bulgarian/email/admin_welcome_inactive.tpl index 44f4339ba7..a512b3c241 100644 --- a/phpBB/language/lang_bulgarian/email/admin_welcome_inactive.tpl +++ b/phpBB/language/lang_bulgarian/email/admin_welcome_inactive.tpl @@ -1,18 +1,19 @@ -Subject: Добре дошли на {SITENAME} Форумите - -{WELCOME_MSG} - -Моля запазете това писмо! То съдържа информацията за вашия потребител: - ----------------------------- -Потребител: {USERNAME} -Парола: {PASSWORD} ----------------------------- - -Вашия потребител в момента е неактивен, ще трябва да изчакате администратора да го активира. Ще бъдете известени когато това стане (с друго писмо). - -Моля не забравайте вашата парола, защото тя е кодирана и ние не можем да ви я пратим. В случай че я забравите, можете да поискате нова, която ще ви бъде пратена по същия начин както тази. - -Благодаря ви, че се регистрирахте! - +Subject: Добре дошли на {SITENAME} Форумите +Charset: windows-1251 + +{WELCOME_MSG} + +Моля запазете това писмо! То съдържа информацията за вашия потребител: + +---------------------------- +Потребител: {USERNAME} +Парола: {PASSWORD} +---------------------------- + +Вашия потребител в момента е неактивен, ще трябва да изчакате администратора да го активира. Ще бъдете известени когато това стане (с друго писмо). + +Моля не забравайте вашата парола, защото тя е кодирана и ние не можем да ви я пратим. В случай че я забравите, можете да поискате нова, която ще ви бъде пратена по същия начин както тази. + +Благодаря ви, че се регистрирахте! + {EMAIL_SIG} \ No newline at end of file diff --git a/phpBB/language/lang_bulgarian/email/coppa_welcome_inactive.tpl b/phpBB/language/lang_bulgarian/email/coppa_welcome_inactive.tpl index 270c49f5cb..767745fb11 100644 --- a/phpBB/language/lang_bulgarian/email/coppa_welcome_inactive.tpl +++ b/phpBB/language/lang_bulgarian/email/coppa_welcome_inactive.tpl @@ -1,4 +1,5 @@ Subject: Добре дошли на {SITENAME} Форумите +Charset: windows-1251 {WELCOME_MSG} diff --git a/phpBB/language/lang_bulgarian/email/group_added.tpl b/phpBB/language/lang_bulgarian/email/group_added.tpl index 8d41d62eb3..48c57b7b4a 100644 --- a/phpBB/language/lang_bulgarian/email/group_added.tpl +++ b/phpBB/language/lang_bulgarian/email/group_added.tpl @@ -1,11 +1,12 @@ -Subject: Приет сте за член на тази група - -Поздравления, - -Вие е сте добавен(а) в група "{GROUP_NAME}" на {SITENAME}. -Това е било направено от модератора на групата или администратора на сайта, свържете се с тях за повече информация. - -Можете да видите информацията за вашата група на следния адрес: -{U_GROUPCP} - -{EMAIL_SIG} +Subject: Приет сте за член на тази група +Charset: windows-1251 + +Поздравления, + +Вие е сте добавен(а) в група "{GROUP_NAME}" на {SITENAME}. +Това е било направено от модератора на групата или администратора на сайта, свържете се с тях за повече информация. + +Можете да видите информацията за вашата група на следния адрес: +{U_GROUPCP} + +{EMAIL_SIG} diff --git a/phpBB/language/lang_bulgarian/email/group_approved.tpl b/phpBB/language/lang_bulgarian/email/group_approved.tpl index 6339603192..b92f41807d 100644 --- a/phpBB/language/lang_bulgarian/email/group_approved.tpl +++ b/phpBB/language/lang_bulgarian/email/group_approved.tpl @@ -1,10 +1,11 @@ -Subject: Вашата кандидатура е одобрена - -Поздравления, - -Вашата молба да се присъедините към групата "{GROUP_NAME}" на {SITENAME} е била одобрена. -Клинкнете на следната връзка за да получите повече информация за групата: - -{U_GROUPCP} - -{EMAIL_SIG} +Subject: Вашата кандидатура е одобрена +Charset: windows-1251 + +Поздравления, + +Вашата молба да се присъедините към групата "{GROUP_NAME}" на {SITENAME} е била одобрена. +Клинкнете на следната връзка за да получите повече информация за групата: + +{U_GROUPCP} + +{EMAIL_SIG} diff --git a/phpBB/language/lang_bulgarian/email/group_request.tpl b/phpBB/language/lang_bulgarian/email/group_request.tpl index f3452335bc..0db1fa28f5 100644 --- a/phpBB/language/lang_bulgarian/email/group_request.tpl +++ b/phpBB/language/lang_bulgarian/email/group_request.tpl @@ -1,10 +1,11 @@ -Subject: Получена е заявка за приемане в групата ви - -{GROUP_MODERATOR}, - -Потребител е помолил да се присъедини към вашата група на {SITENAME}. -За да приемете или отхвърлите молбата му, посетете следната връзка: - -{U_GROUPCP} - -{EMAIL_SIG} +Subject: Получена е заявка за приемане в групата ви +Charset: windows-1251 + +{GROUP_MODERATOR}, + +Потребител е помолил да се присъедини към вашата група на {SITENAME}. +За да приемете или отхвърлите молбата му, посетете следната връзка: + +{U_GROUPCP} + +{EMAIL_SIG} diff --git a/phpBB/language/lang_bulgarian/email/privmsg_notify.tpl b/phpBB/language/lang_bulgarian/email/privmsg_notify.tpl index acaea21297..1ea69faad0 100644 --- a/phpBB/language/lang_bulgarian/email/privmsg_notify.tpl +++ b/phpBB/language/lang_bulgarian/email/privmsg_notify.tpl @@ -1,10 +1,11 @@ -Subject: Получихте ново лично съобщения - -Здравейте {USERNAME}! - -Получили сте лично събощение "{SITENAME}". Можете да видите вашето ново съобщение на: - -{U_INBOX} - - +Subject: Получихте ново лично съобщения +Charset: windows-1251 + +Здравейте {USERNAME}! + +Получили сте лично събощение "{SITENAME}". Можете да видите вашето ново съобщение на: + +{U_INBOX} + + {EMAIL_SIG} \ No newline at end of file diff --git a/phpBB/language/lang_bulgarian/email/profile_send_email.tpl b/phpBB/language/lang_bulgarian/email/profile_send_email.tpl index 821a04ebcf..df63d48625 100644 --- a/phpBB/language/lang_bulgarian/email/profile_send_email.tpl +++ b/phpBB/language/lang_bulgarian/email/profile_send_email.tpl @@ -1,10 +1,12 @@ -Здравейте {TO_USERNAME}! - -Съобщението по-долу ви е пратено от {FROM_USERNAME} чрез вашия профил на {SITENAME}. Ако това съобщение е спам, съдържа неприлични или други коментари които вие намирате за обидни, моля свържете се с webmaster-а на следния е-мейл адрес: - -{BOARD_EMAIL} - -Съобщението пратено до вас -~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -{MESSAGE} +Charset: windows-1251 + +Здравейте {TO_USERNAME}! + +Съобщението по-долу ви е пратено от {FROM_USERNAME} чрез вашия профил на {SITENAME}. Ако това съобщение е спам, съдържа неприлични или други коментари които вие намирате за обидни, моля свържете се с webmaster-а на следния е-мейл адрес: + +{BOARD_EMAIL} + +Съобщението пратено до вас +~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +{MESSAGE} diff --git a/phpBB/language/lang_bulgarian/email/topic_notify.tpl b/phpBB/language/lang_bulgarian/email/topic_notify.tpl index 9e8683b95e..43bf0672a0 100644 --- a/phpBB/language/lang_bulgarian/email/topic_notify.tpl +++ b/phpBB/language/lang_bulgarian/email/topic_notify.tpl @@ -1,13 +1,14 @@ -Subject: Уведемояване за отговори по темата - {TOPIC_TITLE} - -Здравейте {USERNAME}! - -Получавате този мейл, защото сте избрали да бъдете известявани за отговори на темата "{TOPIC_TITLE}" на {SITENAME}. На тази тема е било отговорено след последното ви посещение. Можете да видите отговорите на следващия адрес. Други известия няма да ви бъдат изпращани, докато не го посетите. - -{U_TOPIC} - -Ако не искате да получавате повече известия, можете да промените настройките от самата темата или като кликнете на следния линк: - -{U_STOP_WATCHING_TOPIC} - +Subject: Уведемояване за отговори по темата - {TOPIC_TITLE} +Charset: windows-1251 + +Здравейте {USERNAME}! + +Получавате този мейл, защото сте избрали да бъдете известявани за отговори на темата "{TOPIC_TITLE}" на {SITENAME}. На тази тема е било отговорено след последното ви посещение. Можете да видите отговорите на следващия адрес. Други известия няма да ви бъдат изпращани, докато не го посетите. + +{U_TOPIC} + +Ако не искате да получавате повече известия, можете да промените настройките от самата темата или като кликнете на следния линк: + +{U_STOP_WATCHING_TOPIC} + {EMAIL_SIG} \ No newline at end of file diff --git a/phpBB/language/lang_bulgarian/email/user_activate.tpl b/phpBB/language/lang_bulgarian/email/user_activate.tpl index 3719889f11..e3033e7979 100644 --- a/phpBB/language/lang_bulgarian/email/user_activate.tpl +++ b/phpBB/language/lang_bulgarian/email/user_activate.tpl @@ -1,9 +1,10 @@ -Subject: Ре-активирайте потребителя си! - -Здравейте {USERNAME}! - -Вашия потребител на "{SITENAME}" е деактивиран, най-вероятно в следствие от промяна на вашия профил. За да го активирате отново, посетете следния адрес: - -{U_ACTIVATE} - +Subject: Ре-активирайте потребителя си! +Charset: windows-1251 + +Здравейте {USERNAME}! + +Вашия потребител на "{SITENAME}" е деактивиран, най-вероятно в следствие от промяна на вашия профил. За да го активирате отново, посетете следния адрес: + +{U_ACTIVATE} + {EMAIL_SIG} \ No newline at end of file diff --git a/phpBB/language/lang_bulgarian/email/user_activate_passwd.tpl b/phpBB/language/lang_bulgarian/email/user_activate_passwd.tpl index 74b33a2e77..e5c2c017a7 100644 --- a/phpBB/language/lang_bulgarian/email/user_activate_passwd.tpl +++ b/phpBB/language/lang_bulgarian/email/user_activate_passwd.tpl @@ -1,17 +1,18 @@ -Subject: Активиране на нова парола - -Здравейте {USERNAME}! - -Получавате този е-мейл защото вие (или някой който се прави на вас) е поискал да му(й) бъде пратена нова парола за {SITENAME}. Ако не сте подавали такава молба, не обръщайте внимание на съобщението, а ако продължавате да получавате такива съобщения, свържете се с администратора. - -За да използвате новата си парола трябва да я активирате. За да го направите, използвайте следната връзка: - -{U_ACTIVATE} - -След което би трябвало да можете да влезете със следната парола: - -Парола: {PASSWORD} - -Можете да промените паролата си от профила ви в {SITENAME}. Ако имате проблеми с това, моля свържете се с администратора. - +Subject: Активиране на нова парола +Charset: windows-1251 + +Здравейте {USERNAME}! + +Получавате този е-мейл защото вие (или някой който се прави на вас) е поискал да му(й) бъде пратена нова парола за {SITENAME}. Ако не сте подавали такава молба, не обръщайте внимание на съобщението, а ако продължавате да получавате такива съобщения, свържете се с администратора. + +За да използвате новата си парола трябва да я активирате. За да го направите, използвайте следната връзка: + +{U_ACTIVATE} + +След което би трябвало да можете да влезете със следната парола: + +Парола: {PASSWORD} + +Можете да промените паролата си от профила ви в {SITENAME}. Ако имате проблеми с това, моля свържете се с администратора. + {EMAIL_SIG} \ No newline at end of file diff --git a/phpBB/language/lang_bulgarian/email/user_welcome.tpl b/phpBB/language/lang_bulgarian/email/user_welcome.tpl index 4b33f1935c..97e4ac9471 100644 --- a/phpBB/language/lang_bulgarian/email/user_welcome.tpl +++ b/phpBB/language/lang_bulgarian/email/user_welcome.tpl @@ -1,16 +1,17 @@ -Subject: Добре дошли на {SITENAME} Форумите - -{WELCOME_MSG} - -Моля пазате този е-мейл. Той съдържа информацията за вашия потребител: - ----------------------------- -Потребител: {USERNAME} -Парола: {PASSWORD} ----------------------------- - -Моля не забравайте вашата парола, защото тя е кодирана и ние не можем да ви я пратим. Но в случай че я забравите, можете да поискате нова, която ще ви бъде пратена по същия начин като тази. - -Благодарим ви, че се регистрирахте! - +Subject: Добре дошли на {SITENAME} Форумите +Charset: windows-1251 + +{WELCOME_MSG} + +Моля пазате този е-мейл. Той съдържа информацията за вашия потребител: + +---------------------------- +Потребител: {USERNAME} +Парола: {PASSWORD} +---------------------------- + +Моля не забравайте вашата парола, защото тя е кодирана и ние не можем да ви я пратим. Но в случай че я забравите, можете да поискате нова, която ще ви бъде пратена по същия начин като тази. + +Благодарим ви, че се регистрирахте! + {EMAIL_SIG} \ No newline at end of file diff --git a/phpBB/language/lang_bulgarian/email/user_welcome_inactive.tpl b/phpBB/language/lang_bulgarian/email/user_welcome_inactive.tpl index 5a0e96eac3..daa5b896ab 100644 --- a/phpBB/language/lang_bulgarian/email/user_welcome_inactive.tpl +++ b/phpBB/language/lang_bulgarian/email/user_welcome_inactive.tpl @@ -1,20 +1,21 @@ -Subject: Добре дошли на {SITENAME} Форумите - -{WELCOME_MSG} - -Моля пазете този мейл! Той съдържа информацията за вашия потребител. - ----------------------------- -Потребител: {USERNAME} -Парола: {PASSWORD} ----------------------------- - -Вашият потребител в момента е неактивен. Можете да го активирате като посетите следния адрес: - -{U_ACTIVATE} - -Моля не забравайте вашата парола, защото тя е кодирана и ние не можем да ви я пратим. Но в случай че я забравите, можете да поискате нова, която ще ви бъде пратена по същия начин като тази. - -Благодарим ви, че се регистрирахте! - +Subject: Добре дошли на {SITENAME} Форумите +Charset: windows-1251 + +{WELCOME_MSG} + +Моля пазете този мейл! Той съдържа информацията за вашия потребител. + +---------------------------- +Потребител: {USERNAME} +Парола: {PASSWORD} +---------------------------- + +Вашият потребител в момента е неактивен. Можете да го активирате като посетите следния адрес: + +{U_ACTIVATE} + +Моля не забравайте вашата парола, защото тя е кодирана и ние не можем да ви я пратим. Но в случай че я забравите, можете да поискате нова, която ще ви бъде пратена по същия начин като тази. + +Благодарим ви, че се регистрирахте! + {EMAIL_SIG} \ No newline at end of file diff --git a/phpBB/language/lang_chinese_simplified/email/admin_activate.tpl b/phpBB/language/lang_chinese_simplified/email/admin_activate.tpl index 34dff62de3..521a8dfb0a 100644 --- a/phpBB/language/lang_chinese_simplified/email/admin_activate.tpl +++ b/phpBB/language/lang_chinese_simplified/email/admin_activate.tpl @@ -1,9 +1,10 @@ -Subject: РВУГ»§ХК»§ - -ДъєГ, - -Хвёц "{USERNAME}" µДХКєЕїЙДЬ±»¶іЅбБЛ»тКЗёХНкіЙЧўІбіМРт. Из№ыУР±ШТЄµД»°, ЗлјмІйХвёцУГ»§µДПкПёЧКБПєНК№УГТФПВБґЅУј¤»оХвёцХКєЕ: - -{U_ACTIVATE} - +Subject: РВУГ»§ХК»§ +Charset: gb2312 + +ДъєГ, + +Хвёц "{USERNAME}" µДХКєЕїЙДЬ±»¶іЅбБЛ»тКЗёХНкіЙЧўІбіМРт. Из№ыУР±ШТЄµД»°, ЗлјмІйХвёцУГ»§µДПкПёЧКБПєНК№УГТФПВБґЅУј¤»оХвёцХКєЕ: + +{U_ACTIVATE} + {EMAIL_SIG} \ No newline at end of file diff --git a/phpBB/language/lang_chinese_simplified/email/admin_send_email.tpl b/phpBB/language/lang_chinese_simplified/email/admin_send_email.tpl index 1c6b25b66c..9a2b972652 100644 --- a/phpBB/language/lang_chinese_simplified/email/admin_send_email.tpl +++ b/phpBB/language/lang_chinese_simplified/email/admin_send_email.tpl @@ -1,10 +1,12 @@ -Хв·вµзЧУУКјюКЗУЙ"{SITENAME}"№ЬАнФ±јДіцµД. јЩИзХв·вµзЧУУКјюµДДЪИЭБоДгёРµЅІ»Удїм, ЙхЦБКЗ¶сТвµД№Ґ»ч, ЗлК№УГТФПВБґЅУМбіцЙкЛЯ: - -{BOARD_EMAIL} - -°ьє¬НкХыµДµзЧУУКјю(МШ±рКЗН·РЕПў). - -ёЅґшёшДгµДС¶ПўИзПВ: -~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -{MESSAGE} +Charset: gb2312 + +Хв·вµзЧУУКјюКЗУЙ"{SITENAME}"№ЬАнФ±јДіцµД. јЩИзХв·вµзЧУУКјюµДДЪИЭБоДгёРµЅІ»Удїм, ЙхЦБКЗ¶сТвµД№Ґ»ч, ЗлК№УГТФПВБґЅУМбіцЙкЛЯ: + +{BOARD_EMAIL} + +°ьє¬НкХыµДµзЧУУКјю(МШ±рКЗН·РЕПў). + +ёЅґшёшДгµДС¶ПўИзПВ: +~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +{MESSAGE} 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 16a1fc8080..d31a7445e8 100644 --- a/phpBB/language/lang_chinese_simplified/email/admin_welcome_activated.tpl +++ b/phpBB/language/lang_chinese_simplified/email/admin_welcome_activated.tpl @@ -1,7 +1,8 @@ -Subject: ХЛ»§ј¤»о - -{USERNAME} ДъєГ, - -ДъФЪ"{SITENAME}"µДХКєЕТСѕ­ј¤»о, ДъїЙТФК№УГЛщКХµЅµД»бФ±ХКєЕј°ГЬВлµЗИл"{SITENAME}". - +Subject: ХЛ»§ј¤»о +Charset: gb2312 + +{USERNAME} ДъєГ, + +ДъФЪ"{SITENAME}"µДХКєЕТСѕ­ј¤»о, ДъїЙТФК№УГЛщКХµЅµД»бФ±ХКєЕј°ГЬВлµЗИл"{SITENAME}". + {EMAIL_SIG} \ No newline at end of file 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 cd358deafe..9ea045e3ae 100644 --- a/phpBB/language/lang_chinese_simplified/email/admin_welcome_inactive.tpl +++ b/phpBB/language/lang_chinese_simplified/email/admin_welcome_inactive.tpl @@ -1,18 +1,19 @@ -Subject: »¶У­Дъ·ГОК {SITENAME} ВЫМі - -{WELCOME_MSG} - -ЗлНЧЙЖ±ЈБфХв·вµзЧУУКјю. ДъµДХКєЕЧКБПИзПВ: - ----------------------------- -ХКєЕ: {USERNAME} -ГЬВл: {PASSWORD} ----------------------------- - -ДъµДХКєЕДїЗ°ЙРОґј¤»о, ПµНі№ЬАнФ±Ѕ«ОЄДъїЄНЁХКєЕ. µ±ДъµДХЛєЕј¤»оєуДъЅ«»бКХµЅТ»·вИ·ИПУКјю. - -ЗлАОјЗДъµДГЬВл, УЙУЪЛщУРГЬВлѕщѕ­№эјУГЬґ¦Ан, ПµНі№ЬАнФ±ТІОЮ·ЁИЎµГ. И»¶ш, Из№ыДъНьјЗБЛГЬВл, ПµНіЅ«»бјД·ўТ»ёцРВµДГЬВлёшДъ. - -ёРР»ДъµДЧўІб. - +Subject: »¶У­Дъ·ГОК {SITENAME} ВЫМі +Charset: gb2312 + +{WELCOME_MSG} + +ЗлНЧЙЖ±ЈБфХв·вµзЧУУКјю. ДъµДХКєЕЧКБПИзПВ: + +---------------------------- +ХКєЕ: {USERNAME} +ГЬВл: {PASSWORD} +---------------------------- + +ДъµДХКєЕДїЗ°ЙРОґј¤»о, ПµНі№ЬАнФ±Ѕ«ОЄДъїЄНЁХКєЕ. µ±ДъµДХЛєЕј¤»оєуДъЅ«»бКХµЅТ»·вИ·ИПУКјю. + +ЗлАОјЗДъµДГЬВл, УЙУЪЛщУРГЬВлѕщѕ­№эјУГЬґ¦Ан, ПµНі№ЬАнФ±ТІОЮ·ЁИЎµГ. И»¶ш, Из№ыДъНьјЗБЛГЬВл, ПµНіЅ«»бјД·ўТ»ёцРВµДГЬВлёшДъ. + +ёРР»ДъµДЧўІб. + {EMAIL_SIG} \ No newline at end of file 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 f16e8edf8c..05b8da12db 100644 --- a/phpBB/language/lang_chinese_simplified/email/coppa_welcome_inactive.tpl +++ b/phpBB/language/lang_chinese_simplified/email/coppa_welcome_inactive.tpl @@ -1,53 +1,54 @@ -Subject: »¶У­Дъ·ГОК {SITENAME} ВЫМі - -{WELCOME_MSG} - -ТАХХ"ГА№ъ¶щНЇНшВ·ТюЛЅ±Ј»¤·Ё"№ж¶Ё, ДъµДХКєЕЙРОґј¤»о. - -ЗлБРУЎТФПВ±нёсІўЗлДъµДёёДё»тја»¤ИЛЗ©ЙПГыЧЦєНИХЖЪ,Ѕ«Ждґ«ХжµЅ: - -{FAX_INFO} - -»тУКјДµЅ: - -{MAIL_INFO} - ------------------------------- УЙґЛІГїЄ ------------------------------ -{SITENAME} »бФ±ЧўІбЙкЗл - -К№УГХЯГыіЖ: {USERNAME} -ГЬВл: {PASSWORD} -µзЧУУКјю: {EMAIL_ADDRESS} - -ICQ ±аєЕ: {ICQ} -AIM О»Ц·: {AIM} -MSN РЕК№: {MSN} -СЕ»ўјґК±НЁ: {YIM} -ёцИЛКЧТі: {WEB_SITE} -АґЧФ: {FROM} -Ц°Тµ: {OCC} -РЛИ¤: {INTERESTS} - -ОТТСїґ№э±Ј»¤¶щНЇµДМхОДІўЗТФКРн"{SITENAME}"ґўґжХвР©ЧКС¶. -ОТБЛЅвХвР©ЧКС¶їЙДЬФЪИОєОК±єт±»јьИлГЬВлёьёД. -ОТБЛЅвХвР©ЧКБПУРїЙДЬФЪИОєОК±єтУЙ"{SITENAME}"Йѕіэ. - - -јТі¤»тја»¤ИЛ -(ЗлФЪґЛЗ©Гы): _____________________ - -±ѕИЛ -(ЗлФЪґЛЗ©Гы): __________________ - -ИХЖЪ: _______________ - ------------------------------- УЙґЛІГїЄ------------------------------ - - -µ±№ЬАнИЛФ±КХµЅТФЙПµДЙкЗлґ«Хж»тУКјюІўНЁ№эЙуєЛ, ДъµДХКєЕІЕ»б±»ј¤»о. - -ЗлАОјЗДъµДГЬВл, УЙУЪЛщУРГЬВлѕщѕ­№эјУГЬґ¦Ан, ПµНі№ЬАнФ±ТІОЮ·ЁИЎµГ. И»¶ш, Из№ыДъНьјЗБЛГЬВл, ПµНіЅ«»бјД·ўТ»ёцРВµДГЬВлёшДъ. - -ёРР»ДъµДЧўІб. - +Subject: »¶У­Дъ·ГОК {SITENAME} ВЫМі +Charset: gb2312 + +{WELCOME_MSG} + +ТАХХ"ГА№ъ¶щНЇНшВ·ТюЛЅ±Ј»¤·Ё"№ж¶Ё, ДъµДХКєЕЙРОґј¤»о. + +ЗлБРУЎТФПВ±нёсІўЗлДъµДёёДё»тја»¤ИЛЗ©ЙПГыЧЦєНИХЖЪ,Ѕ«Ждґ«ХжµЅ: + +{FAX_INFO} + +»тУКјДµЅ: + +{MAIL_INFO} + +------------------------------ УЙґЛІГїЄ ------------------------------ +{SITENAME} »бФ±ЧўІбЙкЗл + +К№УГХЯГыіЖ: {USERNAME} +ГЬВл: {PASSWORD} +µзЧУУКјю: {EMAIL_ADDRESS} + +ICQ ±аєЕ: {ICQ} +AIM О»Ц·: {AIM} +MSN РЕК№: {MSN} +СЕ»ўјґК±НЁ: {YIM} +ёцИЛКЧТі: {WEB_SITE} +АґЧФ: {FROM} +Ц°Тµ: {OCC} +РЛИ¤: {INTERESTS} + +ОТТСїґ№э±Ј»¤¶щНЇµДМхОДІўЗТФКРн"{SITENAME}"ґўґжХвР©ЧКС¶. +ОТБЛЅвХвР©ЧКС¶їЙДЬФЪИОєОК±єт±»јьИлГЬВлёьёД. +ОТБЛЅвХвР©ЧКБПУРїЙДЬФЪИОєОК±єтУЙ"{SITENAME}"Йѕіэ. + + +јТі¤»тја»¤ИЛ +(ЗлФЪґЛЗ©Гы): _____________________ + +±ѕИЛ +(ЗлФЪґЛЗ©Гы): __________________ + +ИХЖЪ: _______________ + +------------------------------ УЙґЛІГїЄ------------------------------ + + +µ±№ЬАнИЛФ±КХµЅТФЙПµДЙкЗлґ«Хж»тУКјюІўНЁ№эЙуєЛ, ДъµДХКєЕІЕ»б±»ј¤»о. + +ЗлАОјЗДъµДГЬВл, УЙУЪЛщУРГЬВлѕщѕ­№эјУГЬґ¦Ан, ПµНі№ЬАнФ±ТІОЮ·ЁИЎµГ. И»¶ш, Из№ыДъНьјЗБЛГЬВл, ПµНіЅ«»бјД·ўТ»ёцРВµДГЬВлёшДъ. + +ёРР»ДъµДЧўІб. + {EMAIL_SIG} \ No newline at end of file diff --git a/phpBB/language/lang_chinese_simplified/email/group_added.tpl b/phpBB/language/lang_chinese_simplified/email/group_added.tpl index 69445c1600..5d81cfc804 100644 --- a/phpBB/language/lang_chinese_simplified/email/group_added.tpl +++ b/phpBB/language/lang_chinese_simplified/email/group_added.tpl @@ -1,10 +1,11 @@ -Subject: ДъТСѕ­±»јУИлХвёцНЕ¶У - -№§ПІ, - -ДъТСѕ­іЙ№¦јУИл"{SITENAME}"µД"{GROUP_NAME}"ХвёцИєЧй. -ХвКЗУЙНЕ¶У№ЬАнФ±»тВЫМі№ЬАнФ±ЧчіцµДѕц¶Ё, БЄВзЛыГЗДъїЙТФµГµЅёь¶аУР№ШРЕПў. - -ДъїЙТФК№УГТФПВБґЅУІйїґНЕ¶УРЕПў: -{U_GROUPCP} -{EMAIL_SIG} +Subject: ДъТСѕ­±»јУИлХвёцНЕ¶У +Charset: gb2312 + +№§ПІ, + +ДъТСѕ­іЙ№¦јУИл"{SITENAME}"µД"{GROUP_NAME}"ХвёцИєЧй. +ХвКЗУЙНЕ¶У№ЬАнФ±»тВЫМі№ЬАнФ±ЧчіцµДѕц¶Ё, БЄВзЛыГЗДъїЙТФµГµЅёь¶аУР№ШРЕПў. + +ДъїЙТФК№УГТФПВБґЅУІйїґНЕ¶УРЕПў: +{U_GROUPCP} +{EMAIL_SIG} diff --git a/phpBB/language/lang_chinese_simplified/email/group_approved.tpl b/phpBB/language/lang_chinese_simplified/email/group_approved.tpl index 185f3922df..239b78ef3a 100644 --- a/phpBB/language/lang_chinese_simplified/email/group_approved.tpl +++ b/phpBB/language/lang_chinese_simplified/email/group_approved.tpl @@ -1,10 +1,11 @@ -Subject: ДъµДЙкЗлТСѕ­±»ЕъЧјБЛ - -№§ПІДъ, - -ДгФЪ"{SITENAME}"ЛщЙкЗлјУИлµДНЕ¶У"{GROUP_NAME}"ТСѕ­»сµГЕъЧј. -ЗлК№УГТФПВБґЅУІйїґДъµДНЕ¶УРЕПў - -{U_GROUPCP} - -{EMAIL_SIG} +Subject: ДъµДЙкЗлТСѕ­±»ЕъЧјБЛ +Charset: gb2312 + +№§ПІДъ, + +ДгФЪ"{SITENAME}"ЛщЙкЗлјУИлµДНЕ¶У"{GROUP_NAME}"ТСѕ­»сµГЕъЧј. +ЗлК№УГТФПВБґЅУІйїґДъµДНЕ¶УРЕПў + +{U_GROUPCP} + +{EMAIL_SIG} diff --git a/phpBB/language/lang_chinese_simplified/email/group_request.tpl b/phpBB/language/lang_chinese_simplified/email/group_request.tpl index 20d82fde03..58870be532 100644 --- a/phpBB/language/lang_chinese_simplified/email/group_request.tpl +++ b/phpBB/language/lang_chinese_simplified/email/group_request.tpl @@ -1,10 +1,11 @@ -Subject: јУИлХвёцНЕ¶УµДЙкЗлТСѕ­МбЅ» - -ЗЧ°®µД {GROUP_MODERATOR}, - -УРТ»ёц»бФ±МбіцЙкЗлјУИлДгФЪ"{SITENAME}"Лщ№ЬАнµД»бФ±НЕ¶У. -ЗлК№УГТФПВБґЅУЕъЧј»тКЗѕЬѕшЙкЗлµДѕц¶Ё: - -{U_GROUPCP} - +Subject: јУИлХвёцНЕ¶УµДЙкЗлТСѕ­МбЅ» +Charset: gb2312 + +ЗЧ°®µД {GROUP_MODERATOR}, + +УРТ»ёц»бФ±МбіцЙкЗлјУИлДгФЪ"{SITENAME}"Лщ№ЬАнµД»бФ±НЕ¶У. +ЗлК№УГТФПВБґЅУЕъЧј»тКЗѕЬѕшЙкЗлµДѕц¶Ё: + +{U_GROUPCP} + {EMAIL_SIG} \ No newline at end of file diff --git a/phpBB/language/lang_chinese_simplified/email/privmsg_notify.tpl b/phpBB/language/lang_chinese_simplified/email/privmsg_notify.tpl index 3563cbad0a..7fc2da987b 100644 --- a/phpBB/language/lang_chinese_simplified/email/privmsg_notify.tpl +++ b/phpBB/language/lang_chinese_simplified/email/privmsg_notify.tpl @@ -1,11 +1,12 @@ -Subject: РВµДХѕДЪРЕјю - -{USERNAME} ДъєГ, - -ДъФЪ"{SITENAME}"УРРВµДЛЅИЛПыПў, ДъТЄЗуПµНіТФµзЧУУКјюНЁЦЄ. ДъїЙТФК№УГТФПВµДБґЅУдЇААДъёХКХµЅµДЛЅИЛПыПў: - -{U_INBOX} - -ЗлјЗµГДъЛжК±¶јїЙТФИЎПыХвАаµДµзЧУУКјюНЁЦЄ, Па№ШСЎПоДъїЙТФФЪёцИЛЧКБПЙи¶ЁАпёьёД. - +Subject: РВµДХѕДЪРЕјю +Charset: gb2312 + +{USERNAME} ДъєГ, + +ДъФЪ"{SITENAME}"УРРВµДЛЅИЛПыПў, ДъТЄЗуПµНіТФµзЧУУКјюНЁЦЄ. ДъїЙТФК№УГТФПВµДБґЅУдЇААДъёХКХµЅµДЛЅИЛПыПў: + +{U_INBOX} + +ЗлјЗµГДъЛжК±¶јїЙТФИЎПыХвАаµДµзЧУУКјюНЁЦЄ, Па№ШСЎПоДъїЙТФФЪёцИЛЧКБПЙи¶ЁАпёьёД. + {EMAIL_SIG} \ No newline at end of file diff --git a/phpBB/language/lang_chinese_simplified/email/profile_send_email.tpl b/phpBB/language/lang_chinese_simplified/email/profile_send_email.tpl index 62cf0064ab..1d708b0cf9 100644 --- a/phpBB/language/lang_chinese_simplified/email/profile_send_email.tpl +++ b/phpBB/language/lang_chinese_simplified/email/profile_send_email.tpl @@ -1,12 +1,14 @@ -{TO_USERNAME} ДъєГ, - -Хв·вµзЧУУКјюКЗ"{FROM_USERNAME}"АыУГДъФЪ"{SITENAME}"µД»бФ±ЧКБПЛщ·ўЛНµД. Из№ыХв·вµзЧУУКјюµДДЪИЭКЗ¶сТвµД№Ґ»ч»тКЗА¬»шУКјю, ЗлК№УГТФПВµДБґЅУМбіцЙкЛЯ: - -{BOARD_EMAIL} - -Зл°ьє¬Хв·вНкХыµДµзЧУУКјюДЪИЭ(МШ±рКЗН·РЕПў). ЗлЧўТв»ШёІµДµзЧУУКјюµШЦ·ТСЙи¶ЁОЄ"{FROM_USERNAME}". - -С¶ПўИзПВ: -~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -{MESSAGE} +Charset: gb2312 + +{TO_USERNAME} ДъєГ, + +Хв·вµзЧУУКјюКЗ"{FROM_USERNAME}"АыУГДъФЪ"{SITENAME}"µД»бФ±ЧКБПЛщ·ўЛНµД. Из№ыХв·вµзЧУУКјюµДДЪИЭКЗ¶сТвµД№Ґ»ч»тКЗА¬»шУКјю, ЗлК№УГТФПВµДБґЅУМбіцЙкЛЯ: + +{BOARD_EMAIL} + +Зл°ьє¬Хв·вНкХыµДµзЧУУКјюДЪИЭ(МШ±рКЗН·РЕПў). ЗлЧўТв»ШёІµДµзЧУУКјюµШЦ·ТСЙи¶ЁОЄ"{FROM_USERNAME}". + +С¶ПўИзПВ: +~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +{MESSAGE} diff --git a/phpBB/language/lang_chinese_simplified/email/topic_notify.tpl b/phpBB/language/lang_chinese_simplified/email/topic_notify.tpl index 87190abe24..ae4b8ec28d 100644 --- a/phpBB/language/lang_chinese_simplified/email/topic_notify.tpl +++ b/phpBB/language/lang_chinese_simplified/email/topic_notify.tpl @@ -1,13 +1,14 @@ -Subject: »ШМыНЁЦЄ - {TOPIC_TITLE} - -{USERNAME} ДъєГ, - -ДъКХµЅХв·вХв·вµзЧУУКјюКЗТтОЄДъФЪ"{SITENAME}"¶©ФДБЛЦчМв"{TOPIC_TITLE}", ХвёцЦчМвФЪДъЙПґОАґ·ГєуУРРВµД»ШёІ. ДъїЙТФК№УГТФПВБґЅУАґФД¶Б»ШёІµДДЪИЭ, ФЪДъдЇААФ­ЦчМвЦ®З°, І»»бФЩУРёьРВµДС¶Пў. - -{U_TOPIC} - -Из№ыДъПлИЎПы¶©ФДХвёцЦчМв, ДъїЙТФ°ґПВЦчМвПВ·ЅµДБґЅУ, »тЦ±ЅУК№УГТФПВБґЅУ: - -{U_STOP_WATCHING_TOPIC} - +Subject: »ШМыНЁЦЄ - {TOPIC_TITLE} +Charset: gb2312 + +{USERNAME} ДъєГ, + +ДъКХµЅХв·вХв·вµзЧУУКјюКЗТтОЄДъФЪ"{SITENAME}"¶©ФДБЛЦчМв"{TOPIC_TITLE}", ХвёцЦчМвФЪДъЙПґОАґ·ГєуУРРВµД»ШёІ. ДъїЙТФК№УГТФПВБґЅУАґФД¶Б»ШёІµДДЪИЭ, ФЪДъдЇААФ­ЦчМвЦ®З°, І»»бФЩУРёьРВµДС¶Пў. + +{U_TOPIC} + +Из№ыДъПлИЎПы¶©ФДХвёцЦчМв, ДъїЙТФ°ґПВЦчМвПВ·ЅµДБґЅУ, »тЦ±ЅУК№УГТФПВБґЅУ: + +{U_STOP_WATCHING_TOPIC} + {EMAIL_SIG} \ No newline at end of file diff --git a/phpBB/language/lang_chinese_simplified/email/user_activate.tpl b/phpBB/language/lang_chinese_simplified/email/user_activate.tpl index 9c3425f571..b98a7d19f4 100644 --- a/phpBB/language/lang_chinese_simplified/email/user_activate.tpl +++ b/phpBB/language/lang_chinese_simplified/email/user_activate.tpl @@ -1,9 +1,10 @@ -Subject: ЦШРВј¤»оДъµДХЛ»§! - -{USERNAME} ДъєГ, - -ДъФЪ"{SITENAME}"µДХКєЕФЭК±±»¶іЅб, ЧоУРїЙДЬµДФ­ТтКЗДъёьёДБЛДъµДёцИЛЧКБП. ЗлК№УГТФПВБґЅУЦШРВј¤»оДъµДХКєЕ: - -{U_ACTIVATE} - +Subject: ЦШРВј¤»оДъµДХЛ»§! +Charset: gb2312 + +{USERNAME} ДъєГ, + +ДъФЪ"{SITENAME}"µДХКєЕФЭК±±»¶іЅб, ЧоУРїЙДЬµДФ­ТтКЗДъёьёДБЛДъµДёцИЛЧКБП. ЗлК№УГТФПВБґЅУЦШРВј¤»оДъµДХКєЕ: + +{U_ACTIVATE} + {EMAIL_SIG} \ No newline at end of file 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 b85804cbbc..1d238e281f 100644 --- a/phpBB/language/lang_chinese_simplified/email/user_activate_passwd.tpl +++ b/phpBB/language/lang_chinese_simplified/email/user_activate_passwd.tpl @@ -1,17 +1,18 @@ -Subject: РВГЬВлј¤»о - -{USERNAME} ДъєГ, - -ДъКХµЅХв·вХв·вµзЧУУКјюКЗТтОЄДъ (ТІїЙДЬКЗДіИЛГ°ідДъµДГыТе) ЙкЗлБЛТ»ёцРВµДГЬВл. јЩИзХвІ»КЗДъ±ѕИЛЛщЙкЗл, ЗлІ»УГАн»бХв·вµзЧУУКјю, µ«КЗИз№ыДъіЦРшКХµЅХвАаµДРЕјюЙ§ИЕ, ЗлДъѕЎїмБЄВз№ЬАнФ±. - -ТЄК№УГХвЧйРВµДГЬВл, ЗлК№УГТФПВБ¬ЅбЖфУГГЬВл. - -{U_ACTIVATE} - -ФЪГЬВлЖфУГЦ®бб, ДъЅ«їЙТФК№УГРВµДГЬВлµЗИл: - -ГЬВл: {PASSWORD} - -ДъїЙТФФЪДъµДёцИЛЧКБПЦРЧФРРёьёДХКєЕГЬВл. Из№ыДъ»№УРИОєОµДТЙОК, ЗлУлПµНі№ЬАнФ±БЄВз. - +Subject: РВГЬВлј¤»о +Charset: gb2312 + +{USERNAME} ДъєГ, + +ДъКХµЅХв·вХв·вµзЧУУКјюКЗТтОЄДъ (ТІїЙДЬКЗДіИЛГ°ідДъµДГыТе) ЙкЗлБЛТ»ёцРВµДГЬВл. јЩИзХвІ»КЗДъ±ѕИЛЛщЙкЗл, ЗлІ»УГАн»бХв·вµзЧУУКјю, µ«КЗИз№ыДъіЦРшКХµЅХвАаµДРЕјюЙ§ИЕ, ЗлДъѕЎїмБЄВз№ЬАнФ±. + +ТЄК№УГХвЧйРВµДГЬВл, ЗлК№УГТФПВБ¬ЅбЖфУГГЬВл. + +{U_ACTIVATE} + +ФЪГЬВлЖфУГЦ®бб, ДъЅ«їЙТФК№УГРВµДГЬВлµЗИл: + +ГЬВл: {PASSWORD} + +ДъїЙТФФЪДъµДёцИЛЧКБПЦРЧФРРёьёДХКєЕГЬВл. Из№ыДъ»№УРИОєОµДТЙОК, ЗлУлПµНі№ЬАнФ±БЄВз. + {EMAIL_SIG} \ No newline at end of file diff --git a/phpBB/language/lang_chinese_simplified/email/user_welcome.tpl b/phpBB/language/lang_chinese_simplified/email/user_welcome.tpl index 95e9a08507..4da15d9ae0 100644 --- a/phpBB/language/lang_chinese_simplified/email/user_welcome.tpl +++ b/phpBB/language/lang_chinese_simplified/email/user_welcome.tpl @@ -1,16 +1,17 @@ -Subject: »¶У­Дъ·ГОК {SITENAME} ВЫМі - -{WELCOME_MSG} - -ЗлНЧЙЖ±ЈБфХв·вµзЧУУКјю. ДъµДХКєЕЧКБПИзПВ: - ----------------------------- -ХКєЕ: {USERNAME} -ГЬВл: {PASSWORD} ----------------------------- - -ЗлАОјЗДъµДГЬВл, ТтОЄЛщУРГЬВлѕщѕ­№эјУГЬґ¦Ан, ПµНі№ЬАнФ±ТІОЮ·ЁИЎµГ. И»¶шИз№ыДъНьјЗБЛГЬВл, ДъїЙТФЦШРВЙкЗлТ»ёцРВµДГЬВл. - -ёРР»ДъµДЧўІб. - +Subject: »¶У­Дъ·ГОК {SITENAME} ВЫМі +Charset: gb2312 + +{WELCOME_MSG} + +ЗлНЧЙЖ±ЈБфХв·вµзЧУУКјю. ДъµДХКєЕЧКБПИзПВ: + +---------------------------- +ХКєЕ: {USERNAME} +ГЬВл: {PASSWORD} +---------------------------- + +ЗлАОјЗДъµДГЬВл, ТтОЄЛщУРГЬВлѕщѕ­№эјУГЬґ¦Ан, ПµНі№ЬАнФ±ТІОЮ·ЁИЎµГ. И»¶шИз№ыДъНьјЗБЛГЬВл, ДъїЙТФЦШРВЙкЗлТ»ёцРВµДГЬВл. + +ёРР»ДъµДЧўІб. + {EMAIL_SIG} \ No newline at end of file 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 7063d5287c..4a121b22ba 100644 --- a/phpBB/language/lang_chinese_simplified/email/user_welcome_inactive.tpl +++ b/phpBB/language/lang_chinese_simplified/email/user_welcome_inactive.tpl @@ -1,20 +1,21 @@ -Subject: »¶У­Дъ·ГОК {SITENAME} ВЫМі - -{WELCOME_MSG} - -ЗлНЧЙЖ±ЈБфХв·вµзЧУУКјю. ДъµДХКєЕЧКБПИзПВ: - ----------------------------- -ХКєЕ: {USERNAME} -ГЬВл: {PASSWORD} ----------------------------- - -ДъµДХКєЕЙРОґј¤»о, Дъ±ШРлК№УГТФПВБґЅУј¤»оДъµДХКєЕ: - -{U_ACTIVATE} - -ЗлАОјЗДъµДГЬВл, ТтОЄЛщУРГЬВлѕщѕ­№эјУГЬґ¦Ан, ПµНі№ЬАнФ±ТІОЮ·ЁИЎµГ. И»¶шИз№ыДъНьјЗБЛГЬВл, ДъїЙТФЦШРВЙкЗлТ»ёцРВµДГЬВл. - -ёРР»ДъµДЧўІб. - +Subject: »¶У­Дъ·ГОК {SITENAME} ВЫМі +Charset: gb2312 + +{WELCOME_MSG} + +ЗлНЧЙЖ±ЈБфХв·вµзЧУУКјю. ДъµДХКєЕЧКБПИзПВ: + +---------------------------- +ХКєЕ: {USERNAME} +ГЬВл: {PASSWORD} +---------------------------- + +ДъµДХКєЕЙРОґј¤»о, Дъ±ШРлК№УГТФПВБґЅУј¤»оДъµДХКєЕ: + +{U_ACTIVATE} + +ЗлАОјЗДъµДГЬВл, ТтОЄЛщУРГЬВлѕщѕ­№эјУГЬґ¦Ан, ПµНі№ЬАнФ±ТІОЮ·ЁИЎµГ. И»¶шИз№ыДъНьјЗБЛГЬВл, ДъїЙТФЦШРВЙкЗлТ»ёцРВµДГЬВл. + +ёРР»ДъµДЧўІб. + {EMAIL_SIG} \ No newline at end of file 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..f5d4f26036 100644 --- a/phpBB/language/lang_chinese_traditional_taiwan/email/admin_activate.tpl +++ b/phpBB/language/lang_chinese_traditional_taiwan/email/admin_activate.tpl @@ -1,7 +1,9 @@ -±z¦n, - -іo­У "{USERNAME}" Єє±bё№Ґї¦bµҐ«Э¶}іq (ҐiЇајИ®ЙіQ­бµІ¤F©О¬O¤~­и§№¦ЁµщҐUµ{§З). ¦pЄG¦іҐІ­nЄєёЬ, ЅРҐэ¬d©ъіo­УЁПҐОЄМЄєёк®Ж, µM«б§QҐОҐH¤UіsµІ±ТҐОіo­У·|­ы±bё№: - -{U_ACTIVATE} - +Charset: big5 + +±z¦n, + +іo­У "{USERNAME}" Єє±bё№Ґї¦bµҐ«Э¶}іq (ҐiЇајИ®ЙіQ­бµІ¤F©О¬O¤~­и§№¦ЁµщҐUµ{§З). ¦pЄG¦іҐІ­nЄєёЬ, ЅРҐэ¬d©ъіo­УЁПҐОЄМЄєёк®Ж, µM«б§QҐОҐH¤UіsµІ±ТҐОіo­У·|­ы±bё№: + +{U_ACTIVATE} + {EMAIL_SIG} \ No newline at end of file diff --git a/phpBB/language/lang_chinese_traditional_taiwan/email/admin_send_email.tpl b/phpBB/language/lang_chinese_traditional_taiwan/email/admin_send_email.tpl index afdf823ad7..071d16d092 100644 --- a/phpBB/language/lang_chinese_traditional_taiwan/email/admin_send_email.tpl +++ b/phpBB/language/lang_chinese_traditional_taiwan/email/admin_send_email.tpl @@ -1,10 +1,12 @@ -іo«К№q¤l¶lҐу¬OҐС"{SITENAME}"єЮІz№О¶¤©Т±HҐX. °І¦pіo«К№q¤l¶lҐуЄє¤є®eҐO§A·PЁм¤Јґr§Ц, ¬Ж¦Ь¬Oґc·NЄє§рА»§еµы, ЅР§QҐОҐH¤UЄєіsµІґЈҐXҐУ¶D: - -{BOARD_EMAIL} - -Ґ]§tіo«К§№ѕгЄє№q¤l¶lҐу(ЇS§O¬OјРГD). - -Єю±aµ№§AЄє°T®§¦p¤U: -~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -{MESSAGE} +Charset: big5 + +іo«К№q¤l¶lҐу¬OҐС"{SITENAME}"єЮІz№О¶¤©Т±HҐX. °І¦pіo«К№q¤l¶lҐуЄє¤є®eҐO§A·PЁм¤Јґr§Ц, ¬Ж¦Ь¬Oґc·NЄє§рА»§еµы, ЅР§QҐОҐH¤UЄєіsµІґЈҐXҐУ¶D: + +{BOARD_EMAIL} + +Ґ]§tіo«К§№ѕгЄє№q¤l¶lҐу(ЇS§O¬OјРГD). + +Єю±aµ№§AЄє°T®§¦p¤U: +~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +{MESSAGE} 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..5826f46f68 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,5 +1,7 @@ -їЛ·RЄє {USERNAME} ±z¦n, - -±z¦b"{SITENAME}"Єє±bё№¤wёg±ТҐО, ±zҐiҐHЁПҐО©Т¦¬ЁмЄє·|­ы±bё№¤О±KЅXµn¤J"{SITENAME}". - +Charset: big5 + +їЛ·RЄє {USERNAME} ±z¦n, + +±z¦b"{SITENAME}"Єє±bё№¤wёg±ТҐО, ±zҐiҐHЁПҐО©Т¦¬ЁмЄє·|­ы±bё№¤О±KЅXµn¤J"{SITENAME}". + {EMAIL_SIG} \ No newline at end of file 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..0fe79276a6 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,16 +1,18 @@ -{WELCOME_MSG} - -ЅР§ґµЅ«OЇdіo«К№q¤l¶lҐу. ±zЄє±bё№ёк®Ж¦p¤U: - ----------------------------- -±bё№: {USERNAME} -±KЅX: {PASSWORD} ----------------------------- - -±zЄє±bё№ҐШ«e©|Ґј±ТҐО, ЁtІОєЮІz­ы±N¬°±z¶}іq±bё№. ·н¦№°К§@§№¦Ё«б, ±z±N·|¦¬Ём¤@«КЅT»{«HЁз. - -ЅР¤Ј­n§С°O±zЄє±KЅX, ¦]¬°©Т¦і±KЅX§Ўёg№LҐ[±KіBІz, ґNіsЁtІОєЮІz­ы¤]µLЄkЁъ±o. µM¦У, ¦pЄG±z§С°O¤F±KЅX, ±zҐiҐH­«·sҐУЅР¤@ІХ·sЄє±KЅX, ЁtІО±N·|±Hµo·sЄє±KЅXµ№±z. - -·PБВ±zЄєµщҐU. - +Charset: big5 + +{WELCOME_MSG} + +ЅР§ґµЅ«OЇdіo«К№q¤l¶lҐу. ±zЄє±bё№ёк®Ж¦p¤U: + +---------------------------- +±bё№: {USERNAME} +±KЅX: {PASSWORD} +---------------------------- + +±zЄє±bё№ҐШ«e©|Ґј±ТҐО, ЁtІОєЮІz­ы±N¬°±z¶}іq±bё№. ·н¦№°К§@§№¦Ё«б, ±z±N·|¦¬Ём¤@«КЅT»{«HЁз. + +ЅР¤Ј­n§С°O±zЄє±KЅX, ¦]¬°©Т¦і±KЅX§Ўёg№LҐ[±KіBІz, ґNіsЁtІОєЮІz­ы¤]µLЄkЁъ±o. µM¦У, ¦pЄG±z§С°O¤F±KЅX, ±zҐiҐH­«·sҐУЅР¤@ІХ·sЄє±KЅX, ЁtІО±N·|±Hµo·sЄє±KЅXµ№±z. + +·PБВ±zЄєµщҐU. + {EMAIL_SIG} \ No newline at end of file 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..062629eac7 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,51 +1,53 @@ -{WELCOME_MSG} - -ЁМ·У"¬ь°кЁаµЈєфёфБфЁp«OЕ@Єk"іW©w, ±zЄє±bё№©|ҐјЇа±ТҐО. - -ЅР¦C¦LҐH¤UЄн®жЁГЅР±zЄє¤чҐА©ОєКЕ@¤HГ±¤W¦W¦r©M¤йґБ,±NЁд¶ЗЇuЁм: - -{FAX_INFO} - -©О¶l±HЁм: - -{MAIL_INFO} - ------------------------------- ҐС¦№µф¶} ------------------------------ -{SITENAME} ·|­ыµщҐUҐУЅР®С - -ЁПҐОЄМ¦WєЩ: {USERNAME} -±KЅX: {PASSWORD} -№q¤l¶lҐу: {EMAIL_ADDRESS} - -ICQ Ѕsё№: {ICQ} -AIM ¦м§}: {AIM} -MSN ¶З°TЄМ: {MSN} -¶®Єк§Y®Йіq: {YIM} -­У¤H­є­¶: {WEB_SITE} -ЁУ¦Ы: {FROM} -Вѕ·~: {OCC} -їіЅм: {INTERESTS} - -Ґ»¤H¤w¬Э№L«OЕ@ЁаµЈЄє±ш¤еЁГҐB¤№і\"{SITENAME}"Аx¦sіoЁЗёк°T. -Ґ»¤H¤FёСіoЁЗёк°TҐiЇа¦bҐф¦у®Й­ФіQБд¤J±KЅX§у§п. -Ґ»¤H¤FёСіoЁЗёк®ЖҐiЇа¦bҐф¦у®Й­ФҐС"{SITENAME}"©ТІѕ°Ј. - - -®aЄш©ОєКЕ@¤H -(ЅР¦b¦№Г±¦W): _____________________ - -Ґ»¤H -(ЅР¦b¦№Г±¦W): __________________ - -¤йґБ: _______________ - ------------------------------- ҐС¦№µф¶}------------------------------ - - -·нєЮІz¤H­ы¦¬ЁмҐH¤WЄєҐУЅР¶ЗЇu©О¶lҐу, ЁГіq№Lјf®Ц, ±zЄє±bё№¤~·|іQ±ТҐО. - -ЅР¤Ј­n§С°O±zЄє±KЅX, ¦]¬°©Т¦і±KЅX§Ўёg№LҐ[±KіBІz, ґNіsЁtІОєЮІz­ы¤]µLЄkЁъ±o. µM¦У, ¦pЄG±z§С°O¤F±KЅX, ±zҐiҐH­«·sҐУЅР¤@ІХ·sЄє±KЅX, ЁtІО±N·|±Hµo·sЄє±KЅXµ№±z. - -·PБВ±zЄєµщҐU. - +Charset: big5 + +{WELCOME_MSG} + +ЁМ·У"¬ь°кЁаµЈєфёфБфЁp«OЕ@Єk"іW©w, ±zЄє±bё№©|ҐјЇа±ТҐО. + +ЅР¦C¦LҐH¤UЄн®жЁГЅР±zЄє¤чҐА©ОєКЕ@¤HГ±¤W¦W¦r©M¤йґБ,±NЁд¶ЗЇuЁм: + +{FAX_INFO} + +©О¶l±HЁм: + +{MAIL_INFO} + +------------------------------ ҐС¦№µф¶} ------------------------------ +{SITENAME} ·|­ыµщҐUҐУЅР®С + +ЁПҐОЄМ¦WєЩ: {USERNAME} +±KЅX: {PASSWORD} +№q¤l¶lҐу: {EMAIL_ADDRESS} + +ICQ Ѕsё№: {ICQ} +AIM ¦м§}: {AIM} +MSN ¶З°TЄМ: {MSN} +¶®Єк§Y®Йіq: {YIM} +­У¤H­є­¶: {WEB_SITE} +ЁУ¦Ы: {FROM} +Вѕ·~: {OCC} +їіЅм: {INTERESTS} + +Ґ»¤H¤w¬Э№L«OЕ@ЁаµЈЄє±ш¤еЁГҐB¤№і\"{SITENAME}"Аx¦sіoЁЗёк°T. +Ґ»¤H¤FёСіoЁЗёк°TҐiЇа¦bҐф¦у®Й­ФіQБд¤J±KЅX§у§п. +Ґ»¤H¤FёСіoЁЗёк®ЖҐiЇа¦bҐф¦у®Й­ФҐС"{SITENAME}"©ТІѕ°Ј. + + +®aЄш©ОєКЕ@¤H +(ЅР¦b¦№Г±¦W): _____________________ + +Ґ»¤H +(ЅР¦b¦№Г±¦W): __________________ + +¤йґБ: _______________ + +------------------------------ ҐС¦№µф¶}------------------------------ + + +·нєЮІz¤H­ы¦¬ЁмҐH¤WЄєҐУЅР¶ЗЇu©О¶lҐу, ЁГіq№Lјf®Ц, ±zЄє±bё№¤~·|іQ±ТҐО. + +ЅР¤Ј­n§С°O±zЄє±KЅX, ¦]¬°©Т¦і±KЅX§Ўёg№LҐ[±KіBІz, ґNіsЁtІОєЮІz­ы¤]µLЄkЁъ±o. µM¦У, ¦pЄG±z§С°O¤F±KЅX, ±zҐiҐH­«·sҐУЅР¤@ІХ·sЄє±KЅX, ЁtІО±N·|±Hµo·sЄє±KЅXµ№±z. + +·PБВ±zЄєµщҐU. + {EMAIL_SIG} \ No newline at end of file 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..2c22391034 100644 --- a/phpBB/language/lang_chinese_traditional_taiwan/email/group_added.tpl +++ b/phpBB/language/lang_chinese_traditional_taiwan/email/group_added.tpl @@ -1,9 +1,11 @@ -®ҐіЯ±z, - -±z¤wёgҐї¦ЎҐ[¤J"{SITENAME}"Єє"{GROUP_NAME}"іo­УёsІХ. -іo­У°К§@¬OҐСєЮІz№О¶¤©Т§@ҐXЄєЁM©w, ¦p¦іҐф¦уєГ°ЭЅРБpГґєЮІz­ы­М. - -±zҐiҐH§QҐОҐH¤UіsµІ¬d¬ЭёsІХёк®Ж: -{U_GROUPCP} - -{EMAIL_SIG} +Charset: big5 + +®ҐіЯ±z, + +±z¤wёgҐї¦ЎҐ[¤J"{SITENAME}"Єє"{GROUP_NAME}"іo­УёsІХ. +іo­У°К§@¬OҐСєЮІz№О¶¤©Т§@ҐXЄєЁM©w, ¦p¦іҐф¦уєГ°ЭЅРБpГґєЮІz­ы­М. + +±zҐiҐH§QҐОҐH¤UіsµІ¬d¬ЭёsІХёк®Ж: +{U_GROUPCP} + +{EMAIL_SIG} 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..be8ba523c8 100644 --- a/phpBB/language/lang_chinese_traditional_taiwan/email/group_approved.tpl +++ b/phpBB/language/lang_chinese_traditional_taiwan/email/group_approved.tpl @@ -1,8 +1,10 @@ -®ҐіЯ±z, - -§A¦b"{SITENAME}"©ТҐУЅРҐ[¤JЄєёsІХ"{GROUP_NAME}", ¤wёgАт±o§е­г. -ЅР§QҐОҐH¤UіsµІҐh¬Э¬Э±zЄєёsІХ¦Ё­ы§a! - -{U_GROUPCP} - +Charset: big5 + +®ҐіЯ±z, + +§A¦b"{SITENAME}"©ТҐУЅРҐ[¤JЄєёsІХ"{GROUP_NAME}", ¤wёgАт±o§е­г. +ЅР§QҐОҐH¤UіsµІҐh¬Э¬Э±zЄєёsІХ¦Ё­ы§a! + +{U_GROUPCP} + {EMAIL_SIG} \ No newline at end of file diff --git a/phpBB/language/lang_chinese_traditional_taiwan/email/group_denied.tpl b/phpBB/language/lang_chinese_traditional_taiwan/email/group_denied.tpl index f44abde30b..53eff34d21 100644 --- a/phpBB/language/lang_chinese_traditional_taiwan/email/group_denied.tpl +++ b/phpBB/language/lang_chinese_traditional_taiwan/email/group_denied.tpl @@ -1,9 +1,11 @@ -±z¦n, - -«Ь©кєp, §A¦b"{SITENAME}"©ТҐУЅРҐ[¤JЄєёsІХ"{GROUP_NAME}", ЁГҐјАт±o§е­г. - -ЅР¦bёФІУ¤FёСҐ[¤JїмЄk«б, ЁМ·УёsІХІХЄш©Т§@¤§іW©wїмІzҐУЅР¤вДт. ¦pЄG±zҐјІЕ¦XҐ[¤JЄєёк®ж, ЅР¤Е­«ЅЖҐУЅРҐ[¤J, ёsІХІХЄш¦іЕvјf®ЦЁдёsІХ¦Ё­ы. - -¤Ј«K¤§іB, ·qЅР­мЅМ. - +Charset: big5 + +±z¦n, + +«Ь©кєp, §A¦b"{SITENAME}"©ТҐУЅРҐ[¤JЄєёsІХ"{GROUP_NAME}", ЁГҐјАт±o§е­г. + +ЅР¦bёФІУ¤FёСҐ[¤JїмЄk«б, ЁМ·УёsІХІХЄш©Т§@¤§іW©wїмІzҐУЅР¤вДт. ¦pЄG±zҐјІЕ¦XҐ[¤JЄєёк®ж, ЅР¤Е­«ЅЖҐУЅРҐ[¤J, ёsІХІХЄш¦іЕvјf®ЦЁдёsІХ¦Ё­ы. + +¤Ј«K¤§іB, ·qЅР­мЅМ. + {EMAIL_SIG} \ No newline at end of file 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..caa114db95 100644 --- a/phpBB/language/lang_chinese_traditional_taiwan/email/group_request.tpl +++ b/phpBB/language/lang_chinese_traditional_taiwan/email/group_request.tpl @@ -1,8 +1,10 @@ -їЛ·RЄє {GROUP_MODERATOR} ±z¦n, - -¦і¤@­У·|­ыґЈҐXҐУЅРҐ[¤J§A¦b"{SITENAME}"©ТєЮІzЄє·|­ыёsІХ. -ЅР§QҐОҐH¤UіsµІ§@ҐX§е­г©О¬O»й¦^ҐУЅРЄєЁM©w: - -{U_GROUPCP} - +Charset: big5 + +їЛ·RЄє {GROUP_MODERATOR} ±z¦n, + +¦і¤@­У·|­ыґЈҐXҐУЅРҐ[¤J§A¦b"{SITENAME}"©ТєЮІzЄє·|­ыёsІХ. +ЅР§QҐОҐH¤UіsµІ§@ҐX§е­г©О¬O»й¦^ҐУЅРЄєЁM©w: + +{U_GROUPCP} + {EMAIL_SIG} \ No newline at end of file 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..931ca43f71 100644 --- a/phpBB/language/lang_chinese_traditional_taiwan/email/privmsg_notify.tpl +++ b/phpBB/language/lang_chinese_traditional_taiwan/email/privmsg_notify.tpl @@ -1,9 +1,11 @@ -їЛ·RЄє {USERNAME} ±z¦n, - -±z¦b"{SITENAME}"¦і·sЄєЁp¤H°T®§, ¦УҐB±z­nЁDЁtІОҐH№q¤l¶lҐуіqЄѕ. ±zҐiҐH§QҐОҐH¤UЄєіsµІАЛµш±z­и¦¬ЁмЄєЁp¤H°T®§: - -{U_INBOX} - -ЅР°O±o±zАH®ЙіЈҐiҐHЁъ®шіoГюЄє№q¤l¶lҐуіqЄѕ, ±zҐiҐH§у§п­У¤Hёк®Жі]©wёМЄє¬ЫГцїп¶µ. - +Charset: big5 + +їЛ·RЄє {USERNAME} ±z¦n, + +±z¦b"{SITENAME}"¦і·sЄєЁp¤H°T®§, ¦УҐB±z­nЁDЁtІОҐH№q¤l¶lҐуіqЄѕ. ±zҐiҐH§QҐОҐH¤UЄєіsµІАЛµш±z­и¦¬ЁмЄєЁp¤H°T®§: + +{U_INBOX} + +ЅР°O±o±zАH®ЙіЈҐiҐHЁъ®шіoГюЄє№q¤l¶lҐуіqЄѕ, ±zҐiҐH§у§п­У¤Hёк®Жі]©wёМЄє¬ЫГцїп¶µ. + {EMAIL_SIG} \ No newline at end of file diff --git a/phpBB/language/lang_chinese_traditional_taiwan/email/profile_send_email.tpl b/phpBB/language/lang_chinese_traditional_taiwan/email/profile_send_email.tpl index 25513ecfcc..fe14e6402e 100644 --- a/phpBB/language/lang_chinese_traditional_taiwan/email/profile_send_email.tpl +++ b/phpBB/language/lang_chinese_traditional_taiwan/email/profile_send_email.tpl @@ -1,12 +1,14 @@ -їЛ·RЄє {TO_USERNAME} ±z¦n, - -іo«К№q¤l¶lҐу¬OҐС"{FROM_USERNAME}"іz№L±z¦b"{SITENAME}"Єє·|­ыёк®Ж©Т¶З°e. °І¦pіo«К№q¤l¶lҐуЄє¤є®eҐO§A·PЁм¤Јґr§Ц, ¬Ж¦Ь¬Oґc·NЄє§рА»§еµы, ЅР§QҐОҐH¤UЄєіsµІґЈҐXҐУ¶D: - -{BOARD_EMAIL} - -Ґ]§tіo«К§№ѕгЄє№q¤l¶lҐу(ЇS§O¬OјРГD). ЅРЄ`·N¦^ВРЄє№q¤l¶lҐу«HЅc¤wі]©w¬°"{FROM_USERNAME}". - -Єю±aµ№§AЄє°T®§¦p¤U: -~~~~~~~~~~~~~~~~~~~~~~~~~~~ - +Charset: big5 + +їЛ·RЄє {TO_USERNAME} ±z¦n, + +іo«К№q¤l¶lҐу¬OҐС"{FROM_USERNAME}"іz№L±z¦b"{SITENAME}"Єє·|­ыёк®Ж©Т¶З°e. °І¦pіo«К№q¤l¶lҐуЄє¤є®eҐO§A·PЁм¤Јґr§Ц, ¬Ж¦Ь¬Oґc·NЄє§рА»§еµы, ЅР§QҐОҐH¤UЄєіsµІґЈҐXҐУ¶D: + +{BOARD_EMAIL} + +Ґ]§tіo«К§№ѕгЄє№q¤l¶lҐу(ЇS§O¬OјРГD). ЅРЄ`·N¦^ВРЄє№q¤l¶lҐу«HЅc¤wі]©w¬°"{FROM_USERNAME}". + +Єю±aµ№§AЄє°T®§¦p¤U: +~~~~~~~~~~~~~~~~~~~~~~~~~~~ + {MESSAGE} \ No newline at end of file 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..ee4cdbb636 100644 --- a/phpBB/language/lang_chinese_traditional_taiwan/email/topic_notify.tpl +++ b/phpBB/language/lang_chinese_traditional_taiwan/email/topic_notify.tpl @@ -1,11 +1,13 @@ -їЛ·RЄє {USERNAME} ±z¦n, - -±z¦¬Ёміo«Кіo«К№q¤l¶lҐу¬O¦]¬°±z¦b"{SITENAME}"­qѕ\¤FҐDГD"{TOPIC_TITLE}", іo­УҐDГD¦b±z¤W¦ёЁУіX«б¦і·sЄє¦^ВР°T®§. ±zҐiҐHЁПҐОҐH¤UіsµІЁУЖ[¬Э¦^ВРЄє°T®§, ¦b±zЖ[¬Э­мҐDГD¤§«e, ¤Ј·|¦і§у·sЄє°T®§іqЄѕ±z. - -{U_TOPIC} - -¦pЄG±z·QЁъ®ш­qѕ\іo­УҐDГD, ±zҐiҐH«ц¤UҐDГD¤U¤и"Ёъ®ш­qѕ\іo­УҐDГD (¦^ВРіqЄѕ)"ЄєіsµІ, ©ОЄЅ±µЁПҐОҐH¤UіsµІ: - -{U_STOP_WATCHING_TOPIC} - +Charset: big5 + +їЛ·RЄє {USERNAME} ±z¦n, + +±z¦¬Ёміo«Кіo«К№q¤l¶lҐу¬O¦]¬°±z¦b"{SITENAME}"­qѕ\¤FҐDГD"{TOPIC_TITLE}", іo­УҐDГD¦b±z¤W¦ёЁУіX«б¦і·sЄє¦^ВР°T®§. ±zҐiҐHЁПҐОҐH¤UіsµІЁУЖ[¬Э¦^ВРЄє°T®§, ¦b±zЖ[¬Э­мҐDГD¤§«e, ¤Ј·|¦і§у·sЄє°T®§іqЄѕ±z. + +{U_TOPIC} + +¦pЄG±z·QЁъ®ш­qѕ\іo­УҐDГD, ±zҐiҐH«ц¤UҐDГD¤U¤и"Ёъ®ш­qѕ\іo­УҐDГD (¦^ВРіqЄѕ)"ЄєіsµІ, ©ОЄЅ±µЁПҐОҐH¤UіsµІ: + +{U_STOP_WATCHING_TOPIC} + {EMAIL_SIG} \ No newline at end of file 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..a5f34d3917 100644 --- a/phpBB/language/lang_chinese_traditional_taiwan/email/user_activate.tpl +++ b/phpBB/language/lang_chinese_traditional_taiwan/email/user_activate.tpl @@ -1,7 +1,9 @@ -їЛ·RЄє {USERNAME} ±z¦n, - -±z¦b"{SITENAME}"Єє±bё№јИ®ЙіQ­бµІ, іМ¦іҐiЇаЄє­м¦]¬O¦]¬°±z§у§п№L±zЄє­У¤Hёк®Ж. ЅРЁПҐОҐH¤UіsµІ­«·s±ТҐО±zЄє±bё№: - -{U_ACTIVATE} - +Charset: big5 + +їЛ·RЄє {USERNAME} ±z¦n, + +±z¦b"{SITENAME}"Єє±bё№јИ®ЙіQ­бµІ, іМ¦іҐiЇаЄє­м¦]¬O¦]¬°±z§у§п№L±zЄє­У¤Hёк®Ж. ЅРЁПҐОҐH¤UіsµІ­«·s±ТҐО±zЄє±bё№: + +{U_ACTIVATE} + {EMAIL_SIG} \ No newline at end of file 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..f65903395c 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,15 +1,17 @@ -їЛ·RЄє {USERNAME} ±z¦n, - -±z¦¬Ёміo«Кіo«К№q¤l¶lҐу¬O¦]¬°±z (©ОЄМ¬O¬Y¤H«_ҐR±zЄє¦Wёq) ҐУЅР¤F¤@ІХ·sЄє±KЅX. °І¦pіo¤Ј¬O±zҐ»¤H©ТҐУЅР, ЅР¤ЈҐОІz·|іo«К№q¤l¶lҐу, ¦э¬O¦pЄG±z«щДт¦¬ЁміoГюЄє«HҐуДМВZ, ЅР±zѕЁ§Ц¦VєЮІz¤H­ыіsГґ. - -­nЁПҐОіoІХ·sЄє±KЅX, ЅРЁПҐОҐH¤UіsµІ±ТҐО±KЅX. - -{U_ACTIVATE} - -¦b±KЅX±ТҐО¤§«б, ±z±NҐiҐH¶¶§QЁПҐО·sЄє±KЅXµn¤J: - -±KЅX: {PASSWORD} - -±zҐiҐH¦b±zЄє­У¤Hёк®Ж¤¤¦Ы¦ж§у§п±bё№±KЅX. ¦pЄG±zБЩ¦іҐф¦уЄєєГ°Э, ЅР»PЁtІОєЮІz­ыБpµё. - +Charset: big5 + +їЛ·RЄє {USERNAME} ±z¦n, + +±z¦¬Ёміo«Кіo«К№q¤l¶lҐу¬O¦]¬°±z (©ОЄМ¬O¬Y¤H«_ҐR±zЄє¦Wёq) ҐУЅР¤F¤@ІХ·sЄє±KЅX. °І¦pіo¤Ј¬O±zҐ»¤H©ТҐУЅР, ЅР¤ЈҐОІz·|іo«К№q¤l¶lҐу, ¦э¬O¦pЄG±z«щДт¦¬ЁміoГюЄє«HҐуДМВZ, ЅР±zѕЁ§Ц¦VєЮІz¤H­ыіsГґ. + +­nЁПҐОіoІХ·sЄє±KЅX, ЅРЁПҐОҐH¤UіsµІ±ТҐО±KЅX. + +{U_ACTIVATE} + +¦b±KЅX±ТҐО¤§«б, ±z±NҐiҐH¶¶§QЁПҐО·sЄє±KЅXµn¤J: + +±KЅX: {PASSWORD} + +±zҐiҐH¦b±zЄє­У¤Hёк®Ж¤¤¦Ы¦ж§у§п±bё№±KЅX. ¦pЄG±zБЩ¦іҐф¦уЄєєГ°Э, ЅР»PЁtІОєЮІz­ыБpµё. + {EMAIL_SIG} \ No newline at end of file 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..6bb8013895 100644 --- a/phpBB/language/lang_chinese_traditional_taiwan/email/user_welcome.tpl +++ b/phpBB/language/lang_chinese_traditional_taiwan/email/user_welcome.tpl @@ -1,14 +1,16 @@ -{WELCOME_MSG} - -ЅР§ґµЅ«OЇdіo«К№q¤l¶lҐу. ±zЄє±bё№ёк®Ж¦p¤U: - ----------------------------- -±bё№: {USERNAME} -±KЅX: {PASSWORD} ----------------------------- - -ЅР¤Ј­n§С°O±zЄє±KЅX, ¦]¬°©Т¦і±KЅX§Ўёg№LҐ[±KіBІz, ґNіsЁtІОєЮІz­ы¤]µLЄkЁъ±o. µM¦У, ¦pЄG±z§С°O¤F±KЅX, ±zҐiҐH­«·sҐУЅР¤@ІХ·sЄє±KЅX, ЁtІО±N·|±Hµo·sЄє±KЅXµ№±z. - -·PБВ±zЄєµщҐU. - +Charset: big5 + +{WELCOME_MSG} + +ЅР§ґµЅ«OЇdіo«К№q¤l¶lҐу. ±zЄє±bё№ёк®Ж¦p¤U: + +---------------------------- +±bё№: {USERNAME} +±KЅX: {PASSWORD} +---------------------------- + +ЅР¤Ј­n§С°O±zЄє±KЅX, ¦]¬°©Т¦і±KЅX§Ўёg№LҐ[±KіBІz, ґNіsЁtІОєЮІz­ы¤]µLЄkЁъ±o. µM¦У, ¦pЄG±z§С°O¤F±KЅX, ±zҐiҐH­«·sҐУЅР¤@ІХ·sЄє±KЅX, ЁtІО±N·|±Hµo·sЄє±KЅXµ№±z. + +·PБВ±zЄєµщҐU. + {EMAIL_SIG} \ No newline at end of file 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..151c40c9bc 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,18 +1,20 @@ -{WELCOME_MSG} - -ЅР§ґµЅ«OЇdіo«К№q¤l¶lҐу. ±zЄє±bё№ёк®Ж¦p¤U: - ----------------------------- -±bё№: {USERNAME} -±KЅX: {PASSWORD} ----------------------------- - -±zЄє±bё№©|Ґј±ТҐО, ±zҐІ¶·ЁПҐОҐH¤UіsµІ±ТҐО§AЄє±bё№: - -{U_ACTIVATE} - -ЅР¤Ј­n§С°O±zЄє±KЅX, ¦]¬°©Т¦і±KЅX§Ўёg№LҐ[±KіBІz, ґNіsЁtІОєЮІz­ы¤]µLЄkЁъ±o. µM¦У, ¦pЄG±z§С°O¤F±KЅX, ±zҐiҐH­«·sҐУЅР¤@ІХ·sЄє±KЅX, ЁtІО±N·|±Hµo·sЄє±KЅXµ№±z. - -·PБВ±zЄєµщҐU. - +Charset: big5 + +{WELCOME_MSG} + +ЅР§ґµЅ«OЇdіo«К№q¤l¶lҐу. ±zЄє±bё№ёк®Ж¦p¤U: + +---------------------------- +±bё№: {USERNAME} +±KЅX: {PASSWORD} +---------------------------- + +±zЄє±bё№©|Ґј±ТҐО, ±zҐІ¶·ЁПҐОҐH¤UіsµІ±ТҐО§AЄє±bё№: + +{U_ACTIVATE} + +ЅР¤Ј­n§С°O±zЄє±KЅX, ¦]¬°©Т¦і±KЅX§Ўёg№LҐ[±KіBІz, ґNіsЁtІОєЮІz­ы¤]µLЄkЁъ±o. µM¦У, ¦pЄG±z§С°O¤F±KЅX, ±zҐiҐH­«·sҐУЅР¤@ІХ·sЄє±KЅX, ЁtІО±N·|±Hµo·sЄє±KЅXµ№±z. + +·PБВ±zЄєµщҐU. + {EMAIL_SIG} \ No newline at end of file diff --git a/phpBB/language/lang_danish/email/admin_activate.tpl b/phpBB/language/lang_danish/email/admin_activate.tpl index 38951e77e4..85a12375e0 100644 --- a/phpBB/language/lang_danish/email/admin_activate.tpl +++ b/phpBB/language/lang_danish/email/admin_activate.tpl @@ -1,4 +1,5 @@ Subject: Genaktiver venligst din konto! +Charset: iso-8859-1 Hej, diff --git a/phpBB/language/lang_danish/email/admin_send_email.tpl b/phpBB/language/lang_danish/email/admin_send_email.tpl index 56fc6f08be..db871837ee 100644 --- a/phpBB/language/lang_danish/email/admin_send_email.tpl +++ b/phpBB/language/lang_danish/email/admin_send_email.tpl @@ -1,3 +1,5 @@ +Charset: iso-8859-1 + Fшlgende email er afsendt fra administratoren af "{SITENAME}". Hvis denne email er uшnsket, indeholder bandeord, eller andre kommentarer du finder anstшdende, sе kontakt venligst webmasteren af forumet pе fшlgende adresse: {BOARD_EMAIL} diff --git a/phpBB/language/lang_danish/email/admin_welcome_activated.tpl b/phpBB/language/lang_danish/email/admin_welcome_activated.tpl index 1c8be39fda..ac38a41d14 100644 --- a/phpBB/language/lang_danish/email/admin_welcome_activated.tpl +++ b/phpBB/language/lang_danish/email/admin_welcome_activated.tpl @@ -1,4 +1,5 @@ Subject: Konto aktiveret +Charset: iso-8859-1 Hej {USERNAME}, diff --git a/phpBB/language/lang_danish/email/admin_welcome_inactive.tpl b/phpBB/language/lang_danish/email/admin_welcome_inactive.tpl index c8dbbb4c21..5df20e488c 100644 --- a/phpBB/language/lang_danish/email/admin_welcome_inactive.tpl +++ b/phpBB/language/lang_danish/email/admin_welcome_inactive.tpl @@ -1,4 +1,5 @@ Subject: Velkommen til {SITENAME} Forum +Charset: iso-8859-1 {WELCOME_MSG} diff --git a/phpBB/language/lang_danish/email/coppa_welcome_inactive.tpl b/phpBB/language/lang_danish/email/coppa_welcome_inactive.tpl index 23321dbb4d..c88c8bb383 100644 --- a/phpBB/language/lang_danish/email/coppa_welcome_inactive.tpl +++ b/phpBB/language/lang_danish/email/coppa_welcome_inactive.tpl @@ -1,4 +1,5 @@ Subject: Velkommen til {SITENAME} Forum +Charset: iso-8859-1 {WELCOME_MSG} diff --git a/phpBB/language/lang_danish/email/group_added.tpl b/phpBB/language/lang_danish/email/group_added.tpl index 549b9045e8..ef66df334e 100644 --- a/phpBB/language/lang_danish/email/group_added.tpl +++ b/phpBB/language/lang_danish/email/group_added.tpl @@ -1,4 +1,5 @@ Subject: Du er nu tilfшjet til denne bruger gruppe +Charset: iso-8859-1 Tillykke, diff --git a/phpBB/language/lang_danish/email/group_approved.tpl b/phpBB/language/lang_danish/email/group_approved.tpl index 67f8fbcf99..ecdca7f448 100644 --- a/phpBB/language/lang_danish/email/group_approved.tpl +++ b/phpBB/language/lang_danish/email/group_approved.tpl @@ -1,4 +1,5 @@ Subject: Din tilmelding er blevet godkendt +Charset: iso-8859-1 Tillykke, diff --git a/phpBB/language/lang_danish/email/group_request.tpl b/phpBB/language/lang_danish/email/group_request.tpl index 9cabfbbda9..418609d95d 100644 --- a/phpBB/language/lang_danish/email/group_request.tpl +++ b/phpBB/language/lang_danish/email/group_request.tpl @@ -1,4 +1,5 @@ Subject: En bruger шnsker at tilmelde sig til din gruppe +Charset: iso-8859-1 Kжre {GROUP_MODERATOR}, diff --git a/phpBB/language/lang_danish/email/privmsg_notify.tpl b/phpBB/language/lang_danish/email/privmsg_notify.tpl index 476006f55a..1f9b8fa40e 100644 --- a/phpBB/language/lang_danish/email/privmsg_notify.tpl +++ b/phpBB/language/lang_danish/email/privmsg_notify.tpl @@ -1,4 +1,5 @@ Subject: Ny Privat besked er ankommet +Charset: iso-8859-1 Hej {USERNAME}, diff --git a/phpBB/language/lang_danish/email/profile_send_email.tpl b/phpBB/language/lang_danish/email/profile_send_email.tpl index 224eab3865..eee9225c8b 100644 --- a/phpBB/language/lang_danish/email/profile_send_email.tpl +++ b/phpBB/language/lang_danish/email/profile_send_email.tpl @@ -1,3 +1,5 @@ +Charset: iso-8859-1 + Hej {TO_USERNAME}, Denne email er sendt til dig fra {FROM_USERNAME} via din konto pе {SITENAME}. Hvis denne besked er uшnsket, indeholder bandeord eller andre kommentarer, som du finder anstшdende, sе kontakt venligst webmasteren af forumet pе den fшlgende adresse: diff --git a/phpBB/language/lang_danish/email/topic_notify.tpl b/phpBB/language/lang_danish/email/topic_notify.tpl index 98a2c4e39f..2580f947b0 100644 --- a/phpBB/language/lang_danish/email/topic_notify.tpl +++ b/phpBB/language/lang_danish/email/topic_notify.tpl @@ -1,4 +1,5 @@ Subject: Emnet er besvaret - {TOPIC_TITLE} +Charset: iso-8859-1 Hej {USERNAME}, diff --git a/phpBB/language/lang_danish/email/user_activate.tpl b/phpBB/language/lang_danish/email/user_activate.tpl index 1245c0fdb7..8022183562 100644 --- a/phpBB/language/lang_danish/email/user_activate.tpl +++ b/phpBB/language/lang_danish/email/user_activate.tpl @@ -1,4 +1,5 @@ Subject: Genaktiver venligst din konto! +Charset: iso-8859-1 Hej {USERNAME}, diff --git a/phpBB/language/lang_danish/email/user_activate_passwd.tpl b/phpBB/language/lang_danish/email/user_activate_passwd.tpl index 5f466dd38c..3cb270437d 100644 --- a/phpBB/language/lang_danish/email/user_activate_passwd.tpl +++ b/phpBB/language/lang_danish/email/user_activate_passwd.tpl @@ -1,4 +1,5 @@ Subject: Aktivering af nyt kodeord +Charset: iso-8859-1 Hej {USERNAME} diff --git a/phpBB/language/lang_danish/email/user_welcome.tpl b/phpBB/language/lang_danish/email/user_welcome.tpl index cf642ea785..11e625ce4a 100644 --- a/phpBB/language/lang_danish/email/user_welcome.tpl +++ b/phpBB/language/lang_danish/email/user_welcome.tpl @@ -1,4 +1,5 @@ Subject: Velkommen til {SITENAME} Forum +Charset: iso-8859-1 {WELCOME_MSG} diff --git a/phpBB/language/lang_danish/email/user_welcome_inactive.tpl b/phpBB/language/lang_danish/email/user_welcome_inactive.tpl index a9a610311a..6fd1748782 100644 --- a/phpBB/language/lang_danish/email/user_welcome_inactive.tpl +++ b/phpBB/language/lang_danish/email/user_welcome_inactive.tpl @@ -1,4 +1,5 @@ Subject: Velkommen til {SITENAME} Forum +Charset: iso-8859-1 {WELCOME_MSG} diff --git a/phpBB/language/lang_dutch/email/admin_activate.tpl b/phpBB/language/lang_dutch/email/admin_activate.tpl index bfd2e42513..ffc427c5fa 100644 --- a/phpBB/language/lang_dutch/email/admin_activate.tpl +++ b/phpBB/language/lang_dutch/email/admin_activate.tpl @@ -1,4 +1,5 @@ Subject: Nieuw gebruikers account +Charset: iso-8859-1 Hallo, diff --git a/phpBB/language/lang_dutch/email/admin_send_email.tpl b/phpBB/language/lang_dutch/email/admin_send_email.tpl index 30829912b0..2a378a778b 100644 --- a/phpBB/language/lang_dutch/email/admin_send_email.tpl +++ b/phpBB/language/lang_dutch/email/admin_send_email.tpl @@ -1,3 +1,5 @@ +Charset: iso-8859-1 + De volgende email is verstuurd door een beheerder van "{SITENAME}". Als dit bericht ongewenste gegevens bevat neem dat contact op het de webmaster van de site op het volgende adres: diff --git a/phpBB/language/lang_dutch/email/admin_welcome_activated.tpl b/phpBB/language/lang_dutch/email/admin_welcome_activated.tpl index b69026ea21..ae88e3540e 100644 --- a/phpBB/language/lang_dutch/email/admin_welcome_activated.tpl +++ b/phpBB/language/lang_dutch/email/admin_welcome_activated.tpl @@ -1,4 +1,5 @@ Subject: Account Geactiveerd +Charset: iso-8859-1 Hallo {USERNAME}, diff --git a/phpBB/language/lang_dutch/email/admin_welcome_inactive.tpl b/phpBB/language/lang_dutch/email/admin_welcome_inactive.tpl index 04935fc556..836ada2ca9 100644 --- a/phpBB/language/lang_dutch/email/admin_welcome_inactive.tpl +++ b/phpBB/language/lang_dutch/email/admin_welcome_inactive.tpl @@ -1,4 +1,5 @@ Subject: Welkom op {SITENAME} +Charset: iso-8859-1 {WELCOME_MSG} diff --git a/phpBB/language/lang_dutch/email/coppa_welcome_inactive.tpl b/phpBB/language/lang_dutch/email/coppa_welcome_inactive.tpl index f09b6fbeab..e1b4351948 100644 --- a/phpBB/language/lang_dutch/email/coppa_welcome_inactive.tpl +++ b/phpBB/language/lang_dutch/email/coppa_welcome_inactive.tpl @@ -1,4 +1,5 @@ Subject: Welkom op {SITENAME} +Charset: iso-8859-1 {WELCOME_MSG} diff --git a/phpBB/language/lang_dutch/email/group_added.tpl b/phpBB/language/lang_dutch/email/group_added.tpl index 779fcd93eb..2a2137e9c6 100644 --- a/phpBB/language/lang_dutch/email/group_added.tpl +++ b/phpBB/language/lang_dutch/email/group_added.tpl @@ -1,4 +1,5 @@ Subject: Je bent toegevoegd aan deze groep +Charset: iso-8859-1 Hallo, diff --git a/phpBB/language/lang_dutch/email/group_approved.tpl b/phpBB/language/lang_dutch/email/group_approved.tpl index b6221044e9..db9c1f6725 100644 --- a/phpBB/language/lang_dutch/email/group_approved.tpl +++ b/phpBB/language/lang_dutch/email/group_approved.tpl @@ -1,4 +1,5 @@ Subject: Je aanmelding is goedgekeurd +Charset: iso-8859-1 Hallo, diff --git a/phpBB/language/lang_dutch/email/group_request.tpl b/phpBB/language/lang_dutch/email/group_request.tpl index 55401b7774..13e76a1179 100644 --- a/phpBB/language/lang_dutch/email/group_request.tpl +++ b/phpBB/language/lang_dutch/email/group_request.tpl @@ -1,4 +1,5 @@ Subject: Verzoek om lid te worden van een groep +Charset: iso-8859-1 Hallo {GROUP_MODERATOR}, diff --git a/phpBB/language/lang_dutch/email/privmsg_notify.tpl b/phpBB/language/lang_dutch/email/privmsg_notify.tpl index 494c8749d8..7dfeb3a3a8 100644 --- a/phpBB/language/lang_dutch/email/privmsg_notify.tpl +++ b/phpBB/language/lang_dutch/email/privmsg_notify.tpl @@ -1,4 +1,5 @@ Subject: Er is een nieuw bericht +Charset: iso-8859-1 Hallo {USERNAME}, diff --git a/phpBB/language/lang_dutch/email/profile_send_email.tpl b/phpBB/language/lang_dutch/email/profile_send_email.tpl index 5df7fa66b4..6756237894 100644 --- a/phpBB/language/lang_dutch/email/profile_send_email.tpl +++ b/phpBB/language/lang_dutch/email/profile_send_email.tpl @@ -1,3 +1,5 @@ +Charset: iso-8859-1 + Hallo {TO_USERNAME}, Dit bericht bevalt een email die de gebruiker "{FROM_USERNAME}" naar jou diff --git a/phpBB/language/lang_dutch/email/topic_notify.tpl b/phpBB/language/lang_dutch/email/topic_notify.tpl index 54bc28e14b..70e93b8464 100644 --- a/phpBB/language/lang_dutch/email/topic_notify.tpl +++ b/phpBB/language/lang_dutch/email/topic_notify.tpl @@ -1,4 +1,5 @@ Subject: Melding van het plaatsen van een reactie - {TOPIC_TITLE} +Charset: iso-8859-1 Hallo {USERNAME}, diff --git a/phpBB/language/lang_dutch/email/user_activate.tpl b/phpBB/language/lang_dutch/email/user_activate.tpl index 766b15f393..de9591b4d2 100644 --- a/phpBB/language/lang_dutch/email/user_activate.tpl +++ b/phpBB/language/lang_dutch/email/user_activate.tpl @@ -1,4 +1,5 @@ Subject: Je moet je account opnieuw activeren! +Charset: iso-8859-1 Hallo {USERNAME}, diff --git a/phpBB/language/lang_dutch/email/user_activate_passwd.tpl b/phpBB/language/lang_dutch/email/user_activate_passwd.tpl index 57dbcc2991..bbe223a51e 100644 --- a/phpBB/language/lang_dutch/email/user_activate_passwd.tpl +++ b/phpBB/language/lang_dutch/email/user_activate_passwd.tpl @@ -1,4 +1,5 @@ Subject: Nieuw wachtwoord activatie +Charset: iso-8859-1 Hallo {USERNAME} diff --git a/phpBB/language/lang_dutch/email/user_welcome.tpl b/phpBB/language/lang_dutch/email/user_welcome.tpl index 9c3e118bbb..0ca94ea70e 100644 --- a/phpBB/language/lang_dutch/email/user_welcome.tpl +++ b/phpBB/language/lang_dutch/email/user_welcome.tpl @@ -1,4 +1,5 @@ Subject: Welkom op {SITENAME} +Charset: iso-8859-1 {WELCOME_MSG} diff --git a/phpBB/language/lang_dutch/email/user_welcome_inactive.tpl b/phpBB/language/lang_dutch/email/user_welcome_inactive.tpl index b6cb8bdd9e..8c89e51abf 100644 --- a/phpBB/language/lang_dutch/email/user_welcome_inactive.tpl +++ b/phpBB/language/lang_dutch/email/user_welcome_inactive.tpl @@ -1,4 +1,5 @@ Subject: Welkom op {SITENAME} +Charset: iso-8859-1 {WELCOME_MSG} diff --git a/phpBB/language/lang_english/email/admin_activate.tpl b/phpBB/language/lang_english/email/admin_activate.tpl index 04c8275491..ea0af53880 100644 --- a/phpBB/language/lang_english/email/admin_activate.tpl +++ b/phpBB/language/lang_english/email/admin_activate.tpl @@ -1,4 +1,5 @@ Subject: New user account +Charset: iso-8859-1 Hello, diff --git a/phpBB/language/lang_english/email/admin_send_email.tpl b/phpBB/language/lang_english/email/admin_send_email.tpl index a04796f184..234f61df52 100644 --- a/phpBB/language/lang_english/email/admin_send_email.tpl +++ b/phpBB/language/lang_english/email/admin_send_email.tpl @@ -1,3 +1,5 @@ +Charset: iso-8859-1 + The following is an email sent to you by an administrator of "{SITENAME}". If this message is spam, contains abusive or other comments you find offensive please contact the webmaster of the board at the following address: {BOARD_EMAIL} diff --git a/phpBB/language/lang_english/email/admin_welcome_activated.tpl b/phpBB/language/lang_english/email/admin_welcome_activated.tpl index abd1391df8..3b7aa48362 100644 --- a/phpBB/language/lang_english/email/admin_welcome_activated.tpl +++ b/phpBB/language/lang_english/email/admin_welcome_activated.tpl @@ -1,4 +1,5 @@ Subject: Account Activated +Charset: iso-8859-1 Hello {USERNAME}, diff --git a/phpBB/language/lang_english/email/admin_welcome_inactive.tpl b/phpBB/language/lang_english/email/admin_welcome_inactive.tpl index a9cd4e5db0..905e71696b 100644 --- a/phpBB/language/lang_english/email/admin_welcome_inactive.tpl +++ b/phpBB/language/lang_english/email/admin_welcome_inactive.tpl @@ -1,4 +1,5 @@ Subject: Welcome to {SITENAME} Forums +Charset: iso-8859-1 {WELCOME_MSG} diff --git a/phpBB/language/lang_english/email/coppa_welcome_inactive.tpl b/phpBB/language/lang_english/email/coppa_welcome_inactive.tpl index a77c7feb02..97e651a488 100644 --- a/phpBB/language/lang_english/email/coppa_welcome_inactive.tpl +++ b/phpBB/language/lang_english/email/coppa_welcome_inactive.tpl @@ -1,4 +1,5 @@ Subject: Welcome to {SITENAME} Forums +Charset: iso-8859-1 {WELCOME_MSG} diff --git a/phpBB/language/lang_english/email/group_added.tpl b/phpBB/language/lang_english/email/group_added.tpl index 81e87dbfb3..5707da9031 100644 --- a/phpBB/language/lang_english/email/group_added.tpl +++ b/phpBB/language/lang_english/email/group_added.tpl @@ -1,4 +1,5 @@ Subject: You have been added to this usergroup +Charset: iso-8859-1 Congratulations, diff --git a/phpBB/language/lang_english/email/group_approved.tpl b/phpBB/language/lang_english/email/group_approved.tpl index 60def16635..38773c513d 100644 --- a/phpBB/language/lang_english/email/group_approved.tpl +++ b/phpBB/language/lang_english/email/group_approved.tpl @@ -1,4 +1,5 @@ Subject: Your request has been approved +Charset: iso-8859-1 Congratulations, diff --git a/phpBB/language/lang_english/email/group_request.tpl b/phpBB/language/lang_english/email/group_request.tpl index 7b2811a764..8da7fa9f29 100644 --- a/phpBB/language/lang_english/email/group_request.tpl +++ b/phpBB/language/lang_english/email/group_request.tpl @@ -1,4 +1,5 @@ Subject: A request to join your group has been made +Charset: iso-8859-1 Dear {GROUP_MODERATOR}, diff --git a/phpBB/language/lang_english/email/privmsg_notify.tpl b/phpBB/language/lang_english/email/privmsg_notify.tpl index ef426d58c4..2a96ee8c61 100644 --- a/phpBB/language/lang_english/email/privmsg_notify.tpl +++ b/phpBB/language/lang_english/email/privmsg_notify.tpl @@ -1,4 +1,5 @@ Subject: New Private Message has arrived +Charset: iso-8859-1 Hello {USERNAME}, diff --git a/phpBB/language/lang_english/email/profile_send_email.tpl b/phpBB/language/lang_english/email/profile_send_email.tpl index 231efe1334..00dcde1e46 100644 --- a/phpBB/language/lang_english/email/profile_send_email.tpl +++ b/phpBB/language/lang_english/email/profile_send_email.tpl @@ -1,3 +1,5 @@ +Charset: iso-8859-1 + Hello {TO_USERNAME}, The following is an email sent to you by {FROM_USERNAME} via your account on {SITENAME}. If this message is spam, contains abusive or other comments you find offensive please contact the webmaster of the board at the following address: diff --git a/phpBB/language/lang_english/email/topic_notify.tpl b/phpBB/language/lang_english/email/topic_notify.tpl index b34b2d980a..9682ebbe69 100644 --- a/phpBB/language/lang_english/email/topic_notify.tpl +++ b/phpBB/language/lang_english/email/topic_notify.tpl @@ -1,4 +1,5 @@ Subject: Topic Reply Notification - {TOPIC_TITLE} +Charset: iso-8859-1 Hello {USERNAME}, diff --git a/phpBB/language/lang_english/email/user_activate.tpl b/phpBB/language/lang_english/email/user_activate.tpl index 7d7960c4c5..0adeb5bff2 100644 --- a/phpBB/language/lang_english/email/user_activate.tpl +++ b/phpBB/language/lang_english/email/user_activate.tpl @@ -1,4 +1,5 @@ Subject: Reactivate your account +Charset: iso-8859-1 Hello {USERNAME}, diff --git a/phpBB/language/lang_english/email/user_activate_passwd.tpl b/phpBB/language/lang_english/email/user_activate_passwd.tpl index eb60e9af4c..8c45d032fe 100644 --- a/phpBB/language/lang_english/email/user_activate_passwd.tpl +++ b/phpBB/language/lang_english/email/user_activate_passwd.tpl @@ -1,4 +1,5 @@ Subject: New password activation +Charset: iso-8859-1 Hello {USERNAME} diff --git a/phpBB/language/lang_english/email/user_welcome.tpl b/phpBB/language/lang_english/email/user_welcome.tpl index 963be09048..42dc56df3b 100644 --- a/phpBB/language/lang_english/email/user_welcome.tpl +++ b/phpBB/language/lang_english/email/user_welcome.tpl @@ -1,4 +1,5 @@ Subject: Welcome to {SITENAME} Forums +Charset: iso-8859-1 {WELCOME_MSG} diff --git a/phpBB/language/lang_english/email/user_welcome_inactive.tpl b/phpBB/language/lang_english/email/user_welcome_inactive.tpl index 726abf4d60..6ece2d4faf 100644 --- a/phpBB/language/lang_english/email/user_welcome_inactive.tpl +++ b/phpBB/language/lang_english/email/user_welcome_inactive.tpl @@ -1,4 +1,5 @@ Subject: Welcome to {SITENAME} Forums +Charset: iso-8859-1 {WELCOME_MSG} diff --git a/phpBB/language/lang_finnish/email/admin_activate.tpl b/phpBB/language/lang_finnish/email/admin_activate.tpl index 250bd97f19..e1d93e2054 100644 --- a/phpBB/language/lang_finnish/email/admin_activate.tpl +++ b/phpBB/language/lang_finnish/email/admin_activate.tpl @@ -1,9 +1,10 @@ -Subject: Uusi kдyttдjдtunnus - -Tervehdys, - -Kдyttдjдtunnus nimellд "{USERNAME}" on passivoitu tai juuri luotu, sinun tulee tarkistaa tдmдn kдyttдjдtunnuksen tiedot (jos tarpeen) ja aktivoida tunnus kдyttдen seuraava linkkiд: - -{U_ACTIVATE} - +Subject: Uusi kдyttдjдtunnus +Charset: iso-8859-1 + +Tervehdys, + +Kдyttдjдtunnus nimellд "{USERNAME}" on passivoitu tai juuri luotu, sinun tulee tarkistaa tдmдn kдyttдjдtunnuksen tiedot (jos tarpeen) ja aktivoida tunnus kдyttдen seuraava linkkiд: + +{U_ACTIVATE} + {EMAIL_SIG} \ No newline at end of file diff --git a/phpBB/language/lang_finnish/email/admin_send_email.tpl b/phpBB/language/lang_finnish/email/admin_send_email.tpl index 903a16661b..ae76fa9666 100644 --- a/phpBB/language/lang_finnish/email/admin_send_email.tpl +++ b/phpBB/language/lang_finnish/email/admin_send_email.tpl @@ -1,3 +1,5 @@ +Charset: iso-8859-1 + Oheisen sдhkцpostin on lдhettдnyt sinulle yllдpito sivustolta "{SITENAME}". Jos tдmд viesti on roskapostia, sisдltдд loukkaavaa tai muuten mielestдsi sopimatonta tekstiд, ole hyvд ja ota yhteys sivuston webmasteriin seuraavassa osoitteessa: {BOARD_EMAIL} diff --git a/phpBB/language/lang_finnish/email/admin_welcome_activated.tpl b/phpBB/language/lang_finnish/email/admin_welcome_activated.tpl index cc03df99b4..0164a38fe5 100644 --- a/phpBB/language/lang_finnish/email/admin_welcome_activated.tpl +++ b/phpBB/language/lang_finnish/email/admin_welcome_activated.tpl @@ -1,7 +1,8 @@ -Subject: Kдyttдjдtunnus aktivoitu - -Tervehdys {USERNAME}, - -Kдyttдjдtunnuksesi sivustolla "{SITENAME}" on nyt aktivoitu. Voit kirjautua sisддn kдyttдen kдyttдjдtunnusta ja salasanaa jotka sait edellisessд sдhkцpostissa. - +Subject: Kдyttдjдtunnus aktivoitu +Charset: iso-8859-1 + +Tervehdys {USERNAME}, + +Kдyttдjдtunnuksesi sivustolla "{SITENAME}" on nyt aktivoitu. Voit kirjautua sisддn kдyttдen kдyttдjдtunnusta ja salasanaa jotka sait edellisessд sдhkцpostissa. + {EMAIL_SIG} \ No newline at end of file diff --git a/phpBB/language/lang_finnish/email/admin_welcome_inactive.tpl b/phpBB/language/lang_finnish/email/admin_welcome_inactive.tpl index 4aaf24ecc7..07e7ac23a3 100644 --- a/phpBB/language/lang_finnish/email/admin_welcome_inactive.tpl +++ b/phpBB/language/lang_finnish/email/admin_welcome_inactive.tpl @@ -1,18 +1,19 @@ -Subject: Tervetuloa {SITENAME} Foorumeihin - -{WELCOME_MSG} - -Ole hyvд ja sдilytд tдmд viesti. Kдyttдjдtietosi ovat seuraavanlaiset: - ----------------------------- -Kдyttдjдtunnus: {USERNAME} -Salasana: {PASSWORD} ----------------------------- - -Kдyttдjдtunnustasi ei ole vielд aktivoitu. Yllдpidon on aktivoitava kдyttдjдtunnuksesi ennen kuin voit kirjautua jдrjestelmддn. Saat toisen sдhkцpostin kun aktivointi on tapahtunut. - -Pyydдmme, ettд et unohda salasanaasi. Salasana on kryptattu tietokantaamme emmekд voi selvittдд sitд sinulle. Jos kuitenkin unohdat salasanasi niin voit pyytдд uutta joka aktivoidaan samalla tavalla kuin tдmд. - -Kiitoksia rekisterцitymisestд. - +Subject: Tervetuloa {SITENAME} Foorumeihin +Charset: iso-8859-1 + +{WELCOME_MSG} + +Ole hyvд ja sдilytд tдmд viesti. Kдyttдjдtietosi ovat seuraavanlaiset: + +---------------------------- +Kдyttдjдtunnus: {USERNAME} +Salasana: {PASSWORD} +---------------------------- + +Kдyttдjдtunnustasi ei ole vielд aktivoitu. Yllдpidon on aktivoitava kдyttдjдtunnuksesi ennen kuin voit kirjautua jдrjestelmддn. Saat toisen sдhkцpostin kun aktivointi on tapahtunut. + +Pyydдmme, ettд et unohda salasanaasi. Salasana on kryptattu tietokantaamme emmekд voi selvittдд sitд sinulle. Jos kuitenkin unohdat salasanasi niin voit pyytдд uutta joka aktivoidaan samalla tavalla kuin tдmд. + +Kiitoksia rekisterцitymisestд. + {EMAIL_SIG} \ No newline at end of file diff --git a/phpBB/language/lang_finnish/email/coppa_welcome_inactive.tpl b/phpBB/language/lang_finnish/email/coppa_welcome_inactive.tpl index a4b18c218e..fa727ceb89 100644 --- a/phpBB/language/lang_finnish/email/coppa_welcome_inactive.tpl +++ b/phpBB/language/lang_finnish/email/coppa_welcome_inactive.tpl @@ -1,4 +1,5 @@ Subject: Tervetuloa {SITENAME} Foorumeihin +Charset: iso-8859-1 {WELCOME_MSG} diff --git a/phpBB/language/lang_finnish/email/group_added.tpl b/phpBB/language/lang_finnish/email/group_added.tpl index 7504de23b0..ad7b9c7be9 100644 --- a/phpBB/language/lang_finnish/email/group_added.tpl +++ b/phpBB/language/lang_finnish/email/group_added.tpl @@ -1,11 +1,12 @@ -Subject: Sinut on lisдtty tдhдn kдyttдjдryhmддn - -Onneksi olkoon, - -Sinut on lisдtty ryhmддn "{GROUP_NAME}" sivustolla {SITENAME}. -Toimenpiteen on tehnyt ryhmдn moderaattori tai jдrjestelmдn yllдpitдjд. Ota yhteys heihin, jos tarvitset lisдtietoja. - -Voit katsella ryhmдn tietoja tддllд: -{U_GROUPCP} - -{EMAIL_SIG} +Subject: Sinut on lisдtty tдhдn kдyttдjдryhmддn +Charset: iso-8859-1 + +Onneksi olkoon, + +Sinut on lisдtty ryhmддn "{GROUP_NAME}" sivustolla {SITENAME}. +Toimenpiteen on tehnyt ryhmдn moderaattori tai jдrjestelmдn yllдpitдjд. Ota yhteys heihin, jos tarvitset lisдtietoja. + +Voit katsella ryhmдn tietoja tддllд: +{U_GROUPCP} + +{EMAIL_SIG} diff --git a/phpBB/language/lang_finnish/email/group_approved.tpl b/phpBB/language/lang_finnish/email/group_approved.tpl index 0551870dca..d83ca22057 100644 --- a/phpBB/language/lang_finnish/email/group_approved.tpl +++ b/phpBB/language/lang_finnish/email/group_approved.tpl @@ -1,4 +1,5 @@ Subject: Hakemuksesi on hyvдksytty +Charset: iso-8859-1 Onneksi olkoon, diff --git a/phpBB/language/lang_finnish/email/group_request.tpl b/phpBB/language/lang_finnish/email/group_request.tpl index 7d816cd69a..6b459131b8 100644 --- a/phpBB/language/lang_finnish/email/group_request.tpl +++ b/phpBB/language/lang_finnish/email/group_request.tpl @@ -1,10 +1,11 @@ -Subject: Ryhmддn on tehty jдseneksi liittymispyyntц - -Arvoisa {GROUP_MODERATOR}, - -Kдyttдjд on pyytдnyt lupaa liittyд ryhmддn, jonka moderaattori sinд olet sivustolla {SITENAME}. -Hyvдksyдksesi tai hylдtдksesi pyyntц kдy seuraavassa linkissд: - -{U_GROUPCP} - -{EMAIL_SIG} +Subject: Ryhmддn on tehty jдseneksi liittymispyyntц +Charset: iso-8859-1 + +Arvoisa {GROUP_MODERATOR}, + +Kдyttдjд on pyytдnyt lupaa liittyд ryhmддn, jonka moderaattori sinд olet sivustolla {SITENAME}. +Hyvдksyдksesi tai hylдtдksesi pyyntц kдy seuraavassa linkissд: + +{U_GROUPCP} + +{EMAIL_SIG} diff --git a/phpBB/language/lang_finnish/email/privmsg_notify.tpl b/phpBB/language/lang_finnish/email/privmsg_notify.tpl index bbe3ff6e38..863bb3c4cf 100644 --- a/phpBB/language/lang_finnish/email/privmsg_notify.tpl +++ b/phpBB/language/lang_finnish/email/privmsg_notify.tpl @@ -1,4 +1,5 @@ Subject: Uusi yksityinen viesti on saapunut +Charset: iso-8859-1 Tervehdys {USERNAME}, diff --git a/phpBB/language/lang_finnish/email/profile_send_email.tpl b/phpBB/language/lang_finnish/email/profile_send_email.tpl index 4213bf359f..6aa3fff7e9 100644 --- a/phpBB/language/lang_finnish/email/profile_send_email.tpl +++ b/phpBB/language/lang_finnish/email/profile_send_email.tpl @@ -1,3 +1,5 @@ +Charset: iso-8859-1 + Tervehdys {TO_USERNAME}, Seuraavan sдhkцpostiviestin lдhettдnyt sinulle {FROM_USERNAME} sivustolta {SITENAME}. Jos tдmд viesti on roskapostia, sisдltдд loukkaavaa materiaalia tai on muuten epдasiallinen, ole hyvд ja ota yhteyttд sivuston webmasteriin seuraavassa osoitteessa: diff --git a/phpBB/language/lang_finnish/email/topic_notify.tpl b/phpBB/language/lang_finnish/email/topic_notify.tpl index 34f4e57228..89a2b6bb00 100644 --- a/phpBB/language/lang_finnish/email/topic_notify.tpl +++ b/phpBB/language/lang_finnish/email/topic_notify.tpl @@ -1,4 +1,5 @@ Subject: Ilmoitus vastauksesta aiheeseen - {TOPIC_TITLE} +Charset: iso-8859-1 Tervehdys {USERNAME}, diff --git a/phpBB/language/lang_finnish/email/user_activate.tpl b/phpBB/language/lang_finnish/email/user_activate.tpl index 1bf7906d91..0f90f4b3bc 100644 --- a/phpBB/language/lang_finnish/email/user_activate.tpl +++ b/phpBB/language/lang_finnish/email/user_activate.tpl @@ -1,4 +1,5 @@ Subject: Aktivoi uudelleen kдyttдjдtunnuksesi! +Charset: iso-8859-1 Tervehdys {USERNAME}, diff --git a/phpBB/language/lang_finnish/email/user_activate_passwd.tpl b/phpBB/language/lang_finnish/email/user_activate_passwd.tpl index 1bc73ed0dd..07f84c66b2 100644 --- a/phpBB/language/lang_finnish/email/user_activate_passwd.tpl +++ b/phpBB/language/lang_finnish/email/user_activate_passwd.tpl @@ -1,17 +1,18 @@ -Subject: Uuden salasanan aktivointi - -Tervehdys {USERNAME} - -Saat tдmдn sдhkцpostin koska olet (tai joku joka vдittдд olevansa sinд) pyytдnyt uutta salasanaa lдhetettдvдksi kдyttдjдtunnuksellesi sivustolla {SITENAME}. Jos et pyytдnyt tдtд sдhkцpostia, дlд piittaa tдstд. Jos saat tдmдn toistuvasti ota yhteys jдrjestelmдn yllдpitoon. - -Voidaksesi kдyttдд uutta salasanaa on sinun aktivoitava se. Tehdдksesi se klikkaa linkkiд alapuolella. - -{U_ACTIVATE} - -Jos aktivointi onnistuu voi kirjautua uudella salasanalla: - -Salasana: {PASSWORD} - -Voit tietysti muuttaa tдtд salasanaa kдyttдjдtiedoissasi. Mikдli koet tдssд vaikeuksia ota yhteys jдrjestelmдn yllдpitoon. - +Subject: Uuden salasanan aktivointi +Charset: iso-8859-1 + +Tervehdys {USERNAME} + +Saat tдmдn sдhkцpostin koska olet (tai joku joka vдittдд olevansa sinд) pyytдnyt uutta salasanaa lдhetettдvдksi kдyttдjдtunnuksellesi sivustolla {SITENAME}. Jos et pyytдnyt tдtд sдhkцpostia, дlд piittaa tдstд. Jos saat tдmдn toistuvasti ota yhteys jдrjestelmдn yllдpitoon. + +Voidaksesi kдyttдд uutta salasanaa on sinun aktivoitava se. Tehdдksesi se klikkaa linkkiд alapuolella. + +{U_ACTIVATE} + +Jos aktivointi onnistuu voi kirjautua uudella salasanalla: + +Salasana: {PASSWORD} + +Voit tietysti muuttaa tдtд salasanaa kдyttдjдtiedoissasi. Mikдli koet tдssд vaikeuksia ota yhteys jдrjestelmдn yllдpitoon. + {EMAIL_SIG} \ No newline at end of file diff --git a/phpBB/language/lang_finnish/email/user_welcome.tpl b/phpBB/language/lang_finnish/email/user_welcome.tpl index 7a70efb5f0..7c5d969f43 100644 --- a/phpBB/language/lang_finnish/email/user_welcome.tpl +++ b/phpBB/language/lang_finnish/email/user_welcome.tpl @@ -1,16 +1,17 @@ -Subject: Tervetuloa {SITENAME} Foorumeihin - -{WELCOME_MSG} - -Ole hyvд ja talleta tдmд sдhkцposti. Kдyttдjдtietosi ovat seuraavat: - ----------------------------- -Kдyttдjдtunnus: {USERNAME} -Salasana: {PASSWORD} ----------------------------- - -Pyydдmme, ettд et unohda salasanaa. Salasana on kryptattu tietokantaamme, emmekд voi selvittдд sitд sinulle. Jos kuitenkin unohdat salasanasi, voit pyytдд uutta, joka aktivoidaan kuten tдmдkin. - -Kiitoksia rekisterцitymisestд. - +Subject: Tervetuloa {SITENAME} Foorumeihin +Charset: iso-8859-1 + +{WELCOME_MSG} + +Ole hyvд ja talleta tдmд sдhkцposti. Kдyttдjдtietosi ovat seuraavat: + +---------------------------- +Kдyttдjдtunnus: {USERNAME} +Salasana: {PASSWORD} +---------------------------- + +Pyydдmme, ettд et unohda salasanaa. Salasana on kryptattu tietokantaamme, emmekд voi selvittдд sitд sinulle. Jos kuitenkin unohdat salasanasi, voit pyytдд uutta, joka aktivoidaan kuten tдmдkin. + +Kiitoksia rekisterцitymisestд. + {EMAIL_SIG} \ No newline at end of file diff --git a/phpBB/language/lang_finnish/email/user_welcome_inactive.tpl b/phpBB/language/lang_finnish/email/user_welcome_inactive.tpl index edff9546fb..f85e1fa8b5 100644 --- a/phpBB/language/lang_finnish/email/user_welcome_inactive.tpl +++ b/phpBB/language/lang_finnish/email/user_welcome_inactive.tpl @@ -1,20 +1,21 @@ -Subject: Tervetuloa {SITENAME} Foorumeihin - -{WELCOME_MSG} - -Ole hyvд ja tallenna tдmд sдhkцposti. Kдyttдjдtietosi ovat seuraavat: - ----------------------------- -Kдyttдjдtunnus: {USERNAME} -Salasana: {PASSWORD} ----------------------------- - -Kдyttдjдtietojasi ei ole aktivoitu. Et voi kдyttдд niitд ennen kuin kдyt seuraavassa linkissд: - -{U_ACTIVATE} - -Pyydдmme, ettд et unohda salasanaasi. Salasana on kryptattu tietokantaamme, emmekд voi selvittдд sitд sinulle. Jos kuitenkin unohdat salasanasi voit pyytдд uutta, joka aktivoidaan kuten tдmд. - -Kiitoksia rekisterцitymisestд. - +Subject: Tervetuloa {SITENAME} Foorumeihin +Charset: iso-8859-1 + +{WELCOME_MSG} + +Ole hyvд ja tallenna tдmд sдhkцposti. Kдyttдjдtietosi ovat seuraavat: + +---------------------------- +Kдyttдjдtunnus: {USERNAME} +Salasana: {PASSWORD} +---------------------------- + +Kдyttдjдtietojasi ei ole aktivoitu. Et voi kдyttдд niitд ennen kuin kдyt seuraavassa linkissд: + +{U_ACTIVATE} + +Pyydдmme, ettд et unohda salasanaasi. Salasana on kryptattu tietokantaamme, emmekд voi selvittдд sitд sinulle. Jos kuitenkin unohdat salasanasi voit pyytдд uutta, joka aktivoidaan kuten tдmд. + +Kiitoksia rekisterцitymisestд. + {EMAIL_SIG} \ No newline at end of file diff --git a/phpBB/language/lang_french/email/admin_activate.tpl b/phpBB/language/lang_french/email/admin_activate.tpl index 0e3bad096e..d39053271a 100644 --- a/phpBB/language/lang_french/email/admin_activate.tpl +++ b/phpBB/language/lang_french/email/admin_activate.tpl @@ -1,4 +1,5 @@ Subject: Nouveau compte utilisateur +Charset: ISO-8859-1 Hello, diff --git a/phpBB/language/lang_french/email/admin_send_email.tpl b/phpBB/language/lang_french/email/admin_send_email.tpl index ad954be7a0..4b2726509d 100644 --- a/phpBB/language/lang_french/email/admin_send_email.tpl +++ b/phpBB/language/lang_french/email/admin_send_email.tpl @@ -1,3 +1,5 @@ +Charset: ISO-8859-1 + Ce qui suit est un email qui vous a йtй envoyй par un administrateur de "{SITENAME}". Si ce message est du spam, contient des commentaires abusifs ou autre chose que vous trouvez offensif, veuillez contacter le webmestre de ce forum а l'adresse suivante: {BOARD_EMAIL} diff --git a/phpBB/language/lang_french/email/admin_welcome_activated.tpl b/phpBB/language/lang_french/email/admin_welcome_activated.tpl index 44fac32406..a02cf1b7fb 100644 --- a/phpBB/language/lang_french/email/admin_welcome_activated.tpl +++ b/phpBB/language/lang_french/email/admin_welcome_activated.tpl @@ -1,4 +1,5 @@ Subject: Compte activй +Charset: ISO-8859-1 Hello {USERNAME}, diff --git a/phpBB/language/lang_french/email/admin_welcome_inactive.tpl b/phpBB/language/lang_french/email/admin_welcome_inactive.tpl index 868d09aaae..fc9651d405 100644 --- a/phpBB/language/lang_french/email/admin_welcome_inactive.tpl +++ b/phpBB/language/lang_french/email/admin_welcome_inactive.tpl @@ -1,4 +1,5 @@ Subject: Bienvenue sur les forums de {SITENAME} +Charset: ISO-8859-1 {WELCOME_MSG} diff --git a/phpBB/language/lang_french/email/coppa_welcome_inactive.tpl b/phpBB/language/lang_french/email/coppa_welcome_inactive.tpl index e9256ae970..b485175067 100644 --- a/phpBB/language/lang_french/email/coppa_welcome_inactive.tpl +++ b/phpBB/language/lang_french/email/coppa_welcome_inactive.tpl @@ -1,4 +1,5 @@ Subject: Bienvenue sur les forums de {SITENAME} +Charset: ISO-8859-1 {WELCOME_MSG} diff --git a/phpBB/language/lang_french/email/group_added.tpl b/phpBB/language/lang_french/email/group_added.tpl index be04eface1..ec96aca1b2 100644 --- a/phpBB/language/lang_french/email/group_added.tpl +++ b/phpBB/language/lang_french/email/group_added.tpl @@ -1,4 +1,5 @@ Subject: Vous avez йtй ajoutй а un groupe +Charset: ISO-8859-1 Fйlicitations, diff --git a/phpBB/language/lang_french/email/group_approved.tpl b/phpBB/language/lang_french/email/group_approved.tpl index fec9dd70e5..2040526335 100644 --- a/phpBB/language/lang_french/email/group_approved.tpl +++ b/phpBB/language/lang_french/email/group_approved.tpl @@ -1,4 +1,5 @@ Subject: Votre demande a йtй approuvйe +Charset: ISO-8859-1 Fйlicitations, diff --git a/phpBB/language/lang_french/email/group_request.tpl b/phpBB/language/lang_french/email/group_request.tpl index 880876508a..447abb84c5 100644 --- a/phpBB/language/lang_french/email/group_request.tpl +++ b/phpBB/language/lang_french/email/group_request.tpl @@ -1,4 +1,5 @@ Subject: Une demande pour rejoindre votre groupe a йtй formulйe +Charset: ISO-8859-1 Cher {GROUP_MODERATOR}, diff --git a/phpBB/language/lang_french/email/privmsg_notify.tpl b/phpBB/language/lang_french/email/privmsg_notify.tpl index 2c70fe5712..03e3e508d3 100644 --- a/phpBB/language/lang_french/email/privmsg_notify.tpl +++ b/phpBB/language/lang_french/email/privmsg_notify.tpl @@ -1,4 +1,5 @@ Subject: Un nouveau message privй vient d'arriver +Charset: ISO-8859-1 Hello {USERNAME}, diff --git a/phpBB/language/lang_french/email/profile_send_email.tpl b/phpBB/language/lang_french/email/profile_send_email.tpl index dfff3a207a..8f81b213d0 100644 --- a/phpBB/language/lang_french/email/profile_send_email.tpl +++ b/phpBB/language/lang_french/email/profile_send_email.tpl @@ -1,3 +1,5 @@ +Charset: ISO-8859-1 + Bonjour {TO_USERNAME}, Ce qui suit est un email qui vous a йtй envoyй par {FROM_USERNAME} depuis votre compte sur {SITENAME}. Si ce message est du spam, contient des commentaires abusifs ou autre chose que vous trouvez offensif, veuillez contacter le webmestre de ce forum а l'adresse suivante: diff --git a/phpBB/language/lang_french/email/topic_notify.tpl b/phpBB/language/lang_french/email/topic_notify.tpl index 8a6ccd4262..528228fdb5 100644 --- a/phpBB/language/lang_french/email/topic_notify.tpl +++ b/phpBB/language/lang_french/email/topic_notify.tpl @@ -1,4 +1,5 @@ Subject: Notification de rйponse au sujet - {TOPIC_TITLE} +Charset: ISO-8859-1 Bonjour {USERNAME}, diff --git a/phpBB/language/lang_french/email/user_activate.tpl b/phpBB/language/lang_french/email/user_activate.tpl index 50e342370f..45ee3f28fb 100644 --- a/phpBB/language/lang_french/email/user_activate.tpl +++ b/phpBB/language/lang_french/email/user_activate.tpl @@ -1,4 +1,5 @@ Subject: Rйactivez votre compte +Charset: ISO-8859-1 Bonjour {USERNAME}, diff --git a/phpBB/language/lang_french/email/user_activate_passwd.tpl b/phpBB/language/lang_french/email/user_activate_passwd.tpl index db07dbff29..b646056487 100644 --- a/phpBB/language/lang_french/email/user_activate_passwd.tpl +++ b/phpBB/language/lang_french/email/user_activate_passwd.tpl @@ -1,4 +1,5 @@ Subject: Activation du nouveau mot de passe +Charset: ISO-8859-1 Bonjour {USERNAME} diff --git a/phpBB/language/lang_french/email/user_welcome.tpl b/phpBB/language/lang_french/email/user_welcome.tpl index ea794b0e99..29b86df29a 100644 --- a/phpBB/language/lang_french/email/user_welcome.tpl +++ b/phpBB/language/lang_french/email/user_welcome.tpl @@ -1,4 +1,5 @@ Subject: Bienvenue sur les forums de {SITENAME} +Charset: ISO-8859-1 {WELCOME_MSG} diff --git a/phpBB/language/lang_french/email/user_welcome_inactive.tpl b/phpBB/language/lang_french/email/user_welcome_inactive.tpl index 05d2fd143a..76568d6e70 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 @@ +Charset: ISO-8859-1 + {WELCOME_MSG} Veuillez conserver cet email dans vos archives. Les informations concernant votre compte: diff --git a/phpBB/language/lang_german/email/admin_activate.tpl b/phpBB/language/lang_german/email/admin_activate.tpl index 152ad06aa7..5c1d724345 100644 --- a/phpBB/language/lang_german/email/admin_activate.tpl +++ b/phpBB/language/lang_german/email/admin_activate.tpl @@ -1,4 +1,5 @@ Subject: Neuer Benutzeraccount +Charset: iso-8859-1 Hallo! diff --git a/phpBB/language/lang_german/email/admin_send_email.tpl b/phpBB/language/lang_german/email/admin_send_email.tpl index d82980db3c..5aa22f2a13 100644 --- a/phpBB/language/lang_german/email/admin_send_email.tpl +++ b/phpBB/language/lang_german/email/admin_send_email.tpl @@ -1,3 +1,5 @@ +Charset: iso-8859-1 + Die folgende Email erhдltst du von einem Administrator von {SITENAME}. Wenn diese E-Mail unerwьnschten Inhalt (Spam) enthдlt, dann kontaktiere bitte den Webmaster unter: {BOARD_EMAIL} diff --git a/phpBB/language/lang_german/email/admin_welcome_activated.tpl b/phpBB/language/lang_german/email/admin_welcome_activated.tpl index 575f09ec8c..752b6f4527 100644 --- a/phpBB/language/lang_german/email/admin_welcome_activated.tpl +++ b/phpBB/language/lang_german/email/admin_welcome_activated.tpl @@ -1,4 +1,5 @@ Subject: Account aktiviert +Charset: iso-8859-1 Hallo {USERNAME}! diff --git a/phpBB/language/lang_german/email/admin_welcome_inactive.tpl b/phpBB/language/lang_german/email/admin_welcome_inactive.tpl index 5e70a7f6fe..01524afab7 100644 --- a/phpBB/language/lang_german/email/admin_welcome_inactive.tpl +++ b/phpBB/language/lang_german/email/admin_welcome_inactive.tpl @@ -1,4 +1,5 @@ Subject: Willkommen auf {SITENAME} +Charset: iso-8859-1 {WELCOME_MSG} diff --git a/phpBB/language/lang_german/email/coppa_welcome_inactive.tpl b/phpBB/language/lang_german/email/coppa_welcome_inactive.tpl index 1146743bf2..3aa2602e46 100644 --- a/phpBB/language/lang_german/email/coppa_welcome_inactive.tpl +++ b/phpBB/language/lang_german/email/coppa_welcome_inactive.tpl @@ -1,4 +1,5 @@ Subject: Willkommen auf {SITENAME} +Charset: iso-8859-1 {WELCOME_MSG} diff --git a/phpBB/language/lang_german/email/group_added.tpl b/phpBB/language/lang_german/email/group_added.tpl index 36be14a6e2..a246e7e9d3 100644 --- a/phpBB/language/lang_german/email/group_added.tpl +++ b/phpBB/language/lang_german/email/group_added.tpl @@ -1,4 +1,5 @@ Subject: Du bist dieser Gruppe beigetreten +Charset: iso-8859-1 Gratulation, diff --git a/phpBB/language/lang_german/email/group_approved.tpl b/phpBB/language/lang_german/email/group_approved.tpl index ee2ee023a6..4a08b48980 100644 --- a/phpBB/language/lang_german/email/group_approved.tpl +++ b/phpBB/language/lang_german/email/group_approved.tpl @@ -1,4 +1,5 @@ Subject: Deine Anfrage wurde akzeptiert +Charset: iso-8859-1 Gratulation, diff --git a/phpBB/language/lang_german/email/group_request.tpl b/phpBB/language/lang_german/email/group_request.tpl index 0a1d2b4685..4b79d323a9 100644 --- a/phpBB/language/lang_german/email/group_request.tpl +++ b/phpBB/language/lang_german/email/group_request.tpl @@ -1,4 +1,5 @@ Subject: Eine Anfrage zum Beitritt in diese Gruppe wurde erstellt +Charset: iso-8859-1 Hallo {GROUP_MODERATOR}! diff --git a/phpBB/language/lang_german/email/privmsg_notify.tpl b/phpBB/language/lang_german/email/privmsg_notify.tpl index 4cada24bf9..13652d39fa 100644 --- a/phpBB/language/lang_german/email/privmsg_notify.tpl +++ b/phpBB/language/lang_german/email/privmsg_notify.tpl @@ -1,4 +1,5 @@ Subject: Eine neue Private Nachricht ist eingetroffen +Charset: iso-8859-1 Hallo {USERNAME}! diff --git a/phpBB/language/lang_german/email/profile_send_email.tpl b/phpBB/language/lang_german/email/profile_send_email.tpl index 7cf421666b..13e410ed98 100644 --- a/phpBB/language/lang_german/email/profile_send_email.tpl +++ b/phpBB/language/lang_german/email/profile_send_email.tpl @@ -1,3 +1,5 @@ +Charset: iso-8859-1 + Hallo {TO_USERNAME}! Die folgende E-Mail wurde von {FROM_USERNAME} ьber deinen Account auf {SITENAME} gesendet. Wenn diese E-Mail unerwьnschten Inhalt (Spam) enthдlt, dann kontaktiere bitte den Administrator unter: diff --git a/phpBB/language/lang_german/email/topic_notify.tpl b/phpBB/language/lang_german/email/topic_notify.tpl index cc852c0b83..5c5b4e326a 100644 --- a/phpBB/language/lang_german/email/topic_notify.tpl +++ b/phpBB/language/lang_german/email/topic_notify.tpl @@ -1,4 +1,5 @@ Subject: Benachrichtigen bei Antworten - {TOPIC_TITLE} +Charset: iso-8859-1 Hallo {USERNAME}! diff --git a/phpBB/language/lang_german/email/user_activate.tpl b/phpBB/language/lang_german/email/user_activate.tpl index b3a231b48e..c2e2ed2be5 100644 --- a/phpBB/language/lang_german/email/user_activate.tpl +++ b/phpBB/language/lang_german/email/user_activate.tpl @@ -1,4 +1,5 @@ Subject: Account wieder aktivieren! +Charset: iso-8859-1 Hallo {USERNAME}! diff --git a/phpBB/language/lang_german/email/user_activate_passwd.tpl b/phpBB/language/lang_german/email/user_activate_passwd.tpl index b65d7307e7..e49f95745d 100644 --- a/phpBB/language/lang_german/email/user_activate_passwd.tpl +++ b/phpBB/language/lang_german/email/user_activate_passwd.tpl @@ -1,4 +1,5 @@ Subject: Aktivierung des neuen Passwortes +Charset: iso-8859-1 Hallo {USERNAME}! diff --git a/phpBB/language/lang_german/email/user_welcome.tpl b/phpBB/language/lang_german/email/user_welcome.tpl index 4f472321d1..5684405700 100644 --- a/phpBB/language/lang_german/email/user_welcome.tpl +++ b/phpBB/language/lang_german/email/user_welcome.tpl @@ -1,4 +1,5 @@ Subject: Willkommen auf {SITENAME} +Charset: iso-8859-1 {WELCOME_MSG} diff --git a/phpBB/language/lang_german/email/user_welcome_inactive.tpl b/phpBB/language/lang_german/email/user_welcome_inactive.tpl index 7b24397efa..6db29e767a 100644 --- a/phpBB/language/lang_german/email/user_welcome_inactive.tpl +++ b/phpBB/language/lang_german/email/user_welcome_inactive.tpl @@ -1,4 +1,5 @@ Subject: Willkommen auf {SITENAME} +Charset: iso-8859-1 {WELCOME_MSG} diff --git a/phpBB/language/lang_greek/email/admin_activate.tpl b/phpBB/language/lang_greek/email/admin_activate.tpl index 3fa082f190..6f67bc3c10 100644 --- a/phpBB/language/lang_greek/email/admin_activate.tpl +++ b/phpBB/language/lang_greek/email/admin_activate.tpl @@ -1,9 +1,10 @@ -Subject: Лпгбсйбумьт нЭпх чсЮуфз - -Гейб убт, - -П лпгбсйбумьт п прпЯпт бнЮкей уфпн чсЮуфз "{USERNAME}" Эчей бренесгпрпйзиеЯ Ю мьлйт дзмйпхсгЮизке, рсЭрей нб елЭгоефе фб уфпйчеЯб бхфпэ фпх чсЮуфз (еЬн чсейЬжефбй) кбй енесгпрпйЮуфе фпн чсзуймпрпйюнфбт фзн бкьлпхиз дйбдспмЮ: - -{U_ACTIVATE} - +Subject: Лпгбсйбумьт нЭпх чсЮуфз +Charset: iso-8859-7 + +Гейб убт, + +П лпгбсйбумьт п прпЯпт бнЮкей уфпн чсЮуфз "{USERNAME}" Эчей бренесгпрпйзиеЯ Ю мьлйт дзмйпхсгЮизке, рсЭрей нб елЭгоефе фб уфпйчеЯб бхфпэ фпх чсЮуфз (еЬн чсейЬжефбй) кбй енесгпрпйЮуфе фпн чсзуймпрпйюнфбт фзн бкьлпхиз дйбдспмЮ: + +{U_ACTIVATE} + {EMAIL_SIG} \ No newline at end of file diff --git a/phpBB/language/lang_greek/email/admin_send_email.tpl b/phpBB/language/lang_greek/email/admin_send_email.tpl index a8541a82f5..ae784d9a4a 100644 --- a/phpBB/language/lang_greek/email/admin_send_email.tpl +++ b/phpBB/language/lang_greek/email/admin_send_email.tpl @@ -1,3 +1,5 @@ +Charset: iso-8859-7 + Фп бкьлпхип еЯнбй Энб мЮнхмб фп прпЯп убт Эчей брпуфеЯлей Энбн дйбчейсйуфЮ фпх "{SITENAME}". ЕЬн фп мЮнхмб бхфь еЯнбй бнерйиэмзфп ме енпчлзфйкь Ю кбй рспувлзфйкь ресйечьменп убт рбсбкблю ерйкпйнщнЮуфе ме фпн webmaster фзт Д.УхжЮфзузт уфзн бкьлпхиз дйеэихнуз: {BOARD_EMAIL} diff --git a/phpBB/language/lang_greek/email/admin_welcome_activated.tpl b/phpBB/language/lang_greek/email/admin_welcome_activated.tpl index c35f24a3f0..2156afe1f8 100644 --- a/phpBB/language/lang_greek/email/admin_welcome_activated.tpl +++ b/phpBB/language/lang_greek/email/admin_welcome_activated.tpl @@ -1,4 +1,5 @@ Subject: П лпгбсйбумьт ЕнесгпрпйЮизке +Charset: iso-8859-7 Гейб убт {USERNAME}, diff --git a/phpBB/language/lang_greek/email/admin_welcome_inactive.tpl b/phpBB/language/lang_greek/email/admin_welcome_inactive.tpl index 71e4a5e160..00173fe9b5 100644 --- a/phpBB/language/lang_greek/email/admin_welcome_inactive.tpl +++ b/phpBB/language/lang_greek/email/admin_welcome_inactive.tpl @@ -1,4 +1,5 @@ Subject: Фп {SITENAME} убт кблщупсЯжей уфзн дзмьуйб ухжЮфзуз фпх +Charset: iso-8859-7 {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 bd97abaa29..7c1449d3d3 100644 --- a/phpBB/language/lang_greek/email/coppa_welcome_inactive.tpl +++ b/phpBB/language/lang_greek/email/coppa_welcome_inactive.tpl @@ -1,4 +1,5 @@ Subject: Фп {SITENAME} убт кблщупсЯжей уфзн дзмьуйб ухжЮфзуз фпх +Charset: iso-8859-7 {WELCOME_MSG} diff --git a/phpBB/language/lang_greek/email/group_added.tpl b/phpBB/language/lang_greek/email/group_added.tpl index 4634560a9e..c6cdf71756 100644 --- a/phpBB/language/lang_greek/email/group_added.tpl +++ b/phpBB/language/lang_greek/email/group_added.tpl @@ -1,4 +1,5 @@ Subject: ёчефе рспуфеиеЯ уфзн лЯуфб чсзуфюн бхфЮт фзт пмЬдбт +Charset: iso-8859-7 УхгчбсзфЮсйб, diff --git a/phpBB/language/lang_greek/email/group_approved.tpl b/phpBB/language/lang_greek/email/group_approved.tpl index ab6934ddff..ec9f30263a 100644 --- a/phpBB/language/lang_greek/email/group_approved.tpl +++ b/phpBB/language/lang_greek/email/group_approved.tpl @@ -1,4 +1,5 @@ Subject: З бЯфзуз убт егксЯизке +Charset: iso-8859-7 УхгчбсзфЮсйб, diff --git a/phpBB/language/lang_greek/email/group_request.tpl b/phpBB/language/lang_greek/email/group_request.tpl index 5062579e28..92df8df3c0 100644 --- a/phpBB/language/lang_greek/email/group_request.tpl +++ b/phpBB/language/lang_greek/email/group_request.tpl @@ -1,4 +1,5 @@ Subject: ёлЮциз бЯфзуз Энфбозт уфзн пмЬдб убт +Charset: iso-8859-7 БгбрзфЭ-з {GROUP_MODERATOR}, diff --git a/phpBB/language/lang_greek/email/privmsg_notify.tpl b/phpBB/language/lang_greek/email/privmsg_notify.tpl index d23ef9637a..9966d8c80b 100644 --- a/phpBB/language/lang_greek/email/privmsg_notify.tpl +++ b/phpBB/language/lang_greek/email/privmsg_notify.tpl @@ -1,4 +1,5 @@ Subject: ёнб нЭп рспущрйкь мЮнхмб бцЯчиз +Charset: iso-8859-7 Гейб убт {USERNAME}, diff --git a/phpBB/language/lang_greek/email/profile_send_email.tpl b/phpBB/language/lang_greek/email/profile_send_email.tpl index e87aaefd75..a75e79dbd3 100644 --- a/phpBB/language/lang_greek/email/profile_send_email.tpl +++ b/phpBB/language/lang_greek/email/profile_send_email.tpl @@ -1,3 +1,5 @@ +Charset: iso-8859-7 + Гейб убт {TO_USERNAME}, Фп бкьлпхип еЯнбй Энб email брь фпн {FROM_USERNAME} мЭуп фпх лпгбсйбумпэ убт уфп {SITENAME}. ЕЬн фп мЮнхмб бхфь брпфелеЯ еньчлзуз ме рспувлзфйкь Ю бнпэуйп ресйечьменп рбсбкблю ерйкпйнщнЮуфе ме фпн webmaster фпх цьспхм уфзн бкьлпхиз дйеэихнуз: diff --git a/phpBB/language/lang_greek/email/topic_notify.tpl b/phpBB/language/lang_greek/email/topic_notify.tpl index 5ea48a5c84..ce335b832c 100644 --- a/phpBB/language/lang_greek/email/topic_notify.tpl +++ b/phpBB/language/lang_greek/email/topic_notify.tpl @@ -1,4 +1,5 @@ Subject: ГнщуфпрпЯзуз брЬнфзузт уе И.Еньфзфб - {TOPIC_TITLE} +Charset: iso-8859-7 Гейб убт {USERNAME}, diff --git a/phpBB/language/lang_greek/email/user_activate.tpl b/phpBB/language/lang_greek/email/user_activate.tpl index ee6822609f..40f996b793 100644 --- a/phpBB/language/lang_greek/email/user_activate.tpl +++ b/phpBB/language/lang_greek/email/user_activate.tpl @@ -1,4 +1,5 @@ Subject: ЕрбнесгпрпйЮуфе фпн лпгбсйбумь убт ! +Charset: iso-8859-7 Гейб убт {USERNAME}, diff --git a/phpBB/language/lang_greek/email/user_activate_passwd.tpl b/phpBB/language/lang_greek/email/user_activate_passwd.tpl index bf0bba7d70..43ac5848f9 100644 --- a/phpBB/language/lang_greek/email/user_activate_passwd.tpl +++ b/phpBB/language/lang_greek/email/user_activate_passwd.tpl @@ -1,4 +1,5 @@ Subject: ЕнесгпрпЯзуз нЭпх кщдйкпэ +Charset: iso-8859-7 Гейб убт {USERNAME} diff --git a/phpBB/language/lang_greek/email/user_welcome.tpl b/phpBB/language/lang_greek/email/user_welcome.tpl index 44a2088c12..b8c7466ef6 100644 --- a/phpBB/language/lang_greek/email/user_welcome.tpl +++ b/phpBB/language/lang_greek/email/user_welcome.tpl @@ -1,4 +1,5 @@ Subject: Фп {SITENAME} убт кблщупсЯжей уфзн дзмьуйб ухжЮфзуз фпх +Charset: iso-8859-7 {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 88241e5df7..f641bc6b62 100644 --- a/phpBB/language/lang_greek/email/user_welcome_inactive.tpl +++ b/phpBB/language/lang_greek/email/user_welcome_inactive.tpl @@ -1,4 +1,5 @@ Subject: Фп {SITENAME} убт кблщупсЯжей уфзн дзмьуйб ухжЮфзуз фпх +Charset: iso-8859-7 {WELCOME_MSG} diff --git a/phpBB/language/lang_hebrew/email/admin_activate.tpl b/phpBB/language/lang_hebrew/email/admin_activate.tpl index c6061957b4..afa1317936 100644 --- a/phpBB/language/lang_hebrew/email/admin_activate.tpl +++ b/phpBB/language/lang_hebrew/email/admin_activate.tpl @@ -1,4 +1,5 @@ Subject: зщбеп ощъощ згщ +Charset: windows-1255 щмен, diff --git a/phpBB/language/lang_hebrew/email/admin_send_email.tpl b/phpBB/language/lang_hebrew/email/admin_send_email.tpl index 9fa06b5240..3beebb524d 100644 --- a/phpBB/language/lang_hebrew/email/admin_send_email.tpl +++ b/phpBB/language/lang_hebrew/email/admin_send_email.tpl @@ -1,3 +1,5 @@ +Charset: windows-1255 + дгеаш дамчишерй дба рщмз тм-йгй дордм щм "{SITENAME}". ан дегтд же дйа сфан, ан дегтд же олймд тмбереъ ае дтшеъ азшеъ щаъд оеца февтеъ ара цеш чщш ан ордм дмез блъебъ дбад: {BOARD_EMAIL} diff --git a/phpBB/language/lang_hebrew/email/admin_welcome_activated.tpl b/phpBB/language/lang_hebrew/email/admin_welcome_activated.tpl index 883e2296e4..e362c80f21 100644 --- a/phpBB/language/lang_hebrew/email/admin_welcome_activated.tpl +++ b/phpBB/language/lang_hebrew/email/admin_welcome_activated.tpl @@ -1,4 +1,5 @@ Subject: зщбеп дефтм +Charset: windows-1255 щмен {USERNAME}, diff --git a/phpBB/language/lang_hebrew/email/admin_welcome_inactive.tpl b/phpBB/language/lang_hebrew/email/admin_welcome_inactive.tpl index 3accdebc05..0d00efce12 100644 --- a/phpBB/language/lang_hebrew/email/admin_welcome_inactive.tpl +++ b/phpBB/language/lang_hebrew/email/admin_welcome_inactive.tpl @@ -1,4 +1,5 @@ Subject: бшелйн дбайн мфешеой {SITENAME} +Charset: windows-1255 {WELCOME_MSG} diff --git a/phpBB/language/lang_hebrew/email/coppa_welcome_inactive.tpl b/phpBB/language/lang_hebrew/email/coppa_welcome_inactive.tpl index a77c7feb02..7ef085c880 100644 --- a/phpBB/language/lang_hebrew/email/coppa_welcome_inactive.tpl +++ b/phpBB/language/lang_hebrew/email/coppa_welcome_inactive.tpl @@ -1,4 +1,5 @@ Subject: Welcome to {SITENAME} Forums +Charset: windows-1255 {WELCOME_MSG} diff --git a/phpBB/language/lang_hebrew/email/group_added.tpl b/phpBB/language/lang_hebrew/email/group_added.tpl index 27162af455..b2ab854b20 100644 --- a/phpBB/language/lang_hebrew/email/group_added.tpl +++ b/phpBB/language/lang_hebrew/email/group_added.tpl @@ -1,4 +1,5 @@ Subject: цешфъ мчбецъ дощъощйн дже +Charset: windows-1255 бшлеъ, diff --git a/phpBB/language/lang_hebrew/email/group_approved.tpl b/phpBB/language/lang_hebrew/email/group_approved.tpl index bfaf1cab3e..9ac44595f2 100644 --- a/phpBB/language/lang_hebrew/email/group_approved.tpl +++ b/phpBB/language/lang_hebrew/email/group_approved.tpl @@ -1,4 +1,5 @@ Subject: бчщък аещшд +Charset: windows-1255 бшлеъ, diff --git a/phpBB/language/lang_hebrew/email/group_request.tpl b/phpBB/language/lang_hebrew/email/group_request.tpl index 3b7b7ce393..27c6f66359 100644 --- a/phpBB/language/lang_hebrew/email/group_request.tpl +++ b/phpBB/language/lang_hebrew/email/group_request.tpl @@ -1,4 +1,5 @@ Subject: ртщъд бчщд мдцишфеъ мчбецд щмк +Charset: windows-1255 млбег {GROUP_MODERATOR}, diff --git a/phpBB/language/lang_hebrew/email/privmsg_notify.tpl b/phpBB/language/lang_hebrew/email/privmsg_notify.tpl index f4f9defa5c..788c3f985e 100644 --- a/phpBB/language/lang_hebrew/email/privmsg_notify.tpl +++ b/phpBB/language/lang_hebrew/email/privmsg_notify.tpl @@ -1,4 +1,5 @@ Subject: дегтд фшийъ згщд двйтд +Charset: windows-1255 щмен {USERNAME}, diff --git a/phpBB/language/lang_hebrew/email/profile_send_email.tpl b/phpBB/language/lang_hebrew/email/profile_send_email.tpl index d654cd56ed..58a7d8903f 100644 --- a/phpBB/language/lang_hebrew/email/profile_send_email.tpl +++ b/phpBB/language/lang_hebrew/email/profile_send_email.tpl @@ -1,3 +1,5 @@ +Charset: windows-1255 + щмен {TO_USERNAME}, долъб дба деа геаш амчишерй щрщмз амйк тм-йгй {FROM_USERNAME} гшк дзщбеп щмк б {SITENAME}. ан дегтд же дйрд дцфд, олймд тмбереъ ае дтшеъ азшеъ щаъд оеца февтеъ ара цеш чщш тн ордм дмез блъебъ дбад: diff --git a/phpBB/language/lang_hebrew/email/topic_notify.tpl b/phpBB/language/lang_hebrew/email/topic_notify.tpl index d6c2d20e2e..dbd5c76ecf 100644 --- a/phpBB/language/lang_hebrew/email/topic_notify.tpl +++ b/phpBB/language/lang_hebrew/email/topic_notify.tpl @@ -1,4 +1,5 @@ Subject: дегтд тм ъвебд мреща - {TOPIC_TITLE} +Charset: windows-1255 щмен {USERNAME}, diff --git a/phpBB/language/lang_hebrew/email/user_activate.tpl b/phpBB/language/lang_hebrew/email/user_activate.tpl index e4861b6bcb..2407619326 100644 --- a/phpBB/language/lang_hebrew/email/user_activate.tpl +++ b/phpBB/language/lang_hebrew/email/user_activate.tpl @@ -1,4 +1,5 @@ Subject: дфтм озгщ аъ дзщбеп щмк +Charset: windows-1255 щмен {USERNAME}, diff --git a/phpBB/language/lang_hebrew/email/user_activate_passwd.tpl b/phpBB/language/lang_hebrew/email/user_activate_passwd.tpl index f62314b632..d8ce505bef 100644 --- a/phpBB/language/lang_hebrew/email/user_activate_passwd.tpl +++ b/phpBB/language/lang_hebrew/email/user_activate_passwd.tpl @@ -1,4 +1,5 @@ Subject: дфтмъ сйсод згщд +Charset: windows-1255 щмен {USERNAME} diff --git a/phpBB/language/lang_hebrew/email/user_welcome.tpl b/phpBB/language/lang_hebrew/email/user_welcome.tpl index d35b318afd..948b7496d1 100644 --- a/phpBB/language/lang_hebrew/email/user_welcome.tpl +++ b/phpBB/language/lang_hebrew/email/user_welcome.tpl @@ -1,4 +1,5 @@ Subject: бшелйн дбайн мфешеой {SITENAME} +Charset: windows-1255 {WELCOME_MSG} diff --git a/phpBB/language/lang_hebrew/email/user_welcome_inactive.tpl b/phpBB/language/lang_hebrew/email/user_welcome_inactive.tpl index 406b2090ab..86e497541b 100644 --- a/phpBB/language/lang_hebrew/email/user_welcome_inactive.tpl +++ b/phpBB/language/lang_hebrew/email/user_welcome_inactive.tpl @@ -1,4 +1,5 @@ Subject: бшелйн дбайн мфешеой {SITENAME} +Charset: windows-1255 {WELCOME_MSG} diff --git a/phpBB/language/lang_hebrew/lang_main.php b/phpBB/language/lang_hebrew/lang_main.php index c5d8d59124..c5286f3d75 100644 --- a/phpBB/language/lang_hebrew/lang_main.php +++ b/phpBB/language/lang_hebrew/lang_main.php @@ -32,10 +32,10 @@ // //setlocale(LC_ALL, "he_IL"); -$lang['ENCODING'] = "WINDOWS-1255"; -$lang['DIRECTION'] = "RTL"; -$lang['LEFT'] = "RIGHT"; -$lang['RIGHT'] = "LEFT"; +$lang['ENCODING'] = "windows-1255"; +$lang['DIRECTION'] = "rtl"; +$lang['LEFT'] = "right"; +$lang['RIGHT'] = "left"; $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_hungarian/email/admin_activate.tpl b/phpBB/language/lang_hungarian/email/admin_activate.tpl index eb4d068c48..fe3a9cfa72 100644 --- a/phpBB/language/lang_hungarian/email/admin_activate.tpl +++ b/phpBB/language/lang_hungarian/email/admin_activate.tpl @@ -1,9 +1,10 @@ -Subject: Ъj felhasznбlуi azonosнtу - -Hellу, - -A "{USERNAME}" azonosнtу deaktivбlva lett, vagy most lett lйtrehozva. Tekintse meg a felhasznбlу adatait (ha szьksйges) йs aktivбlja az alбbbi weboldal felkeresйsйvel: - -{U_ACTIVATE} - -{EMAIL_SIG} +Subject: Ъj felhasznбlуi azonosнtу +Charset: iso-8859-2 + +Hellу, + +A "{USERNAME}" azonosнtу deaktivбlva lett, vagy most lett lйtrehozva. Tekintse meg a felhasznбlу adatait (ha szьksйges) йs aktivбlja az alбbbi weboldal felkeresйsйvel: + +{U_ACTIVATE} + +{EMAIL_SIG} diff --git a/phpBB/language/lang_hungarian/email/admin_send_email.tpl b/phpBB/language/lang_hungarian/email/admin_send_email.tpl index 7e037f16f8..974bc70741 100644 --- a/phpBB/language/lang_hungarian/email/admin_send_email.tpl +++ b/phpBB/language/lang_hungarian/email/admin_send_email.tpl @@ -1,11 +1,13 @@ -A kцvetkezх ьzenetet a {SITENAME} fуrum egyik adminisztrбtora kьldte. Ha ez az ьzenet spam, sйrtх, vagy egyйb mуdon nemkнvбnatos, vegye fel a kapcsolatot a fуrum ьzemeltetхivel az alбbbi cнmen: - -{BOARD_EMAIL} - -Csatolja hozzб ezt a levelet (kьlцnцsen a levйl fejlйceit). - -Az ьzenet a kцvetkezх: -~~~~~~~~~~~~~~~~~~~~~~ - -{MESSAGE} - +Charset: iso-8859-2 + +A kцvetkezх ьzenetet a {SITENAME} fуrum egyik adminisztrбtora kьldte. Ha ez az ьzenet spam, sйrtх, vagy egyйb mуdon nemkнvбnatos, vegye fel a kapcsolatot a fуrum ьzemeltetхivel az alбbbi cнmen: + +{BOARD_EMAIL} + +Csatolja hozzб ezt a levelet (kьlцnцsen a levйl fejlйceit). + +Az ьzenet a kцvetkezх: +~~~~~~~~~~~~~~~~~~~~~~ + +{MESSAGE} + diff --git a/phpBB/language/lang_hungarian/email/admin_welcome_activated.tpl b/phpBB/language/lang_hungarian/email/admin_welcome_activated.tpl index d5e6b75694..b977cd963c 100644 --- a/phpBB/language/lang_hungarian/email/admin_welcome_activated.tpl +++ b/phpBB/language/lang_hungarian/email/admin_welcome_activated.tpl @@ -1,7 +1,8 @@ -Subject: Azonosнtу aktivбlva - -Hellу {USERNAME}, - -Az azonosнtуja a "{SITENAME}" fуrumon aktivбlva lett, bejelentkezhet azzal a felhasznбlуnйvvel йs jelszуval, amit a korбbbiakban kapott levйlben. - -{EMAIL_SIG} +Subject: Azonosнtу aktivбlva +Charset: iso-8859-2 + +Hellу {USERNAME}, + +Az azonosнtуja a "{SITENAME}" fуrumon aktivбlva lett, bejelentkezhet azzal a felhasznбlуnйvvel йs jelszуval, amit a korбbbiakban kapott levйlben. + +{EMAIL_SIG} diff --git a/phpBB/language/lang_hungarian/email/admin_welcome_inactive.tpl b/phpBB/language/lang_hungarian/email/admin_welcome_inactive.tpl index 7739ba875e..d82c1f6a51 100644 --- a/phpBB/language/lang_hungarian/email/admin_welcome_inactive.tpl +++ b/phpBB/language/lang_hungarian/email/admin_welcome_inactive.tpl @@ -1,18 +1,19 @@ -Subject: Ьdvцzцljьk a {SITENAME} fуrumбn - -{WELCOME_MSG} - -Tartsa meg ezt a levelet, hogy a kйsхbbiekben segнtsйgkйnt felhasznбlhassa. Az azonosнtуjбnak informбciуi az alбbbiak: - ----------------------------- -Felhasznбlуnйv: {USERNAME} -Jelszу: {PASSWORD} ----------------------------- - -Az azonosнtуja jelenleg inaktнv, йs a fуrum adminisztrбtorбnak aktivбlnia kell, mielхtt hasznбlni tudnб. Amennyiben ez megtцrtйnik, levйlben kap rуla йrtesнtйst. - -Kйrjьk, tartsa emlйkezetйben a jelszavбt, mert az adatbбzisunkban kуdolva szerepel, нgy nincs mуd a kйsхbbiekben a felderнtйsйre. Termйszetesen ha elfelejtette, igйnyelhet helyette egy mбsikat, amelyet hasonlуkйppen aktivбlnia kell hasznбlat elхtt. - -Kцszцnjьk a regisztrбlбst! - -{EMAIL_SIG} +Subject: Ьdvцzцljьk a {SITENAME} fуrumбn +Charset: iso-8859-2 + +{WELCOME_MSG} + +Tartsa meg ezt a levelet, hogy a kйsхbbiekben segнtsйgkйnt felhasznбlhassa. Az azonosнtуjбnak informбciуi az alбbbiak: + +---------------------------- +Felhasznбlуnйv: {USERNAME} +Jelszу: {PASSWORD} +---------------------------- + +Az azonosнtуja jelenleg inaktнv, йs a fуrum adminisztrбtorбnak aktivбlnia kell, mielхtt hasznбlni tudnб. Amennyiben ez megtцrtйnik, levйlben kap rуla йrtesнtйst. + +Kйrjьk, tartsa emlйkezetйben a jelszavбt, mert az adatbбzisunkban kуdolva szerepel, нgy nincs mуd a kйsхbbiekben a felderнtйsйre. Termйszetesen ha elfelejtette, igйnyelhet helyette egy mбsikat, amelyet hasonlуkйppen aktivбlnia kell hasznбlat elхtt. + +Kцszцnjьk a regisztrбlбst! + +{EMAIL_SIG} diff --git a/phpBB/language/lang_hungarian/email/coppa_welcome_inactive.tpl b/phpBB/language/lang_hungarian/email/coppa_welcome_inactive.tpl index eda6fb78e8..1110fcc06b 100644 --- a/phpBB/language/lang_hungarian/email/coppa_welcome_inactive.tpl +++ b/phpBB/language/lang_hungarian/email/coppa_welcome_inactive.tpl @@ -1,52 +1,53 @@ -Subject: Ьdvцzцljьk a {SITENAME} fуrumбn - -{WELCOME_MSG} - -A COPPA szabбlyainak йrtelmйben az azonosнtуja jelenleg inaktнv. - -Kйrjьk nyomtassa ki az alбbbi ьzenetet, kйrje meg a szьleit vagy gondviselхjйt, hogy нrja alб, majd kьldje el faxon az alбbbi cнmre: - -{FAX_INFO} - -VAGY kьldje el levйlben: - -{MAIL_INFO} - ------------------------------- CUT HERE ------------------------------ -Engedйly a {SITENAME} fуrumhoz valу csatlakozбshoz - -Felhasznбlуnйv: {USERNAME} -Jelszу: {PASSWORD} -Email: {EMAIL_ADDRESS} - -ICQ Azonosнtу: {ICQ} -AIM Cнm: {AIM} -MSN Messenger: {MSN} -Yahoo Messenger: {YIM} -Web Site: {WEB_SITE} -Feladу: {FROM} -Foglalkozбs: {OCC} -Йrdeklхdйsi kцr: {INTERESTS} - -ELLENХRIZTEM A GYERMEKEM БLTAL MEGADOTT INFORMБCIУKAT, ЙS HOZZБJБRULOK, HOGY AZ ADATOKAT A {SITENAME} FУRUMON TБROLJБK. -EGYETЙRTEK AZZAL, HOGY EZEKET AZ ADATOKAT EGY JELSZУ BEНRБSБVAL BБRMIKOR MEG LEHET VБLTOZTATNI. -EGYETЙRTEK AZZAL, HOGY EZEK AZ ADATOK BБRMIKOR TЦRЦLHETХEK A {SITENAME} FУRUMBУL. - - -Szьlх vagy Gondviselх -(olvashatу nйv): _____________________ - -(alбнrбs): __________________ - -Dбtum: _______________ - ------------------------------- CUT HERE ------------------------------ - - -Amint az adminisztrбtorok megkaptбk a fenti engedйlyt faxon vagy postбn, az azonosнtуjбt aktivбljбk. - -Kйrjьk, tartsa emlйkezetйben a jelszavбt, mert az adatbбzisunkban kуdolva szerepel, нgy nincs mуd a kйsхbbiekben a felderнtйsйre. Termйszetesen ha elfelejtette, igйnyelhet helyette egy mбsikat, amelyet hasonlуkйppen aktivбlnia kell hasznбlat elхtt. - -Kцszцnjьk a regisztrбlбst! - -{EMAIL_SIG} +Subject: Ьdvцzцljьk a {SITENAME} fуrumбn +Charset: iso-8859-2 + +{WELCOME_MSG} + +A COPPA szabбlyainak йrtelmйben az azonosнtуja jelenleg inaktнv. + +Kйrjьk nyomtassa ki az alбbbi ьzenetet, kйrje meg a szьleit vagy gondviselхjйt, hogy нrja alб, majd kьldje el faxon az alбbbi cнmre: + +{FAX_INFO} + +VAGY kьldje el levйlben: + +{MAIL_INFO} + +------------------------------ CUT HERE ------------------------------ +Engedйly a {SITENAME} fуrumhoz valу csatlakozбshoz + +Felhasznбlуnйv: {USERNAME} +Jelszу: {PASSWORD} +Email: {EMAIL_ADDRESS} + +ICQ Azonosнtу: {ICQ} +AIM Cнm: {AIM} +MSN Messenger: {MSN} +Yahoo Messenger: {YIM} +Web Site: {WEB_SITE} +Feladу: {FROM} +Foglalkozбs: {OCC} +Йrdeklхdйsi kцr: {INTERESTS} + +ELLENХRIZTEM A GYERMEKEM БLTAL MEGADOTT INFORMБCIУKAT, ЙS HOZZБJБRULOK, HOGY AZ ADATOKAT A {SITENAME} FУRUMON TБROLJБK. +EGYETЙRTEK AZZAL, HOGY EZEKET AZ ADATOKAT EGY JELSZУ BEНRБSБVAL BБRMIKOR MEG LEHET VБLTOZTATNI. +EGYETЙRTEK AZZAL, HOGY EZEK AZ ADATOK BБRMIKOR TЦRЦLHETХEK A {SITENAME} FУRUMBУL. + + +Szьlх vagy Gondviselх +(olvashatу nйv): _____________________ + +(alбнrбs): __________________ + +Dбtum: _______________ + +------------------------------ CUT HERE ------------------------------ + + +Amint az adminisztrбtorok megkaptбk a fenti engedйlyt faxon vagy postбn, az azonosнtуjбt aktivбljбk. + +Kйrjьk, tartsa emlйkezetйben a jelszavбt, mert az adatbбzisunkban kуdolva szerepel, нgy nincs mуd a kйsхbbiekben a felderнtйsйre. Termйszetesen ha elfelejtette, igйnyelhet helyette egy mбsikat, amelyet hasonlуkйppen aktivбlnia kell hasznбlat elхtt. + +Kцszцnjьk a regisztrбlбst! + +{EMAIL_SIG} diff --git a/phpBB/language/lang_hungarian/email/group_added.tpl b/phpBB/language/lang_hungarian/email/group_added.tpl index a360a3ffd6..7a6c8d1cb8 100644 --- a/phpBB/language/lang_hungarian/email/group_added.tpl +++ b/phpBB/language/lang_hungarian/email/group_added.tpl @@ -1,12 +1,13 @@ -Subject: Sikeresen csatlakozott a csoporthoz - -Gratulбlunk, - -Sikeresen csatlakozott a "{GROUP_NAME}" csoporthoz a {SITENAME} fуrumon. -A csatlakozбst a csoport moderбtora, vagy a fуrum adminisztrбtora kezdemйnyezte. Vegye fel velьk a kapcsolatot tovбbbi informбciуkйrt. - -Csoport tagsбgбrуl tovбbbi informбciуk: -{U_GROUPCP} - -{EMAIL_SIG} - +Subject: Sikeresen csatlakozott a csoporthoz +Charset: iso-8859-2 + +Gratulбlunk, + +Sikeresen csatlakozott a "{GROUP_NAME}" csoporthoz a {SITENAME} fуrumon. +A csatlakozбst a csoport moderбtora, vagy a fуrum adminisztrбtora kezdemйnyezte. Vegye fel velьk a kapcsolatot tovбbbi informбciуkйrt. + +Csoport tagsбgбrуl tovбbbi informбciуk: +{U_GROUPCP} + +{EMAIL_SIG} + diff --git a/phpBB/language/lang_hungarian/email/group_approved.tpl b/phpBB/language/lang_hungarian/email/group_approved.tpl index ed10fdbf85..8b7fd4b7f7 100644 --- a/phpBB/language/lang_hungarian/email/group_approved.tpl +++ b/phpBB/language/lang_hungarian/email/group_approved.tpl @@ -1,11 +1,12 @@ -Subject: A kйrйse elfogadva - -Gratulбlunk, - -A kйrйsйt a "{GROUP_NAME}" csoporthoz valу csatlakozбshoz a {SITENAME} fуrumon elfogadtбk. - -Csoport tagsбgбrуl tovбbbi informбciуk: -{U_GROUPCP} - -{EMAIL_SIG} - +Subject: A kйrйse elfogadva +Charset: iso-8859-2 + +Gratulбlunk, + +A kйrйsйt a "{GROUP_NAME}" csoporthoz valу csatlakozбshoz a {SITENAME} fуrumon elfogadtбk. + +Csoport tagsбgбrуl tovбbbi informбciуk: +{U_GROUPCP} + +{EMAIL_SIG} + diff --git a/phpBB/language/lang_hungarian/email/group_request.tpl b/phpBB/language/lang_hungarian/email/group_request.tpl index 73edaa8343..a1522e5e60 100644 --- a/phpBB/language/lang_hungarian/email/group_request.tpl +++ b/phpBB/language/lang_hungarian/email/group_request.tpl @@ -1,11 +1,12 @@ -Subject: A request to join your group has been made - -Kedves {GROUP_MODERATOR}, - -Egy felhasznбlу szeretne csatlakozni egy csoporthoz, aminek a moderбtora a {SITENAME} fуrumon. -A kйrйs jуvбhagyбsбhoz vagy visszautasнtбsбhoz keresse fel az alбbbi weboldalt: - -{U_GROUPCP} - -{EMAIL_SIG} - +Subject: A request to join your group has been made +Charset: iso-8859-2 + +Kedves {GROUP_MODERATOR}, + +Egy felhasznбlу szeretne csatlakozni egy csoporthoz, aminek a moderбtora a {SITENAME} fуrumon. +A kйrйs jуvбhagyбsбhoz vagy visszautasнtбsбhoz keresse fel az alбbbi weboldalt: + +{U_GROUPCP} + +{EMAIL_SIG} + diff --git a/phpBB/language/lang_hungarian/email/privmsg_notify.tpl b/phpBB/language/lang_hungarian/email/privmsg_notify.tpl index d419a99d04..ed3059badb 100644 --- a/phpBB/language/lang_hungarian/email/privmsg_notify.tpl +++ b/phpBB/language/lang_hungarian/email/privmsg_notify.tpl @@ -1,11 +1,12 @@ -Subject: Ъj privбt ьzenete йrkezett - -Hellу {USERNAME}, - -Ъj privбt ьzenete йrkezett a "{SITENAME}" fуrumon lйvх azonosнtуjбra. Az esemйnyrхl a korбbbiakban йrtesнtйst kйrt. Az ъj ьzenetet megtekintheti az alбbbi linkre kattintva: - -{U_INBOX} - -Ne felejtse el, hogy ezeket az йrtesнtйseket letilthatja a Profil menьpontban, a beбllнtбsok megvбltoztatбsбval. - -{EMAIL_SIG} +Subject: Ъj privбt ьzenete йrkezett +Charset: iso-8859-2 + +Hellу {USERNAME}, + +Ъj privбt ьzenete йrkezett a "{SITENAME}" fуrumon lйvх azonosнtуjбra. Az esemйnyrхl a korбbbiakban йrtesнtйst kйrt. Az ъj ьzenetet megtekintheti az alбbbi linkre kattintva: + +{U_INBOX} + +Ne felejtse el, hogy ezeket az йrtesнtйseket letilthatja a Profil menьpontban, a beбllнtбsok megvбltoztatбsбval. + +{EMAIL_SIG} diff --git a/phpBB/language/lang_hungarian/email/profile_send_email.tpl b/phpBB/language/lang_hungarian/email/profile_send_email.tpl index a27d873507..f07f4d1904 100644 --- a/phpBB/language/lang_hungarian/email/profile_send_email.tpl +++ b/phpBB/language/lang_hungarian/email/profile_send_email.tpl @@ -1,13 +1,15 @@ -Hellу {TO_USERNAME}, - -A kцvetkezх ьzenetet {FROM_USERNAME} kьldte a {SITENAME} fуrumon lйvх azonosнtуjбval. Ha ez az ьzenet spam, sйrtх, vagy egyйb mуdon nemkнvбnatos, vegye fel a kapcsolatot a fуrum ьzemeltetхivel az alбbbi cнmen: - -{BOARD_EMAIL} - -Csatolja hozzб ezt a levelet (kьlцnцsen a levйl fejlйceit). Megjegyzйs: ennek a levйlnek a vбlaszcнme {FROM_USERNAME} cнmйre van beбllнtva. - -Az ьzenet a kцvetkezх: -~~~~~~~~~~~~~~~~~~~~~~ - -{MESSAGE} - +Charset: iso-8859-2 + +Hellу {TO_USERNAME}, + +A kцvetkezх ьzenetet {FROM_USERNAME} kьldte a {SITENAME} fуrumon lйvх azonosнtуjбval. Ha ez az ьzenet spam, sйrtх, vagy egyйb mуdon nemkнvбnatos, vegye fel a kapcsolatot a fуrum ьzemeltetхivel az alбbbi cнmen: + +{BOARD_EMAIL} + +Csatolja hozzб ezt a levelet (kьlцnцsen a levйl fejlйceit). Megjegyzйs: ennek a levйlnek a vбlaszcнme {FROM_USERNAME} cнmйre van beбllнtva. + +Az ьzenet a kцvetkezх: +~~~~~~~~~~~~~~~~~~~~~~ + +{MESSAGE} + diff --git a/phpBB/language/lang_hungarian/email/topic_notify.tpl b/phpBB/language/lang_hungarian/email/topic_notify.tpl index b195324d62..a3d38e1da0 100644 --- a/phpBB/language/lang_hungarian/email/topic_notify.tpl +++ b/phpBB/language/lang_hungarian/email/topic_notify.tpl @@ -1,13 +1,14 @@ -Subject: Tйma hozzбszуlбs-йrtesнtйs - {TOPIC_TITLE} - -Hellу {USERNAME}, - -Ezt a levelet azйrt kapta, mert a {SITENAME} fуrumon a "{TOPIC_TITLE}" tйma figyelйsйt kйrte. A tйmбra vбlasz йrkezett, kattintson az alбbbi linkre a vбlasz megtekintйsйhez. - -{U_TOPIC} - -Ha nem kнvбnja a tovбbbiakban figyelni ezt a tйmбt, kattintson a "Tйma figyelйsйnek megszьntetйse" linkre a fenti tйmбnбl, vagy keresse fel az alбbbi weboldalt: - -{U_STOP_WATCHING_TOPIC} - -{EMAIL_SIG} +Subject: Tйma hozzбszуlбs-йrtesнtйs - {TOPIC_TITLE} +Charset: iso-8859-2 + +Hellу {USERNAME}, + +Ezt a levelet azйrt kapta, mert a {SITENAME} fуrumon a "{TOPIC_TITLE}" tйma figyelйsйt kйrte. A tйmбra vбlasz йrkezett, kattintson az alбbbi linkre a vбlasz megtekintйsйhez. + +{U_TOPIC} + +Ha nem kнvбnja a tovбbbiakban figyelni ezt a tйmбt, kattintson a "Tйma figyelйsйnek megszьntetйse" linkre a fenti tйmбnбl, vagy keresse fel az alбbbi weboldalt: + +{U_STOP_WATCHING_TOPIC} + +{EMAIL_SIG} diff --git a/phpBB/language/lang_hungarian/email/user_activate.tpl b/phpBB/language/lang_hungarian/email/user_activate.tpl index 0274341182..ba9a035f0d 100644 --- a/phpBB/language/lang_hungarian/email/user_activate.tpl +++ b/phpBB/language/lang_hungarian/email/user_activate.tpl @@ -1,9 +1,10 @@ -Subject: Aktivбlja ъjra az azonosнtуjбt! - -Hellу {USERNAME}, - -Az azonosнtуja a "{SITENAME}" fуrumon deaktivбlva lett, feltehetхleg azйrt, mert vбltoztatбsokat hajtott vйgre a profiljбban. Az azonosнtу ъjra aktivбlбsбhoz fel kell keresnie az alбbbi weboldalt: - -{U_ACTIVATE} - -{EMAIL_SIG} +Subject: Aktivбlja ъjra az azonosнtуjбt! +Charset: iso-8859-2 + +Hellу {USERNAME}, + +Az azonosнtуja a "{SITENAME}" fуrumon deaktivбlva lett, feltehetхleg azйrt, mert vбltoztatбsokat hajtott vйgre a profiljбban. Az azonosнtу ъjra aktivбlбsбhoz fel kell keresnie az alбbbi weboldalt: + +{U_ACTIVATE} + +{EMAIL_SIG} diff --git a/phpBB/language/lang_hungarian/email/user_activate_passwd.tpl b/phpBB/language/lang_hungarian/email/user_activate_passwd.tpl index 77c432c34b..99f6aee9f7 100644 --- a/phpBB/language/lang_hungarian/email/user_activate_passwd.tpl +++ b/phpBB/language/lang_hungarian/email/user_activate_passwd.tpl @@ -1,17 +1,18 @@ -Subject: Ъj jelszу aktivбlбsa - -Hellу {USERNAME}, - -Ezt a levelet azйrt kapta, mert Цn (vagy valaki Цn helyett) ъj jelszу elkьldйsйt kйrte a {SITENAME} fуrumon lйvх azonosнtуjбhoz. Amennyiben nem kйrte ezt az levelet, hagyja figyelmen kнvьl. Ha a tovбbbiakban is kapna ilyen leveleket, vegye fel a kapcsolatot a fуrum adminisztrбtorбval. - -Az ъj jelszуt aktivбlnia kell, mielхtt hasznбlni tudnб. Az aktivбlбshoz keresse fel az alбbbi webcнmet: - -{U_ACTIVATE} - -Ha elkйszьlt, be tud jelentkezni az alбbbi jelszу hasznбlatбval: - -Jelszу: {PASSWORD} - -Termйszetesen a jelszуt meg tudja vбltoztatni a profil beбllнtбsainбl. Ha segнtsйgre van szьksйge, vegye fel a kapcsolatot a fуrum adminisztrбtorбval. - -{EMAIL_SIG} +Subject: Ъj jelszу aktivбlбsa +Charset: iso-8859-2 + +Hellу {USERNAME}, + +Ezt a levelet azйrt kapta, mert Цn (vagy valaki Цn helyett) ъj jelszу elkьldйsйt kйrte a {SITENAME} fуrumon lйvх azonosнtуjбhoz. Amennyiben nem kйrte ezt az levelet, hagyja figyelmen kнvьl. Ha a tovбbbiakban is kapna ilyen leveleket, vegye fel a kapcsolatot a fуrum adminisztrбtorбval. + +Az ъj jelszуt aktivбlnia kell, mielхtt hasznбlni tudnб. Az aktivбlбshoz keresse fel az alбbbi webcнmet: + +{U_ACTIVATE} + +Ha elkйszьlt, be tud jelentkezni az alбbbi jelszу hasznбlatбval: + +Jelszу: {PASSWORD} + +Termйszetesen a jelszуt meg tudja vбltoztatni a profil beбllнtбsainбl. Ha segнtsйgre van szьksйge, vegye fel a kapcsolatot a fуrum adminisztrбtorбval. + +{EMAIL_SIG} diff --git a/phpBB/language/lang_hungarian/email/user_welcome.tpl b/phpBB/language/lang_hungarian/email/user_welcome.tpl index e1b8864e77..6055315cea 100644 --- a/phpBB/language/lang_hungarian/email/user_welcome.tpl +++ b/phpBB/language/lang_hungarian/email/user_welcome.tpl @@ -1,16 +1,17 @@ -Subject: Ьdvцzцljьk a {SITENAME} fуrumбn - -{WELCOME_MSG} - -Tartsa meg ezt a levelet, hogy a kйsхbbiekben segнtsйgkйnt felhasznбlhassa. Az azonosнtуjбnak informбciуi az alбbbiak: - ----------------------------- -Felhasznбlуnйv: {USERNAME} -Jelszу: {PASSWORD} ----------------------------- - -Kйrjьk, tartsa emlйkezetйben a jelszavбt, mert az adatbбzisunkban kуdolva szerepel, нgy nincs mуd a kйsхbbiekben a felderнtйsйre. Termйszetesen ha elfelejtette, igйnyelhet helyette egy mбsikat, amelyet hasonlуkйppen aktivбlnia kell hasznбlat elхtt. - -Kцszцnjьk a regisztrбlбst! - -{EMAIL_SIG} +Subject: Ьdvцzцljьk a {SITENAME} fуrumбn +Charset: iso-8859-2 + +{WELCOME_MSG} + +Tartsa meg ezt a levelet, hogy a kйsхbbiekben segнtsйgkйnt felhasznбlhassa. Az azonosнtуjбnak informбciуi az alбbbiak: + +---------------------------- +Felhasznбlуnйv: {USERNAME} +Jelszу: {PASSWORD} +---------------------------- + +Kйrjьk, tartsa emlйkezetйben a jelszavбt, mert az adatbбzisunkban kуdolva szerepel, нgy nincs mуd a kйsхbbiekben a felderнtйsйre. Termйszetesen ha elfelejtette, igйnyelhet helyette egy mбsikat, amelyet hasonlуkйppen aktivбlnia kell hasznбlat elхtt. + +Kцszцnjьk a regisztrбlбst! + +{EMAIL_SIG} diff --git a/phpBB/language/lang_hungarian/email/user_welcome_inactive.tpl b/phpBB/language/lang_hungarian/email/user_welcome_inactive.tpl index 2054cc6d12..a03f3626d2 100644 --- a/phpBB/language/lang_hungarian/email/user_welcome_inactive.tpl +++ b/phpBB/language/lang_hungarian/email/user_welcome_inactive.tpl @@ -1,20 +1,21 @@ -Subject: Ьdvцzцljьk a {SITENAME} fуrumбn - -{WELCOME_MSG} - -Tartsa meg ezt a levelet, hogy a kйsхbbiekben segнtsйgkйnt felhasznбlhassa. Az azonosнtуjбnak informбciуi az alбbbiak: - ----------------------------- -Felhasznбlуnйv: {USERNAME} -Jelszу: {PASSWORD} ----------------------------- - -Az azonosнtуja jelenleg inaktнv, йs aktivбlnia kell, mielхtt hasznбlni tudnб. Az aktivбlбshoz keresse fel az alбbbi webcнmet: - -{U_ACTIVATE} - -Kйrjьk, tartsa emlйkezetйben a jelszavбt, mert az adatbбzisunkban kуdolva szerepel, нgy nincs mуd a kйsхbbiekben a felderнtйsйre. Termйszetesen ha elfelejtette, igйnyelhet helyette egy mбsikat, amelyet hasonlуkйppen aktivбlnia kell hasznбlat elхtt. - -Kцszцnjьk a regisztrбlбst! - -{EMAIL_SIG} +Subject: Ьdvцzцljьk a {SITENAME} fуrumбn +Charset: iso-8859-2 + +{WELCOME_MSG} + +Tartsa meg ezt a levelet, hogy a kйsхbbiekben segнtsйgkйnt felhasznбlhassa. Az azonosнtуjбnak informбciуi az alбbbiak: + +---------------------------- +Felhasznбlуnйv: {USERNAME} +Jelszу: {PASSWORD} +---------------------------- + +Az azonosнtуja jelenleg inaktнv, йs aktivбlnia kell, mielхtt hasznбlni tudnб. Az aktivбlбshoz keresse fel az alбbbi webcнmet: + +{U_ACTIVATE} + +Kйrjьk, tartsa emlйkezetйben a jelszavбt, mert az adatbбzisunkban kуdolva szerepel, нgy nincs mуd a kйsхbbiekben a felderнtйsйre. Termйszetesen ha elfelejtette, igйnyelhet helyette egy mбsikat, amelyet hasonlуkйppen aktivбlnia kell hasznбlat elхtt. + +Kцszцnjьk a regisztrбlбst! + +{EMAIL_SIG} diff --git a/phpBB/language/lang_italian/email/admin_activate.tpl b/phpBB/language/lang_italian/email/admin_activate.tpl index 4209f0fa05..7218d5f88a 100644 --- a/phpBB/language/lang_italian/email/admin_activate.tpl +++ b/phpBB/language/lang_italian/email/admin_activate.tpl @@ -1,4 +1,5 @@ Subject: Account Nuovo Utente +Charset: iso-8859-1 Ciao, diff --git a/phpBB/language/lang_italian/email/admin_send_email.tpl b/phpBB/language/lang_italian/email/admin_send_email.tpl index d60134100c..0b18f39695 100644 --- a/phpBB/language/lang_italian/email/admin_send_email.tpl +++ b/phpBB/language/lang_italian/email/admin_send_email.tpl @@ -1,3 +1,5 @@ +Charset: iso-8859-1 + La seguente email ti и stata inviata da un amministratore di "{SITENAME}". Se il messaggio contiene spam, commenti abusivi o altri commenti che tu trovi offensivi per favore contatta il webmaster del forum al seguente indirizzo: {BOARD_EMAIL} diff --git a/phpBB/language/lang_italian/email/admin_welcome_activated.tpl b/phpBB/language/lang_italian/email/admin_welcome_activated.tpl index 9b72e6ee85..f83f18c280 100644 --- a/phpBB/language/lang_italian/email/admin_welcome_activated.tpl +++ b/phpBB/language/lang_italian/email/admin_welcome_activated.tpl @@ -1,4 +1,5 @@ Subject: Account Attivato +Charset: iso-8859-1 Ciao {USERNAME}, diff --git a/phpBB/language/lang_italian/email/admin_welcome_inactive.tpl b/phpBB/language/lang_italian/email/admin_welcome_inactive.tpl index 2867d1f3ca..9098e49df6 100644 --- a/phpBB/language/lang_italian/email/admin_welcome_inactive.tpl +++ b/phpBB/language/lang_italian/email/admin_welcome_inactive.tpl @@ -1,4 +1,5 @@ Subject: Benvenuto nel forum di {SITENAME} +Charset: iso-8859-1 {WELCOME_MSG} diff --git a/phpBB/language/lang_italian/email/coppa_welcome_inactive.tpl b/phpBB/language/lang_italian/email/coppa_welcome_inactive.tpl index 733bf54651..6fbb644b7f 100644 --- a/phpBB/language/lang_italian/email/coppa_welcome_inactive.tpl +++ b/phpBB/language/lang_italian/email/coppa_welcome_inactive.tpl @@ -1,4 +1,5 @@ Subject: Benvenuto nel forum di {SITENAME} +Charset: iso-8859-1 {WELCOME_MSG} diff --git a/phpBB/language/lang_italian/email/group_added.tpl b/phpBB/language/lang_italian/email/group_added.tpl index f551eebd7f..8684d37142 100644 --- a/phpBB/language/lang_italian/email/group_added.tpl +++ b/phpBB/language/lang_italian/email/group_added.tpl @@ -1,4 +1,5 @@ Subject: Sei stato aggiunto a questa gruppo utenti +Charset: iso-8859-1 Congratulazioni, diff --git a/phpBB/language/lang_italian/email/group_approved.tpl b/phpBB/language/lang_italian/email/group_approved.tpl index fadc03919c..72d221ff1b 100644 --- a/phpBB/language/lang_italian/email/group_approved.tpl +++ b/phpBB/language/lang_italian/email/group_approved.tpl @@ -1,4 +1,5 @@ Subject: La tua richiesta и stata approvata +Charset: iso-8859-1 Congratulazioni, diff --git a/phpBB/language/lang_italian/email/group_request.tpl b/phpBB/language/lang_italian/email/group_request.tpl index ec77288438..f9f477bba0 100644 --- a/phpBB/language/lang_italian/email/group_request.tpl +++ b/phpBB/language/lang_italian/email/group_request.tpl @@ -1,4 +1,5 @@ Subject: C'и una richiesta di iscrizione al tuo gruppo +Charset: iso-8859-1 Caro {GROUP_MODERATOR}, diff --git a/phpBB/language/lang_italian/email/privmsg_notify.tpl b/phpBB/language/lang_italian/email/privmsg_notify.tpl index 6697c9e420..e9671e62f2 100644 --- a/phpBB/language/lang_italian/email/privmsg_notify.tpl +++ b/phpBB/language/lang_italian/email/privmsg_notify.tpl @@ -1,4 +1,5 @@ Subject: Hai un nuovo messaggio privato +Charset: iso-8859-1 Ciao {USERNAME}, diff --git a/phpBB/language/lang_italian/email/profile_send_email.tpl b/phpBB/language/lang_italian/email/profile_send_email.tpl index 2258e8494e..95ddcdd588 100644 --- a/phpBB/language/lang_italian/email/profile_send_email.tpl +++ b/phpBB/language/lang_italian/email/profile_send_email.tpl @@ -1,3 +1,5 @@ +Charset: iso-8859-1 + Ciao {TO_USERNAME}, La seguente e una email che ti и stata inviata da {FROM_USERNAME} attraverso il tuo account su {SITENAME}. Se il messaggio и spam, contiene commenti abusivi o altri commenti che tu trovi offensivi per favore contatta il webmaster del forum al seguente indirizzo: diff --git a/phpBB/language/lang_italian/email/topic_notify.tpl b/phpBB/language/lang_italian/email/topic_notify.tpl index b5f67754c2..52ab908898 100644 --- a/phpBB/language/lang_italian/email/topic_notify.tpl +++ b/phpBB/language/lang_italian/email/topic_notify.tpl @@ -1,4 +1,5 @@ Subject: Notifica di risposta all'argomento - {TOPIC_TITLE} +Charset: iso-8859-1 Ciao {USERNAME}, diff --git a/phpBB/language/lang_italian/email/user_activate.tpl b/phpBB/language/lang_italian/email/user_activate.tpl index b1906af7e9..f2acaa1d22 100644 --- a/phpBB/language/lang_italian/email/user_activate.tpl +++ b/phpBB/language/lang_italian/email/user_activate.tpl @@ -1,4 +1,5 @@ Subject: Riattiva il tuo account! +Charset: iso-8859-1 Ciao {USERNAME}, diff --git a/phpBB/language/lang_italian/email/user_activate_passwd.tpl b/phpBB/language/lang_italian/email/user_activate_passwd.tpl index da4baab80a..d6df0dd694 100644 --- a/phpBB/language/lang_italian/email/user_activate_passwd.tpl +++ b/phpBB/language/lang_italian/email/user_activate_passwd.tpl @@ -1,4 +1,5 @@ Subject: Attivazione nuova password +Charset: iso-8859-1 Ciao {USERNAME} diff --git a/phpBB/language/lang_italian/email/user_welcome.tpl b/phpBB/language/lang_italian/email/user_welcome.tpl index 05d37de1f2..7318613088 100644 --- a/phpBB/language/lang_italian/email/user_welcome.tpl +++ b/phpBB/language/lang_italian/email/user_welcome.tpl @@ -1,4 +1,5 @@ Subject: Benvenuto nel forum di {SITENAME} +Charset: iso-8859-1 {WELCOME_MSG} diff --git a/phpBB/language/lang_italian/email/user_welcome_inactive.tpl b/phpBB/language/lang_italian/email/user_welcome_inactive.tpl index dd58d0e380..794b5f0b92 100644 --- a/phpBB/language/lang_italian/email/user_welcome_inactive.tpl +++ b/phpBB/language/lang_italian/email/user_welcome_inactive.tpl @@ -1,4 +1,5 @@ Subject: Benvenuto nel forum di {SITENAME} +Charset: iso-8859-1 {WELCOME_MSG} diff --git a/phpBB/language/lang_japanese/email/admin_activate.tpl b/phpBB/language/lang_japanese/email/admin_activate.tpl index 487c2ddaab..7ca4512df4 100644 --- a/phpBB/language/lang_japanese/email/admin_activate.tpl +++ b/phpBB/language/lang_japanese/email/admin_activate.tpl @@ -1,7 +1,8 @@ -Subject: ђV‚µ‚ўѓ†Ѓ[ѓUЃ[ѓAѓJѓEѓ“ѓg - -"{USERNAME}"‚МѓAѓJѓEѓ“ѓg‚Є’вЋ~ЃA‚Ь‚Ѕ‚НђV‚µ‚­Ќмђ¬‚і‚к‚Ь‚µ‚ЅЃB•K—v‚Е‚ ‚к‚О‚±‚Мѓ†Ѓ[ѓUЃ[‚МЏЪЌЧ‚рЉm”F‚µЃA‰є‹L‚МѓЉѓ“ѓN‚©‚зѓAѓNѓeѓBѓxЃ[ѓVѓ‡ѓ“‚рЌs‚Б‚Д‚­‚ѕ‚і‚ўЃF - -{U_ACTIVATE} - +Subject: ђV‚µ‚ўѓ†Ѓ[ѓUЃ[ѓAѓJѓEѓ“ѓg +Charset: shift_jis + +"{USERNAME}"‚МѓAѓJѓEѓ“ѓg‚Є’вЋ~ЃA‚Ь‚Ѕ‚НђV‚µ‚­Ќмђ¬‚і‚к‚Ь‚µ‚ЅЃB•K—v‚Е‚ ‚к‚О‚±‚Мѓ†Ѓ[ѓUЃ[‚МЏЪЌЧ‚рЉm”F‚µЃA‰є‹L‚МѓЉѓ“ѓN‚©‚зѓAѓNѓeѓBѓxЃ[ѓVѓ‡ѓ“‚рЌs‚Б‚Д‚­‚ѕ‚і‚ўЃF + +{U_ACTIVATE} + {EMAIL_SIG} \ No newline at end of file diff --git a/phpBB/language/lang_japanese/email/admin_send_email.tpl b/phpBB/language/lang_japanese/email/admin_send_email.tpl index 4c36daeab6..8fa23c83ef 100644 --- a/phpBB/language/lang_japanese/email/admin_send_email.tpl +++ b/phpBB/language/lang_japanese/email/admin_send_email.tpl @@ -1,10 +1,12 @@ -‰є‹L‚МѓЃЃ[ѓ‹‚НЃA"{SITENAME}"‚МЉЗ—ќђl‚Й‚ж‚Б‚Д‘—ђM‚і‚к‚Ѕ‚а‚М‚Е‚·ЃB‚±‚МѓЃЃ[ѓ‹‚ЄѓXѓpѓЂЃA•sђі‚И‚а‚МЃA”ожЋ’†Џќ“™‚рЉЬ‚Ю‚а‚М‚Е‚ ‚к‚ОЃA‰є‹L‚МѓEѓFѓuѓ}ѓXѓ^Ѓ[‚МѓAѓhѓЊѓX‚М•ы‚Й–в‚ўЌ‡‚н‚№‚Д‚­‚ѕ‚і‚ўЃF - -{BOARD_EMAIL} - -Џг‹L‚МѓAѓhѓЊѓX€¶‚ЙѓЃЃ[ѓ‹‚р‘—‚йЏкЌ‡‚НЃA‘—ђM‚і‚к‚Ѕ‚М“а—eЃi“Б‚Йѓwѓbѓ_Ѓ[Џо•сЃj‚рЉЬ‚Я‚Д‚­‚ѕ‚і‚ўЃB - -‚ ‚И‚Ѕ‚Й‘—‚з‚к‚ЅѓЃЃ[ѓ‹‚М“а—e‚Н€И‰є‚М’К‚и‚Е‚· -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -{MESSAGE} +Charset: shift_jis + +‰є‹L‚МѓЃЃ[ѓ‹‚НЃA"{SITENAME}"‚МЉЗ—ќђl‚Й‚ж‚Б‚Д‘—ђM‚і‚к‚Ѕ‚а‚М‚Е‚·ЃB‚±‚МѓЃЃ[ѓ‹‚ЄѓXѓpѓЂЃA•sђі‚И‚а‚МЃA”ожЋ’†Џќ“™‚рЉЬ‚Ю‚а‚М‚Е‚ ‚к‚ОЃA‰є‹L‚МѓEѓFѓuѓ}ѓXѓ^Ѓ[‚МѓAѓhѓЊѓX‚М•ы‚Й–в‚ўЌ‡‚н‚№‚Д‚­‚ѕ‚і‚ўЃF + +{BOARD_EMAIL} + +Џг‹L‚МѓAѓhѓЊѓX€¶‚ЙѓЃЃ[ѓ‹‚р‘—‚йЏкЌ‡‚НЃA‘—ђM‚і‚к‚Ѕ‚М“а—eЃi“Б‚Йѓwѓbѓ_Ѓ[Џо•сЃj‚рЉЬ‚Я‚Д‚­‚ѕ‚і‚ўЃB + +‚ ‚И‚Ѕ‚Й‘—‚з‚к‚ЅѓЃЃ[ѓ‹‚М“а—e‚Н€И‰є‚М’К‚и‚Е‚· +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +{MESSAGE} diff --git a/phpBB/language/lang_japanese/email/admin_welcome_activated.tpl b/phpBB/language/lang_japanese/email/admin_welcome_activated.tpl index d368e72a90..9704b141c5 100644 --- a/phpBB/language/lang_japanese/email/admin_welcome_activated.tpl +++ b/phpBB/language/lang_japanese/email/admin_welcome_activated.tpl @@ -1,7 +1,8 @@ -Subject: ѓAѓJѓEѓ“ѓg‚НѓAѓNѓeѓBѓu‚Й‚И‚и‚Ь‚µ‚Ѕ - -{USERNAME}‚і‚с‚Ц - -Your account on "{SITENAME}"‚МѓAѓJѓEѓ“ѓg‚ЄѓAѓNѓeѓBѓu‚Й‚И‚и‚Ь‚µ‚ЅЃB‚±‚к‚Е–ј‘O‚ЖѓpѓXѓЏЃ[ѓh‚рЋg‚Б‚ДЊfЋ¦”В‚ЙѓЌѓOѓCѓ“‚·‚й‚±‚Ж‚Є‚Е‚«‚Ь‚·ЃBѓAѓJѓEѓ“ѓg‚М–ј‘O‚ЖѓpѓXѓЏЃ[ѓh‚Н‘O‰с‘—ђM‚і‚к‚ЅѓЃЃ[ѓ‹‚ЙЌЪ‚Б‚Д‚ў‚Ь‚·ЃB - +Subject: ѓAѓJѓEѓ“ѓg‚НѓAѓNѓeѓBѓu‚Й‚И‚и‚Ь‚µ‚Ѕ +Charset: shift_jis + +{USERNAME}‚і‚с‚Ц + +Your account on "{SITENAME}"‚МѓAѓJѓEѓ“ѓg‚ЄѓAѓNѓeѓBѓu‚Й‚И‚и‚Ь‚µ‚ЅЃB‚±‚к‚Е–ј‘O‚ЖѓpѓXѓЏЃ[ѓh‚рЋg‚Б‚ДЊfЋ¦”В‚ЙѓЌѓOѓCѓ“‚·‚й‚±‚Ж‚Є‚Е‚«‚Ь‚·ЃBѓAѓJѓEѓ“ѓg‚М–ј‘O‚ЖѓpѓXѓЏЃ[ѓh‚Н‘O‰с‘—ђM‚і‚к‚ЅѓЃЃ[ѓ‹‚ЙЌЪ‚Б‚Д‚ў‚Ь‚·ЃB + {EMAIL_SIG} \ No newline at end of file diff --git a/phpBB/language/lang_japanese/email/admin_welcome_inactive.tpl b/phpBB/language/lang_japanese/email/admin_welcome_inactive.tpl index 9726f5c1c8..f4a140ef92 100644 --- a/phpBB/language/lang_japanese/email/admin_welcome_inactive.tpl +++ b/phpBB/language/lang_japanese/email/admin_welcome_inactive.tpl @@ -1,18 +1,19 @@ -Subject: ‚悤‚±‚»{SITENAME}‚МЊfЋ¦”В‚Ц - -{WELCOME_MSG} - -‚±‚МѓЃЃ[ѓ‹‚Н‘еђШ‚Й•ЫЉЗ‚µ‚Д‚­‚ѕ‚і‚ўЃB‚ ‚И‚Ѕ‚МѓAѓJѓEѓ“ѓgЏо•с‚Н€И‰є‚М’К‚и‚Е‚·ЃF - ----------------------------- -–ј‘O: {USERNAME} -ѓpѓXѓЏЃ[ѓh: {PASSWORD} ----------------------------- - -‚ ‚И‚Ѕ‚МѓAѓJѓEѓ“ѓg‚Н‚Ь‚ѕѓAѓNѓeѓBѓu‚Й‚И‚Б‚Д‚ў‚Ь‚№‚сЃBЉЗ—ќЋТ‚ЄѓAѓJѓEѓ“ѓg‚рѓAѓNѓeѓBѓu‚Й‚·‚й‚Ь‚Е‚НЃAѓAѓJѓEѓ“ѓg‚рЋg‚Б‚ДЊfЋ¦”В‚ЙѓЌѓOѓCѓ“‚·‚й‚±‚Ж‚Н‚Е‚«‚Ь‚№‚сЃBѓAѓJѓEѓ“ѓg‚МѓAѓNѓeѓBѓxЃ[ѓVѓ‡ѓ“‚ЄЌs‚н‚к‚й‚ЖЃA‚»‚МЋпЋ|‚МѓЃЃ[ѓ‹‚Є‘—ђM‚і‚к‚Ь‚·ЃB - -ѓAѓJѓEѓ“ѓg‚МѓpѓXѓЏЃ[ѓh‚НѓfЃ[ѓ^ѓxЃ[ѓX“а‚Е€ГЌ†‰»‚і‚к‚Д‚ў‚й‚Ѕ‚ЯЃAѓpѓXѓЏЃ[ѓh‚р–Y‚к‚Д‚µ‚Ь‚Б‚ЅЏкЌ‡‚ЙЃA‚»‚МѓpѓXѓЏЃ[ѓh‚рЊ©‚В‚ЇЏo‚·‚±‚Ж‚Н‚Е‚«‚И‚ў‚М‚Е’Ќ€У‚µ‚Д‚­‚ѕ‚і‚ўЃB‚µ‚©‚µЃA–њ‚Є€кѓpѓXѓЏЃ[ѓh‚р–Y‚к‚Д‚µ‚Ь‚Б‚ЅЏкЌ‡‚НЃAђV‚µ‚ўѓpѓXѓЏЃ[ѓh‚р”­Ќs‚·‚й‚±‚Ж‚Є‚Е‚«‚Ь‚·ЃBЌД”­Ќs‚і‚к‚ЅѓpѓXѓЏЃ[ѓh‚ЕѓЌѓOѓCѓ“‚·‚й‚Ѕ‚Я‚Й‚НЃAЌД‚СѓAѓJѓEѓ“ѓg‚МѓAѓNѓeѓBѓxЃ[ѓVѓ‡ѓ“‚р‘Т‚В•K—v‚Є‚ ‚и‚Ь‚·ЃB - -ѓ†Ѓ[ѓUЃ[“o^‚р‚µ‚Д‚ў‚Ѕ‚ѕ‚«ЃA‚Ь‚±‚Ж‚Й—L“‚І‚ґ‚ў‚Ь‚·ЃB - +Subject: ‚悤‚±‚»{SITENAME}‚МЊfЋ¦”В‚Ц +Charset: shift_jis + +{WELCOME_MSG} + +‚±‚МѓЃЃ[ѓ‹‚Н‘еђШ‚Й•ЫЉЗ‚µ‚Д‚­‚ѕ‚і‚ўЃB‚ ‚И‚Ѕ‚МѓAѓJѓEѓ“ѓgЏо•с‚Н€И‰є‚М’К‚и‚Е‚·ЃF + +---------------------------- +–ј‘O: {USERNAME} +ѓpѓXѓЏЃ[ѓh: {PASSWORD} +---------------------------- + +‚ ‚И‚Ѕ‚МѓAѓJѓEѓ“ѓg‚Н‚Ь‚ѕѓAѓNѓeѓBѓu‚Й‚И‚Б‚Д‚ў‚Ь‚№‚сЃBЉЗ—ќЋТ‚ЄѓAѓJѓEѓ“ѓg‚рѓAѓNѓeѓBѓu‚Й‚·‚й‚Ь‚Е‚НЃAѓAѓJѓEѓ“ѓg‚рЋg‚Б‚ДЊfЋ¦”В‚ЙѓЌѓOѓCѓ“‚·‚й‚±‚Ж‚Н‚Е‚«‚Ь‚№‚сЃBѓAѓJѓEѓ“ѓg‚МѓAѓNѓeѓBѓxЃ[ѓVѓ‡ѓ“‚ЄЌs‚н‚к‚й‚ЖЃA‚»‚МЋпЋ|‚МѓЃЃ[ѓ‹‚Є‘—ђM‚і‚к‚Ь‚·ЃB + +ѓAѓJѓEѓ“ѓg‚МѓpѓXѓЏЃ[ѓh‚НѓfЃ[ѓ^ѓxЃ[ѓX“а‚Е€ГЌ†‰»‚і‚к‚Д‚ў‚й‚Ѕ‚ЯЃAѓpѓXѓЏЃ[ѓh‚р–Y‚к‚Д‚µ‚Ь‚Б‚ЅЏкЌ‡‚ЙЃA‚»‚МѓpѓXѓЏЃ[ѓh‚рЊ©‚В‚ЇЏo‚·‚±‚Ж‚Н‚Е‚«‚И‚ў‚М‚Е’Ќ€У‚µ‚Д‚­‚ѕ‚і‚ўЃB‚µ‚©‚µЃA–њ‚Є€кѓpѓXѓЏЃ[ѓh‚р–Y‚к‚Д‚µ‚Ь‚Б‚ЅЏкЌ‡‚НЃAђV‚µ‚ўѓpѓXѓЏЃ[ѓh‚р”­Ќs‚·‚й‚±‚Ж‚Є‚Е‚«‚Ь‚·ЃBЌД”­Ќs‚і‚к‚ЅѓpѓXѓЏЃ[ѓh‚ЕѓЌѓOѓCѓ“‚·‚й‚Ѕ‚Я‚Й‚НЃAЌД‚СѓAѓJѓEѓ“ѓg‚МѓAѓNѓeѓBѓxЃ[ѓVѓ‡ѓ“‚р‘Т‚В•K—v‚Є‚ ‚и‚Ь‚·ЃB + +ѓ†Ѓ[ѓUЃ[“o^‚р‚µ‚Д‚ў‚Ѕ‚ѕ‚«ЃA‚Ь‚±‚Ж‚Й—L“‚І‚ґ‚ў‚Ь‚·ЃB + {EMAIL_SIG} \ No newline at end of file diff --git a/phpBB/language/lang_japanese/email/coppa_welcome_inactive.tpl b/phpBB/language/lang_japanese/email/coppa_welcome_inactive.tpl index 0cd02d7184..a6b6f42d94 100644 --- a/phpBB/language/lang_japanese/email/coppa_welcome_inactive.tpl +++ b/phpBB/language/lang_japanese/email/coppa_welcome_inactive.tpl @@ -1,50 +1,51 @@ -Subject: ‚悤‚±‚»{SITENAME}‚МЊfЋ¦”В‚Ц - -{WELCOME_MSG} - -COPPAЃiЋq‹џ‚МѓIѓ“ѓ‰ѓCѓ“ЃEѓvѓ‰ѓCѓoѓVЃ[•ЫЊм–@Ѓj‚Й‚ж‚иЃA‚ ‚И‚Ѕ‚МѓAѓJѓEѓ“ѓg‚НЊ»ЌЭѓAѓNѓeѓBѓu‚Й‚И‚Б‚Д‚ў‚Ь‚№‚сЃB - -—јђe–”‚Н•ЫЊмЋТ‚Є‰є‹L‚М‹L“ь—“‚Й•K—v‚ИЌЂ–Ъ‚р‹L“ь‚µЃAЋџ‚МFAX”ФЌ†‚Ь‚Е‘—‚Б‚Д‚­‚ѕ‚і‚ўЃF - -{FAX_INFO} - -‚Ь‚Ѕ‚НЋџ‚МѓЃЃ[ѓ‹ѓAѓhѓЊѓX‚Ь‚Е‘—‚Б‚Д‚­‚ѕ‚і‚ўЃF - -{MAIL_INFO} - ------------------------------- ђШ‚иЋж‚и ------------------------------ -{SITENAME}‚ЙЋQ‰Б‚·‚й‹–‰В - -–ј‘O: {USERNAME} -ѓpѓXѓЏЃ[ѓh: {PASSWORD} -ѓЃЃ[ѓ‹ѓAѓhѓЊѓX: {EMAIL_ADDRESS} - -ICQѓiѓ“ѓoЃ[: {ICQ} -AIMѓAѓhѓЊѓX: {AIM} -MSN Messenger: {MSN} -Yahoo Messenger: {YIM} -ѓzЃ[ѓЂѓyЃ[ѓW: {WEB_SITE} -ЏЉЌЭ’n: {FROM} -ђE‹Ж: {OCC} -Ћп–Ў: {INTERESTS} - -Ћ„‚НЋ©•Є‚МЋq‹џ‚МЏо•с‚рЊџ‰{‚µЃA{SITENAME}‚Й‚±‚МЏо•с‚р•ЫЉЗ‚і‚№‚й‹–‰В‚р—^‚¦‚Ь‚·ЃB -Ћ„‚Н‚±‚МЏо•с‚ЄѓpѓXѓЏЃ[ѓh‚р“ь—Н‚·‚й‚±‚Ж‚Е‚ў‚В‚Е‚а•ПЌX‚Є‰В”\‚ИЋ–‚рЏі’m‚µ‚Д‚ў‚Ь‚·ЃB - -—јђe–”‚Н•ЫЊмЋТ -(–ј‘O‚р‚±‚М—“‚Й‹L“ь): _____________________ - -(ѓTѓCѓ“‚р‚±‚М—“‚Й‹L“ь): __________________ - -“ъ•t: _______________ - ------------------------------- ђШ‚иЋж‚и ------------------------------ - - -ЉЗ—ќЋТ‚ЄЏг‹L‚МCOPPA‚МѓfЃ[ѓ^‚рЋу‚ЇЋж‚Б‚ЅЊгЃA‚ ‚И‚Ѕ‚МѓAѓJѓEѓ“ѓg‚НѓAѓNѓeѓBѓu‚Ж‚И‚и‚Ь‚·ЃB - -ѓAѓJѓEѓ“ѓg‚МѓpѓXѓЏЃ[ѓh‚НѓfЃ[ѓ^ѓxЃ[ѓX“а‚Е€ГЌ†‰»‚і‚к‚Д‚ў‚й‚Ѕ‚ЯЃAѓpѓXѓЏЃ[ѓh‚р–Y‚к‚Д‚µ‚Ь‚Б‚ЅЏкЌ‡‚ЙЃA‚»‚МѓpѓXѓЏЃ[ѓh‚рЊ©‚В‚ЇЏo‚·‚±‚Ж‚Н‚Е‚«‚И‚ў‚М‚Е’Ќ€У‚µ‚Д‚­‚ѕ‚і‚ўЃB‚µ‚©‚µЃA–њ‚Є€кѓpѓXѓЏЃ[ѓh‚р–Y‚к‚Д‚µ‚Ь‚Б‚ЅЏкЌ‡‚НЃAђV‚µ‚ўѓpѓXѓЏЃ[ѓh‚р”­Ќs‚·‚й‚±‚Ж‚Є‚Е‚«‚Ь‚·ЃB - -ѓ†Ѓ[ѓUЃ[“o^‚р‚µ‚Д‚ў‚Ѕ‚ѕ‚«ЃA‚Ь‚±‚Ж‚Й—L“‚І‚ґ‚ў‚Ь‚·ЃB - +Subject: ‚悤‚±‚»{SITENAME}‚МЊfЋ¦”В‚Ц +Charset: shift_jis + +{WELCOME_MSG} + +COPPAЃiЋq‹џ‚МѓIѓ“ѓ‰ѓCѓ“ЃEѓvѓ‰ѓCѓoѓVЃ[•ЫЊм–@Ѓj‚Й‚ж‚иЃA‚ ‚И‚Ѕ‚МѓAѓJѓEѓ“ѓg‚НЊ»ЌЭѓAѓNѓeѓBѓu‚Й‚И‚Б‚Д‚ў‚Ь‚№‚сЃB + +—јђe–”‚Н•ЫЊмЋТ‚Є‰є‹L‚М‹L“ь—“‚Й•K—v‚ИЌЂ–Ъ‚р‹L“ь‚µЃAЋџ‚МFAX”ФЌ†‚Ь‚Е‘—‚Б‚Д‚­‚ѕ‚і‚ўЃF + +{FAX_INFO} + +‚Ь‚Ѕ‚НЋџ‚МѓЃЃ[ѓ‹ѓAѓhѓЊѓX‚Ь‚Е‘—‚Б‚Д‚­‚ѕ‚і‚ўЃF + +{MAIL_INFO} + +------------------------------ ђШ‚иЋж‚и ------------------------------ +{SITENAME}‚ЙЋQ‰Б‚·‚й‹–‰В + +–ј‘O: {USERNAME} +ѓpѓXѓЏЃ[ѓh: {PASSWORD} +ѓЃЃ[ѓ‹ѓAѓhѓЊѓX: {EMAIL_ADDRESS} + +ICQѓiѓ“ѓoЃ[: {ICQ} +AIMѓAѓhѓЊѓX: {AIM} +MSN Messenger: {MSN} +Yahoo Messenger: {YIM} +ѓzЃ[ѓЂѓyЃ[ѓW: {WEB_SITE} +ЏЉЌЭ’n: {FROM} +ђE‹Ж: {OCC} +Ћп–Ў: {INTERESTS} + +Ћ„‚НЋ©•Є‚МЋq‹џ‚МЏо•с‚рЊџ‰{‚µЃA{SITENAME}‚Й‚±‚МЏо•с‚р•ЫЉЗ‚і‚№‚й‹–‰В‚р—^‚¦‚Ь‚·ЃB +Ћ„‚Н‚±‚МЏо•с‚ЄѓpѓXѓЏЃ[ѓh‚р“ь—Н‚·‚й‚±‚Ж‚Е‚ў‚В‚Е‚а•ПЌX‚Є‰В”\‚ИЋ–‚рЏі’m‚µ‚Д‚ў‚Ь‚·ЃB + +—јђe–”‚Н•ЫЊмЋТ +(–ј‘O‚р‚±‚М—“‚Й‹L“ь): _____________________ + +(ѓTѓCѓ“‚р‚±‚М—“‚Й‹L“ь): __________________ + +“ъ•t: _______________ + +------------------------------ ђШ‚иЋж‚и ------------------------------ + + +ЉЗ—ќЋТ‚ЄЏг‹L‚МCOPPA‚МѓfЃ[ѓ^‚рЋу‚ЇЋж‚Б‚ЅЊгЃA‚ ‚И‚Ѕ‚МѓAѓJѓEѓ“ѓg‚НѓAѓNѓeѓBѓu‚Ж‚И‚и‚Ь‚·ЃB + +ѓAѓJѓEѓ“ѓg‚МѓpѓXѓЏЃ[ѓh‚НѓfЃ[ѓ^ѓxЃ[ѓX“а‚Е€ГЌ†‰»‚і‚к‚Д‚ў‚й‚Ѕ‚ЯЃAѓpѓXѓЏЃ[ѓh‚р–Y‚к‚Д‚µ‚Ь‚Б‚ЅЏкЌ‡‚ЙЃA‚»‚МѓpѓXѓЏЃ[ѓh‚рЊ©‚В‚ЇЏo‚·‚±‚Ж‚Н‚Е‚«‚И‚ў‚М‚Е’Ќ€У‚µ‚Д‚­‚ѕ‚і‚ўЃB‚µ‚©‚µЃA–њ‚Є€кѓpѓXѓЏЃ[ѓh‚р–Y‚к‚Д‚µ‚Ь‚Б‚ЅЏкЌ‡‚НЃAђV‚µ‚ўѓpѓXѓЏЃ[ѓh‚р”­Ќs‚·‚й‚±‚Ж‚Є‚Е‚«‚Ь‚·ЃB + +ѓ†Ѓ[ѓUЃ[“o^‚р‚µ‚Д‚ў‚Ѕ‚ѕ‚«ЃA‚Ь‚±‚Ж‚Й—L“‚І‚ґ‚ў‚Ь‚·ЃB + {EMAIL_SIG} \ No newline at end of file diff --git a/phpBB/language/lang_japanese/email/group_added.tpl b/phpBB/language/lang_japanese/email/group_added.tpl index fd5dcfee6e..b79a92e5ae 100644 --- a/phpBB/language/lang_japanese/email/group_added.tpl +++ b/phpBB/language/lang_japanese/email/group_added.tpl @@ -1,10 +1,11 @@ -Subject: ‚±‚МѓOѓ‹Ѓ[ѓv‚Й’З‰Б‚і‚к‚Ь‚µ‚Ѕ - -‚Ё‚Я‚Е‚Ж‚¤‚І‚ґ‚ў‚Ь‚· - -‚ ‚И‚Ѕ‚Н {SITENAME}‚МѓOѓ‹Ѓ[ѓv‚Е‚ ‚й"{GROUP_NAME}"‚МѓЃѓ“ѓoЃ[‚Й’З‰Б‚і‚к‚Ь‚µ‚ЅЃB‚±‚МЌм‹Ж‚НѓOѓ‹Ѓ[ѓv‚Мѓ‚ѓfѓЊЃ[ѓ^Ѓ[ЃA‚Ь‚Ѕ‚НЉЗ—ќђl‚Й‚ж‚Б‚ДЌs‚н‚к‚Ь‚µ‚ЅЃBЏЪЌЧ‚Й‚В‚ў‚Д‚Н”Ю‚з‚Й–в‚ўЌ‡‚н‚№‚Д‚­‚ѕ‚і‚ўЃB - -ѓOѓ‹Ѓ[ѓvЏо•с‚Н‚±‚ї‚з‚ЕЊ©‚й‚±‚Ж‚Є‚Е‚«‚Ь‚·ЃF -{U_GROUPCP} - -{EMAIL_SIG} +Subject: ‚±‚МѓOѓ‹Ѓ[ѓv‚Й’З‰Б‚і‚к‚Ь‚µ‚Ѕ +Charset: shift_jis + +‚Ё‚Я‚Е‚Ж‚¤‚І‚ґ‚ў‚Ь‚· + +‚ ‚И‚Ѕ‚Н {SITENAME}‚МѓOѓ‹Ѓ[ѓv‚Е‚ ‚й"{GROUP_NAME}"‚МѓЃѓ“ѓoЃ[‚Й’З‰Б‚і‚к‚Ь‚µ‚ЅЃB‚±‚МЌм‹Ж‚НѓOѓ‹Ѓ[ѓv‚Мѓ‚ѓfѓЊЃ[ѓ^Ѓ[ЃA‚Ь‚Ѕ‚НЉЗ—ќђl‚Й‚ж‚Б‚ДЌs‚н‚к‚Ь‚µ‚ЅЃBЏЪЌЧ‚Й‚В‚ў‚Д‚Н”Ю‚з‚Й–в‚ўЌ‡‚н‚№‚Д‚­‚ѕ‚і‚ўЃB + +ѓOѓ‹Ѓ[ѓvЏо•с‚Н‚±‚ї‚з‚ЕЊ©‚й‚±‚Ж‚Є‚Е‚«‚Ь‚·ЃF +{U_GROUPCP} + +{EMAIL_SIG} diff --git a/phpBB/language/lang_japanese/email/group_approved.tpl b/phpBB/language/lang_japanese/email/group_approved.tpl index db77c7695e..5cdb554465 100644 --- a/phpBB/language/lang_japanese/email/group_approved.tpl +++ b/phpBB/language/lang_japanese/email/group_approved.tpl @@ -1,10 +1,11 @@ -Subject: ѓOѓ‹Ѓ[ѓvЋQ‰Б‚Мђ\‚µЌћ‚Э‚НЏі‘ш‚і‚к‚Ь‚µ‚Ѕ - -‚Ё‚Я‚Е‚Ж‚¤‚І‚ґ‚ў‚Ь‚· - -‚ ‚И‚Ѕ‚М{SITENAME}‚МѓOѓ‹Ѓ[ѓv‚Е‚ ‚й"{GROUP_NAME}"‚Й‘О‚·‚йЋQ‰Б‚Є‹–‰В‚і‚к‚Ь‚µ‚ЅЃB -‚ ‚И‚Ѕ‚МѓOѓ‹Ѓ[ѓv‚МѓЃѓ“ѓoЃ[ѓVѓbѓvЏо•с‚рЊ©‚йЏкЌ‡‚НЃA‰є‹L‚МѓЉѓ“ѓN‚рѓNѓЉѓbѓN‚µ‚Д‚­‚ѕ‚і‚ўЃB - -{U_GROUPCP} - -{EMAIL_SIG} +Subject: ѓOѓ‹Ѓ[ѓvЋQ‰Б‚Мђ\‚µЌћ‚Э‚НЏі‘ш‚і‚к‚Ь‚µ‚Ѕ +Charset: shift_jis + +‚Ё‚Я‚Е‚Ж‚¤‚І‚ґ‚ў‚Ь‚· + +‚ ‚И‚Ѕ‚М{SITENAME}‚МѓOѓ‹Ѓ[ѓv‚Е‚ ‚й"{GROUP_NAME}"‚Й‘О‚·‚йЋQ‰Б‚Є‹–‰В‚і‚к‚Ь‚µ‚ЅЃB +‚ ‚И‚Ѕ‚МѓOѓ‹Ѓ[ѓv‚МѓЃѓ“ѓoЃ[ѓVѓbѓvЏо•с‚рЊ©‚йЏкЌ‡‚НЃA‰є‹L‚МѓЉѓ“ѓN‚рѓNѓЉѓbѓN‚µ‚Д‚­‚ѕ‚і‚ўЃB + +{U_GROUPCP} + +{EMAIL_SIG} diff --git a/phpBB/language/lang_japanese/email/group_request.tpl b/phpBB/language/lang_japanese/email/group_request.tpl index e3d858f22b..b4a3f8a03c 100644 --- a/phpBB/language/lang_japanese/email/group_request.tpl +++ b/phpBB/language/lang_japanese/email/group_request.tpl @@ -1,9 +1,10 @@ -Subject: ѓOѓ‹Ѓ[ѓvЋQ‰Б‚Мђ\‚µЌћ‚Э‚Є‚ ‚и‚Ь‚· - -{GROUP_MODERATOR}‚і‚с‚Ц - -ѓ†Ѓ[ѓUЃ[‚Є{SITENAME}‚МѓOѓ‹Ѓ[ѓv‚МЋQ‰Б‚рђ\‚µЌћ‚с‚Е‚ў‚Ь‚·ЃBЋQ‰Б‚МЏі‘шЃE‹‘”Ы‚·‚йЏкЌ‡‚НЃA‰є‹L‚МѓЉѓ“ѓN‚рѓNѓЉѓbѓN‚µ‚Д‚­‚ѕ‚і‚ўЃF - -{U_GROUPCP} - -{EMAIL_SIG} +Subject: ѓOѓ‹Ѓ[ѓvЋQ‰Б‚Мђ\‚µЌћ‚Э‚Є‚ ‚и‚Ь‚· +Charset: shift_jis + +{GROUP_MODERATOR}‚і‚с‚Ц + +ѓ†Ѓ[ѓUЃ[‚Є{SITENAME}‚МѓOѓ‹Ѓ[ѓv‚МЋQ‰Б‚рђ\‚µЌћ‚с‚Е‚ў‚Ь‚·ЃBЋQ‰Б‚МЏі‘шЃE‹‘”Ы‚·‚йЏкЌ‡‚НЃA‰є‹L‚МѓЉѓ“ѓN‚рѓNѓЉѓbѓN‚µ‚Д‚­‚ѕ‚і‚ўЃF + +{U_GROUPCP} + +{EMAIL_SIG} diff --git a/phpBB/language/lang_japanese/email/privmsg_notify.tpl b/phpBB/language/lang_japanese/email/privmsg_notify.tpl index 51a24c7f8a..2781702673 100644 --- a/phpBB/language/lang_japanese/email/privmsg_notify.tpl +++ b/phpBB/language/lang_japanese/email/privmsg_notify.tpl @@ -1,11 +1,12 @@ -Subject: ђV‚µ‚ўѓЃѓbѓZЃ[ѓW‚Є“Н‚«‚Ь‚µ‚Ѕ - -{USERNAME}‚і‚с‚Ц - -"{SITENAME}"‚МЊfЋ¦”В‚ЕЃAђV‚µ‚ўѓvѓ‰ѓCѓxЃ[ѓgѓЃѓbѓZЃ[ѓW‚Є‚ ‚И‚Ѕ€¶‚Й“Н‚ў‚Д‚ў‚Ь‚·ЃB‚ ‚И‚Ѕ‚Мѓ†Ѓ[ѓUЃ[ђЭ’и‚Е‚НЃAѓvѓ‰ѓCѓxЃ[ѓgѓЃѓbѓZЃ[ѓW‚Є“Н‚ў‚ЅЋћ‚ЙЌђ’m‚µ‚Д‚а‚炤‚悤‚ЙђЭ’и‚і‚к‚Д‚ў‚Ь‚·ЃB‰є‹L‚МѓЉѓ“ѓN‚рѓNѓЉѓbѓN‚·‚й‚ЖЃA‘—ђM‚і‚к‚Ѕѓvѓ‰ѓCѓxЃ[ѓgѓЃѓbѓZЃ[ѓW‚рЊ©‚й‚±‚Ж‚Є‚Е‚«‚Ь‚·ЃF - -{U_INBOX} - -ѓvѓ‰ѓCѓxЃ[ѓgѓЃѓbѓZЃ[ѓW‚Є“Н‚ў‚ЅЋћ‚Й’К’m‚р–іЊш‚Й‚µ‚Ѕ‚ўЏкЌ‡‚НЃAѓ†Ѓ[ѓUЃ[ђЭ’и‰ж–К‚ЕЌs‚¤‚±‚Ж‚Є‚Е‚«‚Ь‚·ЃBЃB - +Subject: ђV‚µ‚ўѓЃѓbѓZЃ[ѓW‚Є“Н‚«‚Ь‚µ‚Ѕ +Charset: shift_jis + +{USERNAME}‚і‚с‚Ц + +"{SITENAME}"‚МЊfЋ¦”В‚ЕЃAђV‚µ‚ўѓvѓ‰ѓCѓxЃ[ѓgѓЃѓbѓZЃ[ѓW‚Є‚ ‚И‚Ѕ€¶‚Й“Н‚ў‚Д‚ў‚Ь‚·ЃB‚ ‚И‚Ѕ‚Мѓ†Ѓ[ѓUЃ[ђЭ’и‚Е‚НЃAѓvѓ‰ѓCѓxЃ[ѓgѓЃѓbѓZЃ[ѓW‚Є“Н‚ў‚ЅЋћ‚ЙЌђ’m‚µ‚Д‚а‚炤‚悤‚ЙђЭ’и‚і‚к‚Д‚ў‚Ь‚·ЃB‰є‹L‚МѓЉѓ“ѓN‚рѓNѓЉѓbѓN‚·‚й‚ЖЃA‘—ђM‚і‚к‚Ѕѓvѓ‰ѓCѓxЃ[ѓgѓЃѓbѓZЃ[ѓW‚рЊ©‚й‚±‚Ж‚Є‚Е‚«‚Ь‚·ЃF + +{U_INBOX} + +ѓvѓ‰ѓCѓxЃ[ѓgѓЃѓbѓZЃ[ѓW‚Є“Н‚ў‚ЅЋћ‚Й’К’m‚р–іЊш‚Й‚µ‚Ѕ‚ўЏкЌ‡‚НЃAѓ†Ѓ[ѓUЃ[ђЭ’и‰ж–К‚ЕЌs‚¤‚±‚Ж‚Є‚Е‚«‚Ь‚·ЃBЃB + {EMAIL_SIG} \ No newline at end of file diff --git a/phpBB/language/lang_japanese/email/profile_send_email.tpl b/phpBB/language/lang_japanese/email/profile_send_email.tpl index a713edfd3b..d4ba76883e 100644 --- a/phpBB/language/lang_japanese/email/profile_send_email.tpl +++ b/phpBB/language/lang_japanese/email/profile_send_email.tpl @@ -1,12 +1,14 @@ -{TO_USERNAME}‚і‚с‚Ц - -{FROM_USERNAME}‚Є{SITENAME}‚МЊfЋ¦”В‚р‰о‚µ‚ДѓЃЃ[ѓ‹‚р‘—ђM‚µ‚Д‚«‚Ь‚µ‚ЅЃB‚±‚МѓЃЃ[ѓ‹‚Є‚±‚МѓЃЃ[ѓ‹‚ЄѓXѓpѓЂЃA•sђі‚И‚а‚МЃA”ожЋ’†Џќ“™‚рЉЬ‚Ю‚а‚М‚Е‚ ‚к‚ОЃA‰є‹L‚МѓEѓFѓuѓ}ѓXѓ^Ѓ[‚МѓAѓhѓЊѓX‚М•ы‚Й–в‚ўЌ‡‚н‚№‚Д‚­‚ѕ‚і‚ўЃF - -{BOARD_EMAIL} - -Џг‹L‚МѓAѓhѓЊѓX€¶‚ЙѓЃЃ[ѓ‹‚р‘—‚йЏкЌ‡‚НЃA‘—ђM‚і‚к‚Ѕ‚М“а—eЃi“Б‚Йѓwѓbѓ_Ѓ[Џо•сЃj‚рЉЬ‚Я‚Д‚­‚ѕ‚і‚ўЃB‚±‚МѓЃЃ[ѓ‹‚М•ФђMђж‚НЃA{FROM_USERNAME}‚МѓЃЃ[ѓ‹ѓAѓhѓЊѓX‚И‚М‚Е’Ќ€У‚µ‚Д‚­‚ѕ‚і‚ўЃB - -‚ ‚И‚Ѕ‚Й‘—‚з‚к‚ЅѓЃЃ[ѓ‹‚М“а—e‚Н€И‰є‚М’К‚и‚Е‚· -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -{MESSAGE} +Charset: shift_jis + +{TO_USERNAME}‚і‚с‚Ц + +{FROM_USERNAME}‚Є{SITENAME}‚МЊfЋ¦”В‚р‰о‚µ‚ДѓЃЃ[ѓ‹‚р‘—ђM‚µ‚Д‚«‚Ь‚µ‚ЅЃB‚±‚МѓЃЃ[ѓ‹‚Є‚±‚МѓЃЃ[ѓ‹‚ЄѓXѓpѓЂЃA•sђі‚И‚а‚МЃA”ожЋ’†Џќ“™‚рЉЬ‚Ю‚а‚М‚Е‚ ‚к‚ОЃA‰є‹L‚МѓEѓFѓuѓ}ѓXѓ^Ѓ[‚МѓAѓhѓЊѓX‚М•ы‚Й–в‚ўЌ‡‚н‚№‚Д‚­‚ѕ‚і‚ўЃF + +{BOARD_EMAIL} + +Џг‹L‚МѓAѓhѓЊѓX€¶‚ЙѓЃЃ[ѓ‹‚р‘—‚йЏкЌ‡‚НЃA‘—ђM‚і‚к‚Ѕ‚М“а—eЃi“Б‚Йѓwѓbѓ_Ѓ[Џо•сЃj‚рЉЬ‚Я‚Д‚­‚ѕ‚і‚ўЃB‚±‚МѓЃЃ[ѓ‹‚М•ФђMђж‚НЃA{FROM_USERNAME}‚МѓЃЃ[ѓ‹ѓAѓhѓЊѓX‚И‚М‚Е’Ќ€У‚µ‚Д‚­‚ѕ‚і‚ўЃB + +‚ ‚И‚Ѕ‚Й‘—‚з‚к‚ЅѓЃЃ[ѓ‹‚М“а—e‚Н€И‰є‚М’К‚и‚Е‚· +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +{MESSAGE} diff --git a/phpBB/language/lang_japanese/email/topic_notify.tpl b/phpBB/language/lang_japanese/email/topic_notify.tpl index 84168af0c2..7093b32666 100644 --- a/phpBB/language/lang_japanese/email/topic_notify.tpl +++ b/phpBB/language/lang_japanese/email/topic_notify.tpl @@ -1,13 +1,14 @@ -Subject: •ФђM‚М’К’m - {TOPIC_TITLE} - -{USERNAME}‚і‚с‚Ц - -{SITENAME}‚МЊfЋ¦”В‚М"{TOPIC_TITLE}"‚Ж‚ў‚¤‘и–ј‚МѓgѓsѓbѓN‚ЙђV‚µ‚ў•ФђM‚Є‚ ‚и‚Ь‚·ЃB‚±‚М•ФђM‚НЃA‚ ‚И‚Ѕ‚ЄЌЕЊг‚Й‚±‚МѓgѓsѓbѓN‚Й–K‚к‚ЅЊг‚Й‚ ‚Б‚Ѕ•ФђM‚Е‚·ЃB•ФђM‚рЊ©‚йЏкЌ‡‚НЃA‰є‹L‚МѓЉѓ“ѓN‚рѓNѓЉѓbѓN‚µ‚Д‚­‚ѕ‚і‚ўЃBѓgѓsѓbѓN‚рЉП‰{‚·‚й‚Ь‚Е‚НЃA‚±‚МѓgѓsѓbѓN‚МЌђ’m‚Н€кђШ‚і‚к‚Ь‚№‚сЃB - -{U_TOPIC} - -‚±‚МѓgѓsѓbѓN‚МЌђ’m‚Є‚а‚¤•K—v‚Є‚И‚ўЏкЌ‡‚НЃAѓgѓsѓbѓN‰ж–К‚М‰є‚Й‚ ‚йЃu‚±‚МѓgѓsѓbѓN‚М•ФђM‚Мѓ`ѓFѓbѓN‚р‰рЏњЃv‚рѓNѓЉѓbѓN‚·‚й‚©ЃA‰є‹L‚МѓЉѓ“ѓN‚рѓNѓЉѓbѓN‚µ‚Д‚­‚ѕ‚і‚ўЃF - -{U_STOP_WATCHING_TOPIC} - +Subject: •ФђM‚М’К’m - {TOPIC_TITLE} +Charset: shift_jis + +{USERNAME}‚і‚с‚Ц + +{SITENAME}‚МЊfЋ¦”В‚М"{TOPIC_TITLE}"‚Ж‚ў‚¤‘и–ј‚МѓgѓsѓbѓN‚ЙђV‚µ‚ў•ФђM‚Є‚ ‚и‚Ь‚·ЃB‚±‚М•ФђM‚НЃA‚ ‚И‚Ѕ‚ЄЌЕЊг‚Й‚±‚МѓgѓsѓbѓN‚Й–K‚к‚ЅЊг‚Й‚ ‚Б‚Ѕ•ФђM‚Е‚·ЃB•ФђM‚рЊ©‚йЏкЌ‡‚НЃA‰є‹L‚МѓЉѓ“ѓN‚рѓNѓЉѓbѓN‚µ‚Д‚­‚ѕ‚і‚ўЃBѓgѓsѓbѓN‚рЉП‰{‚·‚й‚Ь‚Е‚НЃA‚±‚МѓgѓsѓbѓN‚МЌђ’m‚Н€кђШ‚і‚к‚Ь‚№‚сЃB + +{U_TOPIC} + +‚±‚МѓgѓsѓbѓN‚МЌђ’m‚Є‚а‚¤•K—v‚Є‚И‚ўЏкЌ‡‚НЃAѓgѓsѓbѓN‰ж–К‚М‰є‚Й‚ ‚йЃu‚±‚МѓgѓsѓbѓN‚М•ФђM‚Мѓ`ѓFѓbѓN‚р‰рЏњЃv‚рѓNѓЉѓbѓN‚·‚й‚©ЃA‰є‹L‚МѓЉѓ“ѓN‚рѓNѓЉѓbѓN‚µ‚Д‚­‚ѕ‚і‚ўЃF + +{U_STOP_WATCHING_TOPIC} + {EMAIL_SIG} \ No newline at end of file diff --git a/phpBB/language/lang_japanese/email/user_activate.tpl b/phpBB/language/lang_japanese/email/user_activate.tpl index d0257fdc39..bb4f5c3aec 100644 --- a/phpBB/language/lang_japanese/email/user_activate.tpl +++ b/phpBB/language/lang_japanese/email/user_activate.tpl @@ -1,9 +1,10 @@ -Subject: Reactivate your account! - -{USERNAME}‚і‚с‚Ц - -"{SITENAME}"‚Й‚Ё‚Ї‚йѓAѓJѓEѓ“ѓg‚МѓAѓNѓeѓBѓu‚Є–іЊш‚Ж‚И‚и‚Ь‚µ‚ЅЃB‚Ё‚»‚з‚­ѓ†Ѓ[ѓUЃ[ђЭ’и‚р‚µ‚Ѕ‚Ѕ‚Я‚ѕ‚ЖЌl‚¦‚з‚к‚Ь‚·ЃBѓAѓJѓEѓ“ѓg‚рЌД‚СѓAѓNѓeѓBѓu‚Й‚·‚йЏкЌ‡‚НЃA‰є‹L‚МѓЉѓ“ѓN‚рѓNѓЉѓbѓN‚µ‚Д‚­‚ѕ‚і‚ўЃF - -{U_ACTIVATE} - +Subject: Reactivate your account! +Charset: shift_jis + +{USERNAME}‚і‚с‚Ц + +"{SITENAME}"‚Й‚Ё‚Ї‚йѓAѓJѓEѓ“ѓg‚МѓAѓNѓeѓBѓu‚Є–іЊш‚Ж‚И‚и‚Ь‚µ‚ЅЃB‚Ё‚»‚з‚­ѓ†Ѓ[ѓUЃ[ђЭ’и‚р‚µ‚Ѕ‚Ѕ‚Я‚ѕ‚ЖЌl‚¦‚з‚к‚Ь‚·ЃBѓAѓJѓEѓ“ѓg‚рЌД‚СѓAѓNѓeѓBѓu‚Й‚·‚йЏкЌ‡‚НЃA‰є‹L‚МѓЉѓ“ѓN‚рѓNѓЉѓbѓN‚µ‚Д‚­‚ѕ‚і‚ўЃF + +{U_ACTIVATE} + {EMAIL_SIG} \ No newline at end of file diff --git a/phpBB/language/lang_japanese/email/user_activate_passwd.tpl b/phpBB/language/lang_japanese/email/user_activate_passwd.tpl index af2dbf0354..d9686e5221 100644 --- a/phpBB/language/lang_japanese/email/user_activate_passwd.tpl +++ b/phpBB/language/lang_japanese/email/user_activate_passwd.tpl @@ -1,17 +1,18 @@ -Subject: ђV‚µ‚ўѓpѓXѓЏЃ[ѓh‚МѓAѓNѓeѓBѓxЃ[ѓVѓ‡ѓ“ - -{USERNAME}‚і‚с‚Ц - -‚±‚МѓЃЃ[ѓ‹‚НЃA‚ ‚И‚ЅЃi–”‚Н‚ ‚И‚Ѕ‚р‘•‚Б‚Ѕ’N‚©Ѓj‚Є{SITENAME}‚МѓAѓJѓEѓ“ѓg‚МђV‚µ‚ўѓpѓXѓЏЃ[ѓh‚р”­Ќs‚·‚йѓЉѓNѓGѓXѓg‚рЌs‚Б‚Ѕ‚Ѕ‚Я‚Й‘—ђM‚і‚к‚Ь‚µ‚ЅЃBѓЉѓNѓGѓXѓg‚рЌs‚Б‚Д‚ў‚И‚ўЏкЌ‡‚НЃA‚±‚МѓЃЃ[ѓ‹‚р–іЋ‹‚µ‚Д‚­‚ѕ‚і‚ўЃB‰Ѕ“x‚а“Ї‚¶ѓЃЃ[ѓ‹‚Є—€‚йЏкЌ‡‚НЃAЉЗ—ќђl‚Й–в‚ўЌ‡‚н‚№‚Д‚­‚ѕ‚і‚ўЃB - -ђV‚µ‚ўѓpѓXѓЏЃ[ѓh‚рЋg—p‚·‚йЏкЌ‡‚НЃAѓAѓJѓEѓ“ѓg‚рѓAѓNѓeѓBѓu‚Й‚·‚й•K—v‚Є‚ ‚и‚Ь‚·ЃBѓAѓJѓEѓ“ѓg‚МѓAѓNѓeѓBѓxЃ[ѓVѓ‡ѓ“‚рЌs‚¤ЏкЌ‡‚НЃA‰є‹L‚МѓЉѓ“ѓN‚рѓNѓЉѓbѓN‚µ‚Д‚­‚ѕ‚і‚ўЃB - -{U_ACTIVATE} - -ѓAѓJѓEѓ“ѓg‚рѓAѓNѓeѓBѓu‚Й‚µ‚Ѕ‚зЃA‰є‹L‚МѓpѓXѓЏЃ[ѓh‚рЋg‚Б‚ДѓЌѓOѓCѓ“‚Е‚«‚й‚悤‚Й‚И‚и‚Ь‚·ЃF - -ѓpѓXѓЏЃ[ѓh: {PASSWORD} - -ѓpѓXѓЏЃ[ѓh‚МЌД”­Ќs‚р‚µ‚И‚­‚Д‚аЃAѓ†Ѓ[ѓUЃ[ђЭ’и‚©‚зѓpѓXѓЏЃ[ѓh‚р•ПЌX‚·‚й‚±‚Ж‚Є‚Е‚«‚Ь‚·ЃB‰Ѕ‚©–в‘и‚Є‚ ‚йЏкЌ‡‚НЃAЊfЋ¦”В‚МЉЗ—ќђl‚Й–в‚ўЌ‡‚н‚№‚Д‚­‚ѕ‚і‚ўЃB - +Subject: ђV‚µ‚ўѓpѓXѓЏЃ[ѓh‚МѓAѓNѓeѓBѓxЃ[ѓVѓ‡ѓ“ +Charset: shift_jis + +{USERNAME}‚і‚с‚Ц + +‚±‚МѓЃЃ[ѓ‹‚НЃA‚ ‚И‚ЅЃi–”‚Н‚ ‚И‚Ѕ‚р‘•‚Б‚Ѕ’N‚©Ѓj‚Є{SITENAME}‚МѓAѓJѓEѓ“ѓg‚МђV‚µ‚ўѓpѓXѓЏЃ[ѓh‚р”­Ќs‚·‚йѓЉѓNѓGѓXѓg‚рЌs‚Б‚Ѕ‚Ѕ‚Я‚Й‘—ђM‚і‚к‚Ь‚µ‚ЅЃBѓЉѓNѓGѓXѓg‚рЌs‚Б‚Д‚ў‚И‚ўЏкЌ‡‚НЃA‚±‚МѓЃЃ[ѓ‹‚р–іЋ‹‚µ‚Д‚­‚ѕ‚і‚ўЃB‰Ѕ“x‚а“Ї‚¶ѓЃЃ[ѓ‹‚Є—€‚йЏкЌ‡‚НЃAЉЗ—ќђl‚Й–в‚ўЌ‡‚н‚№‚Д‚­‚ѕ‚і‚ўЃB + +ђV‚µ‚ўѓpѓXѓЏЃ[ѓh‚рЋg—p‚·‚йЏкЌ‡‚НЃAѓAѓJѓEѓ“ѓg‚рѓAѓNѓeѓBѓu‚Й‚·‚й•K—v‚Є‚ ‚и‚Ь‚·ЃBѓAѓJѓEѓ“ѓg‚МѓAѓNѓeѓBѓxЃ[ѓVѓ‡ѓ“‚рЌs‚¤ЏкЌ‡‚НЃA‰є‹L‚МѓЉѓ“ѓN‚рѓNѓЉѓbѓN‚µ‚Д‚­‚ѕ‚і‚ўЃB + +{U_ACTIVATE} + +ѓAѓJѓEѓ“ѓg‚рѓAѓNѓeѓBѓu‚Й‚µ‚Ѕ‚зЃA‰є‹L‚МѓpѓXѓЏЃ[ѓh‚рЋg‚Б‚ДѓЌѓOѓCѓ“‚Е‚«‚й‚悤‚Й‚И‚и‚Ь‚·ЃF + +ѓpѓXѓЏЃ[ѓh: {PASSWORD} + +ѓpѓXѓЏЃ[ѓh‚МЌД”­Ќs‚р‚µ‚И‚­‚Д‚аЃAѓ†Ѓ[ѓUЃ[ђЭ’и‚©‚зѓpѓXѓЏЃ[ѓh‚р•ПЌX‚·‚й‚±‚Ж‚Є‚Е‚«‚Ь‚·ЃB‰Ѕ‚©–в‘и‚Є‚ ‚йЏкЌ‡‚НЃAЊfЋ¦”В‚МЉЗ—ќђl‚Й–в‚ўЌ‡‚н‚№‚Д‚­‚ѕ‚і‚ўЃB + {EMAIL_SIG} \ No newline at end of file diff --git a/phpBB/language/lang_japanese/email/user_welcome.tpl b/phpBB/language/lang_japanese/email/user_welcome.tpl index 717036fff4..623a370ed7 100644 --- a/phpBB/language/lang_japanese/email/user_welcome.tpl +++ b/phpBB/language/lang_japanese/email/user_welcome.tpl @@ -1,18 +1,19 @@ -Subject: ‚悤‚±‚»{SITENAME}‚МЊfЋ¦”В‚Ц - -{WELCOME_MSG} - - -‚±‚МѓЃЃ[ѓ‹‚Н‘еђШ‚Й•ЫЉЗ‚µ‚Д‚­‚ѕ‚і‚ўЃB‚ ‚И‚Ѕ‚МѓAѓJѓEѓ“ѓgЏо•с‚Н€И‰є‚М’К‚и‚Е‚·ЃF - ----------------------------- -–ј‘O: {USERNAME} -ѓpѓXѓЏЃ[ѓh: {PASSWORD} ----------------------------- - - -ѓAѓJѓEѓ“ѓg‚МѓpѓXѓЏЃ[ѓh‚НѓfЃ[ѓ^ѓxЃ[ѓX“а‚Е€ГЌ†‰»‚і‚к‚Д‚ў‚й‚Ѕ‚ЯЃAѓpѓXѓЏЃ[ѓh‚р–Y‚к‚Д‚µ‚Ь‚Б‚ЅЏкЌ‡‚ЙЃA‚»‚МѓpѓXѓЏЃ[ѓh‚рЊ©‚В‚ЇЏo‚·‚±‚Ж‚Н‚Е‚«‚И‚ў‚М‚Е’Ќ€У‚µ‚Д‚­‚ѕ‚і‚ўЃB‚µ‚©‚µЃA–њ‚Є€кѓpѓXѓЏЃ[ѓh‚р–Y‚к‚Д‚µ‚Ь‚Б‚ЅЏкЌ‡‚НЃAђV‚µ‚ўѓpѓXѓЏЃ[ѓh‚р”­Ќs‚·‚й‚±‚Ж‚Є‚Е‚«‚Ь‚·ЃB - -ѓ†Ѓ[ѓUЃ[“o^‚р‚µ‚Д‚ў‚Ѕ‚ѕ‚«ЃA‚Ь‚±‚Ж‚Й—L“‚І‚ґ‚ў‚Ь‚·ЃB - +Subject: ‚悤‚±‚»{SITENAME}‚МЊfЋ¦”В‚Ц +Charset: shift_jis + +{WELCOME_MSG} + + +‚±‚МѓЃЃ[ѓ‹‚Н‘еђШ‚Й•ЫЉЗ‚µ‚Д‚­‚ѕ‚і‚ўЃB‚ ‚И‚Ѕ‚МѓAѓJѓEѓ“ѓgЏо•с‚Н€И‰є‚М’К‚и‚Е‚·ЃF + +---------------------------- +–ј‘O: {USERNAME} +ѓpѓXѓЏЃ[ѓh: {PASSWORD} +---------------------------- + + +ѓAѓJѓEѓ“ѓg‚МѓpѓXѓЏЃ[ѓh‚НѓfЃ[ѓ^ѓxЃ[ѓX“а‚Е€ГЌ†‰»‚і‚к‚Д‚ў‚й‚Ѕ‚ЯЃAѓpѓXѓЏЃ[ѓh‚р–Y‚к‚Д‚µ‚Ь‚Б‚ЅЏкЌ‡‚ЙЃA‚»‚МѓpѓXѓЏЃ[ѓh‚рЊ©‚В‚ЇЏo‚·‚±‚Ж‚Н‚Е‚«‚И‚ў‚М‚Е’Ќ€У‚µ‚Д‚­‚ѕ‚і‚ўЃB‚µ‚©‚µЃA–њ‚Є€кѓpѓXѓЏЃ[ѓh‚р–Y‚к‚Д‚µ‚Ь‚Б‚ЅЏкЌ‡‚НЃAђV‚µ‚ўѓpѓXѓЏЃ[ѓh‚р”­Ќs‚·‚й‚±‚Ж‚Є‚Е‚«‚Ь‚·ЃB + +ѓ†Ѓ[ѓUЃ[“o^‚р‚µ‚Д‚ў‚Ѕ‚ѕ‚«ЃA‚Ь‚±‚Ж‚Й—L“‚І‚ґ‚ў‚Ь‚·ЃB + {EMAIL_SIG} \ No newline at end of file diff --git a/phpBB/language/lang_japanese/email/user_welcome_inactive.tpl b/phpBB/language/lang_japanese/email/user_welcome_inactive.tpl index c80dffe03b..e7de70f3ae 100644 --- a/phpBB/language/lang_japanese/email/user_welcome_inactive.tpl +++ b/phpBB/language/lang_japanese/email/user_welcome_inactive.tpl @@ -1,21 +1,22 @@ -Subject: ‚悤‚±‚»{SITENAME}‚МЊfЋ¦”В‚Ц - -{WELCOME_MSG} - -‚±‚МѓЃЃ[ѓ‹‚Н‘еђШ‚Й•ЫЉЗ‚µ‚Д‚­‚ѕ‚і‚ўЃB‚ ‚И‚Ѕ‚МѓAѓJѓEѓ“ѓgЏо•с‚Н€И‰є‚М’К‚и‚Е‚·ЃF - - ----------------------------- -–ј‘O: {USERNAME} -ѓpѓXѓЏЃ[ѓh: {PASSWORD} ----------------------------- - -‚ ‚И‚Ѕ‚МѓAѓJѓEѓ“ѓg‚НЊ»ЌЭѓAѓNѓeѓBѓu‚Е‚Н‚ ‚и‚Ь‚№‚сЃB‰є‹L‚МѓЉѓ“ѓN‚рѓNѓЉѓbѓN‚µ‚ДѓAѓJѓEѓ“ѓg‚МѓAѓNѓeѓBѓxЃ[ѓVѓ‡ѓ“‚рЌs‚¤•K—v‚Є‚ ‚и‚Ь‚·ЃB - -{U_ACTIVATE} - -ѓAѓJѓEѓ“ѓg‚МѓpѓXѓЏЃ[ѓh‚НѓfЃ[ѓ^ѓxЃ[ѓX“а‚Е€ГЌ†‰»‚і‚к‚Д‚ў‚й‚Ѕ‚ЯЃAѓpѓXѓЏЃ[ѓh‚р–Y‚к‚Д‚µ‚Ь‚Б‚ЅЏкЌ‡‚ЙЃA‚»‚МѓpѓXѓЏЃ[ѓh‚рЊ©‚В‚ЇЏo‚·‚±‚Ж‚Н‚Е‚«‚И‚ў‚М‚Е’Ќ€У‚µ‚Д‚­‚ѕ‚і‚ўЃB‚µ‚©‚µЃA–њ‚Є€кѓpѓXѓЏЃ[ѓh‚р–Y‚к‚Д‚µ‚Ь‚Б‚ЅЏкЌ‡‚НЃAђV‚µ‚ўѓpѓXѓЏЃ[ѓh‚р”­Ќs‚·‚й‚±‚Ж‚Є‚Е‚«‚Ь‚·ЃB - -ѓ†Ѓ[ѓUЃ[“o^‚р‚µ‚Д‚ў‚Ѕ‚ѕ‚«ЃA‚Ь‚±‚Ж‚Й—L“‚І‚ґ‚ў‚Ь‚·ЃB - +Subject: ‚悤‚±‚»{SITENAME}‚МЊfЋ¦”В‚Ц +Charset: shift_jis + +{WELCOME_MSG} + +‚±‚МѓЃЃ[ѓ‹‚Н‘еђШ‚Й•ЫЉЗ‚µ‚Д‚­‚ѕ‚і‚ўЃB‚ ‚И‚Ѕ‚МѓAѓJѓEѓ“ѓgЏо•с‚Н€И‰є‚М’К‚и‚Е‚·ЃF + + +---------------------------- +–ј‘O: {USERNAME} +ѓpѓXѓЏЃ[ѓh: {PASSWORD} +---------------------------- + +‚ ‚И‚Ѕ‚МѓAѓJѓEѓ“ѓg‚НЊ»ЌЭѓAѓNѓeѓBѓu‚Е‚Н‚ ‚и‚Ь‚№‚сЃB‰є‹L‚МѓЉѓ“ѓN‚рѓNѓЉѓbѓN‚µ‚ДѓAѓJѓEѓ“ѓg‚МѓAѓNѓeѓBѓxЃ[ѓVѓ‡ѓ“‚рЌs‚¤•K—v‚Є‚ ‚и‚Ь‚·ЃB + +{U_ACTIVATE} + +ѓAѓJѓEѓ“ѓg‚МѓpѓXѓЏЃ[ѓh‚НѓfЃ[ѓ^ѓxЃ[ѓX“а‚Е€ГЌ†‰»‚і‚к‚Д‚ў‚й‚Ѕ‚ЯЃAѓpѓXѓЏЃ[ѓh‚р–Y‚к‚Д‚µ‚Ь‚Б‚ЅЏкЌ‡‚ЙЃA‚»‚МѓpѓXѓЏЃ[ѓh‚рЊ©‚В‚ЇЏo‚·‚±‚Ж‚Н‚Е‚«‚И‚ў‚М‚Е’Ќ€У‚µ‚Д‚­‚ѕ‚і‚ўЃB‚µ‚©‚µЃA–њ‚Є€кѓpѓXѓЏЃ[ѓh‚р–Y‚к‚Д‚µ‚Ь‚Б‚ЅЏкЌ‡‚НЃAђV‚µ‚ўѓpѓXѓЏЃ[ѓh‚р”­Ќs‚·‚й‚±‚Ж‚Є‚Е‚«‚Ь‚·ЃB + +ѓ†Ѓ[ѓUЃ[“o^‚р‚µ‚Д‚ў‚Ѕ‚ѕ‚«ЃA‚Ь‚±‚Ж‚Й—L“‚І‚ґ‚ў‚Ь‚·ЃB + {EMAIL_SIG} \ No newline at end of file diff --git a/phpBB/language/lang_korean/email/admin_activate.tpl b/phpBB/language/lang_korean/email/admin_activate.tpl index 0d2d7ed3e2..1220865e5d 100644 --- a/phpBB/language/lang_korean/email/admin_activate.tpl +++ b/phpBB/language/lang_korean/email/admin_activate.tpl @@ -1,4 +1,5 @@ Subject: »х·Оїо »зїлАЪ ѕЖАМµр +Charset: euc-kr Hello, diff --git a/phpBB/language/lang_korean/email/admin_send_email.tpl b/phpBB/language/lang_korean/email/admin_send_email.tpl index 11b45f2da2..c39d4671e1 100644 --- a/phpBB/language/lang_korean/email/admin_send_email.tpl +++ b/phpBB/language/lang_korean/email/admin_send_email.tpl @@ -1,7 +1,9 @@ -ѕИізЗПјјїд... {SITENAME} АФґПґЩ.. -є» ёЮАПАє {SITENAME} ИёїшґФµйїЎ°Ф єёі»БцґВ ёЮАПАФґПґЩ.. - -{MESSAGE} -_______________________ -{BOARD_EMAIL} -http://www.eazycom.net +Charset: euc-kr + +ѕИізЗПјјїд... {SITENAME} АФґПґЩ.. +є» ёЮАПАє {SITENAME} ИёїшґФµйїЎ°Ф єёі»БцґВ ёЮАПАФґПґЩ.. + +{MESSAGE} +_______________________ +{BOARD_EMAIL} +http://www.eazycom.net diff --git a/phpBB/language/lang_korean/email/admin_welcome_activated.tpl b/phpBB/language/lang_korean/email/admin_welcome_activated.tpl index b81c91ccc2..2053cc4230 100644 --- a/phpBB/language/lang_korean/email/admin_welcome_activated.tpl +++ b/phpBB/language/lang_korean/email/admin_welcome_activated.tpl @@ -1,4 +1,5 @@ Subject: ѕЖАМµр И°јє +Charset: euc-kr Hello {USERNAME}, diff --git a/phpBB/language/lang_korean/email/admin_welcome_inactive.tpl b/phpBB/language/lang_korean/email/admin_welcome_inactive.tpl index a399bed2c1..ee769d5373 100644 --- a/phpBB/language/lang_korean/email/admin_welcome_inactive.tpl +++ b/phpBB/language/lang_korean/email/admin_welcome_inactive.tpl @@ -1,4 +1,5 @@ Subject: {SITENAME} +Charset: euc-kr {WELCOME_MSG} АФґПґЩ. diff --git a/phpBB/language/lang_korean/email/coppa_welcome_inactive.tpl b/phpBB/language/lang_korean/email/coppa_welcome_inactive.tpl index 4fe00c0a1d..99d4ac8b18 100644 --- a/phpBB/language/lang_korean/email/coppa_welcome_inactive.tpl +++ b/phpBB/language/lang_korean/email/coppa_welcome_inactive.tpl @@ -1,4 +1,5 @@ Subject: {SITENAME} +Charset: euc-kr {WELCOME_MSG} diff --git a/phpBB/language/lang_korean/email/group_added.tpl b/phpBB/language/lang_korean/email/group_added.tpl index 6503ff9c7c..0ed83ea86e 100644 --- a/phpBB/language/lang_korean/email/group_added.tpl +++ b/phpBB/language/lang_korean/email/group_added.tpl @@ -1,4 +1,5 @@ Subject: АМ АЇАъ±Ч·мїЎ ГЯ°ЎµЗѕъЅАґПґЩ. +Charset: euc-kr Congratulations, diff --git a/phpBB/language/lang_korean/email/group_approved.tpl b/phpBB/language/lang_korean/email/group_approved.tpl index fb2edda488..7ab37ad6d1 100644 --- a/phpBB/language/lang_korean/email/group_approved.tpl +++ b/phpBB/language/lang_korean/email/group_approved.tpl @@ -1,10 +1,11 @@ -Subject: ёв№ц ЅВАОАМ µЗѕъАЅА» ѕЛ·БµеёіґПґЩ. - -ГаЗПµеёіґПґЩ.. - -їдГ»ЗПЅЕ {SITENAME} АЗ "{GROUP_NAME}" їЎ ёв№ц·О ЅВАОАМ µЗјМЅАґПґЩ. -ѕЖ·ЎАЗ URLА» Е¬ёЇЗПјЕј­ И®АОЗШєёЅГ±в №Щ¶шґПґЩ... - -{U_GROUPCP} - -{EMAIL_SIG} +Subject: ёв№ц ЅВАОАМ µЗѕъАЅА» ѕЛ·БµеёіґПґЩ. +Charset: euc-kr + +ГаЗПµеёіґПґЩ.. + +їдГ»ЗПЅЕ {SITENAME} АЗ "{GROUP_NAME}" їЎ ёв№ц·О ЅВАОАМ µЗјМЅАґПґЩ. +ѕЖ·ЎАЗ URLА» Е¬ёЇЗПјЕј­ И®АОЗШєёЅГ±в №Щ¶шґПґЩ... + +{U_GROUPCP} + +{EMAIL_SIG} diff --git a/phpBB/language/lang_korean/email/group_request.tpl b/phpBB/language/lang_korean/email/group_request.tpl index b9d8a29a8c..e54055380b 100644 --- a/phpBB/language/lang_korean/email/group_request.tpl +++ b/phpBB/language/lang_korean/email/group_request.tpl @@ -1,12 +1,13 @@ -Subject: »х·Оїо ёЮ№цґФІІј­ µо·ПЅЕГ»А» ЗПјМЅАґПґЩ - -ѕИізЗПјјїд.. {GROUP_MODERATOR} ґФ..! - -є» ёЮАПАє {SITENAME} АЗ ±Ч·м °ьё®АЪїЎ°Ф єёі»БцґВ ёЮАПАФґПґЩ. - -{GROUP_MODERATOR} ґФАЗ ±Ч·мїЎ »х·Оїо ёв№цґФІІј­ µо·П ЅЕГ»А» ЗПјМЅАґПґЩ -ѕЖ·ЎАЗ ёµЕ©·О АМµїЗПјЕј­ µо·П АЇ,№«ё¦ И®АОЗШ БЦЅГ±в №Щ¶шґПґЩ.. - -{U_GROUPCP} - -{EMAIL_SIG} +Subject: »х·Оїо ёЮ№цґФІІј­ µо·ПЅЕГ»А» ЗПјМЅАґПґЩ +Charset: euc-kr + +ѕИізЗПјјїд.. {GROUP_MODERATOR} ґФ..! + +є» ёЮАПАє {SITENAME} АЗ ±Ч·м °ьё®АЪїЎ°Ф єёі»БцґВ ёЮАПАФґПґЩ. + +{GROUP_MODERATOR} ґФАЗ ±Ч·мїЎ »х·Оїо ёв№цґФІІј­ µо·П ЅЕГ»А» ЗПјМЅАґПґЩ +ѕЖ·ЎАЗ ёµЕ©·О АМµїЗПјЕј­ µо·П АЇ,№«ё¦ И®АОЗШ БЦЅГ±в №Щ¶шґПґЩ.. + +{U_GROUPCP} + +{EMAIL_SIG} diff --git a/phpBB/language/lang_korean/email/privmsg_notify.tpl b/phpBB/language/lang_korean/email/privmsg_notify.tpl index ab50186262..0df54d3df8 100644 --- a/phpBB/language/lang_korean/email/privmsg_notify.tpl +++ b/phpBB/language/lang_korean/email/privmsg_notify.tpl @@ -1,16 +1,17 @@ -Subject: »х ВКБц°Ў µµВшЗЯЅАґПґЩ. - -ѕИізЗПјјїд.. {USERNAME} ґФ..! - -{SITENAME} їЎ {USERNAME} ґФїЎ°Ф »х ВКБц°Ў µµВшЗЯЅАґПґЩ. -ѕЖ·ЎАЗ URL·О АМµїЗПјЕј­ И®АО ЗШєёјјїд.. - -{U_INBOX} - -ВКБцё¦ ёЮАП·О јцЅЕА» їшЗПБц ѕКАёЅЗ°жїмїЎґВ ѕрБ¦µзБц -{SITENAME} АЗ °іАОБ¤єё єЇ°жїЎј­ єЇ°жЗПЅЗјц АЦЅАґПґЩ.. - -АМ»у {SITENAME} АМѕъЅАґПґЩ.. -±Ч·і ЖтѕИЗС ЗП·з µЗјТј­...!! - +Subject: »х ВКБц°Ў µµВшЗЯЅАґПґЩ. +Charset: euc-kr + +ѕИізЗПјјїд.. {USERNAME} ґФ..! + +{SITENAME} їЎ {USERNAME} ґФїЎ°Ф »х ВКБц°Ў µµВшЗЯЅАґПґЩ. +ѕЖ·ЎАЗ URL·О АМµїЗПјЕј­ И®АО ЗШєёјјїд.. + +{U_INBOX} + +ВКБцё¦ ёЮАП·О јцЅЕА» їшЗПБц ѕКАёЅЗ°жїмїЎґВ ѕрБ¦µзБц +{SITENAME} АЗ °іАОБ¤єё єЇ°жїЎј­ єЇ°жЗПЅЗјц АЦЅАґПґЩ.. + +АМ»у {SITENAME} АМѕъЅАґПґЩ.. +±Ч·і ЖтѕИЗС ЗП·з µЗјТј­...!! + {EMAIL_SIG} \ No newline at end of file diff --git a/phpBB/language/lang_korean/email/profile_send_email.tpl b/phpBB/language/lang_korean/email/profile_send_email.tpl index 47f256fe28..10c0b58cdc 100644 --- a/phpBB/language/lang_korean/email/profile_send_email.tpl +++ b/phpBB/language/lang_korean/email/profile_send_email.tpl @@ -1,8 +1,10 @@ -ѕИізЗПјјїд... {TO_USERNAME} ґФ! -{SITENAME} АЗ {FROM_USERNAME} АФґПґЩ. - -{MESSAGE} - ----------------------- -{BOARD_EMAIL} +Charset: euc-kr + +ѕИізЗПјјїд... {TO_USERNAME} ґФ! +{SITENAME} АЗ {FROM_USERNAME} АФґПґЩ. + +{MESSAGE} + +---------------------- +{BOARD_EMAIL} http://www.eazycom.net \ No newline at end of file diff --git a/phpBB/language/lang_korean/email/topic_notify.tpl b/phpBB/language/lang_korean/email/topic_notify.tpl index 2f9cfba4d9..7461fafdc7 100644 --- a/phpBB/language/lang_korean/email/topic_notify.tpl +++ b/phpBB/language/lang_korean/email/topic_notify.tpl @@ -1,17 +1,18 @@ -Subject: ґдєЇ±ЫАМ µо·ПµЗѕъЅАґПґЩ. - {TOPIC_TITLE} - -ѕИізЗПјјїд.. {USERNAME}ґФ.! - -{SITENAME} їЎј­ АЫјєЗС {TOPIC_TITLE} їЎ ґлЗС -ґдєЇ±ЫАМ µо·П µЗѕъЅАґПґЩ.. -ѕЖ·Ў Url·О АМµї ЗПјЕј­ ЗРАОЗШєёЅГ±в №Щ¶шґПґЩ. - -{U_TOPIC} - -If you no longer wish to watch this topic you can either click the -"Stop watching this topic link" found at the bottom of the topic above, -or by clicking the following link: - -{U_STOP_WATCHING_TOPIC} - +Subject: ґдєЇ±ЫАМ µо·ПµЗѕъЅАґПґЩ. - {TOPIC_TITLE} +Charset: euc-kr + +ѕИізЗПјјїд.. {USERNAME}ґФ.! + +{SITENAME} їЎј­ АЫјєЗС {TOPIC_TITLE} їЎ ґлЗС +ґдєЇ±ЫАМ µо·П µЗѕъЅАґПґЩ.. +ѕЖ·Ў Url·О АМµї ЗПјЕј­ ЗРАОЗШєёЅГ±в №Щ¶шґПґЩ. + +{U_TOPIC} + +If you no longer wish to watch this topic you can either click the +"Stop watching this topic link" found at the bottom of the topic above, +or by clicking the following link: + +{U_STOP_WATCHING_TOPIC} + {EMAIL_SIG} \ No newline at end of file diff --git a/phpBB/language/lang_korean/email/user_activate.tpl b/phpBB/language/lang_korean/email/user_activate.tpl index 5fd8afcdc7..013aa8f72f 100644 --- a/phpBB/language/lang_korean/email/user_activate.tpl +++ b/phpBB/language/lang_korean/email/user_activate.tpl @@ -1,4 +1,5 @@ Subject: ґзЅЕАЗ ѕЖАМµрё¦ И°јєИ­ ЅГДСБЦјјїд! +Charset: euc-kr Hello {USERNAME}, diff --git a/phpBB/language/lang_korean/email/user_activate_passwd.tpl b/phpBB/language/lang_korean/email/user_activate_passwd.tpl index 1aa79dd7fc..f301ef99b5 100644 --- a/phpBB/language/lang_korean/email/user_activate_passwd.tpl +++ b/phpBB/language/lang_korean/email/user_activate_passwd.tpl @@ -1,14 +1,15 @@ -Subject: їдГ»ЗПЅЕ »х єс№Р№шИЈ АФґПґЩ. - -ѕИізЗПјјїд.. {USERNAME} ґФ..! - -{SITENAME} їЎј­ їдГ»ЗПЅЕ »х єс№Р№шИЈ°Ў №Я±ЮµЗѕъЅАґПґЩ. -Бц±Э ѕЖ·ЎАЗ URL·О АМµїЗПјЕј­ їшЗПЅГґВ єс№Р№шИЈ·О єЇ°жЗПЅГ±в №Щ¶шґПґЩ. - -{U_ACTIVATE} - -»х·О №Я±ЮµИ єс№Р№шИЈ АФґПґЩ.. - -єс№Р№шИЈ : {PASSWORD} - -{EMAIL_SIG} +Subject: їдГ»ЗПЅЕ »х єс№Р№шИЈ АФґПґЩ. +Charset: euc-kr + +ѕИізЗПјјїд.. {USERNAME} ґФ..! + +{SITENAME} їЎј­ їдГ»ЗПЅЕ »х єс№Р№шИЈ°Ў №Я±ЮµЗѕъЅАґПґЩ. +Бц±Э ѕЖ·ЎАЗ URL·О АМµїЗПјЕј­ їшЗПЅГґВ єс№Р№шИЈ·О єЇ°жЗПЅГ±в №Щ¶шґПґЩ. + +{U_ACTIVATE} + +»х·О №Я±ЮµИ єс№Р№шИЈ АФґПґЩ.. + +єс№Р№шИЈ : {PASSWORD} + +{EMAIL_SIG} diff --git a/phpBB/language/lang_korean/email/user_welcome.tpl b/phpBB/language/lang_korean/email/user_welcome.tpl index 3545d5b5b5..88e626ee40 100644 --- a/phpBB/language/lang_korean/email/user_welcome.tpl +++ b/phpBB/language/lang_korean/email/user_welcome.tpl @@ -1,21 +1,22 @@ -Subject: {SITENAME} - -ѕИізЗПјјїд..{WELCOME_MSG} АФґПґЩ.. -{WELCOME_MSG} їЎ °ЎАФЗПЅЕ°НА» БшЅЙАё·О ИЇїµЗХґПґЩ. -µо·ПЗПЅЕ °иБ¤Б¤єёґВ ґЩАЅ°ъ °°ЅАґПґЩ. - ----------------------------- -ѕЖ АМ µр : {USERNAME} -єс№Р№шИЈ : {PASSWORD} ----------------------------- - -ЖРЅєїцµеё¦ єРЅЗЗПјМґЩёй Жч·іїЎј­ АМёЮАПА» АФ·ВЗПЅГёй АУАЗАЗ ЖРЅєїцµеё¦ -№Я±Ю№ЮА»јц АЦЅАґПґЩ... №Я±Ю№ЮАє єс№Р№шИЈ·О ѕЛ±вЅ¬їо єс№Р№шИЈ·О Аз єЇ°ж -ЗПјЕј­ »зїлЗПЅГёй µЛґПґЩ..АМ єс№Р№шИЈґВ ЅєЕ©ёіЖ®їЎ АЗЗШ ѕПИЈИ­ µЗѕоБц№З·О -°ьё®АЪµµ єс№Р№шИЈё¦ ѕЛјц°Ў ѕшЅАґПґЩ. - -АЪБЦ µй·ББЦјЕј­ ББАє ё»ѕё ё¶АМ ЗШБЦЅГ°н ЗТ№ЯЗС ЗТµї єОЕ№ µеёіґПґЩ. - -µо·ПЗШБЦјЕј­ °Ё»зЗХґПґЩ. - +Subject: {SITENAME} +Charset: euc-kr + +ѕИізЗПјјїд..{WELCOME_MSG} АФґПґЩ.. +{WELCOME_MSG} їЎ °ЎАФЗПЅЕ°НА» БшЅЙАё·О ИЇїµЗХґПґЩ. +µо·ПЗПЅЕ °иБ¤Б¤єёґВ ґЩАЅ°ъ °°ЅАґПґЩ. + +---------------------------- +ѕЖ АМ µр : {USERNAME} +єс№Р№шИЈ : {PASSWORD} +---------------------------- + +ЖРЅєїцµеё¦ єРЅЗЗПјМґЩёй Жч·іїЎј­ АМёЮАПА» АФ·ВЗПЅГёй АУАЗАЗ ЖРЅєїцµеё¦ +№Я±Ю№ЮА»јц АЦЅАґПґЩ... №Я±Ю№ЮАє єс№Р№шИЈ·О ѕЛ±вЅ¬їо єс№Р№шИЈ·О Аз єЇ°ж +ЗПјЕј­ »зїлЗПЅГёй µЛґПґЩ..АМ єс№Р№шИЈґВ ЅєЕ©ёіЖ®їЎ АЗЗШ ѕПИЈИ­ µЗѕоБц№З·О +°ьё®АЪµµ єс№Р№шИЈё¦ ѕЛјц°Ў ѕшЅАґПґЩ. + +АЪБЦ µй·ББЦјЕј­ ББАє ё»ѕё ё¶АМ ЗШБЦЅГ°н ЗТ№ЯЗС ЗТµї єОЕ№ µеёіґПґЩ. + +µо·ПЗШБЦјЕј­ °Ё»зЗХґПґЩ. + {EMAIL_SIG} \ No newline at end of file diff --git a/phpBB/language/lang_korean/email/user_welcome_inactive.tpl b/phpBB/language/lang_korean/email/user_welcome_inactive.tpl index 5b4e8d1bdc..108377fbf5 100644 --- a/phpBB/language/lang_korean/email/user_welcome_inactive.tpl +++ b/phpBB/language/lang_korean/email/user_welcome_inactive.tpl @@ -1,16 +1,17 @@ -Subject: {SITENAME} - -ѕИізЗПјјїд.. {WELCOME_MSG} АФґПґЩ.. - -Please keep this email for your records. Your account information is as follows: - ----------------------------- -ѕЖ АМ µр : {USERNAME} -єс№Р№шИЈ : {PASSWORD} ----------------------------- - -Your account is currently inactive. You cannot use it until you visit the following link: - -{U_ACTIVATE} - +Subject: {SITENAME} +Charset: euc-kr + +ѕИізЗПјјїд.. {WELCOME_MSG} АФґПґЩ.. + +Please keep this email for your records. Your account information is as follows: + +---------------------------- +ѕЖ АМ µр : {USERNAME} +єс№Р№шИЈ : {PASSWORD} +---------------------------- + +Your account is currently inactive. You cannot use it until you visit the following link: + +{U_ACTIVATE} + {EMAIL_SIG} \ No newline at end of file diff --git a/phpBB/language/lang_norwegian/email/admin_activate.tpl b/phpBB/language/lang_norwegian/email/admin_activate.tpl index 01d7839a73..f81650b33a 100644 --- a/phpBB/language/lang_norwegian/email/admin_activate.tpl +++ b/phpBB/language/lang_norwegian/email/admin_activate.tpl @@ -1,4 +1,5 @@ Subject: Nytt medlemskap +Charset: iso-8859-1 Hei, diff --git a/phpBB/language/lang_norwegian/email/admin_send_email.tpl b/phpBB/language/lang_norwegian/email/admin_send_email.tpl index 7feeb2554f..b46ee0b68d 100644 --- a/phpBB/language/lang_norwegian/email/admin_send_email.tpl +++ b/phpBB/language/lang_norwegian/email/admin_send_email.tpl @@ -1,3 +1,5 @@ +Charset: iso-8859-1 + Fшlgende e-post ble sendt til deg fra en forumadministrator pе {SITENAME}. Hvis denne e-posten er spam, har stшtende eller har annet plagsomt innhold vennligst gi beskjed til forumets webmaster pе fшlgende e-post : diff --git a/phpBB/language/lang_norwegian/email/admin_welcome_activated.tpl b/phpBB/language/lang_norwegian/email/admin_welcome_activated.tpl index ceca4b3522..4f129e40a3 100644 --- a/phpBB/language/lang_norwegian/email/admin_welcome_activated.tpl +++ b/phpBB/language/lang_norwegian/email/admin_welcome_activated.tpl @@ -1,4 +1,5 @@ Subject: Medlemskapet er aktivert +Charset: iso-8859-1 Hei {USERNAME}, diff --git a/phpBB/language/lang_norwegian/email/admin_welcome_inactive.tpl b/phpBB/language/lang_norwegian/email/admin_welcome_inactive.tpl index 5510be5c2d..783ca512fd 100644 --- a/phpBB/language/lang_norwegian/email/admin_welcome_inactive.tpl +++ b/phpBB/language/lang_norwegian/email/admin_welcome_inactive.tpl @@ -1,4 +1,5 @@ Subject: Velkommen til forumene pе {SITENAME} +Charset: iso-8859-1 {WELCOME_MSG} diff --git a/phpBB/language/lang_norwegian/email/coppa_welcome_inactive.tpl b/phpBB/language/lang_norwegian/email/coppa_welcome_inactive.tpl index b8f1fdc7fb..640f4728ce 100644 --- a/phpBB/language/lang_norwegian/email/coppa_welcome_inactive.tpl +++ b/phpBB/language/lang_norwegian/email/coppa_welcome_inactive.tpl @@ -1,4 +1,5 @@ Subject: Velkommen til forumene pе {SITENAME} +Charset: iso-8859-1 {WELCOME_MSG} diff --git a/phpBB/language/lang_norwegian/email/group_added.tpl b/phpBB/language/lang_norwegian/email/group_added.tpl index 4bfb108ab3..191310783f 100644 --- a/phpBB/language/lang_norwegian/email/group_added.tpl +++ b/phpBB/language/lang_norwegian/email/group_added.tpl @@ -1,4 +1,5 @@ Subject: Du er nе lagt til i denne grupppen +Charset: iso-8859-1 Gratulerer, diff --git a/phpBB/language/lang_norwegian/email/group_approved.tpl b/phpBB/language/lang_norwegian/email/group_approved.tpl index 2780b3572a..32d3b68088 100644 --- a/phpBB/language/lang_norwegian/email/group_approved.tpl +++ b/phpBB/language/lang_norwegian/email/group_approved.tpl @@ -1,4 +1,5 @@ Subject: Din sшknad er innvilget +Charset: iso-8859-1 Gratulerer, diff --git a/phpBB/language/lang_norwegian/email/group_request.tpl b/phpBB/language/lang_norwegian/email/group_request.tpl index 452fc195be..99043cac89 100644 --- a/phpBB/language/lang_norwegian/email/group_request.tpl +++ b/phpBB/language/lang_norwegian/email/group_request.tpl @@ -1,4 +1,5 @@ Subject: En sшknad om deltagelse i din gruppe er levert +Charset: iso-8859-1 Hei {GROUP_MODERATOR}, diff --git a/phpBB/language/lang_norwegian/email/privmsg_notify.tpl b/phpBB/language/lang_norwegian/email/privmsg_notify.tpl index 69471c70f3..6f5010e2b9 100644 --- a/phpBB/language/lang_norwegian/email/privmsg_notify.tpl +++ b/phpBB/language/lang_norwegian/email/privmsg_notify.tpl @@ -1,4 +1,5 @@ Subject: Du har mottatt en Privat Melding +Charset: iso-8859-1 Hei {USERNAME}, diff --git a/phpBB/language/lang_norwegian/email/profile_send_email.tpl b/phpBB/language/lang_norwegian/email/profile_send_email.tpl index 0a15339242..18569d0e9f 100644 --- a/phpBB/language/lang_norwegian/email/profile_send_email.tpl +++ b/phpBB/language/lang_norwegian/email/profile_send_email.tpl @@ -1,3 +1,5 @@ +Charset: iso-8859-1 + Hei {TO_USERNAME} Fшlgende e-post ble sendt til deg av {FROM_USERNAME} via brukernavnet ditt i forumet pе {SITENAME}. diff --git a/phpBB/language/lang_norwegian/email/topic_notify.tpl b/phpBB/language/lang_norwegian/email/topic_notify.tpl index 4644911535..f0550c50f6 100644 --- a/phpBB/language/lang_norwegian/email/topic_notify.tpl +++ b/phpBB/language/lang_norwegian/email/topic_notify.tpl @@ -1,4 +1,5 @@ Subject: Varsel om svar pе Tema - {TOPIC_TITLE} +Charset: iso-8859-1 Hei {USERNAME}, diff --git a/phpBB/language/lang_norwegian/email/user_activate.tpl b/phpBB/language/lang_norwegian/email/user_activate.tpl index 6df6c2dc85..2e9658668e 100644 --- a/phpBB/language/lang_norwegian/email/user_activate.tpl +++ b/phpBB/language/lang_norwegian/email/user_activate.tpl @@ -1,4 +1,5 @@ Subject: Reaktiver medlemsskapet ditt! +Charset: iso-8859-1 Hei {USERNAME}, diff --git a/phpBB/language/lang_norwegian/email/user_activate_passwd.tpl b/phpBB/language/lang_norwegian/email/user_activate_passwd.tpl index 4a0fd8d682..0899ad503c 100644 --- a/phpBB/language/lang_norwegian/email/user_activate_passwd.tpl +++ b/phpBB/language/lang_norwegian/email/user_activate_passwd.tpl @@ -1,4 +1,5 @@ Subject: Aktiver nytt passord +Charset: iso-8859-1 Hei {USERNAME} diff --git a/phpBB/language/lang_norwegian/email/user_welcome.tpl b/phpBB/language/lang_norwegian/email/user_welcome.tpl index 7246ac844f..7c05a1bbfb 100644 --- a/phpBB/language/lang_norwegian/email/user_welcome.tpl +++ b/phpBB/language/lang_norwegian/email/user_welcome.tpl @@ -1,4 +1,5 @@ Subject: Velkommen til forumene pе {SITENAME} +Charset: iso-8859-1 {WELCOME_MSG} diff --git a/phpBB/language/lang_norwegian/email/user_welcome_inactive.tpl b/phpBB/language/lang_norwegian/email/user_welcome_inactive.tpl index 91d27e4516..d4102380e4 100644 --- a/phpBB/language/lang_norwegian/email/user_welcome_inactive.tpl +++ b/phpBB/language/lang_norwegian/email/user_welcome_inactive.tpl @@ -1,4 +1,5 @@ Subject: Velkommen til forumene pе {SITENAME} +Charset: iso-8859-1 {WELCOME_MSG} diff --git a/phpBB/language/lang_polish/email/admin_activate.tpl b/phpBB/language/lang_polish/email/admin_activate.tpl index 6c135d806f..e2b0588dde 100644 --- a/phpBB/language/lang_polish/email/admin_activate.tpl +++ b/phpBB/language/lang_polish/email/admin_activate.tpl @@ -1,9 +1,10 @@ -Subject: Nowe Konto - -Witamy, - -Konto o nazwie "{USERNAME}" zostaіo deaktywowane lub nowo utworzone, powiniene¶ sprawdziж szczegуіy tego uїytkownika (je¶li to konieczne) i aktywowaж konto uїywaj±c poniїszego odno¶nika: - -{U_ACTIVATE} - +Subject: Nowe Konto +Charset: iso-8859-2 + +Witamy, + +Konto o nazwie "{USERNAME}" zostaіo deaktywowane lub nowo utworzone, powiniene¶ sprawdziж szczegуіy tego uїytkownika (je¶li to konieczne) i aktywowaж konto uїywaj±c poniїszego odno¶nika: + +{U_ACTIVATE} + {EMAIL_SIG} \ No newline at end of file diff --git a/phpBB/language/lang_polish/email/admin_send_email.tpl b/phpBB/language/lang_polish/email/admin_send_email.tpl index 7ab848466d..39d503d198 100644 --- a/phpBB/language/lang_polish/email/admin_send_email.tpl +++ b/phpBB/language/lang_polish/email/admin_send_email.tpl @@ -1,3 +1,5 @@ +Charset: iso-8859-2 + Poniїej jest email wysіany do Ciebie przez administratora "{SITENAME}". Jeїeli uznasz go za spam, jest obraјliwy lub w jakikolwiek sposуb Ciк niepokoi skontaktuj siк z webmasterem forum pod poniїszym adresem: {BOARD_EMAIL} diff --git a/phpBB/language/lang_polish/email/admin_welcome_activated.tpl b/phpBB/language/lang_polish/email/admin_welcome_activated.tpl index eb9f514564..16a4e796c6 100644 --- a/phpBB/language/lang_polish/email/admin_welcome_activated.tpl +++ b/phpBB/language/lang_polish/email/admin_welcome_activated.tpl @@ -1,7 +1,8 @@ -Subject: Konto Aktywowane - -Witaj {USERNAME}, - -Twoje konto na "{SITENAME}" zostaіo wіa¶nie aktywowane, moїesz zalogowaж siк korzystaj±c z loginu i hasіa, ktуre otrzymaіe¶ w poprzednim email'u. - +Subject: Konto Aktywowane +Charset: iso-8859-2 + +Witaj {USERNAME}, + +Twoje konto na "{SITENAME}" zostaіo wіa¶nie aktywowane, moїesz zalogowaж siк korzystaj±c z loginu i hasіa, ktуre otrzymaіe¶ w poprzednim email'u. + {EMAIL_SIG} \ No newline at end of file diff --git a/phpBB/language/lang_polish/email/admin_welcome_inactive.tpl b/phpBB/language/lang_polish/email/admin_welcome_inactive.tpl index ede371b4b2..0a75ac8540 100644 --- a/phpBB/language/lang_polish/email/admin_welcome_inactive.tpl +++ b/phpBB/language/lang_polish/email/admin_welcome_inactive.tpl @@ -1,4 +1,5 @@ Subject: Witamy na Forum {SITENAME} +Charset: iso-8859-2 {WELCOME_MSG} diff --git a/phpBB/language/lang_polish/email/coppa_welcome_inactive.tpl b/phpBB/language/lang_polish/email/coppa_welcome_inactive.tpl index 708fcca69a..de05fb9e24 100644 --- a/phpBB/language/lang_polish/email/coppa_welcome_inactive.tpl +++ b/phpBB/language/lang_polish/email/coppa_welcome_inactive.tpl @@ -1,4 +1,5 @@ Subject: Witamy na Forum {SITENAME} +Charset: iso-8859-2 {WELCOME_MSG} diff --git a/phpBB/language/lang_polish/email/group_added.tpl b/phpBB/language/lang_polish/email/group_added.tpl index 6ff50fc631..1e4d4e5aac 100644 --- a/phpBB/language/lang_polish/email/group_added.tpl +++ b/phpBB/language/lang_polish/email/group_added.tpl @@ -1,4 +1,5 @@ Subject: Zostaіe¶ dodany do tej grupy +Charset: iso-8859-2 Gratulacje, diff --git a/phpBB/language/lang_polish/email/group_approved.tpl b/phpBB/language/lang_polish/email/group_approved.tpl index ee215a8321..6c4749aea1 100644 --- a/phpBB/language/lang_polish/email/group_approved.tpl +++ b/phpBB/language/lang_polish/email/group_approved.tpl @@ -1,4 +1,5 @@ Subject: Twoja pro¶ba zostaіa zaakceptowana +Charset: iso-8859-2 Gratulacje, diff --git a/phpBB/language/lang_polish/email/group_request.tpl b/phpBB/language/lang_polish/email/group_request.tpl index 28a590ac01..c370fd8b9a 100644 --- a/phpBB/language/lang_polish/email/group_request.tpl +++ b/phpBB/language/lang_polish/email/group_request.tpl @@ -1,10 +1,11 @@ -Subject: Twoja pro¶ba o przyі±czenie do grupy zostaіa wysіana - -Drogi {GROUP_MODERATOR}, - -Jeden z uїytkownikуw poprosiі o czіonkostwo w Twojej grupie na {SITENAME}. -Aby przyj±ж lub odrzuciж t± pro¶bк odwiedј poniїsz± stronк: - -{U_GROUPCP} - -{EMAIL_SIG} +Subject: Twoja pro¶ba o przyі±czenie do grupy zostaіa wysіana +Charset: iso-8859-2 + +Drogi {GROUP_MODERATOR}, + +Jeden z uїytkownikуw poprosiі o czіonkostwo w Twojej grupie na {SITENAME}. +Aby przyj±ж lub odrzuciж t± pro¶bк odwiedј poniїsz± stronк: + +{U_GROUPCP} + +{EMAIL_SIG} diff --git a/phpBB/language/lang_polish/email/privmsg_notify.tpl b/phpBB/language/lang_polish/email/privmsg_notify.tpl index deea00c19c..c6c900e082 100644 --- a/phpBB/language/lang_polish/email/privmsg_notify.tpl +++ b/phpBB/language/lang_polish/email/privmsg_notify.tpl @@ -1,11 +1,12 @@ -Subject: Nadeszіa nowa Prywatna Wiadomo¶ж - -Witaj {USERNAME}, - -Otrzymaіe¶ now± Prywatn± Wiadomo¶ж na Twoje konto na "{SITENAME}" i prosiіe¶ by Ciebie o tym powiadomiono. Moїesz zobaczyж now± wiadomo¶ж klikaj±c na poniїszy odno¶nik: - -{U_INBOX} - -Pamiкtaj, їe moїesz zawsze wyі±czyж powiadamianie o nowych wiadomo¶ciach zmieniaj±c odpowiednie ustawienia w Twoim profilu. - +Subject: Nadeszіa nowa Prywatna Wiadomo¶ж +Charset: iso-8859-2 + +Witaj {USERNAME}, + +Otrzymaіe¶ now± Prywatn± Wiadomo¶ж na Twoje konto na "{SITENAME}" i prosiіe¶ by Ciebie o tym powiadomiono. Moїesz zobaczyж now± wiadomo¶ж klikaj±c na poniїszy odno¶nik: + +{U_INBOX} + +Pamiкtaj, їe moїesz zawsze wyі±czyж powiadamianie o nowych wiadomo¶ciach zmieniaj±c odpowiednie ustawienia w Twoim profilu. + {EMAIL_SIG} \ No newline at end of file diff --git a/phpBB/language/lang_polish/email/profile_send_email.tpl b/phpBB/language/lang_polish/email/profile_send_email.tpl index b3fb9bb4c3..316a6e8b92 100644 --- a/phpBB/language/lang_polish/email/profile_send_email.tpl +++ b/phpBB/language/lang_polish/email/profile_send_email.tpl @@ -1,3 +1,5 @@ +Charset: iso-8859-2 + Witaj {TO_USERNAME}, Poniїej znajduje siк email wysіany do Ciebie przez {FROM_USERNAME} z wykorzystaniem Twojego konta na {SITENAME}. Jeїeli ta wiadomo¶ж zawieta spam lub tre¶ci obraјliwe skontaktuj siк z webmasterem forum pod adresem: diff --git a/phpBB/language/lang_polish/email/topic_notify.tpl b/phpBB/language/lang_polish/email/topic_notify.tpl index 0a45f761ab..a0e8cfa0f1 100644 --- a/phpBB/language/lang_polish/email/topic_notify.tpl +++ b/phpBB/language/lang_polish/email/topic_notify.tpl @@ -1,4 +1,5 @@ Subject: Powiadomienie o Odpowiedzi - {TOPIC_TITLE} +Charset: iso-8859-2 Witaj {USERNAME}, diff --git a/phpBB/language/lang_polish/email/user_activate.tpl b/phpBB/language/lang_polish/email/user_activate.tpl index 31e0d4566a..a9092c9d00 100644 --- a/phpBB/language/lang_polish/email/user_activate.tpl +++ b/phpBB/language/lang_polish/email/user_activate.tpl @@ -1,4 +1,5 @@ Subject: Reaktywuj soje konto! +Charset: iso-8859-2 Witaj {USERNAME}, diff --git a/phpBB/language/lang_polish/email/user_activate_passwd.tpl b/phpBB/language/lang_polish/email/user_activate_passwd.tpl index 9019c5716c..51d1a40187 100644 --- a/phpBB/language/lang_polish/email/user_activate_passwd.tpl +++ b/phpBB/language/lang_polish/email/user_activate_passwd.tpl @@ -1,17 +1,18 @@ -Subject: Aktywacja nowego hasіa - -Witaj {USERNAME} - -Otrzymujesz ten email poniewaї Ty (albo kto¶ podaj±cy siк za Ciebie) poprosiі o nowe hasіo dla Twojego konta na {SITENAME}. Jeїeli nie prosiіe¶ o ten email zignoruj go, a je¶li otrzymasz go ponownie skontaktuj siк z administratorem forum. - -Aby skorzystaж z nowego hasіa musisz je aktywowaж. Aby to zrobiж kliknij odno¶nik poniїej. - -{U_ACTIVATE} - -Gdy to zrobisz bкdziesz mуgі siк logowaж korzystaj±c z hasіa: - -Hasіo: {PASSWORD} - -Moїesz oczywi¶cie zmieniж to hasіo w swoim profilu. Jeїeli bкdziesz miaі problemy skontaktuj siк z administratorem forum. - +Subject: Aktywacja nowego hasіa +Charset: iso-8859-2 + +Witaj {USERNAME} + +Otrzymujesz ten email poniewaї Ty (albo kto¶ podaj±cy siк za Ciebie) poprosiі o nowe hasіo dla Twojego konta na {SITENAME}. Jeїeli nie prosiіe¶ o ten email zignoruj go, a je¶li otrzymasz go ponownie skontaktuj siк z administratorem forum. + +Aby skorzystaж z nowego hasіa musisz je aktywowaж. Aby to zrobiж kliknij odno¶nik poniїej. + +{U_ACTIVATE} + +Gdy to zrobisz bкdziesz mуgі siк logowaж korzystaj±c z hasіa: + +Hasіo: {PASSWORD} + +Moїesz oczywi¶cie zmieniж to hasіo w swoim profilu. Jeїeli bкdziesz miaі problemy skontaktuj siк z administratorem forum. + {EMAIL_SIG} \ No newline at end of file diff --git a/phpBB/language/lang_polish/email/user_welcome.tpl b/phpBB/language/lang_polish/email/user_welcome.tpl index e8878188e5..425fb2d024 100644 --- a/phpBB/language/lang_polish/email/user_welcome.tpl +++ b/phpBB/language/lang_polish/email/user_welcome.tpl @@ -1,4 +1,5 @@ Subject: Witamy na Forum {SITENAME} +Charset: iso-8859-2 {WELCOME_MSG} diff --git a/phpBB/language/lang_polish/email/user_welcome_inactive.tpl b/phpBB/language/lang_polish/email/user_welcome_inactive.tpl index a4cdc9492e..99d0ff9f20 100644 --- a/phpBB/language/lang_polish/email/user_welcome_inactive.tpl +++ b/phpBB/language/lang_polish/email/user_welcome_inactive.tpl @@ -1,4 +1,5 @@ Subject: Witamy na Forum {SITENAME} +Charset: iso-8859-2 {WELCOME_MSG} diff --git a/phpBB/language/lang_portuguese/email/admin_activate.tpl b/phpBB/language/lang_portuguese/email/admin_activate.tpl index 9779549605..27cdd8891d 100644 --- a/phpBB/language/lang_portuguese/email/admin_activate.tpl +++ b/phpBB/language/lang_portuguese/email/admin_activate.tpl @@ -1,3 +1,5 @@ +Charset: iso-8859-1 + Assunto: Novo Registo de Utilizador Olб, diff --git a/phpBB/language/lang_portuguese/email/admin_send_email.tpl b/phpBB/language/lang_portuguese/email/admin_send_email.tpl index 4231e5c486..52878f0c7f 100644 --- a/phpBB/language/lang_portuguese/email/admin_send_email.tpl +++ b/phpBB/language/lang_portuguese/email/admin_send_email.tpl @@ -1,3 +1,5 @@ +Charset: iso-8859-1 + A mensagem seguinte й um email enviado para si por um administrador em "{SITENAME}". Se a mensagem contйm material abusivo, "spam", ou comentбrios que vocк ache ofensivos por favor contacte o "webmaster" dos fуruns para o seguinte endereзo: {BOARD_EMAIL} diff --git a/phpBB/language/lang_portuguese/email/admin_welcome_activated.tpl b/phpBB/language/lang_portuguese/email/admin_welcome_activated.tpl index 41053478d5..221430e40b 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 @@ +Charset: iso-8859-1 + Assunto: Registo Activo Olб {USERNAME}, diff --git a/phpBB/language/lang_portuguese/email/admin_welcome_inactive.tpl b/phpBB/language/lang_portuguese/email/admin_welcome_inactive.tpl index c92c906eef..ee9edea2a3 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 @@ +Charset: iso-8859-1 + Assunto: Benvido a {SITENAME} {WELCOME_MSG} diff --git a/phpBB/language/lang_portuguese/email/coppa_welcome_inactive.tpl b/phpBB/language/lang_portuguese/email/coppa_welcome_inactive.tpl index 407b1dcdc7..da2ea6071e 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 @@ +Charset: iso-8859-1 + Assunto: Benvido a {SITENAME} {WELCOME_MSG} diff --git a/phpBB/language/lang_portuguese/email/group_added.tpl b/phpBB/language/lang_portuguese/email/group_added.tpl index 16bd67c629..585e97b853 100644 --- a/phpBB/language/lang_portuguese/email/group_added.tpl +++ b/phpBB/language/lang_portuguese/email/group_added.tpl @@ -1,3 +1,5 @@ +Charset: iso-8859-1 + Assunto: Utilizador Adicionado a Grupo Parabйns, diff --git a/phpBB/language/lang_portuguese/email/group_approved.tpl b/phpBB/language/lang_portuguese/email/group_approved.tpl index e706cb8e33..8a7dcdebdc 100644 --- a/phpBB/language/lang_portuguese/email/group_approved.tpl +++ b/phpBB/language/lang_portuguese/email/group_approved.tpl @@ -1,3 +1,5 @@ +Charset: iso-8859-1 + Assunto: Pedido foi aceite. Parabйns, diff --git a/phpBB/language/lang_portuguese/email/group_request.tpl b/phpBB/language/lang_portuguese/email/group_request.tpl index fa5757aaf6..1b329883c8 100644 --- a/phpBB/language/lang_portuguese/email/group_request.tpl +++ b/phpBB/language/lang_portuguese/email/group_request.tpl @@ -1,3 +1,5 @@ +Charset: iso-8859-1 + Assunto: Pedido para pertencer ao seu Grupo Estimado {GROUP_MODERATOR}, diff --git a/phpBB/language/lang_portuguese/email/privmsg_notify.tpl b/phpBB/language/lang_portuguese/email/privmsg_notify.tpl index 0c985f4c39..c6349d2ed7 100644 --- a/phpBB/language/lang_portuguese/email/privmsg_notify.tpl +++ b/phpBB/language/lang_portuguese/email/privmsg_notify.tpl @@ -1,3 +1,5 @@ +Charset: iso-8859-1 + Assunto: Notificaзгo de Mensagem Privada Olб {USERNAME}, diff --git a/phpBB/language/lang_portuguese/email/profile_send_email.tpl b/phpBB/language/lang_portuguese/email/profile_send_email.tpl index 9fa3a9c3b4..afc7ec262e 100644 --- a/phpBB/language/lang_portuguese/email/profile_send_email.tpl +++ b/phpBB/language/lang_portuguese/email/profile_send_email.tpl @@ -1,3 +1,5 @@ +Charset: iso-8859-1 + Olб {TO_USERNAME}, A mensagem de email que se segue foi enviada por {FROM_USERNAME} via sua conta em {SITENAME}. Se a mensagem contйm material abusivo, "spam", ou contйm comentбrios que vocк ache ofensivos por favor contacte o "webmaster" dos fуruns para o seguinte endereзo: diff --git a/phpBB/language/lang_portuguese/email/topic_notify.tpl b/phpBB/language/lang_portuguese/email/topic_notify.tpl index b00413628e..ba8e7f19af 100644 --- a/phpBB/language/lang_portuguese/email/topic_notify.tpl +++ b/phpBB/language/lang_portuguese/email/topic_notify.tpl @@ -1,3 +1,5 @@ +Charset: iso-8859-1 + Assunto: Notificaзгo de Resposta a Tуpico - {TOPIC_TITLE} Olб {USERNAME}, diff --git a/phpBB/language/lang_portuguese/email/user_activate.tpl b/phpBB/language/lang_portuguese/email/user_activate.tpl index af13c2cdf0..c09abdba9d 100644 --- a/phpBB/language/lang_portuguese/email/user_activate.tpl +++ b/phpBB/language/lang_portuguese/email/user_activate.tpl @@ -1,3 +1,5 @@ +Charset: iso-8859-1 + Assunto: Reactivar o seu Registo Olб {USERNAME}, diff --git a/phpBB/language/lang_portuguese/email/user_activate_passwd.tpl b/phpBB/language/lang_portuguese/email/user_activate_passwd.tpl index 22837f2aa6..0c3a358a36 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 @@ +Charset: iso-8859-1 + Assunto: Activaзгo de Senha nova Olб {USERNAME} diff --git a/phpBB/language/lang_portuguese/email/user_welcome.tpl b/phpBB/language/lang_portuguese/email/user_welcome.tpl index 492cce1088..dfb1cf637f 100644 --- a/phpBB/language/lang_portuguese/email/user_welcome.tpl +++ b/phpBB/language/lang_portuguese/email/user_welcome.tpl @@ -1,3 +1,5 @@ +Charset: iso-8859-1 + Assunto: Benvido a {SITENAME} diff --git a/phpBB/language/lang_portuguese/email/user_welcome_inactive.tpl b/phpBB/language/lang_portuguese/email/user_welcome_inactive.tpl index 8643eba150..870c39b7a2 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 @@ +Charset: iso-8859-1 + Assunto: Benvido a {SITENAME} {WELCOME_MSG} diff --git a/phpBB/language/lang_portuguese_brazil/email/admin_activate.tpl b/phpBB/language/lang_portuguese_brazil/email/admin_activate.tpl index ba84ada804..da11bd8052 100644 --- a/phpBB/language/lang_portuguese_brazil/email/admin_activate.tpl +++ b/phpBB/language/lang_portuguese_brazil/email/admin_activate.tpl @@ -1,4 +1,5 @@ Subject: Registro de Novo Usuбrio +Charset: iso-8859-1 Olб, diff --git a/phpBB/language/lang_portuguese_brazil/email/admin_send_email.tpl b/phpBB/language/lang_portuguese_brazil/email/admin_send_email.tpl index 222dffaf76..20db4f1287 100644 --- a/phpBB/language/lang_portuguese_brazil/email/admin_send_email.tpl +++ b/phpBB/language/lang_portuguese_brazil/email/admin_send_email.tpl @@ -1,3 +1,5 @@ +Charset: iso-8859-1 + A mensagem seguinte й um email enviado para vocк por um administrador de "{SITENAME}". Se a mensagem contйm material abusivo, "spam", ou comentбrios que vocк ache ofensivos por favor contate o "webmaster" dos fуruns no seguinte endereзo: {BOARD_EMAIL} diff --git a/phpBB/language/lang_portuguese_brazil/email/admin_welcome_activated.tpl b/phpBB/language/lang_portuguese_brazil/email/admin_welcome_activated.tpl index ae04a86719..3f37f08b4f 100644 --- a/phpBB/language/lang_portuguese_brazil/email/admin_welcome_activated.tpl +++ b/phpBB/language/lang_portuguese_brazil/email/admin_welcome_activated.tpl @@ -1,4 +1,5 @@ Subject: Registo Ativado +Charset: iso-8859-1 Olб {USERNAME}, diff --git a/phpBB/language/lang_portuguese_brazil/email/admin_welcome_inactive.tpl b/phpBB/language/lang_portuguese_brazil/email/admin_welcome_inactive.tpl index 8739ccef21..ccdad81858 100644 --- a/phpBB/language/lang_portuguese_brazil/email/admin_welcome_inactive.tpl +++ b/phpBB/language/lang_portuguese_brazil/email/admin_welcome_inactive.tpl @@ -1,4 +1,5 @@ Subject: Bem-vindo ao Fуrum {SITENAME} +Charset: iso-8859-1 {WELCOME_MSG} diff --git a/phpBB/language/lang_portuguese_brazil/email/coppa_welcome_inactive.tpl b/phpBB/language/lang_portuguese_brazil/email/coppa_welcome_inactive.tpl index 4e94ba4b3e..54c43eb328 100644 --- a/phpBB/language/lang_portuguese_brazil/email/coppa_welcome_inactive.tpl +++ b/phpBB/language/lang_portuguese_brazil/email/coppa_welcome_inactive.tpl @@ -1,4 +1,5 @@ Subject: Bem-vindo ao Fуrum {SITENAME} +Charset: iso-8859-1 {WELCOME_MSG} diff --git a/phpBB/language/lang_portuguese_brazil/email/group_added.tpl b/phpBB/language/lang_portuguese_brazil/email/group_added.tpl index 18cc52b213..bb34e1bfcc 100644 --- a/phpBB/language/lang_portuguese_brazil/email/group_added.tpl +++ b/phpBB/language/lang_portuguese_brazil/email/group_added.tpl @@ -1,4 +1,5 @@ Subject: Vocк foi adicionado a este Grupo de Usuбrios +Charset: iso-8859-1 Parabйns, diff --git a/phpBB/language/lang_portuguese_brazil/email/group_approved.tpl b/phpBB/language/lang_portuguese_brazil/email/group_approved.tpl index 478826055e..f7fb43449f 100644 --- a/phpBB/language/lang_portuguese_brazil/email/group_approved.tpl +++ b/phpBB/language/lang_portuguese_brazil/email/group_approved.tpl @@ -1,4 +1,5 @@ Subject: O seu pedido foi aceito +Charset: iso-8859-1 Parabйns, diff --git a/phpBB/language/lang_portuguese_brazil/email/group_request.tpl b/phpBB/language/lang_portuguese_brazil/email/group_request.tpl index 1904f0d7a4..924c13e541 100644 --- a/phpBB/language/lang_portuguese_brazil/email/group_request.tpl +++ b/phpBB/language/lang_portuguese_brazil/email/group_request.tpl @@ -1,4 +1,5 @@ Subject: Foi feito um pedido para se juntar ao seu Grupo +Charset: iso-8859-1 Estimado {GROUP_MODERATOR}, diff --git a/phpBB/language/lang_portuguese_brazil/email/privmsg_notify.tpl b/phpBB/language/lang_portuguese_brazil/email/privmsg_notify.tpl index 121b357ee4..90a96ed98d 100644 --- a/phpBB/language/lang_portuguese_brazil/email/privmsg_notify.tpl +++ b/phpBB/language/lang_portuguese_brazil/email/privmsg_notify.tpl @@ -1,4 +1,5 @@ Subject: Chegou uma Mensagem Particular nova +Charset: iso-8859-1 Olб {USERNAME}, diff --git a/phpBB/language/lang_portuguese_brazil/email/profile_send_email.tpl b/phpBB/language/lang_portuguese_brazil/email/profile_send_email.tpl index 6c23364064..40d0459c65 100644 --- a/phpBB/language/lang_portuguese_brazil/email/profile_send_email.tpl +++ b/phpBB/language/lang_portuguese_brazil/email/profile_send_email.tpl @@ -1,3 +1,5 @@ +Charset: iso-8859-1 + Olб {TO_USERNAME}, A mensagem de email que se segue foi enviada por {FROM_USERNAME} via sua conta em {SITENAME}. Se a mensagem contйm material abusivo, "spam", ou contйm comentбrios que vocк ache ofensivos por favor contate o "webmaster" dos fуruns no seguinte endereзo: diff --git a/phpBB/language/lang_portuguese_brazil/email/topic_notify.tpl b/phpBB/language/lang_portuguese_brazil/email/topic_notify.tpl index 846c61b811..5083a38124 100644 --- a/phpBB/language/lang_portuguese_brazil/email/topic_notify.tpl +++ b/phpBB/language/lang_portuguese_brazil/email/topic_notify.tpl @@ -1,4 +1,5 @@ Subject: Notificaзгo de Resposta a Tуpico - {TOPIC_TITLE} +Charset: iso-8859-1 Olб {USERNAME}, diff --git a/phpBB/language/lang_portuguese_brazil/email/user_activate.tpl b/phpBB/language/lang_portuguese_brazil/email/user_activate.tpl index 7a57f566d1..1886eaf39f 100644 --- a/phpBB/language/lang_portuguese_brazil/email/user_activate.tpl +++ b/phpBB/language/lang_portuguese_brazil/email/user_activate.tpl @@ -1,4 +1,5 @@ Subject: Reativaзгo de registo! +Charset: iso-8859-1 Olб {USERNAME}, diff --git a/phpBB/language/lang_portuguese_brazil/email/user_activate_passwd.tpl b/phpBB/language/lang_portuguese_brazil/email/user_activate_passwd.tpl index 0979ae341b..da3996a6eb 100644 --- a/phpBB/language/lang_portuguese_brazil/email/user_activate_passwd.tpl +++ b/phpBB/language/lang_portuguese_brazil/email/user_activate_passwd.tpl @@ -1,4 +1,5 @@ Subject: Ativaзгo de Senha Nova +Charset: iso-8859-1 Olб {USERNAME} diff --git a/phpBB/language/lang_portuguese_brazil/email/user_welcome.tpl b/phpBB/language/lang_portuguese_brazil/email/user_welcome.tpl index 417552f189..0422cc4f62 100644 --- a/phpBB/language/lang_portuguese_brazil/email/user_welcome.tpl +++ b/phpBB/language/lang_portuguese_brazil/email/user_welcome.tpl @@ -1,4 +1,5 @@ Subject: Bem-vindo ao Fуrum {SITENAME} +Charset: iso-8859-1 {WELCOME_MSG} diff --git a/phpBB/language/lang_portuguese_brazil/email/user_welcome_inactive.tpl b/phpBB/language/lang_portuguese_brazil/email/user_welcome_inactive.tpl index 9d9f475a4e..9b437c9522 100644 --- a/phpBB/language/lang_portuguese_brazil/email/user_welcome_inactive.tpl +++ b/phpBB/language/lang_portuguese_brazil/email/user_welcome_inactive.tpl @@ -1,4 +1,5 @@ Subject: Bem-vindo ao Fуrum {SITENAME} +Charset: iso-8859-1 {WELCOME_MSG} diff --git a/phpBB/language/lang_russian/email/admin_activate.tpl b/phpBB/language/lang_russian/email/admin_activate.tpl index 676fcce7ae..65afa16cd1 100644 --- a/phpBB/language/lang_russian/email/admin_activate.tpl +++ b/phpBB/language/lang_russian/email/admin_activate.tpl @@ -1,9 +1,10 @@ -Subject: Новый пользователь - -Здравствуйте, - -Учётная запись "{USERNAME}" была отключена или только что создана, вы должны проверить информацию о пользователе и активизировать её перейдя по этой ссылке: - -{U_ACTIVATE} - +Subject: Новый пользователь +Charset: windows-1251 + +Здравствуйте, + +Учётная запись "{USERNAME}" была отключена или только что создана, вы должны проверить информацию о пользователе и активизировать её перейдя по этой ссылке: + +{U_ACTIVATE} + {EMAIL_SIG} \ No newline at end of file diff --git a/phpBB/language/lang_russian/email/admin_send_email.tpl b/phpBB/language/lang_russian/email/admin_send_email.tpl index 16e9640181..67a5f6f9f2 100644 --- a/phpBB/language/lang_russian/email/admin_send_email.tpl +++ b/phpBB/language/lang_russian/email/admin_send_email.tpl @@ -1,10 +1,12 @@ -Это e-mail сообщение послано вам администратором сайта "{SITENAME}". Если это сообщение является спамом, содержит оскорбления или прочие неприятные вам комментарии, пожалуйста свяжитесь с вебмастером по адресу: - -{BOARD_EMAIL} - -Включите данное сообщение целиком (особенно заголовки). - -Посланное вам сообщение: -~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -{MESSAGE} +Charset: windows-1251 + +Это e-mail сообщение послано вам администратором сайта "{SITENAME}". Если это сообщение является спамом, содержит оскорбления или прочие неприятные вам комментарии, пожалуйста свяжитесь с вебмастером по адресу: + +{BOARD_EMAIL} + +Включите данное сообщение целиком (особенно заголовки). + +Посланное вам сообщение: +~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +{MESSAGE} diff --git a/phpBB/language/lang_russian/email/admin_welcome_activated.tpl b/phpBB/language/lang_russian/email/admin_welcome_activated.tpl index e85a35ec31..0e4c497ab6 100644 --- a/phpBB/language/lang_russian/email/admin_welcome_activated.tpl +++ b/phpBB/language/lang_russian/email/admin_welcome_activated.tpl @@ -1,7 +1,8 @@ -Subject: Учётная запись активизирована - -Здравствуйте, {USERNAME}! - -Ваша учётная запись на сайте "{SITENAME}" была активизирована, теперь вы можете входить в систему используя имя и пароль, присланные вам в предыдущем письме. - +Subject: Учётная запись активизирована +Charset: windows-1251 + +Здравствуйте, {USERNAME}! + +Ваша учётная запись на сайте "{SITENAME}" была активизирована, теперь вы можете входить в систему используя имя и пароль, присланные вам в предыдущем письме. + {EMAIL_SIG} \ No newline at end of file diff --git a/phpBB/language/lang_russian/email/admin_welcome_inactive.tpl b/phpBB/language/lang_russian/email/admin_welcome_inactive.tpl index f9f98643d0..0d4c1748f6 100644 --- a/phpBB/language/lang_russian/email/admin_welcome_inactive.tpl +++ b/phpBB/language/lang_russian/email/admin_welcome_inactive.tpl @@ -1,18 +1,19 @@ -Subject: Добро пожаловать на форумы {SITENAME} - -{WELCOME_MSG} - -Пожалуйста сохраните это сообщение. Параметры вашей учётной записи таковы: - ----------------------------- -Имя пользователя: {USERNAME} -Пароль: {PASSWORD} ----------------------------- - -Ваша учётная запись пока не активна, её должен активизировать администратор форумов. Как только это произойдёт, вам будет прислано письмо. - -Не забывайте свой пароль: он хранится в нашей базе в зашифрованном виде, и мы не сможем вам его выслать. Если вы всё же забудете свой пароль, то вы сможете запросить новый, который будет активизирован таким же образом, как и ваша учётная запись. - -Спасибо за регистрацию. - +Subject: Добро пожаловать на форумы {SITENAME} +Charset: windows-1251 + +{WELCOME_MSG} + +Пожалуйста сохраните это сообщение. Параметры вашей учётной записи таковы: + +---------------------------- +Имя пользователя: {USERNAME} +Пароль: {PASSWORD} +---------------------------- + +Ваша учётная запись пока не активна, её должен активизировать администратор форумов. Как только это произойдёт, вам будет прислано письмо. + +Не забывайте свой пароль: он хранится в нашей базе в зашифрованном виде, и мы не сможем вам его выслать. Если вы всё же забудете свой пароль, то вы сможете запросить новый, который будет активизирован таким же образом, как и ваша учётная запись. + +Спасибо за регистрацию. + {EMAIL_SIG} \ No newline at end of file diff --git a/phpBB/language/lang_russian/email/coppa_welcome_inactive.tpl b/phpBB/language/lang_russian/email/coppa_welcome_inactive.tpl index 3c4a430d04..7b922c3c8e 100644 --- a/phpBB/language/lang_russian/email/coppa_welcome_inactive.tpl +++ b/phpBB/language/lang_russian/email/coppa_welcome_inactive.tpl @@ -1,52 +1,53 @@ -Subject: Добро пожаловать на форумы {SITENAME} - -{WELCOME_MSG} - -В соответствии с законом 'COPPA' ваша учётная запись не была активизирована. - -Пожалуйста распечатайте это сообщение и попросите вашего родителя или опекуна подписать его и поставить дату. Затем отправьте его по факсу: - -{FAX_INFO} - -Или по почте: - -{MAIL_INFO} - ------------------------------- CUT HERE ------------------------------ -Permission to Participate at {SITENAME} - -Username: {USERNAME} -Password: {PASSWORD} -Email: {EMAIL_ADDRESS} - -ICQ Number: {ICQ} -AIM Address: {AIM} -MSN Messenger: {MSN} -Yahoo Messenger: {YIM} -Web Site: {WEB_SITE} -From: {FROM} -Occupation: {OCC} -Interests: {INTERESTS} - -I HAVE REVIEWED THE INFORMATION PROVIDED BY MY CHILD AND HEREBY GRANT PERMISSION TO {SITENAME} TO STORE THIS INFORMATION. -I UNDERSTAND THIS INFORMATION CAN BE CHANGED AT ANY TIME BY ENTERING A PASSWORD. -I UNDERSTAND THAT MAY REQUEST FOR THIS INFORMATION TO BE REMOVED FROM {SITENAME} AT ANY TIME. - - -Parent or Guardian -(print your name here): _____________________ - -(sign here): __________________ - -Date: _______________ - ------------------------------- CUT HERE ------------------------------ - - -Как только администратор получит эту форму по факсу или по почте, ваша учётная запись будет активизирована. - -Не забывайте свой пароль: он хранится в нашей базе в зашифрованном виде, и мы не сможем вам его выслать. Если вы всё же забудете свой пароль, то вы сможете запросить новый, который будет активизирован таким же образом, как и ваша учётная запись. - -Спасибо за регистрацию. - +Subject: Добро пожаловать на форумы {SITENAME} +Charset: windows-1251 + +{WELCOME_MSG} + +В соответствии с законом 'COPPA' ваша учётная запись не была активизирована. + +Пожалуйста распечатайте это сообщение и попросите вашего родителя или опекуна подписать его и поставить дату. Затем отправьте его по факсу: + +{FAX_INFO} + +Или по почте: + +{MAIL_INFO} + +------------------------------ CUT HERE ------------------------------ +Permission to Participate at {SITENAME} + +Username: {USERNAME} +Password: {PASSWORD} +Email: {EMAIL_ADDRESS} + +ICQ Number: {ICQ} +AIM Address: {AIM} +MSN Messenger: {MSN} +Yahoo Messenger: {YIM} +Web Site: {WEB_SITE} +From: {FROM} +Occupation: {OCC} +Interests: {INTERESTS} + +I HAVE REVIEWED THE INFORMATION PROVIDED BY MY CHILD AND HEREBY GRANT PERMISSION TO {SITENAME} TO STORE THIS INFORMATION. +I UNDERSTAND THIS INFORMATION CAN BE CHANGED AT ANY TIME BY ENTERING A PASSWORD. +I UNDERSTAND THAT MAY REQUEST FOR THIS INFORMATION TO BE REMOVED FROM {SITENAME} AT ANY TIME. + + +Parent or Guardian +(print your name here): _____________________ + +(sign here): __________________ + +Date: _______________ + +------------------------------ CUT HERE ------------------------------ + + +Как только администратор получит эту форму по факсу или по почте, ваша учётная запись будет активизирована. + +Не забывайте свой пароль: он хранится в нашей базе в зашифрованном виде, и мы не сможем вам его выслать. Если вы всё же забудете свой пароль, то вы сможете запросить новый, который будет активизирован таким же образом, как и ваша учётная запись. + +Спасибо за регистрацию. + {EMAIL_SIG} \ No newline at end of file diff --git a/phpBB/language/lang_russian/email/group_added.tpl b/phpBB/language/lang_russian/email/group_added.tpl index 6f0dae5fa0..5265c1865e 100644 --- a/phpBB/language/lang_russian/email/group_added.tpl +++ b/phpBB/language/lang_russian/email/group_added.tpl @@ -1,11 +1,12 @@ -Subject: Вы были включены в группу - -Поздравляем! - -Вы были приняты в группу "{GROUP_NAME}" на сайте {SITENAME}. -Это было проделано модератором группы или администратором сайта, обратитесь к ним за дополнительной информацией. - -Перейдите по ссылке, чтобы увидеть информацию о вашем членстве в группах: -{U_GROUPCP} - -{EMAIL_SIG} +Subject: Вы были включены в группу +Charset: windows-1251 + +Поздравляем! + +Вы были приняты в группу "{GROUP_NAME}" на сайте {SITENAME}. +Это было проделано модератором группы или администратором сайта, обратитесь к ним за дополнительной информацией. + +Перейдите по ссылке, чтобы увидеть информацию о вашем членстве в группах: +{U_GROUPCP} + +{EMAIL_SIG} diff --git a/phpBB/language/lang_russian/email/group_approved.tpl b/phpBB/language/lang_russian/email/group_approved.tpl index f2e97fbe42..2f58193d87 100644 --- a/phpBB/language/lang_russian/email/group_approved.tpl +++ b/phpBB/language/lang_russian/email/group_approved.tpl @@ -1,10 +1,11 @@ -Subject: Ваша просьба была удовлетворена. - -Поздравляем! - -Ваша просьба о вступлении в группу "{GROUP_NAME}" на сайте {SITENAME} была удовлетворена. -Перейдите по ссылке, чтобы увидеть информацию о вашем членстве в группах: - -{U_GROUPCP} - -{EMAIL_SIG} +Subject: Ваша просьба была удовлетворена. +Charset: windows-1251 + +Поздравляем! + +Ваша просьба о вступлении в группу "{GROUP_NAME}" на сайте {SITENAME} была удовлетворена. +Перейдите по ссылке, чтобы увидеть информацию о вашем членстве в группах: + +{U_GROUPCP} + +{EMAIL_SIG} diff --git a/phpBB/language/lang_russian/email/group_request.tpl b/phpBB/language/lang_russian/email/group_request.tpl index 8c3ae63c69..8ddefb4d76 100644 --- a/phpBB/language/lang_russian/email/group_request.tpl +++ b/phpBB/language/lang_russian/email/group_request.tpl @@ -1,10 +1,11 @@ -Subject: Было подана просьба о вступлении в группу. - -Уважаемый(ая) {GROUP_MODERATOR}! - -Пользователь попросил о вступлении в группу (на сайте {SITENAME}), модератором которой вы являетесь. -Чтобы удовлетворить или отклонить эту просьбу перейдите по следующей ссылке: - -{U_GROUPCP} - -{EMAIL_SIG} +Subject: Было подана просьба о вступлении в группу. +Charset: windows-1251 + +Уважаемый(ая) {GROUP_MODERATOR}! + +Пользователь попросил о вступлении в группу (на сайте {SITENAME}), модератором которой вы являетесь. +Чтобы удовлетворить или отклонить эту просьбу перейдите по следующей ссылке: + +{U_GROUPCP} + +{EMAIL_SIG} diff --git a/phpBB/language/lang_russian/email/privmsg_notify.tpl b/phpBB/language/lang_russian/email/privmsg_notify.tpl index 7bdff8f8e3..b78c10db72 100644 --- a/phpBB/language/lang_russian/email/privmsg_notify.tpl +++ b/phpBB/language/lang_russian/email/privmsg_notify.tpl @@ -1,11 +1,12 @@ -Subject: Вам пришло новое личное сообщение - -Здравствуйте, {USERNAME}! - -Вам было направлено личное сообщение на сайте {SITENAME}, а вы просили уведомлять вас об этом. Вы можете посмотреть это сообщение перейдя по следующей ссылке: - -{U_INBOX} - -Помните, вы можете отказаться от получения подобных уведомлений, если измените настройки в своём профиле. - +Subject: Вам пришло новое личное сообщение +Charset: windows-1251 + +Здравствуйте, {USERNAME}! + +Вам было направлено личное сообщение на сайте {SITENAME}, а вы просили уведомлять вас об этом. Вы можете посмотреть это сообщение перейдя по следующей ссылке: + +{U_INBOX} + +Помните, вы можете отказаться от получения подобных уведомлений, если измените настройки в своём профиле. + {EMAIL_SIG} \ No newline at end of file diff --git a/phpBB/language/lang_russian/email/profile_send_email.tpl b/phpBB/language/lang_russian/email/profile_send_email.tpl index 6a566612fa..1b0b714df4 100644 --- a/phpBB/language/lang_russian/email/profile_send_email.tpl +++ b/phpBB/language/lang_russian/email/profile_send_email.tpl @@ -1,12 +1,14 @@ -Здравствуйте, {TO_USERNAME}! - -Ниже следует e-mail, посланный вам пользователем {FROM_USERNAME} через вашу регистрацию на сайте {SITENAME}. Если это сообщение является спамом, содержит оскорбления или прочие неприятные вам комментарии, пожалуйста свяжитесь с вебмастером по адресу: - -{BOARD_EMAIL} - -Включите данное сообщение целиком (особенно заголовки). Пожалуйста учтите, что адрес ответа в этом сообщении является адресом {FROM_USERNAME}. - -Посланное вам сообщение: -~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - +Charset: windows-1251 + +Здравствуйте, {TO_USERNAME}! + +Ниже следует e-mail, посланный вам пользователем {FROM_USERNAME} через вашу регистрацию на сайте {SITENAME}. Если это сообщение является спамом, содержит оскорбления или прочие неприятные вам комментарии, пожалуйста свяжитесь с вебмастером по адресу: + +{BOARD_EMAIL} + +Включите данное сообщение целиком (особенно заголовки). Пожалуйста учтите, что адрес ответа в этом сообщении является адресом {FROM_USERNAME}. + +Посланное вам сообщение: +~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + {MESSAGE} \ No newline at end of file diff --git a/phpBB/language/lang_russian/email/topic_notify.tpl b/phpBB/language/lang_russian/email/topic_notify.tpl index 02a94b492f..0427b9a505 100644 --- a/phpBB/language/lang_russian/email/topic_notify.tpl +++ b/phpBB/language/lang_russian/email/topic_notify.tpl @@ -1,13 +1,14 @@ -Subject: Уведомление об ответе в теме - {TOPIC_TITLE} - -Здравствуйте, {USERNAME}! - -Вы получили это сообщение потому, что следите за темой "{TOPIC_TITLE}" на сайте {SITENAME}. В этой теме со времени вашего последнего визита появилось новое сообщение. Вы можете перейти по ссылке чтобы посмотреть поступившие ответы, новые уведомления не будут приходить пока вы не просмотрите тему. - -{U_TOPIC} - -Если вы больше не хотите следить за темой, то либо щёлкните по ссылке "перестать следить за темой" внизу страницы с этой темой, либо перейдите по следующей ссылке: - -{U_STOP_WATCHING_TOPIC} - +Subject: Уведомление об ответе в теме - {TOPIC_TITLE} +Charset: windows-1251 + +Здравствуйте, {USERNAME}! + +Вы получили это сообщение потому, что следите за темой "{TOPIC_TITLE}" на сайте {SITENAME}. В этой теме со времени вашего последнего визита появилось новое сообщение. Вы можете перейти по ссылке чтобы посмотреть поступившие ответы, новые уведомления не будут приходить пока вы не просмотрите тему. + +{U_TOPIC} + +Если вы больше не хотите следить за темой, то либо щёлкните по ссылке "перестать следить за темой" внизу страницы с этой темой, либо перейдите по следующей ссылке: + +{U_STOP_WATCHING_TOPIC} + {EMAIL_SIG} \ No newline at end of file diff --git a/phpBB/language/lang_russian/email/user_activate.tpl b/phpBB/language/lang_russian/email/user_activate.tpl index dca6cb512c..37e1fb50dc 100644 --- a/phpBB/language/lang_russian/email/user_activate.tpl +++ b/phpBB/language/lang_russian/email/user_activate.tpl @@ -1,9 +1,10 @@ -Subject: Вновь активизировать учётную запись - -Здравствуйте, {USERNAME}! - -Ваша учётная запись на {SITENAME} была отключена, скорее всего из-за внесённых в ваш профиль изменений. Чтобы вновь её активизировать, щёлкните по этой ссылке: - -{U_ACTIVATE} - +Subject: Вновь активизировать учётную запись +Charset: windows-1251 + +Здравствуйте, {USERNAME}! + +Ваша учётная запись на {SITENAME} была отключена, скорее всего из-за внесённых в ваш профиль изменений. Чтобы вновь её активизировать, щёлкните по этой ссылке: + +{U_ACTIVATE} + {EMAIL_SIG} \ No newline at end of file diff --git a/phpBB/language/lang_russian/email/user_activate_passwd.tpl b/phpBB/language/lang_russian/email/user_activate_passwd.tpl index 14b8d20ff1..81e4e79606 100644 --- a/phpBB/language/lang_russian/email/user_activate_passwd.tpl +++ b/phpBB/language/lang_russian/email/user_activate_passwd.tpl @@ -1,17 +1,18 @@ -Subject: Активизация нового пароля - -Здравствуйте, {USERNAME}! - -Вы получили это письмо потому, что вы (либо кто-то, выдающий себя за вас) попросили выслать новый пароль к вашей учётной записи на сайте {SITENAME}. Если вы не просили выслать пароль, не обращайте внимания на это письмо, если же подобные письма будут продолжать приходить, обратитесь к администратору форумов. - -Для того, чтобы использовать новый пароль вы должны его активизировать. Для этого перейдите по ссылке: - -{U_ACTIVATE} - -В случае успешной активизации вы сможете входить в систему, используя следующий пароль: - -Пароль: {PASSWORD} - -Вы сможете сменить этот пароль на странице редактирования профиля. Если у вас возникнут какие-то трудности, обратитесь к администратору форумов. - +Subject: Активизация нового пароля +Charset: windows-1251 + +Здравствуйте, {USERNAME}! + +Вы получили это письмо потому, что вы (либо кто-то, выдающий себя за вас) попросили выслать новый пароль к вашей учётной записи на сайте {SITENAME}. Если вы не просили выслать пароль, не обращайте внимания на это письмо, если же подобные письма будут продолжать приходить, обратитесь к администратору форумов. + +Для того, чтобы использовать новый пароль вы должны его активизировать. Для этого перейдите по ссылке: + +{U_ACTIVATE} + +В случае успешной активизации вы сможете входить в систему, используя следующий пароль: + +Пароль: {PASSWORD} + +Вы сможете сменить этот пароль на странице редактирования профиля. Если у вас возникнут какие-то трудности, обратитесь к администратору форумов. + {EMAIL_SIG} \ No newline at end of file diff --git a/phpBB/language/lang_russian/email/user_welcome.tpl b/phpBB/language/lang_russian/email/user_welcome.tpl index 06ff9c5585..75823edc51 100644 --- a/phpBB/language/lang_russian/email/user_welcome.tpl +++ b/phpBB/language/lang_russian/email/user_welcome.tpl @@ -1,16 +1,17 @@ -Subject: Добро пожаловать на форумы {SITENAME} - -{WELCOME_MSG} - -Пожалуйста сохраните это сообщение. Параметры вашей учётной записи таковы: - ----------------------------- -Имя пользователя: {USERNAME} -Пароль: {PASSWORD} ----------------------------- - -Не забывайте свой пароль: он хранится в нашей базе в зашифрованном виде, и мы не сможем вам его выслать. Если вы всё же забудете свой пароль, то вы сможете запросить новый, который будет активизирован таким же образом, как и ваша учётная запись. - -Спасибо за регистрацию. - +Subject: Добро пожаловать на форумы {SITENAME} +Charset: windows-1251 + +{WELCOME_MSG} + +Пожалуйста сохраните это сообщение. Параметры вашей учётной записи таковы: + +---------------------------- +Имя пользователя: {USERNAME} +Пароль: {PASSWORD} +---------------------------- + +Не забывайте свой пароль: он хранится в нашей базе в зашифрованном виде, и мы не сможем вам его выслать. Если вы всё же забудете свой пароль, то вы сможете запросить новый, который будет активизирован таким же образом, как и ваша учётная запись. + +Спасибо за регистрацию. + {EMAIL_SIG} \ No newline at end of file diff --git a/phpBB/language/lang_russian/email/user_welcome_inactive.tpl b/phpBB/language/lang_russian/email/user_welcome_inactive.tpl index 09e8f047ea..6b070f6d42 100644 --- a/phpBB/language/lang_russian/email/user_welcome_inactive.tpl +++ b/phpBB/language/lang_russian/email/user_welcome_inactive.tpl @@ -1,20 +1,21 @@ -Subject: Добро пожаловать на форумы {SITENAME} - -{WELCOME_MSG} - -Пожалуйста сохраните это сообщение. Параметры вашей учётной записи таковы: - ----------------------------- -Имя пользователя: {USERNAME} -Пароль: {PASSWORD} ----------------------------- - -Ваша учётная запись пока не активна. Вы не сможете им пользоваться, пока не перейдёте по следующей ссылке: - -{U_ACTIVATE} - -Не забывайте свой пароль: он хранится в нашей базе в зашифрованном виде, и мы не сможем вам его выслать. Если вы всё же забудете свой пароль, то вы сможете запросить новый, который будет активизирован таким же образом, как и ваша учётная запись. - -Спасибо за регистрацию. - +Subject: Добро пожаловать на форумы {SITENAME} +Charset: windows-1251 + +{WELCOME_MSG} + +Пожалуйста сохраните это сообщение. Параметры вашей учётной записи таковы: + +---------------------------- +Имя пользователя: {USERNAME} +Пароль: {PASSWORD} +---------------------------- + +Ваша учётная запись пока не активна. Вы не сможете им пользоваться, пока не перейдёте по следующей ссылке: + +{U_ACTIVATE} + +Не забывайте свой пароль: он хранится в нашей базе в зашифрованном виде, и мы не сможем вам его выслать. Если вы всё же забудете свой пароль, то вы сможете запросить новый, который будет активизирован таким же образом, как и ваша учётная запись. + +Спасибо за регистрацию. + {EMAIL_SIG} \ No newline at end of file diff --git a/phpBB/language/lang_spanish/email/admin_activate.tpl b/phpBB/language/lang_spanish/email/admin_activate.tpl index 04c8275491..ea0af53880 100644 --- a/phpBB/language/lang_spanish/email/admin_activate.tpl +++ b/phpBB/language/lang_spanish/email/admin_activate.tpl @@ -1,4 +1,5 @@ Subject: New user account +Charset: iso-8859-1 Hello, diff --git a/phpBB/language/lang_spanish/email/admin_send_email.tpl b/phpBB/language/lang_spanish/email/admin_send_email.tpl index a04796f184..234f61df52 100644 --- a/phpBB/language/lang_spanish/email/admin_send_email.tpl +++ b/phpBB/language/lang_spanish/email/admin_send_email.tpl @@ -1,3 +1,5 @@ +Charset: iso-8859-1 + The following is an email sent to you by an administrator of "{SITENAME}". If this message is spam, contains abusive or other comments you find offensive please contact the webmaster of the board at the following address: {BOARD_EMAIL} diff --git a/phpBB/language/lang_spanish/email/admin_welcome_activated.tpl b/phpBB/language/lang_spanish/email/admin_welcome_activated.tpl index abd1391df8..3b7aa48362 100644 --- a/phpBB/language/lang_spanish/email/admin_welcome_activated.tpl +++ b/phpBB/language/lang_spanish/email/admin_welcome_activated.tpl @@ -1,4 +1,5 @@ Subject: Account Activated +Charset: iso-8859-1 Hello {USERNAME}, diff --git a/phpBB/language/lang_spanish/email/admin_welcome_inactive.tpl b/phpBB/language/lang_spanish/email/admin_welcome_inactive.tpl index a9cd4e5db0..905e71696b 100644 --- a/phpBB/language/lang_spanish/email/admin_welcome_inactive.tpl +++ b/phpBB/language/lang_spanish/email/admin_welcome_inactive.tpl @@ -1,4 +1,5 @@ Subject: Welcome to {SITENAME} Forums +Charset: iso-8859-1 {WELCOME_MSG} diff --git a/phpBB/language/lang_spanish/email/coppa_welcome_inactive.tpl b/phpBB/language/lang_spanish/email/coppa_welcome_inactive.tpl index a77c7feb02..97e651a488 100644 --- a/phpBB/language/lang_spanish/email/coppa_welcome_inactive.tpl +++ b/phpBB/language/lang_spanish/email/coppa_welcome_inactive.tpl @@ -1,4 +1,5 @@ Subject: Welcome to {SITENAME} Forums +Charset: iso-8859-1 {WELCOME_MSG} diff --git a/phpBB/language/lang_spanish/email/group_added.tpl b/phpBB/language/lang_spanish/email/group_added.tpl index 81e87dbfb3..5707da9031 100644 --- a/phpBB/language/lang_spanish/email/group_added.tpl +++ b/phpBB/language/lang_spanish/email/group_added.tpl @@ -1,4 +1,5 @@ Subject: You have been added to this usergroup +Charset: iso-8859-1 Congratulations, diff --git a/phpBB/language/lang_spanish/email/group_approved.tpl b/phpBB/language/lang_spanish/email/group_approved.tpl index 60def16635..38773c513d 100644 --- a/phpBB/language/lang_spanish/email/group_approved.tpl +++ b/phpBB/language/lang_spanish/email/group_approved.tpl @@ -1,4 +1,5 @@ Subject: Your request has been approved +Charset: iso-8859-1 Congratulations, diff --git a/phpBB/language/lang_spanish/email/group_request.tpl b/phpBB/language/lang_spanish/email/group_request.tpl index a67f013364..bac4dc8ebe 100644 --- a/phpBB/language/lang_spanish/email/group_request.tpl +++ b/phpBB/language/lang_spanish/email/group_request.tpl @@ -1,4 +1,5 @@ Subject: Se a realizado un pedido para ingresar a tu grupo +Charset: iso-8859-1 Estimado {GROUP_MODERATOR}, diff --git a/phpBB/language/lang_spanish/email/privmsg_notify.tpl b/phpBB/language/lang_spanish/email/privmsg_notify.tpl index a6199b9c05..f03cdd12be 100644 --- a/phpBB/language/lang_spanish/email/privmsg_notify.tpl +++ b/phpBB/language/lang_spanish/email/privmsg_notify.tpl @@ -1,4 +1,5 @@ Subject: Tienes un nuevo mensaje privado +Charset: iso-8859-1 Hola {USERNAME}, diff --git a/phpBB/language/lang_spanish/email/profile_send_email.tpl b/phpBB/language/lang_spanish/email/profile_send_email.tpl index 8fd2c9bd56..58224c5648 100644 --- a/phpBB/language/lang_spanish/email/profile_send_email.tpl +++ b/phpBB/language/lang_spanish/email/profile_send_email.tpl @@ -1,3 +1,5 @@ +Charset: iso-8859-1 + Hola {TO_USERNAME}, El siguiente email ha sido enviado por {FROM_USERNAME} a travйs de tu cuenta en {SITENAME}. Si este mensaje es spam, o contiene comentarios abusivos o que te resultan ofensivos, por favor contacta al webmaster de los foros en esta direcciуn: diff --git a/phpBB/language/lang_spanish/email/topic_notify.tpl b/phpBB/language/lang_spanish/email/topic_notify.tpl index f9c42f0790..5dfd363804 100644 --- a/phpBB/language/lang_spanish/email/topic_notify.tpl +++ b/phpBB/language/lang_spanish/email/topic_notify.tpl @@ -1,4 +1,5 @@ Subject: Aviso de respuesta de Tуpico - {TOPIC_TITLE} +Charset: iso-8859-1 Hola {USERNAME}, diff --git a/phpBB/language/lang_spanish/email/user_activate.tpl b/phpBB/language/lang_spanish/email/user_activate.tpl index 5d8681eaf0..ca6bfda6ad 100644 --- a/phpBB/language/lang_spanish/email/user_activate.tpl +++ b/phpBB/language/lang_spanish/email/user_activate.tpl @@ -1,4 +1,5 @@ Subject: Reactivar tu cuenta +Charset: iso-8859-1 Hola {USERNAME}, diff --git a/phpBB/language/lang_spanish/email/user_activate_passwd.tpl b/phpBB/language/lang_spanish/email/user_activate_passwd.tpl index 68888ce013..496e00f4b1 100644 --- a/phpBB/language/lang_spanish/email/user_activate_passwd.tpl +++ b/phpBB/language/lang_spanish/email/user_activate_passwd.tpl @@ -1,4 +1,5 @@ Subject: Activaciуn de nueva contraseсa +Charset: iso-8859-1 Hola {USERNAME} diff --git a/phpBB/language/lang_spanish/email/user_welcome.tpl b/phpBB/language/lang_spanish/email/user_welcome.tpl index fca8f6d9bd..42e356960d 100644 --- a/phpBB/language/lang_spanish/email/user_welcome.tpl +++ b/phpBB/language/lang_spanish/email/user_welcome.tpl @@ -1,4 +1,5 @@ Subject: Bienvenido a los foros de {SITENAME} +Charset: iso-8859-1 {WELCOME_MSG} diff --git a/phpBB/language/lang_spanish/email/user_welcome_inactive.tpl b/phpBB/language/lang_spanish/email/user_welcome_inactive.tpl index ebb8a89136..76c94cf0eb 100644 --- a/phpBB/language/lang_spanish/email/user_welcome_inactive.tpl +++ b/phpBB/language/lang_spanish/email/user_welcome_inactive.tpl @@ -1,4 +1,5 @@ Subject: Bienvenido a los foros de {SITENAME} +Charset: iso-8859-1 {WELCOME_MSG} diff --git a/phpBB/language/lang_swedish/email/admin_activate.tpl b/phpBB/language/lang_swedish/email/admin_activate.tpl index a6c4cf6343..84624b27e0 100644 --- a/phpBB/language/lang_swedish/email/admin_activate.tpl +++ b/phpBB/language/lang_swedish/email/admin_activate.tpl @@ -1,4 +1,5 @@ Subject: Nytt anvдndarkonto +Charset: iso-8859-1 Hej, diff --git a/phpBB/language/lang_swedish/email/admin_send_email.tpl b/phpBB/language/lang_swedish/email/admin_send_email.tpl index a154eb95e2..ebac8b6874 100644 --- a/phpBB/language/lang_swedish/email/admin_send_email.tpl +++ b/phpBB/language/lang_swedish/email/admin_send_email.tpl @@ -1,3 +1,5 @@ +Charset: iso-8859-1 + Detta дr ett meddelande frеn administratцren av "{SITENAME}". Om meddelandet дr ett spam eller innehеller stцtande eller pе annat sдtt grova kommentarer som du tycker дr krдnkande var god och tar kontakt med webbmastern pе fцljande adress: {BOARD_EMAIL} diff --git a/phpBB/language/lang_swedish/email/admin_welcome_activated.tpl b/phpBB/language/lang_swedish/email/admin_welcome_activated.tpl index 121299cf45..2b46a38102 100644 --- a/phpBB/language/lang_swedish/email/admin_welcome_activated.tpl +++ b/phpBB/language/lang_swedish/email/admin_welcome_activated.tpl @@ -1,4 +1,5 @@ Subject: Konto Aktiverat +Charset: iso-8859-1 Hej {USERNAME}, diff --git a/phpBB/language/lang_swedish/email/admin_welcome_inactive.tpl b/phpBB/language/lang_swedish/email/admin_welcome_inactive.tpl index 644468e3d0..bc781abb75 100644 --- a/phpBB/language/lang_swedish/email/admin_welcome_inactive.tpl +++ b/phpBB/language/lang_swedish/email/admin_welcome_inactive.tpl @@ -1,4 +1,5 @@ Subject: Vдlkommen till {SITENAME} Forum +Charset: iso-8859-1 {WELCOME_MSG} diff --git a/phpBB/language/lang_swedish/email/coppa_welcome_inactive.tpl b/phpBB/language/lang_swedish/email/coppa_welcome_inactive.tpl index ca07dbfd07..3f0b41c0d7 100644 --- a/phpBB/language/lang_swedish/email/coppa_welcome_inactive.tpl +++ b/phpBB/language/lang_swedish/email/coppa_welcome_inactive.tpl @@ -1,4 +1,5 @@ Subject: Vдlkommen till {SITENAME} Forum +Charset: iso-8859-1 {WELCOME_MSG} diff --git a/phpBB/language/lang_swedish/email/group_added.tpl b/phpBB/language/lang_swedish/email/group_added.tpl index 7c8a276cd9..5bfd5d7ca1 100644 --- a/phpBB/language/lang_swedish/email/group_added.tpl +++ b/phpBB/language/lang_swedish/email/group_added.tpl @@ -1,4 +1,5 @@ Subject: Du har lagts till i den hдr anvдndar gruppen +Charset: iso-8859-1 Gratulera, diff --git a/phpBB/language/lang_swedish/email/group_approved.tpl b/phpBB/language/lang_swedish/email/group_approved.tpl index f169bdf9e2..cb5128e41b 100644 --- a/phpBB/language/lang_swedish/email/group_approved.tpl +++ b/phpBB/language/lang_swedish/email/group_approved.tpl @@ -1,4 +1,5 @@ Subject: Din fцrfrеgan har blivit godkдnd +Charset: iso-8859-1 Gratulera, diff --git a/phpBB/language/lang_swedish/email/group_request.tpl b/phpBB/language/lang_swedish/email/group_request.tpl index d15e2a2d0e..1e5df6bcfa 100644 --- a/phpBB/language/lang_swedish/email/group_request.tpl +++ b/phpBB/language/lang_swedish/email/group_request.tpl @@ -1,4 +1,5 @@ Subject: En fцrfrеgan att om att bli medlem i din grupp har gjorts +Charset: iso-8859-1 Hej {GROUP_MODERATOR}, diff --git a/phpBB/language/lang_swedish/email/privmsg_notify.tpl b/phpBB/language/lang_swedish/email/privmsg_notify.tpl index 92423595a4..c1f68987bb 100644 --- a/phpBB/language/lang_swedish/email/privmsg_notify.tpl +++ b/phpBB/language/lang_swedish/email/privmsg_notify.tpl @@ -1,4 +1,5 @@ Subject: Du har fеtt ett Privat Meddelande +Charset: iso-8859-1 Hej {USERNAME}, diff --git a/phpBB/language/lang_swedish/email/profile_send_email.tpl b/phpBB/language/lang_swedish/email/profile_send_email.tpl index 34c70a3655..d7ee571082 100644 --- a/phpBB/language/lang_swedish/email/profile_send_email.tpl +++ b/phpBB/language/lang_swedish/email/profile_send_email.tpl @@ -1,3 +1,5 @@ +Charset: iso-8859-1 + Hej {TO_USERNAME}, Detta дr ett meddelande frеn {FROM_USERNAME} via ditt konto pе {SITENAME}. Om meddelandet дr ett spam eller innehеller stцtande eller pе annat sдtt grova kommentarer som du tycker дr krдnkande var god och tar kontakt med webbmastern pе fцljande adress: diff --git a/phpBB/language/lang_swedish/email/topic_notify.tpl b/phpBB/language/lang_swedish/email/topic_notify.tpl index 81250cfaf8..4e3ef57f51 100644 --- a/phpBB/language/lang_swedish/email/topic_notify.tpl +++ b/phpBB/language/lang_swedish/email/topic_notify.tpl @@ -1,4 +1,5 @@ Subject: Meddelande om svar pе inlдgg - {TOPIC_TITLE} +Charset: iso-8859-1 Hej {USERNAME}, diff --git a/phpBB/language/lang_swedish/email/user_activate.tpl b/phpBB/language/lang_swedish/email/user_activate.tpl index 6d909d5efb..4204eea8d0 100644 --- a/phpBB/language/lang_swedish/email/user_activate.tpl +++ b/phpBB/language/lang_swedish/email/user_activate.tpl @@ -1,4 +1,5 @@ Subject: Еteraktivera ditt konto! +Charset: iso-8859-1 Hej {USERNAME}, diff --git a/phpBB/language/lang_swedish/email/user_activate_passwd.tpl b/phpBB/language/lang_swedish/email/user_activate_passwd.tpl index bc8a26f6c0..d730b63ea8 100644 --- a/phpBB/language/lang_swedish/email/user_activate_passwd.tpl +++ b/phpBB/language/lang_swedish/email/user_activate_passwd.tpl @@ -1,4 +1,5 @@ Subject: Ny lцsenords aktivering +Charset: iso-8859-1 Hej {USERNAME} diff --git a/phpBB/language/lang_swedish/email/user_welcome.tpl b/phpBB/language/lang_swedish/email/user_welcome.tpl index b9126834a4..9f9fd0f129 100644 --- a/phpBB/language/lang_swedish/email/user_welcome.tpl +++ b/phpBB/language/lang_swedish/email/user_welcome.tpl @@ -1,4 +1,5 @@ Subject: Vдlkommen till {SITENAME} Forum +Charset: iso-8859-1 {WELCOME_MSG} diff --git a/phpBB/language/lang_swedish/email/user_welcome_inactive.tpl b/phpBB/language/lang_swedish/email/user_welcome_inactive.tpl index 402738c136..ca77e8c057 100644 --- a/phpBB/language/lang_swedish/email/user_welcome_inactive.tpl +++ b/phpBB/language/lang_swedish/email/user_welcome_inactive.tpl @@ -1,4 +1,5 @@ Subject: Vдlkommen till {SITENAME} Forum +Charset: iso-8859-1 {WELCOME_MSG} diff --git a/phpBB/language/lang_turkish/email/admin_activate.tpl b/phpBB/language/lang_turkish/email/admin_activate.tpl index e0f9acf7a7..2b09d16c8a 100644 --- a/phpBB/language/lang_turkish/email/admin_activate.tpl +++ b/phpBB/language/lang_turkish/email/admin_activate.tpl @@ -1,4 +1,5 @@ Subject: Yeni kullanэcэ hesabэ +Charset: iso-8859-9 Merhaba, diff --git a/phpBB/language/lang_turkish/email/admin_send_email.tpl b/phpBB/language/lang_turkish/email/admin_send_email.tpl index 7529ab1701..84a8761447 100644 --- a/phpBB/language/lang_turkish/email/admin_send_email.tpl +++ b/phpBB/language/lang_turkish/email/admin_send_email.tpl @@ -1,3 +1,5 @@ +Charset: iso-8859-9 + Asagidaki msg size "{SITENAME}" admini tarafindan gonderildi. Eger bu msgin spam oldugunu dusunuyorsaniz veya iceriginden rahatsiz olduysaniz asagida adresten iletisime gecin: {BOARD_EMAIL} diff --git a/phpBB/language/lang_turkish/email/admin_welcome_activated.tpl b/phpBB/language/lang_turkish/email/admin_welcome_activated.tpl index c0d4fa6cee..01f853cbbc 100644 --- a/phpBB/language/lang_turkish/email/admin_welcome_activated.tpl +++ b/phpBB/language/lang_turkish/email/admin_welcome_activated.tpl @@ -1,4 +1,5 @@ Subject: Hesap aktif hale getirilmiюtir +Charset: iso-8859-9 Merhaba {USERNAME}, diff --git a/phpBB/language/lang_turkish/email/admin_welcome_inactive.tpl b/phpBB/language/lang_turkish/email/admin_welcome_inactive.tpl index 14359f77e9..558ff38532 100644 --- a/phpBB/language/lang_turkish/email/admin_welcome_inactive.tpl +++ b/phpBB/language/lang_turkish/email/admin_welcome_inactive.tpl @@ -1,4 +1,5 @@ Subject: {SITENAME} Forumlarэna Hoюgeldiniz +Charset: iso-8859-9 {WELCOME_MSG} diff --git a/phpBB/language/lang_turkish/email/coppa_welcome_inactive.tpl b/phpBB/language/lang_turkish/email/coppa_welcome_inactive.tpl index c1f0f629a4..9df96b2c32 100644 --- a/phpBB/language/lang_turkish/email/coppa_welcome_inactive.tpl +++ b/phpBB/language/lang_turkish/email/coppa_welcome_inactive.tpl @@ -1,4 +1,5 @@ Subject: {SITENAME} Forumlarэna Hoюgeldiniz +Charset: iso-8859-9 {WELCOME_MSG} diff --git a/phpBB/language/lang_turkish/email/group_added.tpl b/phpBB/language/lang_turkish/email/group_added.tpl index 6c9b056eb9..47d54a7352 100644 --- a/phpBB/language/lang_turkish/email/group_added.tpl +++ b/phpBB/language/lang_turkish/email/group_added.tpl @@ -1,4 +1,5 @@ Subject: Bu gruba eklendiniz +Charset: iso-8859-9 Tebrikler, diff --git a/phpBB/language/lang_turkish/email/group_approved.tpl b/phpBB/language/lang_turkish/email/group_approved.tpl index d7075948a6..97fb531eca 100644 --- a/phpBB/language/lang_turkish/email/group_approved.tpl +++ b/phpBB/language/lang_turkish/email/group_approved.tpl @@ -1,4 +1,5 @@ Subject: Baюvurunuz onaylanmэюtэr +Charset: iso-8859-9 Tebrikler, diff --git a/phpBB/language/lang_turkish/email/group_request.tpl b/phpBB/language/lang_turkish/email/group_request.tpl index f115d1092f..37d9bf7957 100644 --- a/phpBB/language/lang_turkish/email/group_request.tpl +++ b/phpBB/language/lang_turkish/email/group_request.tpl @@ -1,4 +1,5 @@ Subject: Grubunuza katэlmak iзin bir baюvuru var +Charset: iso-8859-9 Degerli {GROUP_MODERATOR}, diff --git a/phpBB/language/lang_turkish/email/privmsg_notify.tpl b/phpBB/language/lang_turkish/email/privmsg_notify.tpl index 3ce5e8d228..1f0f0f559b 100644 --- a/phpBB/language/lang_turkish/email/privmsg_notify.tpl +++ b/phpBB/language/lang_turkish/email/privmsg_notify.tpl @@ -1,4 +1,5 @@ Subject: Yeni bir цzel mesaj geldi +Charset: iso-8859-9 Merhaba {USERNAME}, diff --git a/phpBB/language/lang_turkish/email/profile_send_email.tpl b/phpBB/language/lang_turkish/email/profile_send_email.tpl index 0f31563f0f..5547ce4d13 100644 --- a/phpBB/language/lang_turkish/email/profile_send_email.tpl +++ b/phpBB/language/lang_turkish/email/profile_send_email.tpl @@ -1,3 +1,5 @@ +Charset: iso-8859-9 + Merhaba {TO_USERNAME}, Bu msg size {FROM_USERNAME} tarafindan {SITENAME} da bulunan hesabiniz araciligi ile gonderildi. Eger bu msgin spam oldugunu dusunuyorsaniz veya iceriginden rahatsiz iseniz lutfen asagidaki adresle iletisime geciniz. diff --git a/phpBB/language/lang_turkish/email/topic_notify.tpl b/phpBB/language/lang_turkish/email/topic_notify.tpl index 58c169d03e..31067e3eac 100644 --- a/phpBB/language/lang_turkish/email/topic_notify.tpl +++ b/phpBB/language/lang_turkish/email/topic_notify.tpl @@ -1,4 +1,5 @@ Subject: Cevap gцzleme - {TOPIC_TITLE} +Charset: iso-8859-9 Merhaba {USERNAME}, diff --git a/phpBB/language/lang_turkish/email/user_activate.tpl b/phpBB/language/lang_turkish/email/user_activate.tpl index ef3c29ff6a..224096838e 100644 --- a/phpBB/language/lang_turkish/email/user_activate.tpl +++ b/phpBB/language/lang_turkish/email/user_activate.tpl @@ -1,4 +1,5 @@ Subject: Hesabэnэzэ yeniden aktif hale getirmelisiniz! +Charset: iso-8859-9 Merhaba {USERNAME}, diff --git a/phpBB/language/lang_turkish/email/user_activate_passwd.tpl b/phpBB/language/lang_turkish/email/user_activate_passwd.tpl index e98eb20284..2f77d3e142 100644 --- a/phpBB/language/lang_turkish/email/user_activate_passwd.tpl +++ b/phpBB/language/lang_turkish/email/user_activate_passwd.tpl @@ -1,4 +1,5 @@ Subject: Yeni юifre aktivasyonu +Charset: iso-8859-9 Merhaba {USERNAME} diff --git a/phpBB/language/lang_turkish/email/user_welcome.tpl b/phpBB/language/lang_turkish/email/user_welcome.tpl index 0c6f1d87b4..6431070bee 100644 --- a/phpBB/language/lang_turkish/email/user_welcome.tpl +++ b/phpBB/language/lang_turkish/email/user_welcome.tpl @@ -1,4 +1,5 @@ Subject: {SITENAME} Forumlarэna Hoюgeldiniz +Charset: iso-8859-9 {WELCOME_MSG} diff --git a/phpBB/language/lang_turkish/email/user_welcome_inactive.tpl b/phpBB/language/lang_turkish/email/user_welcome_inactive.tpl index ea3e14f728..a065e66579 100644 --- a/phpBB/language/lang_turkish/email/user_welcome_inactive.tpl +++ b/phpBB/language/lang_turkish/email/user_welcome_inactive.tpl @@ -1,4 +1,5 @@ Subject: {SITENAME} Forumlarэna Hoюgeldiniz +Charset: iso-8859-9 {WELCOME_MSG} diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php index f576c4eaab..0cd475941d 100644 --- a/phpBB/viewforum.php +++ b/phpBB/viewforum.php @@ -257,7 +257,7 @@ if ( !empty($HTTP_POST_VARS['topicdays']) || !empty($HTTP_GET_VARS['topicdays']) } $row = $db->sql_fetchrow($result); - $topics_count = ( $forum_row['forum_topics'] ) ? $forum_row['forum_topics'] : 1; + $topics_count = ( $row['forum_topics'] ) ? $row['forum_topics'] : 1; $limit_topics_time = "AND p.post_time >= $min_topic_time"; if ( !empty($HTTP_POST_VARS['topicdays']) )