pfSense

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

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

Protect against PHP errors if the interface list is empty

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

Fix the ID for the link to the associated filter rule when a filter rule has not been saved since the associated rule was created.

Disable protocol box on associated rules, move the message, and clean up code a bit.

Fix text

Fix link in error message for wake on lan.

Simplify sprintf

Fix text for a couple advanced options on filter rule list.

Modify various (s)printf format strings to allow translations to change the order of the inserted strings.

Remove or simplify some (s)printf calls.

Fix text

gettext() fixes on diag_traceroute.php

gettext() fixes on diag_system_pftop.php

Stick save and cancel back into the right hand of the first td cell like all other forms have it.

gettext() fixes on diag_showbogons.php

gettext() fixes on diag_routes.php

gettext() fixes on diag_patterns.php

Hide Save button until a drop down onChange event occurs

Remove extra quotes that were added around some strings when adding printf+gettext in some areas.

gettext() fixes on diag_packet_capture.php

Fix printf/sprintf mixups.

Made LB pool status page follow natural (expected) order no matter which host(s) is/are active.

This doesn't really need a printf either, come to think of it.

This probably shouldn't be a printf anyhow

This should be sprintf

Fix another gettext() call.

Fix gettext() call

Show selected properly for the LB mode.

No need to set enable

Do not try to bring down a CARP VIP for an entry that does not exist yet. Fixes #819

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

Allow batch Server LB/Failover pool changes from the Pool status screen. For LB pools, you can pick via checkbox any number of active pool servers. For manual failover types, you can choose the active server.

gettext() fixes on diag_defaults.php

gettext() fixes on diag_backup.php

When adding to a pool in manual failover mode, enforce the one-active limit also.

Add 8021.x preauth (rsn_preauth)

Rename $vipent to $pool here since we only deal with pools and the old name doesn't make sense in this context.

Change these PRINTs to echo for consistency, and reformat a little. Wrap vars inside strings in {}.

Formatting/whitespace fixes.

Remove the gateway load balancer status code, that has all moved away from here to Status > Gateways and is no longer needed.

Add <form> tag, submit, and reset button here.

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