pfSense

Small logic fixes, gettext fixes and make php -l happy

gettext fixes

Merge branch 'master' of rcs.pfsense.org:pfsense/pfsense-gettext

Use

gettext() fixes on pkg_mgr_settings.php

Make php -l happy renaming local function getHostName to _getHostName

Use

Use

gettext() fixes on load_balancer_pool_edit.php

Make php -l happier

Add missing )

Use

gettext() fixes on interfaces.php

Add missing )

Fix gettext on interfaces_vlan.php

Fix gettext on interfaces_qinq.php

gettext fixes

Fix gettext on interfaces_ppps_edit.php

Fix gettext on interfaces_lagg.php

Fix gettext on interfaces_groups.php

Fix gettext on interfaces_gre.php

Fix gettext on interfaces_gif.php

Fix gettext on interfaces_bridge_edit.php

Merge remote branch 'origin/master'

Fix gettext on interfaces_bridge.php

gettext fixes

Fix gettext on firewall_virtual_ip_edit.php

Fix gettext on firewall_virtual_ip.php

Fix gettext on firewall_schedule.php

Fix gettext on firewall_rules_edit.php

gettext() fixes on firewall_nat_out_edit.php

gettext() fixes on firewall_nat_out.php

gettext() fixes on firewall_nat_edit.php

gettext() fixes on firewall_nat_1to1.php

gettext() fixes on firewall_aliases.php

gettext() fixes on diag_traceroute.php

gettext() fixes on diag_system_pftop.php

gettext() fixes on diag_showbogons.php

gettext() fixes on diag_routes.php

gettext() fixes on diag_patterns.php

gettext() fixes on diag_packet_capture.php

gettext() fixes on diag_overload_tables.php

gettext() fixes on diag_nanobsd.php

Implement geettext() on diag_smart.php

gettext() fixes on diag_logs_filter_dynamic.php

gettext() fixes on diag_ipsec_spd.php

gettext() fixes on diag_ipsec_sad.php

gettext() fixes on diag_ipsec.php

gettext() fixes on diag_dump_states.php

gettext() fixes on diag_defaults.php

gettext() fixes on diag_backup.php

Small gettext() fixes

Move : to gettext string

Fixes #821. Force usage of configured redirurl when one has been configured.

Show the architecture after the version number.

Add quotes back that were incorrectly removed when implementing gettext and add php tags around gettext where needed.

Separate RRD graph settings to a separate entry.

Fixes #817. Tags/Marks can be used even outside floating rules.

Fixed LB pool status display to match current config

Removed custom test code

There is not point in unsetting if just after we set the var!

Add the ability to select a mode for LB pool members, load balance (default) or manual failover. If manual failover is selected, only allow one server to be chosen as active.

Merge remote branch 'mainline/master'

Conflicts:
usr/local/www/status_lb_pool.php

Fixing gettext calls on index.php

Fixing gettext calls on diag_confbak.php

Fix enable_change() broken on last gettext() implementation

Default to the 'pools' tab of the inbound load balancer, and move the monitor tab to the end.

Removed duplicated tabs block on status_rrd_graph_settings.php

lb status fixes from Ltning

Fix gettext call added wrong

Fixing gettext calls on firewall_aliases_edit.php

Fixing gettext calls on license.php

Fixing gettext calls on pkg_mgr.php

Fixing gettext calls on system_advanced_admin.php

Fixing gettext calls on diag_logs_settings.php

Fixing gettext calls on diag_logs_ntpd.php

Fixing gettext calls on diag_logs_openvpn.php

Fixing gettext calls on diag_logs_relayd.php

Fixing gettext calls on diag_logs_vpn.php

Fixing gettext calls on diag_logs_ipsec.php

Fixing gettext calls on diag_logs_ppp.php

Fixing gettext calls on status_graph.php

Add the ability to set a periodic RRD and DHCP leases backup from Diagnostics > NanoBSD.

Merge remote branch 'mainline/master'

Conflicts:
usr/local/www/status_captiveportal.php
usr/local/www/status_rrd_graph.php
usr/local/www/status_wireless.php

add TCP 1119 for battle.net

add tooltip. cvstrac 1640

add explanation of flags and capabilities from m0n0wall. cvstrac 1564

Add hidden "if" field to status_wireless.php.

Move the get_real_interface call above this condition and fix the ID of the rescan button.

add info message

background the scan

add a Rescan button. ticket #793

fix text. Ticket #799

Fix link to the associated filter rule for port forwards on an interface other than the first with a filter rule.

Enforce the interface selection on associated filter rules. Ticket #780

correctly select Local Database when it's configured as such

fix text

don't static port 5060 by default, it breaks things much more often than it helps.

Add missing quote for the image title of the delete button, which was masked by the code that used to be after it.

Fix on-click confirmation for the delete button on port forward rows.