[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 0d0df35ca260e5934f66ac79247dd9682f20795f - IPFire-SCM

20 Mar 2014

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  0d0df35ca260e5934f66ac79247dd9682f20795f (commit)
       via  95cda2592498ead2cc02364b6d9ea6522bd562a6 (commit)
      from  cec275c9dfd9f614c94f10c636bdbeba09427272 (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 0d0df35ca260e5934f66ac79247dd9682f20795f
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Thu Mar 20 23:07:26 2014 +0100
Update translations.
commit 95cda2592498ead2cc02364b6d9ea6522bd562a6
Author: Alexander Marx alexander.marx@ipfire.org
Date:   Thu Mar 20 16:23:47 2014 +0100
Firewall: DNAT - always show right red address in dropdown.
Edited language String in DNAT area: external ip address is now Firewall
    Interface
-----------------------------------------------------------------------
Summary of changes:
 doc/language_issues.de    |  4 ++++
 doc/language_issues.en    |  4 ++++
 doc/language_issues.es    | 10 +++++++++-
 doc/language_issues.fr    | 10 +++++++++-
 doc/language_issues.nl    | 10 +++++++++-
 doc/language_issues.pl    | 10 +++++++++-
 doc/language_issues.ru    | 10 +++++++++-
 doc/language_issues.tr    | 10 ++++++++++
 doc/language_missings     | 24 ++++++++++++++++++++++++
 html/cgi-bin/firewall.cgi |  4 +++-
 langs/de/cgi-bin/de.pl    |  4 ++--
 langs/en/cgi-bin/en.pl    |  4 ++--
 12 files changed, 94 insertions(+), 10 deletions(-)
Difference in files:

diff --git a/doc/language_issues.de b/doc/language_issues.de
index 94cf2ce..d501b71 100644
--- a/doc/language_issues.de
+++ b/doc/language_issues.de
@@ -58,6 +58,7 @@ WARNING: translation string unused: alt vpn
 WARNING: translation string unused: and
 WARNING: translation string unused: apply
 WARNING: translation string unused: archive not exist
+WARNING: translation string unused: attemps
 WARNING: translation string unused: available updates
 WARNING: translation string unused: backup config floppy
 WARNING: translation string unused: backup configuration
@@ -118,6 +119,7 @@ WARNING: translation string unused: ddns help freedns
 WARNING: translation string unused: ddns help plus
 WARNING: translation string unused: debugme
 WARNING: translation string unused: deep scan directories
+WARNING: translation string unused: default ip
 WARNING: translation string unused: default networks
 WARNING: translation string unused: default services
 WARNING: translation string unused: description
@@ -134,6 +136,7 @@ WARNING: translation string unused: dial user password
 WARNING: translation string unused: dial user password has been changed
 WARNING: translation string unused: dialup settings
 WARNING: translation string unused: disconnect
+WARNING: translation string unused: disconnects
 WARNING: translation string unused: display traffic at home
 WARNING: translation string unused: display webinterface effects
 WARNING: translation string unused: dmz pinhole configuration
@@ -528,6 +531,7 @@ WARNING: translation string unused: tor accounting period daily
 WARNING: translation string unused: tor accounting period monthly
 WARNING: translation string unused: tor accounting period weekly
 WARNING: translation string unused: tor exit country
+WARNING: translation string unused: total connection time
 WARNING: translation string unused: traffic back
 WARNING: translation string unused: traffic calc time
 WARNING: translation string unused: traffic calc time bad
diff --git a/doc/language_issues.en b/doc/language_issues.en
index b69be53..494780f 100644
--- a/doc/language_issues.en
+++ b/doc/language_issues.en
@@ -59,6 +59,7 @@ WARNING: translation string unused: and
 WARNING: translation string unused: ansi t1.483
 WARNING: translation string unused: apply
 WARNING: translation string unused: archive not exist
+WARNING: translation string unused: attemps
 WARNING: translation string unused: available updates
 WARNING: translation string unused: backup archive
 WARNING: translation string unused: backup clear archive
@@ -137,6 +138,7 @@ WARNING: translation string unused: ddns help freedns
 WARNING: translation string unused: ddns help plus
 WARNING: translation string unused: debugme
 WARNING: translation string unused: deep scan directories
+WARNING: translation string unused: default ip
 WARNING: translation string unused: default networks
 WARNING: translation string unused: default services
 WARNING: translation string unused: description
@@ -155,6 +157,7 @@ WARNING: translation string unused: dial user password
 WARNING: translation string unused: dial user password has been changed
 WARNING: translation string unused: dialup settings
 WARNING: translation string unused: disconnect
+WARNING: translation string unused: disconnects
 WARNING: translation string unused: display traffic at home
 WARNING: translation string unused: display webinterface effects
 WARNING: translation string unused: dmz pinhole configuration
@@ -560,6 +563,7 @@ WARNING: translation string unused: tor accounting period weekly
 WARNING: translation string unused: tor bridge enabled
 WARNING: translation string unused: tor errmsg invalid node id
 WARNING: translation string unused: tor exit country
+WARNING: translation string unused: total connection time
 WARNING: translation string unused: traffic back
 WARNING: translation string unused: traffic calc time
 WARNING: translation string unused: traffic calc time bad
diff --git a/doc/language_issues.es b/doc/language_issues.es
index 8ff311d..cf2fe52 100644
--- a/doc/language_issues.es
+++ b/doc/language_issues.es
@@ -54,6 +54,7 @@ WARNING: translation string unused: and
 WARNING: translation string unused: ansi t1.483
 WARNING: translation string unused: apply
 WARNING: translation string unused: archive not exist
+WARNING: translation string unused: attemps
 WARNING: translation string unused: available updates
 WARNING: translation string unused: backup archive
 WARNING: translation string unused: backup clear archive
@@ -148,6 +149,7 @@ WARNING: translation string unused: dial user password
 WARNING: translation string unused: dial user password has been changed
 WARNING: translation string unused: dialup settings
 WARNING: translation string unused: disconnect
+WARNING: translation string unused: disconnects
 WARNING: translation string unused: display traffic at home
 WARNING: translation string unused: display webinterface effects
 WARNING: translation string unused: dmz pinhole configuration
@@ -499,6 +501,7 @@ WARNING: translation string unused: to email adr
 WARNING: translation string unused: to install an update
 WARNING: translation string unused: to warn email bad
 WARNING: translation string unused: too long 80 char max
+WARNING: translation string unused: total connection time
 WARNING: translation string unused: traffic back
 WARNING: translation string unused: traffic calc time
 WARNING: translation string unused: traffic calc time bad
@@ -617,9 +620,13 @@ WARNING: untranslated string: ccd none
 WARNING: untranslated string: ccd routes
 WARNING: untranslated string: ccd subnet
 WARNING: untranslated string: ccd used
+WARNING: untranslated string: count
+WARNING: untranslated string: countries
+WARNING: untranslated string: country codes and flags
+WARNING: untranslated string: countrycode
 WARNING: untranslated string: dead peer detection
-WARNING: untranslated string: default ip
 WARNING: untranslated string: deprecated fs warn
+WARNING: untranslated string: details
 WARNING: untranslated string: dnat address
 WARNING: untranslated string: dns servers
 WARNING: untranslated string: dnsforward
@@ -660,6 +667,7 @@ WARNING: untranslated string: fireinfo why read more
 WARNING: untranslated string: fireinfo your profile id
 WARNING: untranslated string: firewall rules
 WARNING: untranslated string: first
+WARNING: untranslated string: flag
 WARNING: untranslated string: fw default drop
 WARNING: untranslated string: fw settings
 WARNING: untranslated string: fw settings color
diff --git a/doc/language_issues.fr b/doc/language_issues.fr
index 69f260d..b3d9252 100644
--- a/doc/language_issues.fr
+++ b/doc/language_issues.fr
@@ -54,6 +54,7 @@ WARNING: translation string unused: and
 WARNING: translation string unused: ansi t1.483
 WARNING: translation string unused: apply
 WARNING: translation string unused: archive not exist
+WARNING: translation string unused: attemps
 WARNING: translation string unused: available updates
 WARNING: translation string unused: backup archive
 WARNING: translation string unused: backup clear archive
@@ -148,6 +149,7 @@ WARNING: translation string unused: dial user password
 WARNING: translation string unused: dial user password has been changed
 WARNING: translation string unused: dialup settings
 WARNING: translation string unused: disconnect
+WARNING: translation string unused: disconnects
 WARNING: translation string unused: display traffic at home
 WARNING: translation string unused: display webinterface effects
 WARNING: translation string unused: dmz pinhole configuration
@@ -510,6 +512,7 @@ WARNING: translation string unused: to email adr
 WARNING: translation string unused: to install an update
 WARNING: translation string unused: to warn email bad
 WARNING: translation string unused: too long 80 char max
+WARNING: translation string unused: total connection time
 WARNING: translation string unused: traffic back
 WARNING: translation string unused: traffic calc time
 WARNING: translation string unused: traffic calc time bad
@@ -627,9 +630,13 @@ WARNING: untranslated string: ccd none
 WARNING: untranslated string: ccd routes
 WARNING: untranslated string: ccd subnet
 WARNING: untranslated string: ccd used
+WARNING: untranslated string: count
+WARNING: untranslated string: countries
+WARNING: untranslated string: country codes and flags
+WARNING: untranslated string: countrycode
 WARNING: untranslated string: dead peer detection
-WARNING: untranslated string: default ip
 WARNING: untranslated string: deprecated fs warn
+WARNING: untranslated string: details
 WARNING: untranslated string: dnat address
 WARNING: untranslated string: dns address deleted txt
 WARNING: untranslated string: dns servers
@@ -671,6 +678,7 @@ WARNING: untranslated string: fireinfo why read more
 WARNING: untranslated string: fireinfo your profile id
 WARNING: untranslated string: firewall rules
 WARNING: untranslated string: first
+WARNING: untranslated string: flag
 WARNING: untranslated string: fw default drop
 WARNING: untranslated string: fw settings
 WARNING: untranslated string: fw settings color
diff --git a/doc/language_issues.nl b/doc/language_issues.nl
index 59c9ecb..9b20840 100644
--- a/doc/language_issues.nl
+++ b/doc/language_issues.nl
@@ -54,6 +54,7 @@ WARNING: translation string unused: and
 WARNING: translation string unused: ansi t1.483
 WARNING: translation string unused: apply
 WARNING: translation string unused: archive not exist
+WARNING: translation string unused: attemps
 WARNING: translation string unused: available updates
 WARNING: translation string unused: backup archive
 WARNING: translation string unused: backup clear archive
@@ -150,6 +151,7 @@ WARNING: translation string unused: dial user password
 WARNING: translation string unused: dial user password has been changed
 WARNING: translation string unused: dialup settings
 WARNING: translation string unused: disconnect
+WARNING: translation string unused: disconnects
 WARNING: translation string unused: display traffic at home
 WARNING: translation string unused: display webinterface effects
 WARNING: translation string unused: dmz pinhole configuration
@@ -515,6 +517,7 @@ WARNING: translation string unused: to email adr
 WARNING: translation string unused: to install an update
 WARNING: translation string unused: to warn email bad
 WARNING: translation string unused: too long 80 char max
+WARNING: translation string unused: total connection time
 WARNING: translation string unused: traffic back
 WARNING: translation string unused: traffic calc time
 WARNING: translation string unused: traffic calc time bad
@@ -594,8 +597,12 @@ WARNING: untranslated string: bytes
 WARNING: untranslated string: ccd err isipsecrw
 WARNING: untranslated string: ccd err isovpnn2n
 WARNING: untranslated string: ccd iroute2
+WARNING: untranslated string: count
+WARNING: untranslated string: countries
+WARNING: untranslated string: country codes and flags
+WARNING: untranslated string: countrycode
 WARNING: untranslated string: dead peer detection
-WARNING: untranslated string: default ip
+WARNING: untranslated string: details
 WARNING: untranslated string: dnat address
 WARNING: untranslated string: dns servers
 WARNING: untranslated string: dnsforward
@@ -618,6 +625,7 @@ WARNING: untranslated string: entropy
 WARNING: untranslated string: entropy graphs
 WARNING: untranslated string: firewall rules
 WARNING: untranslated string: first
+WARNING: untranslated string: flag
 WARNING: untranslated string: fw default drop
 WARNING: untranslated string: fw settings
 WARNING: untranslated string: fw settings color
diff --git a/doc/language_issues.pl b/doc/language_issues.pl
index 8ff311d..cf2fe52 100644
--- a/doc/language_issues.pl
+++ b/doc/language_issues.pl
@@ -54,6 +54,7 @@ WARNING: translation string unused: and
 WARNING: translation string unused: ansi t1.483
 WARNING: translation string unused: apply
 WARNING: translation string unused: archive not exist
+WARNING: translation string unused: attemps
 WARNING: translation string unused: available updates
 WARNING: translation string unused: backup archive
 WARNING: translation string unused: backup clear archive
@@ -148,6 +149,7 @@ WARNING: translation string unused: dial user password
 WARNING: translation string unused: dial user password has been changed
 WARNING: translation string unused: dialup settings
 WARNING: translation string unused: disconnect
+WARNING: translation string unused: disconnects
 WARNING: translation string unused: display traffic at home
 WARNING: translation string unused: display webinterface effects
 WARNING: translation string unused: dmz pinhole configuration
@@ -499,6 +501,7 @@ WARNING: translation string unused: to email adr
 WARNING: translation string unused: to install an update
 WARNING: translation string unused: to warn email bad
 WARNING: translation string unused: too long 80 char max
+WARNING: translation string unused: total connection time
 WARNING: translation string unused: traffic back
 WARNING: translation string unused: traffic calc time
 WARNING: translation string unused: traffic calc time bad
@@ -617,9 +620,13 @@ WARNING: untranslated string: ccd none
 WARNING: untranslated string: ccd routes
 WARNING: untranslated string: ccd subnet
 WARNING: untranslated string: ccd used
+WARNING: untranslated string: count
+WARNING: untranslated string: countries
+WARNING: untranslated string: country codes and flags
+WARNING: untranslated string: countrycode
 WARNING: untranslated string: dead peer detection
-WARNING: untranslated string: default ip
 WARNING: untranslated string: deprecated fs warn
+WARNING: untranslated string: details
 WARNING: untranslated string: dnat address
 WARNING: untranslated string: dns servers
 WARNING: untranslated string: dnsforward
@@ -660,6 +667,7 @@ WARNING: untranslated string: fireinfo why read more
 WARNING: untranslated string: fireinfo your profile id
 WARNING: untranslated string: firewall rules
 WARNING: untranslated string: first
+WARNING: untranslated string: flag
 WARNING: untranslated string: fw default drop
 WARNING: untranslated string: fw settings
 WARNING: untranslated string: fw settings color
diff --git a/doc/language_issues.ru b/doc/language_issues.ru
index c7679b7..0c94fc6 100644
--- a/doc/language_issues.ru
+++ b/doc/language_issues.ru
@@ -54,6 +54,7 @@ WARNING: translation string unused: and
 WARNING: translation string unused: ansi t1.483
 WARNING: translation string unused: apply
 WARNING: translation string unused: archive not exist
+WARNING: translation string unused: attemps
 WARNING: translation string unused: available updates
 WARNING: translation string unused: backup archive
 WARNING: translation string unused: backup clear archive
@@ -147,6 +148,7 @@ WARNING: translation string unused: dial user password
 WARNING: translation string unused: dial user password has been changed
 WARNING: translation string unused: dialup settings
 WARNING: translation string unused: disconnect
+WARNING: translation string unused: disconnects
 WARNING: translation string unused: display traffic at home
 WARNING: translation string unused: display webinterface effects
 WARNING: translation string unused: dmz pinhole configuration
@@ -504,6 +506,7 @@ WARNING: translation string unused: to email adr
 WARNING: translation string unused: to install an update
 WARNING: translation string unused: to warn email bad
 WARNING: translation string unused: too long 80 char max
+WARNING: translation string unused: total connection time
 WARNING: translation string unused: traffic back
 WARNING: translation string unused: traffic calc time
 WARNING: translation string unused: traffic calc time bad
@@ -621,9 +624,13 @@ WARNING: untranslated string: ccd routes
 WARNING: untranslated string: ccd subnet
 WARNING: untranslated string: ccd used
 WARNING: untranslated string: community rules
+WARNING: untranslated string: count
+WARNING: untranslated string: countries
+WARNING: untranslated string: country codes and flags
+WARNING: untranslated string: countrycode
 WARNING: untranslated string: dead peer detection
-WARNING: untranslated string: default ip
 WARNING: untranslated string: deprecated fs warn
+WARNING: untranslated string: details
 WARNING: untranslated string: disk access per
 WARNING: untranslated string: dnat address
 WARNING: untranslated string: dns servers
@@ -655,6 +662,7 @@ WARNING: untranslated string: extrahd to root
 WARNING: untranslated string: extrahd you cant mount
 WARNING: untranslated string: firewall rules
 WARNING: untranslated string: first
+WARNING: untranslated string: flag
 WARNING: untranslated string: fw default drop
 WARNING: untranslated string: fw settings
 WARNING: untranslated string: fw settings color
diff --git a/doc/language_issues.tr b/doc/language_issues.tr
index 93da78a..c266510 100644
--- a/doc/language_issues.tr
+++ b/doc/language_issues.tr
@@ -59,6 +59,7 @@ WARNING: translation string unused: and
 WARNING: translation string unused: ansi t1.483
 WARNING: translation string unused: apply
 WARNING: translation string unused: archive not exist
+WARNING: translation string unused: attemps
 WARNING: translation string unused: available updates
 WARNING: translation string unused: backup archive
 WARNING: translation string unused: backup clear archive
@@ -137,6 +138,7 @@ WARNING: translation string unused: ddns help freedns
 WARNING: translation string unused: ddns help plus
 WARNING: translation string unused: debugme
 WARNING: translation string unused: deep scan directories
+WARNING: translation string unused: default ip
 WARNING: translation string unused: default networks
 WARNING: translation string unused: default services
 WARNING: translation string unused: description
@@ -155,6 +157,7 @@ WARNING: translation string unused: dial user password
 WARNING: translation string unused: dial user password has been changed
 WARNING: translation string unused: dialup settings
 WARNING: translation string unused: disconnect
+WARNING: translation string unused: disconnects
 WARNING: translation string unused: display traffic at home
 WARNING: translation string unused: display webinterface effects
 WARNING: translation string unused: dmz pinhole configuration
@@ -560,6 +563,7 @@ WARNING: translation string unused: tor accounting period weekly
 WARNING: translation string unused: tor bridge enabled
 WARNING: translation string unused: tor errmsg invalid node id
 WARNING: translation string unused: tor exit country
+WARNING: translation string unused: total connection time
 WARNING: translation string unused: traffic back
 WARNING: translation string unused: traffic calc time
 WARNING: translation string unused: traffic calc time bad
@@ -637,8 +641,14 @@ WARNING: untranslated string: Scan for Songs
 WARNING: untranslated string: bytes
 WARNING: untranslated string: ccd err isipsecrw
 WARNING: untranslated string: ccd err isovpnn2n
+WARNING: untranslated string: count
+WARNING: untranslated string: countries
+WARNING: untranslated string: country codes and flags
+WARNING: untranslated string: countrycode
+WARNING: untranslated string: details
 WARNING: untranslated string: drop outgoing
 WARNING: untranslated string: entropy graphs
+WARNING: untranslated string: flag
 WARNING: untranslated string: fwdfw warn1
 WARNING: untranslated string: fwhost err hostip
 WARNING: untranslated string: hardware support
diff --git a/doc/language_missings b/doc/language_missings
index 8e13c90..3c3d742 100644
--- a/doc/language_missings
+++ b/doc/language_missings
@@ -65,8 +65,13 @@
 < ccd routes
 < ccd subnet
 < ccd used
+< count
+< countries
+< countrycode
+< country codes and flags
 < default ip
 < deprecated fs warn
+< details
 < dnat address
 < dns address deleted txt
 < dnsforward
@@ -107,6 +112,7 @@
 < fireinfo your profile id
 < firewall rules
 < first
+< flag
 < forward firewall
 < fw default drop
 < fwdfw ACCEPT
@@ -519,8 +525,13 @@
 < ccd routes
 < ccd subnet
 < ccd used
+< count
+< countries
+< countrycode
+< country codes and flags
 < default ip
 < deprecated fs warn
+< details
 < dnat address
 < dnsforward
 < dnsforward add a new entry
@@ -560,6 +571,7 @@
 < fireinfo your profile id
 < firewall rules
 < first
+< flag
 < forward firewall
 < fw default drop
 < fwdfw ACCEPT
@@ -964,8 +976,13 @@
 < ccd routes
 < ccd subnet
 < ccd used
+< count
+< countries
+< countrycode
+< country codes and flags
 < default ip
 < deprecated fs warn
+< details
 < dnat address
 < dnsforward
 < dnsforward add a new entry
@@ -997,6 +1014,7 @@
 < extrahd you cant mount
 < firewall rules
 < first
+< flag
 < forward firewall
 < fw default drop
 < fwdfw ACCEPT
@@ -1386,9 +1404,14 @@
 < ccd routes
 < ccd subnet
 < ccd used
+< count
+< countries
+< countrycode
+< country codes and flags
 < day-graph
 < default ip
 < deprecated fs warn
+< details
 < disk access per
 < dnat address
 < dnsforward
@@ -1422,6 +1445,7 @@
 < extrahd you cant mount
 < firewall rules
 < first
+< flag
 < forward firewall
 < frequency
 < fw default drop
diff --git a/html/cgi-bin/firewall.cgi b/html/cgi-bin/firewall.cgi
index 59c4caa..436bdaf 100644
--- a/html/cgi-bin/firewall.cgi
+++ b/html/cgi-bin/firewall.cgi
@@ -1540,6 +1540,7 @@ sub newrule
    			$selected{'TIME_TO'}{$fwdfwsettings{'TIME_TO'}}			= 'selected';
    			$selected{'ipfire'}{$fwdfwsettings{$fwdfwsettings{'grp2'}}} ='selected';
    			$selected{'ipfire_src'}{$fwdfwsettings{$fwdfwsettings{'grp1'}}} ='selected';
+				$selected{'dnat'}{$fwdfwsettings{'dnat'}}				='selected';
    		}
    	}
    	$fwdfwsettings{'oldgrp1a'}=$fwdfwsettings{'grp1'};
