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, master has been updated
via 9f6e5c768ee27f986b303f91dd42d07bc0ce4c56 (commit)
via ee79343e3bb337b27a9613625aa909b38a77ce04 (commit)
from cf4dd3c01bd8ab20a43c24549e3191b1585fbd85 (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 9f6e5c768ee27f986b303f91dd42d07bc0ce4c56
Author: Jan Paul Tuecking <earl(a)ipfire.org>
Date: Sun Jun 13 02:26:52 2010 +0200
This fixes Bug #0000642 - clearer description for p2p-block buttons on outgoing firewall page.
commit ee79343e3bb337b27a9613625aa909b38a77ce04
Author: Jan Paul Tuecking <earl(a)ipfire.org>
Date: Sun Jun 13 01:06:19 2010 +0200
Removed not working tap device.
-----------------------------------------------------------------------
Summary of changes:
html/cgi-bin/outgoingfw.cgi | 6 +++---
html/cgi-bin/ovpnmain.cgi | 3 ++-
langs/de/cgi-bin/de.pl | 6 +++++-
langs/en/cgi-bin/en.pl | 6 +++++-
langs/es/cgi-bin/es.pl | 6 +++++-
langs/fr/cgi-bin/fr.pl | 6 +++++-
6 files changed, 25 insertions(+), 8 deletions(-)
Difference in files:
diff --git a/html/cgi-bin/outgoingfw.cgi b/html/cgi-bin/outgoingfw.cgi
index a9e8d92..6e27262 100644
--- 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' />
- <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' />
- <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
;
}
@@ -576,7 +576,7 @@ END
}
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();
diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi
index ecca6fa..fcaeb5c 100644
--- a/html/cgi-bin/ovpnmain.cgi
+++ b/html/cgi-bin/ovpnmain.cgi
@@ -2668,7 +2668,8 @@ END
<td class='boldbase' nowrap='nowrap' colspan='2'>$Lang::tr{'ovpn subnet'}<br /><input type='TEXT' name='DOVPN_SUBNET' value='$cgiparams{'DOVPN_SUBNET'}' size='30' /></td></tr>
<tr><td class='boldbase' nowrap='nowrap'>$Lang::tr{'ovpn device'}</td>
<td><select name='DDEVICE' ><option value='tun' $selected{'DDEVICE'}{'tun'}>TUN</option>
- <option value='tap' $selected{'DDEVICE'}{'tap'}>TAP</option></select></td>
+ <!-- this is still not working
+ <option value='tap' $selected{'DDEVICE'}{'tap'}>TAP</option></select>--> </td>
<tr><td class='boldbase' nowrap='nowrap'>$Lang::tr{'protocol'}</td>
<td><select name='DPROTOCOL'><option value='udp' $selected{'DPROTOCOL'}{'udp'}>UDP</option>
<option value='tcp' $selected{'DPROTOCOL'}{'tcp'}>TCP</option></select></td>
diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index 3d77681..fd075ad 100644
--- 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 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',
diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index e5390a5..dab1b94 100644
--- 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 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',
diff --git a/langs/es/cgi-bin/es.pl b/langs/es/cgi-bin/es.pl
index e5390a5..dab1b94 100644
--- 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 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',
diff --git a/langs/fr/cgi-bin/fr.pl b/langs/fr/cgi-bin/fr.pl
index 60a5ca0..7c8c4f7 100644
--- 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 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',
hooks/post-receive
--
IPFire 2.x development tree