gettext() fixes on interfaces_bridge.php
Merge remote branch 'mainline/master'
Conflicts: usr/local/www/diag_smart.php usr/local/www/firewall_rules_edit.php usr/local/www/interfaces.php usr/local/www/load_balancer_pool_edit.php usr/local/www/pkg_mgr_settings.php
Use
Small logic fixes, gettext fixes and make php -l happy
gettext fixes
Merge branch 'master' of rcs.pfsense.org:pfsense/pfsense-gettext
gettext() fixes on pkg_mgr_settings.php
Make php -l happy renaming local function getHostName to _getHostName
View revisions
Also available in: Atom