Merge branch 'master' into 'master'

Master

See merge request !226

Author: Marius Cramer

install/tpl/fedora_amavisd_conf.master

@@ -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

@@ -1,8 +1,8 @@
 <?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';
 ?>