From 4569cae57f127afd093794310ccd290d2d9fdf36 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Wed, 20 Apr 2016 10:58:46 -0400
Subject: [PATCH] Merge branch 'stable-3.1'

---
 interface/web/mail/lib/lang/de_mail_domain.lng |   15 ++++++++-------
 1 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/interface/web/mail/lib/lang/de_mail_domain.lng b/interface/web/mail/lib/lang/de_mail_domain.lng
index 94c1bbe..13aac42 100644
--- a/interface/web/mail/lib/lang/de_mail_domain.lng
+++ b/interface/web/mail/lib/lang/de_mail_domain.lng
@@ -3,12 +3,12 @@
 $wb['domain_txt'] = 'Domain';
 $wb['type_txt'] = 'Typ';
 $wb['active_txt'] = 'Aktiv';
-$wb["dkim_txt"] = 'DKIM aktivieren';
-$wb["dkim_private_txt"] = 'DKIM privater Schlüssel';
-$wb["dkim_public_txt"] = 'DKIM öffentlicher Schlüssel';
-$wb["dkim_generate_txt"] = 'erstelle DKIM Schlüssel';
-$wb["dkim_dns_txt"] = 'DNS Eintrag';
-$wb["dkim_private_key_error"] = 'ungueltiger DKIM-Private key';
+$wb['dkim_txt'] = 'DKIM aktivieren';
+$wb['dkim_private_txt'] = 'DKIM privater Schlüssel';
+$wb['dkim_public_txt'] = 'DKIM öffentlicher Schlüssel';
+$wb['dkim_generate_txt'] = 'erstelle DKIM Schlüssel';
+$wb['dkim_dns_txt'] = 'DNS Eintrag';
+$wb['dkim_private_key_error'] = 'ungueltiger DKIM-Private key';
 $wb['domain_error_empty'] = 'Domain ist leer';
 $wb['domain_error_unique'] = 'Doppelte Domain.';
 $wb['domain_error_regex'] = 'Ungültiger Domainname.';
@@ -18,5 +18,6 @@
 $wb['no_policy'] = '- nicht aktiviert -';
 $wb['dkim_selector_txt'] = 'DKIM-Selector';
 $wb['dkim_selector_error'] = 'Ungültiger DKIM-Selector.  Verwenden Sie nur max. 63 alphanumerische Zeichen (a-z oder 0-9)';
-$wb["dkim_settings_txt"] = 'DomainKeys Identified Mail (DKIM)';
+$wb['dkim_settings_txt'] = 'DomainKeys Identified Mail (DKIM)';
+$wb['error_not_allowed_server_id'] = 'Chosen server is not allowed for this account.';
 ?>

--
Gitblit v1.9.1