This fixes Bug #0000642 - clearer description for p2p-block buttons on outgoing firew...

diff --git a/html/cgi-bin/outgoingfw.cgi b/html/cgi-bin/outgoingfw.cgi
index a9e8d92d8df9c7384d5b9cf0242648b5c86f9f3d..6e27262abec66da356a5d240a44c14eac10e146e 100644 (file)
--- a/html/cgi-bin/outgoingfw.cgi
+++ b/html/cgi-bin/outgoingfw.cgi
@@ -559,13 +559,13 @@ END
                if ($p2pline[2] eq 'on') {
                        print <<END
                                <input type='hidden' name='ACTION' value='disable' />
                if ($p2pline[2] eq 'on') {
                        print <<END
                                <input type='hidden' name='ACTION' value='disable' />

-                               <input type='image' name='submit' src='/images/stock_ok.png' alt='' />
+                               <input type='image' name='submit' src='/images/stock_ok.png' alt='$Lang::tr{'outgoingfw p2p allow'}' title='$Lang::tr{'outgoingfw p2p allow'}'/>

 END
 ;
                } else {
                        print <<END
                                <input type='hidden' name='ACTION' value='enable' />
 END
 ;
                } else {
                        print <<END
                                <input type='hidden' name='ACTION' value='enable' />

-                               <input type='image' name='submit' src='/images/stock_stop.png' alt='' />
+                               <input type='image' name='submit' src='/images/stock_stop.png' alt='$Lang::tr{'outgoingfw p2p deny'}' title='$Lang::tr{'outgoingfw p2p deny'}' />

 END
 ;
                }
 END
 ;
                }


@@ -576,7 +576,7 @@ END
        }
        print <<END
        </table>
        }
        print <<END
        </table>

-  <br />$Lang::tr{'outgoingfw p2p description'}
+  <br />$Lang::tr{'outgoingfw p2p description 1'} <img src='/images/stock_ok.png' align='absmiddle' alt='$Lang::tr{'outgoingfw p2p deny'}'> $Lang::tr{'outgoingfw p2p description 2'} <img src='/images/stock_stop.png' align='absmiddle' alt='$Lang::tr{'outgoingfw p2p deny'}'> $Lang::tr{'outgoingfw p2p description 3'}

 END
 ;
        &Header::closebox();
 END
 ;
        &Header::closebox();

diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index 3d776814f49a6c7d55e83a765164c491ffef1d2f..fd075ad2bc0a4c2050f29a8d8273c2817d65fd74 100644 (file)
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -1277,7 +1277,11 @@
 'outgoingfw mode0' => 'In diesem Modus ist es allen Rechnern im Netzwerk uneingeschränkt möglich Verbindungen ins Internet aufzubauen.',
 'outgoingfw mode1' => 'In diesem Modus werden nur Verbindungen nach den oben definierten Regeln zugelassen.',
 'outgoingfw mode2' => 'In diesem Modus werden sämtliche Verbindungen erlaubt, bis auf die oben definierten Block-Regeln.',
 'outgoingfw mode0' => 'In diesem Modus ist es allen Rechnern im Netzwerk uneingeschränkt möglich Verbindungen ins Internet aufzubauen.',
 'outgoingfw mode1' => 'In diesem Modus werden nur Verbindungen nach den oben definierten Regeln zugelassen.',
 'outgoingfw mode2' => 'In diesem Modus werden sämtliche Verbindungen erlaubt, bis auf die oben definierten Block-Regeln.',

-'outgoingfw p2p description' => 'Klicken Sie auf die Symbole um das entsprechende iptables P2P-Blockmodul zu (de-)aktivieren.',
+'outgoingfw p2p description 1' => 'Das Symbole',
+'outgoingfw p2p description 2' => 'bedeutet das, dass P2P-Protokoll erlaubt wird oder',
+'outgoingfw p2p description 3' => 'das, dass P2P-Protokoll gesperrt wird.',
+'outgoingfw p2p deny' => 'P2P-Protokoll ist gesperrt!',
+'outgoingfw p2p allow' => 'P2P-Protokoll ist erlaubt!',

 'outgoingfw reset' => 'Alle Regeln löschen',
 'override mtu' => 'Überschreibe Standard MTU',
 'ovpn' => 'OpenVPN',
 'outgoingfw reset' => 'Alle Regeln löschen',
 'override mtu' => 'Überschreibe Standard MTU',
 'ovpn' => 'OpenVPN',

diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index e5390a52eedb6ce2ae230230c39c435fd25cd3bf..dab1b943eddb87682dc32ebbd369c0da02df6f5b 100644 (file)
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -1306,7 +1306,11 @@
 'outgoingfw mode0' => 'Using this mode, all clients are able to access the internet without any restrictions.',
 'outgoingfw mode1' => 'Using this mode, only connections based on the defined rules are allowed.',
 'outgoingfw mode2' => 'Using this mode, all connections are allowed despited off the defined ones.',
 'outgoingfw mode0' => 'Using this mode, all clients are able to access the internet without any restrictions.',
 'outgoingfw mode1' => 'Using this mode, only connections based on the defined rules are allowed.',
 'outgoingfw mode2' => 'Using this mode, all connections are allowed despited off the defined ones.',

-'outgoingfw p2p description' => 'Press the corresponding button to enable/disable the iptables p2p block modul.',
+'outgoingfw p2p description 1' => 'The button',
+'outgoingfw p2p description 2' => 'means that the p2p protocol is allowed or',
+'outgoingfw p2p description 3' => 'that the p2p protocol is denied.',
+'outgoingfw p2p deny' => 'p2p protocol is denied',
+'outgoingfw p2p allow' => 'p2p protocol is allowed',

 'outgoingfw reset' => 'Reset all',
 'override mtu' => 'Override default MTU',
 'ovpn' => 'OpenVPN',
 'outgoingfw reset' => 'Reset all',
 'override mtu' => 'Override default MTU',
 'ovpn' => 'OpenVPN',

diff --git a/langs/es/cgi-bin/es.pl b/langs/es/cgi-bin/es.pl
index e5390a52eedb6ce2ae230230c39c435fd25cd3bf..dab1b943eddb87682dc32ebbd369c0da02df6f5b 100644 (file)
--- a/langs/es/cgi-bin/es.pl
+++ b/langs/es/cgi-bin/es.pl
@@ -1306,7 +1306,11 @@
 'outgoingfw mode0' => 'Using this mode, all clients are able to access the internet without any restrictions.',
 'outgoingfw mode1' => 'Using this mode, only connections based on the defined rules are allowed.',
 'outgoingfw mode2' => 'Using this mode, all connections are allowed despited off the defined ones.',
 'outgoingfw mode0' => 'Using this mode, all clients are able to access the internet without any restrictions.',
 'outgoingfw mode1' => 'Using this mode, only connections based on the defined rules are allowed.',
 'outgoingfw mode2' => 'Using this mode, all connections are allowed despited off the defined ones.',

-'outgoingfw p2p description' => 'Press the corresponding button to enable/disable the iptables p2p block modul.',
+'outgoingfw p2p description 1' => 'The button',
+'outgoingfw p2p description 2' => 'means that the p2p protocol is allowed or',
+'outgoingfw p2p description 3' => 'that the p2p protocol is denied.',
+'outgoingfw p2p deny' => 'p2p protocol is denied',
+'outgoingfw p2p allow' => 'p2p protocol is allowed',

 'outgoingfw reset' => 'Reset all',
 'override mtu' => 'Override default MTU',
 'ovpn' => 'OpenVPN',
 'outgoingfw reset' => 'Reset all',
 'override mtu' => 'Override default MTU',
 'ovpn' => 'OpenVPN',

diff --git a/langs/fr/cgi-bin/fr.pl b/langs/fr/cgi-bin/fr.pl
index 60a5ca0cc5671b603358e959378e8739a5581951..7c8c4f714661aa88ddb289841e2cab9156fdb636 100644 (file)
--- a/langs/fr/cgi-bin/fr.pl
+++ b/langs/fr/cgi-bin/fr.pl
@@ -1306,7 +1306,11 @@
 'outgoingfw mode0' => 'Using this mode, all clients are able to access the internet without any restrictions.',
 'outgoingfw mode1' => 'Using this mode, only connections based on the defined rules are allowed.',
 'outgoingfw mode2' => 'Using this mode, all connections are allowed despited off the defined ones.',
 'outgoingfw mode0' => 'Using this mode, all clients are able to access the internet without any restrictions.',
 'outgoingfw mode1' => 'Using this mode, only connections based on the defined rules are allowed.',
 'outgoingfw mode2' => 'Using this mode, all connections are allowed despited off the defined ones.',

-'outgoingfw p2p description' => 'Press the corresponding button to enable/disable the iptables p2p block modul.',
+'outgoingfw p2p description 1' => 'The button',
+'outgoingfw p2p description 2' => 'means that the p2p protocol is allowed or',
+'outgoingfw p2p description 3' => 'that the p2p protocol is denied.',
+'outgoingfw p2p deny' => 'p2p protocol is denied',
+'outgoingfw p2p allow' => 'p2p protocol is allowed',

 'outgoingfw reset' => 'Reset all',
 'override mtu' => 'Override default MTU',
 'ovpn' => 'OpenVPN',
 'outgoingfw reset' => 'Reset all',
 'override mtu' => 'Override default MTU',
 'ovpn' => 'OpenVPN',