Use updated get_memory var names
The value of minimum_ram_warning is designed to be compared to hw.physmem - so do that. Usse the appropriate physmem or realmem value in each place.
Merge git pull request 313 from bcyrill with some modifications
Fixup gettext/printf call.
Change ereg() to preg_match() function
Fixes #2490. If there is a descr set on the interface keep it and do not disable the iface
fix for bug #2469 ("WAN -> LAN -> OPT10")
Good catch jim :)
Just php does not like this variable name and just prepends the 1 in output!
Merge remote-tracking branch 'mainline/master' into inc
Conflicts: etc/inc/gwlb.inc
Save a little space on the interface list for console assignment.
Conflicts: etc/inc/interfaces.inc etc/inc/priv.defs.inc etc/inc/shaper.inc etc/inc/system.inc
Conflicts: etc/inc/auth.inc etc/inc/config.lib.inc etc/inc/filter.inc etc/inc/pfsense-utils.inc etc/inc/pkg-utils.inc etc/inc/priv.defs.inc etc/inc/services.inc...
Change wording
BP: Fix gettext implementation
Resolves #1265. Show the interfaces in the same order requested during assignment on console.
Merge branch 'master' into inc
Conflicts: etc/inc/captiveportal.inc etc/inc/config.console.inc etc/inc/config.lib.inc etc/inc/easyrule.inc etc/inc/filter.inc etc/inc/ipsec.inc etc/inc/pkg-utils.inc etc/inc/shaper.inc...
Add some more safe belts and remove code that is commented from long time now. Reported on http://forum.pfsense.org/index.php/topic,28202.15.html
Merge remote branch 'mainline/master' into inc
Conflicts: etc/inc/auth.inc etc/inc/config.lib.inc etc/inc/filter.inc etc/inc/gwlb.inc etc/inc/interfaces.inc etc/inc/pfsense-utils.inc etc/inc/pkg-utils.inc...
Use pfSense_sync()
More gettext fixes
Implement gettext() calls on config.console.inc
Show disabled interfaces as well
Adding config.console.inc