Skip to content

GitLab

I
ISPConfig 3
Commit 6cdb029d authored by Marius Cramer's avatar Marius Cramer
Browse files
Options

Merge branch 'master' into 'master' 

Master

See merge request !226
parents 842b5c34 a5d73310
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
install/tpl/fedora_amavisd_conf.master
View file @ 6cdb029d
......@@ -144,7 +144,7 @@ $defang_by_ccat{+CC_BADH.",6"} = 1; # header field syntax error
# OTHER MORE COMMON SETTINGS (defaults may suffice):
# $myhostname = 'host.example.com'; # must be a fully-qualified domain name!
$myhostname = '{hostname}';
$notify_method = 'smtp:[127.0.0.1]:10027';
$forward_method = 'smtp:[127.0.0.1]:10025'; # set to undef with milter!
......
interface/web/mail/lib/lang/de_mail_user_stats_list.lng
View file @ 6cdb029d
<?php
$wb['list_head_txt'] = 'E-Mail Datenverkehr';
$wb['email_txt'] = 'E-Mail Adresse';
$wb['this_month_txt'] = 'Aktuelles Monat';
$wb['last_month_txt'] = 'Vergangenes Monat';
$wb['this_month_txt'] = 'Aktueller Monat';
$wb['last_month_txt'] = 'Vergangener Monat';
$wb['this_year_txt'] = 'Aktuelles Jahr';
$wb['last_year_txt'] = 'Vergangenes Jahr';
?>
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment