maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

check whether an email account is to be deleted when re-adding an email account with the same name, fixes #1519

Browse Source 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann (d00p)
2016-03-10 10:54:32 +01:00
parent 2b2ca99a2b
commit f9740ff545
4 changed files with 56 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lng/english.lng.php
View File

@@ -1973,3 +1973,4 @@ $lng['domains']['termination_date'] = 'Date of termination';
$lng['domains']['termination_date_overview'] = 'canceled until ';
$lng['panel']['set'] = 'Apply';
$lng['customer']['selectserveralias_addinfo'] = 'This option can be set when editing the domain. Its initial value is inherited from the parent-domain.';
$lng['error']['mailaccistobedeleted'] = "Another account with the same name (%s) is currently being deleted and can therefore not be added at this moment.";

1
lng/german.lng.php
View File

@@ -1626,3 +1626,4 @@ $lng['domains']['termination_date'] = 'Kündigungsdatum';
$lng['domains']['termination_date_overview'] = 'gekündigt zum ';
$lng['panel']['set'] = 'Setzen';
$lng['customer']['selectserveralias_addinfo'] = 'Diese Option steht beim Bearbeiten der Domain zur Verfügung. Als Initial-Wert wird die Einstellung der Hauptdomain vererbt.';
$lng['error']['mailaccistobedeleted'] = "Ein vorheriges Konto mit dem gleichen Namen (%s) wird aktuell noch gelöscht und kann daher derzeit nicht angelegt werden";