From 6cdb029df901248cf6f9bbd74586cc6f62051fee Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Sat, 12 Sep 2015 02:37:56 -0400
Subject: [PATCH] Merge branch 'master' into 'master'
---
interface/web/mail/lib/lang/de_mail_user_stats_list.lng | 4 ++--
install/tpl/fedora_amavisd_conf.master | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/install/tpl/fedora_amavisd_conf.master b/install/tpl/fedora_amavisd_conf.master
index 5275552..29f1066 100644
--- a/install/tpl/fedora_amavisd_conf.master
+++ b/install/tpl/fedora_amavisd_conf.master
@@ -144,7 +144,7 @@
# 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!
diff --git a/interface/web/mail/lib/lang/de_mail_user_stats_list.lng b/interface/web/mail/lib/lang/de_mail_user_stats_list.lng
index e9a1983..ef0b0c5 100644
--- a/interface/web/mail/lib/lang/de_mail_user_stats_list.lng
+++ b/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';
?>
--
Gitblit v1.9.1