From b4945ae0c3f4e108090d05b34b3e7df8a753a2ec Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Mon, 07 Jul 2014 13:07:17 -0400
Subject: [PATCH] Merge branch 'master' into 'master'

---
 interface/web/mail/lib/lang/de_mail_alias_list.lng |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/interface/web/mail/lib/lang/de_mail_alias_list.lng b/interface/web/mail/lib/lang/de_mail_alias_list.lng
index b80f46c..e741d02 100644
--- a/interface/web/mail/lib/lang/de_mail_alias_list.lng
+++ b/interface/web/mail/lib/lang/de_mail_alias_list.lng
@@ -1,9 +1,8 @@
 <?php
-$wb['list_head_txt'] = 'Email Alias';
+$wb['list_head_txt'] = 'E-Mail Alias';
 $wb['active_txt'] = 'Aktiv';
 $wb['source_txt'] = 'Quelle';
 $wb['destination_txt'] = 'Ziel';
-$wb['email_txt'] = 'Emailadresse';
-$wb['add_new_record_txt'] = 'Neuen Email Alias hinzufügen';
+$wb['email_txt'] = 'E-Mail Adresse';
+$wb['add_new_record_txt'] = 'Neuen E-Mail Alias hinzufügen';
 ?>
-

--
Gitblit v1.9.1