@@ -1637,7 +1638,7 @@ END
    					<td width='30%'>
    						<select name='dnat' style='width: 100%;'>
    							<option value='AUTO' $selected{'dnat'}{'AUTO'}>- $Lang::tr{'automatic'} -</option>
-								<option value='Default IP' $selected{'dnat'}{'Default IP'}>$Lang::tr{'red1'} ($netsettings{'RED_ADDRESS'})</option>
+								<option value='Default IP' $selected{'dnat'}{'Default IP'}>$Lang::tr{'red1'} ($redip)</option>
 END
    	if (%aliases) {
    		foreach my $alias (sort keys %aliases) {
@@ -2551,6 +2552,7 @@ END
 END
    		#Is this a DNAT rule?
    		if ($$hash{$key}[31] eq 'dnat' && $$hash{$key}[28] eq 'ON'){
+				if ($$hash{$key}[29] eq 'Default IP'){$$hash{$key}[29]=$Lang::tr{'red1'};}
    			print "Firewall ($$hash{$key}[29])";
    			if($$hash{$key}[30] ne ''){
    				$$hash{$key}[30]=~ tr/|/,/;
diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index acb1bb4..267d175 100644
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -569,8 +569,8 @@
 'count' => 'Anzahl',
 'countries' => 'Länder',
 'country' => 'Land',
-'countrycode' => 'Kennung',
 'country codes and flags' => 'Länder und Länderkennungen',
+'countrycode' => 'Kennung',
 'cpu frequency per' => 'CPU-Frequenz pro',
 'cpu idle usage' => 'Leerlauf CPU-Nutzung',
 'cpu interrupt usage' => 'Interrupt CPU-Nutzung',
@@ -707,7 +707,7 @@
 'dmz pinhole rule added' => 'Regel für DMZ-Schlupfloch hinzugefügt; Starte DMZ-Schlupfloch neu',
 'dmz pinhole rule removed' => 'Regel für DMZ-Schlupfloch entfernt; Starte DMZ-Schlupfloch neu',
 'dmzpinholes for same net not necessary' => 'DMZ-Schlupflöcher werden im gleichen Netz nicht benötigt. Wählen Sie ein anderes Quell- oder Ziel-Netz.',
-'dnat address' => 'Externe IP-Adresse',
+'dnat address' => 'Firewall-Interface',
 'dns address deleted' => 'Erfolgreich gelöscht! ',
 'dns address deleted txt' => 'DNS Server Adressen wurden erfolgreich gelöscht. Änderungen werden jedoch erst nach einem Neustart oder einer Wiederverbindung übernommen.',
 'dns address done' => 'Die DNS-Server Adressen Einstellungen werden übernommen.',
diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index bedb949..64b6d19 100644
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -590,8 +590,8 @@
 'count' => 'Count',
 'countries' => 'Countries',
 'country' => 'Country',
-'countrycode' => 'Code',
 'country codes and flags' => 'Country Codes and Flags:',
+'countrycode' => 'Code',
 'cpu frequency per' => 'CPU frequency per',
 'cpu idle usage' => 'Idle CPU Usage',
 'cpu interrupt usage' => 'Interrupt CPU Usage',
@@ -731,7 +731,7 @@
 'dmz pinhole rule added' => 'DMZ pinhole rule added; restarting DMZ pinhole',
 'dmz pinhole rule removed' => 'DMZ pinhole rule removed; restarting DMZ pinhole',
 'dmzpinholes for same net not necessary' => 'DMZ Pinholes are not necessary for same net. Select different source or destination net.',
-'dnat address' => 'External IP address',
+'dnat address' => 'Firewall Interface',
 'dns address deleted' => 'Successfully deleted!',
 'dns address deleted txt' => 'The DNS-Server addresses have been successfully deleted.<br />You have to reboot or reconnect that the changes have effect!',
 'dns address done' => 'The DNS-Server address settings are going to be saved.',
hooks/post-receive
--
IPFire 2.x development tree

    