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

fix incorrect description text of ip/port add/edit, thx to Sephi and Thomas

Browse Source 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann (d00p)
2014-02-13 12:06:07 +01:00
parent 8d601a065e
commit 57a9f3747b
4 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/formfields/admin/ipsandports/formfield.ipsandports_add.php
View File

@@ -93,7 +93,7 @@ return array(
'default_vhostconf_domain' => array( 'default_vhostconf_domain' => array(
'style' => 'vertical-align:top;', 'style' => 'vertical-align:top;',
'label' => $lng['admin']['ipsandports']['default_vhostconf_domain'], 'label' => $lng['admin']['ipsandports']['default_vhostconf_domain'],
'desc' => $lng['serversettings']['default_vhostconf']['description'], 'desc' => $lng['serversettings']['default_vhostconf_domain']['description'],
'type' => 'textarea', 'type' => 'textarea',
'cols' => 60, 'cols' => 60,
'rows' => 12 'rows' => 12

2
lib/formfields/admin/ipsandports/formfield.ipsandports_edit.php
View File

@@ -97,7 +97,7 @@ return array(
'default_vhostconf_domain' => array( 'default_vhostconf_domain' => array(
'style' => 'vertical-align:top;', 'style' => 'vertical-align:top;',
'label' => $lng['admin']['ipsandports']['default_vhostconf_domain'], 'label' => $lng['admin']['ipsandports']['default_vhostconf_domain'],
'desc' => $lng['serversettings']['default_vhostconf']['description'], 'desc' => $lng['serversettings']['default_vhostconf_domain']['description'],
'type' => 'textarea', 'type' => 'textarea',
'cols' => 60, 'cols' => 60,
'rows' => 12, 'rows' => 12,

3
lng/english.lng.php
View File

@@ -782,7 +782,8 @@ $lng['message']['noreceipients'] = 'No e-mail has been sent because there are no
$lng['admin']['sslsettings'] = 'SSL settings'; $lng['admin']['sslsettings'] = 'SSL settings';
$lng['cronjobs']['notyetrun'] = 'Not yet run'; $lng['cronjobs']['notyetrun'] = 'Not yet run';
$lng['serversettings']['default_vhostconf']['title'] = 'Default vHost-settings'; $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['error']['invalidip'] = 'Invalid IP address: %s';
$lng['serversettings']['decimal_places'] = 'Number of decimal places in traffic/webspace output'; $lng['serversettings']['decimal_places'] = 'Number of decimal places in traffic/webspace output';

5
lng/german.lng.php
View File

@@ -781,7 +781,8 @@ $lng['message']['noreceipients'] = 'Es wurde keine E-Mail versendet da sich kein
$lng['admin']['sslsettings'] = 'SSL Einstellungen'; $lng['admin']['sslsettings'] = 'SSL Einstellungen';
$lng['cronjobs']['notyetrun'] = 'Bisher nicht gestartet'; $lng['cronjobs']['notyetrun'] = 'Bisher nicht gestartet';
$lng['serversettings']['default_vhostconf']['title'] = 'Standard Vhost-Einstellungen'; $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['error']['invalidip'] = 'Ungültige IP Adresse: "%s"';
$lng['serversettings']['decimal_places'] = 'Nachkommastellen bei der Ausgabe von Traffic/Webspace'; $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']['webserverssldomainconfig'] = 'Webserver-SSL-Konfiguration';
$lng['admin']['ipsandports']['ssl_key_file'] = 'Pfad zu der SSL-Schlüsseldatei'; $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']['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']['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_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)'; $lng['serversettings']['ssl']['ssl_ca_file']['title'] = 'Pfad zu dem SSL-CA-Zertifikat (optional)';