Fixed proxy label on index.cgi

Added apcusd status again.

diff --git a/html/cgi-bin/index.cgi b/html/cgi-bin/index.cgi
old mode 100644 (file)
new mode 100755 (executable)
index a1b0369..6a78baa
--- a/html/cgi-bin/index.cgi
+++ b/html/cgi-bin/index.cgi
@@ -314,9 +314,9 @@ END
                <td width='45%' align='center'>
 END
                if ( `cat /var/ipfire/proxy/advanced/settings | grep ^ENABLE=on` ) { 
-                       print "Proxy an"; 
+                       print $Lang::tr{'advproxy on'}; 
                        if ( `cat /var/ipfire/proxy/advanced/settings | grep ^TRANSPARENT=on` ) { print " (transparent)"; }
-               }       else { print "Proxy aus"; }
+               }       else { print $Lang::tr{'advproxy off'};  }
        }
        if ( $netsettings{'BLUE_DEV'} ) { print <<END;
                <tr><td align='center' bgcolor='$Header::colourblue' width='25%'><a href="/cgi-bin/wireless.cgi"><font size='2' color='white'><b>$Lang::tr{'wireless'}</b></font></a><br>
@@ -324,9 +324,9 @@ END
                <td width='45%' align='center'>
 END
                if ( `cat /var/ipfire/proxy/advanced/settings | grep ^ENABLE_BLUE=on` ) { 
-                       print "Proxy an"; 
+                       print $Lang::tr{'advproxy on'};  
                        if ( `cat /var/ipfire/proxy/advanced/settings | grep ^TRANSPARENT_BLUE=on` ) { print " (transparent)"; }
-               }       else { print "Proxy aus"; }
+               }       else { print $Lang::tr{'advproxy off'};  }
        }
        if ( $netsettings{'ORANGE_DEV'} ) { print <<END;
                <tr><td align='center' bgcolor='$Header::colourorange' width='25%'><a href="/cgi-bin/dmzholes.cgi"><font size='2' color='white'><b>$Lang::tr{'dmz'}</b></font></a><br>

diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index 17942107a2c7e05ef7489cfed17bed8dc0134122..536a59afd2a6fda1b0856ebe02cc3d4bbaa4c2a4 100644 (file)
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -313,6 +313,8 @@
 'advproxy visible hostname' => 'Sichtbarer Hostname',
 'advproxy web browser' => 'Web-Browser',
 'advproxy wednesday' => 'Mit',
+'advproxy on' => 'Proxy an',
+'advproxy off' => 'Proxy aus',
 'again' => 'Wiederholung:',
 'aktiv' => 'aktiv',
 'album' => 'Album',
@@ -336,6 +338,7 @@
 'alt system' => 'System',
 'alt vpn' => 'VPNs',
 'and' => 'Und',
+'apcupsd' => 'APC-UPS status',
 'apply' => 'Jetzt anwenden',
 'april' => 'April',
 'archive not exist' => 'Konfigurationsarchiv existiert nicht',
@@ -2056,7 +2059,6 @@
 'proxy admin password' => 'Cache Administrator Passwort',
 'proxy cachemgr' => 'Cachemanager aktivieren',
 'proxy reconfigure' => 'Speichern und Laden',
-'apcupsd' => 'APC-UPS Status',
 );
 
 #EOF

diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index 20baf0de574a09b132c3602aede5be2b2f2ef80c..d156316e2636b9c2d63e1e577f3f4797a3265b3b 100644 (file)
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -317,6 +317,8 @@
 'advproxy visible hostname' => 'Visible hostname',
 'advproxy web browser' => 'Web browser',
 'advproxy wednesday' => 'Wed',
+'advproxy on' => 'Proxy on',
+'advproxy off' => 'Proxy off',
 'again' => 'Again:',
 'aktiv' => 'Active',
 'album' => 'Album',
@@ -341,6 +343,7 @@
 'alt vpn' => 'VPNs',
 'and' => 'And',
 'ansi t1.483' => 'TO BE REMOVED',
+'apcupsd' => 'APC-UPS status',
 'apply' => 'Apply now',
 'april' => 'April',
 'archive not exist' => 'Configuration archive does not exist',