From 690cfe993b4b82b938717663d52e3c14ba047619 Mon Sep 17 00:00:00 2001 From: Antennipasi Date: Sun, 25 Jan 2009 14:41:05 +0000 Subject: [PATCH] fix for local characters not encoded properly in welcome-email. remove trailing empty lines from finnish language, again... --- interface/lib/lang/de.lng | 37 ++++++------ interface/lib/lang/fi.lng | 1 - interface/web/admin/lib/lang/fi.lng | 1 - interface/web/admin/lib/lang/fi_firewall.lng | 1 - .../web/admin/lib/lang/fi_firewall_list.lng | 1 - interface/web/admin/lib/lang/fi_groups.lng | 1 - .../web/admin/lib/lang/fi_groups_list.lng | 1 - .../web/admin/lib/lang/fi_language_add.lng | 1 - .../admin/lib/lang/fi_language_complete.lng | 1 - .../web/admin/lib/lang/fi_language_edit.lng | 1 - .../web/admin/lib/lang/fi_language_export.lng | 1 - .../web/admin/lib/lang/fi_language_import.lng | 1 - .../web/admin/lib/lang/fi_language_list.lng | 1 - interface/web/admin/lib/lang/fi_server.lng | 1 - .../web/admin/lib/lang/fi_server_config.lng | 1 - .../admin/lib/lang/fi_server_config_list.lng | 1 - interface/web/admin/lib/lang/fi_server_ip.lng | 1 - .../web/admin/lib/lang/fi_server_ip_list.lng | 1 - .../web/admin/lib/lang/fi_server_list.lng | 1 - .../lib/lang/fi_software_package_list.lng | 1 - .../web/admin/lib/lang/fi_software_repo.lng | 1 - .../admin/lib/lang/fi_software_repo_list.lng | 1 - .../lib/lang/fi_software_update_list.lng | 1 - .../web/admin/lib/lang/fi_system_config.lng | 1 - interface/web/admin/lib/lang/fi_users.lng | 1 - .../web/admin/lib/lang/fi_users_list.lng | 1 - interface/web/client/lib/lang/fi.lng | 1 - interface/web/client/lib/lang/fi_client.lng | 1 - .../client/lib/lang/fi_client_template.lng | 1 - .../lib/lang/fi_client_template_list.lng | 1 - .../web/client/lib/lang/fi_clients_list.lng | 1 - interface/web/designer/lib/lang/fi.lng | 1 - .../web/designer/lib/lang/fi_form_edit.lng | 1 - .../web/designer/lib/lang/fi_form_list.lng | 1 - .../web/designer/lib/lang/fi_form_show.lng | 1 - .../web/designer/lib/lang/fi_module_edit.lng | 1 - .../web/designer/lib/lang/fi_module_list.lng | 1 - .../lib/lang/fi_module_nav_item_edit.lng | 1 - .../web/designer/lib/lang/fi_module_show.lng | 1 - interface/web/dns/lib/lang/fi.lng | 1 - interface/web/dns/lib/lang/fi_dns_a.lng | 1 - interface/web/dns/lib/lang/fi_dns_a_list.lng | 1 - interface/web/dns/lib/lang/fi_dns_alias.lng | 1 - interface/web/dns/lib/lang/fi_dns_cname.lng | 1 - interface/web/dns/lib/lang/fi_dns_hinfo.lng | 1 - interface/web/dns/lib/lang/fi_dns_mx.lng | 1 - interface/web/dns/lib/lang/fi_dns_ns.lng | 1 - interface/web/dns/lib/lang/fi_dns_ptr.lng | 1 - interface/web/dns/lib/lang/fi_dns_rp.lng | 1 - interface/web/dns/lib/lang/fi_dns_soa.lng | 1 - .../web/dns/lib/lang/fi_dns_soa_list.lng | 1 - interface/web/dns/lib/lang/fi_dns_srv.lng | 1 - .../web/dns/lib/lang/fi_dns_template.lng | 1 - .../web/dns/lib/lang/fi_dns_template_list.lng | 1 - interface/web/dns/lib/lang/fi_dns_txt.lng | 1 - interface/web/dns/lib/lang/fi_dns_wizard.lng | 1 - interface/web/help/lib/lang/fi.lng | 1 - .../web/help/lib/lang/fi_support_message.lng | 1 - .../help/lib/lang/fi_support_message_list.lng | 1 - interface/web/js/lib/lang/fi_javascript.lng | 1 - interface/web/login/lib/lang/fi.lng | 1 - interface/web/mail/lib/lang/bg_mail_user.lng | 2 + 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/mail/lib/lang/fi.lng | 1 - interface/web/mail/lib/lang/fi_mail_alias.lng | 1 - .../web/mail/lib/lang/fi_mail_alias_list.lng | 1 - .../web/mail/lib/lang/fi_mail_blacklist.lng | 1 - .../mail/lib/lang/fi_mail_blacklist_list.lng | 1 - .../mail/lib/lang/fi_mail_content_filter.lng | 1 - .../lib/lang/fi_mail_content_filter_list.lng | 1 - .../web/mail/lib/lang/fi_mail_domain.lng | 1 - .../mail/lib/lang/fi_mail_domain_catchall.lng | 1 - .../lib/lang/fi_mail_domain_catchall_list.lng | 1 - .../web/mail/lib/lang/fi_mail_domain_list.lng | 1 - .../web/mail/lib/lang/fi_mail_forward.lng | 1 - .../mail/lib/lang/fi_mail_forward_list.lng | 1 - interface/web/mail/lib/lang/fi_mail_get.lng | 1 - .../web/mail/lib/lang/fi_mail_get_list.lng | 1 - .../web/mail/lib/lang/fi_mail_spamfilter.lng | 1 - .../mail/lib/lang/fi_mail_spamfilter_list.lng | 1 - .../web/mail/lib/lang/fi_mail_transport.lng | 1 - .../mail/lib/lang/fi_mail_transport_list.lng | 1 - interface/web/mail/lib/lang/fi_mail_user.lng | 5 +- .../web/mail/lib/lang/fi_mail_user_filter.lng | 1 - .../lib/lang/fi_mail_user_filter_list.lng | 1 - .../web/mail/lib/lang/fi_mail_user_list.lng | 1 - .../mail/lib/lang/fi_mail_user_stats_list.lng | 1 - .../web/mail/lib/lang/fi_mail_whitelist.lng | 1 - .../mail/lib/lang/fi_mail_whitelist_list.lng | 1 - .../mail/lib/lang/fi_spamfilter_blacklist.lng | 1 - .../lib/lang/fi_spamfilter_blacklist_list.lng | 1 - .../mail/lib/lang/fi_spamfilter_config.lng | 1 - .../lib/lang/fi_spamfilter_config_list.lng | 1 - .../mail/lib/lang/fi_spamfilter_policy.lng | 1 - .../lib/lang/fi_spamfilter_policy_list.lng | 1 - .../web/mail/lib/lang/fi_spamfilter_users.lng | 1 - .../lib/lang/fi_spamfilter_users_list.lng | 1 - .../mail/lib/lang/fi_spamfilter_whitelist.lng | 1 - .../lib/lang/fi_spamfilter_whitelist_list.lng | 1 - interface/web/mail/lib/lang/fr_mail_user.lng | 2 + interface/web/mail/lib/lang/it_mail_user.lng | 2 + interface/web/mail/lib/lang/nl_mail_user.lng | 2 + interface/web/mail/lib/lang/ru_mail_user.lng | 2 + interface/web/mail/lib/lang/se_mail_user.lng | 2 + interface/web/mail/mail_user_edit.php | 25 ++++++++- interface/web/monitor/lib/lang/fi.lng | 1 - .../web/monitor/lib/lang/fi_datalog_list.lng | 1 - .../web/monitor/lib/lang/fi_syslog_list.lng | 1 - interface/web/sites/lib/lang/fi.lng | 1 - interface/web/sites/lib/lang/fi_database.lng | 1 - .../web/sites/lib/lang/fi_database_list.lng | 1 - interface/web/sites/lib/lang/fi_ftp_user.lng | 1 - .../web/sites/lib/lang/fi_ftp_user_list.lng | 1 - .../web/sites/lib/lang/fi_shell_user.lng | 1 - .../web/sites/lib/lang/fi_shell_user_list.lng | 1 - .../lib/lang/fi_web_aliasdomain_list.lng | 1 - .../web/sites/lib/lang/fi_web_domain.lng | 3 +- .../web/sites/lib/lang/fi_web_domain_list.lng | 1 - .../web/sites/lib/lang/fi_web_subdomain.lng | 1 - .../sites/lib/lang/fi_web_subdomain_list.lng | 1 - interface/web/tools/lib/lang/fi.lng | 1 - .../web/tools/lib/lang/fi_usersettings.lng | 1 - 124 files changed, 91 insertions(+), 164 deletions(-) diff --git a/interface/lib/lang/de.lng b/interface/lib/lang/de.lng index 10814cd320..c5326e8d7d 100644 --- a/interface/lib/lang/de.lng +++ b/interface/lib/lang/de.lng @@ -1,20 +1,19 @@ - - +$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 5d3a0dc514..969c373dc8 100755 --- a/interface/lib/lang/fi.lng +++ b/interface/lib/lang/fi.lng @@ -17,4 +17,3 @@ $wb['add_new_record_txt'] = 'Lisää uusi tietue'; $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 aa4abbaf2b..0f21a5a536 100755 --- a/interface/web/admin/lib/lang/fi.lng +++ b/interface/web/admin/lib/lang/fi.lng @@ -32,4 +32,3 @@ $wb['Language Editor'] = 'Kielimuokkain'; $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 e2f7771768..d47d21de03 100755 --- a/interface/web/admin/lib/lang/fi_firewall.lng +++ b/interface/web/admin/lib/lang/fi_firewall.lng @@ -7,4 +7,3 @@ $wb['udp_port_help_txt'] = 'Pilkulla erotettu lista'; $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 e912ff05a5..96ff2dc63a 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['tcp_port_txt'] = 'Avoimet TCP-portit'; $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 c3341ed25f..141322bc00 100755 --- a/interface/web/admin/lib/lang/fi_groups.lng +++ b/interface/web/admin/lib/lang/fi_groups.lng @@ -3,4 +3,3 @@ $wb['description_txt'] = 'Ryhmän kuvaus'; $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 b7cd545612..8a7b0e4f83 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['description_txt'] = 'Ryhmien kuvaukset'; $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 5432e1d4a0..c58d9ea44f 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['language_new_txt'] = 'Lisää uusi kieli'; $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 758357f4dd..f4baae36a5 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['language_select_txt'] = 'Valitse täydennettävä kieli'; $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 f3fbfdedc0..cdf73da643 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['lang_file_txt'] = 'Kielitiedosto'; $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 db057cbd4c..b1ff06c4e8 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['language_select_txt'] = 'Valitse ladattava kieli'; $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 ef3d8aa639..ee8a32f856 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['btn_save_txt'] = 'Asenna valittu kielitiedosto'; $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 8dd1d59f72..85e7b70e11 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['module_txt'] = 'Ohjelmaosio'; $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 da70cba12a..8d2fec13b8 100755 --- a/interface/web/admin/lib/lang/fi_server.lng +++ b/interface/web/admin/lib/lang/fi_server.lng @@ -9,4 +9,3 @@ $wb['db_server_txt'] = 'Tietokantapalvelin'; $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 5d46722596..a935886435 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['hostname_txt'] = 'Palvelimen nimi'; $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 fde21a1c32..ed1cbed5b4 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 e423a99aa8..7930433253 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['ip_address_txt'] = 'IP-osoite'; $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 8123436482..a297a62bf6 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['server_id_txt'] = 'Palvelin'; $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 c303c47dd3..30863bdf24 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['db_server_txt'] = 'Tietokantapalvelin'; $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 97f481e864..a8957cc9f7 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_title_txt'] = 'Ohjelmapaketti'; $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 9a9ebead63..c89969445f 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_username_txt'] = 'Käyttäjätunnus (valinnainen)'; $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 094fc4f91c..bde844c99f 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['active_txt'] = 'Käytössä'; $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 fcb82879fe..c352c1c5c6 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['update_title_txt'] = 'Päivitä'; $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 ff42ab90dd..3ad68041b1 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['shelluser_prefix_error_regex'] = 'Shell-käyttäjätunnuksen etuliite on v $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 ec94e5d18e..08bada0374 100755 --- a/interface/web/admin/lib/lang/fi_users.lng +++ b/interface/web/admin/lib/lang/fi_users.lng @@ -26,4 +26,3 @@ $wb['default_group_txt'] = 'Oletusryhmä'; $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 3ed6a42d8f..d161aa22d1 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['name_txt'] = 'Etunimi'; $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 035b4731c1..a06bfe8dfa 100755 --- a/interface/web/client/lib/lang/fi.lng +++ b/interface/web/client/lib/lang/fi.lng @@ -7,4 +7,3 @@ $wb['Edit Client'] = 'Muokkaa asiakkaan tietoja'; $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 37037a2eb0..850d9c3279 100755 --- a/interface/web/client/lib/lang/fi_client.lng +++ b/interface/web/client/lib/lang/fi_client.lng @@ -79,4 +79,3 @@ $wb['password_strength_txt'] = 'Salasanan vahvuus'; $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 a501f67f6c..31390499d6 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_dns_zone_error_notint'] = 'DNS-tietueiden raja-arvon pitää olla num $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 22b49a6123..094c3c70c9 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['list_head_txt'] = 'Asiakasmallit'; $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 789b843143..3d6766dfb5 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['city_txt'] = 'Kaupunki'; $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 29f4a51efe..acb6c3546c 100755 --- a/interface/web/designer/lib/lang/fi.lng +++ b/interface/web/designer/lib/lang/fi.lng @@ -1,3 +1,2 @@ - diff --git a/interface/web/designer/lib/lang/fi_form_edit.lng b/interface/web/designer/lib/lang/fi_form_edit.lng index 3af85556a8..c9a13038a4 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_user_txt'] = 'Käyttäjän oikeudet'; $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 a35c8dbcc2..9052c8f0c9 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['module_txt'] = 'Ohjelmaosio'; $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 c2f28353a9..247a95be59 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['module_del_txt'] = 'Poista ohjelmaosion kansio ja kaikki sen alikansiot?'; $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 c902b7a1e3..8bb4a5c09e 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 @@ $wb['description_txt'] = ' Vihje: 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 bb83c342f1..f07c9a377b 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['list_head_txt'] = 'Perusohjelmaosio'; $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 ece2a168bf..5f32d58481 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['header_txt'] = 'Valikon ominaisuudet'; $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 2ea910e535..066d92f583 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['module_del_txt'] = 'Haluatko poistaa tämän ohjelmaosion ja kaikki siihen $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 31bdc48074..a44ed083b8 100755 --- a/interface/web/dns/lib/lang/fi.lng +++ b/interface/web/dns/lib/lang/fi.lng @@ -15,4 +15,3 @@ $wb['DNS SRV'] = 'DNS SRV-tietue'; $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 40c6681f95..0248631d35 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['name_error_regex'] = 'Verkkotunnus on vääränlainen.'; $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 b304f11b8d..0e518ace54 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['type_txt'] = 'Tyyppi'; $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 d3ccbb045f..20da599c72 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['name_error_regex'] = 'Aliasverkkotunnus on vääränlainen.'; $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 c21cdb25ba..a58f0d2f2c 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['name_error_regex'] = 'Verkkotunnus on vääränlainen.'; $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 baba09e908..ea2fb93a39 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['name_error_regex'] = 'Verkkotunnus on vääränlainen.'; $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 dba4363664..e4b4a60d56 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['name_error_regex'] = 'Verkkotunnus on väärän muotoinen.'; $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 2ef717cb0c..8f97c53cb2 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['name_error_regex'] = 'Alue-kenttä on väärän muotoinen.'; $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 4cfcb29320..9885c2be9d 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['name_error_regex'] = 'Alueen nimi-kenttä on väärän muotoinen.'; $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 0c12013b3c..d47cdcfbdd 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['name_error_regex'] = 'Pääverkkotunnus on vääränlainen.'; $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 9f4d4877ea..809454ab4f 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['ns_error_regex'] = 'Nimipalvelin-kenttä on tyhjä.'; $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 7b405212e6..95d104443a 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['ns_txt'] = 'nimipalvelin (NS)'; $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 679de7b3b1..1f136a2a81 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['name_error_regex'] = 'Verkkotunnus on vääränlainen.'; $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 96a8978ca3..b34a92d6a9 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['fields_txt'] = 'Kentät'; $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 92dd4e76e7..47c8924237 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['visible_txt'] = 'Näkyvissä'; $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 dc1cfad710..d1235ba07a 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['name_error_regex'] = 'Verkkotunnus on vääränlainen.'; $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 bf328d4880..966447f78e 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['ns2_txt'] = '2. nimipalvelin'; $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 ddf4fac92c..62ab7717c6 100755 --- a/interface/web/help/lib/lang/fi.lng +++ b/interface/web/help/lib/lang/fi.lng @@ -5,4 +5,3 @@ $wb['Send message'] = 'Lähetä tukipyyntö'; $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 32997fe3cc..1e693bc6ed 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['subject_txt'] = 'Tukipyynnön aihe'; $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 b7f58bfc81..4bbc1de799 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['sender_id_txt'] = 'Tukipyynnön lähettäjä'; $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 414a88549c..9145652614 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_3_txt'] = 'Hyvä'; $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 b17ec1bc65..94908156ab 100755 --- a/interface/web/login/lib/lang/fi.lng +++ b/interface/web/login/lib/lang/fi.lng @@ -10,4 +10,3 @@ $wb['pw_error_noinput'] = 'Anna sähköpostiosoite ja käyttäjätunnus.'; $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 6019160c68..c181eb1255 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 @@ $wb['welcome_mail_message'] = 'Welcome to your new email account. 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 289ad9395b..4c09d070f9 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 @@ - - +$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 e361a09e74..ec2618ad9c 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["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_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 6019160c68..c181eb1255 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 @@ $wb['welcome_mail_message'] = 'Welcome to your new email account. 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 340f2bb411..9d5c4f6e95 100755 --- a/interface/web/mail/lib/lang/fi.lng +++ b/interface/web/mail/lib/lang/fi.lng @@ -43,4 +43,3 @@ $wb['Content Filter'] = 'Sisältösuodatin'; $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 40093b25eb..f3a6dad211 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['no_domain_perm'] = 'Käyttäjätunnuksella ei ole oikeuksia tähän verkkot $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 1f2a31e916..37dad6eaa6 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['destination_txt'] = 'Kohde'; $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 b3236dc812..66cb93004e 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['source_error_notempty'] = 'Estetty osoite on tyhjä'; $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 7f3099e965..2d792ffc6a 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['recipient_txt'] = 'Vastaanottaja'; $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 22c7ba78c0..9cac6d38ff 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['action_txt'] = 'Toiminto'; $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 8a5bfc939a..ccd1b895e4 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['pattern_txt'] = 'Suodatuskuvio (RegExp)'; $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 5bb83dc195..d35f8a4fcd 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['limit_maildomain_txt'] = 'Käyttäjatunnuksella on jo sallittu määrä pos $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 e326003ee2..b4928d5369 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['no_domain_perm'] = 'Käyttäjätunnuksella ei ole oikeuksia tähän verkkot $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 7629bac073..951807890f 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['server_id_txt'] = 'Palvelin'; $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 d0292a175d..e8c4d2862c 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['domain_txt'] = 'Postiverkkotunnus'; $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 3476c6df6e..5423874b8f 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['destination_txt'] = 'Vastaanottajan sähköposti'; $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 ac53a1a25c..15aab44bf9 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['destination_txt'] = 'Minne:'; $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 9b79f7e53d..6bc1dccf81 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['destination_txt'] = 'Kohdepostilaatikko'; $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 93eae9ecde..be7a29f7c4 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['source_username_txt'] = 'Käyttäjätunnus'; $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 31f0cb3e60..a833ecacfc 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['email_error_unique'] = 'Tälle sähköpostiosoitteelle on jo olemassa suoda $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 bba4011953..41f6e3b0d7 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['server_name_txt'] = 'Palvelimen nimi'; $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 44c05b5729..4b4ad896a3 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['sort_order_txt'] = 'Järjestä..'; $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 435eea2efa..e91c76e29a 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['transport_txt'] = 'Reitti'; $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 9a218ed8c5..b5835941ae 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['policy_txt'] = 'Roskapostisuodatin'; $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 aedc25d318..8ed85c5042 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['rulename_error_empty'] = 'Säännön nimi on tyhjä.'; $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 3d8ead8232..c089777286 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 885f43411e..2f876e00a8 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['email_txt'] = 'Sähköpostiosoite'; $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 27e6720f24..5f5b0391fc 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['last_month_txt'] = 'Viime kuussa'; $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 ca894d4234..abd8e85f2b 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['source_error_notempty'] = 'Osoite on tyhjä'; $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 deebbb9604..57632b041c 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['recipient_txt'] = 'Vastaanottaja'; $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 531ae3cf6c..f44c20f75f 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['email_txt'] = 'Sähköpostiosoite'; $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 8044fa38d0..d448876ef2 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['rid_txt'] = 'Käyttäjätunnus'; $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 4e65a74c25..7447b48c77 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['relayhost_password_txt'] = 'Salasana'; $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 c5c24d69ad..aee0c81737 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['list_head_txt'] = 'Palvelimen asetukset'; $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 e7554b74b7..8f61ba411b 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['spam_admin_txt'] = 'Roskapostitunnisteiden ylläpitäjä'; $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 0430a7eac1..3074d45ff0 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['banned_files_lover_txt'] = 'Pitää estetyistä tiedostoista'; $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 b5810ea04f..d960f5c82a 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['email_txt'] = 'Sähköpostiosoite (RegExp)'; $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 97527a0d48..385d617a74 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['fullname_txt'] = 'Koko nimi'; $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 5a6c403a22..78d2012ef3 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['email_txt'] = 'Sähköpostiosoite'; $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 05d5d3f982..a3f00fc848 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['rid_txt'] = 'Käyttäjä'; $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 6019160c68..c181eb1255 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 @@ $wb['welcome_mail_message'] = 'Welcome to your new email account. 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 6019160c68..c181eb1255 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 @@ $wb['welcome_mail_message'] = 'Welcome to your new email account. 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 27311956bb..08ef5a8427 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 @@ $wb['welcome_mail_message'] = 'Welkom op uw nieuwe email account. 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 aca58dae3e..75e1f8dbc0 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['welcome_mail_message'] = 'Добро пожаловать в ваш нов $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 6019160c68..c181eb1255 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 @@ $wb['welcome_mail_message'] = 'Welcome to your new email account. 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 59470f2668..2942b96055 100644 --- a/interface/web/mail/mail_user_edit.php +++ b/interface/web/mail/mail_user_edit.php @@ -200,7 +200,28 @@ class page_action extends tform_actions { $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 @@ class page_action extends tform_actions { $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 651dc92658..e9eab30dc9 100755 --- a/interface/web/monitor/lib/lang/fi.lng +++ b/interface/web/monitor/lib/lang/fi.lng @@ -135,4 +135,3 @@ $wb['monitor_title_raidstate_txt'] = 'RAID-laitteiden tila'; $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 80007ebad9..eb26582613 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['dbtable_txt'] = 'Tietokannan taulu'; $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 d542e9b308..54aaa4e306 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['server_id_txt'] = 'Palvelin'; $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 ca8621bf06..fca962a402 100755 --- a/interface/web/sites/lib/lang/fi.lng +++ b/interface/web/sites/lib/lang/fi.lng @@ -14,4 +14,3 @@ $wb['Shell-User'] = 'Shell-käyttäjä'; $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 d9016b5f0a..ce657407a2 100755 --- a/interface/web/sites/lib/lang/fi_database.lng +++ b/interface/web/sites/lib/lang/fi_database.lng @@ -19,4 +19,3 @@ $wb['password_strength_txt'] = 'Salasanan vahvuus'; $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 96bed62619..a231a6fb95 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['server_id_txt'] = 'Palvelin'; $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 0bc36d1216..a121d5af3c 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['uid_error_empty'] = 'Käyttäjäryhmä-kenttä on tyhjä.'; $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 38a143204c..81c60b6d71 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['parent_domain_id_txt'] = 'Verkkotunnus'; $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 c845728e10..de3365f6f6 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['directory_error_empty'] = 'Kansio-kenttä on tyhjä.'; $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 d4e0ef3d0b..c09edb230a 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['parent_domain_id_txt'] = 'Verkkotunnus'; $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 b719991805..8f5c5ccf12 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_empty'] = 'Aliasverkkotunnus on tyhjä.'; $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 524a4a8fe7..30a2c3be15 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_locality_empty'] = 'SSL-lokaali-kenttä on tyhjä.'; $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 a990c3737f..8f5691c2f8 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['domain_txt'] = 'Verkkotunnus'; $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 7fe9c857f9..a7fa3868df 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_empty'] = 'Verkkotunnus-kenttä on tyhjä.'; $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 e21c19f505..31fb17028a 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['parent_domain_id_txt'] = 'Pääverkkotunnus'; $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 32c8ceb5e5..2f78ef6ccc 100755 --- a/interface/web/tools/lib/lang/fi.lng +++ b/interface/web/tools/lib/lang/fi.lng @@ -4,4 +4,3 @@ $wb['Settings'] = 'Aetukset'; $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 58a752a627..16ec5cf1ab 100755 --- a/interface/web/tools/lib/lang/fi_usersettings.lng +++ b/interface/web/tools/lib/lang/fi_usersettings.lng @@ -6,4 +6,3 @@ $wb['password_strength_txt'] = 'Salasanan vahvuus'; $wb['Form to edit the user password and language.'] = 'Lomake käyttäjän salasanan ja kieliasetusten muokkaamiseen.'; $wb['Settings'] = 'Asetukset'; ?> - -- GitLab