From 690cfe993b4b82b938717663d52e3c14ba047619 Mon Sep 17 00:00:00 2001
From: Antennipasi <Antennipasi@ispconfig3>
Date: Sun, 25 Jan 2009 09:41:05 -0500
Subject: [PATCH] fix for local characters not encoded properly in welcome-email. remove trailing empty lines from finnish language, again...
---
interface/web/dns/lib/lang/fi_dns_template_list.lng | 1
interface/web/mail/lib/lang/fi_mail_domain_list.lng | 1
interface/web/mail/mail_user_edit.php | 25 ++++
interface/web/client/lib/lang/fi_clients_list.lng | 1
interface/web/designer/lib/lang/fi_module_show.lng | 1
interface/web/admin/lib/lang/fi_groups.lng | 1
interface/web/help/lib/lang/fi.lng | 1
interface/web/dns/lib/lang/fi_dns_rp.lng | 1
interface/web/admin/lib/lang/fi_server_config_list.lng | 1
interface/web/client/lib/lang/fi_client.lng | 1
interface/web/tools/lib/lang/fi.lng | 1
interface/web/mail/lib/lang/bg_mail_user.lng | 2
interface/web/dns/lib/lang/fi_dns_cname.lng | 1
interface/web/admin/lib/lang/fi_server_config.lng | 1
interface/web/admin/lib/lang/fi.lng | 1
interface/web/js/lib/lang/fi_javascript.lng | 1
interface/web/mail/lib/lang/fi_spamfilter_blacklist_list.lng | 1
interface/web/admin/lib/lang/fi_server_ip_list.lng | 1
interface/web/mail/lib/lang/fi_mail_user_list.lng | 1
interface/web/mail/lib/lang/fi_spamfilter_whitelist.lng | 1
interface/web/mail/lib/lang/fi_mail_transport_list.lng | 1
interface/web/admin/lib/lang/fi_language_add.lng | 1
interface/web/mail/lib/lang/de_mail_user.lng | 56 +++++-----
interface/web/mail/lib/lang/en_mail_user.lng | 4
interface/web/mail/lib/lang/es_mail_user.lng | 2
interface/web/dns/lib/lang/fi.lng | 1
interface/web/mail/lib/lang/fi_spamfilter_config.lng | 1
interface/web/admin/lib/lang/fi_users.lng | 1
interface/web/sites/lib/lang/fi_web_subdomain_list.lng | 1
interface/web/mail/lib/lang/fi_mail_get_list.lng | 1
interface/web/sites/lib/lang/fi_database.lng | 1
interface/web/sites/lib/lang/fi_shell_user_list.lng | 1
interface/web/mail/lib/lang/fi_spamfilter_whitelist_list.lng | 1
interface/web/sites/lib/lang/fi_shell_user.lng | 1
interface/web/mail/lib/lang/fi_mail_spamfilter_list.lng | 1
interface/web/mail/lib/lang/fi_spamfilter_users.lng | 1
interface/web/mail/lib/lang/fi_spamfilter_users_list.lng | 1
interface/web/designer/lib/lang/fi_module_edit.lng | 1
interface/web/mail/lib/lang/fr_mail_user.lng | 2
interface/web/designer/lib/lang/fi_form_list.lng | 1
interface/web/dns/lib/lang/fi_dns_hinfo.lng | 1
interface/web/mail/lib/lang/fi_mail_alias.lng | 1
interface/lib/lang/de.lng | 37 +++---
interface/web/dns/lib/lang/fi_dns_a.lng | 1
interface/web/mail/lib/lang/fi_mail_user.lng | 5
interface/web/mail/lib/lang/fi_mail_spamfilter.lng | 1
interface/web/mail/lib/lang/fi_spamfilter_policy_list.lng | 1
interface/web/mail/lib/lang/fi_mail_get.lng | 1
interface/web/admin/lib/lang/fi_language_list.lng | 1
interface/web/admin/lib/lang/fi_firewall_list.lng | 1
interface/web/sites/lib/lang/fi_ftp_user.lng | 1
interface/web/client/lib/lang/fi_client_template_list.lng | 1
interface/web/mail/lib/lang/fi_mail_transport.lng | 1
interface/web/monitor/lib/lang/fi_syslog_list.lng | 1
interface/web/admin/lib/lang/fi_software_repo_list.lng | 1
interface/web/mail/lib/lang/fi_spamfilter_config_list.lng | 1
interface/web/sites/lib/lang/fi.lng | 1
interface/web/dns/lib/lang/fi_dns_wizard.lng | 1
interface/web/mail/lib/lang/nl_mail_user.lng | 2
interface/web/monitor/lib/lang/fi_datalog_list.lng | 1
interface/web/dns/lib/lang/fi_dns_ns.lng | 1
interface/web/mail/lib/lang/fi_mail_blacklist.lng | 1
interface/web/mail/lib/lang/ru_mail_user.lng | 2
interface/web/admin/lib/lang/fi_server_ip.lng | 1
interface/web/mail/lib/lang/fi_mail_user_stats_list.lng | 1
interface/web/mail/lib/lang/fi_mail_alias_list.lng | 1
interface/web/mail/lib/lang/fi_mail_content_filter_list.lng | 1
interface/web/designer/lib/lang/fi_form_show.lng | 1
interface/web/mail/lib/lang/se_mail_user.lng | 2
interface/web/designer/lib/lang/fi_form_edit.lng | 1
interface/web/admin/lib/lang/fi_language_export.lng | 1
interface/web/dns/lib/lang/fi_dns_alias.lng | 1
interface/web/admin/lib/lang/fi_server_list.lng | 1
interface/web/mail/lib/lang/fi_spamfilter_blacklist.lng | 1
interface/web/mail/lib/lang/it_mail_user.lng | 2
interface/web/mail/lib/lang/fi_mail_domain.lng | 1
interface/web/help/lib/lang/fi_support_message_list.lng | 1
interface/web/login/lib/lang/fi.lng | 1
interface/web/tools/lib/lang/fi_usersettings.lng | 1
interface/web/mail/lib/lang/fi_mail_forward.lng | 1
interface/web/sites/lib/lang/fi_web_subdomain.lng | 1
interface/web/admin/lib/lang/fi_groups_list.lng | 1
interface/web/admin/lib/lang/fi_software_package_list.lng | 1
interface/web/dns/lib/lang/fi_dns_soa.lng | 1
interface/web/admin/lib/lang/fi_firewall.lng | 1
interface/web/designer/lib/lang/fi_module_nav_item_edit.lng | 1
interface/web/mail/lib/lang/fi.lng | 1
interface/web/sites/lib/lang/fi_web_domain.lng | 3
interface/lib/lang/fi.lng | 1
interface/web/admin/lib/lang/fi_users_list.lng | 1
interface/web/client/lib/lang/fi.lng | 1
interface/web/dns/lib/lang/fi_dns_template.lng | 1
interface/web/admin/lib/lang/fi_language_edit.lng | 1
interface/web/dns/lib/lang/fi_dns_a_list.lng | 1
interface/web/admin/lib/lang/fi_language_import.lng | 1
interface/web/mail/lib/lang/fi_mail_domain_catchall.lng | 1
interface/web/mail/lib/lang/fi_mail_whitelist.lng | 1
interface/web/admin/lib/lang/fi_language_complete.lng | 1
interface/web/mail/lib/lang/fi_mail_blacklist_list.lng | 1
interface/web/mail/lib/lang/fi_mail_forward_list.lng | 1
interface/web/sites/lib/lang/fi_web_aliasdomain_list.lng | 1
interface/web/designer/lib/lang/fi.lng | 1
interface/web/mail/lib/lang/fi_mail_whitelist_list.lng | 1
interface/web/mail/lib/lang/fi_spamfilter_policy.lng | 1
interface/web/sites/lib/lang/fi_database_list.lng | 1
interface/web/sites/lib/lang/fi_ftp_user_list.lng | 1
interface/web/client/lib/lang/fi_client_template.lng | 1
interface/web/mail/lib/lang/fi_mail_user_filter.lng | 1
interface/web/sites/lib/lang/fi_web_domain_list.lng | 1
interface/web/monitor/lib/lang/fi.lng | 1
interface/web/admin/lib/lang/fi_software_update_list.lng | 1
interface/web/dns/lib/lang/fi_dns_mx.lng | 1
interface/web/admin/lib/lang/fi_server.lng | 1
interface/web/admin/lib/lang/fi_software_repo.lng | 1
interface/web/admin/lib/lang/fi_system_config.lng | 1
interface/web/designer/lib/lang/fi_module_list.lng | 1
interface/web/mail/lib/lang/fi_mail_domain_catchall_list.lng | 1
interface/web/dns/lib/lang/fi_dns_ptr.lng | 1
interface/web/dns/lib/lang/fi_dns_txt.lng | 1
interface/web/help/lib/lang/fi_support_message.lng | 1
interface/web/dns/lib/lang/fi_dns_soa_list.lng | 1
interface/web/dns/lib/lang/fi_dns_srv.lng | 1
interface/web/mail/lib/lang/fi_mail_user_filter_list.lng | 1
interface/web/mail/lib/lang/fi_mail_content_filter.lng | 1
124 files changed, 91 insertions(+), 164 deletions(-)
diff --git a/interface/lib/lang/de.lng b/interface/lib/lang/de.lng
index 10814cd..c5326e8 100644
--- a/interface/lib/lang/de.lng
+++ b/interface/lib/lang/de.lng
@@ -1,20 +1,19 @@
-<?php
+<?php
$wb['301'] = 'Modul für Benutzer nicht erlaubt.';
-$wb['302'] = 'Modul ungültig.';
-$wb['1001'] = 'Der Benutzername und das Passwort dürfen nicht leer sein!';
-$wb['1002'] = 'Der Benutzername und/oder das Passwort sind nicht korrekt!';
-$wb['1003'] = 'Der Benutzername ist deaktiviert!';
-$wb['delete_confirmation'] = 'Wollen Sie den Datensatz wirklich löschen?';
-$wb['error_no_view_permission'] = 'Sie haben nicht die Berechtigung, den Datensatz zu lesen, oder der Datensatz existiert nicht!';
-$wb['error_no_delete_permission'] = 'Sie haben nicht die Berechtigung, den Datensatz zu löschen!';
-$wb['page_txt'] = 'Seite';
-$wb['page_of_txt'] = 'von';
-$wb['page_next_txt'] = 'Weiter';
-$wb['page_back_txt'] = 'Zurück';
-$wb['delete_txt'] = 'Löschen';
-$wb['filter_txt'] = 'Filter';
-$wb['add_new_record_txt'] = 'Neuen Datensatz hinzufügen';
-$wb['btn_save_txt'] = 'Speichern';
-$wb['btn_cancel_txt'] = 'Abbrechen';
-?>
-
+$wb['302'] = 'Modul ungültig.';
+$wb['1001'] = 'Der Benutzername und das Passwort dürfen nicht leer sein!';
+$wb['1002'] = 'Der Benutzername und/oder das Passwort sind nicht korrekt!';
+$wb['1003'] = 'Der Benutzername ist deaktiviert!';
+$wb['delete_confirmation'] = 'Wollen Sie den Datensatz wirklich löschen?';
+$wb['error_no_view_permission'] = 'Sie haben nicht die Berechtigung, den Datensatz zu lesen, oder der Datensatz existiert nicht!';
+$wb['error_no_delete_permission'] = 'Sie haben nicht die Berechtigung, den Datensatz zu löschen!';
+$wb['page_txt'] = 'Seite';
+$wb['page_of_txt'] = 'von';
+$wb['page_next_txt'] = 'Weiter';
+$wb['page_back_txt'] = 'Zurück';
+$wb['delete_txt'] = 'Löschen';
+$wb['filter_txt'] = 'Filter';
+$wb['add_new_record_txt'] = 'Neuen Datensatz hinzufügen';
+$wb['btn_save_txt'] = 'Speichern';
+$wb['btn_cancel_txt'] = 'Abbrechen';
+?>
diff --git a/interface/lib/lang/fi.lng b/interface/lib/lang/fi.lng
index 5d3a0dc..969c373 100755
--- a/interface/lib/lang/fi.lng
+++ b/interface/lib/lang/fi.lng
@@ -17,4 +17,3 @@
$wb['btn_save_txt'] = 'Tallenna';
$wb['btn_cancel_txt'] = 'Keskeytä';
?>
-
diff --git a/interface/web/admin/lib/lang/fi.lng b/interface/web/admin/lib/lang/fi.lng
index aa4abba..0f21a5a 100755
--- a/interface/web/admin/lib/lang/fi.lng
+++ b/interface/web/admin/lib/lang/fi.lng
@@ -32,4 +32,3 @@
$wb['Software'] = 'Ohjelmat';
$wb['Repositories'] = 'Ohjelmapakettien varastot';
?>
-
diff --git a/interface/web/admin/lib/lang/fi_firewall.lng b/interface/web/admin/lib/lang/fi_firewall.lng
index e2f7771..d47d21d 100755
--- a/interface/web/admin/lib/lang/fi_firewall.lng
+++ b/interface/web/admin/lib/lang/fi_firewall.lng
@@ -7,4 +7,3 @@
$wb['active_txt'] = 'Käytössä';
$wb['firewall_error_unique'] = 'Tällainen palomuurisäänto on jo tällä palvelimella.';
?>
-
diff --git a/interface/web/admin/lib/lang/fi_firewall_list.lng b/interface/web/admin/lib/lang/fi_firewall_list.lng
index e912ff0..96ff2dc 100755
--- a/interface/web/admin/lib/lang/fi_firewall_list.lng
+++ b/interface/web/admin/lib/lang/fi_firewall_list.lng
@@ -6,4 +6,3 @@
$wb['udp_port_txt'] = 'Avoimet UDP-portit';
$wb['add_new_record_txt'] = 'Lisää uusi palomuurisääntö';
?>
-
diff --git a/interface/web/admin/lib/lang/fi_groups.lng b/interface/web/admin/lib/lang/fi_groups.lng
index c3341ed..141322b 100755
--- a/interface/web/admin/lib/lang/fi_groups.lng
+++ b/interface/web/admin/lib/lang/fi_groups.lng
@@ -3,4 +3,3 @@
$wb['name_txt'] = 'Käyttäjäryhmä';
$wb['name_err'] = 'Käyttäjäryhmän nimen on oltava vähintään 1, enintään 30 merkkiä pitkä.';
?>
-
diff --git a/interface/web/admin/lib/lang/fi_groups_list.lng b/interface/web/admin/lib/lang/fi_groups_list.lng
index b7cd545..8a7b0e4 100755
--- a/interface/web/admin/lib/lang/fi_groups_list.lng
+++ b/interface/web/admin/lib/lang/fi_groups_list.lng
@@ -4,4 +4,3 @@
$wb['name_txt'] = 'Käyttäjäryhmä';
$wb['add_new_record_txt'] = 'Lisää uusi tietue';
?>
-
diff --git a/interface/web/admin/lib/lang/fi_language_add.lng b/interface/web/admin/lib/lang/fi_language_add.lng
index 5432e1d..c58d9ea 100755
--- a/interface/web/admin/lib/lang/fi_language_add.lng
+++ b/interface/web/admin/lib/lang/fi_language_add.lng
@@ -5,4 +5,3 @@
$wb['btn_save_txt'] = 'Luo uudet kielitiedostot';
$wb['btn_cancel_txt'] = 'Keskeytä';
?>
-
diff --git a/interface/web/admin/lib/lang/fi_language_complete.lng b/interface/web/admin/lib/lang/fi_language_complete.lng
index 758357f..f4baae3 100755
--- a/interface/web/admin/lib/lang/fi_language_complete.lng
+++ b/interface/web/admin/lib/lang/fi_language_complete.lng
@@ -4,4 +4,3 @@
$wb['btn_save_txt'] = 'Yhdistä kielitiedostot nyt';
$wb['btn_cancel_txt'] = 'Keskeytä';
?>
-
diff --git a/interface/web/admin/lib/lang/fi_language_edit.lng b/interface/web/admin/lib/lang/fi_language_edit.lng
index f3fbfde..cdf73da 100755
--- a/interface/web/admin/lib/lang/fi_language_edit.lng
+++ b/interface/web/admin/lib/lang/fi_language_edit.lng
@@ -6,4 +6,3 @@
$wb['btn_save_txt'] = 'Tallenna';
$wb['btn_cancel_txt'] = 'Keskeytä';
?>
-
diff --git a/interface/web/admin/lib/lang/fi_language_export.lng b/interface/web/admin/lib/lang/fi_language_export.lng
index db057cb..b1ff06c 100755
--- a/interface/web/admin/lib/lang/fi_language_export.lng
+++ b/interface/web/admin/lib/lang/fi_language_export.lng
@@ -4,4 +4,3 @@
$wb['btn_save_txt'] = 'Lataa valittu kielitiedosto';
$wb['btn_cancel_txt'] = 'Takaisin';
?>
-
diff --git a/interface/web/admin/lib/lang/fi_language_import.lng b/interface/web/admin/lib/lang/fi_language_import.lng
index ef3d8aa..ee8a32f 100755
--- a/interface/web/admin/lib/lang/fi_language_import.lng
+++ b/interface/web/admin/lib/lang/fi_language_import.lng
@@ -5,4 +5,3 @@
$wb['language_overwrite_txt'] = 'Ylikirjoitetaan tiedostot, jos ne on jo olemassa.';
$wb['btn_cancel_txt'] = 'Takaisin';
?>
-
diff --git a/interface/web/admin/lib/lang/fi_language_list.lng b/interface/web/admin/lib/lang/fi_language_list.lng
index 8dd1d59..85e7b70 100755
--- a/interface/web/admin/lib/lang/fi_language_list.lng
+++ b/interface/web/admin/lib/lang/fi_language_list.lng
@@ -5,4 +5,3 @@
$wb['lang_file_txt'] = 'Kielitiedosto';
$wb['lang_file_date_txt'] = 'Viimeksi muokattu';
?>
-
diff --git a/interface/web/admin/lib/lang/fi_server.lng b/interface/web/admin/lib/lang/fi_server.lng
index da70cba..8d2fec1 100755
--- a/interface/web/admin/lib/lang/fi_server.lng
+++ b/interface/web/admin/lib/lang/fi_server.lng
@@ -9,4 +9,3 @@
$wb['vserver_server_txt'] = 'Virtuaalipalvelin';
$wb['active_txt'] = 'Käytössä';
?>
-
diff --git a/interface/web/admin/lib/lang/fi_server_config.lng b/interface/web/admin/lib/lang/fi_server_config.lng
index 5d46722..a935886 100755
--- a/interface/web/admin/lib/lang/fi_server_config.lng
+++ b/interface/web/admin/lib/lang/fi_server_config.lng
@@ -33,4 +33,3 @@
$wb['nameservers_txt'] = 'Nimipalvelimet';
$wb['auto_network_configuration_txt'] = 'Automaattiset verkkoasetukset';
?>
-
diff --git a/interface/web/admin/lib/lang/fi_server_config_list.lng b/interface/web/admin/lib/lang/fi_server_config_list.lng
index fde21a1..ed1cbed 100755
--- a/interface/web/admin/lib/lang/fi_server_config_list.lng
+++ b/interface/web/admin/lib/lang/fi_server_config_list.lng
@@ -2,4 +2,3 @@
$wb['list_head_txt'] = 'Palvelimen asetukset';
$wb['server_name_txt'] = 'Palvelin';
?>
-
diff --git a/interface/web/admin/lib/lang/fi_server_ip.lng b/interface/web/admin/lib/lang/fi_server_ip.lng
index e423a99..7930433 100755
--- a/interface/web/admin/lib/lang/fi_server_ip.lng
+++ b/interface/web/admin/lib/lang/fi_server_ip.lng
@@ -4,4 +4,3 @@
$wb['virtualhost_txt'] = 'Virtuaalipalvelin';
$wb['ip_err'] = 'IP-osoite vääränlainen';
?>
-
diff --git a/interface/web/admin/lib/lang/fi_server_ip_list.lng b/interface/web/admin/lib/lang/fi_server_ip_list.lng
index 8123436..a297a62 100755
--- a/interface/web/admin/lib/lang/fi_server_ip_list.lng
+++ b/interface/web/admin/lib/lang/fi_server_ip_list.lng
@@ -4,4 +4,3 @@
$wb['ip_address_txt'] = 'IP-osoite';
$wb['add_new_record_txt'] = 'Lisää uusi IP-osoite';
?>
-
diff --git a/interface/web/admin/lib/lang/fi_server_list.lng b/interface/web/admin/lib/lang/fi_server_list.lng
index c303c47..30863bd 100755
--- a/interface/web/admin/lib/lang/fi_server_list.lng
+++ b/interface/web/admin/lib/lang/fi_server_list.lng
@@ -9,4 +9,3 @@
$wb['vserver_server_txt'] = 'Virtuaalipalvelin';
$wb['add_new_record_txt'] = 'Lisää uusi tietue';
?>
-
diff --git a/interface/web/admin/lib/lang/fi_software_package_list.lng b/interface/web/admin/lib/lang/fi_software_package_list.lng
index 97f481e..a8957cc 100755
--- a/interface/web/admin/lib/lang/fi_software_package_list.lng
+++ b/interface/web/admin/lib/lang/fi_software_package_list.lng
@@ -5,4 +5,3 @@
$wb['package_description_txt'] = 'Ohjelmapaketin kuvaus';
$wb['action_txt'] = 'Toiminto';
?>
-
diff --git a/interface/web/admin/lib/lang/fi_software_repo.lng b/interface/web/admin/lib/lang/fi_software_repo.lng
index 9a9ebea..c899694 100755
--- a/interface/web/admin/lib/lang/fi_software_repo.lng
+++ b/interface/web/admin/lib/lang/fi_software_repo.lng
@@ -5,4 +5,3 @@
$wb['repo_password_txt'] = 'Salasana (valinnnainen)';
$wb['active_txt'] = 'Käytössä';
?>
-
diff --git a/interface/web/admin/lib/lang/fi_software_repo_list.lng b/interface/web/admin/lib/lang/fi_software_repo_list.lng
index 094fc4f..bde844c 100755
--- a/interface/web/admin/lib/lang/fi_software_repo_list.lng
+++ b/interface/web/admin/lib/lang/fi_software_repo_list.lng
@@ -4,4 +4,3 @@
$wb['repo_name_txt'] = 'Ohjelmapakettien varasto';
$wb['repo_url_txt'] = 'Ohjelmapakettien varaston osoite';
?>
-
diff --git a/interface/web/admin/lib/lang/fi_software_update_list.lng b/interface/web/admin/lib/lang/fi_software_update_list.lng
index fcb8287..c352c1c 100755
--- a/interface/web/admin/lib/lang/fi_software_update_list.lng
+++ b/interface/web/admin/lib/lang/fi_software_update_list.lng
@@ -5,4 +5,3 @@
$wb['version_txt'] = 'Versio';
$wb['action_txt'] = 'Toiminto';
?>
-
diff --git a/interface/web/admin/lib/lang/fi_system_config.lng b/interface/web/admin/lib/lang/fi_system_config.lng
index ff42ab9..3ad6804 100755
--- a/interface/web/admin/lib/lang/fi_system_config.lng
+++ b/interface/web/admin/lib/lang/fi_system_config.lng
@@ -11,4 +11,3 @@
$wb['dblist_phpmyadmin_link_txt'] = 'Linkki phpMyAdminiin tietokantalistassa';
$wb['mailboxlist_webmail_link_txt'] = 'Linkki internetpostiin postilaatikkolistassa';
?>
-
diff --git a/interface/web/admin/lib/lang/fi_users.lng b/interface/web/admin/lib/lang/fi_users.lng
index ec94e5d..08bada0 100755
--- a/interface/web/admin/lib/lang/fi_users.lng
+++ b/interface/web/admin/lib/lang/fi_users.lng
@@ -26,4 +26,3 @@
$wb['startmodule_err'] = 'Aloitusosio ei ole sallittu.';
$wb['password_strength_txt'] = 'Salasanan vahvuus';
?>
-
diff --git a/interface/web/admin/lib/lang/fi_users_list.lng b/interface/web/admin/lib/lang/fi_users_list.lng
index 3ed6a42..d161aa2 100755
--- a/interface/web/admin/lib/lang/fi_users_list.lng
+++ b/interface/web/admin/lib/lang/fi_users_list.lng
@@ -5,4 +5,3 @@
$wb['vorname_txt'] = 'Sukunimi';
$wb['ort_txt'] = 'Kaupunki';
?>
-
diff --git a/interface/web/client/lib/lang/fi.lng b/interface/web/client/lib/lang/fi.lng
index 035b473..a06bfe8 100755
--- a/interface/web/client/lib/lang/fi.lng
+++ b/interface/web/client/lib/lang/fi.lng
@@ -7,4 +7,3 @@
$wb['Clients'] = 'Asiakkaat';
$wb['Edit Client-Templates'] = 'Muokkaa asiakasmalleja';
?>
-
diff --git a/interface/web/client/lib/lang/fi_client.lng b/interface/web/client/lib/lang/fi_client.lng
index 37037a2..850d9c3 100755
--- a/interface/web/client/lib/lang/fi_client.lng
+++ b/interface/web/client/lib/lang/fi_client.lng
@@ -79,4 +79,3 @@
$wb['template_master_txt'] = 'Perusmalli';
$wb['template_additional_txt'] = 'Lisämalli';
?>
-
diff --git a/interface/web/client/lib/lang/fi_client_template.lng b/interface/web/client/lib/lang/fi_client_template.lng
index a501f67..3139049 100755
--- a/interface/web/client/lib/lang/fi_client_template.lng
+++ b/interface/web/client/lib/lang/fi_client_template.lng
@@ -45,4 +45,3 @@
$wb['limit_database_error_notint'] = 'Tietokantojen raja-arvon pitää olla numero.';
$wb['error_template_name_empty'] = 'Anna mallilomakkeen nimi';
?>
-
diff --git a/interface/web/client/lib/lang/fi_client_template_list.lng b/interface/web/client/lib/lang/fi_client_template_list.lng
index 22b49a6..094c3c7 100755
--- a/interface/web/client/lib/lang/fi_client_template_list.lng
+++ b/interface/web/client/lib/lang/fi_client_template_list.lng
@@ -3,4 +3,3 @@
$wb['template_type_txt'] = 'Tyyppi';
$wb['template_name_txt'] = 'Asiakasmallin nimi';
?>
-
diff --git a/interface/web/client/lib/lang/fi_clients_list.lng b/interface/web/client/lib/lang/fi_clients_list.lng
index 789b843..3d6766d 100755
--- a/interface/web/client/lib/lang/fi_clients_list.lng
+++ b/interface/web/client/lib/lang/fi_clients_list.lng
@@ -6,4 +6,3 @@
$wb['country_txt'] = 'Maa';
$wb['client_id_txt'] = 'Tunnus';
?>
-
diff --git a/interface/web/designer/lib/lang/fi.lng b/interface/web/designer/lib/lang/fi.lng
index 29f4a51..acb6c35 100755
--- a/interface/web/designer/lib/lang/fi.lng
+++ b/interface/web/designer/lib/lang/fi.lng
@@ -1,3 +1,2 @@
<?php
?>
-
diff --git a/interface/web/designer/lib/lang/fi_form_edit.lng b/interface/web/designer/lib/lang/fi_form_edit.lng
index 3af8555..c9a1303 100755
--- a/interface/web/designer/lib/lang/fi_form_edit.lng
+++ b/interface/web/designer/lib/lang/fi_form_edit.lng
@@ -22,4 +22,3 @@
$wb['auth_preset_perm_group_txt'] = 'Ryhmän oikeudet';
$wb['auth_preset_perm_other_txt'] = 'Muiden käyttäjien oikeudet';
?>
-
diff --git a/interface/web/designer/lib/lang/fi_form_list.lng b/interface/web/designer/lib/lang/fi_form_list.lng
index a35c8db..9052c8f 100755
--- a/interface/web/designer/lib/lang/fi_form_list.lng
+++ b/interface/web/designer/lib/lang/fi_form_list.lng
@@ -5,4 +5,3 @@
$wb['title_txt'] = 'Otsikko';
$wb['description_txt'] = 'Kuvaus';
?>
-
diff --git a/interface/web/designer/lib/lang/fi_form_show.lng b/interface/web/designer/lib/lang/fi_form_show.lng
index c2f2835..247a95b 100755
--- a/interface/web/designer/lib/lang/fi_form_show.lng
+++ b/interface/web/designer/lib/lang/fi_form_show.lng
@@ -16,4 +16,3 @@
$wb['menu_del_txt'] = 'Poista valikko ja kaikki sen osat?';
$wb['item_del_txt'] = 'Poista valikon osa?';
?>
-
diff --git a/interface/web/designer/lib/lang/fi_module_edit.lng b/interface/web/designer/lib/lang/fi_module_edit.lng
index c902b7a..8bb4a5c 100755
--- a/interface/web/designer/lib/lang/fi_module_edit.lng
+++ b/interface/web/designer/lib/lang/fi_module_edit.lng
@@ -20,4 +20,3 @@
<b>Vihje:</b> Kaikki polut ovat suhteellisia web-kansioon, eivät absoluuttisia.
';
?>
-
diff --git a/interface/web/designer/lib/lang/fi_module_list.lng b/interface/web/designer/lib/lang/fi_module_list.lng
index bb83c34..f07c9a3 100755
--- a/interface/web/designer/lib/lang/fi_module_list.lng
+++ b/interface/web/designer/lib/lang/fi_module_list.lng
@@ -3,4 +3,3 @@
$wb['module_txt'] = 'Ohjelmaosio';
$wb['title_txt'] = 'Otsikko';
?>
-
diff --git a/interface/web/designer/lib/lang/fi_module_nav_item_edit.lng b/interface/web/designer/lib/lang/fi_module_nav_item_edit.lng
index ece2a16..5f32d58 100755
--- a/interface/web/designer/lib/lang/fi_module_nav_item_edit.lng
+++ b/interface/web/designer/lib/lang/fi_module_nav_item_edit.lng
@@ -6,4 +6,3 @@
$wb['save_txt'] = 'Tallenna';
$wb['cancel_txt'] = 'Keskeytä';
?>
-
diff --git a/interface/web/designer/lib/lang/fi_module_show.lng b/interface/web/designer/lib/lang/fi_module_show.lng
index 2ea910e..066d92f 100755
--- a/interface/web/designer/lib/lang/fi_module_show.lng
+++ b/interface/web/designer/lib/lang/fi_module_show.lng
@@ -14,4 +14,3 @@
$wb['menu_del_txt'] = 'Haluatko poistaa tämän valikon?';
$wb['item_del_txt'] = 'Haluatko poistaa tämän osan?';
?>
-
diff --git a/interface/web/dns/lib/lang/fi.lng b/interface/web/dns/lib/lang/fi.lng
index 31bdc48..a44ed08 100755
--- a/interface/web/dns/lib/lang/fi.lng
+++ b/interface/web/dns/lib/lang/fi.lng
@@ -15,4 +15,3 @@
$wb['DNS TXT Record'] = 'DNS TXT-tietue';
$wb['DNS TXT'] = 'DNS TXT-tietue';
?>
-
diff --git a/interface/web/dns/lib/lang/fi_dns_a.lng b/interface/web/dns/lib/lang/fi_dns_a.lng
index 40c6681..0248631 100755
--- a/interface/web/dns/lib/lang/fi_dns_a.lng
+++ b/interface/web/dns/lib/lang/fi_dns_a.lng
@@ -13,4 +13,3 @@
$wb['data_error_empty'] = 'IP-osoite tyhjä';
$wb['data_error_regex'] = 'IP-osoite on vääränlainen';
?>
-
diff --git a/interface/web/dns/lib/lang/fi_dns_a_list.lng b/interface/web/dns/lib/lang/fi_dns_a_list.lng
index b304f11..0e518ac 100755
--- a/interface/web/dns/lib/lang/fi_dns_a_list.lng
+++ b/interface/web/dns/lib/lang/fi_dns_a_list.lng
@@ -9,4 +9,3 @@
$wb['add_new_record_txt'] = 'Lisää uusi tietue';
$wb['aux_txt'] = 'Tärkeysjärjestys';
?>
-
diff --git a/interface/web/dns/lib/lang/fi_dns_alias.lng b/interface/web/dns/lib/lang/fi_dns_alias.lng
index d3ccbb0..20da599 100755
--- a/interface/web/dns/lib/lang/fi_dns_alias.lng
+++ b/interface/web/dns/lib/lang/fi_dns_alias.lng
@@ -13,4 +13,3 @@
$wb['data_error_empty'] = 'Pääverkkotunnus on tyhjä';
$wb['data_error_regex'] = 'Pääverkkotunnus on vääränlainen';
?>
-
diff --git a/interface/web/dns/lib/lang/fi_dns_cname.lng b/interface/web/dns/lib/lang/fi_dns_cname.lng
index c21cdb2..a58f0d2 100755
--- a/interface/web/dns/lib/lang/fi_dns_cname.lng
+++ b/interface/web/dns/lib/lang/fi_dns_cname.lng
@@ -13,4 +13,3 @@
$wb['data_error_empty'] = 'Kohteen verkkotunnus on tyhjä';
$wb['data_error_regex'] = 'Kohteen verkkotunnus on vääränlainen';
?>
-
diff --git a/interface/web/dns/lib/lang/fi_dns_hinfo.lng b/interface/web/dns/lib/lang/fi_dns_hinfo.lng
index baba09e..ea2fb93 100755
--- a/interface/web/dns/lib/lang/fi_dns_hinfo.lng
+++ b/interface/web/dns/lib/lang/fi_dns_hinfo.lng
@@ -13,4 +13,3 @@
$wb['data_error_empty'] = 'Verkkotunnuksen tiedot ovat tyhjiä';
$wb['data_error_regex'] = 'Verkkotunnuksen tiedot ovat vääränlaisia';
?>
-
diff --git a/interface/web/dns/lib/lang/fi_dns_mx.lng b/interface/web/dns/lib/lang/fi_dns_mx.lng
index dba4363..e4b4a60 100755
--- a/interface/web/dns/lib/lang/fi_dns_mx.lng
+++ b/interface/web/dns/lib/lang/fi_dns_mx.lng
@@ -14,4 +14,3 @@
$wb['data_error_empty'] = 'Tekstikenttä on tyhjä';
$wb['data_error_regex'] = 'Tekstikenttä on vääränlainen';
?>
-
diff --git a/interface/web/dns/lib/lang/fi_dns_ns.lng b/interface/web/dns/lib/lang/fi_dns_ns.lng
index 2ef717c..8f97c53 100755
--- a/interface/web/dns/lib/lang/fi_dns_ns.lng
+++ b/interface/web/dns/lib/lang/fi_dns_ns.lng
@@ -13,4 +13,3 @@
$wb['data_error_empty'] = 'Nimipalvelin-kenttä tyhjä';
$wb['data_error_regex'] = 'Nimipalvelin-kenttän muoto vääränlainen';
?>
-
diff --git a/interface/web/dns/lib/lang/fi_dns_ptr.lng b/interface/web/dns/lib/lang/fi_dns_ptr.lng
index 4cfcb29..9885c2b 100755
--- a/interface/web/dns/lib/lang/fi_dns_ptr.lng
+++ b/interface/web/dns/lib/lang/fi_dns_ptr.lng
@@ -13,4 +13,3 @@
$wb['data_error_empty'] = 'Kohteen isäntänimi tyhjä';
$wb['data_error_regex'] = 'Kohteen isäntänimi muoto vääränlainen';
?>
-
diff --git a/interface/web/dns/lib/lang/fi_dns_rp.lng b/interface/web/dns/lib/lang/fi_dns_rp.lng
index 0c12013..d47cdcf 100755
--- a/interface/web/dns/lib/lang/fi_dns_rp.lng
+++ b/interface/web/dns/lib/lang/fi_dns_rp.lng
@@ -13,4 +13,3 @@
$wb['data_error_empty'] = 'Vastuuhenkilö-kenttä tyhjä';
$wb['data_error_regex'] = 'Vastuuhenkilö-kenttä on vääränlainen';
?>
-
diff --git a/interface/web/dns/lib/lang/fi_dns_soa.lng b/interface/web/dns/lib/lang/fi_dns_soa.lng
index 9f4d487..809454a 100755
--- a/interface/web/dns/lib/lang/fi_dns_soa.lng
+++ b/interface/web/dns/lib/lang/fi_dns_soa.lng
@@ -22,4 +22,3 @@
$wb['mbox_error_empty'] = 'Sähköpostiosoite on tyhjä.';
$wb['mbox_error_regex'] = 'Sähköpostiosoite on vääränlainen';
?>
-
diff --git a/interface/web/dns/lib/lang/fi_dns_soa_list.lng b/interface/web/dns/lib/lang/fi_dns_soa_list.lng
index 7b40521..95d1044 100755
--- a/interface/web/dns/lib/lang/fi_dns_soa_list.lng
+++ b/interface/web/dns/lib/lang/fi_dns_soa_list.lng
@@ -7,4 +7,3 @@
$wb['mbox_txt'] = 'Yhteyshenkilön sähköpostiosoite';
$wb['add_new_record_txt'] = 'Lisää uusi DNS-alue (SOA)';
?>
-
diff --git a/interface/web/dns/lib/lang/fi_dns_srv.lng b/interface/web/dns/lib/lang/fi_dns_srv.lng
index 679de7b..1f136a2 100755
--- a/interface/web/dns/lib/lang/fi_dns_srv.lng
+++ b/interface/web/dns/lib/lang/fi_dns_srv.lng
@@ -13,4 +13,3 @@
$wb['data_error_empty'] = 'Palvelintietue on tyhjä.';
$wb['data_error_regex'] = 'Palvelintietue on vääränlainen.';
?>
-
diff --git a/interface/web/dns/lib/lang/fi_dns_template.lng b/interface/web/dns/lib/lang/fi_dns_template.lng
index 96a8978..b34a92d 100755
--- a/interface/web/dns/lib/lang/fi_dns_template.lng
+++ b/interface/web/dns/lib/lang/fi_dns_template.lng
@@ -4,4 +4,3 @@
$wb['template_txt'] = 'Malli';
$wb['visible_txt'] = 'Näkyvissä';
?>
-
diff --git a/interface/web/dns/lib/lang/fi_dns_template_list.lng b/interface/web/dns/lib/lang/fi_dns_template_list.lng
index 92dd4e7..47c8924 100755
--- a/interface/web/dns/lib/lang/fi_dns_template_list.lng
+++ b/interface/web/dns/lib/lang/fi_dns_template_list.lng
@@ -4,4 +4,3 @@
$wb['name_txt'] = 'Mallin nimi';
$wb['add_new_record_txt'] = 'Lisää uusi mallitietue';
?>
-
diff --git a/interface/web/dns/lib/lang/fi_dns_txt.lng b/interface/web/dns/lib/lang/fi_dns_txt.lng
index dc1cfad..d1235ba 100755
--- a/interface/web/dns/lib/lang/fi_dns_txt.lng
+++ b/interface/web/dns/lib/lang/fi_dns_txt.lng
@@ -13,4 +13,3 @@
$wb['data_error_empty'] = 'Tekstikenttä on tyhjä';
$wb['data_error_regex'] = 'Tekstikenttä on vääränlainen';
?>
-
diff --git a/interface/web/dns/lib/lang/fi_dns_wizard.lng b/interface/web/dns/lib/lang/fi_dns_wizard.lng
index bf328d4..966447f 100755
--- a/interface/web/dns/lib/lang/fi_dns_wizard.lng
+++ b/interface/web/dns/lib/lang/fi_dns_wizard.lng
@@ -11,4 +11,3 @@
$wb['ip_txt'] = 'IP-osoite';
$wb['error_origin_empty'] = 'Verkkotunnusta ei ole annettu.';
?>
-
diff --git a/interface/web/help/lib/lang/fi.lng b/interface/web/help/lib/lang/fi.lng
index ddf4fac..62ab771 100755
--- a/interface/web/help/lib/lang/fi.lng
+++ b/interface/web/help/lib/lang/fi.lng
@@ -5,4 +5,3 @@
$wb['View messages'] = 'Näytä tukipyynnöt';
$wb['Support'] = 'Käyttäjätuki';
?>
-
diff --git a/interface/web/help/lib/lang/fi_support_message.lng b/interface/web/help/lib/lang/fi_support_message.lng
index 32997fe..1e693bc 100755
--- a/interface/web/help/lib/lang/fi_support_message.lng
+++ b/interface/web/help/lib/lang/fi_support_message.lng
@@ -5,4 +5,3 @@
$wb['message_txt'] = 'Tukipyyntö';
$wb['tstamp_txt'] = 'Päiväys';
?>
-
diff --git a/interface/web/help/lib/lang/fi_support_message_list.lng b/interface/web/help/lib/lang/fi_support_message_list.lng
index b7f58bf..4bbc1de 100755
--- a/interface/web/help/lib/lang/fi_support_message_list.lng
+++ b/interface/web/help/lib/lang/fi_support_message_list.lng
@@ -4,4 +4,3 @@
$wb['subject_txt'] = 'Tukipyynnön aihe';
$wb['add_new_record_txt'] = 'Lähetä uusi tukipyyntö';
?>
-
diff --git a/interface/web/js/lib/lang/fi_javascript.lng b/interface/web/js/lib/lang/fi_javascript.lng
index 414a885..9145652 100755
--- a/interface/web/js/lib/lang/fi_javascript.lng
+++ b/interface/web/js/lib/lang/fi_javascript.lng
@@ -6,4 +6,3 @@
$wb['password_strength_4_txt'] = 'Vahva';
$wb['password_strength_5_txt'] = 'Erittäin vahva';
?>
-
diff --git a/interface/web/login/lib/lang/fi.lng b/interface/web/login/lib/lang/fi.lng
index b17ec1b..9490815 100755
--- a/interface/web/login/lib/lang/fi.lng
+++ b/interface/web/login/lib/lang/fi.lng
@@ -10,4 +10,3 @@
$wb['pw_reset_mail_msg'] = 'Käyttäjätunnuksesi salasana ISPConfi3 Hallintapaneeliin on vaihdettu. Uusi salasanasi: ';
$wb['pw_reset_mail_title'] = 'ISPConfi3 Hallintapaneelin salasana on vaihdettu.';
?>
-
diff --git a/interface/web/mail/lib/lang/bg_mail_user.lng b/interface/web/mail/lib/lang/bg_mail_user.lng
index 6019160..c181eb1 100644
--- a/interface/web/mail/lib/lang/bg_mail_user.lng
+++ b/interface/web/mail/lib/lang/bg_mail_user.lng
@@ -27,4 +27,6 @@
Your webmaster.';
$wb['disableimap_txt'] = 'Disable IMAP';
$wb['disablepop3_txt'] = 'Disable POP3';
+$wb['welcome_mail_fromname_txt'] = 'ISPConfig3';
+$wb['welcome_mail_fromemail_txt'] = 'webmaster@localhost.tld';
?>
diff --git a/interface/web/mail/lib/lang/de_mail_user.lng b/interface/web/mail/lib/lang/de_mail_user.lng
index 289ad93..4c09d07 100644
--- a/interface/web/mail/lib/lang/de_mail_user.lng
+++ b/interface/web/mail/lib/lang/de_mail_user.lng
@@ -1,31 +1,33 @@
-<?php
+<?php
$wb['custom_mailfilter_txt'] = 'Custom mail filter recipe';
-$wb['email_txt'] = 'Email';
-$wb['cryptpwd_txt'] = 'Password';
-$wb['active_txt'] = 'Active';
+$wb['email_txt'] = 'Email';
+$wb['cryptpwd_txt'] = 'Password';
+$wb['active_txt'] = 'Active';
$wb['email_error_isemail'] = 'Email address is invalid.';
$wb['email_error_unique'] = 'Duplicate Emailaddress.';
-$wb['autoresponder_text_txt'] = 'Text';
-$wb['autoresponder_txt'] = 'Autoresponder';
-$wb['no_domain_perm'] = 'You have no permission for this domain.';
-$wb['error_no_pwd'] = 'Password is empty.';
-$wb['quota_error_isint'] = 'Mailbox size must be a number.';
-$wb['quota_txt'] = 'quota in MB';
-$wb['server_id_txt'] = 'server_id';
-$wb['password_txt'] = 'password';
-$wb['maildir_txt'] = 'maildir';
-$wb['postfix_txt'] = 'Enable Receiving';
-$wb['access_txt'] = 'Enable Access';
-$wb['policy_txt'] = 'Spamfilter';
+$wb['autoresponder_text_txt'] = 'Text';
+$wb['autoresponder_txt'] = 'Autoresponder';
+$wb['no_domain_perm'] = 'You have no permission for this domain.';
+$wb['error_no_pwd'] = 'Password is empty.';
+$wb['quota_error_isint'] = 'Mailbox size must be a number.';
+$wb['quota_txt'] = 'quota in MB';
+$wb['server_id_txt'] = 'server_id';
+$wb['password_txt'] = 'password';
+$wb['maildir_txt'] = 'maildir';
+$wb['postfix_txt'] = 'Enable Receiving';
+$wb['access_txt'] = 'Enable Access';
+$wb['policy_txt'] = 'Spamfilter';
$wb['no_policy'] = '- not enabled -';
-$wb['limit_mailbox_txt'] = 'The max. number of mailboxes for your account is reached.';
-$wb['limit_mailquota_txt'] = 'The max space for mailboxes is reached. The max. available space in MB is';
-$wb['welcome_mail_subject'] = 'Welcome to your new email account.';
-$wb['welcome_mail_message'] = 'Welcome to your new email account.
-
-Your webmaster.';
-$wb['disableimap_txt'] = 'Disable IMAP';
-$wb['disablepop3_txt'] = 'Disable POP3';
-$wb['password_strength_txt'] = 'Password strength';
-?>
-
+$wb['limit_mailbox_txt'] = 'The max. number of mailboxes for your account is reached.';
+$wb['limit_mailquota_txt'] = 'The max space for mailboxes is reached. The max. available space in MB is';
+$wb['welcome_mail_subject'] = 'Welcome to your new email account.';
+$wb['welcome_mail_message'] = 'Welcome to your new email account.
+
+Your webmaster.';
+$wb['disableimap_txt'] = 'Disable IMAP';
+$wb['disablepop3_txt'] = 'Disable POP3';
+$wb['password_strength_txt'] = 'Password strength';
+$wb['welcome_mail_fromname_txt'] = 'ISPConfig3';
+$wb['welcome_mail_fromemail_txt'] = 'webmaster@localhost.tld';
+?>
+
diff --git a/interface/web/mail/lib/lang/en_mail_user.lng b/interface/web/mail/lib/lang/en_mail_user.lng
index e361a09..ec2618a 100644
--- a/interface/web/mail/lib/lang/en_mail_user.lng
+++ b/interface/web/mail/lib/lang/en_mail_user.lng
@@ -21,8 +21,10 @@
$wb["no_policy"] = '- not enabled -';
$wb["limit_mailbox_txt"] = 'The max. number of mailboxes for your account is reached.';
$wb["limit_mailquota_txt"] = 'The max space for mailboxes is reached. The max. available space in MB is';
+$wb["welcome_mail_fromname_txt"] = 'ISPConfig3';
+$wb["welcome_mail_fromemail_txt"] = "webmaster@localhost.tld";
$wb["welcome_mail_subject"] = 'Welcome to your new email account.';
-$wb["welcome_mail_message"] = "Welcome to your new email account.\n\nYour webmaster.";
+$wb["welcome_mail_message"] = "Welcome to your new email account. Your webmaster.";
$wb["disableimap_txt"] = 'Disable IMAP';
$wb["disablepop3_txt"] = 'Disable POP3';
?>
diff --git a/interface/web/mail/lib/lang/es_mail_user.lng b/interface/web/mail/lib/lang/es_mail_user.lng
index 6019160..c181eb1 100644
--- a/interface/web/mail/lib/lang/es_mail_user.lng
+++ b/interface/web/mail/lib/lang/es_mail_user.lng
@@ -27,4 +27,6 @@
Your webmaster.';
$wb['disableimap_txt'] = 'Disable IMAP';
$wb['disablepop3_txt'] = 'Disable POP3';
+$wb['welcome_mail_fromname_txt'] = 'ISPConfig3';
+$wb['welcome_mail_fromemail_txt'] = 'webmaster@localhost.tld';
?>
diff --git a/interface/web/mail/lib/lang/fi.lng b/interface/web/mail/lib/lang/fi.lng
index 340f2bb..9d5c4f6 100755
--- a/interface/web/mail/lib/lang/fi.lng
+++ b/interface/web/mail/lib/lang/fi.lng
@@ -43,4 +43,3 @@
$wb['Global Filters'] = 'Yleiset suodattimet';
$wb['Server'] = 'Palvelin';
?>
-
diff --git a/interface/web/mail/lib/lang/fi_mail_alias.lng b/interface/web/mail/lib/lang/fi_mail_alias.lng
index 40093b2..f3a6dad 100755
--- a/interface/web/mail/lib/lang/fi_mail_alias.lng
+++ b/interface/web/mail/lib/lang/fi_mail_alias.lng
@@ -8,4 +8,3 @@
$wb['destination_error_isemail'] = 'Kohteena oleva sähköpostiosoite on vääränlainen.';
$wb['limit_mailalias_txt'] = 'Käyttäjätunnuksella on jo sallittu määrä aliasosoitteita.';
?>
-
diff --git a/interface/web/mail/lib/lang/fi_mail_alias_list.lng b/interface/web/mail/lib/lang/fi_mail_alias_list.lng
index 1f2a31e..37dad6e 100755
--- a/interface/web/mail/lib/lang/fi_mail_alias_list.lng
+++ b/interface/web/mail/lib/lang/fi_mail_alias_list.lng
@@ -6,4 +6,3 @@
$wb['email_txt'] = 'Sähköpostiosoite';
$wb['add_new_record_txt'] = 'Lisää uusi aliastunnus';
?>
-
diff --git a/interface/web/mail/lib/lang/fi_mail_blacklist.lng b/interface/web/mail/lib/lang/fi_mail_blacklist.lng
index b3236dc..66cb930 100755
--- a/interface/web/mail/lib/lang/fi_mail_blacklist.lng
+++ b/interface/web/mail/lib/lang/fi_mail_blacklist.lng
@@ -7,4 +7,3 @@
$wb['type_txt'] = 'Tyyppi';
$wb['limit_mailfilter_txt'] = 'Käyttäjätunnuksella on jo sallittu määrä suodattimia.';
?>
-
diff --git a/interface/web/mail/lib/lang/fi_mail_blacklist_list.lng b/interface/web/mail/lib/lang/fi_mail_blacklist_list.lng
index 7f3099e..2d792ff 100755
--- a/interface/web/mail/lib/lang/fi_mail_blacklist_list.lng
+++ b/interface/web/mail/lib/lang/fi_mail_blacklist_list.lng
@@ -8,4 +8,3 @@
$wb['add_new_record_txt'] = 'Lisä uusi osoite estolistalle';
$wb['access_txt'] = 'Yhteys';
?>
-
diff --git a/interface/web/mail/lib/lang/fi_mail_content_filter.lng b/interface/web/mail/lib/lang/fi_mail_content_filter.lng
index 22c7ba7..9cac6d3 100755
--- a/interface/web/mail/lib/lang/fi_mail_content_filter.lng
+++ b/interface/web/mail/lib/lang/fi_mail_content_filter.lng
@@ -7,4 +7,3 @@
$wb['active_txt'] = 'Käytössä';
$wb['pattern_error_empty'] = 'Etsintäkuvio on tyhjä.';
?>
-
diff --git a/interface/web/mail/lib/lang/fi_mail_content_filter_list.lng b/interface/web/mail/lib/lang/fi_mail_content_filter_list.lng
index 8a5bfc9..ccd1b89 100755
--- a/interface/web/mail/lib/lang/fi_mail_content_filter_list.lng
+++ b/interface/web/mail/lib/lang/fi_mail_content_filter_list.lng
@@ -6,4 +6,3 @@
$wb['action_txt'] = 'Toiminto';
$wb['add_new_record_txt'] = 'Lisää uusi suodatussääntö';
?>
-
diff --git a/interface/web/mail/lib/lang/fi_mail_domain.lng b/interface/web/mail/lib/lang/fi_mail_domain.lng
index 5bb83dc..d35f8a4 100755
--- a/interface/web/mail/lib/lang/fi_mail_domain.lng
+++ b/interface/web/mail/lib/lang/fi_mail_domain.lng
@@ -11,4 +11,3 @@
$wb['policy_txt'] = 'Roskapostisuodatin';
$wb['no_policy'] = '- ei Käytössä -';
?>
-
diff --git a/interface/web/mail/lib/lang/fi_mail_domain_catchall.lng b/interface/web/mail/lib/lang/fi_mail_domain_catchall.lng
index e326003..b4928d5 100755
--- a/interface/web/mail/lib/lang/fi_mail_domain_catchall.lng
+++ b/interface/web/mail/lib/lang/fi_mail_domain_catchall.lng
@@ -7,4 +7,3 @@
$wb['domain_error_regex'] = 'Vääränlainen verkkotunnus tai se sisältää kiellettyjä merkkejä.';
$wb['limit_mailcatchall_txt'] = 'Käyttäjätunnuksella on jo sallittu määrä Catchall-tunnuksia.';
?>
-
diff --git a/interface/web/mail/lib/lang/fi_mail_domain_catchall_list.lng b/interface/web/mail/lib/lang/fi_mail_domain_catchall_list.lng
index 7629bac..9518078 100755
--- a/interface/web/mail/lib/lang/fi_mail_domain_catchall_list.lng
+++ b/interface/web/mail/lib/lang/fi_mail_domain_catchall_list.lng
@@ -7,4 +7,3 @@
$wb['domain_txt'] = 'Verkkotunnus';
$wb['add_new_record_txt'] = 'Lisää uusi Catchall-osoite';
?>
-
diff --git a/interface/web/mail/lib/lang/fi_mail_domain_list.lng b/interface/web/mail/lib/lang/fi_mail_domain_list.lng
index d0292a1..e8c4d28 100755
--- a/interface/web/mail/lib/lang/fi_mail_domain_list.lng
+++ b/interface/web/mail/lib/lang/fi_mail_domain_list.lng
@@ -5,4 +5,3 @@
$wb['add_new_record_txt'] = 'Lisää uusi postiverkkotunnus.';
$wb['active_txt'] = 'Käytössä';
?>
-
diff --git a/interface/web/mail/lib/lang/fi_mail_forward.lng b/interface/web/mail/lib/lang/fi_mail_forward.lng
index 3476c6d..5423874 100755
--- a/interface/web/mail/lib/lang/fi_mail_forward.lng
+++ b/interface/web/mail/lib/lang/fi_mail_forward.lng
@@ -4,4 +4,3 @@
$wb['active_txt'] = 'Käytössä';
$wb['limit_mailforward_txt'] = 'Käyttäjätunnuksella on jo sallittu määrä edelleenlähetysosoitteita.';
?>
-
diff --git a/interface/web/mail/lib/lang/fi_mail_forward_list.lng b/interface/web/mail/lib/lang/fi_mail_forward_list.lng
index ac53a1a..15aab44 100755
--- a/interface/web/mail/lib/lang/fi_mail_forward_list.lng
+++ b/interface/web/mail/lib/lang/fi_mail_forward_list.lng
@@ -6,4 +6,3 @@
$wb['email_txt'] = 'Sähköpostiosoite';
$wb['add_new_record_txt'] = 'Lisää uusi edelleenlähetysosoite';
?>
-
diff --git a/interface/web/mail/lib/lang/fi_mail_get.lng b/interface/web/mail/lib/lang/fi_mail_get.lng
index 9b79f7e..6bc1dcc 100755
--- a/interface/web/mail/lib/lang/fi_mail_get.lng
+++ b/interface/web/mail/lib/lang/fi_mail_get.lng
@@ -9,4 +9,3 @@
$wb['active_txt'] = 'Käytössä';
$wb['limit_fetchmail_txt'] = 'Käyttäjätunnuksella on jo sallittu määrä noudettavia osoitteita.';
?>
-
diff --git a/interface/web/mail/lib/lang/fi_mail_get_list.lng b/interface/web/mail/lib/lang/fi_mail_get_list.lng
index 93eae9e..be7a29f 100755
--- a/interface/web/mail/lib/lang/fi_mail_get_list.lng
+++ b/interface/web/mail/lib/lang/fi_mail_get_list.lng
@@ -7,4 +7,3 @@
$wb['destination_txt'] = 'Kohdepostilaatikko';
$wb['add_new_record_txt'] = 'Lisää uusi tili';
?>
-
diff --git a/interface/web/mail/lib/lang/fi_mail_spamfilter.lng b/interface/web/mail/lib/lang/fi_mail_spamfilter.lng
index 31f0cb3..a833eca 100755
--- a/interface/web/mail/lib/lang/fi_mail_spamfilter.lng
+++ b/interface/web/mail/lib/lang/fi_mail_spamfilter.lng
@@ -15,4 +15,3 @@
$wb['spam_redirect_maildir_purge_txt'] = 'Poista edelleenohjauslaatikosta';
$wb['days_txt'] = 'päivää vanhemmat viestit.';
?>
-
diff --git a/interface/web/mail/lib/lang/fi_mail_spamfilter_list.lng b/interface/web/mail/lib/lang/fi_mail_spamfilter_list.lng
index bba4011..41f6e3b 100755
--- a/interface/web/mail/lib/lang/fi_mail_spamfilter_list.lng
+++ b/interface/web/mail/lib/lang/fi_mail_spamfilter_list.lng
@@ -6,4 +6,3 @@
$wb['email_txt'] = 'Sähköpostiosoite';
$wb['add_new_record_txt'] = 'Lisää osoite estolistalle';
?>
-
diff --git a/interface/web/mail/lib/lang/fi_mail_transport.lng b/interface/web/mail/lib/lang/fi_mail_transport.lng
index 44c05b5..4b4ad89 100755
--- a/interface/web/mail/lib/lang/fi_mail_transport.lng
+++ b/interface/web/mail/lib/lang/fi_mail_transport.lng
@@ -8,4 +8,3 @@
$wb['active_txt'] = 'Käytössä';
$wb['limit_mailrouting_txt'] = 'Käyttäjätunnuksella on jo sallittu määrä sähköpostireitityksiä.';
?>
-
diff --git a/interface/web/mail/lib/lang/fi_mail_transport_list.lng b/interface/web/mail/lib/lang/fi_mail_transport_list.lng
index 435eea2..e91c76e 100755
--- a/interface/web/mail/lib/lang/fi_mail_transport_list.lng
+++ b/interface/web/mail/lib/lang/fi_mail_transport_list.lng
@@ -7,4 +7,3 @@
$wb['sort_order_txt'] = 'Järjestä..';
$wb['add_new_record_txt'] = 'Lisää uusi reitti';
?>
-
diff --git a/interface/web/mail/lib/lang/fi_mail_user.lng b/interface/web/mail/lib/lang/fi_mail_user.lng
index 9a218ed..b583594 100755
--- a/interface/web/mail/lib/lang/fi_mail_user.lng
+++ b/interface/web/mail/lib/lang/fi_mail_user.lng
@@ -20,10 +20,11 @@
$wb['no_policy'] = '- ei Käytössä -';
$wb['limit_mailbox_txt'] = 'Tilisi sallittu postilaatikoiden määrä on ylitetty.';
$wb['limit_mailquota_txt'] = 'Tilisi sallittu postilaatikoiden koko on ylitetty. Vapaa tila megatavuina on';
+$wb["welcome_mail_fromname_txt"] = 'ISPConfig3';
+$wb["welcome_mail_fromemail_txt"] = "webmaster@localhost.tld";
$wb['welcome_mail_subject'] = 'Tervetuloa käyttämään uutta sähköpotitiliäsi.';
-$wb['welcome_mail_message'] = 'Tervetuloa käyttämään uutta sähköpotitiliäsi. Toivoo Antenniserverin väki.';
+$wb['welcome_mail_message'] = 'Tervetuloa käyttämään uutta sähköpotitiliäsi toivottaa Webmaster';
$wb['disableimap_txt'] = 'Estä IMAP';
$wb['disablepop3_txt'] = 'Estä POP3';
$wb['password_strength_txt'] = 'Salasanan vahvuus';
?>
-
diff --git a/interface/web/mail/lib/lang/fi_mail_user_filter.lng b/interface/web/mail/lib/lang/fi_mail_user_filter.lng
index aedc25d..8ed85c5 100755
--- a/interface/web/mail/lib/lang/fi_mail_user_filter.lng
+++ b/interface/web/mail/lib/lang/fi_mail_user_filter.lng
@@ -7,4 +7,3 @@
$wb['searchterm_is_empty'] = 'Hakusana on tyhjä.';
$wb['source_txt'] = 'Lähde';
?>
-
diff --git a/interface/web/mail/lib/lang/fi_mail_user_filter_list.lng b/interface/web/mail/lib/lang/fi_mail_user_filter_list.lng
index 3d8ead8..c089777 100755
--- a/interface/web/mail/lib/lang/fi_mail_user_filter_list.lng
+++ b/interface/web/mail/lib/lang/fi_mail_user_filter_list.lng
@@ -2,4 +2,3 @@
$wb['rulename_txt'] = 'Suodatussäännön nimi';
$wb['add_new_record_txt'] = 'Lisää uusi suodatussääntö';
?>
-
diff --git a/interface/web/mail/lib/lang/fi_mail_user_list.lng b/interface/web/mail/lib/lang/fi_mail_user_list.lng
index 885f434..2f876e0 100755
--- a/interface/web/mail/lib/lang/fi_mail_user_list.lng
+++ b/interface/web/mail/lib/lang/fi_mail_user_list.lng
@@ -4,4 +4,3 @@
$wb['autoresponder_txt'] = 'Lomavastaaja';
$wb['add_new_record_txt'] = 'Lisää uusi postilaatikko';
?>
-
diff --git a/interface/web/mail/lib/lang/fi_mail_user_stats_list.lng b/interface/web/mail/lib/lang/fi_mail_user_stats_list.lng
index 27e6720..5f5b039 100755
--- a/interface/web/mail/lib/lang/fi_mail_user_stats_list.lng
+++ b/interface/web/mail/lib/lang/fi_mail_user_stats_list.lng
@@ -6,4 +6,3 @@
$wb['this_year_txt'] = 'Tänä vuonna';
$wb['last_year_txt'] = 'Viime vuonna';
?>
-
diff --git a/interface/web/mail/lib/lang/fi_mail_whitelist.lng b/interface/web/mail/lib/lang/fi_mail_whitelist.lng
index ca894d4..abd8e85 100755
--- a/interface/web/mail/lib/lang/fi_mail_whitelist.lng
+++ b/interface/web/mail/lib/lang/fi_mail_whitelist.lng
@@ -7,4 +7,3 @@
$wb['type_txt'] = 'Tyyppi';
$wb['limit_mailfilter_txt'] = 'Käyttäjätunnuksella on jo sallittu määrä suodattimia.';
?>
-
diff --git a/interface/web/mail/lib/lang/fi_mail_whitelist_list.lng b/interface/web/mail/lib/lang/fi_mail_whitelist_list.lng
index deebbb9..57632b0 100755
--- a/interface/web/mail/lib/lang/fi_mail_whitelist_list.lng
+++ b/interface/web/mail/lib/lang/fi_mail_whitelist_list.lng
@@ -8,4 +8,3 @@
$wb['add_new_record_txt'] = 'Lisää uusi luotettu osoite';
$wb['access_txt'] = 'yhteys';
?>
-
diff --git a/interface/web/mail/lib/lang/fi_spamfilter_blacklist.lng b/interface/web/mail/lib/lang/fi_spamfilter_blacklist.lng
index 531ae3c..f44c20f 100755
--- a/interface/web/mail/lib/lang/fi_spamfilter_blacklist.lng
+++ b/interface/web/mail/lib/lang/fi_spamfilter_blacklist.lng
@@ -6,4 +6,3 @@
$wb['priority_txt'] = 'Tärkeysjärjestys';
$wb['active_txt'] = 'Käytössä';
?>
-
diff --git a/interface/web/mail/lib/lang/fi_spamfilter_blacklist_list.lng b/interface/web/mail/lib/lang/fi_spamfilter_blacklist_list.lng
index 8044fa3..d448876 100755
--- a/interface/web/mail/lib/lang/fi_spamfilter_blacklist_list.lng
+++ b/interface/web/mail/lib/lang/fi_spamfilter_blacklist_list.lng
@@ -7,4 +7,3 @@
$wb['email_txt'] = 'Estettävä sähköpostiosoite';
$wb['add_new_record_txt'] = 'Lisää osoite estolistalle';
?>
-
diff --git a/interface/web/mail/lib/lang/fi_spamfilter_config.lng b/interface/web/mail/lib/lang/fi_spamfilter_config.lng
index 4e65a74..7447b48 100755
--- a/interface/web/mail/lib/lang/fi_spamfilter_config.lng
+++ b/interface/web/mail/lib/lang/fi_spamfilter_config.lng
@@ -18,4 +18,3 @@
$wb['mailbox_size_limit_txt'] = 'Postilaatikon koko';
$wb['message_size_limit_txt'] = 'Viestien enimmäiskoko';
?>
-
diff --git a/interface/web/mail/lib/lang/fi_spamfilter_config_list.lng b/interface/web/mail/lib/lang/fi_spamfilter_config_list.lng
index c5c24d6..aee0c81 100755
--- a/interface/web/mail/lib/lang/fi_spamfilter_config_list.lng
+++ b/interface/web/mail/lib/lang/fi_spamfilter_config_list.lng
@@ -3,4 +3,3 @@
$wb['server_name_txt'] = 'Palvelin';
$wb['server_id_txt'] = 'Palvelimen tunnus';
?>
-
diff --git a/interface/web/mail/lib/lang/fi_spamfilter_policy.lng b/interface/web/mail/lib/lang/fi_spamfilter_policy.lng
index e7554b7..8f61ba4 100755
--- a/interface/web/mail/lib/lang/fi_spamfilter_policy.lng
+++ b/interface/web/mail/lib/lang/fi_spamfilter_policy.lng
@@ -36,4 +36,3 @@
$wb['message_size_limit_txt'] = 'Viestin kokoraja';
$wb['banned_rulenames_txt'] = 'Estojen sääntönimet';
?>
-
diff --git a/interface/web/mail/lib/lang/fi_spamfilter_policy_list.lng b/interface/web/mail/lib/lang/fi_spamfilter_policy_list.lng
index 0430a7e..3074d45 100755
--- a/interface/web/mail/lib/lang/fi_spamfilter_policy_list.lng
+++ b/interface/web/mail/lib/lang/fi_spamfilter_policy_list.lng
@@ -7,4 +7,3 @@
$wb['bad_header_lover_txt'] = 'Pitää osikkovirheistä';
$wb['add_new_record_txt'] = 'Lisää kohtelutapa';
?>
-
diff --git a/interface/web/mail/lib/lang/fi_spamfilter_users.lng b/interface/web/mail/lib/lang/fi_spamfilter_users.lng
index b5810ea..d960f5c 100755
--- a/interface/web/mail/lib/lang/fi_spamfilter_users.lng
+++ b/interface/web/mail/lib/lang/fi_spamfilter_users.lng
@@ -6,4 +6,3 @@
$wb['fullname_txt'] = 'Koko nimi';
$wb['local_txt'] = 'Paikallinen';
?>
-
diff --git a/interface/web/mail/lib/lang/fi_spamfilter_users_list.lng b/interface/web/mail/lib/lang/fi_spamfilter_users_list.lng
index 97527a0..385d617 100755
--- a/interface/web/mail/lib/lang/fi_spamfilter_users_list.lng
+++ b/interface/web/mail/lib/lang/fi_spamfilter_users_list.lng
@@ -8,4 +8,3 @@
$wb['email_txt'] = 'Sähköpostiosoite';
$wb['add_new_record_txt'] = 'Lisää Roskapostisuodattimen käyttäjä';
?>
-
diff --git a/interface/web/mail/lib/lang/fi_spamfilter_whitelist.lng b/interface/web/mail/lib/lang/fi_spamfilter_whitelist.lng
index 5a6c403..78d2012 100755
--- a/interface/web/mail/lib/lang/fi_spamfilter_whitelist.lng
+++ b/interface/web/mail/lib/lang/fi_spamfilter_whitelist.lng
@@ -6,4 +6,3 @@
$wb['priority_txt'] = 'Tärkeysjärjestys';
$wb['active_txt'] = 'Käytössä';
?>
-
diff --git a/interface/web/mail/lib/lang/fi_spamfilter_whitelist_list.lng b/interface/web/mail/lib/lang/fi_spamfilter_whitelist_list.lng
index 05d5d3f..a3f00fc 100755
--- a/interface/web/mail/lib/lang/fi_spamfilter_whitelist_list.lng
+++ b/interface/web/mail/lib/lang/fi_spamfilter_whitelist_list.lng
@@ -7,4 +7,3 @@
$wb['email_txt'] = 'Luotettu osoite';
$wb['add_new_record_txt'] = 'Lisää uusi luotettu osoite';
?>
-
diff --git a/interface/web/mail/lib/lang/fr_mail_user.lng b/interface/web/mail/lib/lang/fr_mail_user.lng
index 6019160..c181eb1 100644
--- a/interface/web/mail/lib/lang/fr_mail_user.lng
+++ b/interface/web/mail/lib/lang/fr_mail_user.lng
@@ -27,4 +27,6 @@
Your webmaster.';
$wb['disableimap_txt'] = 'Disable IMAP';
$wb['disablepop3_txt'] = 'Disable POP3';
+$wb['welcome_mail_fromname_txt'] = 'ISPConfig3';
+$wb['welcome_mail_fromemail_txt'] = 'webmaster@localhost.tld';
?>
diff --git a/interface/web/mail/lib/lang/it_mail_user.lng b/interface/web/mail/lib/lang/it_mail_user.lng
index 6019160..c181eb1 100644
--- a/interface/web/mail/lib/lang/it_mail_user.lng
+++ b/interface/web/mail/lib/lang/it_mail_user.lng
@@ -27,4 +27,6 @@
Your webmaster.';
$wb['disableimap_txt'] = 'Disable IMAP';
$wb['disablepop3_txt'] = 'Disable POP3';
+$wb['welcome_mail_fromname_txt'] = 'ISPConfig3';
+$wb['welcome_mail_fromemail_txt'] = 'webmaster@localhost.tld';
?>
diff --git a/interface/web/mail/lib/lang/nl_mail_user.lng b/interface/web/mail/lib/lang/nl_mail_user.lng
index 2731195..08ef5a8 100644
--- a/interface/web/mail/lib/lang/nl_mail_user.lng
+++ b/interface/web/mail/lib/lang/nl_mail_user.lng
@@ -27,4 +27,6 @@
Uw webmaster.';
$wb['disableimap_txt'] = 'Uitschakelen IMAP';
$wb['disablepop3_txt'] = 'Uitschakelen POP3';
+$wb['welcome_mail_fromname_txt'] = 'ISPConfig3';
+$wb['welcome_mail_fromemail_txt'] = 'webmaster@localhost.tld';
?>
diff --git a/interface/web/mail/lib/lang/ru_mail_user.lng b/interface/web/mail/lib/lang/ru_mail_user.lng
index aca58da..75e1f8d 100644
--- a/interface/web/mail/lib/lang/ru_mail_user.lng
+++ b/interface/web/mail/lib/lang/ru_mail_user.lng
@@ -27,4 +27,6 @@
$wb['password_strength_txt'] = 'Password strength';
$wb['disableimap_txt'] = 'Disable IMAP';
$wb['disablepop3_txt'] = 'Disable POP3';
+$wb['welcome_mail_fromname_txt'] = 'ISPConfig3';
+$wb['welcome_mail_fromemail_txt'] = 'webmaster@localhost.tld';
?>
diff --git a/interface/web/mail/lib/lang/se_mail_user.lng b/interface/web/mail/lib/lang/se_mail_user.lng
index 6019160..c181eb1 100644
--- a/interface/web/mail/lib/lang/se_mail_user.lng
+++ b/interface/web/mail/lib/lang/se_mail_user.lng
@@ -27,4 +27,6 @@
Your webmaster.';
$wb['disableimap_txt'] = 'Disable IMAP';
$wb['disablepop3_txt'] = 'Disable POP3';
+$wb['welcome_mail_fromname_txt'] = 'ISPConfig3';
+$wb['welcome_mail_fromemail_txt'] = 'webmaster@localhost.tld';
?>
diff --git a/interface/web/mail/mail_user_edit.php b/interface/web/mail/mail_user_edit.php
index 59470f2..2942b96 100644
--- a/interface/web/mail/mail_user_edit.php
+++ b/interface/web/mail/mail_user_edit.php
@@ -200,7 +200,28 @@
$app->db->query("UPDATE mail_user SET sys_groupid = ".$domain["sys_groupid"]." WHERE mailuser_id = ".$this->id);
// send a welcome email to create the mailbox
- mail($this->dataRecord["email"],$app->tform->wordbook["welcome_mail_subject"],$app->tform->wordbook["welcome_mail_message"]);
+// mail($this->dataRecord["email"],$app->tform->wordbook["welcome_mail_subject"],$app->tform->wordbook["welcome_mail_message"]);
+
+ // tries to detect current charset, and encode subject-header and body from it to ISO-8859-1.
+ $fromCharset = mb_detect_encoding($app->tform->wordbook["welcome_mail_subject"]);
+ $iconvPreferences = array("input-charset" => $fromCharset,
+ "output-charset" => "ISO-8859-1",
+ "line-length" => 76,
+ "line-break-chars" => "\r\n",
+ "scheme" => "Q");
+
+ $welcomeFromName = $app->tform->wordbook["welcome_mail_fromname_txt"];
+ $welcomeFromEmail = $app->tform->wordbook["welcome_mail_fromemail_txt"];
+ $mailHeaders = "MIME-Version: 1.0" . "\r\n";
+ $mailHeaders .= "Content-type: text/plain; charset=iso-8859-1" . "\r\n";
+ $mailHeaders .= "From: $welcomeFromName <$welcomeFromEmail>" . "\r\n";
+ $mailHeaders .= "Reply-To: <$welcomeFromEmail>" . "\r\n";
+ $mailTarget = $this->dataRecord["email"];
+ $mailSubject = iconv_mime_encode("trimoff", $app->tform->wordbook["welcome_mail_subject"], $iconvPreferences);
+ $mailSubject = str_replace("trimoff: ", "", $mailSubject);
+ $mailBody = iconv ($fromCharset, "ISO-8859-1", $app->tform->wordbook["welcome_mail_message"]);
+
+ mail($mailTarget, $mailSubject, $mailBody, $mailHeaders);
// Spamfilter policy
$policy_id = intval($this->dataRecord["policy"]);
@@ -255,4 +276,4 @@
$app->tform_actions = new page_action;
$app->tform_actions->onLoad();
-?>
\ No newline at end of file
+?>
diff --git a/interface/web/monitor/lib/lang/fi.lng b/interface/web/monitor/lib/lang/fi.lng
index 651dc92..e9eab30 100755
--- a/interface/web/monitor/lib/lang/fi.lng
+++ b/interface/web/monitor/lib/lang/fi.lng
@@ -135,4 +135,3 @@
$wb['monitor_title_rkhunterlog_txt'] = 'RKHunter-tulokset';
$wb['monitor_updates_nosupport_txt'] = 'Käyttämäsi Linux-jakelu ei tue päivitysten valvontaa.';
?>
-
diff --git a/interface/web/monitor/lib/lang/fi_datalog_list.lng b/interface/web/monitor/lib/lang/fi_datalog_list.lng
index 80007eb..eb26582 100755
--- a/interface/web/monitor/lib/lang/fi_datalog_list.lng
+++ b/interface/web/monitor/lib/lang/fi_datalog_list.lng
@@ -6,4 +6,3 @@
$wb['action_txt'] = 'Toiminto';
$wb['status_txt'] = 'Tila';
?>
-
diff --git a/interface/web/monitor/lib/lang/fi_syslog_list.lng b/interface/web/monitor/lib/lang/fi_syslog_list.lng
index d542e9b..54aaa4e 100755
--- a/interface/web/monitor/lib/lang/fi_syslog_list.lng
+++ b/interface/web/monitor/lib/lang/fi_syslog_list.lng
@@ -5,4 +5,3 @@
$wb['loglevel_txt'] = 'Lokitaso';
$wb['message_txt'] = 'Viesti';
?>
-
diff --git a/interface/web/sites/lib/lang/fi.lng b/interface/web/sites/lib/lang/fi.lng
index ca8621b..fca962a 100755
--- a/interface/web/sites/lib/lang/fi.lng
+++ b/interface/web/sites/lib/lang/fi.lng
@@ -14,4 +14,3 @@
$wb['Shell'] = 'Shell';
$wb['Websites'] = 'Verkkotunnukset';
?>
-
diff --git a/interface/web/sites/lib/lang/fi_database.lng b/interface/web/sites/lib/lang/fi_database.lng
index d9016b5..ce65740 100755
--- a/interface/web/sites/lib/lang/fi_database.lng
+++ b/interface/web/sites/lib/lang/fi_database.lng
@@ -19,4 +19,3 @@
$wb['database_charset_txt'] = 'Tietokannan merkistö';
$wb['database_charset_change_txt'] = 'Tietokannan merkistöä ei voi vaihtaa';
?>
-
diff --git a/interface/web/sites/lib/lang/fi_database_list.lng b/interface/web/sites/lib/lang/fi_database_list.lng
index 96bed62..a231a6f 100755
--- a/interface/web/sites/lib/lang/fi_database_list.lng
+++ b/interface/web/sites/lib/lang/fi_database_list.lng
@@ -6,4 +6,3 @@
$wb['database_name_txt'] = 'Tietokannnan nimi';
$wb['add_new_record_txt'] = 'Lisää uusi tietokanta';
?>
-
diff --git a/interface/web/sites/lib/lang/fi_ftp_user.lng b/interface/web/sites/lib/lang/fi_ftp_user.lng
index 0bc36d1..a121d5a 100755
--- a/interface/web/sites/lib/lang/fi_ftp_user.lng
+++ b/interface/web/sites/lib/lang/fi_ftp_user.lng
@@ -22,4 +22,3 @@
$wb['directory_error_empty'] = 'Kotihakemisto-kenttä on tyhjä.';
$wb['password_strength_txt'] = 'Salasanan vahvuus';
?>
-
diff --git a/interface/web/sites/lib/lang/fi_ftp_user_list.lng b/interface/web/sites/lib/lang/fi_ftp_user_list.lng
index 38a1432..81c60b6 100755
--- a/interface/web/sites/lib/lang/fi_ftp_user_list.lng
+++ b/interface/web/sites/lib/lang/fi_ftp_user_list.lng
@@ -6,4 +6,3 @@
$wb['username_txt'] = 'Käyttäjätunnus';
$wb['add_new_record_txt'] = 'Lisää uusi FTP-käyttäjätunnus';
?>
-
diff --git a/interface/web/sites/lib/lang/fi_shell_user.lng b/interface/web/sites/lib/lang/fi_shell_user.lng
index c845728..de3365f 100755
--- a/interface/web/sites/lib/lang/fi_shell_user.lng
+++ b/interface/web/sites/lib/lang/fi_shell_user.lng
@@ -19,4 +19,3 @@
$wb['limit_shell_user_txt'] = 'Shell-käyttäjien määrä on ylitetty.';
$wb['password_strength_txt'] = 'Salasanan vahvuus';
?>
-
diff --git a/interface/web/sites/lib/lang/fi_shell_user_list.lng b/interface/web/sites/lib/lang/fi_shell_user_list.lng
index d4e0ef3..c09edb2 100755
--- a/interface/web/sites/lib/lang/fi_shell_user_list.lng
+++ b/interface/web/sites/lib/lang/fi_shell_user_list.lng
@@ -6,4 +6,3 @@
$wb['username_txt'] = 'Käyttäjätunnus';
$wb['add_new_record_txt'] = 'Lisää uusi Shell-käyttäjä';
?>
-
diff --git a/interface/web/sites/lib/lang/fi_web_aliasdomain_list.lng b/interface/web/sites/lib/lang/fi_web_aliasdomain_list.lng
index b719991..8f5c5cc 100755
--- a/interface/web/sites/lib/lang/fi_web_aliasdomain_list.lng
+++ b/interface/web/sites/lib/lang/fi_web_aliasdomain_list.lng
@@ -9,4 +9,3 @@
$wb['domain_error_unique'] = 'Tämä aliasverkkotunnus on jo olemassa.';
$wb['domain_error_regex'] = 'Aliasverkkotunnus on vääränlainen.';
?>
-
diff --git a/interface/web/sites/lib/lang/fi_web_domain.lng b/interface/web/sites/lib/lang/fi_web_domain.lng
index 524a4a8..30a2c3b 100755
--- a/interface/web/sites/lib/lang/fi_web_domain.lng
+++ b/interface/web/sites/lib/lang/fi_web_domain.lng
@@ -44,5 +44,4 @@
$wb['error_ssl_organisation_empty'] = 'SSL-organisaatio-kenttä on tyhjä.';
$wb['error_ssl_organisation_unit_empty'] = 'SSL-organisaatioyksikkö-kenttä on tyhjä.';
$wb['error_ssl_country_empty'] = 'SSL-maa-kenttä on tyhjä.';
-?>
-
+?>
\ No newline at end of file
diff --git a/interface/web/sites/lib/lang/fi_web_domain_list.lng b/interface/web/sites/lib/lang/fi_web_domain_list.lng
index a990c37..8f5691c 100755
--- a/interface/web/sites/lib/lang/fi_web_domain_list.lng
+++ b/interface/web/sites/lib/lang/fi_web_domain_list.lng
@@ -6,4 +6,3 @@
$wb['add_new_record_txt'] = 'Lisää uusi verkkotunnus';
$wb['domain_id_txt'] = 'Verkkotunnus';
?>
-
diff --git a/interface/web/sites/lib/lang/fi_web_subdomain.lng b/interface/web/sites/lib/lang/fi_web_subdomain.lng
index 7fe9c85..a7fa386 100755
--- a/interface/web/sites/lib/lang/fi_web_subdomain.lng
+++ b/interface/web/sites/lib/lang/fi_web_subdomain.lng
@@ -36,4 +36,3 @@
$wb['domain_error_unique'] = 'Tämä verkkotunnus on jo olemassa.';
$wb['domain_error_regex'] = 'Verkkotunnus on vääränlainen.';
?>
-
diff --git a/interface/web/sites/lib/lang/fi_web_subdomain_list.lng b/interface/web/sites/lib/lang/fi_web_subdomain_list.lng
index e21c19f..31fb170 100755
--- a/interface/web/sites/lib/lang/fi_web_subdomain_list.lng
+++ b/interface/web/sites/lib/lang/fi_web_subdomain_list.lng
@@ -6,4 +6,3 @@
$wb['domain_txt'] = 'Aliverkkotunnus';
$wb['add_new_record_txt'] = 'Lisää uusi aliverkkotunnus';
?>
-
diff --git a/interface/web/tools/lib/lang/fi.lng b/interface/web/tools/lib/lang/fi.lng
index 32c8ceb..2f78ef6 100755
--- a/interface/web/tools/lib/lang/fi.lng
+++ b/interface/web/tools/lib/lang/fi.lng
@@ -4,4 +4,3 @@
$wb['ISPConfig Tools'] = 'ISPConfig-työkalut';
$wb['Password and Language'] = 'Salasanat ja kielet';
?>
-
diff --git a/interface/web/tools/lib/lang/fi_usersettings.lng b/interface/web/tools/lib/lang/fi_usersettings.lng
index 58a752a..16ec5cf 100755
--- a/interface/web/tools/lib/lang/fi_usersettings.lng
+++ b/interface/web/tools/lib/lang/fi_usersettings.lng
@@ -6,4 +6,3 @@
$wb['Form to edit the user password and language.'] = 'Lomake käyttäjän salasanan ja kieliasetusten muokkaamiseen.';
$wb['Settings'] = 'Asetukset';
?>
-
--
Gitblit v1.9.1