[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 317638e7534c995fd3866467fab17b057e28f76a
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".
The branch, next has been updated via 317638e7534c995fd3866467fab17b057e28f76a (commit) from 5e1ee0e6e688da9623c27e27574395fefe8a33e3 (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit 317638e7534c995fd3866467fab17b057e28f76a Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Feb 20 10:55:08 2014 +0100
index.cgi: Change display of DNS servers.
Add missing colon and put them into one column in the table.
-----------------------------------------------------------------------
Summary of changes: doc/language_issues.de | 1 + doc/language_issues.en | 1 + doc/language_issues.es | 2 ++ doc/language_issues.fr | 2 ++ doc/language_issues.nl | 2 ++ doc/language_issues.pl | 2 ++ doc/language_issues.ru | 2 ++ doc/language_issues.tr | 2 ++ doc/language_missings | 4 ++++ html/cgi-bin/index.cgi | 31 ++++++++++++++++--------------- langs/de/cgi-bin/de.pl | 3 ++- langs/en/cgi-bin/en.pl | 1 + 12 files changed, 37 insertions(+), 16 deletions(-)
Difference in files: diff --git a/doc/language_issues.de b/doc/language_issues.de index 11b6336..881d318 100644 --- a/doc/language_issues.de +++ b/doc/language_issues.de @@ -140,6 +140,7 @@ WARNING: translation string unused: dmz pinhole configuration WARNING: translation string unused: dmz pinhole rule added WARNING: translation string unused: dmz pinhole rule removed WARNING: translation string unused: dmzpinholes for same net not necessary +WARNING: translation string unused: dns server WARNING: translation string unused: do not log this port list WARNING: translation string unused: donation-link WARNING: translation string unused: driver diff --git a/doc/language_issues.en b/doc/language_issues.en index 017a2c4..611a0de 100644 --- a/doc/language_issues.en +++ b/doc/language_issues.en @@ -161,6 +161,7 @@ WARNING: translation string unused: dmz pinhole configuration WARNING: translation string unused: dmz pinhole rule added WARNING: translation string unused: dmz pinhole rule removed WARNING: translation string unused: dmzpinholes for same net not necessary +WARNING: translation string unused: dns server WARNING: translation string unused: do not log this port list WARNING: translation string unused: donation-link WARNING: translation string unused: done diff --git a/doc/language_issues.es b/doc/language_issues.es index 366af44..636b05f 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -154,6 +154,7 @@ WARNING: translation string unused: dmz pinhole configuration WARNING: translation string unused: dmz pinhole rule added WARNING: translation string unused: dmz pinhole rule removed WARNING: translation string unused: dmzpinholes for same net not necessary +WARNING: translation string unused: dns server WARNING: translation string unused: do not log this port list WARNING: translation string unused: donation-link WARNING: translation string unused: done @@ -618,6 +619,7 @@ WARNING: untranslated string: dead peer detection WARNING: untranslated string: default ip WARNING: untranslated string: deprecated fs warn WARNING: untranslated string: dnat address +WARNING: untranslated string: dns servers WARNING: untranslated string: dnsforward WARNING: untranslated string: dnsforward add a new entry WARNING: untranslated string: dnsforward configuration diff --git a/doc/language_issues.fr b/doc/language_issues.fr index 0560b2b..30cc1f1 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -154,6 +154,7 @@ WARNING: translation string unused: dmz pinhole configuration WARNING: translation string unused: dmz pinhole rule added WARNING: translation string unused: dmz pinhole rule removed WARNING: translation string unused: dmzpinholes for same net not necessary +WARNING: translation string unused: dns server WARNING: translation string unused: do not log this port list WARNING: translation string unused: donation-link WARNING: translation string unused: done @@ -629,6 +630,7 @@ WARNING: untranslated string: default ip WARNING: untranslated string: deprecated fs warn WARNING: untranslated string: dnat address WARNING: untranslated string: dns address deleted txt +WARNING: untranslated string: dns servers WARNING: untranslated string: dnsforward WARNING: untranslated string: dnsforward add a new entry WARNING: untranslated string: dnsforward configuration diff --git a/doc/language_issues.nl b/doc/language_issues.nl index 934c538..e04aae3 100644 --- a/doc/language_issues.nl +++ b/doc/language_issues.nl @@ -156,6 +156,7 @@ WARNING: translation string unused: dmz pinhole configuration WARNING: translation string unused: dmz pinhole rule added WARNING: translation string unused: dmz pinhole rule removed WARNING: translation string unused: dmzpinholes for same net not necessary +WARNING: translation string unused: dns server WARNING: translation string unused: do not log this port list WARNING: translation string unused: donation-link WARNING: translation string unused: done @@ -594,6 +595,7 @@ WARNING: untranslated string: ccd iroute2 WARNING: untranslated string: dead peer detection WARNING: untranslated string: default ip WARNING: untranslated string: dnat address +WARNING: untranslated string: dns servers WARNING: untranslated string: dnsforward WARNING: untranslated string: dnsforward add a new entry WARNING: untranslated string: dnsforward configuration diff --git a/doc/language_issues.pl b/doc/language_issues.pl index 366af44..636b05f 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -154,6 +154,7 @@ WARNING: translation string unused: dmz pinhole configuration WARNING: translation string unused: dmz pinhole rule added WARNING: translation string unused: dmz pinhole rule removed WARNING: translation string unused: dmzpinholes for same net not necessary +WARNING: translation string unused: dns server WARNING: translation string unused: do not log this port list WARNING: translation string unused: donation-link WARNING: translation string unused: done @@ -618,6 +619,7 @@ WARNING: untranslated string: dead peer detection WARNING: untranslated string: default ip WARNING: untranslated string: deprecated fs warn WARNING: untranslated string: dnat address +WARNING: untranslated string: dns servers WARNING: untranslated string: dnsforward WARNING: untranslated string: dnsforward add a new entry WARNING: untranslated string: dnsforward configuration diff --git a/doc/language_issues.ru b/doc/language_issues.ru index dff15bb..195ffc1 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -153,6 +153,7 @@ WARNING: translation string unused: dmz pinhole configuration WARNING: translation string unused: dmz pinhole rule added WARNING: translation string unused: dmz pinhole rule removed WARNING: translation string unused: dmzpinholes for same net not necessary +WARNING: translation string unused: dns server WARNING: translation string unused: do not log this port list WARNING: translation string unused: donation-link WARNING: translation string unused: done @@ -623,6 +624,7 @@ WARNING: untranslated string: default ip WARNING: untranslated string: deprecated fs warn WARNING: untranslated string: disk access per WARNING: untranslated string: dnat address +WARNING: untranslated string: dns servers WARNING: untranslated string: dnsforward WARNING: untranslated string: dnsforward add a new entry WARNING: untranslated string: dnsforward configuration diff --git a/doc/language_issues.tr b/doc/language_issues.tr index 620c787..3f27ba2 100644 --- a/doc/language_issues.tr +++ b/doc/language_issues.tr @@ -161,6 +161,7 @@ WARNING: translation string unused: dmz pinhole configuration WARNING: translation string unused: dmz pinhole rule added WARNING: translation string unused: dmz pinhole rule removed WARNING: translation string unused: dmzpinholes for same net not necessary +WARNING: translation string unused: dns server WARNING: translation string unused: do not log this port list WARNING: translation string unused: donation-link WARNING: translation string unused: done @@ -638,6 +639,7 @@ WARNING: untranslated string: bytes WARNING: untranslated string: dead peer detection WARNING: untranslated string: default ip WARNING: untranslated string: dnat address +WARNING: untranslated string: dns servers WARNING: untranslated string: dpd delay WARNING: untranslated string: dpd timeout WARNING: untranslated string: drop action diff --git a/doc/language_missings b/doc/language_missings index 1d57464..2ca9bf6 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -74,6 +74,7 @@ < dnsforward entries < dnsforward forward_server < dnsforward zone +< dns servers < dpd delay < dpd timeout < drop action @@ -516,6 +517,7 @@ < dnsforward entries < dnsforward forward_server < dnsforward zone +< dns servers < dpd delay < dpd timeout < drop action @@ -950,6 +952,7 @@ < dnsforward entries < dnsforward forward_server < dnsforward zone +< dns servers < dpd delay < dpd timeout < drop action @@ -1363,6 +1366,7 @@ < dnsforward entries < dnsforward forward_server < dnsforward zone +< dns servers < dpd delay < dpd timeout < drop action diff --git a/html/cgi-bin/index.cgi b/html/cgi-bin/index.cgi index 14eceac..ca98e72 100644 --- a/html/cgi-bin/index.cgi +++ b/html/cgi-bin/index.cgi @@ -190,28 +190,29 @@ END <tr><td><b>$Lang::tr{'gateway'}:</b><td align='center'>$GATEWAY</td><td></td></tr> END } - #Read DNS server 1 - open (DNS1, "<${General::swroot}/red/dns1"); - my $DNS1 = <DNS1>; - chomp($DNS1); - close DNS1; - #Read DNS server 2 - open (DNS2, "<${General::swroot}/red/dns2"); - my $DNS2 = <DNS2>; - chomp($DNS2); - close DNS2; + + my @dns_servers = (); + foreach my $f ("${General::swroot}/red/dns1", "${General::swroot}/red/dns2") { + open(DNS, "<$f"); + my $dns_server = <DNS>; + close(DNS); + + chomp($dns_server); + if ($dns_server) { + push(@dns_servers, $dns_server); + } + } + my $dns_servers_str = join(", ", @dns_servers);
print <<END; <tr> <td> - <b>$Lang::tr{'dns server'}</b> - </td> - <td align="center"> - $DNS1 + <b>$Lang::tr{'dns servers'}:</b> </td> <td align="center"> - $DNS2 + $dns_servers_str </td> + <td align="center"></td> </tr> </table> END diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index 6d49f27..4518f60 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -718,7 +718,8 @@ 'dns proxy server' => 'DNS-Proxyserver', 'dns saved' => 'Erfolgreich gespeichert!', 'dns saved txt' => 'Die beiden eingegebenen DNS-Server-Adressen wurde erfolgreich gespeichert.<br/>Um die Änderung wirksam zu machen, müssen Sie neustarten oder wiederverbinden!', -'dns server' => 'DNS Server', +'dns server' => 'DNS-Server', +'dns servers' => 'DNS-Server', 'dns title' => 'Domain Name System', 'dnsforward' => 'DNS-Weiterleitung', 'dnsforward add a new entry' => 'Neuen Eintrag hinzufügen', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index a5e4388..921e1b1 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -743,6 +743,7 @@ 'dns saved' => 'Successfully saved!', 'dns saved txt' => 'The two entered DNS server addresses have been saved successfully.<br />You have to reboot or reconnect that the changes have effect!', 'dns server' => 'DNS Server', +'dns servers' => 'DNS Servers', 'dns title' => 'Domain Name System', 'dnsforward' => 'DNS Forwarding', 'dnsforward add a new entry' => 'Add a new entry',
hooks/post-receive -- IPFire 2.x development tree
-
git＠ipfire.org