From f43ef975d75a57973886e7f8eabb068d2ac15cc0 Mon Sep 17 00:00:00 2001 From: Falko Timme <ft@falkotimme.com> Date: Mon, 16 Jun 2014 12:06:06 -0400 Subject: [PATCH] - Make sure ISPConfig shows the correct error message (instad of an SQL error) when a website is renamed after an alias domain that still exists. - It should be possible to create two websites with the same domain on the same server as long as the IP differs. I therefore changed the serverdomain index of the web_domain table to include the IP address. --- interface/web/tools/lib/lang/de_usersettings.lng | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/interface/web/tools/lib/lang/de_usersettings.lng b/interface/web/tools/lib/lang/de_usersettings.lng index 2adc821..908bbf6 100644 --- a/interface/web/tools/lib/lang/de_usersettings.lng +++ b/interface/web/tools/lib/lang/de_usersettings.lng @@ -3,6 +3,10 @@ $wb['language_txt'] = 'Sprache'; $wb['password_mismatch'] = 'Die Passwörter stimmen nicht überein.'; $wb['password_strength_txt'] = 'Passwortkomplexität'; -$wb['Form to edit the user password and language.'] = 'Formular um das Benutzerpasswort und die Sprache zu bearbeiten.'; +$wb['Form to edit the user password and language.'] = 'Formular, um das Benutzerpasswort und die Sprache zu bearbeiten.'; $wb['Settings'] = 'Einstellungen'; +$wb['generate_password_txt'] = 'Passwort erzeugen'; +$wb['repeat_password_txt'] = 'Passwort wiederholen'; +$wb['password_mismatch_txt'] = 'Die Passwörter stimmen nicht überein.'; +$wb['password_match_txt'] = 'Die Passwörter stimmen überein.'; ?> -- Gitblit v1.9.1