Resolved differences from svn merge to trunk and git master

Marius Cramer

2013-10-18 bd68aae78a5d696e4ccb9c0d267486c283a6d9d2

 interface/web/admin/lib/lang/it_firewall_list.lng

@@ -1,8 +1,8 @@
<?php
$wb['list_head_txt'] = 'Firewall';
$wb['active_txt'] = 'Active';
$wb['active_txt'] = 'Attivo';
$wb['server_id_txt'] = 'Server';
$wb['tcp_port_txt'] = 'Open TCP ports';
$wb['udp_port_txt'] = 'Open UDP ports';
$wb['add_new_record_txt'] = 'Add Firewall record';
$wb['tcp_port_txt'] = 'Porte TCP aperte';
$wb['udp_port_txt'] = 'Porte UDP aperte';
$wb['add_new_record_txt'] = 'Aggiungi regola firewall';
?>