From 57a9f3747b06d5fb9f0ba41beaa005b844067189 Mon Sep 17 00:00:00 2001 From: "Michael Kaufmann (d00p)" Date: Thu, 13 Feb 2014 12:06:07 +0100 Subject: [PATCH] fix incorrect description text of ip/port add/edit, thx to Sephi and Thomas Signed-off-by: Michael Kaufmann (d00p) --- .../admin/ipsandports/formfield.ipsandports_add.php | 2 +- .../admin/ipsandports/formfield.ipsandports_edit.php | 2 +- lng/english.lng.php | 3 ++- lng/german.lng.php | 5 +++-- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/lib/formfields/admin/ipsandports/formfield.ipsandports_add.php b/lib/formfields/admin/ipsandports/formfield.ipsandports_add.php index 98e82d0f..5d4fbcec 100644 --- a/lib/formfields/admin/ipsandports/formfield.ipsandports_add.php +++ b/lib/formfields/admin/ipsandports/formfield.ipsandports_add.php @@ -93,7 +93,7 @@ return array( 'default_vhostconf_domain' => array( 'style' => 'vertical-align:top;', 'label' => $lng['admin']['ipsandports']['default_vhostconf_domain'], - 'desc' => $lng['serversettings']['default_vhostconf']['description'], + 'desc' => $lng['serversettings']['default_vhostconf_domain']['description'], 'type' => 'textarea', 'cols' => 60, 'rows' => 12 diff --git a/lib/formfields/admin/ipsandports/formfield.ipsandports_edit.php b/lib/formfields/admin/ipsandports/formfield.ipsandports_edit.php index c850bafd..56d73c19 100644 --- a/lib/formfields/admin/ipsandports/formfield.ipsandports_edit.php +++ b/lib/formfields/admin/ipsandports/formfield.ipsandports_edit.php @@ -97,7 +97,7 @@ return array( 'default_vhostconf_domain' => array( 'style' => 'vertical-align:top;', 'label' => $lng['admin']['ipsandports']['default_vhostconf_domain'], - 'desc' => $lng['serversettings']['default_vhostconf']['description'], + 'desc' => $lng['serversettings']['default_vhostconf_domain']['description'], 'type' => 'textarea', 'cols' => 60, 'rows' => 12, diff --git a/lng/english.lng.php b/lng/english.lng.php index 15571b41..2c8050e4 100644 --- a/lng/english.lng.php +++ b/lng/english.lng.php @@ -782,7 +782,8 @@ $lng['message']['noreceipients'] = 'No e-mail has been sent because there are no $lng['admin']['sslsettings'] = 'SSL settings'; $lng['cronjobs']['notyetrun'] = 'Not yet run'; $lng['serversettings']['default_vhostconf']['title'] = 'Default vHost-settings'; -$lng['serversettings']['default_vhostconf']['description'] = 'The content of this field will be included into the domain vHost container directly. Attention: The code won\'t be checked for any errors. If it contains errors, webserver might not start again!'; +$lng['serversettings']['default_vhostconf']['description'] = 'The content of this field will be included into this ip/port vHost container directly. Attention: The code won\'t be checked for any errors. If it contains errors, webserver might not start again!'; +$lng['serversettings']['default_vhostconf_domain']['description'] = 'The content of this field will be included into the domain vHost container directly. Attention: The code won\'t be checked for any errors. If it contains errors, webserver might not start again!'; $lng['error']['invalidip'] = 'Invalid IP address: %s'; $lng['serversettings']['decimal_places'] = 'Number of decimal places in traffic/webspace output'; diff --git a/lng/german.lng.php b/lng/german.lng.php index 7ca6ea22..dee643a2 100644 --- a/lng/german.lng.php +++ b/lng/german.lng.php @@ -781,7 +781,8 @@ $lng['message']['noreceipients'] = 'Es wurde keine E-Mail versendet da sich kein $lng['admin']['sslsettings'] = 'SSL Einstellungen'; $lng['cronjobs']['notyetrun'] = 'Bisher nicht gestartet'; $lng['serversettings']['default_vhostconf']['title'] = 'Standard Vhost-Einstellungen'; -$lng['serversettings']['default_vhostconf']['description'] = 'Der Inhalt dieses Feldes wird direkt in jeden Domain-vHost-Container übernommen. Achtung: Der Code wird nicht auf Fehler geprüft. Etwaige Fehler werden also auch übernommen. Der Webserver könnte nicht mehr starten!'; +$lng['serversettings']['default_vhostconf']['description'] = 'Der Inhalt dieses Feldes wird direkt in den IP/Port vHost-Container übernommen. Achtung: Der Code wird nicht auf Fehler geprüft. Etwaige Fehler werden also auch übernommen. Der Webserver könnte nicht mehr starten!'; +$lng['serversettings']['default_vhostconf_domain']['description'] = 'Der Inhalt dieses Feldes wird direkt in jeden Domain-vHost-Container übernommen. Achtung: Der Code wird nicht auf Fehler geprüft. Etwaige Fehler werden also auch übernommen. Der Webserver könnte nicht mehr starten!'; $lng['error']['invalidip'] = 'Ungültige IP Adresse: "%s"'; $lng['serversettings']['decimal_places'] = 'Nachkommastellen bei der Ausgabe von Traffic/Webspace'; @@ -1126,7 +1127,7 @@ $lng['admin']['ipsandports']['webserverdomainconfig'] = 'Webserver-Domain-Konfig $lng['admin']['ipsandports']['webserverssldomainconfig'] = 'Webserver-SSL-Konfiguration'; $lng['admin']['ipsandports']['ssl_key_file'] = 'Pfad zu der SSL-Schlüsseldatei'; $lng['admin']['ipsandports']['ssl_ca_file'] = 'Pfad zu dem SSL-CA-Zertifikat'; -$lng['admin']['ipsandports']['default_vhostconf_domain'] = 'Standard vHost - Einstellungen für jeden Domain - Kontainer'; +$lng['admin']['ipsandports']['default_vhostconf_domain'] = 'Standard vHost - Einstellungen für jeden Domain - Container'; $lng['serversettings']['ssl']['ssl_key_file']['title'] = 'Pfad zum SSL Private-key'; $lng['serversettings']['ssl']['ssl_key_file']['description'] = 'Geben Sie den Pfad inklusive Dateinamen der Schlüssel-Datei an (der private-key, meist .key).'; $lng['serversettings']['ssl']['ssl_ca_file']['title'] = 'Pfad zu dem SSL-CA-Zertifikat (optional)';