From: Alexander Marx <amarx@ipfire.org>
Date: Sat, 11 Jan 2014 04:51:44 +0000 (+0100)
Subject: language changes in Menu and on statuspage (index.cgi)
X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=commitdiff_plain;h=f536ab266173dd7d6ec5ddd984e0a458c1aedbc2

language changes in Menu and on statuspage (index.cgi)
---

diff --git a/config/menu/40-services.menu b/config/menu/40-services.menu
index 9901e8f3f..2f4d96e73 100644
--- a/config/menu/40-services.menu
+++ b/config/menu/40-services.menu
@@ -1,5 +1,5 @@
     $subservices->{'10.ipsec'} = {
-				'caption' => 'IPSec',
+				'caption' => $Lang::tr{'ipsec'},
 			     	'uri' => '/cgi-bin/vpnmain.cgi',
 			     	'title' => "$Lang::tr{'virtual private networking'}",
 			     	'enabled' => 1,
diff --git a/config/menu/50-firewall.menu b/config/menu/50-firewall.menu
index 8bc66f912..ce6fd9d8d 100644
--- a/config/menu/50-firewall.menu
+++ b/config/menu/50-firewall.menu
@@ -17,7 +17,7 @@
 				'enabled' => 1,
 				};
 	$subfirewall->{'40.p2p'} = {
-				'caption' => 'P2P-Block',
+				'caption' => $Lang::tr{'p2p block'},
 				'uri' => '/cgi-bin/p2p-block.cgi',
 				'title' => "P2P-Block",
 				'enabled' => 1,
diff --git a/html/cgi-bin/index.cgi b/html/cgi-bin/index.cgi
index 5143e5e14..b3a262994 100644
--- a/html/cgi-bin/index.cgi
+++ b/html/cgi-bin/index.cgi
@@ -286,7 +286,7 @@ if ( `cat /var/ipfire/vpn/settings | grep ^ENABLED=on` ||
 	$haveipsec=1;
 	my $ipsecip = `cat /var/ipfire/vpn/settings | grep ^VPN_IP= | cut -c 8-`;
 print<<END;
-		<tr><td align='center' bgcolor='$Header::colourvpn' width='25%'><a href="/cgi-bin/vpnmain.cgi"><font size='2' color='white'><b>$Lang::tr{'vpn'}</b></font></a><br>
+		<tr><td align='center' bgcolor='$Header::colourvpn' width='25%'><a href="/cgi-bin/vpnmain.cgi"><font size='2' color='white'><b>$Lang::tr{'ipsec'}</b></font></a><br>
 		<td width='30%' align='center'>$ipsecip
 		<td width='45%' align='center'><font color=$Header::colourgreen>Online</font>
 END
diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index 3671c5276..37c02af39 100644
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -1269,9 +1269,10 @@
 'ipfire side is invalid' => 'IPFire Seite ist ungültig.',
 'ipfires hostname' => 'IPFire\'s Hostname',
 'ipinfo' => 'IP-Info',
-'ipsec network' => 'IPsec-Netzwerke',
 'iptable rules' => 'IPTable-Regeln',
 'iptmangles' => 'IPTable Mangles',
+'ipsec' => 'IPsec',
+'ipsec network' => 'IPsec-Netzwerke',
 'iptnats' => 'IPTable Network Address Translation',
 'ipts' => 'iptables',
 'isdn' => 'ISDN',
@@ -1627,7 +1628,7 @@
 'ovpn_processprioVH' => 'Sehr Hoch',
 'ovpnstatus log' => 'OVPN-Status-Log',
 'ovpnsys log' => 'OVPN-System-Log',
-'p2p block' => 'P2P-Block',
+'p2p block' => 'P2P-Netzwerke',
 'p2p block save notice' => 'Bitte lesen Sie die Firewallregeln neu ein, damit die Änderungen aktiv werden.',
 'package failed to install' => 'Programmpaket konnte nicht installiert werden.',
 'pagerefresh' => 'Seite wird aktualisiert. Bitte warten.',
diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index f04a17e76..5e47e5c2a 100644
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -1298,6 +1298,7 @@
 'ipfire side is invalid' => 'IPFire side is invalid.',
 'ipfires hostname' => 'IPFire\'s Hostname',
 'ipinfo' => 'IP info',
+'ipsec' => 'IPsec',
 'ipsec network' => 'IPsec network',
 'iptable rules' => 'IPTable rules',
 'iptmangles' => 'IPTable Mangles',
@@ -1657,7 +1658,7 @@
 'ovpn_processprioVH' => 'Very high',
 'ovpnstatus log' => 'OVPN-Status-Log',
 'ovpnsys log' => 'OVPN-System-Log',
-'p2p block' => 'P2P block',
+'p2p block' => 'P2P networks',
 'p2p block save notice' => 'Please reload the firewall ruleset in order to apply your changes.',
 'package failed to install' => 'Package failed to install.',
 'pagerefresh' => 'Page is beeing refreshed, please wait.',