Update pot

1 files changed, 3755 insertions, 3467 deletions

diff --git a/src/usr/local/share/locale/en/LC_MESSAGES/pfSense.pot b/src/usr/local/share/locale/en/LC_MESSAGES/pfSense.pot
index 946cb0a..224cfc7 100644
--- a/src/usr/local/share/locale/en/LC_MESSAGES/pfSense.pot
+++ b/src/usr/local/share/locale/en/LC_MESSAGES/pfSense.pot
@@ -5,7 +5,7 @@
 #
 #: src/usr/local/www/diag_traceroute.php:155
 #: src/usr/local/www/diag_traceroute.php:162
-#: src/usr/local/www/interfaces.php:3101 src/usr/local/www/interfaces.php:3111
+#: src/usr/local/www/interfaces.php:3111 src/usr/local/www/interfaces.php:3121
 #: src/usr/local/www/system_gateway_groups_edit.php:217
 #: src/usr/local/www/system_gateway_groups_edit.php:218
 #: src/usr/local/www/system_gateway_groups_edit.php:219
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-10-12 16:21-0300\n"
+"POT-Creation-Date: 2016-12-19 13:20-0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -36,7 +36,7 @@ msgid ""
 "hostname."
 msgstr ""
 
-#: src/etc/inc/auth.inc:114 src/etc/inc/captiveportal.inc:258
+#: src/etc/inc/auth.inc:114 src/etc/inc/captiveportal.inc:267
 msgid "Redirecting..."
 msgstr ""
 
@@ -44,143 +44,163 @@ msgstr ""
 msgid "Redirecting to the dashboard..."
 msgstr ""
 
-#: src/etc/inc/auth.inc:397 src/etc/inc/auth.inc:421 src/etc/inc/auth.inc:496
-#: src/etc/inc/auth.inc:537 src/etc/inc/auth.inc:606 src/etc/inc/auth.inc:764
-#: src/etc/inc/auth.inc:777
+#: src/etc/inc/auth.inc:397 src/etc/inc/auth.inc:421 src/etc/inc/auth.inc:498
+#: src/etc/inc/auth.inc:539 src/etc/inc/auth.inc:608 src/etc/inc/auth.inc:766
+#: src/etc/inc/auth.inc:779
 #, php-format
 msgid "Running: %s"
 msgstr ""
 
-#: src/etc/inc/auth.inc:818 src/etc/inc/auth.inc:899 src/etc/inc/auth.inc:979
-#: src/etc/inc/auth.inc:1267
+#: src/etc/inc/auth.inc:820 src/etc/inc/auth.inc:901 src/etc/inc/auth.inc:989
+#: src/etc/inc/auth.inc:1301
 #, php-format
 msgid "ERROR!  Could not connect to server %s."
 msgstr ""
 
-#: src/etc/inc/auth.inc:836
+#: src/etc/inc/auth.inc:838
 #, php-format
 msgid "LDAP: Could not lookup CA by reference for host %s."
 msgstr ""
 
-#: src/etc/inc/auth.inc:965
+#: src/etc/inc/auth.inc:913
+#, php-format
+msgid "ERROR! ldap_test_bind() could not STARTTLS to server %s."
+msgstr ""
+
+#: src/etc/inc/auth.inc:975
 msgid ""
 "ERROR!  ldap_get_user_ous() backed selected with no LDAP authentication "
 "server defined."
 msgstr ""
 
-#: src/etc/inc/auth.inc:995
+#: src/etc/inc/auth.inc:1003
+#, php-format
+msgid "ERROR! ldap_get_user_ous() could not STARTTLS to server %s."
+msgstr ""
+
+#: src/etc/inc/auth.inc:1013
 #, php-format
 msgid "ERROR! ldap_get_user_ous() could not bind anonymously to server %s."
 msgstr ""
 
-#: src/etc/inc/auth.inc:1000
+#: src/etc/inc/auth.inc:1018
 #, php-format
 msgid "ERROR! ldap_get_user_ous() could not bind to server %s."
 msgstr ""
 
-#: src/etc/inc/auth.inc:1116
+#: src/etc/inc/auth.inc:1134
 #, php-format
 msgid "ERROR! ldap_get_groups() Could not connect to server %s."
 msgstr ""
 
-#: src/etc/inc/auth.inc:1131
+#: src/etc/inc/auth.inc:1146
+#, php-format
+msgid "ERROR! ldap_get_groups() could not STARTTLS to server %s."
+msgstr ""
+
+#: src/etc/inc/auth.inc:1157
 #, php-format
 msgid "ERROR! ldap_get_groups() could not bind anonymously to server %s."
 msgstr ""
 
-#: src/etc/inc/auth.inc:1136
+#: src/etc/inc/auth.inc:1162
 #, php-format
 msgid "ERROR! ldap_get_groups() could not bind to server %s."
 msgstr ""
 
-#: src/etc/inc/auth.inc:1242
+#: src/etc/inc/auth.inc:1268
 msgid ""
 "ERROR! ldap_backed() called with no LDAP authentication server defined.  "
 "Defaulting to local user database. Visit System -> User Manager."
 msgstr ""
 
-#: src/etc/inc/auth.inc:1245
+#: src/etc/inc/auth.inc:1271
 msgid "ERROR! ldap_backed() called with no LDAP authentication server defined."
 msgstr ""
 
-#: src/etc/inc/auth.inc:1285
+#: src/etc/inc/auth.inc:1294
+#, php-format
+msgid "ERROR! ldap_backed() could not STARTTLS to server %s."
+msgstr ""
+
+#: src/etc/inc/auth.inc:1319
 #, php-format
 msgid "ERROR! Could not bind to server %s."
 msgstr ""
 
-#: src/etc/inc/auth.inc:1303
+#: src/etc/inc/auth.inc:1337
 #, php-format
 msgid "Now Searching for %s in directory."
 msgstr ""
 
-#: src/etc/inc/auth.inc:1312
+#: src/etc/inc/auth.inc:1346
 #, php-format
 msgid "Now Searching in server %1$s, container %2$s with filter %3$s."
 msgstr ""
 
-#: src/etc/inc/auth.inc:1326
+#: src/etc/inc/auth.inc:1360
 #, php-format
 msgid "Search resulted in error: %s"
 msgstr ""
 
-#: src/etc/inc/auth.inc:1342
+#: src/etc/inc/auth.inc:1376
 msgid "ERROR! Either LDAP search failed, or multiple users were found."
 msgstr ""
 
-#: src/etc/inc/auth.inc:1349
+#: src/etc/inc/auth.inc:1383
 #, php-format
 msgid "ERROR! Could not login to server %1$s as user %2$s: %3$s"
 msgstr ""
 
-#: src/etc/inc/auth.inc:1356
+#: src/etc/inc/auth.inc:1390
 #, php-format
 msgid "Logged in successfully as %1$s via LDAP server %2$s with DN = %3$s."
 msgstr ""
 
-#: src/etc/inc/auth.inc:1392
+#: src/etc/inc/auth.inc:1426
 #, php-format
 msgid "RADIUS start: %s<br />\n"
 msgstr ""
 
-#: src/etc/inc/auth.inc:1404
+#: src/etc/inc/auth.inc:1438
 #, php-format
 msgid "RADIUS send failed: %s<br />\n"
 msgstr ""
 
-#: src/etc/inc/auth.inc:1412
+#: src/etc/inc/auth.inc:1446
 #, php-format
 msgid "RADIUS Auth succeeded"
 msgstr ""
 
-#: src/etc/inc/auth.inc:1418
+#: src/etc/inc/auth.inc:1452
 #, php-format
 msgid "RADIUS Auth rejected"
 msgstr ""
 
-#: src/etc/inc/auth.inc:1535
+#: src/etc/inc/auth.inc:1569
 msgid "Widget configuration has been changed."
 msgstr ""
 
-#: src/etc/inc/auth.inc:1540
+#: src/etc/inc/auth.inc:1574
 #, php-format
 msgid "(User %s)"
 msgstr ""
 
-#: src/etc/inc/auth.inc:1558 src/etc/inc/auth.inc:1574
+#: src/etc/inc/auth.inc:1592 src/etc/inc/auth.inc:1608
 msgid "Local Database"
 msgstr ""
 
-#: src/etc/inc/auth.inc:1677
+#: src/etc/inc/auth.inc:1712
 #, php-format
 msgid "Successful login for user '%1$s' from: %2$s"
 msgstr ""
 
-#: src/etc/inc/auth.inc:1735
+#: src/etc/inc/auth.inc:1770
 #, php-format
 msgid "Session timed out for user '%1$s' from: %2$s"
 msgstr ""
 
-#: src/etc/inc/auth.inc:1737
+#: src/etc/inc/auth.inc:1772
 #, php-format
 msgid "User logged out for user '%1$s' from: %2$s"
 msgstr ""
@@ -212,12 +232,17 @@ msgstr ""
 msgid "This device is currently being maintained by: %s."
 msgstr ""
 
-#: src/etc/inc/authgui.inc:229 src/etc/inc/authgui.inc:277
-#: src/usr/local/www/services_captiveportal.php:1016
+#: src/etc/inc/authgui.inc:224
+#, php-format
+msgid " on %s.%s"
+msgstr ""
+
+#: src/etc/inc/authgui.inc:235 src/etc/inc/authgui.inc:283
+#: src/usr/local/www/services_captiveportal.php:1015
 msgid "Login"
 msgstr ""
 
-#: src/etc/inc/authgui.inc:243
+#: src/etc/inc/authgui.inc:249
 msgid ""
 "The IP address being used to access this router is not configured locally, "
 "which may be forwarded by NAT or other means. <br /><br />If this forwarding "
@@ -225,27 +250,27 @@ msgid ""
 "taking place."
 msgstr ""
 
-#: src/etc/inc/authgui.inc:251
+#: src/etc/inc/authgui.inc:257
 #, php-format
-msgid "Login to %s"
+msgid "Login to %s %s"
 msgstr ""
 
-#: src/etc/inc/authgui.inc:258
+#: src/etc/inc/authgui.inc:264
 msgid "The browser must support cookies to login."
 msgstr ""
 
-#: src/etc/inc/authgui.inc:262 src/usr/local/www/diag_authentication.php:98
-#: src/usr/local/www/interfaces.php:2482 src/usr/local/www/interfaces.php:2549
-#: src/usr/local/www/interfaces.php:2674
+#: src/etc/inc/authgui.inc:268 src/usr/local/www/diag_authentication.php:98
+#: src/usr/local/www/interfaces.php:2490 src/usr/local/www/interfaces.php:2557
+#: src/usr/local/www/interfaces.php:2682
 #: src/usr/local/www/interfaces_ppps_edit.php:210
 #: src/usr/local/www/interfaces_ppps_edit.php:213
 #: src/usr/local/www/interfaces_ppps_edit.php:221
 #: src/usr/local/www/interfaces_ppps_edit.php:224
 #: src/usr/local/www/interfaces_ppps_edit.php:621
-#: src/usr/local/www/services_dyndns_edit.php:98
-#: src/usr/local/www/services_dyndns_edit.php:347
+#: src/usr/local/www/services_dyndns_edit.php:99
+#: src/usr/local/www/services_dyndns_edit.php:348
 #: src/usr/local/www/services_pppoe_edit.php:506
-#: src/usr/local/www/status_captiveportal.php:156
+#: src/usr/local/www/status_captiveportal.php:161
 #: src/usr/local/www/system_usermanager.php:176
 #: src/usr/local/www/system_usermanager.php:181
 #: src/usr/local/www/system_usermanager.php:186
@@ -261,25 +286,25 @@ msgstr ""
 msgid "Username"
 msgstr ""
 
-#: src/etc/inc/authgui.inc:264
+#: src/etc/inc/authgui.inc:270
 msgid "Enter your username"
 msgstr ""
 
-#: src/etc/inc/authgui.inc:269 src/usr/local/www/diag_authentication.php:106
+#: src/etc/inc/authgui.inc:275 src/usr/local/www/diag_authentication.php:106
 #: src/usr/local/www/diag_backup.php:580 src/usr/local/www/diag_backup.php:627
-#: src/usr/local/www/interfaces.php:2489 src/usr/local/www/interfaces.php:2556
-#: src/usr/local/www/interfaces.php:2681
+#: src/usr/local/www/interfaces.php:2497 src/usr/local/www/interfaces.php:2564
+#: src/usr/local/www/interfaces.php:2689
 #: src/usr/local/www/interfaces_ppps_edit.php:210
 #: src/usr/local/www/interfaces_ppps_edit.php:213
 #: src/usr/local/www/interfaces_ppps_edit.php:221
 #: src/usr/local/www/interfaces_ppps_edit.php:224
 #: src/usr/local/www/interfaces_ppps_edit.php:628
 #: src/usr/local/www/services_checkip_edit.php:151
-#: src/usr/local/www/services_dyndns_edit.php:96
-#: src/usr/local/www/services_dyndns_edit.php:357
+#: src/usr/local/www/services_dyndns_edit.php:97
+#: src/usr/local/www/services_dyndns_edit.php:358
 #: src/usr/local/www/services_pppoe_edit.php:513
 #: src/usr/local/www/system_advanced_notifications.php:246
-#: src/usr/local/www/system_authservers.php:645
+#: src/usr/local/www/system_authservers.php:646
 #: src/usr/local/www/system_usermanager.php:182
 #: src/usr/local/www/system_usermanager.php:187
 #: src/usr/local/www/system_usermanager.php:707
@@ -293,7 +318,7 @@ msgstr ""
 msgid "Password"
 msgstr ""
 
-#: src/etc/inc/authgui.inc:271
+#: src/etc/inc/authgui.inc:277
 msgid "Enter your password"
 msgstr ""
 
@@ -323,19 +348,19 @@ msgstr ""
 msgid "Continue"
 msgstr ""
 
-#: src/etc/inc/captiveportal.inc:259
+#: src/etc/inc/captiveportal.inc:268
 msgid "Redirecting to"
 msgstr ""
 
-#: src/etc/inc/captiveportal.inc:260 src/usr/local/www/head.inc:210
+#: src/etc/inc/captiveportal.inc:269 src/usr/local/www/head.inc:219
 msgid "Logout"
 msgstr ""
 
-#: src/etc/inc/captiveportal.inc:261
+#: src/etc/inc/captiveportal.inc:270
 msgid "Click the button below to disconnect"
 msgstr ""
 
-#: src/etc/inc/captiveportal.inc:1556
+#: src/etc/inc/captiveportal.inc:1716
 #, php-format
 msgid "Error: cannot open '%s' in captiveportal_write_elements()%s"
 msgstr ""
@@ -540,7 +565,7 @@ msgid ""
 msgstr ""
 
 #: src/etc/inc/config.lib.inc:127 src/etc/inc/config.lib.inc:138
-#: src/etc/inc/config.lib.inc:490
+#: src/etc/inc/config.lib.inc:498
 msgid "Could not restore config.xml."
 msgstr ""
 
@@ -583,43 +608,43 @@ msgstr ""
 msgid "Upgraded config version level from %1$s to %2$s"
 msgstr ""
 
-#: src/etc/inc/config.lib.inc:467
+#: src/etc/inc/config.lib.inc:475
 msgid "WARNING: Config contents could not be saved. Could not open file!"
 msgstr ""
 
-#: src/etc/inc/config.lib.inc:469
+#: src/etc/inc/config.lib.inc:477
 #, php-format
 msgid "Unable to open %s/config.xml for writing in write_config()%s"
 msgstr ""
 
-#: src/etc/inc/config.lib.inc:589
+#: src/etc/inc/config.lib.inc:597
 #, php-format
 msgid "Reverted to %s."
 msgstr ""
 
-#: src/etc/inc/config.lib.inc:606
+#: src/etc/inc/config.lib.inc:614
 msgid "Installing configuration..."
 msgstr ""
 
-#: src/etc/inc/config.lib.inc:608
+#: src/etc/inc/config.lib.inc:616
 msgid "Installing configuration ...."
 msgstr ""
 
-#: src/etc/inc/config.lib.inc:659
+#: src/etc/inc/config.lib.inc:667
 msgid "XML error: unable to open file"
 msgstr ""
 
-#: src/etc/inc/config.lib.inc:665
+#: src/etc/inc/config.lib.inc:673
 #, php-format
 msgid "%1$s at line %2$d"
 msgstr ""
 
-#: src/etc/inc/config.lib.inc:718 src/etc/inc/config.lib.inc:720
+#: src/etc/inc/config.lib.inc:726 src/etc/inc/config.lib.inc:728
 #, php-format
 msgid "The backup cache file %s is corrupted.  Unlinking."
 msgstr ""
 
-#: src/etc/inc/config.lib.inc:870
+#: src/etc/inc/config.lib.inc:878
 #, php-format
 msgid "%s made unknown change"
 msgstr ""
@@ -628,588 +653,600 @@ msgstr ""
 msgid "Failed to encrypt/decrypt data!"
 msgstr ""
 
-#: src/etc/inc/dyndns.class:188
+#: src/etc/inc/dyndns.class:193
 msgid "Dynamic DNS: updatedns() starting"
 msgstr ""
 
-#: src/etc/inc/dyndns.class:245
+#: src/etc/inc/dyndns.class:259
 #, php-format
 msgid "Dynamic DNS (%1$s): running get_failover_interface for %2$s. found %3$s"
 msgstr ""
 
-#: src/etc/inc/dyndns.class:254
+#: src/etc/inc/dyndns.class:268
 #, php-format
 msgid ""
 "Dynamic DNS (%1$s) There was an error trying to determine the public IP for "
 "interface - %2$s (%3$s %4$s)."
 msgstr ""
 
-#: src/etc/inc/dyndns.class:329
+#: src/etc/inc/dyndns.class:346
 #, php-format
 msgid "Dynamic DNS %1$s (%2$s): _update() starting."
 msgstr ""
 
-#: src/etc/inc/dyndns.class:427
+#: src/etc/inc/dyndns.class:444
 #, php-format
 msgid ""
 "Dynamic DNS %1$s (%2$s): Processing dummy update on No-IP free account. IP "
 "temporarily set to %3$s"
 msgstr ""
 
-#: src/etc/inc/dyndns.class:695
+#: src/etc/inc/dyndns.class:683
 #, php-format
 msgid "Sending request to: %s"
 msgstr ""
 
-#: src/etc/inc/dyndns.class:852
+#: src/etc/inc/dyndns.class:839
 #, php-format
 msgid "Dynamic DNS %1$s (%2$s): _checkStatus() starting."
 msgstr ""
 
-#: src/etc/inc/dyndns.class:855 src/usr/local/www/pkg_mgr_install.php:118
+#: src/etc/inc/dyndns.class:842 src/usr/local/www/pkg_mgr_install.php:119
 msgid "Success"
 msgstr ""
 
-#: src/etc/inc/dyndns.class:856 src/etc/inc/dyndns.class:1488
-#: src/usr/local/www/diag_smart.php:472
+#: src/etc/inc/dyndns.class:843 src/etc/inc/dyndns.class:1515
+#: src/usr/local/www/diag_smart.php:372
 msgid "Error"
 msgstr ""
 
-#: src/etc/inc/dyndns.class:860
+#: src/etc/inc/dyndns.class:847
 msgid "Curl error occurred:"
 msgstr ""
 
-#: src/etc/inc/dyndns.class:869 src/etc/inc/dyndns.class:890
-#: src/etc/inc/dyndns.class:909 src/etc/inc/dyndns.class:927
-#: src/etc/inc/dyndns.class:944 src/etc/inc/dyndns.class:961
-#: src/etc/inc/dyndns.class:1110 src/etc/inc/dyndns.class:1123
-#: src/etc/inc/dyndns.class:1136 src/etc/inc/dyndns.class:1153
-#: src/etc/inc/dyndns.class:1263 src/etc/inc/dyndns.class:1320
-#: src/etc/inc/dyndns.class:1380 src/etc/inc/dyndns.class:1401
-#: src/etc/inc/dyndns.class:1446
+#: src/etc/inc/dyndns.class:856 src/etc/inc/dyndns.class:877
+#: src/etc/inc/dyndns.class:896 src/etc/inc/dyndns.class:914
+#: src/etc/inc/dyndns.class:931 src/etc/inc/dyndns.class:948
+#: src/etc/inc/dyndns.class:1097 src/etc/inc/dyndns.class:1110
+#: src/etc/inc/dyndns.class:1123 src/etc/inc/dyndns.class:1140
+#: src/etc/inc/dyndns.class:1269 src/etc/inc/dyndns.class:1333
+#: src/etc/inc/dyndns.class:1391 src/etc/inc/dyndns.class:1412
+#: src/etc/inc/dyndns.class:1457 src/etc/inc/dyndns.class:1469
 msgid "IP Address Changed Successfully!"
 msgstr ""
 
-#: src/etc/inc/dyndns.class:872 src/etc/inc/dyndns.class:895
-#: src/etc/inc/dyndns.class:914 src/etc/inc/dyndns.class:932
-#: src/etc/inc/dyndns.class:949 src/etc/inc/dyndns.class:966
-#: src/etc/inc/dyndns.class:1033 src/etc/inc/dyndns.class:1051
-#: src/etc/inc/dyndns.class:1071 src/etc/inc/dyndns.class:1089
-#: src/etc/inc/dyndns.class:1099 src/etc/inc/dyndns.class:1113
-#: src/etc/inc/dyndns.class:1126 src/etc/inc/dyndns.class:1141
-#: src/etc/inc/dyndns.class:1160 src/etc/inc/dyndns.class:1184
-#: src/etc/inc/dyndns.class:1203 src/etc/inc/dyndns.class:1224
-#: src/etc/inc/dyndns.class:1251 src/etc/inc/dyndns.class:1268
-#: src/etc/inc/dyndns.class:1325 src/etc/inc/dyndns.class:1343
-#: src/etc/inc/dyndns.class:1368 src/etc/inc/dyndns.class:1393
-#: src/etc/inc/dyndns.class:1430 src/etc/inc/dyndns.class:1451
+#: src/etc/inc/dyndns.class:859 src/etc/inc/dyndns.class:882
+#: src/etc/inc/dyndns.class:901 src/etc/inc/dyndns.class:919
+#: src/etc/inc/dyndns.class:936 src/etc/inc/dyndns.class:953
+#: src/etc/inc/dyndns.class:1020 src/etc/inc/dyndns.class:1038
+#: src/etc/inc/dyndns.class:1058 src/etc/inc/dyndns.class:1076
+#: src/etc/inc/dyndns.class:1086 src/etc/inc/dyndns.class:1100
+#: src/etc/inc/dyndns.class:1113 src/etc/inc/dyndns.class:1128
+#: src/etc/inc/dyndns.class:1147 src/etc/inc/dyndns.class:1171
+#: src/etc/inc/dyndns.class:1190 src/etc/inc/dyndns.class:1210
+#: src/etc/inc/dyndns.class:1230 src/etc/inc/dyndns.class:1257
+#: src/etc/inc/dyndns.class:1274 src/etc/inc/dyndns.class:1338
+#: src/etc/inc/dyndns.class:1356 src/etc/inc/dyndns.class:1379
+#: src/etc/inc/dyndns.class:1404 src/etc/inc/dyndns.class:1441
+#: src/etc/inc/dyndns.class:1462 src/etc/inc/dyndns.class:1477
 msgid "Unknown Response"
 msgstr ""
 
-#: src/etc/inc/dyndns.class:873 src/etc/inc/dyndns.class:896
-#: src/etc/inc/dyndns.class:915 src/etc/inc/dyndns.class:933
-#: src/etc/inc/dyndns.class:950 src/etc/inc/dyndns.class:967
-#: src/etc/inc/dyndns.class:1052 src/etc/inc/dyndns.class:1072
-#: src/etc/inc/dyndns.class:1090 src/etc/inc/dyndns.class:1100
-#: src/etc/inc/dyndns.class:1114 src/etc/inc/dyndns.class:1127
-#: src/etc/inc/dyndns.class:1142 src/etc/inc/dyndns.class:1161
-#: src/etc/inc/dyndns.class:1185 src/etc/inc/dyndns.class:1204
-#: src/etc/inc/dyndns.class:1225 src/etc/inc/dyndns.class:1252
-#: src/etc/inc/dyndns.class:1269 src/etc/inc/dyndns.class:1310
-#: src/etc/inc/dyndns.class:1326 src/etc/inc/dyndns.class:1344
-#: src/etc/inc/dyndns.class:1369 src/etc/inc/dyndns.class:1394
-#: src/etc/inc/dyndns.class:1431 src/etc/inc/dyndns.class:1452
+#: src/etc/inc/dyndns.class:860 src/etc/inc/dyndns.class:883
+#: src/etc/inc/dyndns.class:902 src/etc/inc/dyndns.class:920
+#: src/etc/inc/dyndns.class:937 src/etc/inc/dyndns.class:954
+#: src/etc/inc/dyndns.class:1039 src/etc/inc/dyndns.class:1059
+#: src/etc/inc/dyndns.class:1077 src/etc/inc/dyndns.class:1087
+#: src/etc/inc/dyndns.class:1101 src/etc/inc/dyndns.class:1114
+#: src/etc/inc/dyndns.class:1129 src/etc/inc/dyndns.class:1148
+#: src/etc/inc/dyndns.class:1172 src/etc/inc/dyndns.class:1191
+#: src/etc/inc/dyndns.class:1211 src/etc/inc/dyndns.class:1231
+#: src/etc/inc/dyndns.class:1258 src/etc/inc/dyndns.class:1275
+#: src/etc/inc/dyndns.class:1323 src/etc/inc/dyndns.class:1339
+#: src/etc/inc/dyndns.class:1357 src/etc/inc/dyndns.class:1380
+#: src/etc/inc/dyndns.class:1405 src/etc/inc/dyndns.class:1442
+#: src/etc/inc/dyndns.class:1463 src/etc/inc/dyndns.class:1478
 msgid "PAYLOAD:"
 msgstr ""
 
-#: src/etc/inc/dyndns.class:880
+#: src/etc/inc/dyndns.class:867
 msgid ""
 "The DNS-O-Matic username or password specified are incorrect. No updates "
 "will be distributed to services until this is resolved."
 msgstr ""
 
-#: src/etc/inc/dyndns.class:882
+#: src/etc/inc/dyndns.class:869
 msgid ""
 "The hostname specified is not a fully-qualified domain name. If no hostnames "
 "included, notfqdn will be returned once."
 msgstr ""
 
-#: src/etc/inc/dyndns.class:884
+#: src/etc/inc/dyndns.class:871
 msgid ""
 "The hostname passed could not be matched to any services configured. The "
 "service field will be blank in the return code."
 msgstr ""
 
-#: src/etc/inc/dyndns.class:886
+#: src/etc/inc/dyndns.class:873
 msgid ""
 "Up to 20 hosts my be updated. numhost is returned if attempting to update "
 "more than 20 or update a round-robin."
 msgstr ""
 
-#: src/etc/inc/dyndns.class:888
+#: src/etc/inc/dyndns.class:875
 msgid "The hostname is blocked for update abuse."
 msgstr ""
 
-#: src/etc/inc/dyndns.class:893
+#: src/etc/inc/dyndns.class:880
 msgid "DNS error encountered. Stop updating for 30 minutes."
 msgstr ""
 
-#: src/etc/inc/dyndns.class:902 src/etc/inc/dyndns.class:922
-#: src/etc/inc/dyndns.class:939 src/etc/inc/dyndns.class:956
-#: src/etc/inc/dyndns.class:1258 src/etc/inc/dyndns.class:1315
-#: src/etc/inc/dyndns.class:1439
+#: src/etc/inc/dyndns.class:889 src/etc/inc/dyndns.class:909
+#: src/etc/inc/dyndns.class:926 src/etc/inc/dyndns.class:943
+#: src/etc/inc/dyndns.class:1264 src/etc/inc/dyndns.class:1328
+#: src/etc/inc/dyndns.class:1450
 msgid "Not A FQDN!"
 msgstr ""
 
-#: src/etc/inc/dyndns.class:904 src/etc/inc/dyndns.class:1441
+#: src/etc/inc/dyndns.class:891 src/etc/inc/dyndns.class:1452
 msgid "No such host"
 msgstr ""
 
-#: src/etc/inc/dyndns.class:906 src/etc/inc/dyndns.class:924
-#: src/etc/inc/dyndns.class:941 src/etc/inc/dyndns.class:958
-#: src/etc/inc/dyndns.class:1107 src/etc/inc/dyndns.class:1120
-#: src/etc/inc/dyndns.class:1133 src/etc/inc/dyndns.class:1317
-#: src/etc/inc/dyndns.class:1377 src/etc/inc/dyndns.class:1420
-#: src/etc/inc/dyndns.class:1443
+#: src/etc/inc/dyndns.class:893 src/etc/inc/dyndns.class:911
+#: src/etc/inc/dyndns.class:928 src/etc/inc/dyndns.class:945
+#: src/etc/inc/dyndns.class:1094 src/etc/inc/dyndns.class:1107
+#: src/etc/inc/dyndns.class:1120 src/etc/inc/dyndns.class:1330
+#: src/etc/inc/dyndns.class:1388 src/etc/inc/dyndns.class:1431
+#: src/etc/inc/dyndns.class:1454
 msgid "No Change In IP Address"
 msgstr ""
 
-#: src/etc/inc/dyndns.class:912 src/etc/inc/dyndns.class:930
-#: src/etc/inc/dyndns.class:947 src/etc/inc/dyndns.class:964
-#: src/etc/inc/dyndns.class:1139 src/etc/inc/dyndns.class:1266
-#: src/etc/inc/dyndns.class:1323 src/etc/inc/dyndns.class:1383
-#: src/etc/inc/dyndns.class:1449
+#: src/etc/inc/dyndns.class:899 src/etc/inc/dyndns.class:917
+#: src/etc/inc/dyndns.class:934 src/etc/inc/dyndns.class:951
+#: src/etc/inc/dyndns.class:1126 src/etc/inc/dyndns.class:1272
+#: src/etc/inc/dyndns.class:1336 src/etc/inc/dyndns.class:1394
+#: src/etc/inc/dyndns.class:1460
 msgid "User Authorization Failed"
 msgstr ""
 
-#: src/etc/inc/dyndns.class:978
+#: src/etc/inc/dyndns.class:965
 msgid "IP address is current, no update performed."
 msgstr ""
 
-#: src/etc/inc/dyndns.class:982
+#: src/etc/inc/dyndns.class:969
 msgid "DNS hostname update successful."
 msgstr ""
 
-#: src/etc/inc/dyndns.class:986
+#: src/etc/inc/dyndns.class:973
 msgid "Hostname supplied does not exist."
 msgstr ""
 
-#: src/etc/inc/dyndns.class:989
+#: src/etc/inc/dyndns.class:976
 msgid "Invalid Username."
 msgstr ""
 
-#: src/etc/inc/dyndns.class:992
+#: src/etc/inc/dyndns.class:979
 msgid "Invalid Password."
 msgstr ""
 
-#: src/etc/inc/dyndns.class:995
+#: src/etc/inc/dyndns.class:982
 msgid "Too many updates sent."
 msgstr ""
 
-#: src/etc/inc/dyndns.class:998
+#: src/etc/inc/dyndns.class:985
 msgid "Account disabled due to violation of No-IP terms of service."
 msgstr ""
 
-#: src/etc/inc/dyndns.class:1001
+#: src/etc/inc/dyndns.class:988
 msgid ""
 "Invalid IP. IP Address submitted is improperly formatted or is a private IP "
 "address or is on a blacklist."
 msgstr ""
 
-#: src/etc/inc/dyndns.class:1004
+#: src/etc/inc/dyndns.class:991
 msgid "Disabled / Locked Hostname."
 msgstr ""
 
-#: src/etc/inc/dyndns.class:1007
+#: src/etc/inc/dyndns.class:994
 msgid ""
 "Host updated is configured as a web redirect and no update was performed."
 msgstr ""
 
-#: src/etc/inc/dyndns.class:1010
+#: src/etc/inc/dyndns.class:997
 msgid "Group supplied does not exist."
 msgstr ""
 
-#: src/etc/inc/dyndns.class:1013
+#: src/etc/inc/dyndns.class:1000
 msgid "DNS group update is successful."
 msgstr ""
 
-#: src/etc/inc/dyndns.class:1017
+#: src/etc/inc/dyndns.class:1004
 msgid "DNS group is current, no update performed."
 msgstr ""
 
-#: src/etc/inc/dyndns.class:1021
+#: src/etc/inc/dyndns.class:1008
 msgid "Update client support not available for supplied hostname or group."
 msgstr ""
 
-#: src/etc/inc/dyndns.class:1024
+#: src/etc/inc/dyndns.class:1011
 msgid "Hostname supplied does not have offline settings configured."
 msgstr ""
 
-#: src/etc/inc/dyndns.class:1027 src/etc/inc/dyndns.class:1030
+#: src/etc/inc/dyndns.class:1014 src/etc/inc/dyndns.class:1017
 msgid ""
 "Client disabled. Client should exit and not perform any more updates without "
 "user intervention."
 msgstr ""
 
-#: src/etc/inc/dyndns.class:1034
+#: src/etc/inc/dyndns.class:1021
 msgid "Unknown Response:"
 msgstr ""
 
-#: src/etc/inc/dyndns.class:1040
+#: src/etc/inc/dyndns.class:1027
 msgid "Authentication Failed: Username and/or Password was Incorrect."
 msgstr ""
 
-#: src/etc/inc/dyndns.class:1042
+#: src/etc/inc/dyndns.class:1029
 msgid "No Service: Dynamic DNS Service has been disabled for this domain."
 msgstr ""
 
-#: src/etc/inc/dyndns.class:1044
+#: src/etc/inc/dyndns.class:1031
 msgid "Illegal Input: Self-Explanatory"
 msgstr ""
 
-#: src/etc/inc/dyndns.class:1046
+#: src/etc/inc/dyndns.class:1033
 msgid "Too Soon: Not Enough Time Has Elapsed Since Last Update"
 msgstr ""
 
-#: src/etc/inc/dyndns.class:1048
+#: src/etc/inc/dyndns.class:1035
 msgid "IP Updated Successfully!"
 msgstr ""
 
-#: src/etc/inc/dyndns.class:1061
+#: src/etc/inc/dyndns.class:1048
 msgid "Error 799"
 msgstr ""
 
-#: src/etc/inc/dyndns.class:1061 src/etc/inc/dyndns.class:1063
+#: src/etc/inc/dyndns.class:1048 src/etc/inc/dyndns.class:1050
 msgid "Update Failed!"
 msgstr ""
 
-#: src/etc/inc/dyndns.class:1063
+#: src/etc/inc/dyndns.class:1050
 msgid "Error 700"
 msgstr ""
 
-#: src/etc/inc/dyndns.class:1065 src/etc/inc/dyndns.class:1068
-#: src/etc/inc/dyndns.class:1086 src/etc/inc/dyndns.class:1096
-#: src/etc/inc/dyndns.class:1181 src/etc/inc/dyndns.class:1197
-#: src/etc/inc/dyndns.class:1218 src/etc/inc/dyndns.class:1245
-#: src/etc/inc/dyndns.class:1293 src/etc/inc/dyndns.class:1340
-#: src/etc/inc/dyndns.class:1356
+#: src/etc/inc/dyndns.class:1052 src/etc/inc/dyndns.class:1055
+#: src/etc/inc/dyndns.class:1073 src/etc/inc/dyndns.class:1083
+#: src/etc/inc/dyndns.class:1168 src/etc/inc/dyndns.class:1184
+#: src/etc/inc/dyndns.class:1204 src/etc/inc/dyndns.class:1224
+#: src/etc/inc/dyndns.class:1251 src/etc/inc/dyndns.class:1306
+#: src/etc/inc/dyndns.class:1353 src/etc/inc/dyndns.class:1367
 msgid "IP Address Updated Successfully!"
 msgstr ""
 
-#: src/etc/inc/dyndns.class:1078
+#: src/etc/inc/dyndns.class:1065
 msgid ""
 "Bad Request - The URL was malformed. Required parameters were not provided."
 msgstr ""
 
-#: src/etc/inc/dyndns.class:1080
+#: src/etc/inc/dyndns.class:1067
 msgid "Update Too Soon - Attempted to update too quickly since last change."
 msgstr ""
 
-#: src/etc/inc/dyndns.class:1082
+#: src/etc/inc/dyndns.class:1069
 msgid "Database Error - There was a server-sided database error."
 msgstr ""
 
-#: src/etc/inc/dyndns.class:1084
+#: src/etc/inc/dyndns.class:1071
 #, php-format
 msgid "Hostname Error - The hostname (%s) doesn't belong to user (%s)."
 msgstr ""
 
-#: src/etc/inc/dyndns.class:1148
+#: src/etc/inc/dyndns.class:1135
 msgid "Not a valid username or password!"
 msgstr ""
 
-#: src/etc/inc/dyndns.class:1150
+#: src/etc/inc/dyndns.class:1137
 msgid "Hostname specified does not exist."
 msgstr ""
 
-#: src/etc/inc/dyndns.class:1156
+#: src/etc/inc/dyndns.class:1143
 msgid "Hostname specified exists, but not under the username specified."
 msgstr ""
 
-#: src/etc/inc/dyndns.class:1158
+#: src/etc/inc/dyndns.class:1145
 msgid "Updating too frequently, considered abuse."
 msgstr ""
 
-#: src/etc/inc/dyndns.class:1167 src/etc/inc/dyndns.class:1212
+#: src/etc/inc/dyndns.class:1154 src/etc/inc/dyndns.class:1218
 msgid "Bad Request - The IP provided was invalid."
 msgstr ""
 
-#: src/etc/inc/dyndns.class:1169
+#: src/etc/inc/dyndns.class:1156
 msgid "Bad Request - Required parameters were not provided."
 msgstr ""
 
-#: src/etc/inc/dyndns.class:1171
+#: src/etc/inc/dyndns.class:1158
 msgid ""
 "Bad Request - Illegal characters in either the username or the password."
 msgstr ""
 
-#: src/etc/inc/dyndns.class:1173
+#: src/etc/inc/dyndns.class:1160
 msgid "Invalid password."
 msgstr ""
 
-#: src/etc/inc/dyndns.class:1175
+#: src/etc/inc/dyndns.class:1162
 msgid "This account has been administratively locked."
 msgstr ""
 
-#: src/etc/inc/dyndns.class:1177
+#: src/etc/inc/dyndns.class:1164
 msgid "Updating too frequently."
 msgstr ""
 
-#: src/etc/inc/dyndns.class:1179 src/etc/inc/dyndns.class:1193
+#: src/etc/inc/dyndns.class:1166 src/etc/inc/dyndns.class:1180
+#: src/etc/inc/dyndns.class:1198
 msgid "Server side error."
 msgstr ""
 
-#: src/etc/inc/dyndns.class:1195
+#: src/etc/inc/dyndns.class:1182
 msgid "Badly Formed Request (check the settings)."
 msgstr ""
 
-#: src/etc/inc/dyndns.class:1214
+#: src/etc/inc/dyndns.class:1200 src/etc/inc/dyndns.class:1220
 msgid "Bad Request - A hostname was not provided."
 msgstr ""
 
-#: src/etc/inc/dyndns.class:1216 src/etc/inc/dyndns.class:1243
+#: src/etc/inc/dyndns.class:1202 src/etc/inc/dyndns.class:1222
+#: src/etc/inc/dyndns.class:1249
 msgid "Invalid username or password."
 msgstr ""
 
-#: src/etc/inc/dyndns.class:1221 src/etc/inc/dyndns.class:1248
-#: src/etc/inc/dyndns.class:1260
+#: src/etc/inc/dyndns.class:1207 src/etc/inc/dyndns.class:1227
+#: src/etc/inc/dyndns.class:1254 src/etc/inc/dyndns.class:1266
 msgid "No Change In IP Address."
 msgstr ""
 
-#: src/etc/inc/dyndns.class:1239
+#: src/etc/inc/dyndns.class:1245
 msgid "Bad Request - Missing/Invalid Parameters."
 msgstr ""
 
-#: src/etc/inc/dyndns.class:1241
+#: src/etc/inc/dyndns.class:1247
 msgid "Bad Request - Invalid Tunnel ID."
 msgstr ""
 
-#: src/etc/inc/dyndns.class:1295
+#: src/etc/inc/dyndns.class:1281
+msgid "Route53 API call failed"
+msgstr ""
+
+#: src/etc/inc/dyndns.class:1285
+msgid "IP address changed successfully"
+msgstr ""
+
+#: src/etc/inc/dyndns.class:1308 src/etc/inc/dyndns.class:1472
 msgid "Result did not match."
 msgstr ""
 
-#: src/etc/inc/dyndns.class:1302
+#: src/etc/inc/dyndns.class:1315
 #, php-format
 msgid "%1$s updated to %2$s"
 msgstr ""
 
-#: src/etc/inc/dyndns.class:1305
+#: src/etc/inc/dyndns.class:1318
 msgid ""
 "Invalid Credentials! Don't forget to use API Key for password field with "
 "CloudFlare."
 msgstr ""
 
-#: src/etc/inc/dyndns.class:1307
+#: src/etc/inc/dyndns.class:1320
 msgid "Zone or Host ID was not found, check the hostname."
 msgstr ""
 
-#: src/etc/inc/dyndns.class:1309
+#: src/etc/inc/dyndns.class:1322
 msgid "UNKNOWN ERROR"
 msgstr ""
 
-#: src/etc/inc/dyndns.class:1332
+#: src/etc/inc/dyndns.class:1345
 msgid "Wrong values - Update could not be completed."
 msgstr ""
 
-#: src/etc/inc/dyndns.class:1334
+#: src/etc/inc/dyndns.class:1347
 msgid "Unknown username - User does not exist."
 msgstr ""
 
-#: src/etc/inc/dyndns.class:1336
+#: src/etc/inc/dyndns.class:1349
 msgid "Wrong password - Remember password is case sensitive."
 msgstr ""
 
-#: src/etc/inc/dyndns.class:1338
+#: src/etc/inc/dyndns.class:1351
 msgid "User unable to administer the selected domain."
 msgstr ""
 
-#: src/etc/inc/dyndns.class:1375
+#: src/etc/inc/dyndns.class:1386
 msgid "Not A FQDN"
 msgstr ""
 
-#: src/etc/inc/dyndns.class:1385
+#: src/etc/inc/dyndns.class:1396
 msgid "Hostname does not exist or DynDNS not enabled"
 msgstr ""
 
-#: src/etc/inc/dyndns.class:1387
+#: src/etc/inc/dyndns.class:1398
 msgid "Bad request"
 msgstr ""
 
-#: src/etc/inc/dyndns.class:1389
+#: src/etc/inc/dyndns.class:1400
 msgid "Dynamic DNS access has been blocked!"
 msgstr ""
 
-#: src/etc/inc/dyndns.class:1391
+#: src/etc/inc/dyndns.class:1402
 msgid "Error on Google's end, retry in 5 minutes"
 msgstr ""
 
-#: src/etc/inc/dyndns.class:1405
+#: src/etc/inc/dyndns.class:1416 src/etc/inc/dyndns.class:1474
 msgid "Invalid username or password"
 msgstr ""
 
-#: src/etc/inc/dyndns.class:1408
+#: src/etc/inc/dyndns.class:1419
 msgid "Account suspended"
 msgstr ""
 
-#: src/etc/inc/dyndns.class:1411
+#: src/etc/inc/dyndns.class:1422
 msgid "Account revoked"
 msgstr ""
 
-#: src/etc/inc/dyndns.class:1414
+#: src/etc/inc/dyndns.class:1425
 msgid "Record does not exist in the system. Unable to update record"
 msgstr ""
 
-#: src/etc/inc/dyndns.class:1417
+#: src/etc/inc/dyndns.class:1428
 msgid "User does not have access to this record"
 msgstr ""
 
-#: src/etc/inc/dyndns.class:1424
+#: src/etc/inc/dyndns.class:1435
 msgid "General system error recognized by the system"
 msgstr ""
 
-#: src/etc/inc/dyndns.class:1427
+#: src/etc/inc/dyndns.class:1438
 msgid "General system error unrecognized by the system"
 msgstr ""
 
-#: src/etc/inc/dyndns.class:1463
+#: src/etc/inc/dyndns.class:1490
 #, php-format
 msgid "DynDNS updated IP Address on %1$s (%2$s) to %3$s"
 msgstr ""
 
-#: src/etc/inc/dyndns.class:1464 src/etc/inc/dyndns.class:1472
-#: src/etc/inc/services.inc:2576
+#: src/etc/inc/dyndns.class:1491 src/etc/inc/dyndns.class:1499
+#: src/etc/inc/services.inc:2608
 #, php-format
 msgid "phpDynDNS: updating cache file %1$s: %2$s"
 msgstr ""
 
-#: src/etc/inc/dyndns.class:1471
+#: src/etc/inc/dyndns.class:1498
 #, php-format
 msgid "DynDNS updated IPv6 Address on %s (%s) to %s"
 msgstr ""
 
-#: src/etc/inc/dyndns.class:1487
+#: src/etc/inc/dyndns.class:1514
 msgid "ERROR!"
 msgstr ""
 
-#: src/etc/inc/dyndns.class:1493
+#: src/etc/inc/dyndns.class:1520
 msgid "No Dynamic DNS Service provider was selected."
 msgstr ""
 
-#: src/etc/inc/dyndns.class:1496
+#: src/etc/inc/dyndns.class:1523
 msgid "No Username Provided."
 msgstr ""
 
-#: src/etc/inc/dyndns.class:1499
+#: src/etc/inc/dyndns.class:1526
 msgid "No Password Provided."
 msgstr ""
 
-#: src/etc/inc/dyndns.class:1502
+#: src/etc/inc/dyndns.class:1529
 msgid "No Hostname Provided."
 msgstr ""
 
-#: src/etc/inc/dyndns.class:1505
+#: src/etc/inc/dyndns.class:1532
 msgid "The Dynamic DNS Service provided is not yet supported."
 msgstr ""
 
-#: src/etc/inc/dyndns.class:1508
+#: src/etc/inc/dyndns.class:1535
 msgid "No Update URL Provided."
 msgstr ""
 
-#: src/etc/inc/dyndns.class:1511
+#: src/etc/inc/dyndns.class:1538
 msgid "Invalid ZoneID"
 msgstr ""
 
-#: src/etc/inc/dyndns.class:1514
+#: src/etc/inc/dyndns.class:1541
 msgid "Invalid TTL"
 msgstr ""
 
-#: src/etc/inc/dyndns.class:1517
+#: src/etc/inc/dyndns.class:1544
 #, php-format
 msgid ""
 "No change in my IP address and/or %s days has not passed. Not updating "
 "dynamic DNS entry."
 msgstr ""
 
-#: src/etc/inc/dyndns.class:1520
+#: src/etc/inc/dyndns.class:1547
 msgid "Unknown Response."
 msgstr ""
 
-#: src/etc/inc/dyndns.class:1539
+#: src/etc/inc/dyndns.class:1566
 #, php-format
 msgid "Dynamic DNS %1$s (%2$s): _detectChange() starting."
 msgstr ""
 
-#: src/etc/inc/dyndns.class:1546
+#: src/etc/inc/dyndns.class:1573
 #, php-format
 msgid ""
 "Dynamic Dns (%s): Current WAN IP could not be determined, skipping update "
 "process."
 msgstr ""
 
-#: src/etc/inc/dyndns.class:1549
+#: src/etc/inc/dyndns.class:1576
 #, php-format
 msgid "Dynamic Dns (%1$s): Current WAN IP: %2$s"
 msgstr ""
 
-#: src/etc/inc/dyndns.class:1557
+#: src/etc/inc/dyndns.class:1584
 #, php-format
 msgid "Cached IPv6: %s"
 msgstr ""
 
-#: src/etc/inc/dyndns.class:1563
+#: src/etc/inc/dyndns.class:1590
 msgid "No Cached IPv6 found."
 msgstr ""
 
-#: src/etc/inc/dyndns.class:1571
+#: src/etc/inc/dyndns.class:1598
 #, php-format
 msgid "Cached IP: %s"
 msgstr ""
 
-#: src/etc/inc/dyndns.class:1577
+#: src/etc/inc/dyndns.class:1604
 msgid "No Cached IP found."
 msgstr ""
 
-#: src/etc/inc/dyndns.class:1591
+#: src/etc/inc/dyndns.class:1618
 msgid "Dynamic Dns: cacheIP != wan_ip. Updating."
 msgstr ""
 
-#: src/etc/inc/dyndns.class:1592
+#: src/etc/inc/dyndns.class:1619
 #, php-format
 msgid "Cached IP: %1$s WAN IP: %2$s"
 msgstr ""
 
-#: src/etc/inc/dyndns.class:1597
+#: src/etc/inc/dyndns.class:1624
 #, php-format
 msgid "Dynamic Dns: More than %s days. Updating."
 msgstr ""
 
-#: src/etc/inc/dyndns.class:1602
+#: src/etc/inc/dyndns.class:1629
 msgid "Initial update."
 msgstr ""
 
-#: src/etc/inc/dyndns.class:1639
+#: src/etc/inc/dyndns.class:1666
 #, php-format
 msgid "Dynamic DNS %1$s (%2$s): _checkIP() starting."
 msgstr ""
 
-#: src/etc/inc/dyndns.class:1664
+#: src/etc/inc/dyndns.class:1691
 #, php-format
 msgid ""
 "Dynamic DNS %1$s debug information (%2$s): Could not resolve %3$s to IP "
 "using interface IP %4$s."
 msgstr ""
 
-#: src/etc/inc/dyndns.class:1683
+#: src/etc/inc/dyndns.class:1710
 #, php-format
 msgid "Dynamic DNS %1$s (%2$s): %3$s extracted from %4$s"
 msgstr ""
 
-#: src/etc/inc/dyndns.class:1686
+#: src/etc/inc/dyndns.class:1713
 #, php-format
 msgid "Dynamic DNS %1$s (%2$s): IP address could not be extracted from %3$s"
 msgstr ""
 
-#: src/etc/inc/dyndns.class:1691
+#: src/etc/inc/dyndns.class:1718
 #, php-format
 msgid "Dynamic DNS %1$s (%2$s): %3$s extracted from local system."
 msgstr ""
@@ -1318,8 +1355,8 @@ msgstr ""
 #: src/etc/inc/filter.inc:48 src/etc/inc/filter.inc:78
 #: src/usr/local/www/firewall_rules_edit.php:1189
 #: src/usr/local/www/firewall_rules_edit.php:1231
-#: src/usr/local/www/firewall_rules_edit.php:1282
-#: src/usr/local/www/firewall_rules_edit.php:1337
+#: src/usr/local/www/firewall_rules_edit.php:1285
+#: src/usr/local/www/firewall_rules_edit.php:1340
 msgid "any"
 msgstr ""
 
@@ -1391,7 +1428,7 @@ msgstr ""
 #: src/etc/inc/filter.inc:65 src/usr/local/www/diag_dns.php:308
 #: src/usr/local/www/diag_traceroute.php:37
 #: src/usr/local/www/diag_traceroute.php:121
-#: src/usr/local/www/diag_traceroute.php:170 src/usr/local/www/head.inc:359
+#: src/usr/local/www/diag_traceroute.php:170 src/usr/local/www/head.inc:386
 msgid "Traceroute"
 msgstr ""
 
@@ -1544,19 +1581,19 @@ msgstr ""
 #: src/etc/inc/interfaces.inc:347 src/etc/inc/interfaces.inc:409
 #: src/etc/inc/interfaces.inc:717 src/etc/inc/interfaces.inc:1071
 #: src/etc/inc/interfaces.inc:1102 src/etc/inc/interfaces.inc:1126
-#: src/etc/inc/interfaces.inc:1147 src/etc/inc/interfaces.inc:2160
-#: src/etc/inc/pkg-utils.inc:529 src/etc/inc/pkg-utils.inc:677
-#: src/etc/inc/pkg-utils.inc:700 src/etc/inc/pkg-utils.inc:736
-#: src/etc/inc/pkg-utils.inc:741 src/etc/inc/pkg-utils.inc:746
-#: src/etc/inc/pkg-utils.inc:764 src/etc/inc/pkg-utils.inc:781
-#: src/etc/inc/pkg-utils.inc:803 src/etc/inc/pkg-utils.inc:844
-#: src/etc/inc/pkg-utils.inc:870 src/etc/inc/pkg-utils.inc:913
-#: src/etc/inc/pkg-utils.inc:932 src/etc/inc/rrd.inc:1030
-#: src/etc/inc/services.inc:1594 src/etc/inc/services.inc:1992
-#: src/etc/inc/services.inc:2209 src/etc/inc/services.inc:2251
-#: src/etc/inc/services.inc:2456 src/etc/inc/system.inc:1092
-#: src/etc/inc/system.inc:1190 src/etc/inc/system.inc:1493
-#: src/etc/inc/system.inc:2023
+#: src/etc/inc/interfaces.inc:1147 src/etc/inc/interfaces.inc:2163
+#: src/etc/inc/pkg-utils.inc:533 src/etc/inc/pkg-utils.inc:681
+#: src/etc/inc/pkg-utils.inc:704 src/etc/inc/pkg-utils.inc:740
+#: src/etc/inc/pkg-utils.inc:745 src/etc/inc/pkg-utils.inc:750
+#: src/etc/inc/pkg-utils.inc:768 src/etc/inc/pkg-utils.inc:785
+#: src/etc/inc/pkg-utils.inc:807 src/etc/inc/pkg-utils.inc:848
+#: src/etc/inc/pkg-utils.inc:874 src/etc/inc/pkg-utils.inc:917
+#: src/etc/inc/pkg-utils.inc:936 src/etc/inc/rrd.inc:1030
+#: src/etc/inc/services.inc:1611 src/etc/inc/services.inc:2009
+#: src/etc/inc/services.inc:2226 src/etc/inc/services.inc:2268
+#: src/etc/inc/services.inc:2488 src/etc/inc/system.inc:1079
+#: src/etc/inc/system.inc:1177 src/etc/inc/system.inc:1480
+#: src/etc/inc/system.inc:2040
 msgid "done."
 msgstr ""
 
@@ -1628,177 +1665,177 @@ msgid ""
 "not been added."
 msgstr ""
 
-#: src/etc/inc/filter.inc:1253
+#: src/etc/inc/filter.inc:1264
 #, php-format
 msgid "Creating reflection NAT rule for %s..."
 msgstr ""
 
-#: src/etc/inc/filter.inc:1351
+#: src/etc/inc/filter.inc:1362
 #, php-format
 msgid "Creating reflection rule for %s..."
 msgstr ""
 
-#: src/etc/inc/filter.inc:1472
+#: src/etc/inc/filter.inc:1483
 msgid "Not installing NAT reflection rules for a port range > 500"
 msgstr ""
 
-#: src/etc/inc/filter.inc:1478
+#: src/etc/inc/filter.inc:1489
 msgid "Installing partial NAT reflection rules. Maximum 1,000 reached."
 msgstr ""
 
-#: src/etc/inc/filter.inc:1559
+#: src/etc/inc/filter.inc:1570
 msgid "localhost"
 msgstr ""
 
-#: src/etc/inc/filter.inc:1567
+#: src/etc/inc/filter.inc:1578
 msgid "static route"
 msgstr ""
 
-#: src/etc/inc/filter.inc:1579
+#: src/etc/inc/filter.inc:1590
 msgid "DHCP alias address"
 msgstr ""
 
-#: src/etc/inc/filter.inc:1613
+#: src/etc/inc/filter.inc:1624
 msgid "PPPoE server"
 msgstr ""
 
-#: src/etc/inc/filter.inc:1624
+#: src/etc/inc/filter.inc:1635
 msgid "L2TP server"
 msgstr ""
 
-#: src/etc/inc/filter.inc:1633
+#: src/etc/inc/filter.inc:1644
 msgid "OpenVPN server"
 msgstr ""
 
-#: src/etc/inc/filter.inc:1642
+#: src/etc/inc/filter.inc:1653
 msgid "OpenVPN client"
 msgstr ""
 
-#: src/etc/inc/filter.inc:1652
+#: src/etc/inc/filter.inc:1663
 msgid "IPsec client"
 msgstr ""
 
-#: src/etc/inc/filter.inc:1688
+#: src/etc/inc/filter.inc:1699
 msgid "Auto created rule for ISAKMP"
 msgstr ""
 
-#: src/etc/inc/filter.inc:1698
+#: src/etc/inc/filter.inc:1709
 msgid "Auto created rule"
 msgstr ""
 
-#: src/etc/inc/filter.inc:1831
+#: src/etc/inc/filter.inc:1842
 msgid "Creating 1:1 rules..."
 msgstr ""
 
-#: src/etc/inc/filter.inc:2016
+#: src/etc/inc/filter.inc:2027
 #, php-format
 msgid "Creating advanced outbound rule %s"
 msgstr ""
 
-#: src/etc/inc/filter.inc:2063
+#: src/etc/inc/filter.inc:2074
 msgid "Creating outbound NAT rules"
 msgstr ""
 
-#: src/etc/inc/filter.inc:2070
+#: src/etc/inc/filter.inc:2081
 msgid "Creating automatic outbound rules"
 msgstr ""
 
-#: src/etc/inc/filter.inc:2100
+#: src/etc/inc/filter.inc:2111
 msgid "Setting up TFTP helper"
 msgstr ""
 
-#: src/etc/inc/filter.inc:2142
+#: src/etc/inc/filter.inc:2155
 #, php-format
 msgid "Creating NAT rule %s"
 msgstr ""
 
-#: src/etc/inc/filter.inc:2370
+#: src/etc/inc/filter.inc:2385
 #, php-format
 msgid "Creating filter rule %s ..."
 msgstr ""
 
-#: src/etc/inc/filter.inc:2394
+#: src/etc/inc/filter.inc:2409
 #, php-format
 msgid "filter_generate_port: %1$s is not a valid %2$s port."
 msgstr ""
 
-#: src/etc/inc/filter.inc:2631
+#: src/etc/inc/filter.inc:2646
 #, php-format
 msgid "Creating filter rules %s ..."
 msgstr ""
 
-#: src/etc/inc/filter.inc:2686
+#: src/etc/inc/filter.inc:2701
 #, php-format
 msgid "Unresolvable source alias '%1$s' for rule '%2$s'"
 msgstr ""
 
-#: src/etc/inc/filter.inc:2691
+#: src/etc/inc/filter.inc:2706
 #, php-format
 msgid "Unresolvable destination alias '%1$s' for rule '%2$s'"
 msgstr ""
 
-#: src/etc/inc/filter.inc:2695
+#: src/etc/inc/filter.inc:2710
 msgid "Setting up pass/block rules"
 msgstr ""
 
-#: src/etc/inc/filter.inc:2722
+#: src/etc/inc/filter.inc:2737
 #, php-format
 msgid "Setting up pass/block rules %s"
 msgstr ""
 
-#: src/etc/inc/filter.inc:2746
+#: src/etc/inc/filter.inc:2761
 #, php-format
 msgid "The gateway: %s is invalid or unknown, not using it."
 msgstr ""
 
-#: src/etc/inc/filter.inc:2765
+#: src/etc/inc/filter.inc:2780
 #, php-format
 msgid "Creating rule %s"
 msgstr ""
 
-#: src/etc/inc/filter.inc:3008
+#: src/etc/inc/filter.inc:3023
 #, php-format
 msgid "[TDR DEBUG] status true -- rule type '%s'"
 msgstr ""
 
-#: src/etc/inc/filter.inc:3052
+#: src/etc/inc/filter.inc:3067
 msgid "Creating default rules"
 msgstr ""
 
-#: src/etc/inc/filter.inc:3703
+#: src/etc/inc/filter.inc:3748
 msgid "Creating IPsec rules..."
 msgstr ""
 
-#: src/etc/inc/filter.inc:3756
+#: src/etc/inc/filter.inc:3801
 msgid ""
 "Please use filter_tdr_install_cron() function tdr_install_cron will be "
 "deprecated!"
 msgstr ""
 
-#: src/etc/inc/filter.inc:3805
+#: src/etc/inc/filter.inc:3850
 msgid "Installed 15 minute filter reload for Time Based Rules"
 msgstr ""
 
-#: src/etc/inc/filter.inc:3812
+#: src/etc/inc/filter.inc:3857
 msgid "Removed 15 minute filter reload for Time Based Rules"
 msgstr ""
 
-#: src/etc/inc/filter.inc:4177
+#: src/etc/inc/filter.inc:4222
 #, php-format
 msgid "Checking for %1$s PF hooks in package %2$s"
 msgstr ""
 
-#: src/etc/inc/filter.inc:4184
+#: src/etc/inc/filter.inc:4229
 #, php-format
 msgid "Processing early %1$s rules for package %2$s"
 msgstr ""
 
-#: src/etc/inc/filter.inc:4189
+#: src/etc/inc/filter.inc:4234
 #, php-format
 msgid "There was an error while parsing the package filter rules for %s."
 msgstr ""
 
-#: src/etc/inc/filter.inc:4255
+#: src/etc/inc/filter.inc:4300
 msgid "delete this separator"
 msgstr ""
 
@@ -1850,12 +1887,12 @@ msgstr ""
 
 #: src/etc/inc/gmirror.inc:73 src/etc/inc/shaper.inc:805
 #: src/etc/inc/shaper.inc:1201 src/etc/inc/shaper.inc:1414
-#: src/etc/inc/shaper.inc:3281 src/etc/inc/shaper.inc:3828
-#: src/etc/inc/shaper.inc:4141 src/usr/local/www/diag_gmirror.php:221
+#: src/etc/inc/shaper.inc:3282 src/etc/inc/shaper.inc:3829
+#: src/etc/inc/shaper.inc:4142 src/usr/local/www/diag_gmirror.php:221
 #: src/usr/local/www/diag_gmirror.php:302
 #: src/usr/local/www/firewall_aliases.php:196
-#: src/usr/local/www/firewall_aliases_edit.php:141
-#: src/usr/local/www/firewall_aliases_edit.php:639
+#: src/usr/local/www/firewall_aliases_edit.php:142
+#: src/usr/local/www/firewall_aliases_edit.php:649
 #: src/usr/local/www/firewall_aliases_import.php:64
 #: src/usr/local/www/firewall_schedule.php:93
 #: src/usr/local/www/interfaces_groups.php:79
@@ -1881,12 +1918,12 @@ msgstr ""
 #: src/usr/local/www/status_lb_vs.php:62
 #: src/usr/local/www/status_openvpn.php:224
 #: src/usr/local/www/status_openvpn.php:280
-#: src/usr/local/www/system_camanager.php:357
-#: src/usr/local/www/system_certmanager.php:949
+#: src/usr/local/www/system_camanager.php:362
+#: src/usr/local/www/system_certmanager.php:952
 #: src/usr/local/www/system_crlmanager.php:576
-#: src/usr/local/www/system_gateways.php:242
-#: src/usr/local/www/system_gateways_edit.php:108
-#: src/usr/local/www/system_gateways_edit.php:604
+#: src/usr/local/www/system_gateways.php:256
+#: src/usr/local/www/system_gateways_edit.php:109
+#: src/usr/local/www/system_gateways_edit.php:617
 #: src/usr/local/www/system_groupmanager.php:230
 #: src/usr/local/www/system_usermanager.php:438
 #: src/usr/local/www/system_usermanager.php:488
@@ -1898,12 +1935,12 @@ msgstr ""
 
 #: src/etc/inc/gmirror.inc:74 src/usr/local/www/diag_arp.php:336
 #: src/usr/local/www/diag_gmirror.php:222 src/usr/local/www/easyrule.php:78
-#: src/usr/local/www/index.php:289 src/usr/local/www/pkg_mgr_install.php:475
-#: src/usr/local/www/status_captiveportal.php:92
-#: src/usr/local/www/status_captiveportal_expire.php:53
-#: src/usr/local/www/status_captiveportal_test.php:53
-#: src/usr/local/www/status_captiveportal_voucher_rolls.php:52
-#: src/usr/local/www/status_captiveportal_vouchers.php:52
+#: src/usr/local/www/index.php:289 src/usr/local/www/pkg_mgr_install.php:485
+#: src/usr/local/www/status_captiveportal.php:97
+#: src/usr/local/www/status_captiveportal_expire.php:57
+#: src/usr/local/www/status_captiveportal_test.php:57
+#: src/usr/local/www/status_captiveportal_voucher_rolls.php:57
+#: src/usr/local/www/status_captiveportal_vouchers.php:57
 #: src/usr/local/www/status_carp.php:106 src/usr/local/www/status_carp.php:174
 #: src/usr/local/www/status_dhcp_leases.php:36
 #: src/usr/local/www/status_dhcpv6_leases.php:37
@@ -1929,7 +1966,7 @@ msgstr ""
 #: src/usr/local/www/status_logs_filter_summary.php:67
 #: src/usr/local/www/status_logs_settings.php:188
 #: src/usr/local/www/status_logs_vpn.php:84
-#: src/usr/local/www/status_ntpd.php:254 src/usr/local/www/status_ntpd.php:266
+#: src/usr/local/www/status_ntpd.php:258 src/usr/local/www/status_ntpd.php:270
 #: src/usr/local/www/status_openvpn.php:30
 #: src/usr/local/www/status_openvpn.php:144
 #: src/usr/local/www/status_openvpn.php:225
@@ -1953,11 +1990,11 @@ msgstr ""
 msgid "Component"
 msgstr ""
 
-#: src/etc/inc/gwlb.inc:177
+#: src/etc/inc/gwlb.inc:179
 msgid "No gateways to monitor. dpinger will not run."
 msgstr ""
 
-#: src/etc/inc/gwlb.inc:225 src/etc/inc/gwlb.inc:267
+#: src/etc/inc/gwlb.inc:227 src/etc/inc/gwlb.inc:268
 #, php-format
 msgid ""
 "Removing static route for monitor %1$s and adding a new route through %2$s"
@@ -1978,39 +2015,39 @@ msgstr ""
 msgid "dpinger: cannot connect to status socket %1$s - %2$s (%3$s)"
 msgstr ""
 
-#: src/etc/inc/gwlb.inc:914
+#: src/etc/inc/gwlb.inc:932
 #, php-format
 msgid "MONITOR: %1$s is down, omitting from routing group %2$s"
 msgstr ""
 
-#: src/etc/inc/gwlb.inc:918
+#: src/etc/inc/gwlb.inc:936
 #, php-format
 msgid "MONITOR: %1$s has packet loss, omitting from routing group %2$s"
 msgstr ""
 
-#: src/etc/inc/gwlb.inc:922
+#: src/etc/inc/gwlb.inc:940
 #, php-format
 msgid "MONITOR: %1$s has high latency, omitting from routing group %2$s"
 msgstr ""
 
-#: src/etc/inc/gwlb.inc:940
+#: src/etc/inc/gwlb.inc:963
 #, php-format
 msgid "MONITOR: %1$s is available now, adding to routing group %2$s"
 msgstr ""
 
-#: src/etc/inc/gwlb.inc:956
+#: src/etc/inc/gwlb.inc:981
 #, php-format
 msgid ""
 "Gateways status could not be determined, considering all as up/active. "
 "(Group: %s)"
 msgstr ""
 
-#: src/etc/inc/gwlb.inc:999
+#: src/etc/inc/gwlb.inc:1024
 #, php-format
 msgid "GATEWAYS: Group %1$s did not have any gateways up on tier %2$s!"
 msgstr ""
 
-#: src/etc/inc/gwlb.inc:1021
+#: src/etc/inc/gwlb.inc:1046
 #, php-format
 msgid "Updating gateway group gateway for %1$s - new gateway is %2$s"
 msgstr ""
@@ -2131,186 +2168,186 @@ msgid ""
 "interfaces_ppps_configure. Using 0.0.0.0 ip!"
 msgstr ""
 
-#: src/etc/inc/interfaces.inc:1654
+#: src/etc/inc/interfaces.inc:1657
 #, php-format
 msgid ""
 "Could not get a PPTP/L2TP Remote IP address from %1$s for %2$s in "
 "interfaces_ppps_configure."
 msgstr ""
 
-#: src/etc/inc/interfaces.inc:1661
+#: src/etc/inc/interfaces.inc:1664
 #, php-format
 msgid ""
 "Device %s does not exist. PPP link cannot start without the modem device."
 msgstr ""
 
-#: src/etc/inc/interfaces.inc:1666
+#: src/etc/inc/interfaces.inc:1669
 #, php-format
 msgid "Unknown %s configured as ppp interface."
 msgstr ""
 
-#: src/etc/inc/interfaces.inc:1986
+#: src/etc/inc/interfaces.inc:1989
 #, php-format
 msgid "Error: cannot open mpd_%1$s.conf in interface_ppps_configure().%2$s"
 msgstr ""
 
-#: src/etc/inc/interfaces.inc:2081
+#: src/etc/inc/interfaces.inc:2084
 #, php-format
 msgid "Starting 3gstats.php on device '%1$s' for interface '%2$s'"
 msgstr ""
 
-#: src/etc/inc/interfaces.inc:2098
+#: src/etc/inc/interfaces.inc:2101
 msgid "Configuring CARP settings..."
 msgstr ""
 
-#: src/etc/inc/interfaces.inc:2139
+#: src/etc/inc/interfaces.inc:2142
 msgid "waiting for pfsync..."
 msgstr ""
 
-#: src/etc/inc/interfaces.inc:2145
+#: src/etc/inc/interfaces.inc:2148
 #, php-format
 msgid "pfsync done in %s seconds."
 msgstr ""
 
-#: src/etc/inc/interfaces.inc:2146
+#: src/etc/inc/interfaces.inc:2149
 msgid "Configuring CARP settings finalize..."
 msgstr ""
 
-#: src/etc/inc/interfaces.inc:2369
+#: src/etc/inc/interfaces.inc:2372
 #, php-format
 msgid ""
 "Interface specified for the virtual IP address %s does not exist. Skipping "
 "this VIP."
 msgstr ""
 
-#: src/etc/inc/interfaces.inc:2429
+#: src/etc/inc/interfaces.inc:2432
 #, php-format
 msgid "Interface %s changed to hostap mode"
 msgstr ""
 
-#: src/etc/inc/interfaces.inc:2433
+#: src/etc/inc/interfaces.inc:2436
 #, php-format
 msgid "Interface %s changed to adhoc mode"
 msgstr ""
 
-#: src/etc/inc/interfaces.inc:2437
+#: src/etc/inc/interfaces.inc:2440
 #, php-format
 msgid "Interface %s changed to infrastructure mode"
 msgstr ""
 
-#: src/etc/inc/interfaces.inc:2450
+#: src/etc/inc/interfaces.inc:2453
 #, php-format
 msgid "Cloning new wireless interface %s"
 msgstr ""
 
-#: src/etc/inc/interfaces.inc:2455
+#: src/etc/inc/interfaces.inc:2458
 #, php-format
 msgid "Failed to clone interface %1$s with error code %2$s, output %3$s"
 msgstr ""
 
-#: src/etc/inc/interfaces.inc:3047
+#: src/etc/inc/interfaces.inc:3051
 #, php-format
 msgid "OpenVPN: Resync server %s"
 msgstr ""
 
-#: src/etc/inc/interfaces.inc:3060
+#: src/etc/inc/interfaces.inc:3064
 #, php-format
 msgid "OpenVPN: Resync client %s"
 msgstr ""
 
-#: src/etc/inc/interfaces.inc:3195
+#: src/etc/inc/interfaces.inc:3199
 #, php-format
 msgid "Deny router advertisements for interface %s"
 msgstr ""
 
-#: src/etc/inc/interfaces.inc:3220
+#: src/etc/inc/interfaces.inc:3224
 msgid "Generating new MAC address."
 msgstr ""
 
-#: src/etc/inc/interfaces.inc:3226
+#: src/etc/inc/interfaces.inc:3230
 #, php-format
 msgid ""
 "The INVALID MAC address (ff:ff:ff:ff:ff:ff) on interface %1$s has been "
 "automatically replaced with %2$s"
 msgstr ""
 
-#: src/etc/inc/interfaces.inc:3292
+#: src/etc/inc/interfaces.inc:3296
 #, php-format
 msgid "There is a conflict on MTU between parent %1$s and VLAN(%2$s)"
 msgstr ""
 
-#: src/etc/inc/interfaces.inc:3483 src/etc/inc/interfaces.inc:3553
-#: src/etc/inc/interfaces.inc:3617
+#: src/etc/inc/interfaces.inc:3487 src/etc/inc/interfaces.inc:3557
+#: src/etc/inc/interfaces.inc:3621
 #, php-format
 msgid "Interface %1$s tracking non-existent interface %2$s"
 msgstr ""
 
-#: src/etc/inc/interfaces.inc:3490 src/etc/inc/interfaces.inc:3496
+#: src/etc/inc/interfaces.inc:3494 src/etc/inc/interfaces.inc:3500
 #, php-format
 msgid "Interface %1$s configured via %2$s type %3$s"
 msgstr ""
 
-#: src/etc/inc/interfaces.inc:3559
+#: src/etc/inc/interfaces.inc:3563
 #, php-format
 msgid ""
 "The interface IPv4 '%1$s' address on interface '%2$s' is not valid, not "
 "configuring 6RD tunnel"
 msgstr ""
 
-#: src/etc/inc/interfaces.inc:3595
+#: src/etc/inc/interfaces.inc:3599
 #, php-format
 msgid "rd6 %1$s with ipv6 address %2$s based on %3$s ipv4 %4$s"
 msgstr ""
 
-#: src/etc/inc/interfaces.inc:3623 src/etc/inc/interfaces.inc:3678
-#: src/etc/inc/interfaces.inc:3764
+#: src/etc/inc/interfaces.inc:3627 src/etc/inc/interfaces.inc:3682
+#: src/etc/inc/interfaces.inc:3768
 #, php-format
 msgid ""
 "The interface IPv4 '%1$s' address on interface '%2$s' is not public, not "
 "configuring 6RD tunnel"
 msgstr ""
 
-#: src/etc/inc/interfaces.inc:3655
+#: src/etc/inc/interfaces.inc:3659
 #, php-format
 msgid "sixto4 %1$s with ipv6 address %2$s based on %3$s ipv4 %4$s"
 msgstr ""
 
-#: src/etc/inc/interfaces.inc:4169
+#: src/etc/inc/interfaces.inc:4173
 #, php-format
 msgid "Error: cannot open %s in DHCP6_Config_File_Override() for reading."
 msgstr ""
 
-#: src/etc/inc/interfaces.inc:4197
+#: src/etc/inc/interfaces.inc:4201
 #, php-format
 msgid ""
 "Error: cannot open dhclient_%s.conf in interface_dhcp_configure() for "
 "writing."
 msgstr ""
 
-#: src/etc/inc/interfaces.inc:4210
+#: src/etc/inc/interfaces.inc:4214
 #, php-format
 msgid "Invalid interface \"%s\" in interface_dhcp_configure()"
 msgstr ""
 
-#: src/etc/inc/interfaces.inc:4266
+#: src/etc/inc/interfaces.inc:4270
 #, php-format
 msgid "Could not bring up %s interface in interface_dhcp_configure()"
 msgstr ""
 
-#: src/etc/inc/interfaces.inc:4359
+#: src/etc/inc/interfaces.inc:4363
 #, php-format
 msgid "Error: cannot open %s in DHCP_Config_File_Override() for reading.\n"
 msgstr ""
 
-#: src/etc/inc/interfaces.inc:5364 src/etc/inc/service-utils.inc:358
+#: src/etc/inc/interfaces.inc:5389 src/etc/inc/service-utils.inc:358
 #: src/usr/local/www/diag_backup.php:489
 #: src/usr/local/www/diag_packet_capture.php:109
-#: src/usr/local/www/firewall_nat_1to1_edit.php:405
-#: src/usr/local/www/firewall_nat_edit.php:671
+#: src/usr/local/www/firewall_nat_1to1_edit.php:415
+#: src/usr/local/www/firewall_nat_edit.php:688
 #: src/usr/local/www/firewall_nat_npt_edit.php:172
 #: src/usr/local/www/firewall_rules.php:162
 #: src/usr/local/www/firewall_rules_edit.php:1032
-#: src/usr/local/www/head.inc:287 src/usr/local/www/head.inc:305
+#: src/usr/local/www/head.inc:314 src/usr/local/www/head.inc:332
 #: src/usr/local/www/status_graph.php:49 src/usr/local/www/status_logs.php:53
 #: src/usr/local/www/status_logs_common.inc:96
 #: src/usr/local/www/status_logs_settings.php:220
@@ -2422,15 +2459,15 @@ msgid "My IP address"
 msgstr ""
 
 #: src/etc/inc/ipsec.inc:77 src/etc/inc/ipsec.inc:89
-#: src/usr/local/www/diag_arp.php:333 src/usr/local/www/services_dhcp.php:1317
+#: src/usr/local/www/diag_arp.php:333 src/usr/local/www/services_dhcp.php:1346
 #: src/usr/local/www/services_dnsmasq_domainoverride_edit.php:67
-#: src/usr/local/www/services_dnsmasq_edit.php:77
+#: src/usr/local/www/services_dnsmasq_edit.php:63
 #: src/usr/local/www/services_unbound_domainoverride_edit.php:63
 #: src/usr/local/www/services_unbound_host_edit.php:78
-#: src/usr/local/www/status_captiveportal.php:150
-#: src/usr/local/www/status_dhcp_leases.php:346
+#: src/usr/local/www/status_captiveportal.php:155
+#: src/usr/local/www/status_dhcp_leases.php:354
 #: src/usr/local/www/system_advanced_network.php:180
-#: src/usr/local/www/system_certmanager.php:740
+#: src/usr/local/www/system_certmanager.php:743
 #: src/usr/local/www/vpn_l2tp_users.php:96
 #: src/usr/local/www/widgets/widgets/captive_portal_status.widget.php:82
 msgid "IP address"
@@ -2452,29 +2489,29 @@ msgstr ""
 msgid "KeyID tag"
 msgstr ""
 
-#: src/etc/inc/ipsec.inc:82 src/usr/local/www/head.inc:267
+#: src/etc/inc/ipsec.inc:82 src/usr/local/www/head.inc:294
 #: src/usr/local/www/services_checkip.php:65
 #: src/usr/local/www/services_checkip_edit.php:106
-#: src/usr/local/www/services_dhcp.php:990
-#: src/usr/local/www/services_dhcp_edit.php:577
-#: src/usr/local/www/services_dhcpv6.php:730
-#: src/usr/local/www/services_dyndns.php:66
-#: src/usr/local/www/services_dyndns_edit.php:239
+#: src/usr/local/www/services_dhcp.php:1008
+#: src/usr/local/www/services_dhcp_edit.php:587
+#: src/usr/local/www/services_dhcpv6.php:744
+#: src/usr/local/www/services_dyndns.php:67
+#: src/usr/local/www/services_dyndns_edit.php:240
 #: src/usr/local/www/services_rfc2136.php:58
 #: src/usr/local/www/services_rfc2136_edit.php:148
 msgid "Dynamic DNS"
 msgstr ""
 
 #: src/etc/inc/ipsec.inc:87 src/usr/local/www/diag_traceroute.php:142
-#: src/usr/local/www/firewall_nat_1to1_edit.php:254
-#: src/usr/local/www/firewall_nat_1to1_edit.php:296
-#: src/usr/local/www/firewall_nat_edit.php:518
-#: src/usr/local/www/firewall_nat_edit.php:558
-#: src/usr/local/www/firewall_nat_edit.php:729
-#: src/usr/local/www/firewall_nat_out_edit.php:495
-#: src/usr/local/www/firewall_nat_out_edit.php:519
-#: src/usr/local/www/firewall_rules_edit.php:1422
-#: src/usr/local/www/interfaces.php:2924
+#: src/usr/local/www/firewall_nat_1to1_edit.php:255
+#: src/usr/local/www/firewall_nat_1to1_edit.php:302
+#: src/usr/local/www/firewall_nat_edit.php:536
+#: src/usr/local/www/firewall_nat_edit.php:576
+#: src/usr/local/www/firewall_nat_edit.php:746
+#: src/usr/local/www/firewall_nat_out_edit.php:493
+#: src/usr/local/www/firewall_nat_out_edit.php:517
+#: src/usr/local/www/firewall_rules_edit.php:1425
+#: src/usr/local/www/interfaces.php:2934
 msgid "Any"
 msgstr ""
 
@@ -2591,13 +2628,13 @@ msgstr ""
 msgid "Mobile Client"
 msgstr ""
 
-#: src/etc/inc/ipsec.inc:411 src/etc/inc/pfsense-utils.inc:2984
-#: src/etc/inc/shaper.inc:3864 src/etc/inc/shaper.inc:4168
+#: src/etc/inc/ipsec.inc:411 src/etc/inc/pfsense-utils.inc:3057
+#: src/etc/inc/shaper.inc:3865 src/etc/inc/shaper.inc:4169
 #: src/usr/local/www/diag_pftop.php:116
-#: src/usr/local/www/firewall_nat_edit.php:893
-#: src/usr/local/www/firewall_rules_edit.php:1533
-#: src/usr/local/www/interfaces.php:1619 src/usr/local/www/interfaces.php:1620
-#: src/usr/local/www/interfaces.php:1644 src/usr/local/www/interfaces.php:1657
+#: src/usr/local/www/firewall_nat_edit.php:910
+#: src/usr/local/www/firewall_rules_edit.php:1536
+#: src/usr/local/www/interfaces.php:1621 src/usr/local/www/interfaces.php:1622
+#: src/usr/local/www/interfaces.php:1646 src/usr/local/www/interfaces.php:1659
 #: src/usr/local/www/services_ntpd_gps.php:240
 #: src/usr/local/www/services_ntpd_pps.php:148
 #: src/usr/local/www/system_advanced_misc.php:437
@@ -2605,7 +2642,7 @@ msgstr ""
 msgid "None"
 msgstr ""
 
-#: src/etc/inc/ipsec.inc:605
+#: src/etc/inc/ipsec.inc:609
 msgid ""
 "Unable to find IPsec daemon leases file. Could not display mobile user stats!"
 msgstr ""
@@ -2681,10 +2718,10 @@ msgstr ""
 msgid "Could not send register Growl on %1$s -- Error: %2$s"
 msgstr ""
 
-#: src/etc/inc/openvpn.inc:43 src/usr/local/www/firewall_rules.php:746
-#: src/usr/local/www/firewall_rules_edit.php:1572
-#: src/usr/local/www/firewall_rules_edit.php:1613
-#: src/usr/local/www/firewall_rules_edit.php:1620
+#: src/etc/inc/openvpn.inc:43 src/usr/local/www/firewall_rules.php:755
+#: src/usr/local/www/firewall_rules_edit.php:1575
+#: src/usr/local/www/firewall_rules_edit.php:1616
+#: src/usr/local/www/firewall_rules_edit.php:1623
 #: src/usr/local/www/status_ipsec.php:329
 #: src/usr/local/www/vpn_ipsec_mobile.php:462
 #: src/usr/local/www/vpn_openvpn_client.php:501
@@ -2692,8 +2729,8 @@ msgid "none"
 msgstr ""
 
 #: src/etc/inc/openvpn.inc:44 src/usr/local/www/diag_pftop.php:94
-#: src/usr/local/www/firewall_rules_edit.php:1575
-#: src/usr/local/www/services_captiveportal.php:976
+#: src/usr/local/www/firewall_rules_edit.php:1578
+#: src/usr/local/www/services_captiveportal.php:966
 msgid "default"
 msgstr ""
 
@@ -2794,12 +2831,13 @@ msgstr ""
 msgid "CA: %s"
 msgstr ""
 
-#: src/etc/inc/openvpn.inc:212 src/usr/local/www/system_certmanager.php:952
+#: src/etc/inc/openvpn.inc:212 src/usr/local/www/system_camanager.php:367
+#: src/usr/local/www/system_certmanager.php:955
 #: src/usr/local/www/system_crlmanager.php:579
 msgid "In Use"
 msgstr ""
 
-#: src/etc/inc/openvpn.inc:215 src/usr/local/www/system_certmanager.php:1015
+#: src/etc/inc/openvpn.inc:215 src/usr/local/www/system_certmanager.php:1018
 msgid "Revoked"
 msgstr ""
 
@@ -2842,34 +2880,34 @@ msgstr ""
 msgid "OpenVPN ID %1$s PID %2$s still running, killing."
 msgstr ""
 
-#: src/etc/inc/openvpn.inc:1320
+#: src/etc/inc/openvpn.inc:1324
 #, php-format
 msgid "Resyncing OpenVPN instances for interface %s."
 msgstr ""
 
-#: src/etc/inc/openvpn.inc:1322
+#: src/etc/inc/openvpn.inc:1326
 msgid "Resyncing OpenVPN instances."
 msgstr ""
 
-#: src/etc/inc/openvpn.inc:1355
+#: src/etc/inc/openvpn.inc:1359
 #, php-format
 msgid "Resyncing OpenVPN for gateway group %1$s server %2$s."
 msgstr ""
 
-#: src/etc/inc/openvpn.inc:1364
+#: src/etc/inc/openvpn.inc:1368
 #, php-format
 msgid "Resyncing OpenVPN for gateway group %1$s client %2$s."
 msgstr ""
 
-#: src/etc/inc/openvpn.inc:1373
+#: src/etc/inc/openvpn.inc:1377
 msgid "openvpn_resync_gwgroup called with null gwgroup parameter."
 msgstr ""
 
-#: src/etc/inc/openvpn.inc:1474 src/etc/inc/openvpn.inc:1601
+#: src/etc/inc/openvpn.inc:1478 src/etc/inc/openvpn.inc:1605
 msgid "Unable to contact daemon"
 msgstr ""
 
-#: src/etc/inc/openvpn.inc:1475 src/etc/inc/openvpn.inc:1602
+#: src/etc/inc/openvpn.inc:1479 src/etc/inc/openvpn.inc:1606
 msgid "Service not running?"
 msgstr ""
 
@@ -2974,158 +3012,158 @@ msgid ""
 "host name."
 msgstr ""
 
-#: src/etc/inc/pfsense-utils.inc:693
+#: src/etc/inc/pfsense-utils.inc:708
 msgid "After synch increase advertising skew"
 msgstr ""
 
-#: src/etc/inc/pfsense-utils.inc:743
+#: src/etc/inc/pfsense-utils.inc:758
 msgid "Error creating socket!"
 msgstr ""
 
-#: src/etc/inc/pfsense-utils.inc:744
+#: src/etc/inc/pfsense-utils.inc:759
 #, php-format
 msgid "Error code is '%1$s' - %2$s"
 msgstr ""
 
-#: src/etc/inc/pfsense-utils.inc:749
+#: src/etc/inc/pfsense-utils.inc:764
 #, php-format
 msgid "setsockopt() failed, error: %s"
 msgstr ""
 
-#: src/etc/inc/pfsense-utils.inc:753
+#: src/etc/inc/pfsense-utils.inc:768
 #, php-format
 msgid "Magic Packet sent (%1$s) to (%2$s) MAC=%3$s"
 msgstr ""
 
-#: src/etc/inc/pfsense-utils.inc:816 src/etc/inc/pfsense-utils.inc:836
+#: src/etc/inc/pfsense-utils.inc:831 src/etc/inc/pfsense-utils.inc:851
 #, php-format
 msgid "Restored %s of config file (maybe from CARP partner)"
 msgstr ""
 
-#: src/etc/inc/pfsense-utils.inc:970
+#: src/etc/inc/pfsense-utils.inc:985
 msgid "reload_interfaces_sync() is starting."
 msgstr ""
 
-#: src/etc/inc/pfsense-utils.inc:979
+#: src/etc/inc/pfsense-utils.inc:994
 msgid "Enabling system routing"
 msgstr ""
 
-#: src/etc/inc/pfsense-utils.inc:983
+#: src/etc/inc/pfsense-utils.inc:998
 msgid "Cleaning up Interfaces"
 msgstr ""
 
-#: src/etc/inc/pfsense-utils.inc:1365
+#: src/etc/inc/pfsense-utils.inc:1437
 msgid "No history data found!"
 msgstr ""
 
-#: src/etc/inc/pfsense-utils.inc:1497
+#: src/etc/inc/pfsense-utils.inc:1569
 msgid "device not present! Is the modem attached to the system?"
 msgstr ""
 
-#: src/etc/inc/pfsense-utils.inc:1566
+#: src/etc/inc/pfsense-utils.inc:1638
 msgid "running"
 msgstr ""
 
-#: src/etc/inc/pfsense-utils.inc:1567 src/usr/local/www/graph.php:196
+#: src/etc/inc/pfsense-utils.inc:1639 src/usr/local/www/graph.php:196
 msgid "up"
 msgstr ""
 
-#: src/etc/inc/pfsense-utils.inc:1612
+#: src/etc/inc/pfsense-utils.inc:1684
 msgid "blocking"
 msgstr ""
 
-#: src/etc/inc/pfsense-utils.inc:1612
+#: src/etc/inc/pfsense-utils.inc:1684
 msgid "check for ethernet loops"
 msgstr ""
 
-#: src/etc/inc/pfsense-utils.inc:1615
+#: src/etc/inc/pfsense-utils.inc:1687
 msgid "learning"
 msgstr ""
 
-#: src/etc/inc/pfsense-utils.inc:1618
+#: src/etc/inc/pfsense-utils.inc:1690
 msgid "forwarding"
 msgstr ""
 
-#: src/etc/inc/pfsense-utils.inc:1752
+#: src/etc/inc/pfsense-utils.inc:1824
 #, php-format
 msgid "DNSCACHE: Found old IP %1$s and new IP %2$s"
 msgstr ""
 
-#: src/etc/inc/pfsense-utils.inc:1772
+#: src/etc/inc/pfsense-utils.inc:1844
 #, php-format
 msgid "Loading %s cryptographic accelerator module."
 msgstr ""
 
-#: src/etc/inc/pfsense-utils.inc:1789
+#: src/etc/inc/pfsense-utils.inc:1861
 #, php-format
 msgid "Loading %s thermal monitor module."
 msgstr ""
 
-#: src/etc/inc/pfsense-utils.inc:1865 src/etc/inc/pfsense-utils.inc:1920
+#: src/etc/inc/pfsense-utils.inc:1937 src/etc/inc/pfsense-utils.inc:1992
 #, php-format
 msgid "Download file failed with status code %1$s. URL: %2$s"
 msgstr ""
 
-#: src/etc/inc/pfsense-utils.inc:2116
+#: src/etc/inc/pfsense-utils.inc:2188
 #, php-format
 msgid "Could not process non-existent file from alias: %s"
 msgstr ""
 
-#: src/etc/inc/pfsense-utils.inc:2121
+#: src/etc/inc/pfsense-utils.inc:2193
 #, php-format
 msgid "Could not process empty file from alias: %s"
 msgstr ""
 
-#: src/etc/inc/pfsense-utils.inc:2126
+#: src/etc/inc/pfsense-utils.inc:2198
 #, php-format
 msgid "Could not process aliases from alias: %s"
 msgstr ""
 
-#: src/etc/inc/pfsense-utils.inc:2183
+#: src/etc/inc/pfsense-utils.inc:2255
 #, php-format
 msgid "Failed to download alias %s"
 msgstr ""
 
-#: src/etc/inc/pfsense-utils.inc:2212
+#: src/etc/inc/pfsense-utils.inc:2284
 msgid ""
 "Alias archive is a .tar/tgz file which cannot be decompressed because "
 "utility is missing!"
 msgstr ""
 
-#: src/etc/inc/pfsense-utils.inc:2222
+#: src/etc/inc/pfsense-utils.inc:2294
 #, php-format
 msgid "Could not open %s/aliases for writing!"
 msgstr ""
 
-#: src/etc/inc/pfsense-utils.inc:2228
+#: src/etc/inc/pfsense-utils.inc:2300
 #, php-format
 msgid "The following file could not be read %1$s from %2$s"
 msgstr ""
 
-#: src/etc/inc/pfsense-utils.inc:2804
+#: src/etc/inc/pfsense-utils.inc:2876
 msgid "English"
 msgstr ""
 
-#: src/etc/inc/pfsense-utils.inc:2805
+#: src/etc/inc/pfsense-utils.inc:2877
 msgid "Portuguese (Brazil)"
 msgstr ""
 
-#: src/etc/inc/pfsense-utils.inc:2806
+#: src/etc/inc/pfsense-utils.inc:2878
 msgid "Turkish"
 msgstr ""
 
-#: src/etc/inc/pfsense-utils.inc:2992 src/etc/inc/pfsense-utils.inc:3007
-#: src/etc/inc/pfsense-utils.inc:3032
+#: src/etc/inc/pfsense-utils.inc:3065 src/etc/inc/pfsense-utils.inc:3080
+#: src/etc/inc/pfsense-utils.inc:3105
 msgid "No Service"
 msgstr ""
 
-#: src/etc/inc/pfsense-utils.inc:3002 src/etc/inc/pfsense-utils.inc:3044
+#: src/etc/inc/pfsense-utils.inc:3075 src/etc/inc/pfsense-utils.inc:3117
 #: src/usr/local/www/firewall_nat_out.php:229
 #: src/usr/local/www/firewall_nat_out.php:233
-#: src/usr/local/www/interfaces.php:840 src/usr/local/www/interfaces.php:2907
+#: src/usr/local/www/interfaces.php:842 src/usr/local/www/interfaces.php:2917
 #: src/usr/local/www/interfaces_wireless.php:100
 #: src/usr/local/www/interfaces_wireless_edit.php:81
-#: src/usr/local/www/interfaces_wireless_edit.php:187
+#: src/usr/local/www/interfaces_wireless_edit.php:185
 #: src/usr/local/www/load_balancer_pool.php:121
 #: src/usr/local/www/load_balancer_pool_edit.php:73
 #: src/usr/local/www/load_balancer_pool_edit.php:312
@@ -3137,89 +3175,89 @@ msgstr ""
 msgid "Mode"
 msgstr ""
 
-#: src/etc/inc/pfsense-utils.inc:3008
+#: src/etc/inc/pfsense-utils.inc:3081
 msgid "Restricted Service"
 msgstr ""
 
-#: src/etc/inc/pfsense-utils.inc:3009
+#: src/etc/inc/pfsense-utils.inc:3082
 msgid "Valid Service"
 msgstr ""
 
-#: src/etc/inc/pfsense-utils.inc:3010
+#: src/etc/inc/pfsense-utils.inc:3083
 msgid "Restricted Regional Service"
 msgstr ""
 
-#: src/etc/inc/pfsense-utils.inc:3011
+#: src/etc/inc/pfsense-utils.inc:3084
 msgid "Powersaving Service"
 msgstr ""
 
-#: src/etc/inc/pfsense-utils.inc:3017
+#: src/etc/inc/pfsense-utils.inc:3090
 msgid "Invalid SIM/locked State"
 msgstr ""
 
-#: src/etc/inc/pfsense-utils.inc:3018
+#: src/etc/inc/pfsense-utils.inc:3091
 msgid "Valid SIM State"
 msgstr ""
 
-#: src/etc/inc/pfsense-utils.inc:3019
+#: src/etc/inc/pfsense-utils.inc:3092
 msgid "Invalid SIM CS State"
 msgstr ""
 
-#: src/etc/inc/pfsense-utils.inc:3020
+#: src/etc/inc/pfsense-utils.inc:3093
 msgid "Invalid SIM PS State"
 msgstr ""
 
-#: src/etc/inc/pfsense-utils.inc:3021
+#: src/etc/inc/pfsense-utils.inc:3094
 msgid "Invalid SIM CS/PS State"
 msgstr ""
 
-#: src/etc/inc/pfsense-utils.inc:3022
+#: src/etc/inc/pfsense-utils.inc:3095
 msgid "Missing SIM State"
 msgstr ""
 
-#: src/etc/inc/pfsense-utils.inc:3033
+#: src/etc/inc/pfsense-utils.inc:3106
 msgid "Limited Service"
 msgstr ""
 
-#: src/etc/inc/pfsense-utils.inc:3049
+#: src/etc/inc/pfsense-utils.inc:3122
 msgid "Initializing Service"
 msgstr ""
 
-#: src/etc/inc/pfsense-utils.inc:3050
+#: src/etc/inc/pfsense-utils.inc:3123
 msgid "Network Lock error Service"
 msgstr ""
 
-#: src/etc/inc/pfsense-utils.inc:3051
+#: src/etc/inc/pfsense-utils.inc:3124
 msgid "Network Locked Service"
 msgstr ""
 
-#: src/etc/inc/pfsense-utils.inc:3052
+#: src/etc/inc/pfsense-utils.inc:3125
 msgid "Unlocked or correct MCC/MNC Service"
 msgstr ""
 
-#: src/etc/inc/pfsense-utils.inc:3058
+#: src/etc/inc/pfsense-utils.inc:3131
 msgid "No action State"
 msgstr ""
 
-#: src/etc/inc/pfsense-utils.inc:3059
+#: src/etc/inc/pfsense-utils.inc:3132
 msgid "Network lock State"
 msgstr ""
 
-#: src/etc/inc/pfsense-utils.inc:3060
+#: src/etc/inc/pfsense-utils.inc:3133
 msgid "(U)SIM card lock State"
 msgstr ""
 
-#: src/etc/inc/pfsense-utils.inc:3061
+#: src/etc/inc/pfsense-utils.inc:3134
 msgid "Network Lock and (U)SIM card Lock State"
 msgstr ""
 
-#: src/etc/inc/pfsense-utils.inc:3152
+#: src/etc/inc/pfsense-utils.inc:3225
 #, php-format
 msgid ""
 "Alias table restore failed exited with %1$s, the error is: %2$s %3$s%4$s"
 msgstr ""
 
-#: src/etc/inc/pfsense-utils.inc:3154
+#: src/etc/inc/pfsense-utils.inc:3227
 #, php-format
 msgid ""
 "Alias table restore succeeded exited with %1$s, the result is: %2$s %3$s%4$s"
@@ -3229,231 +3267,231 @@ msgstr ""
 msgid "Warning, could not open log for writing."
 msgstr ""
 
-#: src/etc/inc/pkg-utils.inc:183
+#: src/etc/inc/pkg-utils.inc:187
 #, php-format
 msgid ""
 "ERROR!!! An error occurred on pkg execution (rc = %d) with parameters '%s':"
 msgstr ""
 
-#: src/etc/inc/pkg-utils.inc:379 src/etc/inc/pkg-utils.inc:382
+#: src/etc/inc/pkg-utils.inc:383 src/etc/inc/pkg-utils.inc:386
 msgid "ERROR: Error trying to get packages list. Aborting..."
 msgstr ""
 
-#: src/etc/inc/pkg-utils.inc:414 src/etc/inc/pkg-utils.inc:417
+#: src/etc/inc/pkg-utils.inc:418 src/etc/inc/pkg-utils.inc:421
 msgid "ERROR: Error trying to get package version. Aborting..."
 msgstr ""
 
-#: src/etc/inc/pkg-utils.inc:466
+#: src/etc/inc/pkg-utils.inc:470
 #, php-format
 msgid "Running last steps of %s installation."
 msgstr ""
 
-#: src/etc/inc/pkg-utils.inc:479
+#: src/etc/inc/pkg-utils.inc:483
 msgid "Resyncing configuration for all packages."
 msgstr ""
 
-#: src/etc/inc/pkg-utils.inc:501
+#: src/etc/inc/pkg-utils.inc:505
 msgid "Syncing packages..."
 msgstr ""
 
-#: src/etc/inc/pkg-utils.inc:523
+#: src/etc/inc/pkg-utils.inc:527
 msgid "Removing package..."
 msgstr ""
 
-#: src/etc/inc/pkg-utils.inc:556
+#: src/etc/inc/pkg-utils.inc:560
 #, php-format
 msgid ""
 "The %s package is missing its configuration file and must be reinstalled."
 msgstr ""
 
-#: src/etc/inc/pkg-utils.inc:572
+#: src/etc/inc/pkg-utils.inc:576
 #, php-format
 msgid "Reinstalling package %1$s because its include file(%2$s) is missing!"
 msgstr ""
 
-#: src/etc/inc/pkg-utils.inc:575
+#: src/etc/inc/pkg-utils.inc:579
 #, php-format
 msgid "Reinstalling package %s failed. Take appropriate measures!!!"
 msgstr ""
 
-#: src/etc/inc/pkg-utils.inc:668
+#: src/etc/inc/pkg-utils.inc:672
 msgid "Beginning package installation."
 msgstr ""
 
-#: src/etc/inc/pkg-utils.inc:669
+#: src/etc/inc/pkg-utils.inc:673
 #, php-format
 msgid "Beginning package installation for %s ."
 msgstr ""
 
-#: src/etc/inc/pkg-utils.inc:673
+#: src/etc/inc/pkg-utils.inc:677
 msgid "Saving updated package information..."
 msgstr ""
 
-#: src/etc/inc/pkg-utils.inc:676
+#: src/etc/inc/pkg-utils.inc:680
 #, php-format
 msgid "Installed %s package."
 msgstr ""
 
-#: src/etc/inc/pkg-utils.inc:680
+#: src/etc/inc/pkg-utils.inc:684
 #, php-format
 msgid "Overwrote previous installation of %s."
 msgstr ""
 
-#: src/etc/inc/pkg-utils.inc:681
+#: src/etc/inc/pkg-utils.inc:685
 msgid "overwrite!"
 msgstr ""
 
-#: src/etc/inc/pkg-utils.inc:684
+#: src/etc/inc/pkg-utils.inc:688
 #, php-format
 msgid "Intermediate config write during package install for %s."
 msgstr ""
 
-#: src/etc/inc/pkg-utils.inc:688
+#: src/etc/inc/pkg-utils.inc:692
 #, php-format
 msgid "The %s package is not installed.%sInstallation aborted."
 msgstr ""
 
-#: src/etc/inc/pkg-utils.inc:692 src/etc/inc/pkg-utils.inc:724
-#: src/etc/inc/pkg-utils.inc:790
+#: src/etc/inc/pkg-utils.inc:696 src/etc/inc/pkg-utils.inc:728
+#: src/etc/inc/pkg-utils.inc:794
 #, php-format
 msgid "Failed to install package: %s."
 msgstr ""
 
-#: src/etc/inc/pkg-utils.inc:693 src/etc/inc/pkg-utils.inc:725
-#: src/etc/inc/pkg-utils.inc:791
+#: src/etc/inc/pkg-utils.inc:697 src/etc/inc/pkg-utils.inc:729
+#: src/etc/inc/pkg-utils.inc:795
 msgid "Failed to install package."
 msgstr ""
 
-#: src/etc/inc/pkg-utils.inc:698
+#: src/etc/inc/pkg-utils.inc:702
 msgid "Loading package configuration... "
 msgstr ""
 
-#: src/etc/inc/pkg-utils.inc:701
+#: src/etc/inc/pkg-utils.inc:705
 msgid "Configuring package components..."
 msgstr ""
 
-#: src/etc/inc/pkg-utils.inc:713 src/etc/inc/pkg-utils.inc:885
+#: src/etc/inc/pkg-utils.inc:717 src/etc/inc/pkg-utils.inc:889
 msgid "Loading package instructions..."
 msgstr ""
 
-#: src/etc/inc/pkg-utils.inc:720
+#: src/etc/inc/pkg-utils.inc:724
 #, php-format
 msgid "Include %s is missing!"
 msgstr ""
 
-#: src/etc/inc/pkg-utils.inc:731
+#: src/etc/inc/pkg-utils.inc:735
 msgid "Custom commands..."
 msgstr ""
 
-#: src/etc/inc/pkg-utils.inc:734
+#: src/etc/inc/pkg-utils.inc:738
 msgid "Executing custom_php_global_functions()..."
 msgstr ""
 
-#: src/etc/inc/pkg-utils.inc:739
+#: src/etc/inc/pkg-utils.inc:743
 msgid "Executing custom_php_install_command()..."
 msgstr ""
 
-#: src/etc/inc/pkg-utils.inc:744
+#: src/etc/inc/pkg-utils.inc:748
 msgid "Executing custom_php_resync_config_command()..."
 msgstr ""
 
-#: src/etc/inc/pkg-utils.inc:751 src/etc/inc/pkg-utils.inc:833
+#: src/etc/inc/pkg-utils.inc:755 src/etc/inc/pkg-utils.inc:837
 msgid "Menu items... "
 msgstr ""
 
-#: src/etc/inc/pkg-utils.inc:768 src/etc/inc/pkg-utils.inc:848
+#: src/etc/inc/pkg-utils.inc:772 src/etc/inc/pkg-utils.inc:852
 msgid "Services... "
 msgstr ""
 
-#: src/etc/inc/pkg-utils.inc:785
+#: src/etc/inc/pkg-utils.inc:789
 msgid "Loading package configuration... failed!"
 msgstr ""
 
-#: src/etc/inc/pkg-utils.inc:785
+#: src/etc/inc/pkg-utils.inc:789
 msgid "Installation aborted."
 msgstr ""
 
-#: src/etc/inc/pkg-utils.inc:786
+#: src/etc/inc/pkg-utils.inc:790
 msgid "Unable to load package configuration. Installation aborted."
 msgstr ""
 
-#: src/etc/inc/pkg-utils.inc:800
+#: src/etc/inc/pkg-utils.inc:804
 msgid "Writing configuration... "
 msgstr ""
 
-#: src/etc/inc/pkg-utils.inc:802
+#: src/etc/inc/pkg-utils.inc:806
 #, php-format
 msgid "Successfully installed package: %s."
 msgstr ""
 
-#: src/etc/inc/pkg-utils.inc:817
+#: src/etc/inc/pkg-utils.inc:821
 #, php-format
 msgid "The %s package is not installed.%sDeletion aborted."
 msgstr ""
 
-#: src/etc/inc/pkg-utils.inc:822
+#: src/etc/inc/pkg-utils.inc:826
 #, php-format
 msgid "Removing %s package... "
 msgstr ""
 
-#: src/etc/inc/pkg-utils.inc:823
+#: src/etc/inc/pkg-utils.inc:827
 #, php-format
 msgid "Removing %s components..."
 msgstr ""
 
-#: src/etc/inc/pkg-utils.inc:876
+#: src/etc/inc/pkg-utils.inc:880
 #, php-format
 msgid "Intermediate config write during package removal for %s."
 msgstr ""
 
-#: src/etc/inc/pkg-utils.inc:892
+#: src/etc/inc/pkg-utils.inc:896
 #, php-format
 msgid "Include file %s could not be found for inclusion."
 msgstr ""
 
-#: src/etc/inc/pkg-utils.inc:910
+#: src/etc/inc/pkg-utils.inc:914
 msgid "Deinstall commands... "
 msgstr ""
 
-#: src/etc/inc/pkg-utils.inc:915
+#: src/etc/inc/pkg-utils.inc:919
 msgid "Not executing custom deinstall hook because an include is missing."
 msgstr ""
 
-#: src/etc/inc/pkg-utils.inc:922
+#: src/etc/inc/pkg-utils.inc:926
 msgid "Syslog entries... "
 msgstr ""
 
-#: src/etc/inc/pkg-utils.inc:930
+#: src/etc/inc/pkg-utils.inc:934
 msgid "Configuration... "
 msgstr ""
 
-#: src/etc/inc/pkg-utils.inc:933
+#: src/etc/inc/pkg-utils.inc:937
 #, php-format
 msgid "Removed %s package."
 msgstr ""
 
-#: src/etc/inc/pkg-utils.inc:960
+#: src/etc/inc/pkg-utils.inc:964
 msgid ""
 "Waiting for Internet connection to update pkg metadata and finish package "
 "reinstallation"
 msgstr ""
 
-#: src/etc/inc/pkg-utils.inc:973 src/etc/inc/pkg-utils.inc:1012
+#: src/etc/inc/pkg-utils.inc:977 src/etc/inc/pkg-utils.inc:1016
 msgid "Package reinstall"
 msgstr ""
 
-#: src/etc/inc/pkg-utils.inc:974
+#: src/etc/inc/pkg-utils.inc:978
 msgid ""
 "Package reinstall process was ABORTED due to lack of internet connectivity"
 msgstr ""
 
-#: src/etc/inc/pkg-utils.inc:1013
+#: src/etc/inc/pkg-utils.inc:1017
 #, php-format
 msgid ""
 "Package %s does not exist in current %s version and it has been removed."
 msgstr ""
 
-#: src/etc/inc/pkg-utils.inc:1034
+#: src/etc/inc/pkg-utils.inc:1038
 msgid "Stopping all packages."
 msgstr ""
 
@@ -3519,137 +3557,132 @@ msgstr ""
 msgid "User - System: Copy files (scp)"
 msgstr ""
 
-#: src/etc/inc/priv/user.priv.inc:47
-msgid ""
-"Indicates whether this user is allowed to copy files onto the %s appliance "
-"via SCP/SFTP."
-msgstr ""
-
 #: src/etc/inc/priv/user.priv.inc:50
 msgid "User - System: Copy files to home directory (chrooted scp)"
 msgstr ""
 
 #: src/etc/inc/priv/user.priv.inc:51
 msgid ""
-"Indicates whether this user is allowed to copy files to the home directory via SCP/SFTP."
-"Note: User - System - Copy files (scp) conflicts with this privilege."
-"Warning: Manual chroot setup required, see /usr/local/etc/rc.d/scponlyc."
+"Indicates whether this user is allowed to copy files to the home directory "
+"via SCP/SFTP.Note: User - System - Copy files (scp) conflicts with this "
+"privilege.Warning: Manual chroot setup required, see /usr/local/etc/rc.d/"
+"scponlyc."
 msgstr ""
 
-#: src/etc/inc/priv/user.priv.inc:53
+#: src/etc/inc/priv/user.priv.inc:56
 msgid "User - System: SSH tunneling"
 msgstr ""
 
-#: src/etc/inc/priv/user.priv.inc:54
+#: src/etc/inc/priv/user.priv.inc:57
 msgid ""
 "Indicates whether the user is able to login for tunneling via SSH when they "
-"have no shell access. Note: User - System - Copy files and "
-"System: Copy files to home directory (chrooted scp) conflict with this privilege."
+"have no shell access. Note: User - System - Copy files (scp) and System: "
+"Copy files to home directory (chrooted scp) conflict with this privilege."
 msgstr ""
 
-#: src/etc/inc/priv/user.priv.inc:60
+#: src/etc/inc/priv/user.priv.inc:64
 msgid "User - VPN: IPsec xauth Dialin"
 msgstr ""
 
-#: src/etc/inc/priv/user.priv.inc:61
+#: src/etc/inc/priv/user.priv.inc:65
 msgid ""
 "Indicates whether the user is allowed to dial in via IPsec xauth (Note: Does "
 "not allow shell access, but may allow the user to create SSH tunnels)"
 msgstr ""
 
-#: src/etc/inc/priv/user.priv.inc:66
+#: src/etc/inc/priv/user.priv.inc:70
 msgid "User - VPN: L2TP Dialin"
 msgstr ""
 
-#: src/etc/inc/priv/user.priv.inc:67
+#: src/etc/inc/priv/user.priv.inc:71
 msgid "Indicates whether the user is allowed to dial in via L2TP"
 msgstr ""
 
-#: src/etc/inc/priv/user.priv.inc:70
+#: src/etc/inc/priv/user.priv.inc:74
 msgid "User - VPN: PPPOE Dialin"
 msgstr ""
 
-#: src/etc/inc/priv/user.priv.inc:71
+#: src/etc/inc/priv/user.priv.inc:75
 msgid "Indicates whether the user is allowed to dial in via PPPOE"
 msgstr ""
 
-#: src/etc/inc/priv/user.priv.inc:74
+#: src/etc/inc/priv/user.priv.inc:78
 msgid "WebCfg - Status: System Logs: Portal Auth"
 msgstr ""
 
-#: src/etc/inc/priv/user.priv.inc:75
+#: src/etc/inc/priv/user.priv.inc:79
 msgid "Allow access to the 'Status: System Logs: Portal Auth' page."
 msgstr ""
 
-#: src/etc/inc/priv/user.priv.inc:80
+#: src/etc/inc/priv/user.priv.inc:84
 msgid "WebCfg - Status: Logs: DHCP"
 msgstr ""
 
-#: src/etc/inc/priv/user.priv.inc:81
+#: src/etc/inc/priv/user.priv.inc:85
 msgid "Allow access to the 'Status: Logs: DHCP' page."
 msgstr ""
 
-#: src/etc/inc/priv/user.priv.inc:86
+#: src/etc/inc/priv/user.priv.inc:90
 msgid "WebCfg - Status: Logs: Gateways"
 msgstr ""
 
-#: src/etc/inc/priv/user.priv.inc:87
+#: src/etc/inc/priv/user.priv.inc:91
 msgid "Allow access to the 'Status: Logs: System: Gateways' page."
 msgstr ""
 
-#: src/etc/inc/priv/user.priv.inc:92
+#: src/etc/inc/priv/user.priv.inc:96
 msgid "WebCfg - Status: Logs: Resolver"
 msgstr ""
 
-#: src/etc/inc/priv/user.priv.inc:93
+#: src/etc/inc/priv/user.priv.inc:97
 msgid "Allow access to the 'Status: Logs: System: Resolver' page."
 msgstr ""
 
-#: src/etc/inc/priv/user.priv.inc:98 src/etc/inc/priv/user.priv.inc:116
+#: src/etc/inc/priv/user.priv.inc:102 src/etc/inc/priv/user.priv.inc:120
 msgid "WebCfg - Status: System Logs: IPsec VPN"
 msgstr ""
 
-#: src/etc/inc/priv/user.priv.inc:99 src/etc/inc/priv/user.priv.inc:117
+#: src/etc/inc/priv/user.priv.inc:103 src/etc/inc/priv/user.priv.inc:121
 msgid "Allow access to the 'Status: System Logs: IPsec VPN' page."
 msgstr ""
 
-#: src/etc/inc/priv/user.priv.inc:104
+#: src/etc/inc/priv/user.priv.inc:108
 msgid "WebCfg - Status: System Logs: NTP"
 msgstr ""
 
-#: src/etc/inc/priv/user.priv.inc:105
+#: src/etc/inc/priv/user.priv.inc:109
 msgid "Allow access to the 'Status: System Logs: NTP' page."
 msgstr ""
 
-#: src/etc/inc/priv/user.priv.inc:110
+#: src/etc/inc/priv/user.priv.inc:114
 msgid "WebCfg - Status: System Logs: OpenVPN"
 msgstr ""
 
-#: src/etc/inc/priv/user.priv.inc:111
+#: src/etc/inc/priv/user.priv.inc:115
 msgid "Allow access to the 'Status: System Logs: OpenVPN' page."
 msgstr ""
 
-#: src/etc/inc/priv/user.priv.inc:122
+#: src/etc/inc/priv/user.priv.inc:126
 msgid "WebCfg - Status: System Logs: Load Balancer"
 msgstr ""
 
-#: src/etc/inc/priv/user.priv.inc:123
+#: src/etc/inc/priv/user.priv.inc:127
 msgid "Allow access to the 'Status: System Logs: Load Balancer' page."
 msgstr ""
 
-#: src/etc/inc/priv/user.priv.inc:128
+#: src/etc/inc/priv/user.priv.inc:132
 msgid "WebCfg - Status: System Logs: Routing"
 msgstr ""
 
-#: src/etc/inc/priv/user.priv.inc:129
+#: src/etc/inc/priv/user.priv.inc:133
 msgid "Allow access to the 'Status: System Logs: System: Routing' page."
 msgstr ""
 
-#: src/etc/inc/priv/user.priv.inc:134
+#: src/etc/inc/priv/user.priv.inc:138
 msgid "WebCfg - Status: System Logs: Wireless"
 msgstr ""
 
-#: src/etc/inc/priv/user.priv.inc:135
+#: src/etc/inc/priv/user.priv.inc:139
 msgid "Allow access to the 'Status: System Logs: System: Wireless' page."
 msgstr ""
 
@@ -5413,14 +5446,14 @@ msgid "Router Advertisement Daemon"
 msgstr ""
 
 #: src/etc/inc/service-utils.inc:248 src/usr/local/www/diag_backup.php:481
-#: src/usr/local/www/head.inc:257 src/usr/local/www/services_dnsmasq.php:182
+#: src/usr/local/www/head.inc:284 src/usr/local/www/services_dnsmasq.php:227
 #: src/usr/local/www/services_dnsmasq_domainoverride_edit.php:120
-#: src/usr/local/www/services_dnsmasq_edit.php:199
+#: src/usr/local/www/services_dnsmasq_edit.php:185
 msgid "DNS Forwarder"
 msgstr ""
 
 #: src/etc/inc/service-utils.inc:255 src/usr/local/www/diag_backup.php:482
-#: src/usr/local/www/head.inc:258 src/usr/local/www/services_unbound.php:238
+#: src/usr/local/www/head.inc:285 src/usr/local/www/services_unbound.php:238
 #: src/usr/local/www/services_unbound_acls.php:174
 #: src/usr/local/www/services_unbound_advanced.php:187
 #: src/usr/local/www/services_unbound_domainoverride_edit.php:112
@@ -5435,7 +5468,7 @@ msgid "NTP clock sync"
 msgstr ""
 
 #: src/etc/inc/service-utils.inc:270 src/usr/local/www/diag_backup.php:479
-#: src/usr/local/www/head.inc:256 src/usr/local/www/head.inc:294
+#: src/usr/local/www/head.inc:283 src/usr/local/www/head.inc:321
 #: src/usr/local/www/services_captiveportal.php:64
 #: src/usr/local/www/services_captiveportal_filemanager.php:67
 #: src/usr/local/www/services_captiveportal_hostname.php:62
@@ -5448,22 +5481,22 @@ msgstr ""
 #: src/usr/local/www/services_captiveportal_vouchers_edit.php:53
 #: src/usr/local/www/services_captiveportal_zones.php:59
 #: src/usr/local/www/services_captiveportal_zones_edit.php:35
-#: src/usr/local/www/status_captiveportal.php:92
-#: src/usr/local/www/status_captiveportal_expire.php:53
-#: src/usr/local/www/status_captiveportal_test.php:53
-#: src/usr/local/www/status_captiveportal_voucher_rolls.php:52
-#: src/usr/local/www/status_captiveportal_vouchers.php:52
-#: src/usr/local/www/system_certmanager.php:1033
+#: src/usr/local/www/status_captiveportal.php:97
+#: src/usr/local/www/status_captiveportal_expire.php:57
+#: src/usr/local/www/status_captiveportal_test.php:57
+#: src/usr/local/www/status_captiveportal_voucher_rolls.php:57
+#: src/usr/local/www/status_captiveportal_vouchers.php:57
+#: src/usr/local/www/system_certmanager.php:1036
 msgid "Captive Portal"
 msgstr ""
 
-#: src/etc/inc/service-utils.inc:288 src/usr/local/www/head.inc:259
-#: src/usr/local/www/services_dhcp_relay.php:120
+#: src/etc/inc/service-utils.inc:288 src/usr/local/www/head.inc:286
+#: src/usr/local/www/services_dhcp_relay.php:124
 msgid "DHCP Relay"
 msgstr ""
 
-#: src/etc/inc/service-utils.inc:295 src/usr/local/www/head.inc:260
-#: src/usr/local/www/services_dhcpv6_relay.php:118
+#: src/etc/inc/service-utils.inc:295 src/usr/local/www/head.inc:287
+#: src/usr/local/www/services_dhcpv6_relay.php:124
 msgid "DHCPv6 Relay"
 msgstr ""
 
@@ -5512,16 +5545,16 @@ msgid "Stopped"
 msgstr ""
 
 #: src/etc/inc/service-utils.inc:472
-#: src/usr/local/www/firewall_nat_1to1_edit.php:368
-#: src/usr/local/www/firewall_nat_edit.php:634
+#: src/usr/local/www/firewall_nat_1to1_edit.php:378
+#: src/usr/local/www/firewall_nat_edit.php:651
 #: src/usr/local/www/firewall_nat_npt_edit.php:191
-#: src/usr/local/www/firewall_nat_out_edit.php:433
+#: src/usr/local/www/firewall_nat_out_edit.php:431
 #: src/usr/local/www/firewall_rules_edit.php:1114
-#: src/usr/local/www/interfaces.php:2589
+#: src/usr/local/www/interfaces.php:2597
 #: src/usr/local/www/interfaces_ppps_edit.php:748
 #: src/usr/local/www/load_balancer_pool_edit.php:405
 #: src/usr/local/www/services_router_advertisements.php:107
-#: src/usr/local/www/system_gateways_edit.php:579
+#: src/usr/local/www/system_gateways_edit.php:592
 #: src/usr/local/www/system_routes_edit.php:265
 #: src/usr/local/www/system_usermanager.php:566
 #: src/usr/local/www/system_usermanager.php:684
@@ -5590,138 +5623,143 @@ msgstr ""
 msgid "Starting DHCP service..."
 msgstr ""
 
-#: src/etc/inc/services.inc:613
+#: src/etc/inc/services.inc:612
 msgid "Warning!  DHCP Failover setup and no CARP virtual IPs defined!"
 msgstr ""
 
-#: src/etc/inc/services.inc:780
+#: src/etc/inc/services.inc:779
 #, php-format
 msgid ""
 "Invalid DHCP pool %s - %s for %s subnet %s/%s detected. Please correct the "
 "settings in Services, DHCP Server"
 msgstr ""
 
-#: src/etc/inc/services.inc:1143
+#: src/etc/inc/services.inc:1145
 #, php-format
 msgid "Error: cannot open dhcpd.conf in services_dhcpdv4_configure().%s"
 msgstr ""
 
-#: src/etc/inc/services.inc:1647
+#: src/etc/inc/services.inc:1274
+#, php-format
+msgid "DHCP leases v6 restore failed exited with %1$s, the error is: %2$s"
+msgstr ""
+
+#: src/etc/inc/services.inc:1664
 msgid "Could not write Igmpproxy configuration file!"
 msgstr ""
 
-#: src/etc/inc/services.inc:1660
+#: src/etc/inc/services.inc:1677
 msgid "Started IGMP proxy service."
 msgstr ""
 
-#: src/etc/inc/services.inc:1684
+#: src/etc/inc/services.inc:1701
 msgid "Starting DHCP relay service..."
 msgstr ""
 
-#: src/etc/inc/services.inc:1709
+#: src/etc/inc/services.inc:1726
 msgid "No destination IP has been configured!"
 msgstr ""
 
-#: src/etc/inc/services.inc:1782
+#: src/etc/inc/services.inc:1799
 msgid "No suitable interface found for running dhcrelay!"
 msgstr ""
 
-#: src/etc/inc/services.inc:1818
+#: src/etc/inc/services.inc:1835
 msgid "Starting DHCPv6 relay service..."
 msgstr ""
 
-#: src/etc/inc/services.inc:1906
+#: src/etc/inc/services.inc:1923
 msgid "No suitable interface found for running dhcrelay -6!"
 msgstr ""
 
-#: src/etc/inc/services.inc:1966
+#: src/etc/inc/services.inc:1983
 msgid "Starting DynDNS clients..."
 msgstr ""
 
-#: src/etc/inc/services.inc:2072
+#: src/etc/inc/services.inc:2089
 msgid "Starting DNS forwarder..."
 msgstr ""
 
-#: src/etc/inc/services.inc:2238
+#: src/etc/inc/services.inc:2255
 msgid "Starting DNS Resolver..."
 msgstr ""
 
-#: src/etc/inc/services.inc:2283
+#: src/etc/inc/services.inc:2300
 msgid "Starting SNMP daemon... "
 msgstr ""
 
-#: src/etc/inc/services.inc:2289
+#: src/etc/inc/services.inc:2311
 #, php-format
 msgid "Error: cannot open snmpd.conf in services_snmpd_configure().%s"
 msgstr ""
 
-#: src/etc/inc/services.inc:2574
+#: src/etc/inc/services.inc:2606
 #, php-format
 msgid "DynDNS updated IP Address (A) for %1$s on %2$s (%3$s) to %4$s"
 msgstr ""
 
-#: src/etc/inc/services.inc:2579
+#: src/etc/inc/services.inc:2611
 #, php-format
 msgid ""
 "phpDynDNS: Not updating %s A record because the IP address has not changed."
 msgstr ""
 
-#: src/etc/inc/services.inc:2590
+#: src/etc/inc/services.inc:2622
 #, php-format
 msgid "DynDNS updated IPv6 Address (AAAA) for %1$s on %2$s (%3$s) to %4$s"
 msgstr ""
 
-#: src/etc/inc/services.inc:2592
+#: src/etc/inc/services.inc:2624
 #, php-format
 msgid "phpDynDNS: updating cache file %1$s.ipv6: %2$s"
 msgstr ""
 
-#: src/etc/inc/services.inc:2595
+#: src/etc/inc/services.inc:2627
 #, php-format
 msgid ""
 "phpDynDNS: Not updating %s AAAA record because the IPv6 address has not "
 "changed."
 msgstr ""
 
-#: src/etc/inc/services.inc:2645
+#: src/etc/inc/services.inc:2677
 msgid "Created:"
 msgstr ""
 
-#: src/etc/inc/services.inc:2667
+#: src/etc/inc/services.inc:2703
 msgid "If possible do not add items to this file manually."
 msgstr ""
 
-#: src/etc/inc/services.inc:2668
+#: src/etc/inc/services.inc:2704
 msgid ""
 "If done so, this file must be terminated with a blank line (e.g. new line)"
 msgstr ""
 
-#: src/etc/inc/services.inc:2718
+#: src/etc/inc/services.inc:2754
 msgid "Starting UPnP service... "
 msgstr ""
 
-#: src/etc/inc/services.inc:2758
+#: src/etc/inc/services.inc:2794
 #, php-format
 msgid "Installed cron job for %s"
 msgstr ""
 
-#: src/etc/inc/services.inc:2762
+#: src/etc/inc/services.inc:2798
 #, php-format
 msgid "Checked cron job for %s, no change needed"
 msgstr ""
 
-#: src/etc/inc/services.inc:2765
+#: src/etc/inc/services.inc:2801
 #, php-format
 msgid "Updated cron job for %s"
 msgstr ""
 
-#: src/etc/inc/services.inc:2771
+#: src/etc/inc/services.inc:2807
 #, php-format
 msgid "Removed cron job for %s"
 msgstr ""
 
-#: src/etc/inc/shaper.inc:263 src/usr/local/www/system_camanager.php:226
-#: src/usr/local/www/system_certmanager.php:344
+#: src/etc/inc/shaper.inc:263 src/usr/local/www/system_camanager.php:231
+#: src/usr/local/www/system_certmanager.php:347
 #, php-format
 msgid "The field '%s' contains invalid characters."
 msgstr ""
@@ -5732,18 +5770,18 @@ msgid "The field '%s' is required."
 msgstr ""
 
 #: src/etc/inc/shaper.inc:436 src/etc/inc/shaper.inc:1901
-#: src/etc/inc/shaper.inc:2264 src/etc/inc/shaper.inc:2648
-#: src/etc/inc/shaper.inc:2776 src/etc/inc/shaper.inc:2930
-#: src/etc/inc/shaper.inc:3049 src/etc/inc/shaper.inc:3275
-#: src/etc/inc/shaper.inc:3853 src/usr/local/www/interfaces_ppps_edit.php:910
+#: src/etc/inc/shaper.inc:2264 src/etc/inc/shaper.inc:2649
+#: src/etc/inc/shaper.inc:2777 src/etc/inc/shaper.inc:2931
+#: src/etc/inc/shaper.inc:3050 src/etc/inc/shaper.inc:3276
+#: src/etc/inc/shaper.inc:3854 src/usr/local/www/interfaces_ppps_edit.php:910
 #: src/usr/local/www/status_queues.php:163
 #: src/usr/local/www/status_queues.php:167
 msgid "Bandwidth"
 msgstr ""
 
 #: src/etc/inc/shaper.inc:438 src/etc/inc/shaper.inc:1903
-#: src/etc/inc/shaper.inc:2650 src/etc/inc/shaper.inc:2932
-#: src/etc/inc/shaper.inc:3279
+#: src/etc/inc/shaper.inc:2651 src/etc/inc/shaper.inc:2933
+#: src/etc/inc/shaper.inc:3280
 msgid "Bandwidthtype"
 msgstr ""
 
@@ -5825,7 +5863,7 @@ msgstr ""
 msgid "The priority must be an integer between 1 and 15."
 msgstr ""
 
-#: src/etc/inc/shaper.inc:1222 src/etc/inc/shaper.inc:3294
+#: src/etc/inc/shaper.inc:1222 src/etc/inc/shaper.inc:3295
 msgid "Queue limit must be an integer"
 msgstr ""
 
@@ -5834,7 +5872,7 @@ msgid "Queue limit must be positive"
 msgstr ""
 
 #: src/etc/inc/shaper.inc:1228 src/etc/inc/shaper.inc:1231
-#: src/etc/inc/shaper.inc:3297 src/etc/inc/shaper.inc:3300
+#: src/etc/inc/shaper.inc:3298 src/etc/inc/shaper.inc:3301
 msgid "Queue names must be alphanumeric and _ or - only."
 msgstr ""
 
@@ -5868,7 +5906,7 @@ msgstr ""
 msgid "Scheduler options"
 msgstr ""
 
-#: src/etc/inc/shaper.inc:1450 src/usr/local/www/firewall_rules_edit.php:1655
+#: src/etc/inc/shaper.inc:1450 src/usr/local/www/firewall_rules_edit.php:1658
 msgid "Default Queue"
 msgstr ""
 
@@ -5878,7 +5916,8 @@ msgstr ""
 
 #: src/etc/inc/shaper.inc:1458
 msgid ""
-"<a target=\"_new\" href=\"http://www.openbsd.org/faq/pf/queueing.html#red\">"
+"<a target=\"_new\" href=\"https://web.archive.org/web/20160404153707/http://"
+"www.openbsd.org/faq/pf/queueing.html#red\">"
 msgstr ""
 
 #: src/etc/inc/shaper.inc:1465
@@ -5887,7 +5926,8 @@ msgstr ""
 
 #: src/etc/inc/shaper.inc:1465
 msgid ""
-"<a target=\"_new\" href=\"http://www.openbsd.org/faq/pf/queueing.html#rio\">"
+"<a target=\"_new\" href=\"https://web.archive.org/web/20160404153707/http://"
+"www.openbsd.org/faq/pf/queueing.html#rio\">"
 msgstr ""
 
 #: src/etc/inc/shaper.inc:1472
@@ -5896,7 +5936,8 @@ msgstr ""
 
 #: src/etc/inc/shaper.inc:1472 src/etc/inc/shaper.inc:1479
 msgid ""
-"<a target=\"_new\" href=\"http://www.openbsd.org/faq/pf/queueing.html#ecn\">"
+"<a target=\"_new\" href=\"https://web.archive.org/web/20160404153707/http://"
+"www.openbsd.org/faq/pf/queueing.html#ecn\">"
 msgstr ""
 
 #: src/etc/inc/shaper.inc:1479
@@ -5907,35 +5948,35 @@ msgstr ""
 msgid "Select options for this queue"
 msgstr ""
 
-#: src/etc/inc/shaper.inc:1487 src/etc/inc/shaper.inc:3889
-#: src/etc/inc/shaper.inc:4193 src/usr/local/www/firewall_aliases.php:198
-#: src/usr/local/www/firewall_aliases_edit.php:647
-#: src/usr/local/www/firewall_aliases_edit.php:704
-#: src/usr/local/www/firewall_aliases_import.php:234
-#: src/usr/local/www/firewall_nat.php:215
+#: src/etc/inc/shaper.inc:1487 src/etc/inc/shaper.inc:3890
+#: src/etc/inc/shaper.inc:4194 src/usr/local/www/firewall_aliases.php:198
+#: src/usr/local/www/firewall_aliases_edit.php:657
+#: src/usr/local/www/firewall_aliases_edit.php:714
+#: src/usr/local/www/firewall_aliases_import.php:243
+#: src/usr/local/www/firewall_nat.php:234
 #: src/usr/local/www/firewall_nat_1to1.php:154
-#: src/usr/local/www/firewall_nat_1to1_edit.php:477
-#: src/usr/local/www/firewall_nat_edit.php:864
+#: src/usr/local/www/firewall_nat_1to1_edit.php:487
+#: src/usr/local/www/firewall_nat_edit.php:881
 #: src/usr/local/www/firewall_nat_npt.php:153
 #: src/usr/local/www/firewall_nat_npt_edit.php:235
 #: src/usr/local/www/firewall_nat_out.php:286
 #: src/usr/local/www/firewall_nat_out.php:539
 #: src/usr/local/www/firewall_nat_out_edit.php:629
-#: src/usr/local/www/firewall_rules.php:383
-#: src/usr/local/www/firewall_rules_edit.php:1394
+#: src/usr/local/www/firewall_rules.php:392
+#: src/usr/local/www/firewall_rules_edit.php:1397
 #: src/usr/local/www/firewall_schedule.php:95
 #: src/usr/local/www/firewall_schedule_edit.php:371
 #: src/usr/local/www/firewall_schedule_edit.php:615
 #: src/usr/local/www/firewall_virtual_ip.php:265
-#: src/usr/local/www/firewall_virtual_ip_edit.php:431
-#: src/usr/local/www/guiconfig.inc:1073 src/usr/local/www/interfaces.php:1698
-#: src/usr/local/www/interfaces.php:1858 src/usr/local/www/interfaces.php:3169
+#: src/usr/local/www/firewall_virtual_ip_edit.php:424
+#: src/usr/local/www/guiconfig.inc:1074 src/usr/local/www/interfaces.php:1700
+#: src/usr/local/www/interfaces.php:1863 src/usr/local/www/interfaces.php:3180
 #: src/usr/local/www/interfaces_bridge.php:104
 #: src/usr/local/www/interfaces_bridge_edit.php:408
 #: src/usr/local/www/interfaces_gif.php:99
 #: src/usr/local/www/interfaces_gif_edit.php:225
 #: src/usr/local/www/interfaces_gre.php:99
-#: src/usr/local/www/interfaces_gre_edit.php:208
+#: src/usr/local/www/interfaces_gre_edit.php:212
 #: src/usr/local/www/interfaces_groups.php:81
 #: src/usr/local/www/interfaces_lagg.php:106
 #: src/usr/local/www/interfaces_lagg_edit.php:254
@@ -5946,7 +5987,7 @@ msgstr ""
 #: src/usr/local/www/interfaces_vlan.php:110
 #: src/usr/local/www/interfaces_vlan_edit.php:208
 #: src/usr/local/www/interfaces_wireless.php:101
-#: src/usr/local/www/interfaces_wireless_edit.php:198
+#: src/usr/local/www/interfaces_wireless_edit.php:196
 #: src/usr/local/www/load_balancer_monitor.php:108
 #: src/usr/local/www/load_balancer_monitor_edit.php:86
 #: src/usr/local/www/load_balancer_monitor_edit.php:277
@@ -5956,27 +5997,27 @@ msgstr ""
 #: src/usr/local/www/load_balancer_virtual_server_edit.php:183
 #: src/usr/local/www/pkg_mgr.php:67 src/usr/local/www/pkg_mgr.php:157
 #: src/usr/local/www/pkg_mgr_installed.php:78
-#: src/usr/local/www/services_captiveportal_hostname.php:118
+#: src/usr/local/www/services_captiveportal_hostname.php:119
 #: src/usr/local/www/services_captiveportal_hostname_edit.php:191
-#: src/usr/local/www/services_captiveportal_ip.php:113
-#: src/usr/local/www/services_captiveportal_ip_edit.php:226
+#: src/usr/local/www/services_captiveportal_ip.php:114
+#: src/usr/local/www/services_captiveportal_ip_edit.php:229
 #: src/usr/local/www/services_captiveportal_mac.php:178
 #: src/usr/local/www/services_captiveportal_mac_edit.php:232
 #: src/usr/local/www/services_captiveportal_zones.php:81
 #: src/usr/local/www/services_checkip.php:90
 #: src/usr/local/www/services_checkip_edit.php:165
-#: src/usr/local/www/services_dhcp.php:663
-#: src/usr/local/www/services_dhcp.php:1319
-#: src/usr/local/www/services_dhcp_edit.php:463
-#: src/usr/local/www/services_dhcpv6.php:981
+#: src/usr/local/www/services_dhcp.php:671
+#: src/usr/local/www/services_dhcp.php:1348
+#: src/usr/local/www/services_dhcp_edit.php:473
+#: src/usr/local/www/services_dhcpv6.php:1003
 #: src/usr/local/www/services_dhcpv6_edit.php:241
-#: src/usr/local/www/services_dnsmasq.php:322
-#: src/usr/local/www/services_dnsmasq.php:396
+#: src/usr/local/www/services_dnsmasq.php:367
+#: src/usr/local/www/services_dnsmasq.php:441
 #: src/usr/local/www/services_dnsmasq_domainoverride_edit.php:158
-#: src/usr/local/www/services_dnsmasq_edit.php:236
-#: src/usr/local/www/services_dnsmasq_edit.php:285
-#: src/usr/local/www/services_dyndns.php:91
-#: src/usr/local/www/services_dyndns_edit.php:398
+#: src/usr/local/www/services_dnsmasq_edit.php:222
+#: src/usr/local/www/services_dnsmasq_edit.php:271
+#: src/usr/local/www/services_dyndns.php:92
+#: src/usr/local/www/services_dyndns_edit.php:399
 #: src/usr/local/www/services_igmpproxy.php:91
 #: src/usr/local/www/services_igmpproxy_edit.php:162
 #: src/usr/local/www/services_pppoe.php:106
@@ -5993,7 +6034,7 @@ msgstr ""
 #: src/usr/local/www/services_unbound_host_edit.php:286
 #: src/usr/local/www/services_wol.php:177
 #: src/usr/local/www/services_wol_edit.php:140
-#: src/usr/local/www/status_dhcp_leases.php:349
+#: src/usr/local/www/status_dhcp_leases.php:365
 #: src/usr/local/www/status_gateway_groups.php:65
 #: src/usr/local/www/status_gateways.php:66
 #: src/usr/local/www/status_graph.php:166
@@ -6007,8 +6048,8 @@ msgstr ""
 #: src/usr/local/www/system_gateway_groups.php:133
 #: src/usr/local/www/system_gateway_groups_edit.php:308
 #: src/usr/local/www/system_gateway_groups_edit.php:337
-#: src/usr/local/www/system_gateways.php:246
-#: src/usr/local/www/system_gateways_edit.php:664
+#: src/usr/local/www/system_gateways.php:260
+#: src/usr/local/www/system_gateways_edit.php:684
 #: src/usr/local/www/system_groupmanager.php:231
 #: src/usr/local/www/system_groupmanager.php:290
 #: src/usr/local/www/system_groupmanager.php:395
@@ -6099,145 +6140,145 @@ msgstr ""
 msgid "Service Curve (sc)"
 msgstr ""
 
-#: src/etc/inc/shaper.inc:2284 src/etc/inc/shaper.inc:2796
-#: src/etc/inc/shaper.inc:3069
+#: src/etc/inc/shaper.inc:2285 src/etc/inc/shaper.inc:2797
+#: src/etc/inc/shaper.inc:3070
 msgid "Choose the amount of bandwidth for this queue"
 msgstr ""
 
-#: src/etc/inc/shaper.inc:2288
+#: src/etc/inc/shaper.inc:2289
 msgid "Max bandwidth for queue."
 msgstr ""
 
-#: src/etc/inc/shaper.inc:2302 src/etc/inc/shaper.inc:2335
-#: src/etc/inc/shaper.inc:2367
+#: src/etc/inc/shaper.inc:2303 src/etc/inc/shaper.inc:2336
+#: src/etc/inc/shaper.inc:2368
 msgid "m1"
 msgstr ""
 
-#: src/etc/inc/shaper.inc:2309 src/etc/inc/shaper.inc:2342
-#: src/etc/inc/shaper.inc:2374
+#: src/etc/inc/shaper.inc:2310 src/etc/inc/shaper.inc:2343
+#: src/etc/inc/shaper.inc:2375
 msgid "d"
 msgstr ""
 
-#: src/etc/inc/shaper.inc:2316 src/etc/inc/shaper.inc:2349
-#: src/etc/inc/shaper.inc:2381
+#: src/etc/inc/shaper.inc:2317 src/etc/inc/shaper.inc:2350
+#: src/etc/inc/shaper.inc:2382
 msgid "m2"
 msgstr ""
 
-#: src/etc/inc/shaper.inc:2321
+#: src/etc/inc/shaper.inc:2322
 msgid "Min bandwidth for queue."
 msgstr ""
 
-#: src/etc/inc/shaper.inc:2353
+#: src/etc/inc/shaper.inc:2354
 msgid "B/W share of a backlogged queue."
 msgstr ""
 
-#: src/etc/inc/shaper.inc:2645
+#: src/etc/inc/shaper.inc:2646
 msgid "Priority must be an integer between 1 and 7."
 msgstr ""
 
-#: src/etc/inc/shaper.inc:2774
+#: src/etc/inc/shaper.inc:2775
 msgid "NOTITLE"
 msgstr ""
 
-#: src/etc/inc/shaper.inc:2802
+#: src/etc/inc/shaper.inc:2803
 msgid "Scheduler option"
 msgstr ""
 
-#: src/etc/inc/shaper.inc:2927
+#: src/etc/inc/shaper.inc:2928
 msgid "Priority must be an integer between 1 and 255."
 msgstr ""
 
-#: src/etc/inc/shaper.inc:3075
+#: src/etc/inc/shaper.inc:3076
 msgid "Scheduler specific options"
 msgstr ""
 
-#: src/etc/inc/shaper.inc:3078
+#: src/etc/inc/shaper.inc:3079
 msgid "Number of buckets available"
 msgstr ""
 
-#: src/etc/inc/shaper.inc:3085
+#: src/etc/inc/shaper.inc:3086
 msgid "Bandwidth limit for hosts to not saturate link"
 msgstr ""
 
-#: src/etc/inc/shaper.inc:3287
+#: src/etc/inc/shaper.inc:3288
 msgid "Packet Loss Rate must be a value between 0 and 1."
 msgstr ""
 
-#: src/etc/inc/shaper.inc:3291
+#: src/etc/inc/shaper.inc:3292
 msgid "Buckets must be an integer between 16 and 65535."
 msgstr ""
 
-#: src/etc/inc/shaper.inc:3304
+#: src/etc/inc/shaper.inc:3305
 msgid "IPv4 bit mask must be blank or numeric value between 1 and 32."
 msgstr ""
 
-#: src/etc/inc/shaper.inc:3309
+#: src/etc/inc/shaper.inc:3310
 msgid "IPv6 bit mask must be blank or numeric value between 1 and 128."
 msgstr ""
 
-#: src/etc/inc/shaper.inc:3405
+#: src/etc/inc/shaper.inc:3406
 #, php-format
 msgid "SHAPER: Could not create queue %1$s on interface %2$s because: %3$s"
 msgstr ""
 
-#: src/etc/inc/shaper.inc:3463
+#: src/etc/inc/shaper.inc:3464
 #, php-format
 msgid "Bandwidth for schedule %s must be an integer."
 msgstr ""
 
-#: src/etc/inc/shaper.inc:3465
+#: src/etc/inc/shaper.inc:3466
 #, php-format
 msgid "Burst for schedule %s must be an integer."
 msgstr ""
 
-#: src/etc/inc/shaper.inc:3472
+#: src/etc/inc/shaper.inc:3473
 msgid "A schedule needs to be specified for every additional entry."
 msgstr ""
 
-#: src/etc/inc/shaper.inc:3475
+#: src/etc/inc/shaper.inc:3476
 msgid ""
 "If more than one bandwidth configured all schedules need to be selected."
 msgstr ""
 
-#: src/etc/inc/shaper.inc:3478
+#: src/etc/inc/shaper.inc:3479
 msgid "At least one bw specification is necessary."
 msgstr ""
 
-#: src/etc/inc/shaper.inc:3481
+#: src/etc/inc/shaper.inc:3482
 msgid "Delay must be an integer."
 msgstr ""
 
-#: src/etc/inc/shaper.inc:3785 src/usr/local/www/firewall_aliases_edit.php:711
-#: src/usr/local/www/firewall_nat.php:452
+#: src/etc/inc/shaper.inc:3786 src/usr/local/www/firewall_aliases_edit.php:721
+#: src/usr/local/www/firewall_nat.php:471
 #: src/usr/local/www/firewall_nat_1to1.php:245
 #: src/usr/local/www/firewall_nat_npt.php:234
 #: src/usr/local/www/firewall_nat_out.php:503
-#: src/usr/local/www/firewall_rules.php:815
+#: src/usr/local/www/firewall_rules.php:824
 #: src/usr/local/www/firewall_schedule_edit.php:619
 #: src/usr/local/www/firewall_schedule_edit.php:1116
 #: src/usr/local/www/interfaces_assign.php:542
 #: src/usr/local/www/interfaces_qinq_edit.php:298
 #: src/usr/local/www/interfaces_vlan.php:133
-#: src/usr/local/www/pkg_edit.php:1430 src/usr/local/www/services_dhcp.php:1258
-#: src/usr/local/www/services_dhcpv6.php:922
-#: src/usr/local/www/services_dnsmasq_edit.php:289
+#: src/usr/local/www/pkg_edit.php:1430 src/usr/local/www/services_dhcp.php:1287
+#: src/usr/local/www/services_dhcpv6.php:944
+#: src/usr/local/www/services_dnsmasq_edit.php:275
 #: src/usr/local/www/services_igmpproxy_edit.php:231
-#: src/usr/local/www/services_ntpd.php:249
+#: src/usr/local/www/services_ntpd.php:262
 #: src/usr/local/www/services_ntpd_acls.php:286
 #: src/usr/local/www/services_pppoe_edit.php:523
 #: src/usr/local/www/services_router_advertisements.php:406
 #: src/usr/local/www/services_unbound_acls.php:266
 #: src/usr/local/www/services_unbound_host_edit.php:290
-#: src/usr/local/www/system_certmanager.php:755
+#: src/usr/local/www/system_certmanager.php:758
 #: src/usr/local/www/system_usermanager.php:614
 msgid "Delete"
 msgstr ""
 
-#: src/etc/inc/shaper.inc:3793
+#: src/etc/inc/shaper.inc:3794
 msgid "Add Schedule"
 msgstr ""
 
-#: src/etc/inc/shaper.inc:3816 src/etc/inc/shaper.inc:4129
+#: src/etc/inc/shaper.inc:3817 src/etc/inc/shaper.inc:4130
 #: src/usr/local/www/firewall_shaper.php:383
 #: src/usr/local/www/firewall_shaper_queues.php:212
 #: src/usr/local/www/firewall_shaper_vinterface.php:39
@@ -6246,22 +6287,23 @@ msgstr ""
 msgid "Limiters"
 msgstr ""
 
-#: src/etc/inc/shaper.inc:3820 src/etc/inc/shaper.inc:4133
-#: src/usr/local/www/firewall_nat_1to1_edit.php:488
-#: src/usr/local/www/firewall_rules.php:766
-#: src/usr/local/www/interfaces.php:1690 src/usr/local/www/interfaces.php:2967
-#: src/usr/local/www/services_captiveportal.php:545
+#: src/etc/inc/shaper.inc:3821 src/etc/inc/shaper.inc:4134
+#: src/usr/local/www/firewall_nat_1to1_edit.php:498
+#: src/usr/local/www/firewall_rules.php:775
+#: src/usr/local/www/interfaces.php:1692 src/usr/local/www/interfaces.php:2977
+#: src/usr/local/www/services_captiveportal.php:535
 #: src/usr/local/www/services_captiveportal_vouchers.php:450
 #: src/usr/local/www/services_checkip_edit.php:123
-#: src/usr/local/www/services_dhcp.php:763
-#: src/usr/local/www/services_dhcp.php:1145
-#: src/usr/local/www/services_dhcp_relay.php:144
-#: src/usr/local/www/services_dhcpv6_relay.php:142
-#: src/usr/local/www/services_dnsmasq.php:204
+#: src/usr/local/www/services_dhcp.php:766
+#: src/usr/local/www/services_dhcp.php:773
+#: src/usr/local/www/services_dhcp.php:1173
+#: src/usr/local/www/services_dhcp_relay.php:148
+#: src/usr/local/www/services_dhcpv6_relay.php:148
+#: src/usr/local/www/services_dnsmasq.php:249
 #: src/usr/local/www/services_pppoe_edit.php:298
 #: src/usr/local/www/services_rfc2136_edit.php:165
-#: src/usr/local/www/services_snmp.php:196
-#: src/usr/local/www/services_snmp.php:239
+#: src/usr/local/www/services_snmp.php:213
+#: src/usr/local/www/services_snmp.php:256
 #: src/usr/local/www/services_unbound.php:267
 #: src/usr/local/www/vpn_ipsec_phase1.php:855
 #: src/usr/local/www/vpn_l2tp.php:196 src/usr/local/www/vpn_l2tp.php:282
@@ -6269,19 +6311,19 @@ msgstr ""
 msgid "Enable"
 msgstr ""
 
-#: src/etc/inc/shaper.inc:3864 src/etc/inc/shaper.inc:4168
+#: src/etc/inc/shaper.inc:3865 src/etc/inc/shaper.inc:4169
 msgid "Source addresses"
 msgstr ""
 
-#: src/etc/inc/shaper.inc:3864 src/etc/inc/shaper.inc:4168
+#: src/etc/inc/shaper.inc:3865 src/etc/inc/shaper.inc:4169
 msgid "Destination addresses"
 msgstr ""
 
-#: src/etc/inc/shaper.inc:3862 src/etc/inc/shaper.inc:4166
+#: src/etc/inc/shaper.inc:3863 src/etc/inc/shaper.inc:4167
 msgid "Mask"
 msgstr ""
 
-#: src/etc/inc/shaper.inc:3865 src/etc/inc/shaper.inc:4169
+#: src/etc/inc/shaper.inc:3866 src/etc/inc/shaper.inc:4170
 msgid ""
 "If \"source\" or \"destination\" slots is chosen a dynamic pipe with the "
 "bandwidth, delay, packet loss and queue size given above will be created for "
@@ -6289,36 +6331,36 @@ msgid ""
 "possible to easily specify bandwidth limits per host."
 msgstr ""
 
-#: src/etc/inc/shaper.inc:3876 src/etc/inc/shaper.inc:4180
+#: src/etc/inc/shaper.inc:3877 src/etc/inc/shaper.inc:4181
 msgid "IPv4 mask bits<br />255.255.255.255/?"
 msgstr ""
 
-#: src/etc/inc/shaper.inc:3883 src/etc/inc/shaper.inc:4187
+#: src/etc/inc/shaper.inc:3884 src/etc/inc/shaper.inc:4188
 msgid ""
 "IPv6 mask bits<br /><span style=\"font-family:consolas\">ffff:ffff:ffff:ffff:"
 "ffff:ffff:ffff:ffff/?</span>"
 msgstr ""
 
-#: src/etc/inc/shaper.inc:3892 src/etc/inc/shaper.inc:4196
-#: src/usr/local/www/firewall_aliases_edit.php:650
-#: src/usr/local/www/firewall_aliases_import.php:237
-#: src/usr/local/www/firewall_nat_1to1_edit.php:480
-#: src/usr/local/www/firewall_nat_edit.php:867
+#: src/etc/inc/shaper.inc:3893 src/etc/inc/shaper.inc:4197
+#: src/usr/local/www/firewall_aliases_edit.php:660
+#: src/usr/local/www/firewall_aliases_import.php:246
+#: src/usr/local/www/firewall_nat_1to1_edit.php:490
+#: src/usr/local/www/firewall_nat_edit.php:884
 #: src/usr/local/www/firewall_nat_npt_edit.php:238
 #: src/usr/local/www/firewall_nat_out_edit.php:632
-#: src/usr/local/www/firewall_virtual_ip_edit.php:434
+#: src/usr/local/www/firewall_virtual_ip_edit.php:427
 #: src/usr/local/www/interfaces_gif_edit.php:228
-#: src/usr/local/www/interfaces_gre_edit.php:211
+#: src/usr/local/www/interfaces_gre_edit.php:215
 #: src/usr/local/www/interfaces_qinq_edit.php:256
-#: src/usr/local/www/interfaces_wireless_edit.php:201
+#: src/usr/local/www/interfaces_wireless_edit.php:199
 #: src/usr/local/www/services_captiveportal_hostname_edit.php:194
 #: src/usr/local/www/services_captiveportal_zones_edit.php:95
 #: src/usr/local/www/services_checkip_edit.php:168
-#: src/usr/local/www/services_dhcp_edit.php:466
+#: src/usr/local/www/services_dhcp_edit.php:476
 #: src/usr/local/www/services_dhcpv6_edit.php:244
 #: src/usr/local/www/services_dnsmasq_domainoverride_edit.php:161
-#: src/usr/local/www/services_dnsmasq_edit.php:239
-#: src/usr/local/www/services_dyndns_edit.php:401
+#: src/usr/local/www/services_dnsmasq_edit.php:225
+#: src/usr/local/www/services_dyndns_edit.php:402
 #: src/usr/local/www/services_igmpproxy_edit.php:165
 #: src/usr/local/www/services_rfc2136_edit.php:291
 #: src/usr/local/www/services_unbound_domainoverride_edit.php:143
@@ -6334,38 +6376,38 @@ msgid ""
 "A description may be entered here for administrative reference (not parsed)."
 msgstr ""
 
-#: src/etc/inc/shaper.inc:3896 src/etc/inc/shaper.inc:4200
-#: src/usr/local/www/firewall_rules_edit.php:1409
-#: src/usr/local/www/firewall_rules_edit.php:1415
+#: src/etc/inc/shaper.inc:3897 src/etc/inc/shaper.inc:4201
+#: src/usr/local/www/firewall_rules_edit.php:1412
+#: src/usr/local/www/firewall_rules_edit.php:1418
 #: src/usr/local/www/interfaces_bridge_edit.php:424
 #: src/usr/local/www/vpn_ipsec_phase1.php:820
 msgid "Advanced Options"
 msgstr ""
 
-#: src/etc/inc/shaper.inc:3900
+#: src/etc/inc/shaper.inc:3901
 msgid "Delay (ms)"
 msgstr ""
 
-#: src/etc/inc/shaper.inc:3903
+#: src/etc/inc/shaper.inc:3904
 msgid ""
 "In most cases, zero (0) should specified here (or leave the field empty)."
 msgstr ""
 
-#: src/etc/inc/shaper.inc:3907 src/etc/inc/shaper.inc:4213
+#: src/etc/inc/shaper.inc:3908 src/etc/inc/shaper.inc:4214
 msgid "Packet Loss Rate"
 msgstr ""
 
-#: src/etc/inc/shaper.inc:3911
+#: src/etc/inc/shaper.inc:3912
 msgid ""
 "In most cases, zero (0) should be specified here (or leave the field empty). "
 "A value of 0.001 means one packet in 1000 gets dropped."
 msgstr ""
 
-#: src/etc/inc/shaper.inc:3916 src/etc/inc/shaper.inc:4222
+#: src/etc/inc/shaper.inc:3917 src/etc/inc/shaper.inc:4223
 msgid "Queue size (slots)"
 msgstr ""
 
-#: src/etc/inc/shaper.inc:3919 src/etc/inc/shaper.inc:4225
+#: src/etc/inc/shaper.inc:3920 src/etc/inc/shaper.inc:4226
 msgid ""
 "In most cases, the field should be left empty. All packets in this pipe are "
 "placed into a fixed-size queue first, then they are delayed by value "
@@ -6373,180 +6415,180 @@ msgid ""
 "destination."
 msgstr ""
 
-#: src/etc/inc/shaper.inc:3924 src/etc/inc/shaper.inc:4230
+#: src/etc/inc/shaper.inc:3925 src/etc/inc/shaper.inc:4231
 msgid "Bucket size (slots)"
 msgstr ""
 
-#: src/etc/inc/shaper.inc:3927
+#: src/etc/inc/shaper.inc:3928
 msgid ""
 "In most cases, this field should be left empty. It increases the hash size "
 "set."
 msgstr ""
 
-#: src/etc/inc/shaper.inc:3998
+#: src/etc/inc/shaper.inc:3999
 msgid "Weight must be an integer between 1 and 100."
 msgstr ""
 
-#: src/etc/inc/shaper.inc:4204 src/usr/local/www/system_gateways_edit.php:691
+#: src/etc/inc/shaper.inc:4205 src/usr/local/www/system_gateways_edit.php:711
 msgid "Weight"
 msgstr ""
 
-#: src/etc/inc/shaper.inc:4208
+#: src/etc/inc/shaper.inc:4209
 msgid ""
 "For queues under the same parent this specifies the share that a queue "
 "gets(values range from 1 to 100), it can be left blank otherwise."
 msgstr ""
 
-#: src/etc/inc/shaper.inc:4217
+#: src/etc/inc/shaper.inc:4218
 msgid ""
 "In most cases, zero (0) should be specified here (or leave the field empty). "
 "A value of 0.001 means one packet in 1000 gets dropped"
 msgstr ""
 
-#: src/etc/inc/shaper.inc:4233
+#: src/etc/inc/shaper.inc:4234
 msgid ""
 "In most cases, this field should be left empty. It increases the hash size "
 "set"
 msgstr ""
 
-#: src/etc/inc/shaper.inc:4628
+#: src/etc/inc/shaper.inc:4629
 msgid "Clone Shaper to this Interface"
 msgstr ""
 
-#: src/etc/inc/shaper.inc:4637
+#: src/etc/inc/shaper.inc:4638
 #, php-format
 msgid "Welcome to the %s Traffic Shaper."
 msgstr ""
 
-#: src/etc/inc/shaper.inc:4640
+#: src/etc/inc/shaper.inc:4641
 #, php-format
 msgid "The tree on the left navigates through the %s."
 msgstr ""
 
-#: src/etc/inc/shaper.inc:4641
+#: src/etc/inc/shaper.inc:4642
 msgid "queues"
 msgstr ""
 
-#: src/etc/inc/shaper.inc:4642
+#: src/etc/inc/shaper.inc:4643
 msgid "limiters"
 msgstr ""
 
-#: src/etc/inc/shaper.inc:4644
+#: src/etc/inc/shaper.inc:4645
 #, php-format
 msgid ""
 "Buttons at the bottom represent %s actions and are activated accordingly."
 msgstr ""
 
-#: src/etc/inc/shaper.inc:4645 src/usr/local/www/diag_pftop.php:97
+#: src/etc/inc/shaper.inc:4646 src/usr/local/www/diag_pftop.php:97
 msgid "queue"
 msgstr ""
 
-#: src/etc/inc/shaper.inc:4646
+#: src/etc/inc/shaper.inc:4647
 msgid "limiter"
 msgstr ""
 
-#: src/etc/inc/system.inc:426
+#: src/etc/inc/system.inc:423
 msgid "Error: cannot open hosts file in system_hosts_generate()."
 msgstr ""
 
-#: src/etc/inc/system.inc:582
+#: src/etc/inc/system.inc:579
 msgid "Not adding default route because OLSR dynamic gateway is enabled."
 msgstr ""
 
-#: src/etc/inc/system.inc:610
+#: src/etc/inc/system.inc:603
 #, php-format
 msgid "ROUTING: setting default route to %s"
 msgstr ""
 
-#: src/etc/inc/system.inc:621
+#: src/etc/inc/system.inc:614
 #, php-format
 msgid "ROUTING: setting IPv6 default route to %s"
 msgstr ""
 
-#: src/etc/inc/system.inc:642
+#: src/etc/inc/system.inc:635
 #, php-format
 msgid "Static Routes: Gateway IP could not be found for %s"
 msgstr ""
 
-#: src/etc/inc/system.inc:857
+#: src/etc/inc/system.inc:846
 msgid "Starting syslog..."
 msgstr ""
 
-#: src/etc/inc/system.inc:1030
+#: src/etc/inc/system.inc:1019
 #, php-format
 msgid "Error: cannot open syslog.conf in system_syslogd_start().%s"
 msgstr ""
 
-#: src/etc/inc/system.inc:1109
+#: src/etc/inc/system.inc:1096
 msgid "Creating SSL Certificate for this host"
 msgstr ""
 
-#: src/etc/inc/system.inc:1113
+#: src/etc/inc/system.inc:1100
 #, php-format
 msgid "webConfigurator default (%s)"
 msgstr ""
 
-#: src/etc/inc/system.inc:1125
+#: src/etc/inc/system.inc:1112
 #, php-format
 msgid "Error creating WebGUI Certificate: openssl library returns: %s"
 msgstr ""
 
-#: src/etc/inc/system.inc:1134
+#: src/etc/inc/system.inc:1121
 #, php-format
 msgid "Generated new self-signed HTTPS certificate (%s)"
 msgstr ""
 
-#: src/etc/inc/system.inc:1142
+#: src/etc/inc/system.inc:1129
 msgid "Starting webConfigurator..."
 msgstr ""
 
-#: src/etc/inc/system.inc:1192 src/etc/inc/system.inc:2026
-#: src/etc/inc/system.inc:2029
+#: src/etc/inc/system.inc:1179 src/etc/inc/system.inc:2043
+#: src/etc/inc/system.inc:2046
 msgid "failed!"
 msgstr ""
 
-#: src/etc/inc/system.inc:1394
+#: src/etc/inc/system.inc:1381
 #, php-format
 msgid "Error: cannot open certificate file in system_webgui_start().%s"
 msgstr ""
 
-#: src/etc/inc/system.inc:1407
+#: src/etc/inc/system.inc:1394
 #, php-format
 msgid "Error: cannot open certificate key file in system_webgui_start().%s"
 msgstr ""
 
-#: src/etc/inc/system.inc:1434
+#: src/etc/inc/system.inc:1421
 #, php-format
 msgid "Error: cannot open %s in system_generate_nginx_config().%s"
 msgstr ""
 
-#: src/etc/inc/system.inc:1483
+#: src/etc/inc/system.inc:1470
 msgid "Setting timezone..."
 msgstr ""
 
-#: src/etc/inc/system.inc:1865
+#: src/etc/inc/system.inc:1882
 #, php-format
 msgid "Could not open %s/ntpd.conf for writing"
 msgstr ""
 
-#: src/etc/inc/system.inc:1978
+#: src/etc/inc/system.inc:1995
 #, php-format
 msgid "Error: cannot open dmesg.boot in system_dmesg_save().%s"
 msgstr ""
 
-#: src/etc/inc/system.inc:2005
+#: src/etc/inc/system.inc:2022
 msgid "Setting hard disk standby... "
 msgstr ""
 
-#: src/etc/inc/system.inc:2212
+#: src/etc/inc/system.inc:2232
 msgid "PC Engines WRAP"
 msgstr ""
 
-#: src/etc/inc/system.inc:2216 src/etc/inc/system.inc:2235
+#: src/etc/inc/system.inc:2236 src/etc/inc/system.inc:2255
 msgid "PC Engines ALIX"
 msgstr ""
 
-#: src/etc/inc/unbound.inc:766 src/usr/local/www/services_dhcpv6.php:774
+#: src/etc/inc/unbound.inc:766 src/usr/local/www/services_dhcpv6.php:796
 #: src/usr/local/www/services_unbound_acls.php:231
 msgid "Deny"
 msgstr ""
@@ -6798,20 +6840,20 @@ msgid ""
 "Layer 7 shaping is no longer supported. Its configuration has been removed."
 msgstr ""
 
-#: src/etc/inc/util.inc:97
+#: src/etc/inc/util.inc:98
 #, php-format
 msgid "WARNING: Could not mark subsystem: %s dirty"
 msgstr ""
 
-#: src/etc/inc/util.inc:118
+#: src/etc/inc/util.inc:119
 msgid "WARNING: A name must be given as parameter to lock() function."
 msgstr ""
 
-#: src/etc/inc/util.inc:137
+#: src/etc/inc/util.inc:138
 msgid "WARNING: A name must be given as parameter to try_lock() function."
 msgstr ""
 
-#: src/etc/inc/util.inc:1012
+#: src/etc/inc/util.inc:1023
 #, php-format
 msgid ""
 "The %1$s name must be less than 32 characters long, may not consist of only "
@@ -6819,30 +6861,60 @@ msgid ""
 "following characters: %2$s"
 msgstr ""
 
-#: src/etc/inc/util.inc:1019
+#: src/etc/inc/util.inc:1030
 #, php-format
 msgid "The %1$s name must not be either of the reserved words %2$s or %3$s."
 msgstr ""
 
-#: src/etc/inc/util.inc:1026
+#: src/etc/inc/util.inc:1037
 #, php-format
 msgid ""
 "The %1$s name must not be a well-known IP protocol name such as TCP, UDP, "
 "ICMP etc."
 msgstr ""
 
-#: src/etc/inc/util.inc:1033
+#: src/etc/inc/util.inc:1044
 #, php-format
 msgid ""
 "The %1$s name must not be a well-known TCP or UDP port name such as ssh, "
 "smtp, pop3, tftp, http, openvpn etc."
 msgstr ""
 
-#: src/etc/inc/util.inc:1619
+#: src/etc/inc/util.inc:1640
 #, php-format
 msgid "The command '%1$s' returned exit code '%2$d', the output was '%3$s' "
 msgstr ""
 
+#: src/etc/inc/util.inc:2493
+#, php-format
+msgid "%s must be a valid IPv4 address or alias."
+msgstr ""
+
+#: src/etc/inc/util.inc:2497
+#, php-format
+msgid "%s must be a valid IPv4 address."
+msgstr ""
+
+#: src/etc/inc/util.inc:2509
+#, php-format
+msgid "%s must be a valid IPv6 address or alias."
+msgstr ""
+
+#: src/etc/inc/util.inc:2513
+#, php-format
+msgid "%s must be a valid IPv6 address."
+msgstr ""
+
+#: src/etc/inc/util.inc:2527
+#, php-format
+msgid "%s must be a valid IPv4 or IPv6 address or alias."
+msgstr ""
+
+#: src/etc/inc/util.inc:2531
+#, php-format
+msgid "%s must be a valid IPv4 or IPv6 address."
+msgstr ""
+
 #: src/etc/inc/voucher.inc:105
 #, php-format
 msgid "Captive Portal Voucher database synchronized with %s:%s"
@@ -6971,48 +7043,48 @@ msgstr ""
 msgid "Error: Cannot write IPsec CA file for %s"
 msgstr ""
 
-#: src/etc/inc/vpn.inc:1372
+#: src/etc/inc/vpn.inc:1362
 #, php-format
 msgid "No phase2 specifications for tunnel with REQID = %s"
 msgstr ""
 
-#: src/etc/inc/vpn.inc:1491
+#: src/etc/inc/vpn.inc:1481
 #, php-format
 msgid "Ignoring IPsec reload since there are no tunnels on interface %s"
 msgstr ""
 
-#: src/etc/inc/vpn.inc:1497
+#: src/etc/inc/vpn.inc:1487
 msgid "Forcefully reloading IPsec"
 msgstr ""
 
-#: src/etc/inc/vpn.inc:1547
+#: src/etc/inc/vpn.inc:1537
 msgid "Configuring PPPoE Server service... "
 msgstr ""
 
-#: src/etc/inc/vpn.inc:1572
+#: src/etc/inc/vpn.inc:1562
 #, php-format
 msgid "Error: cannot open mpd.conf in vpn_pppoe_configure()."
 msgstr ""
 
-#: src/etc/inc/vpn.inc:1689
+#: src/etc/inc/vpn.inc:1679
 #, php-format
 msgid "Error: cannot open mpd.secret in vpn_pppoe_configure()."
 msgstr ""
 
-#: src/etc/inc/vpn.inc:1723
+#: src/etc/inc/vpn.inc:1713
 msgid "done"
 msgstr ""
 
-#: src/etc/inc/vpn.inc:1745
+#: src/etc/inc/vpn.inc:1735
 msgid "Configuring l2tp VPN service... "
 msgstr ""
 
-#: src/etc/inc/vpn.inc:1784
+#: src/etc/inc/vpn.inc:1774
 #, php-format
 msgid "Error: cannot open mpd.conf in vpn_l2tp_configure()."
 msgstr ""
 
-#: src/etc/inc/vpn.inc:1881
+#: src/etc/inc/vpn.inc:1871
 #, php-format
 msgid "Error: cannot open mpd.secret in vpn_l2tp_configure()."
 msgstr ""
@@ -7046,19 +7118,19 @@ msgstr ""
 msgid "Error returned while trying to parse %s"
 msgstr ""
 
-#: src/etc/inc/xmlrpc_client.inc:89
+#: src/etc/inc/xmlrpc_client.inc:91
 #, php-format
 msgid "Beginning XMLRPC sync data to %s."
 msgstr ""
 
-#: src/etc/inc/xmlrpc_client.inc:92
+#: src/etc/inc/xmlrpc_client.inc:94
 #, php-format
 msgid ""
 "A communications error occurred while attempting XMLRPC sync with %s "
 "(pfsense.%s)."
 msgstr ""
 
-#: src/etc/inc/xmlrpc_client.inc:123
+#: src/etc/inc/xmlrpc_client.inc:125
 msgid "Error code received"
 msgstr ""
 
@@ -7098,22 +7170,22 @@ msgstr ""
 #: src/usr/local/www/classes/Form/Section.class.php:78
 #: src/usr/local/www/diag_gmirror.php:54 src/usr/local/www/diag_gmirror.php:198
 #: src/usr/local/www/diag_gmirror.php:200
-#: src/usr/local/www/pkg_mgr_install.php:332
-#: src/usr/local/www/pkg_mgr_install.php:334
-#: src/usr/local/www/pkg_mgr_install.php:344
-#: src/usr/local/www/pkg_mgr_install.php:346
+#: src/usr/local/www/pkg_mgr_install.php:338
+#: src/usr/local/www/pkg_mgr_install.php:340
+#: src/usr/local/www/pkg_mgr_install.php:350
+#: src/usr/local/www/pkg_mgr_install.php:352
 msgid "Confirm"
 msgstr ""
 
 #: src/usr/local/www/classes/Form.class.php:38
 #: src/usr/local/www/diag_confbak.php:171 src/usr/local/www/diag_edit.php:121
-#: src/usr/local/www/diag_edit.php:123 src/usr/local/www/firewall_nat.php:456
-#: src/usr/local/www/firewall_nat.php:470
+#: src/usr/local/www/diag_edit.php:123 src/usr/local/www/firewall_nat.php:475
+#: src/usr/local/www/firewall_nat.php:489
 #: src/usr/local/www/firewall_nat_1to1.php:249
 #: src/usr/local/www/firewall_nat_npt.php:238
 #: src/usr/local/www/firewall_nat_out.php:507
-#: src/usr/local/www/firewall_rules.php:819
-#: src/usr/local/www/firewall_rules.php:870
+#: src/usr/local/www/firewall_rules.php:828
+#: src/usr/local/www/firewall_rules.php:879
 #: src/usr/local/www/interfaces_assign.php:575 src/usr/local/www/pkg.php:593
 #: src/usr/local/www/pkg_edit.php:589
 #: src/usr/local/www/services_igmpproxy.php:139
@@ -7123,11 +7195,11 @@ msgstr ""
 #: src/usr/local/www/status_logs_common.inc:940
 #: src/usr/local/www/system_advanced_sysctl.php:94
 #: src/usr/local/www/system_authservers.php:80
-#: src/usr/local/www/system_camanager.php:318
-#: src/usr/local/www/system_camanager.php:348
+#: src/usr/local/www/system_camanager.php:323
+#: src/usr/local/www/system_camanager.php:353
 #: src/usr/local/www/system_certmanager.php:219
-#: src/usr/local/www/system_certmanager.php:520
-#: src/usr/local/www/system_certmanager.php:550
+#: src/usr/local/www/system_certmanager.php:523
+#: src/usr/local/www/system_certmanager.php:553
 #: src/usr/local/www/system_crlmanager.php:255
 #: src/usr/local/www/system_crlmanager.php:339
 #: src/usr/local/www/widgets/widgets/log.widget.php:262
@@ -7156,7 +7228,7 @@ msgstr ""
 #: src/usr/local/www/diag_states_summary.php:192
 #: src/usr/local/www/diag_system_activity.php:31
 #: src/usr/local/www/diag_tables.php:29 src/usr/local/www/diag_testport.php:38
-#: src/usr/local/www/diag_traceroute.php:37 src/usr/local/www/head.inc:580
+#: src/usr/local/www/diag_traceroute.php:37 src/usr/local/www/head.inc:615
 msgid "Diagnostics"
 msgstr ""
 
@@ -7232,7 +7304,7 @@ msgid "The ARP cache entry for %s has been deleted."
 msgstr ""
 
 #: src/usr/local/www/diag_arp.php:269 src/usr/local/www/diag_arp.php:325
-#: src/usr/local/www/head.inc:332
+#: src/usr/local/www/head.inc:359
 msgid "ARP Table"
 msgstr ""
 
@@ -7245,25 +7317,25 @@ msgstr ""
 #: src/usr/local/www/diag_dump_states.php:179
 #: src/usr/local/www/diag_ndp.php:111
 #: src/usr/local/www/diag_packet_capture.php:278
-#: src/usr/local/www/firewall_nat.php:207
+#: src/usr/local/www/firewall_nat.php:226
 #: src/usr/local/www/firewall_nat_1to1.php:150
-#: src/usr/local/www/firewall_nat_1to1_edit.php:119
-#: src/usr/local/www/firewall_nat_1to1_edit.php:122
-#: src/usr/local/www/firewall_nat_1to1_edit.php:410
+#: src/usr/local/www/firewall_nat_1to1_edit.php:118
+#: src/usr/local/www/firewall_nat_1to1_edit.php:121
+#: src/usr/local/www/firewall_nat_1to1_edit.php:420
 #: src/usr/local/www/firewall_nat_edit.php:212
 #: src/usr/local/www/firewall_nat_edit.php:215
-#: src/usr/local/www/firewall_nat_edit.php:676
+#: src/usr/local/www/firewall_nat_edit.php:693
 #: src/usr/local/www/firewall_nat_npt.php:150
 #: src/usr/local/www/firewall_nat_npt_edit.php:99
 #: src/usr/local/www/firewall_nat_npt_edit.php:198
 #: src/usr/local/www/firewall_nat_out.php:278
 #: src/usr/local/www/firewall_nat_out.php:531
 #: src/usr/local/www/firewall_nat_out_edit.php:152
-#: src/usr/local/www/firewall_nat_out_edit.php:475
+#: src/usr/local/www/firewall_nat_out_edit.php:473
 #: src/usr/local/www/firewall_rules_edit.php:1169
 #: src/usr/local/www/firewall_rules_edit.php:1177
 #: src/usr/local/www/firewall_virtual_ip.php:263
-#: src/usr/local/www/firewall_virtual_ip_edit.php:368
+#: src/usr/local/www/firewall_virtual_ip_edit.php:361
 #: src/usr/local/www/interfaces_assign.php:513
 #: src/usr/local/www/interfaces_bridge.php:102
 #: src/usr/local/www/interfaces_gif.php:97
@@ -7273,12 +7345,12 @@ msgstr ""
 #: src/usr/local/www/interfaces_qinq.php:109
 #: src/usr/local/www/interfaces_vlan.php:107
 #: src/usr/local/www/interfaces_wireless.php:99
-#: src/usr/local/www/services_captiveportal.php:214
-#: src/usr/local/www/services_dhcp_relay.php:77
-#: src/usr/local/www/services_dhcpv6_relay.php:78
-#: src/usr/local/www/services_dyndns.php:87
+#: src/usr/local/www/services_captiveportal.php:215
+#: src/usr/local/www/services_dhcp_relay.php:78
+#: src/usr/local/www/services_dhcpv6_relay.php:79
+#: src/usr/local/www/services_dyndns.php:88
 #: src/usr/local/www/services_igmpproxy_edit.php:155
-#: src/usr/local/www/services_ntpd.php:211
+#: src/usr/local/www/services_ntpd.php:215
 #: src/usr/local/www/services_pppoe.php:103
 #: src/usr/local/www/services_pppoe_edit.php:306
 #: src/usr/local/www/services_rfc2136.php:80
@@ -7287,16 +7359,16 @@ msgstr ""
 #: src/usr/local/www/services_wol.php:175
 #: src/usr/local/www/services_wol_edit.php:73
 #: src/usr/local/www/services_wol_edit.php:126
-#: src/usr/local/www/status_dhcp_leases.php:464
+#: src/usr/local/www/status_dhcp_leases.php:497
 #: src/usr/local/www/status_graph.php:136
 #: src/usr/local/www/status_logs_common.inc:470
 #: src/usr/local/www/status_logs_common.inc:502
 #: src/usr/local/www/status_logs_common.inc:505
 #: src/usr/local/www/status_logs_filter.php:151
 #: src/usr/local/www/status_logs_filter_dynamic.php:391
-#: src/usr/local/www/system_gateways.php:243
-#: src/usr/local/www/system_gateways_edit.php:108
-#: src/usr/local/www/system_gateways_edit.php:587
+#: src/usr/local/www/system_gateways.php:257
+#: src/usr/local/www/system_gateways_edit.php:109
+#: src/usr/local/www/system_gateways_edit.php:600
 #: src/usr/local/www/system_routes.php:245
 #: src/usr/local/www/vpn_ipsec_phase1.php:674
 #: src/usr/local/www/vpn_l2tp.php:215
@@ -7309,14 +7381,14 @@ msgstr ""
 #: src/usr/local/www/diag_arp.php:334 src/usr/local/www/diag_ndp.php:109
 #: src/usr/local/www/services_captiveportal_mac.php:177
 #: src/usr/local/www/services_captiveportal_mac_edit.php:99
-#: src/usr/local/www/services_dhcp.php:1316
+#: src/usr/local/www/services_dhcp.php:1345
 #: src/usr/local/www/services_wol.php:147
 #: src/usr/local/www/services_wol.php:176
 #: src/usr/local/www/services_wol_edit.php:73
 #: src/usr/local/www/services_wol_edit.php:133
-#: src/usr/local/www/status_captiveportal.php:153
-#: src/usr/local/www/status_dhcp_leases.php:347
-#: src/usr/local/www/status_dhcpv6_leases.php:433
+#: src/usr/local/www/status_captiveportal.php:158
+#: src/usr/local/www/status_dhcp_leases.php:355
+#: src/usr/local/www/status_dhcpv6_leases.php:440
 #: src/usr/local/www/widgets/widgets/captive_portal_status.widget.php:83
 msgid "MAC address"
 msgstr ""
@@ -7325,24 +7397,24 @@ msgstr ""
 #: src/usr/local/www/diag_ndp.php:110 src/usr/local/www/diag_ping.php:131
 #: src/usr/local/www/diag_testport.php:221
 #: src/usr/local/www/diag_traceroute.php:125
-#: src/usr/local/www/interfaces.php:1912
-#: src/usr/local/www/services_captiveportal_hostname.php:117
+#: src/usr/local/www/interfaces.php:1917
+#: src/usr/local/www/services_captiveportal_hostname.php:118
 #: src/usr/local/www/services_captiveportal_hostname_edit.php:184
-#: src/usr/local/www/services_dhcp.php:1318
-#: src/usr/local/www/services_dhcp_edit.php:440
-#: src/usr/local/www/services_dhcpv6.php:980
+#: src/usr/local/www/services_dhcp.php:1347
+#: src/usr/local/www/services_dhcp_edit.php:450
+#: src/usr/local/www/services_dhcpv6.php:1002
 #: src/usr/local/www/services_dhcpv6_edit.php:234
-#: src/usr/local/www/services_dyndns.php:89
-#: src/usr/local/www/services_dyndns_edit.php:94
-#: src/usr/local/www/services_dyndns_edit.php:286
-#: src/usr/local/www/services_dyndns_edit.php:290
+#: src/usr/local/www/services_dyndns.php:90
+#: src/usr/local/www/services_dyndns_edit.php:95
+#: src/usr/local/www/services_dyndns_edit.php:287
+#: src/usr/local/www/services_dyndns_edit.php:291
 #: src/usr/local/www/services_rfc2136.php:82
 #: src/usr/local/www/services_rfc2136_edit.php:78
 #: src/usr/local/www/services_rfc2136_edit.php:183
-#: src/usr/local/www/status_dhcp_leases.php:348
-#: src/usr/local/www/status_dhcpv6_leases.php:434
-#: src/usr/local/www/system.php:113 src/usr/local/www/system.php:359
-#: src/usr/local/www/widgets/widgets/dyn_dns_status.widget.php:96
+#: src/usr/local/www/status_dhcp_leases.php:364
+#: src/usr/local/www/status_dhcpv6_leases.php:441
+#: src/usr/local/www/system.php:114 src/usr/local/www/system.php:362
+#: src/usr/local/www/widgets/widgets/dyn_dns_status.widget.php:109
 msgid "Hostname"
 msgstr ""
 
@@ -7353,11 +7425,11 @@ msgstr ""
 
 #: src/usr/local/www/diag_arp.php:338 src/usr/local/www/diag_confbak.php:214
 #: src/usr/local/www/firewall_aliases.php:199
-#: src/usr/local/www/firewall_nat.php:216
+#: src/usr/local/www/firewall_nat.php:235
 #: src/usr/local/www/firewall_nat_1to1.php:155
 #: src/usr/local/www/firewall_nat_npt.php:154
 #: src/usr/local/www/firewall_nat_out.php:287
-#: src/usr/local/www/firewall_rules.php:384
+#: src/usr/local/www/firewall_rules.php:393
 #: src/usr/local/www/firewall_schedule.php:96
 #: src/usr/local/www/firewall_virtual_ip.php:266
 #: src/usr/local/www/interfaces_bridge.php:105
@@ -7374,16 +7446,16 @@ msgstr ""
 #: src/usr/local/www/load_balancer_virtual_server.php:147
 #: src/usr/local/www/pkg_mgr_installed.php:79
 #: src/usr/local/www/services_captiveportal_filemanager.php:190
-#: src/usr/local/www/services_captiveportal_hostname.php:119
-#: src/usr/local/www/services_captiveportal_ip.php:114
+#: src/usr/local/www/services_captiveportal_hostname.php:120
+#: src/usr/local/www/services_captiveportal_ip.php:115
 #: src/usr/local/www/services_captiveportal_mac.php:179
 #: src/usr/local/www/services_captiveportal_vouchers.php:395
 #: src/usr/local/www/services_captiveportal_zones.php:82
 #: src/usr/local/www/services_checkip.php:91
-#: src/usr/local/www/services_dhcp.php:664
-#: src/usr/local/www/services_dnsmasq.php:323
-#: src/usr/local/www/services_dnsmasq.php:397
-#: src/usr/local/www/services_dyndns.php:92
+#: src/usr/local/www/services_dhcp.php:672
+#: src/usr/local/www/services_dnsmasq.php:368
+#: src/usr/local/www/services_dnsmasq.php:442
+#: src/usr/local/www/services_dyndns.php:93
 #: src/usr/local/www/services_igmpproxy.php:92
 #: src/usr/local/www/services_pppoe.php:107
 #: src/usr/local/www/services_rfc2136.php:85
@@ -7391,18 +7463,18 @@ msgstr ""
 #: src/usr/local/www/services_unbound.php:513
 #: src/usr/local/www/services_unbound_acls.php:299
 #: src/usr/local/www/services_wol.php:178
-#: src/usr/local/www/status_captiveportal.php:171
-#: src/usr/local/www/status_dhcp_leases.php:354
-#: src/usr/local/www/status_dhcpv6_leases.php:439
+#: src/usr/local/www/status_captiveportal.php:176
+#: src/usr/local/www/status_dhcp_leases.php:370
+#: src/usr/local/www/status_dhcpv6_leases.php:446
 #: src/usr/local/www/status_logs_filter_summary.php:83
 #: src/usr/local/www/status_openvpn.php:147
 #: src/usr/local/www/status_services.php:89
 #: src/usr/local/www/system_authservers.php:438
-#: src/usr/local/www/system_camanager.php:362
-#: src/usr/local/www/system_certmanager.php:954
+#: src/usr/local/www/system_camanager.php:368
+#: src/usr/local/www/system_certmanager.php:957
 #: src/usr/local/www/system_crlmanager.php:580
 #: src/usr/local/www/system_gateway_groups.php:134
-#: src/usr/local/www/system_gateways.php:247
+#: src/usr/local/www/system_gateways.php:261
 #: src/usr/local/www/system_groupmanager.php:292
 #: src/usr/local/www/system_routes.php:247
 #: src/usr/local/www/system_usermanager.php:568
@@ -7478,8 +7550,8 @@ msgid "Authentication failed."
 msgstr ""
 
 #: src/usr/local/www/diag_authentication.php:69
-#: src/usr/local/www/guiconfig.inc:157 src/usr/local/www/head.inc:333
-#: src/usr/local/www/services_captiveportal.php:695
+#: src/usr/local/www/guiconfig.inc:158 src/usr/local/www/head.inc:360
+#: src/usr/local/www/services_captiveportal.php:685
 msgid "Authentication"
 msgstr ""
 
@@ -7497,8 +7569,8 @@ msgid "Select the authentication server to test against."
 msgstr ""
 
 #: src/usr/local/www/diag_authentication.php:116
-#: src/usr/local/www/diag_smart.php:378 src/usr/local/www/diag_testport.php:269
-#: src/usr/local/www/status_captiveportal_test.php:104
+#: src/usr/local/www/diag_smart.php:278 src/usr/local/www/diag_testport.php:269
+#: src/usr/local/www/status_captiveportal_test.php:108
 msgid "Test"
 msgstr ""
 
@@ -7536,9 +7608,9 @@ msgid "Clear Package Lock"
 msgstr ""
 
 #: src/usr/local/www/diag_backup.php:179 src/usr/local/www/diag_command.php:245
-#: src/usr/local/www/services_captiveportal.php:1092
-#: src/usr/local/www/services_captiveportal.php:1126
-#: src/usr/local/www/services_captiveportal.php:1158
+#: src/usr/local/www/services_captiveportal.php:1091
+#: src/usr/local/www/services_captiveportal.php:1125
+#: src/usr/local/www/services_captiveportal.php:1157
 msgid "Download"
 msgstr ""
 
@@ -7616,7 +7688,7 @@ msgstr ""
 #: src/usr/local/www/firewall_aliases_edit.php:38
 #: src/usr/local/www/firewall_aliases_import.php:38
 #: src/usr/local/www/firewall_aliases_import.php:64
-#: src/usr/local/www/head.inc:246
+#: src/usr/local/www/head.inc:273
 msgid "Aliases"
 msgstr ""
 
@@ -7624,16 +7696,17 @@ msgstr ""
 msgid "Captive Portal Vouchers"
 msgstr ""
 
-#: src/usr/local/www/diag_backup.php:483 src/usr/local/www/head.inc:263
-#: src/usr/local/www/services_dhcp.php:699
-#: src/usr/local/www/services_dhcp_edit.php:388
+#: src/usr/local/www/diag_backup.php:483 src/usr/local/www/head.inc:290
+#: src/usr/local/www/services_dhcp.php:707
+#: src/usr/local/www/services_dhcp_edit.php:397
 msgid "DHCP Server"
 msgstr ""
 
 #: src/usr/local/www/diag_backup.php:484
-#: src/usr/local/www/services_dhcpv6.php:471
-#: src/usr/local/www/services_dhcpv6.php:549
-#: src/usr/local/www/services_dhcpv6.php:564
+#: src/usr/local/www/services_dhcpv6.php:485
+#: src/usr/local/www/services_dhcpv6.php:559
+#: src/usr/local/www/services_dhcpv6.php:570
+#: src/usr/local/www/services_dhcpv6.php:577
 #: src/usr/local/www/services_dhcpv6_edit.php:201
 #: src/usr/local/www/services_router_advertisements.php:283
 msgid "DHCPv6 Server"
@@ -7643,15 +7716,15 @@ msgstr ""
 msgid "Firewall Rules"
 msgstr ""
 
-#: src/usr/local/www/diag_backup.php:486 src/usr/local/www/head.inc:301
-#: src/usr/local/www/interfaces.php:1616
+#: src/usr/local/www/diag_backup.php:486 src/usr/local/www/head.inc:328
+#: src/usr/local/www/interfaces.php:1618
 #: src/usr/local/www/interfaces_assign.php:34
 #: src/usr/local/www/interfaces_bridge.php:75
 #: src/usr/local/www/interfaces_bridge_edit.php:384
 #: src/usr/local/www/interfaces_gif.php:69
 #: src/usr/local/www/interfaces_gif_edit.php:165
 #: src/usr/local/www/interfaces_gre.php:70
-#: src/usr/local/www/interfaces_gre_edit.php:155
+#: src/usr/local/www/interfaces_gre_edit.php:159
 #: src/usr/local/www/interfaces_groups.php:54
 #: src/usr/local/www/interfaces_groups_edit.php:33
 #: src/usr/local/www/interfaces_lagg.php:76
@@ -7663,10 +7736,10 @@ msgstr ""
 #: src/usr/local/www/interfaces_vlan.php:76
 #: src/usr/local/www/interfaces_vlan_edit.php:172
 #: src/usr/local/www/interfaces_wireless.php:71
-#: src/usr/local/www/interfaces_wireless_edit.php:167
-#: src/usr/local/www/services_captiveportal.php:552
+#: src/usr/local/www/interfaces_wireless_edit.php:165
+#: src/usr/local/www/services_captiveportal.php:542
 #: src/usr/local/www/services_captiveportal_zones.php:79
-#: src/usr/local/www/services_dnsmasq.php:286
+#: src/usr/local/www/services_dnsmasq.php:331
 #: src/usr/local/www/status_interfaces.php:78
 #: src/usr/local/www/status_logs_filter_summary.php:84
 #: src/usr/local/www/widgets/include/interfaces.inc:23
@@ -7677,21 +7750,21 @@ msgstr ""
 msgid "IPSEC"
 msgstr ""
 
-#: src/usr/local/www/diag_backup.php:488 src/usr/local/www/firewall_nat.php:175
+#: src/usr/local/www/diag_backup.php:488 src/usr/local/www/firewall_nat.php:186
 #: src/usr/local/www/firewall_nat_1to1.php:122
-#: src/usr/local/www/firewall_nat_1to1_edit.php:248
-#: src/usr/local/www/firewall_nat_edit.php:621
+#: src/usr/local/www/firewall_nat_1to1_edit.php:249
+#: src/usr/local/www/firewall_nat_edit.php:638
 #: src/usr/local/www/firewall_nat_npt.php:122
 #: src/usr/local/www/firewall_nat_npt_edit.php:178
 #: src/usr/local/www/firewall_nat_out.php:206
 #: src/usr/local/www/firewall_nat_out_edit.php:378
-#: src/usr/local/www/head.inc:247
+#: src/usr/local/www/head.inc:274
 msgid "NAT"
 msgstr ""
 
-#: src/usr/local/www/diag_backup.php:490 src/usr/local/www/head.inc:215
-#: src/usr/local/www/head.inc:578 src/usr/local/www/pkg_mgr.php:38
-#: src/usr/local/www/pkg_mgr.php:129 src/usr/local/www/pkg_mgr_install.php:242
+#: src/usr/local/www/diag_backup.php:490 src/usr/local/www/head.inc:224
+#: src/usr/local/www/head.inc:613 src/usr/local/www/pkg_mgr.php:38
+#: src/usr/local/www/pkg_mgr.php:129 src/usr/local/www/pkg_mgr_install.php:248
 #: src/usr/local/www/pkg_mgr_installed.php:34
 #: src/usr/local/www/pkg_mgr_installed.php:203
 msgid "Package Manager"
@@ -7709,17 +7782,17 @@ msgstr ""
 msgid "Syslog"
 msgstr ""
 
-#: src/usr/local/www/diag_backup.php:494 src/usr/local/www/head.inc:578
+#: src/usr/local/www/diag_backup.php:494 src/usr/local/www/head.inc:613
 #: src/usr/local/www/pkg_mgr.php:38 src/usr/local/www/pkg_mgr.php:129
-#: src/usr/local/www/pkg_mgr_install.php:238
-#: src/usr/local/www/pkg_mgr_install.php:242
+#: src/usr/local/www/pkg_mgr_install.php:244
+#: src/usr/local/www/pkg_mgr_install.php:248
 #: src/usr/local/www/pkg_mgr_installed.php:34
 #: src/usr/local/www/pkg_mgr_installed.php:203
 #: src/usr/local/www/status_logs.php:96
 #: src/usr/local/www/status_logs_common.inc:88
 #: src/usr/local/www/status_logs_settings.php:212
-#: src/usr/local/www/system.php:83 src/usr/local/www/system.php:341
-#: src/usr/local/www/system.php:356
+#: src/usr/local/www/system.php:84 src/usr/local/www/system.php:344
+#: src/usr/local/www/system.php:359
 #: src/usr/local/www/system_advanced_admin.php:283
 #: src/usr/local/www/system_advanced_firewall.php:371
 #: src/usr/local/www/system_advanced_misc.php:286
@@ -7727,13 +7800,13 @@ msgstr ""
 #: src/usr/local/www/system_advanced_notifications.php:188
 #: src/usr/local/www/system_advanced_sysctl.php:121
 #: src/usr/local/www/system_authservers.php:403
-#: src/usr/local/www/system_camanager.php:316
-#: src/usr/local/www/system_certmanager.php:518
+#: src/usr/local/www/system_camanager.php:321
+#: src/usr/local/www/system_certmanager.php:521
 #: src/usr/local/www/system_crlmanager.php:253
 #: src/usr/local/www/system_gateway_groups.php:104
 #: src/usr/local/www/system_gateway_groups_edit.php:147
-#: src/usr/local/www/system_gateways.php:211
-#: src/usr/local/www/system_gateways_edit.php:538
+#: src/usr/local/www/system_gateways.php:225
+#: src/usr/local/www/system_gateways_edit.php:551
 #: src/usr/local/www/system_groupmanager.php:257
 #: src/usr/local/www/system_groupmanager_addprivs.php:36
 #: src/usr/local/www/system_hasync.php:102
@@ -7768,7 +7841,7 @@ msgstr ""
 #: src/usr/local/www/firewall_shaper_queues.php:188
 #: src/usr/local/www/firewall_shaper_vinterface.php:39
 #: src/usr/local/www/firewall_shaper_wizards.php:62
-#: src/usr/local/www/head.inc:250
+#: src/usr/local/www/head.inc:277
 msgid "Traffic Shaper"
 msgstr ""
 
@@ -7776,7 +7849,7 @@ msgstr ""
 msgid "VLANS"
 msgstr ""
 
-#: src/usr/local/www/diag_backup.php:500 src/usr/local/www/head.inc:281
+#: src/usr/local/www/diag_backup.php:500 src/usr/local/www/head.inc:308
 #: src/usr/local/www/services_wol.php:113
 #: src/usr/local/www/services_wol.php:136
 #: src/usr/local/www/services_wol_edit.php:104
@@ -7787,14 +7860,15 @@ msgstr ""
 #: src/usr/local/www/firewall_aliases.php:162
 #: src/usr/local/www/pkg_edit.php:1180
 #: src/usr/local/www/services_ntpd_gps.php:171
+#: src/usr/local/www/services_snmp.php:174
 #: src/usr/local/www/services_unbound.php:220
-#: src/usr/local/www/status_graph.php:155 src/usr/local/www/diag_smart.php:351
+#: src/usr/local/www/status_graph.php:155 src/usr/local/www/diag_smart.php:251
 msgid "All"
 msgstr ""
 
 #: src/usr/local/www/diag_backup.php:518 src/usr/local/www/diag_backup.php:541
 #: src/usr/local/www/diag_confbak.php:99 src/usr/local/www/diag_confbak.php:107
-#: src/usr/local/www/head.inc:334 src/usr/local/www/head.inc:580
+#: src/usr/local/www/head.inc:361 src/usr/local/www/head.inc:615
 msgid "Backup & Restore"
 msgstr ""
 
@@ -7886,7 +7960,7 @@ msgstr ""
 msgid "Uploaded file to /tmp/%s."
 msgstr ""
 
-#: src/usr/local/www/diag_command.php:90 src/usr/local/www/head.inc:335
+#: src/usr/local/www/diag_command.php:90 src/usr/local/www/head.inc:362
 msgid "Command Prompt"
 msgstr ""
 
@@ -7938,7 +8012,7 @@ msgstr ""
 #: src/usr/local/www/system_groupmanager_addprivs.php:187
 #: src/usr/local/www/system_usermanager_addprivs.php:177
 #: src/usr/local/www/widgets/widgets/services_status.widget.php:136
-#: src/usr/local/www/interfaces.php:1993
+#: src/usr/local/www/interfaces.php:1999
 msgid "Clear"
 msgstr ""
 
@@ -7986,8 +8060,8 @@ msgstr ""
 #: src/usr/local/www/diag_confbak.php:116
 #: src/usr/local/www/diag_confbak.php:224
 #: src/usr/local/www/diag_confbak.php:235
-#: src/usr/local/www/firewall_nat_edit.php:944
-#: src/usr/local/www/firewall_nat_edit.php:951
+#: src/usr/local/www/firewall_nat_edit.php:961
+#: src/usr/local/www/firewall_nat_edit.php:968
 #: src/usr/local/www/firewall_nat_out_edit.php:661
 #: src/usr/local/www/firewall_nat_out_edit.php:668
 msgid "n/j/y H:i:s"
@@ -8078,7 +8152,7 @@ msgstr ""
 #: src/usr/local/www/status_ipsec.php:395
 #: src/usr/local/www/status_ipsec.php:406
 #: src/usr/local/www/status_ipsec.php:415
-#: src/usr/local/www/widgets/widgets/gateways.widget.php:241
+#: src/usr/local/www/widgets/widgets/gateways.widget.php:247
 #: src/usr/local/www/widgets/widgets/installed_packages.widget.php:96
 #: src/usr/local/www/widgets/widgets/smart_status.widget.php:63
 msgid "Unknown"
@@ -8105,7 +8179,7 @@ msgstr ""
 msgid "No backups found."
 msgstr ""
 
-#: src/usr/local/www/diag_defaults.php:40 src/usr/local/www/head.inc:338
+#: src/usr/local/www/diag_defaults.php:40 src/usr/local/www/head.inc:365
 msgid "Factory Defaults"
 msgstr ""
 
@@ -8177,7 +8251,7 @@ msgid "Keep Configuration"
 msgstr ""
 
 #: src/usr/local/www/diag_dns.php:29 src/usr/local/www/diag_dns.php:218
-#: src/usr/local/www/head.inc:336
+#: src/usr/local/www/head.inc:363
 msgid "DNS Lookup"
 msgstr ""
 
@@ -8194,16 +8268,16 @@ msgid "No response"
 msgstr ""
 
 #: src/usr/local/www/diag_dns.php:184 src/usr/local/www/diag_tables.php:261
-#: src/usr/local/www/interfaces.php:3041 src/usr/local/www/interfaces.php:3065
+#: src/usr/local/www/interfaces.php:3051 src/usr/local/www/interfaces.php:3075
 #: src/usr/local/www/load_balancer_pool_edit.php:370
 #: src/usr/local/www/load_balancer_virtual_server.php:142
 #: src/usr/local/www/load_balancer_virtual_server_edit.php:70
 #: src/usr/local/www/load_balancer_virtual_server_edit.php:75
 #: src/usr/local/www/load_balancer_virtual_server_edit.php:190
-#: src/usr/local/www/services_captiveportal_ip_edit.php:220
-#: src/usr/local/www/services_dhcp_edit.php:433
+#: src/usr/local/www/services_captiveportal_ip_edit.php:223
+#: src/usr/local/www/services_dhcp_edit.php:442
 #: src/usr/local/www/services_dnsmasq_domainoverride_edit.php:142
-#: src/usr/local/www/services_dnsmasq_edit.php:229
+#: src/usr/local/www/services_dnsmasq_edit.php:215
 #: src/usr/local/www/services_pppoe_edit.php:415
 #: src/usr/local/www/services_pppoe_edit.php:448
 #: src/usr/local/www/services_pppoe_edit.php:519
@@ -8226,8 +8300,8 @@ msgstr ""
 
 #: src/usr/local/www/diag_dns.php:188 src/usr/local/www/services_rfc2136.php:81
 #: src/usr/local/www/services_rfc2136_edit.php:239
-#: src/usr/local/www/status_ntpd.php:267
-#: src/usr/local/www/system_certmanager.php:1000
+#: src/usr/local/www/status_ntpd.php:271
+#: src/usr/local/www/system_certmanager.php:1003
 #: src/usr/local/www/vpn_l2tp.php:296
 #: src/usr/local/www/vpn_openvpn_client.php:792
 #: src/usr/local/www/widgets/widgets/load_balancer_status.widget.php:60
@@ -8295,7 +8369,7 @@ msgstr ""
 
 #: src/usr/local/www/diag_dns.php:307 src/usr/local/www/diag_ping.php:35
 #: src/usr/local/www/diag_ping.php:127 src/usr/local/www/diag_ping.php:162
-#: src/usr/local/www/head.inc:348
+#: src/usr/local/www/head.inc:375
 msgid "Ping"
 msgstr ""
 
@@ -8329,7 +8403,7 @@ msgstr ""
 #: src/usr/local/www/diag_resetstate.php:80
 #: src/usr/local/www/diag_states_summary.php:152
 #: src/usr/local/www/diag_states_summary.php:154
-#: src/usr/local/www/firewall_rules.php:374 src/usr/local/www/head.inc:356
+#: src/usr/local/www/firewall_rules.php:383 src/usr/local/www/head.inc:383
 msgid "States"
 msgstr ""
 
@@ -8383,13 +8457,13 @@ msgstr ""
 #: src/usr/local/www/diag_dump_states.php:180
 #: src/usr/local/www/diag_packet_capture.php:305
 #: src/usr/local/www/diag_states_summary.php:153
-#: src/usr/local/www/firewall_nat.php:208
+#: src/usr/local/www/firewall_nat.php:227
 #: src/usr/local/www/firewall_nat_edit.php:212
 #: src/usr/local/www/firewall_nat_edit.php:215
-#: src/usr/local/www/firewall_nat_edit.php:685
+#: src/usr/local/www/firewall_nat_edit.php:702
 #: src/usr/local/www/firewall_nat_out_edit.php:152
-#: src/usr/local/www/firewall_nat_out_edit.php:484
-#: src/usr/local/www/firewall_rules.php:375
+#: src/usr/local/www/firewall_nat_out_edit.php:482
+#: src/usr/local/www/firewall_rules.php:384
 #: src/usr/local/www/firewall_rules_edit.php:411
 #: src/usr/local/www/firewall_rules_edit.php:1216
 #: src/usr/local/www/interfaces_bridge_edit.php:539
@@ -8416,7 +8490,7 @@ msgid "Source (Original Source) -> Destination (Original Destination)"
 msgstr ""
 
 #: src/usr/local/www/diag_dump_states.php:182
-#: src/usr/local/www/status_dhcpv6_leases.php:532
+#: src/usr/local/www/status_dhcpv6_leases.php:539
 msgid "State"
 msgstr ""
 
@@ -8429,16 +8503,16 @@ msgstr ""
 msgid "Bytes"
 msgstr ""
 
-#: src/usr/local/www/diag_dump_states.php:253
+#: src/usr/local/www/diag_dump_states.php:248
 #, php-format
 msgid "Remove all state entries from %1$s to %2$s"
 msgstr ""
 
-#: src/usr/local/www/diag_dump_states.php:268
+#: src/usr/local/www/diag_dump_states.php:263
 msgid "No states were found that match the current filter."
 msgstr ""
 
-#: src/usr/local/www/diag_dump_states.php:270
+#: src/usr/local/www/diag_dump_states.php:265
 msgid "No states were found."
 msgstr ""
 
@@ -8487,7 +8561,7 @@ msgstr ""
 msgid "No source tracking entries were found."
 msgstr ""
 
-#: src/usr/local/www/diag_edit.php:31 src/usr/local/www/head.inc:337
+#: src/usr/local/www/diag_edit.php:31 src/usr/local/www/head.inc:364
 msgid "Edit File"
 msgstr ""
 
@@ -8539,7 +8613,7 @@ msgstr ""
 msgid "GoTo Line #"
 msgstr ""
 
-#: src/usr/local/www/diag_gmirror.php:33 src/usr/local/www/head.inc:341
+#: src/usr/local/www/diag_gmirror.php:33 src/usr/local/www/head.inc:368
 msgid "GEOM Mirrors"
 msgstr ""
 
@@ -8705,7 +8779,7 @@ msgid ""
 "followed by an 'insert' action on the new consumer."
 msgstr ""
 
-#: src/usr/local/www/diag_halt.php:45 src/usr/local/www/head.inc:344
+#: src/usr/local/www/diag_halt.php:45 src/usr/local/www/head.inc:371
 msgid "Halt System"
 msgstr ""
 
@@ -8737,13 +8811,13 @@ msgid "Halt the system and power off"
 msgstr ""
 
 #: src/usr/local/www/diag_halt.php:78 src/usr/local/www/diag_reboot.php:119
-#: src/usr/local/www/firewall_nat.php:469
-#: src/usr/local/www/firewall_rules.php:869
-#: src/usr/local/www/interfaces.php:1873 src/usr/local/www/interfaces.php:3184
+#: src/usr/local/www/firewall_nat.php:488
+#: src/usr/local/www/firewall_rules.php:878
+#: src/usr/local/www/interfaces.php:1878 src/usr/local/www/interfaces.php:3195
 msgid "Cancel"
 msgstr ""
 
-#: src/usr/local/www/diag_limiter_info.php:31 src/usr/local/www/head.inc:345
+#: src/usr/local/www/diag_limiter_info.php:31 src/usr/local/www/head.inc:372
 msgid "Limiter Info"
 msgstr ""
 
@@ -8755,7 +8829,7 @@ msgstr ""
 msgid "Limiters:"
 msgstr ""
 
-#: src/usr/local/www/diag_limiter_info.php:43 src/usr/local/www/head.inc:307
+#: src/usr/local/www/diag_limiter_info.php:43 src/usr/local/www/head.inc:334
 #: src/usr/local/www/status_queues.php:110
 msgid "Queues"
 msgstr ""
@@ -8769,15 +8843,15 @@ msgid "Gathering Limiter information, please wait..."
 msgstr ""
 
 #: src/usr/local/www/diag_ndp.php:96 src/usr/local/www/diag_ndp.php:101
-#: src/usr/local/www/head.inc:346
+#: src/usr/local/www/head.inc:373
 msgid "NDP Table"
 msgstr ""
 
 #: src/usr/local/www/diag_ndp.php:108 src/usr/local/www/interfaces.php:578
-#: src/usr/local/www/interfaces.php:1807
-#: src/usr/local/www/services_dhcpv6.php:979
+#: src/usr/local/www/interfaces.php:1810
+#: src/usr/local/www/services_dhcpv6.php:1001
 #: src/usr/local/www/services_dhcpv6_edit.php:226
-#: src/usr/local/www/status_dhcpv6_leases.php:430
+#: src/usr/local/www/status_dhcpv6_leases.php:437
 msgid "IPv6 address"
 msgstr ""
 
@@ -8786,7 +8860,7 @@ msgstr ""
 msgid "Download Capture"
 msgstr ""
 
-#: src/usr/local/www/diag_packet_capture.php:84 src/usr/local/www/head.inc:360
+#: src/usr/local/www/diag_packet_capture.php:84 src/usr/local/www/head.inc:387
 msgid "Packet Capture"
 msgstr ""
 
@@ -8834,9 +8908,9 @@ msgstr ""
 #: src/usr/local/www/diag_packet_capture.php:209
 #: src/usr/local/www/diag_packet_capture.php:374
 #: src/usr/local/www/diag_packet_capture.php:450
-#: src/usr/local/www/status_dhcp_leases.php:350
-#: src/usr/local/www/status_dhcpv6_leases.php:435
-#: src/usr/local/www/status_dhcpv6_leases.php:530
+#: src/usr/local/www/status_dhcp_leases.php:366
+#: src/usr/local/www/status_dhcpv6_leases.php:442
+#: src/usr/local/www/status_dhcpv6_leases.php:537
 msgid "Start"
 msgstr ""
 
@@ -8881,7 +8955,7 @@ msgstr ""
 
 #: src/usr/local/www/diag_packet_capture.php:295
 #: src/usr/local/www/firewall_rules_edit.php:1205
-#: src/usr/local/www/system_gateways_edit.php:594
+#: src/usr/local/www/system_gateways_edit.php:607
 msgid "Address Family"
 msgstr ""
 
@@ -8911,14 +8985,11 @@ msgstr ""
 #: src/usr/local/www/diag_packet_capture.php:322
 #: src/usr/local/www/diag_testport.php:52
 #: src/usr/local/www/diag_testport.php:229
-#: src/usr/local/www/firewall_aliases_edit.php:549
-#: src/usr/local/www/firewall_nat_edit.php:847
-#: src/usr/local/www/firewall_nat_out_edit.php:509
-#: src/usr/local/www/firewall_nat_out_edit.php:533
-#: src/usr/local/www/firewall_nat_out_edit.php:596
-#: src/usr/local/www/firewall_rules.php:377
-#: src/usr/local/www/firewall_rules.php:379
-#: src/usr/local/www/interfaces.php:3047 src/usr/local/www/interfaces.php:3071
+#: src/usr/local/www/firewall_aliases_edit.php:559
+#: src/usr/local/www/firewall_nat_edit.php:864
+#: src/usr/local/www/firewall_rules.php:386
+#: src/usr/local/www/firewall_rules.php:388
+#: src/usr/local/www/interfaces.php:3057 src/usr/local/www/interfaces.php:3081
 #: src/usr/local/www/load_balancer_pool.php:123
 #: src/usr/local/www/load_balancer_pool_edit.php:73
 #: src/usr/local/www/load_balancer_pool_edit.php:329
@@ -9014,7 +9085,7 @@ msgstr ""
 msgid "Packets Captured"
 msgstr ""
 
-#: src/usr/local/www/diag_pf_info.php:31 src/usr/local/www/head.inc:350
+#: src/usr/local/www/diag_pf_info.php:31 src/usr/local/www/head.inc:377
 msgid "pfInfo"
 msgstr ""
 
@@ -9034,7 +9105,7 @@ msgstr ""
 msgid "Gathering PF information, please wait..."
 msgstr ""
 
-#: src/usr/local/www/diag_pftop.php:31 src/usr/local/www/head.inc:351
+#: src/usr/local/www/diag_pftop.php:31 src/usr/local/www/head.inc:378
 msgid "pfTop"
 msgstr ""
 
@@ -9070,11 +9141,11 @@ msgstr ""
 msgid "time"
 msgstr ""
 
-#: src/usr/local/www/diag_pftop.php:106 src/usr/local/www/diag_smart.php:298
-#: src/usr/local/www/diag_smart.php:451
-#: src/usr/local/www/services_captiveportal.php:1085
-#: src/usr/local/www/services_captiveportal.php:1119
-#: src/usr/local/www/services_captiveportal.php:1151
+#: src/usr/local/www/diag_pftop.php:106 src/usr/local/www/diag_smart.php:198
+#: src/usr/local/www/diag_smart.php:351
+#: src/usr/local/www/services_captiveportal.php:1084
+#: src/usr/local/www/services_captiveportal.php:1118
+#: src/usr/local/www/services_captiveportal.php:1150
 msgid "View"
 msgstr ""
 
@@ -9114,7 +9185,7 @@ msgstr ""
 
 #: src/usr/local/www/diag_pftop.php:127 src/usr/local/www/diag_testport.php:252
 #: src/usr/local/www/diag_traceroute.php:140
-#: src/usr/local/www/firewall_nat.php:209
+#: src/usr/local/www/firewall_nat.php:228
 #: src/usr/local/www/status_logs_settings.php:340
 msgid "Source Address"
 msgstr ""
@@ -9135,8 +9206,8 @@ msgstr ""
 #: src/usr/local/www/diag_traceroute.php:58
 #: src/usr/local/www/load_balancer_monitor_edit.php:303
 #: src/usr/local/www/load_balancer_monitor_edit.php:329
-#: src/usr/local/www/services_dnsmasq.php:319
-#: src/usr/local/www/services_dnsmasq_edit.php:213
+#: src/usr/local/www/services_dnsmasq.php:364
+#: src/usr/local/www/services_dnsmasq_edit.php:199
 #: src/usr/local/www/services_unbound.php:433
 #: src/usr/local/www/services_unbound_host_edit.php:214
 #: src/usr/local/www/status_ipsec_leases.php:55
@@ -9173,7 +9244,7 @@ msgid "Automatically selected (default)"
 msgstr ""
 
 #: src/usr/local/www/diag_ping.php:146
-#: src/usr/local/www/firewall_nat_1to1_edit.php:127
+#: src/usr/local/www/firewall_nat_1to1_edit.php:126
 #: src/usr/local/www/firewall_nat_edit.php:220
 msgid "Source address"
 msgstr ""
@@ -9191,8 +9262,8 @@ msgid "Select the maximum number of pings."
 msgstr ""
 
 #: src/usr/local/www/diag_reboot.php:43 src/usr/local/www/diag_reboot.php:113
-#: src/usr/local/www/diag_reboot.php:115 src/usr/local/www/head.inc:352
-#: src/usr/local/www/interfaces.php:1961
+#: src/usr/local/www/diag_reboot.php:115 src/usr/local/www/head.inc:379
+#: src/usr/local/www/interfaces.php:1967
 msgid "Reboot"
 msgstr ""
 
@@ -9201,13 +9272,13 @@ msgid "Not actually rebooting (DEBUG is set true)."
 msgstr ""
 
 #: src/usr/local/www/diag_reboot.php:79
-#: src/usr/local/www/pkg_mgr_install.php:687
+#: src/usr/local/www/pkg_mgr_install.php:699
 #, php-format
 msgid "Rebooting%sPage will automatically reload in %s seconds"
 msgstr ""
 
 #: src/usr/local/www/diag_reboot.php:87
-#: src/usr/local/www/pkg_mgr_install.php:695
+#: src/usr/local/www/pkg_mgr_install.php:707
 #, php-format
 msgid "Not yet ready%s Retrying in another %s seconds"
 msgstr ""
@@ -9279,7 +9350,7 @@ msgstr ""
 msgid "Do you really want to reset the selected states?"
 msgstr ""
 
-#: src/usr/local/www/diag_routes.php:65 src/usr/local/www/head.inc:353
+#: src/usr/local/www/diag_routes.php:65 src/usr/local/www/head.inc:380
 msgid "Routes"
 msgstr ""
 
@@ -9306,12 +9377,12 @@ msgid "Use a regular expression to filter the tables."
 msgstr ""
 
 #: src/usr/local/www/diag_routes.php:106 src/usr/local/www/diag_tables.php:147
-#: src/usr/local/www/head.inc:212 src/usr/local/www/pkg_mgr_install.php:238
+#: src/usr/local/www/head.inc:221 src/usr/local/www/pkg_mgr_install.php:244
 #: src/usr/local/www/pkg_mgr_installed.php:189
-#: src/usr/local/www/system_certmanager.php:464
-#: src/usr/local/www/system_certmanager.php:520
-#: src/usr/local/www/system_certmanager.php:886
-#: src/usr/local/www/system_certmanager.php:934
+#: src/usr/local/www/system_certmanager.php:467
+#: src/usr/local/www/system_certmanager.php:523
+#: src/usr/local/www/system_certmanager.php:889
+#: src/usr/local/www/system_certmanager.php:937
 #: src/usr/local/www/system_update_settings.php:77
 #: src/usr/local/www/widgets/widgets/installed_packages.widget.php:120
 msgid "Update"
@@ -9329,138 +9400,110 @@ msgstr ""
 msgid "IPv6 Routes"
 msgstr ""
 
-#: src/usr/local/www/diag_smart.php:36 src/usr/local/www/head.inc:354
+#: src/usr/local/www/diag_smart.php:36 src/usr/local/www/head.inc:381
 #: src/usr/local/www/widgets/include/smart_status.inc:23
 #: src/usr/local/www/widgets/widgets/smart_status.widget.php:40
 msgid "S.M.A.R.T. Status"
 msgstr ""
 
-#: src/usr/local/www/diag_smart.php:39 src/usr/local/www/diag_smart.php:99
+#: src/usr/local/www/diag_smart.php:39
 msgid "Information & Tests"
 msgstr ""
 
-#: src/usr/local/www/diag_smart.php:41 src/usr/local/www/diag_smart.php:100
+#: src/usr/local/www/diag_smart.php:41
 msgid "Config"
 msgstr ""
 
-#: src/usr/local/www/diag_smart.php:59
+#: src/usr/local/www/diag_smart.php:57
 msgid "PASSED"
 msgstr ""
 
-#: src/usr/local/www/diag_smart.php:60
+#: src/usr/local/www/diag_smart.php:58
 msgid "FAILED"
 msgstr ""
 
-#: src/usr/local/www/diag_smart.php:61
+#: src/usr/local/www/diag_smart.php:59
 msgid "Warning"
 msgstr ""
 
-#: src/usr/local/www/diag_smart.php:94
+#: src/usr/local/www/diag_smart.php:68
 msgid "Device does not exist, bailing."
 msgstr ""
 
-#: src/usr/local/www/diag_smart.php:105
-msgid "S.M.A.R.T. is not supported in Hyper-V guests."
+#: src/usr/local/www/diag_smart.php:74
+#, php-format
+msgid "S.M.A.R.T. is not supported on this system (%s)."
 msgstr ""
 
-#: src/usr/local/www/diag_smart.php:116
+#: src/usr/local/www/diag_smart.php:85
 msgid "Invalid test type, bailing."
 msgstr ""
 
-#: src/usr/local/www/diag_smart.php:123
+#: src/usr/local/www/diag_smart.php:92
 msgid "Test Results"
 msgstr ""
 
-#: src/usr/local/www/diag_smart.php:133 src/usr/local/www/diag_smart.php:211
-#: src/usr/local/www/diag_smart.php:505 src/usr/local/www/diag_smart.php:514
+#: src/usr/local/www/diag_smart.php:102 src/usr/local/www/diag_smart.php:180
+#: src/usr/local/www/diag_smart.php:405 src/usr/local/www/diag_smart.php:414
 msgid "Abort"
 msgstr ""
 
-#: src/usr/local/www/diag_smart.php:135
+#: src/usr/local/www/diag_smart.php:104
 msgid "Abort Test"
 msgstr ""
 
-#: src/usr/local/www/diag_smart.php:139 src/usr/local/www/diag_smart.php:170
-#: src/usr/local/www/diag_smart.php:198
+#: src/usr/local/www/diag_smart.php:108 src/usr/local/www/diag_smart.php:139
+#: src/usr/local/www/diag_smart.php:167
 msgid "Back"
 msgstr ""
 
-#: src/usr/local/www/diag_smart.php:154
+#: src/usr/local/www/diag_smart.php:123
 msgid "Invalid info type, bailing."
 msgstr ""
 
-#: src/usr/local/www/diag_smart.php:161 src/usr/local/www/diag_smart.php:305
+#: src/usr/local/www/diag_smart.php:130 src/usr/local/www/diag_smart.php:205
 #: src/usr/local/www/pkg_mgr_installed.php:194
 msgid "Information"
 msgstr ""
 
-#: src/usr/local/www/diag_smart.php:182
+#: src/usr/local/www/diag_smart.php:151
 msgid "Invalid log type, bailing."
 msgstr ""
 
-#: src/usr/local/www/diag_smart.php:189
+#: src/usr/local/www/diag_smart.php:158
 msgid "Logs"
 msgstr ""
 
-#: src/usr/local/www/diag_smart.php:226
-#, php-format
-msgid "Email sent to %s"
-msgstr ""
-
-#: src/usr/local/www/diag_smart.php:264
-#: src/usr/local/www/services_captiveportal.php:64
-#: src/usr/local/www/services_captiveportal.php:530
-#: src/usr/local/www/services_captiveportal_filemanager.php:138
-#: src/usr/local/www/services_captiveportal_hostname.php:105
-#: src/usr/local/www/services_captiveportal_ip.php:99
-#: src/usr/local/www/services_captiveportal_mac.php:164
-#: src/usr/local/www/services_captiveportal_vouchers.php:374
-#: src/usr/local/www/vpn_l2tp.php:173 src/usr/local/www/vpn_l2tp.php:186
-#: src/usr/local/www/vpn_l2tp.php:210 src/usr/local/www/vpn_l2tp_users.php:84
-msgid "Configuration"
-msgstr ""
-
-#: src/usr/local/www/diag_smart.php:268
-#: src/usr/local/www/system_camanager.php:589
-#: src/usr/local/www/system_certmanager.php:707
-#: src/usr/local/www/system_certmanager.php:834
-msgid "Email Address"
-msgstr ""
-
-#: src/usr/local/www/diag_smart.php:278
-msgid "Send test email"
-msgstr ""
-
-#: src/usr/local/www/diag_smart.php:314
+#: src/usr/local/www/diag_smart.php:214
 msgid "Info type"
 msgstr ""
 
-#: src/usr/local/www/diag_smart.php:360 src/usr/local/www/diag_smart.php:433
-#: src/usr/local/www/diag_smart.php:489 src/usr/local/www/diag_smart.php:525
+#: src/usr/local/www/diag_smart.php:260 src/usr/local/www/diag_smart.php:333
+#: src/usr/local/www/diag_smart.php:389 src/usr/local/www/diag_smart.php:425
 msgid "Device: /dev/"
 msgstr ""
 
-#: src/usr/local/www/diag_smart.php:385
+#: src/usr/local/www/diag_smart.php:285
 msgid "Perform self-tests"
 msgstr ""
 
-#: src/usr/local/www/diag_smart.php:394
+#: src/usr/local/www/diag_smart.php:294
 msgid "Test type"
 msgstr ""
 
-#: src/usr/local/www/diag_smart.php:428
+#: src/usr/local/www/diag_smart.php:328
 msgid "Select \"Conveyance\" for ATA disks only."
 msgstr ""
 
-#: src/usr/local/www/diag_smart.php:458
+#: src/usr/local/www/diag_smart.php:358
 msgid "View Logs"
 msgstr ""
 
-#: src/usr/local/www/diag_smart.php:467
+#: src/usr/local/www/diag_smart.php:367
 msgid "Log type"
 msgstr ""
 
-#: src/usr/local/www/diag_sockets.php:31 src/usr/local/www/head.inc:355
+#: src/usr/local/www/diag_sockets.php:31 src/usr/local/www/head.inc:382
 msgid "Sockets"
 msgstr ""
 
@@ -9501,8 +9544,8 @@ msgstr ""
 
 #: src/usr/local/www/diag_states_summary.php:151
 #: src/usr/local/www/firewall_aliases.php:159
-#: src/usr/local/www/services_dnsmasq.php:321
-#: src/usr/local/www/services_dnsmasq.php:395
+#: src/usr/local/www/services_dnsmasq.php:366
+#: src/usr/local/www/services_dnsmasq.php:440
 #: src/usr/local/www/services_unbound.php:435
 #: src/usr/local/www/services_unbound.php:511
 #: src/usr/local/www/widgets/widgets/ipsec.widget.php:222
@@ -9510,17 +9553,17 @@ msgid "IP"
 msgstr ""
 
 #: src/usr/local/www/diag_states_summary.php:155
-#: src/usr/local/www/firewall_nat.php:210
+#: src/usr/local/www/firewall_nat.php:229
 #: src/usr/local/www/status_logs_filter_summary.php:88
 msgid "Source Ports"
 msgstr ""
 
 #: src/usr/local/www/diag_states_summary.php:156
-#: src/usr/local/www/firewall_nat.php:212
+#: src/usr/local/www/firewall_nat.php:231
 msgid "Dest. Ports"
 msgstr ""
 
-#: src/usr/local/www/diag_states_summary.php:192 src/usr/local/www/head.inc:357
+#: src/usr/local/www/diag_states_summary.php:192 src/usr/local/www/head.inc:384
 msgid "States Summary"
 msgstr ""
 
@@ -9540,7 +9583,7 @@ msgstr ""
 msgid "By IP Pair"
 msgstr ""
 
-#: src/usr/local/www/diag_system_activity.php:31 src/usr/local/www/head.inc:358
+#: src/usr/local/www/diag_system_activity.php:31 src/usr/local/www/head.inc:385
 msgid "System Activity"
 msgstr ""
 
@@ -9552,7 +9595,7 @@ msgstr ""
 msgid "Gathering CPU activity, please wait..."
 msgstr ""
 
-#: src/usr/local/www/diag_tables.php:29 src/usr/local/www/head.inc:347
+#: src/usr/local/www/diag_tables.php:29 src/usr/local/www/head.inc:374
 msgid "Tables"
 msgstr ""
 
@@ -9629,7 +9672,7 @@ msgid "Remove this entry"
 msgstr ""
 
 #: src/usr/local/www/diag_testport.php:38
-#: src/usr/local/www/diag_testport.php:217 src/usr/local/www/head.inc:349
+#: src/usr/local/www/diag_testport.php:217 src/usr/local/www/head.inc:376
 msgid "Test Port"
 msgstr ""
 
@@ -9787,7 +9830,7 @@ msgid ""
 "Logs page"
 msgstr ""
 
-#: src/usr/local/www/easyrule.php:78 src/usr/local/www/head.inc:309
+#: src/usr/local/www/easyrule.php:78 src/usr/local/www/head.inc:336
 #: src/usr/local/www/status_logs.php:96 src/usr/local/www/status_logs.php:98
 #: src/usr/local/www/status_logs_filter.php:102
 #: src/usr/local/www/status_logs_filter_dynamic.php:82
@@ -9817,10 +9860,10 @@ msgstr ""
 #: src/usr/local/www/firewall_aliases.php:171
 #: src/usr/local/www/firewall_aliases_edit.php:38
 #: src/usr/local/www/firewall_aliases_import.php:38
-#: src/usr/local/www/firewall_nat.php:175
+#: src/usr/local/www/firewall_nat.php:186
 #: src/usr/local/www/firewall_nat_1to1.php:122
-#: src/usr/local/www/firewall_nat_1to1_edit.php:248
-#: src/usr/local/www/firewall_nat_edit.php:621
+#: src/usr/local/www/firewall_nat_1to1_edit.php:249
+#: src/usr/local/www/firewall_nat_edit.php:638
 #: src/usr/local/www/firewall_nat_npt.php:122
 #: src/usr/local/www/firewall_nat_npt_edit.php:178
 #: src/usr/local/www/firewall_nat_out.php:206
@@ -9835,7 +9878,7 @@ msgstr ""
 #: src/usr/local/www/firewall_shaper_vinterface.php:39
 #: src/usr/local/www/firewall_shaper_wizards.php:62
 #: src/usr/local/www/firewall_virtual_ip.php:238
-#: src/usr/local/www/firewall_virtual_ip_edit.php:296
+#: src/usr/local/www/firewall_virtual_ip_edit.php:289
 #: src/usr/local/www/status_logs_common.inc:89
 #: src/usr/local/www/status_logs_settings.php:213
 msgid "Firewall"
@@ -9846,7 +9889,7 @@ msgid "The alias list has been changed."
 msgstr ""
 
 #: src/usr/local/www/firewall_aliases.php:181
-#: src/usr/local/www/firewall_nat.php:184
+#: src/usr/local/www/firewall_nat.php:195
 #: src/usr/local/www/firewall_nat_1to1.php:131
 #: src/usr/local/www/firewall_nat_npt.php:131
 #: src/usr/local/www/firewall_nat_out.php:215
@@ -9863,9 +9906,9 @@ msgstr ""
 #: src/usr/local/www/load_balancer_virtual_server.php:121
 #: src/usr/local/www/services_captiveportal_mac.php:160
 #: src/usr/local/www/services_captiveportal_zones.php:68
-#: src/usr/local/www/services_dhcp.php:723
-#: src/usr/local/www/services_dhcpv6.php:490
-#: src/usr/local/www/services_dnsmasq.php:195
+#: src/usr/local/www/services_dhcp.php:725
+#: src/usr/local/www/services_dhcpv6.php:500
+#: src/usr/local/www/services_dnsmasq.php:240
 #: src/usr/local/www/services_igmpproxy.php:76
 #: src/usr/local/www/services_pppoe.php:91
 #: src/usr/local/www/services_unbound.php:252
@@ -9874,7 +9917,7 @@ msgstr ""
 #: src/usr/local/www/status_lb_pool.php:110
 #: src/usr/local/www/system_advanced_sysctl.php:137
 #: src/usr/local/www/system_gateway_groups.php:114
-#: src/usr/local/www/system_gateways.php:224
+#: src/usr/local/www/system_gateways.php:238
 #: src/usr/local/www/system_routes.php:225 src/usr/local/www/vpn_ipsec.php:236
 #: src/usr/local/www/vpn_ipsec_keys.php:82
 #: src/usr/local/www/vpn_ipsec_mobile.php:407
@@ -9900,19 +9943,19 @@ msgid "Delete alias"
 msgstr ""
 
 #: src/usr/local/www/firewall_aliases.php:277
-#: src/usr/local/www/firewall_nat.php:444
-#: src/usr/local/www/firewall_nat.php:448
+#: src/usr/local/www/firewall_nat.php:463
+#: src/usr/local/www/firewall_nat.php:467
 #: src/usr/local/www/firewall_nat_1to1.php:237
 #: src/usr/local/www/firewall_nat_1to1.php:241
 #: src/usr/local/www/firewall_nat_npt.php:226
 #: src/usr/local/www/firewall_nat_npt.php:230
 #: src/usr/local/www/firewall_nat_out.php:495
 #: src/usr/local/www/firewall_nat_out.php:499
-#: src/usr/local/www/firewall_rules.php:807
-#: src/usr/local/www/firewall_rules.php:811
+#: src/usr/local/www/firewall_rules.php:816
+#: src/usr/local/www/firewall_rules.php:820
 #: src/usr/local/www/firewall_schedule.php:245
 #: src/usr/local/www/firewall_virtual_ip.php:338
-#: src/usr/local/www/interfaces.php:1864 src/usr/local/www/interfaces.php:3175
+#: src/usr/local/www/interfaces.php:1869 src/usr/local/www/interfaces.php:3186
 #: src/usr/local/www/interfaces_assign.php:566
 #: src/usr/local/www/interfaces_bridge.php:156
 #: src/usr/local/www/interfaces_gif.php:130
@@ -9928,22 +9971,22 @@ msgstr ""
 #: src/usr/local/www/load_balancer_virtual_server.php:203
 #: src/usr/local/www/pkg.php:575 src/usr/local/www/pkg_edit.php:1442
 #: src/usr/local/www/services_captiveportal_filemanager.php:234
-#: src/usr/local/www/services_captiveportal_hostname.php:162
-#: src/usr/local/www/services_captiveportal_ip.php:159
+#: src/usr/local/www/services_captiveportal_hostname.php:163
+#: src/usr/local/www/services_captiveportal_ip.php:160
 #: src/usr/local/www/services_captiveportal_mac.php:222
 #: src/usr/local/www/services_captiveportal_vouchers.php:438
 #: src/usr/local/www/services_captiveportal_zones.php:122
 #: src/usr/local/www/services_checkip.php:155
-#: src/usr/local/www/services_dhcp.php:872
-#: src/usr/local/www/services_dhcp.php:1270
-#: src/usr/local/www/services_dhcp.php:1369
-#: src/usr/local/www/services_dhcpv6.php:1024
-#: src/usr/local/www/services_dnsmasq.php:384
-#: src/usr/local/www/services_dnsmasq.php:431
-#: src/usr/local/www/services_dyndns.php:212
+#: src/usr/local/www/services_dhcp.php:885
+#: src/usr/local/www/services_dhcp.php:1299
+#: src/usr/local/www/services_dhcp.php:1398
+#: src/usr/local/www/services_dhcpv6.php:1046
+#: src/usr/local/www/services_dnsmasq.php:429
+#: src/usr/local/www/services_dnsmasq.php:476
+#: src/usr/local/www/services_dyndns.php:213
 #: src/usr/local/www/services_igmpproxy.php:145
-#: src/usr/local/www/services_ntpd.php:259
-#: src/usr/local/www/services_ntpd_acls.php:299
+#: src/usr/local/www/services_ntpd.php:272
+#: src/usr/local/www/services_ntpd_acls.php:300
 #: src/usr/local/www/services_pppoe.php:147
 #: src/usr/local/www/services_rfc2136.php:201
 #: src/usr/local/www/services_router_advertisements.php:420
@@ -9952,12 +9995,12 @@ msgstr ""
 #: src/usr/local/www/services_unbound_acls.php:335
 #: src/usr/local/www/services_wol.php:207
 #: src/usr/local/www/system_authservers.php:464
-#: src/usr/local/www/system_camanager.php:429
-#: src/usr/local/www/system_certmanager.php:769
-#: src/usr/local/www/system_certmanager.php:1082
+#: src/usr/local/www/system_camanager.php:451
+#: src/usr/local/www/system_certmanager.php:772
+#: src/usr/local/www/system_certmanager.php:1085
 #: src/usr/local/www/system_crlmanager.php:535
 #: src/usr/local/www/system_gateway_groups.php:188
-#: src/usr/local/www/system_gateways.php:317
+#: src/usr/local/www/system_gateways.php:331
 #: src/usr/local/www/system_groupmanager.php:251
 #: src/usr/local/www/system_groupmanager.php:333
 #: src/usr/local/www/system_routes.php:299
@@ -9988,23 +10031,23 @@ msgid ""
 msgstr ""
 
 #: src/usr/local/www/firewall_aliases_edit.php:38
-#: src/usr/local/www/firewall_nat_1to1_edit.php:248
-#: src/usr/local/www/firewall_nat_edit.php:621
+#: src/usr/local/www/firewall_nat_1to1_edit.php:249
+#: src/usr/local/www/firewall_nat_edit.php:638
 #: src/usr/local/www/firewall_nat_npt_edit.php:178
 #: src/usr/local/www/firewall_nat_out_edit.php:378
-#: src/usr/local/www/firewall_rules.php:762
+#: src/usr/local/www/firewall_rules.php:771
 #: src/usr/local/www/firewall_rules_edit.php:1043
 #: src/usr/local/www/firewall_schedule_edit.php:52
-#: src/usr/local/www/firewall_virtual_ip_edit.php:296
+#: src/usr/local/www/firewall_virtual_ip_edit.php:289
 #: src/usr/local/www/interfaces_bridge_edit.php:384
 #: src/usr/local/www/interfaces_gif_edit.php:165
-#: src/usr/local/www/interfaces_gre_edit.php:155
+#: src/usr/local/www/interfaces_gre_edit.php:159
 #: src/usr/local/www/interfaces_groups_edit.php:33
 #: src/usr/local/www/interfaces_lagg_edit.php:223
 #: src/usr/local/www/interfaces_ppps_edit.php:460
 #: src/usr/local/www/interfaces_qinq_edit.php:29
 #: src/usr/local/www/interfaces_vlan_edit.php:172
-#: src/usr/local/www/interfaces_wireless_edit.php:167
+#: src/usr/local/www/interfaces_wireless_edit.php:165
 #: src/usr/local/www/load_balancer_monitor_edit.php:202
 #: src/usr/local/www/load_balancer_pool_edit.php:185
 #: src/usr/local/www/load_balancer_virtual_server_edit.php:159
@@ -10013,7 +10056,7 @@ msgstr ""
 #: src/usr/local/www/services_captiveportal_mac_edit.php:69
 #: src/usr/local/www/services_captiveportal_vouchers_edit.php:53
 #: src/usr/local/www/services_checkip_edit.php:106
-#: src/usr/local/www/services_dyndns_edit.php:239
+#: src/usr/local/www/services_dyndns_edit.php:240
 #: src/usr/local/www/services_igmpproxy_edit.php:33
 #: src/usr/local/www/services_pppoe_edit.php:280
 #: src/usr/local/www/services_rfc2136_edit.php:148
@@ -10021,11 +10064,11 @@ msgstr ""
 #: src/usr/local/www/services_wol_edit.php:104
 #: src/usr/local/www/system_advanced_sysctl.php:124
 #: src/usr/local/www/system_authservers.php:406
-#: src/usr/local/www/system_camanager.php:319
-#: src/usr/local/www/system_certmanager.php:521
+#: src/usr/local/www/system_camanager.php:324
+#: src/usr/local/www/system_certmanager.php:524
 #: src/usr/local/www/system_crlmanager.php:256
 #: src/usr/local/www/system_gateway_groups_edit.php:147
-#: src/usr/local/www/system_gateways_edit.php:538
+#: src/usr/local/www/system_gateways_edit.php:551
 #: src/usr/local/www/system_groupmanager.php:260
 #: src/usr/local/www/system_groupmanager_addprivs.php:36
 #: src/usr/local/www/system_routes_edit.php:224
@@ -10048,7 +10091,7 @@ msgid "network"
 msgstr ""
 
 #: src/usr/local/www/firewall_aliases_edit.php:79
-#: src/usr/local/www/firewall_aliases_edit.php:698
+#: src/usr/local/www/firewall_aliases_edit.php:708
 msgid "port"
 msgstr ""
 
@@ -10068,181 +10111,187 @@ msgstr ""
 msgid "URL Table (Port)"
 msgstr ""
 
-#: src/usr/local/www/firewall_aliases_edit.php:136
+#: src/usr/local/www/firewall_aliases_edit.php:137
 msgid ""
 "Vertical bars (|) at start or end, or double in the middle of descriptions "
 "not allowed. Descriptions have been cleaned. Check and save again."
 msgstr ""
 
-#: src/usr/local/www/firewall_aliases_edit.php:152
+#: src/usr/local/www/firewall_aliases_edit.php:153
 #: src/usr/local/www/firewall_aliases_import.php:74
+#: src/usr/local/www/interfaces_groups_edit.php:100
 msgid "An alias with this name already exists."
 msgstr ""
 
-#: src/usr/local/www/firewall_aliases_edit.php:160
+#: src/usr/local/www/firewall_aliases_edit.php:161
 #: src/usr/local/www/firewall_aliases_import.php:81
 #, php-format
 msgid "Cannot use a reserved keyword as an alias name: %s"
 msgstr ""
 
-#: src/usr/local/www/firewall_aliases_edit.php:167
+#: src/usr/local/www/firewall_aliases_edit.php:168
 #: src/usr/local/www/firewall_aliases_import.php:88
 msgid "An interface description with this name already exists."
 msgstr ""
 
-#: src/usr/local/www/firewall_aliases_edit.php:189
+#: src/usr/local/www/firewall_aliases_edit.php:177
+#: src/usr/local/www/firewall_aliases_import.php:97
+msgid "Sorry, an interface group with this name already exists."
+msgstr ""
+
+#: src/usr/local/www/firewall_aliases_edit.php:199
 msgid "A valid URL must be provided."
 msgstr ""
 
-#: src/usr/local/www/firewall_aliases_edit.php:191
+#: src/usr/local/www/firewall_aliases_edit.php:201
 msgid "Unable to fetch usable data from URL"
 msgstr ""
 
-#: src/usr/local/www/firewall_aliases_edit.php:203
-#: src/usr/local/www/firewall_aliases_edit.php:245
-#: src/usr/local/www/firewall_aliases_edit.php:290
+#: src/usr/local/www/firewall_aliases_edit.php:213
+#: src/usr/local/www/firewall_aliases_edit.php:255
+#: src/usr/local/www/firewall_aliases_edit.php:300
 #, php-format
 msgid "Entry added %s"
 msgstr ""
 
-#: src/usr/local/www/firewall_aliases_edit.php:252
+#: src/usr/local/www/firewall_aliases_edit.php:262
 #, php-format
 msgid "A valid URL must be provided. Could not fetch usable data from '%s'."
 msgstr ""
 
-#: src/usr/local/www/firewall_aliases_edit.php:256
+#: src/usr/local/www/firewall_aliases_edit.php:266
 #, php-format
 msgid "URL '%s' is not valid."
 msgstr ""
 
-#: src/usr/local/www/firewall_aliases_edit.php:321
+#: src/usr/local/www/firewall_aliases_edit.php:331
 #, php-format
 msgid "Range is too large to expand into individual host IP addresses (%s)"
 msgstr ""
 
-#: src/usr/local/www/firewall_aliases_edit.php:322
-#: src/usr/local/www/firewall_aliases_edit.php:352
+#: src/usr/local/www/firewall_aliases_edit.php:332
+#: src/usr/local/www/firewall_aliases_edit.php:362
 #, php-format
 msgid "The maximum number of entries in an alias is %s"
 msgstr ""
 
-#: src/usr/local/www/firewall_aliases_edit.php:330
-#: src/usr/local/www/firewall_aliases_import.php:131
+#: src/usr/local/www/firewall_aliases_edit.php:340
+#: src/usr/local/www/firewall_aliases_import.php:140
 #, php-format
 msgid "IPv6 address ranges are not supported (%s)"
 msgstr ""
 
-#: src/usr/local/www/firewall_aliases_edit.php:351
+#: src/usr/local/www/firewall_aliases_edit.php:361
 #, php-format
 msgid "Subnet is too large to expand into individual host IP addresses (%s)"
 msgstr ""
 
-#: src/usr/local/www/firewall_aliases_edit.php:359
+#: src/usr/local/www/firewall_aliases_edit.php:369
 #, php-format
 msgid "IPv6 subnets are not supported in host aliases (%s)"
 msgstr ""
 
-#: src/usr/local/www/firewall_aliases_edit.php:386
+#: src/usr/local/www/firewall_aliases_edit.php:396
 #, php-format
 msgid "The maximum number of entries in an alias has been exceeded (%s)"
 msgstr ""
 
-#: src/usr/local/www/firewall_aliases_edit.php:405
+#: src/usr/local/www/firewall_aliases_edit.php:415
 #, php-format
 msgid "%s is not a valid port or alias."
 msgstr ""
 
-#: src/usr/local/www/firewall_aliases_edit.php:410
+#: src/usr/local/www/firewall_aliases_edit.php:420
 #, php-format
 msgid "%1$s is not a valid %2$s address, FQDN or alias."
 msgstr ""
 
-#: src/usr/local/www/firewall_aliases_edit.php:416
+#: src/usr/local/www/firewall_aliases_edit.php:426
 #, php-format
 msgid "%1$s/%2$s is not a valid subnet."
 msgstr ""
 
-#: src/usr/local/www/firewall_aliases_edit.php:425
+#: src/usr/local/www/firewall_aliases_edit.php:435
 #, php-format
 msgid ""
 "The alias(es): %s cannot be nested because they are not of the same type."
 msgstr ""
 
-#: src/usr/local/www/firewall_aliases_edit.php:527
-#: src/usr/local/www/firewall_aliases_edit.php:588
+#: src/usr/local/www/firewall_aliases_edit.php:537
+#: src/usr/local/www/firewall_aliases_edit.php:598
 msgid "Network(s)"
 msgstr ""
 
-#: src/usr/local/www/firewall_aliases_edit.php:528
-#: src/usr/local/www/firewall_aliases_edit.php:587
+#: src/usr/local/www/firewall_aliases_edit.php:538
+#: src/usr/local/www/firewall_aliases_edit.php:597
 msgid "Host(s)"
 msgstr ""
 
-#: src/usr/local/www/firewall_aliases_edit.php:529
-#: src/usr/local/www/firewall_aliases_edit.php:589
+#: src/usr/local/www/firewall_aliases_edit.php:539
+#: src/usr/local/www/firewall_aliases_edit.php:599
 msgid "Port(s)"
 msgstr ""
 
-#: src/usr/local/www/firewall_aliases_edit.php:530
-#: src/usr/local/www/firewall_aliases_edit.php:550
-#: src/usr/local/www/firewall_aliases_edit.php:590
+#: src/usr/local/www/firewall_aliases_edit.php:540
+#: src/usr/local/www/firewall_aliases_edit.php:560
+#: src/usr/local/www/firewall_aliases_edit.php:600
 msgid "URL (IPs)"
 msgstr ""
 
-#: src/usr/local/www/firewall_aliases_edit.php:531
-#: src/usr/local/www/firewall_aliases_edit.php:551
-#: src/usr/local/www/firewall_aliases_edit.php:591
+#: src/usr/local/www/firewall_aliases_edit.php:541
+#: src/usr/local/www/firewall_aliases_edit.php:561
+#: src/usr/local/www/firewall_aliases_edit.php:601
 msgid "URL (Ports)"
 msgstr ""
 
-#: src/usr/local/www/firewall_aliases_edit.php:532
-#: src/usr/local/www/firewall_aliases_edit.php:552
-#: src/usr/local/www/firewall_aliases_edit.php:592
+#: src/usr/local/www/firewall_aliases_edit.php:542
+#: src/usr/local/www/firewall_aliases_edit.php:562
+#: src/usr/local/www/firewall_aliases_edit.php:602
 msgid "URL Table (IPs)"
 msgstr ""
 
-#: src/usr/local/www/firewall_aliases_edit.php:533
-#: src/usr/local/www/firewall_aliases_edit.php:553
-#: src/usr/local/www/firewall_aliases_edit.php:593
+#: src/usr/local/www/firewall_aliases_edit.php:543
+#: src/usr/local/www/firewall_aliases_edit.php:563
+#: src/usr/local/www/firewall_aliases_edit.php:603
 msgid "URL Table (Ports)"
 msgstr ""
 
-#: src/usr/local/www/firewall_aliases_edit.php:537
+#: src/usr/local/www/firewall_aliases_edit.php:547
 #: src/usr/local/www/services_unbound_acls.php:279
 msgid "Add Network"
 msgstr ""
 
-#: src/usr/local/www/firewall_aliases_edit.php:538
+#: src/usr/local/www/firewall_aliases_edit.php:548
 msgid "Add Host"
 msgstr ""
 
-#: src/usr/local/www/firewall_aliases_edit.php:539
+#: src/usr/local/www/firewall_aliases_edit.php:549
 msgid "Add Port"
 msgstr ""
 
-#: src/usr/local/www/firewall_aliases_edit.php:540
-#: src/usr/local/www/firewall_aliases_edit.php:541
+#: src/usr/local/www/firewall_aliases_edit.php:550
+#: src/usr/local/www/firewall_aliases_edit.php:551
 msgid "Add URL"
 msgstr ""
 
-#: src/usr/local/www/firewall_aliases_edit.php:542
-#: src/usr/local/www/firewall_aliases_edit.php:543
+#: src/usr/local/www/firewall_aliases_edit.php:552
+#: src/usr/local/www/firewall_aliases_edit.php:553
 msgid "Add URL Table"
 msgstr ""
 
-#: src/usr/local/www/firewall_aliases_edit.php:547
+#: src/usr/local/www/firewall_aliases_edit.php:557
 msgid "Network or FQDN"
 msgstr ""
 
-#: src/usr/local/www/firewall_aliases_edit.php:548
+#: src/usr/local/www/firewall_aliases_edit.php:558
 msgid "IP or FQDN"
 msgstr ""
 
-#: src/usr/local/www/firewall_aliases_edit.php:556
+#: src/usr/local/www/firewall_aliases_edit.php:566
 msgid "The value after the \"/\" is the update frequency in days."
 msgstr ""
 
-#: src/usr/local/www/firewall_aliases_edit.php:559
+#: src/usr/local/www/firewall_aliases_edit.php:569
 msgid ""
 "Networks are specified in CIDR format. Select the CIDR mask that pertains to "
 "each entry. /32 specifies a single IPv4 host, /128 specifies a single IPv6 "
@@ -10252,7 +10301,7 @@ msgid ""
 "and a list of CIDR networks will be derived to fill the range."
 msgstr ""
 
-#: src/usr/local/www/firewall_aliases_edit.php:560
+#: src/usr/local/www/firewall_aliases_edit.php:570
 msgid ""
 "Enter as many hosts as desired. Hosts must be specified by their IP address "
 "or fully qualified domain name (FQDN). FQDN hostnames are periodically re-"
@@ -10262,27 +10311,27 @@ msgid ""
 "will be generated."
 msgstr ""
 
-#: src/usr/local/www/firewall_aliases_edit.php:561
+#: src/usr/local/www/firewall_aliases_edit.php:571
 msgid ""
 "Enter ports as desired, with a single port or port range per entry. Port "
 "ranges can be expressed by separating with a colon."
 msgstr ""
 
-#: src/usr/local/www/firewall_aliases_edit.php:562
+#: src/usr/local/www/firewall_aliases_edit.php:572
 msgid ""
 "Enter as many URLs as desired. After saving, the URLs will be downloaded and "
 "the items imported into the alias. Use only with small sets of IP addresses "
 "(less than 3000)."
 msgstr ""
 
-#: src/usr/local/www/firewall_aliases_edit.php:563
+#: src/usr/local/www/firewall_aliases_edit.php:573
 msgid ""
 "Enter as many URLs as desired. After saving, the URLs will be downloaded and "
 "the items imported into the alias. Use only with small sets of Ports (less "
 "than 3000)."
 msgstr ""
 
-#: src/usr/local/www/firewall_aliases_edit.php:564
+#: src/usr/local/www/firewall_aliases_edit.php:574
 msgid ""
 "Enter a single URL containing a large number of IPs and/or Subnets. After "
 "saving, the URLs will be downloaded and a table file containing these "
@@ -10290,50 +10339,50 @@ msgid ""
 "(30,000+) or small numbers."
 msgstr ""
 
-#: src/usr/local/www/firewall_aliases_edit.php:566
+#: src/usr/local/www/firewall_aliases_edit.php:576
 msgid ""
 "Enter a single URL containing a list of Port numbers and/or Port ranges. "
 "After saving, the URL will be downloaded."
 msgstr ""
 
-#: src/usr/local/www/firewall_aliases_edit.php:635
+#: src/usr/local/www/firewall_aliases_edit.php:645
 msgid "Properties"
 msgstr ""
 
-#: src/usr/local/www/firewall_aliases_edit.php:642
-#: src/usr/local/www/firewall_aliases_import.php:229
+#: src/usr/local/www/firewall_aliases_edit.php:652
+#: src/usr/local/www/firewall_aliases_import.php:238
 msgid ""
 "The name of the alias may only consist of the characters \"a-z, A-Z, 0-9 and "
 "_\"."
 msgstr ""
 
-#: src/usr/local/www/firewall_aliases_edit.php:654
-#: src/usr/local/www/firewall_nat_1to1_edit.php:436
-#: src/usr/local/www/firewall_nat_1to1_edit.php:463
-#: src/usr/local/www/firewall_nat_edit.php:719
-#: src/usr/local/www/firewall_nat_edit.php:786
-#: src/usr/local/www/firewall_nat_out_edit.php:496
-#: src/usr/local/www/firewall_nat_out_edit.php:520
+#: src/usr/local/www/firewall_aliases_edit.php:664
+#: src/usr/local/www/firewall_nat_1to1_edit.php:446
+#: src/usr/local/www/firewall_nat_1to1_edit.php:473
+#: src/usr/local/www/firewall_nat_edit.php:736
+#: src/usr/local/www/firewall_nat_edit.php:803
+#: src/usr/local/www/firewall_nat_out_edit.php:494
+#: src/usr/local/www/firewall_nat_out_edit.php:518
 #: src/usr/local/www/firewall_rules_edit.php:411
 #: src/usr/local/www/firewall_virtual_ip.php:264
-#: src/usr/local/www/firewall_virtual_ip_edit.php:96
-#: src/usr/local/www/firewall_virtual_ip_edit.php:330
+#: src/usr/local/www/firewall_virtual_ip_edit.php:95
+#: src/usr/local/www/firewall_virtual_ip_edit.php:323
 #: src/usr/local/www/load_balancer_monitor.php:107
 #: src/usr/local/www/load_balancer_monitor_edit.php:86
 #: src/usr/local/www/load_balancer_monitor_edit.php:284
-#: src/usr/local/www/services_captiveportal.php:974
-#: src/usr/local/www/services_dhcp.php:1247
+#: src/usr/local/www/services_captiveportal.php:964
+#: src/usr/local/www/services_dhcp.php:1276
 #: src/usr/local/www/services_igmpproxy.php:89
 #: src/usr/local/www/services_igmpproxy_edit.php:169
 #: src/usr/local/www/status_logs_vpn.php:177
 #: src/usr/local/www/status_logs_vpn.php:407
-#: src/usr/local/www/status_ntpd.php:270
+#: src/usr/local/www/status_ntpd.php:274
 #: src/usr/local/www/system_authservers.php:230
 #: src/usr/local/www/system_authservers.php:253
 #: src/usr/local/www/system_authservers.php:436
 #: src/usr/local/www/system_authservers.php:493
-#: src/usr/local/www/system_certmanager.php:736
-#: src/usr/local/www/system_certmanager.php:744
+#: src/usr/local/www/system_certmanager.php:739
+#: src/usr/local/www/system_certmanager.php:747
 #: src/usr/local/www/vpn_ipsec_keys.php:101
 #: src/usr/local/www/vpn_ipsec_phase2.php:522
 #: src/usr/local/www/vpn_ipsec_phase2.php:548
@@ -10341,7 +10390,7 @@ msgstr ""
 msgid "Type"
 msgstr ""
 
-#: src/usr/local/www/firewall_aliases_edit.php:664
+#: src/usr/local/www/firewall_aliases_edit.php:674
 msgid "Hint"
 msgstr ""
 
@@ -10349,31 +10398,31 @@ msgstr ""
 msgid "Bulk import"
 msgstr ""
 
-#: src/usr/local/www/firewall_aliases_import.php:118
+#: src/usr/local/www/firewall_aliases_import.php:127
 #, php-format
 msgid "%s is not a valid port or port range."
 msgstr ""
 
-#: src/usr/local/www/firewall_aliases_import.php:135
+#: src/usr/local/www/firewall_aliases_import.php:144
 #, php-format
 msgid "%s is not an IP address. Please correct the error to continue"
 msgstr ""
 
-#: src/usr/local/www/firewall_aliases_import.php:147
+#: src/usr/local/www/firewall_aliases_import.php:156
 msgid ""
 "Descriptions may not start or end with vertical bar (|) or contain double "
 "vertical bar ||."
 msgstr ""
 
-#: src/usr/local/www/firewall_aliases_import.php:155
+#: src/usr/local/www/firewall_aliases_import.php:164
 msgid "Descriptions must be less than 200 characters long."
 msgstr ""
 
-#: src/usr/local/www/firewall_aliases_import.php:205
+#: src/usr/local/www/firewall_aliases_import.php:214
 msgid "Port Alias Details"
 msgstr ""
 
-#: src/usr/local/www/firewall_aliases_import.php:206
+#: src/usr/local/www/firewall_aliases_import.php:215
 msgid ""
 "Paste in the ports to import separated by a carriage return. The list may "
 "contain port numbers, port ranges, blank lines (ignored) and an optional "
@@ -10382,11 +10431,11 @@ msgid ""
 "ul><span class=\"help-block\">"
 msgstr ""
 
-#: src/usr/local/www/firewall_aliases_import.php:212
+#: src/usr/local/www/firewall_aliases_import.php:221
 msgid "IP Alias Details"
 msgstr ""
 
-#: src/usr/local/www/firewall_aliases_import.php:213
+#: src/usr/local/www/firewall_aliases_import.php:222
 msgid ""
 "Paste in the aliases to import separated by a carriage return. Common "
 "examples are lists of IPs, networks, blacklists, etc. The list may contain "
@@ -10398,44 +10447,44 @@ msgid ""
 "block\">"
 msgstr ""
 
-#: src/usr/local/www/firewall_aliases_import.php:226
+#: src/usr/local/www/firewall_aliases_import.php:235
 msgid "Alias Name"
 msgstr ""
 
-#: src/usr/local/www/firewall_aliases_import.php:241
+#: src/usr/local/www/firewall_aliases_import.php:250
 msgid "Aliases to import"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat.php:167
+#: src/usr/local/www/firewall_nat.php:178
 msgid "Firewall: NAT: Port forward, enable/disable NAT rule"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat.php:175
-#: src/usr/local/www/firewall_nat.php:188
+#: src/usr/local/www/firewall_nat.php:186
+#: src/usr/local/www/firewall_nat.php:199
 #: src/usr/local/www/firewall_nat_1to1.php:135
-#: src/usr/local/www/firewall_nat_edit.php:621
+#: src/usr/local/www/firewall_nat_edit.php:638
 #: src/usr/local/www/firewall_nat_npt.php:135
 #: src/usr/local/www/firewall_nat_out.php:219
 msgid "Port Forward"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat.php:183
+#: src/usr/local/www/firewall_nat.php:194
 #: src/usr/local/www/firewall_nat_1to1.php:130
 #: src/usr/local/www/firewall_nat_npt.php:130
 #: src/usr/local/www/firewall_nat_out.php:214
 msgid "The NAT configuration has been changed."
 msgstr ""
 
-#: src/usr/local/www/firewall_nat.php:189
+#: src/usr/local/www/firewall_nat.php:200
 #: src/usr/local/www/firewall_nat_1to1.php:122
 #: src/usr/local/www/firewall_nat_1to1.php:136
-#: src/usr/local/www/firewall_nat_1to1_edit.php:248
+#: src/usr/local/www/firewall_nat_1to1_edit.php:249
 #: src/usr/local/www/firewall_nat_npt.php:136
 #: src/usr/local/www/firewall_nat_out.php:220
 msgid "1:1"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat.php:190
+#: src/usr/local/www/firewall_nat.php:201
 #: src/usr/local/www/firewall_nat_1to1.php:137
 #: src/usr/local/www/firewall_nat_npt.php:137
 #: src/usr/local/www/firewall_nat_out.php:206
@@ -10444,7 +10493,7 @@ msgstr ""
 msgid "Outbound"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat.php:191
+#: src/usr/local/www/firewall_nat.php:202
 #: src/usr/local/www/firewall_nat_1to1.php:138
 #: src/usr/local/www/firewall_nat_npt.php:122
 #: src/usr/local/www/firewall_nat_npt.php:138
@@ -10453,122 +10502,122 @@ msgstr ""
 msgid "NPt"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat.php:199
+#: src/usr/local/www/firewall_nat.php:218
 #: src/usr/local/www/firewall_rules.php:42
 #: src/usr/local/www/firewall_rules.php:324
 #: src/usr/local/www/firewall_rules_edit.php:1038
-#: src/usr/local/www/head.inc:248
+#: src/usr/local/www/head.inc:275
 msgid "Rules"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat.php:211
+#: src/usr/local/www/firewall_nat.php:230
 msgid "Dest. Address"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat.php:213
+#: src/usr/local/www/firewall_nat.php:232
 msgid "NAT IP"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat.php:214
+#: src/usr/local/www/firewall_nat.php:233
 msgid "NAT Ports"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat.php:274
+#: src/usr/local/www/firewall_nat.php:293
 #: src/usr/local/www/firewall_nat_1to1.php:178
 #: src/usr/local/www/firewall_nat_npt.php:179
-#: src/usr/local/www/firewall_rules.php:494 src/usr/local/www/vpn_ipsec.php:275
+#: src/usr/local/www/firewall_rules.php:503 src/usr/local/www/vpn_ipsec.php:275
 #: src/usr/local/www/vpn_ipsec.php:425
 msgid "click to toggle enabled/disabled status"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat.php:276
+#: src/usr/local/www/firewall_nat.php:295
 #: src/usr/local/www/firewall_nat_1to1.php:180
 msgid "Negated: This rule excludes NAT from a later rule"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat.php:284
+#: src/usr/local/www/firewall_nat.php:303
 msgid "All traffic matching this NAT entry is passed"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat.php:288
+#: src/usr/local/www/firewall_nat.php:307
 #, php-format
 msgid "Firewall rule ID %s is managed by this rule"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat.php:315
-#: src/usr/local/www/firewall_nat.php:332
-#: src/usr/local/www/firewall_nat.php:350
-#: src/usr/local/www/firewall_nat.php:367
-#: src/usr/local/www/firewall_nat.php:384
-#: src/usr/local/www/firewall_nat.php:402
-#: src/usr/local/www/firewall_rules.php:694
+#: src/usr/local/www/firewall_nat.php:334
+#: src/usr/local/www/firewall_nat.php:351
+#: src/usr/local/www/firewall_nat.php:369
+#: src/usr/local/www/firewall_nat.php:386
+#: src/usr/local/www/firewall_nat.php:403
+#: src/usr/local/www/firewall_nat.php:421
 #: src/usr/local/www/firewall_rules.php:703
 #: src/usr/local/www/firewall_rules.php:712
 #: src/usr/local/www/firewall_rules.php:721
+#: src/usr/local/www/firewall_rules.php:730
 msgid "Alias details"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat.php:420
+#: src/usr/local/www/firewall_nat.php:439
 msgid "Edit rule"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat.php:421
+#: src/usr/local/www/firewall_nat.php:440
 msgid "Add a new NAT based on this one"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat.php:422
+#: src/usr/local/www/firewall_nat.php:441
 msgid "Delete rule"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat.php:442
-#: src/usr/local/www/firewall_rules.php:805
+#: src/usr/local/www/firewall_nat.php:461
+#: src/usr/local/www/firewall_rules.php:814
 msgid "Add rule to the top of the list"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat.php:446
-#: src/usr/local/www/firewall_rules.php:809
+#: src/usr/local/www/firewall_nat.php:465
+#: src/usr/local/www/firewall_rules.php:818
 msgid "Add rule to the end of the list"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat.php:450
-#: src/usr/local/www/firewall_rules.php:813
+#: src/usr/local/www/firewall_nat.php:469
+#: src/usr/local/www/firewall_rules.php:822
 msgid "Delete selected rules"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat.php:454
-#: src/usr/local/www/firewall_rules.php:817
+#: src/usr/local/www/firewall_nat.php:473
+#: src/usr/local/www/firewall_rules.php:826
 msgid "Save rule order"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat.php:458
-#: src/usr/local/www/firewall_rules.php:821
+#: src/usr/local/www/firewall_nat.php:477
+#: src/usr/local/www/firewall_rules.php:830
 msgid "Add separator"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat.php:460
-#: src/usr/local/www/firewall_rules.php:823
+#: src/usr/local/www/firewall_nat.php:479
+#: src/usr/local/www/firewall_rules.php:832
 msgid "Separator"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat.php:471
-#: src/usr/local/www/firewall_rules.php:871
+#: src/usr/local/www/firewall_nat.php:490
+#: src/usr/local/www/firewall_rules.php:880
 msgid "Enter a description, Save, then drag to final location."
 msgstr ""
 
-#: src/usr/local/www/firewall_nat.php:507
+#: src/usr/local/www/firewall_nat.php:526
 msgid ""
 "One or more Port Forward rules have been moved but have not yet been saved"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat.php:522
-#: src/usr/local/www/firewall_rules.php:832
+#: src/usr/local/www/firewall_nat.php:541
+#: src/usr/local/www/firewall_rules.php:841
 msgid "Legend"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat.php:523
-#: src/usr/local/www/firewall_nat_edit.php:893
-#: src/usr/local/www/firewall_nat_edit.php:928
-#: src/usr/local/www/firewall_rules.php:833
+#: src/usr/local/www/firewall_nat.php:542
+#: src/usr/local/www/firewall_nat_edit.php:910
+#: src/usr/local/www/firewall_nat_edit.php:945
+#: src/usr/local/www/firewall_rules.php:842
 #: src/usr/local/www/firewall_rules_edit.php:1092
 #: src/usr/local/www/services_captiveportal_mac.php:62
 #: src/usr/local/www/services_captiveportal_mac_edit.php:204
@@ -10578,7 +10627,7 @@ msgstr ""
 msgid "Pass"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat.php:524
+#: src/usr/local/www/firewall_nat.php:543
 msgid "Linked rule"
 msgstr ""
 
@@ -10595,7 +10644,7 @@ msgid "External IP"
 msgstr ""
 
 #: src/usr/local/www/firewall_nat_1to1.php:152
-#: src/usr/local/www/firewall_nat_1to1_edit.php:422
+#: src/usr/local/www/firewall_nat_1to1_edit.php:432
 #: src/usr/local/www/status_upnp.php:71
 msgid "Internal IP"
 msgstr ""
@@ -10649,7 +10698,8 @@ msgstr ""
 
 #: src/usr/local/www/firewall_nat_1to1.php:256
 #: src/usr/local/www/firewall_nat_out.php:643
-#: src/usr/local/www/firewall_nat_out_edit.php:564
+#: src/usr/local/www/firewall_nat_out_edit.php:554
+#: src/usr/local/www/firewall_nat_out_edit.php:562
 #: src/usr/local/www/status_carp.php:173
 #: src/usr/local/www/system_gateway_groups_edit.php:287
 #: src/usr/local/www/system_gateway_groups_edit.php:307
@@ -10670,7 +10720,7 @@ msgid ""
 "One or more NAT 1:1 mappings have been moved but have not yet been saved"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat_1to1_edit.php:112
+#: src/usr/local/www/firewall_nat_1to1_edit.php:111
 #: src/usr/local/www/firewall_nat_out_edit.php:146
 #, php-format
 msgid ""
@@ -10678,59 +10728,59 @@ msgid ""
 "again."
 msgstr ""
 
-#: src/usr/local/www/firewall_nat_1to1_edit.php:122
+#: src/usr/local/www/firewall_nat_1to1_edit.php:121
 msgid "External subnet"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat_1to1_edit.php:132
+#: src/usr/local/www/firewall_nat_1to1_edit.php:131
 #: src/usr/local/www/firewall_nat_edit.php:225
 msgid "Destination address"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat_1to1_edit.php:167
+#: src/usr/local/www/firewall_nat_1to1_edit.php:168
 msgid "A valid external subnet must be specified."
 msgstr ""
 
-#: src/usr/local/www/firewall_nat_1to1_edit.php:172
+#: src/usr/local/www/firewall_nat_1to1_edit.php:173
 #: src/usr/local/www/firewall_nat_edit.php:283
 msgid "Alias entries must specify a single host or alias."
 msgstr ""
 
-#: src/usr/local/www/firewall_nat_1to1_edit.php:178
+#: src/usr/local/www/firewall_nat_1to1_edit.php:179
 #, php-format
 msgid "%s is not a valid internal IP address."
 msgstr ""
 
-#: src/usr/local/www/firewall_nat_1to1_edit.php:182
+#: src/usr/local/www/firewall_nat_1to1_edit.php:183
 msgid "A valid internal bit count must be specified."
 msgstr ""
 
-#: src/usr/local/www/firewall_nat_1to1_edit.php:189
+#: src/usr/local/www/firewall_nat_1to1_edit.php:190
 #: src/usr/local/www/firewall_nat_edit.php:300
 #: src/usr/local/www/firewall_rules_edit.php:518
 #, php-format
 msgid "%s is not a valid destination IP address or alias."
 msgstr ""
 
-#: src/usr/local/www/firewall_nat_1to1_edit.php:193
+#: src/usr/local/www/firewall_nat_1to1_edit.php:194
 #: src/usr/local/www/firewall_nat_edit.php:306
 #: src/usr/local/www/firewall_nat_out_edit.php:206
 #: src/usr/local/www/firewall_rules_edit.php:521
 msgid "A valid destination bit count must be specified."
 msgstr ""
 
-#: src/usr/local/www/firewall_nat_1to1_edit.php:254
+#: src/usr/local/www/firewall_nat_1to1_edit.php:255
 msgid "Single host"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat_1to1_edit.php:254
-#: src/usr/local/www/firewall_nat_1to1_edit.php:296
-#: src/usr/local/www/firewall_nat_edit.php:518
-#: src/usr/local/www/firewall_nat_edit.php:558
-#: src/usr/local/www/firewall_nat_out_edit.php:495
-#: src/usr/local/www/firewall_nat_out_edit.php:519
-#: src/usr/local/www/firewall_rules_edit.php:1284
-#: src/usr/local/www/firewall_virtual_ip_edit.php:379
+#: src/usr/local/www/firewall_nat_1to1_edit.php:255
+#: src/usr/local/www/firewall_nat_1to1_edit.php:302
+#: src/usr/local/www/firewall_nat_edit.php:536
+#: src/usr/local/www/firewall_nat_edit.php:576
+#: src/usr/local/www/firewall_nat_out_edit.php:493
+#: src/usr/local/www/firewall_nat_out_edit.php:517
+#: src/usr/local/www/firewall_rules_edit.php:1287
+#: src/usr/local/www/firewall_virtual_ip_edit.php:372
 #: src/usr/local/www/system_routes.php:243
 #: src/usr/local/www/vpn_ipsec_mobile.php:488
 #: src/usr/local/www/vpn_ipsec_phase2.php:521
@@ -10739,79 +10789,72 @@ msgstr ""
 msgid "Network"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat_1to1_edit.php:259
-#: src/usr/local/www/firewall_nat_1to1_edit.php:299
-#: src/usr/local/www/firewall_nat_edit.php:521
-#: src/usr/local/www/firewall_nat_edit.php:561
-#: src/usr/local/www/firewall_rules_edit.php:1295
-#: src/usr/local/www/guiconfig.inc:219
+#: src/usr/local/www/firewall_nat_1to1_edit.php:260
+#: src/usr/local/www/firewall_nat_1to1_edit.php:305
+#: src/usr/local/www/firewall_nat_edit.php:539
+#: src/usr/local/www/firewall_nat_edit.php:579
+#: src/usr/local/www/firewall_rules_edit.php:1298
+#: src/usr/local/www/guiconfig.inc:220
 msgid "PPPoE clients"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat_1to1_edit.php:263
-#: src/usr/local/www/firewall_nat_1to1_edit.php:303
-#: src/usr/local/www/firewall_nat_edit.php:525
-#: src/usr/local/www/firewall_nat_edit.php:565
-#: src/usr/local/www/firewall_rules_edit.php:1298
-#: src/usr/local/www/guiconfig.inc:220
+#: src/usr/local/www/firewall_nat_1to1_edit.php:264
+#: src/usr/local/www/firewall_nat_1to1_edit.php:309
+#: src/usr/local/www/firewall_nat_edit.php:543
+#: src/usr/local/www/firewall_nat_edit.php:583
+#: src/usr/local/www/firewall_rules_edit.php:1301
+#: src/usr/local/www/guiconfig.inc:221
 msgid "L2TP clients"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat_1to1_edit.php:296
-#: src/usr/local/www/firewall_nat_edit.php:518
-#: src/usr/local/www/firewall_nat_edit.php:558
-#: src/usr/local/www/firewall_rules_edit.php:1283
+#: src/usr/local/www/firewall_nat_1to1_edit.php:302
+#: src/usr/local/www/firewall_nat_edit.php:536
+#: src/usr/local/www/firewall_nat_edit.php:576
+#: src/usr/local/www/firewall_rules_edit.php:1286
 msgid "Single host or alias"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat_1to1_edit.php:296
-#: src/usr/local/www/firewall_nat_edit.php:558
-#: src/usr/local/www/firewall_nat_out_edit.php:495
-#: src/usr/local/www/firewall_rules_edit.php:1292
-msgid "This Firewall (self)"
-msgstr ""
-
-#: src/usr/local/www/firewall_nat_1to1_edit.php:364
+#: src/usr/local/www/firewall_nat_1to1_edit.php:374
 msgid "Edit NAT 1:1 Entry"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat_1to1_edit.php:371
+#: src/usr/local/www/firewall_nat_1to1_edit.php:381
 msgid "When disabled, the rule will not have any effect."
 msgstr ""
 
-#: src/usr/local/www/firewall_nat_1to1_edit.php:375
+#: src/usr/local/www/firewall_nat_1to1_edit.php:385
 msgid "No BINAT (NOT)"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat_1to1_edit.php:378
+#: src/usr/local/www/firewall_nat_1to1_edit.php:388
 msgid "Excludes the address from a later, more general, rule."
 msgstr ""
 
-#: src/usr/local/www/firewall_nat_1to1_edit.php:390
-#: src/usr/local/www/firewall_nat_edit.php:656
+#: src/usr/local/www/firewall_nat_1to1_edit.php:400
+#: src/usr/local/www/firewall_nat_edit.php:673
 #: src/usr/local/www/firewall_nat_npt_edit.php:155
 #: src/usr/local/www/firewall_rules.php:143
 #: src/usr/local/www/firewall_rules_edit.php:1018
 msgid "L2TP VPN"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat_1to1_edit.php:395
-#: src/usr/local/www/firewall_nat_edit.php:661
+#: src/usr/local/www/firewall_nat_1to1_edit.php:405
+#: src/usr/local/www/firewall_nat_edit.php:678
 #: src/usr/local/www/firewall_nat_npt_edit.php:161
 #: src/usr/local/www/firewall_rules.php:150
 #: src/usr/local/www/firewall_rules_edit.php:1022
-#: src/usr/local/www/head.inc:271 src/usr/local/www/services_pppoe.php:82
+#: src/usr/local/www/head.inc:298 src/usr/local/www/services_pppoe.php:82
 #: src/usr/local/www/services_pppoe.php:96
 #: src/usr/local/www/services_pppoe_edit.php:280
 msgid "PPPoE Server"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat_1to1_edit.php:400
-#: src/usr/local/www/firewall_nat_edit.php:666
+#: src/usr/local/www/firewall_nat_1to1_edit.php:410
+#: src/usr/local/www/firewall_nat_edit.php:683
 #: src/usr/local/www/firewall_nat_npt_edit.php:167
 #: src/usr/local/www/firewall_rules.php:157
 #: src/usr/local/www/firewall_rules_edit.php:1027
-#: src/usr/local/www/head.inc:286 src/usr/local/www/head.inc:302
+#: src/usr/local/www/head.inc:313 src/usr/local/www/head.inc:329
 #: src/usr/local/www/status_graph.php:42 src/usr/local/www/status_graph.php:442
 #: src/usr/local/www/status_ipsec.php:456
 #: src/usr/local/www/status_ipsec_leases.php:32
@@ -10832,50 +10875,49 @@ msgstr ""
 msgid "IPsec"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat_1to1_edit.php:413
-#: src/usr/local/www/firewall_nat_edit.php:679
-#: src/usr/local/www/firewall_nat_out_edit.php:478
+#: src/usr/local/www/firewall_nat_1to1_edit.php:423
+#: src/usr/local/www/firewall_nat_edit.php:696
 msgid ""
 "Choose which interface this rule applies to. In most cases \"WAN\" is "
 "specified."
 msgstr ""
 
-#: src/usr/local/www/firewall_nat_1to1_edit.php:417
+#: src/usr/local/www/firewall_nat_1to1_edit.php:427
 msgid "External subnet IP"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat_1to1_edit.php:419
+#: src/usr/local/www/firewall_nat_1to1_edit.php:429
 msgid ""
 "Enter the external (usually on a WAN) subnet's starting address for the 1:1 "
 "mapping. The subnet mask from the internal address below will be applied to "
 "this IP address."
 msgstr ""
 
-#: src/usr/local/www/firewall_nat_1to1_edit.php:429
-#: src/usr/local/www/firewall_nat_1to1_edit.php:456
+#: src/usr/local/www/firewall_nat_1to1_edit.php:439
+#: src/usr/local/www/firewall_nat_1to1_edit.php:466
 msgid "Invert the sense of the match."
 msgstr ""
 
-#: src/usr/local/www/firewall_nat_1to1_edit.php:442
-#: src/usr/local/www/firewall_nat_1to1_edit.php:469
-#: src/usr/local/www/firewall_nat_edit.php:725
-#: src/usr/local/www/firewall_nat_edit.php:792
+#: src/usr/local/www/firewall_nat_1to1_edit.php:452
+#: src/usr/local/www/firewall_nat_1to1_edit.php:479
+#: src/usr/local/www/firewall_nat_edit.php:742
+#: src/usr/local/www/firewall_nat_edit.php:809
 msgid "Address/mask"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat_1to1_edit.php:444
+#: src/usr/local/www/firewall_nat_1to1_edit.php:454
 msgid ""
 "Enter the internal (LAN) subnet for the 1:1 mapping. The subnet size "
 "specified for the internal subnet will be applied to the external subnet."
 msgstr ""
 
-#: src/usr/local/www/firewall_nat_1to1_edit.php:449
-#: src/usr/local/www/firewall_nat_edit.php:772
+#: src/usr/local/www/firewall_nat_1to1_edit.php:459
+#: src/usr/local/www/firewall_nat_edit.php:789
 #: src/usr/local/www/firewall_nat_out.php:281
 #: src/usr/local/www/firewall_nat_out.php:534
 #: src/usr/local/www/firewall_nat_out_edit.php:152
-#: src/usr/local/www/firewall_nat_out_edit.php:513
-#: src/usr/local/www/firewall_rules.php:378
+#: src/usr/local/www/firewall_nat_out_edit.php:511
+#: src/usr/local/www/firewall_rules.php:387
 #: src/usr/local/www/firewall_rules_edit.php:414
 #: src/usr/local/www/status_ipsec_sad.php:66
 #: src/usr/local/www/status_ipsec_spd.php:59
@@ -10886,28 +10928,28 @@ msgstr ""
 msgid "Destination"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat_1to1_edit.php:471
+#: src/usr/local/www/firewall_nat_1to1_edit.php:481
 msgid ""
 "The 1:1 mapping will only be used for connections to or from the specified "
 "destination. Hint: this is usually \"Any\"."
 msgstr ""
 
-#: src/usr/local/www/firewall_nat_1to1_edit.php:487
-#: src/usr/local/www/firewall_nat_edit.php:883
+#: src/usr/local/www/firewall_nat_1to1_edit.php:497
+#: src/usr/local/www/firewall_nat_edit.php:900
 msgid "Use system default"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat_1to1_edit.php:489
-#: src/usr/local/www/firewall_nat_edit.php:886
-#: src/usr/local/www/firewall_rules.php:769
-#: src/usr/local/www/services_dyndns_edit.php:258
+#: src/usr/local/www/firewall_nat_1to1_edit.php:499
+#: src/usr/local/www/firewall_nat_edit.php:903
+#: src/usr/local/www/firewall_rules.php:778
+#: src/usr/local/www/services_dyndns_edit.php:259
 #: src/usr/local/www/vpn_ipsec_phase1.php:855
 #: src/usr/local/www/vpn_openvpn_csc.php:328
 msgid "Disable"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat_1to1_edit.php:484
-#: src/usr/local/www/firewall_nat_edit.php:880
+#: src/usr/local/www/firewall_nat_1to1_edit.php:494
+#: src/usr/local/www/firewall_nat_edit.php:897
 msgid "NAT reflection"
 msgstr ""
 
@@ -10927,7 +10969,7 @@ msgid "Destination port to"
 msgstr ""
 
 #: src/usr/local/www/firewall_nat_edit.php:230
-#: src/usr/local/www/firewall_nat_edit.php:834
+#: src/usr/local/www/firewall_nat_edit.php:851
 msgid "Redirect target IP"
 msgstr ""
 
@@ -11010,87 +11052,93 @@ msgstr ""
 msgid "The destination port range overlaps with an existing entry."
 msgstr ""
 
-#: src/usr/local/www/firewall_nat_edit.php:472
+#: src/usr/local/www/firewall_nat_edit.php:481
 msgid "NAT Port Forward"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat_edit.php:630
+#: src/usr/local/www/firewall_nat_edit.php:576
+#: src/usr/local/www/firewall_nat_out_edit.php:493
+#: src/usr/local/www/firewall_rules_edit.php:1295
+msgid "This Firewall (self)"
+msgstr ""
+
+#: src/usr/local/www/firewall_nat_edit.php:647
 msgid "Edit Redirect Entry"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat_edit.php:641
+#: src/usr/local/www/firewall_nat_edit.php:658
 msgid "No RDR (NOT)"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat_edit.php:644
+#: src/usr/local/www/firewall_nat_edit.php:661
 msgid ""
 "This option is rarely needed. Don't use this without thorough knowledge of "
 "the implications."
 msgstr ""
 
-#: src/usr/local/www/firewall_nat_edit.php:688
+#: src/usr/local/www/firewall_nat_edit.php:705
 msgid ""
 "Choose which protocol this rule should match. In most cases \"TCP\" is "
 "specified."
 msgstr ""
 
-#: src/usr/local/www/firewall_nat_edit.php:692
-#: src/usr/local/www/firewall_nat_edit.php:1178
-#: src/usr/local/www/firewall_rules_edit.php:1401
-#: src/usr/local/www/firewall_rules_edit.php:1720
-#: src/usr/local/www/firewall_rules_edit.php:1792
+#: src/usr/local/www/firewall_nat_edit.php:709
+#: src/usr/local/www/firewall_nat_edit.php:1195
+#: src/usr/local/www/firewall_rules_edit.php:1404
+#: src/usr/local/www/firewall_rules_edit.php:1723
+#: src/usr/local/www/firewall_rules_edit.php:1795
 #: src/usr/local/www/interfaces_bridge_edit.php:416
 #: src/usr/local/www/interfaces_bridge_edit.php:661
 #: src/usr/local/www/interfaces_ppps_edit.php:822
 #: src/usr/local/www/interfaces_ppps_edit.php:1037
-#: src/usr/local/www/services_dhcp.php:982
-#: src/usr/local/www/services_dhcp.php:1032
-#: src/usr/local/www/services_dhcp.php:1061
-#: src/usr/local/www/services_dhcp.php:1088
-#: src/usr/local/www/services_dhcp.php:1109
-#: src/usr/local/www/services_dhcp.php:1131
-#: src/usr/local/www/services_dhcp.php:1188
-#: src/usr/local/www/services_dhcp.php:1410
-#: src/usr/local/www/services_dhcp.php:1445
-#: src/usr/local/www/services_dhcp.php:1480
-#: src/usr/local/www/services_dhcp.php:1514
-#: src/usr/local/www/services_dhcp.php:1548
-#: src/usr/local/www/services_dhcp.php:1583
-#: src/usr/local/www/services_dhcp.php:1622
-#: src/usr/local/www/services_dhcp_edit.php:569
-#: src/usr/local/www/services_dhcp_edit.php:617
-#: src/usr/local/www/services_dhcp_edit.php:653
-#: src/usr/local/www/services_dhcp_edit.php:710
-#: src/usr/local/www/services_dhcp_edit.php:745
-#: src/usr/local/www/services_dhcp_edit.php:779
-#: src/usr/local/www/services_dhcpv6.php:722
-#: src/usr/local/www/services_dhcpv6.php:790
-#: src/usr/local/www/services_dhcpv6.php:826
-#: src/usr/local/www/services_dhcpv6.php:847
-#: src/usr/local/www/services_dhcpv6.php:875
-#: src/usr/local/www/services_dhcpv6.php:1069
-#: src/usr/local/www/services_dhcpv6.php:1104
-#: src/usr/local/www/services_dhcpv6.php:1138
-#: src/usr/local/www/services_dhcpv6.php:1173
-#: src/usr/local/www/services_dhcpv6.php:1209
-#: src/usr/local/www/services_ntpd.php:305
-#: src/usr/local/www/services_ntpd.php:341
-#: src/usr/local/www/services_ntpd.php:410
-#: src/usr/local/www/services_ntpd.php:447
+#: src/usr/local/www/services_dhcp.php:1000
+#: src/usr/local/www/services_dhcp.php:1058
+#: src/usr/local/www/services_dhcp.php:1087
+#: src/usr/local/www/services_dhcp.php:1116
+#: src/usr/local/www/services_dhcp.php:1137
+#: src/usr/local/www/services_dhcp.php:1159
+#: src/usr/local/www/services_dhcp.php:1217
+#: src/usr/local/www/services_dhcp.php:1440
+#: src/usr/local/www/services_dhcp.php:1475
+#: src/usr/local/www/services_dhcp.php:1510
+#: src/usr/local/www/services_dhcp.php:1544
+#: src/usr/local/www/services_dhcp.php:1578
+#: src/usr/local/www/services_dhcp.php:1613
+#: src/usr/local/www/services_dhcp.php:1652
+#: src/usr/local/www/services_dhcp_edit.php:579
+#: src/usr/local/www/services_dhcp_edit.php:635
+#: src/usr/local/www/services_dhcp_edit.php:671
+#: src/usr/local/www/services_dhcp_edit.php:729
+#: src/usr/local/www/services_dhcp_edit.php:764
+#: src/usr/local/www/services_dhcp_edit.php:798
+#: src/usr/local/www/services_dhcpv6.php:736
+#: src/usr/local/www/services_dhcpv6.php:812
+#: src/usr/local/www/services_dhcpv6.php:848
+#: src/usr/local/www/services_dhcpv6.php:869
+#: src/usr/local/www/services_dhcpv6.php:897
+#: src/usr/local/www/services_dhcpv6.php:1093
+#: src/usr/local/www/services_dhcpv6.php:1128
+#: src/usr/local/www/services_dhcpv6.php:1162
+#: src/usr/local/www/services_dhcpv6.php:1197
+#: src/usr/local/www/services_dhcpv6.php:1233
+#: src/usr/local/www/services_ntpd.php:319
+#: src/usr/local/www/services_ntpd.php:355
+#: src/usr/local/www/services_ntpd.php:424
+#: src/usr/local/www/services_ntpd.php:461
 #: src/usr/local/www/services_ntpd_gps.php:343
 #: src/usr/local/www/services_ntpd_gps.php:534
-#: src/usr/local/www/system_gateways_edit.php:672
-#: src/usr/local/www/system_gateways_edit.php:875
+#: src/usr/local/www/system_gateways_edit.php:692
+#: src/usr/local/www/system_gateways_edit.php:895
 msgid "Display Advanced"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat_edit.php:700
-#: src/usr/local/www/firewall_nat_edit.php:704
+#: src/usr/local/www/firewall_nat_edit.php:717
+#: src/usr/local/www/firewall_nat_edit.php:721
 #: src/usr/local/www/firewall_nat_out.php:279
 #: src/usr/local/www/firewall_nat_out.php:532
 #: src/usr/local/www/firewall_nat_out_edit.php:152
-#: src/usr/local/www/firewall_nat_out_edit.php:489
-#: src/usr/local/www/firewall_rules.php:376
+#: src/usr/local/www/firewall_nat_out_edit.php:487
+#: src/usr/local/www/firewall_rules.php:385
 #: src/usr/local/www/firewall_rules_edit.php:413
 #: src/usr/local/www/status_ipsec_sad.php:65
 #: src/usr/local/www/status_ipsec_spd.php:58
@@ -11103,75 +11151,75 @@ msgstr ""
 msgid "Source"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat_edit.php:709
+#: src/usr/local/www/firewall_nat_edit.php:726
 msgid "Source not"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat_edit.php:729
+#: src/usr/local/www/firewall_nat_edit.php:746
 #: src/usr/local/www/firewall_virtual_ip.php:234
-#: src/usr/local/www/firewall_virtual_ip_edit.php:359
+#: src/usr/local/www/firewall_virtual_ip_edit.php:352
 msgid "Other"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat_edit.php:735
+#: src/usr/local/www/firewall_nat_edit.php:752
 msgid "Source port range"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat_edit.php:743
-#: src/usr/local/www/firewall_nat_edit.php:804
+#: src/usr/local/www/firewall_nat_edit.php:760
+#: src/usr/local/www/firewall_nat_edit.php:821
 msgid "From port"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat_edit.php:750
-#: src/usr/local/www/firewall_nat_edit.php:764
-#: src/usr/local/www/firewall_nat_edit.php:811
-#: src/usr/local/www/firewall_nat_edit.php:825
-#: src/usr/local/www/firewall_nat_edit.php:858
-#: src/usr/local/www/firewall_rules_edit.php:1358
-#: src/usr/local/www/firewall_rules_edit.php:1372
-#: src/usr/local/www/interfaces.php:2589
+#: src/usr/local/www/firewall_nat_edit.php:767
+#: src/usr/local/www/firewall_nat_edit.php:781
+#: src/usr/local/www/firewall_nat_edit.php:828
+#: src/usr/local/www/firewall_nat_edit.php:842
+#: src/usr/local/www/firewall_nat_edit.php:875
+#: src/usr/local/www/firewall_rules_edit.php:1361
+#: src/usr/local/www/firewall_rules_edit.php:1375
+#: src/usr/local/www/interfaces.php:2597
 #: src/usr/local/www/interfaces_ppps_edit.php:749
 #: src/usr/local/www/services_ntpd_gps.php:215
 msgid "Custom"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat_edit.php:757
-#: src/usr/local/www/firewall_nat_edit.php:818
+#: src/usr/local/www/firewall_nat_edit.php:774
+#: src/usr/local/www/firewall_nat_edit.php:835
 msgid "To port"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat_edit.php:766
+#: src/usr/local/www/firewall_nat_edit.php:783
 msgid ""
 "Specify the source port or port range for this rule. This is usually random "
 "and almost never equal to the destination port range (and should usually be "
 "'any'). The 'to' field may be left empty if only filtering a single port."
 msgstr ""
 
-#: src/usr/local/www/firewall_nat_edit.php:776
+#: src/usr/local/www/firewall_nat_edit.php:793
 msgid "Destination not"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat_edit.php:796
+#: src/usr/local/www/firewall_nat_edit.php:813
 msgid "Destination port range"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat_edit.php:827
+#: src/usr/local/www/firewall_nat_edit.php:844
 msgid ""
 "Specify the port or port range for the destination of the packet for this "
 "mapping. The 'to' field may be left empty if only mapping a single port. "
 msgstr ""
 
-#: src/usr/local/www/firewall_nat_edit.php:836
+#: src/usr/local/www/firewall_nat_edit.php:853
 msgid ""
 "Enter the internal IP address of the server on which to map the ports.<br /"
 ">e.g.: 192.168.1.12"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat_edit.php:839
+#: src/usr/local/www/firewall_nat_edit.php:856
 msgid "Redirect target port"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat_edit.php:849
+#: src/usr/local/www/firewall_nat_edit.php:866
 msgid ""
 "Specify the port on the machine with the IP address entered above. In case "
 "of a port range, specify the beginning port of the range (the end port will "
@@ -11179,109 +11227,109 @@ msgid ""
 "port\" above."
 msgstr ""
 
-#: src/usr/local/www/firewall_nat_edit.php:872
+#: src/usr/local/www/firewall_nat_edit.php:889
 #: src/usr/local/www/firewall_nat_out_edit.php:620
-#: src/usr/local/www/firewall_rules_edit.php:1540
+#: src/usr/local/www/firewall_rules_edit.php:1543
 msgid "No XMLRPC Sync"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat_edit.php:875
+#: src/usr/local/www/firewall_nat_edit.php:892
 msgid ""
 "This prevents the rule on Master from automatically syncing to other CARP "
 "members. This does NOT prevent the rule from being overwritten on Slave."
 msgstr ""
 
-#: src/usr/local/www/firewall_nat_edit.php:884
+#: src/usr/local/www/firewall_nat_edit.php:901
 msgid "Enable (NAT + Proxy)"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat_edit.php:885
+#: src/usr/local/www/firewall_nat_edit.php:902
 msgid "Enable (Pure NAT)"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat_edit.php:900
+#: src/usr/local/www/firewall_nat_edit.php:917
 #, php-format
 msgid "Rule %s"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat_edit.php:903
+#: src/usr/local/www/firewall_nat_edit.php:920
 msgid "View the filter rule"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat_edit.php:910
+#: src/usr/local/www/firewall_nat_edit.php:927
 msgid "Create new associated filter rule"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat_edit.php:915
-#: src/usr/local/www/firewall_nat_edit.php:922
+#: src/usr/local/www/firewall_nat_edit.php:932
+#: src/usr/local/www/firewall_nat_edit.php:939
 msgid "Filter rule association"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat_edit.php:926
+#: src/usr/local/www/firewall_nat_edit.php:943
 msgid "Add associated filter rule"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat_edit.php:927
+#: src/usr/local/www/firewall_nat_edit.php:944
 msgid "Add unassociated filter rule"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat_edit.php:930
+#: src/usr/local/www/firewall_nat_edit.php:947
 msgid ""
 "The \"pass\" selection does not work properly with Multi-WAN. It will only "
 "work on an interface containing the default gateway."
 msgstr ""
 
-#: src/usr/local/www/firewall_nat_edit.php:939
+#: src/usr/local/www/firewall_nat_edit.php:956
 #: src/usr/local/www/firewall_nat_out_edit.php:656
-#: src/usr/local/www/firewall_rules_edit.php:1670
+#: src/usr/local/www/firewall_rules_edit.php:1673
 msgid "Rule Information"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat_edit.php:944
-#: src/usr/local/www/firewall_nat_edit.php:951
+#: src/usr/local/www/firewall_nat_edit.php:961
+#: src/usr/local/www/firewall_nat_edit.php:968
 #: src/usr/local/www/firewall_nat_out_edit.php:661
 #: src/usr/local/www/firewall_nat_out_edit.php:668
-#: src/usr/local/www/firewall_rules_edit.php:1675
-#: src/usr/local/www/firewall_rules_edit.php:1682
+#: src/usr/local/www/firewall_rules_edit.php:1678
+#: src/usr/local/www/firewall_rules_edit.php:1685
 msgid " by "
 msgstr ""
 
-#: src/usr/local/www/firewall_nat_edit.php:943
+#: src/usr/local/www/firewall_nat_edit.php:960
 #: src/usr/local/www/firewall_nat_out_edit.php:660
-#: src/usr/local/www/firewall_rules_edit.php:1674
+#: src/usr/local/www/firewall_rules_edit.php:1677
 msgid "Created"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat_edit.php:950
+#: src/usr/local/www/firewall_nat_edit.php:967
 #: src/usr/local/www/firewall_nat_out_edit.php:667
-#: src/usr/local/www/firewall_rules_edit.php:1681
+#: src/usr/local/www/firewall_rules_edit.php:1684
 msgid "Updated"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat_edit.php:1180
-#: src/usr/local/www/firewall_rules_edit.php:1718
-#: src/usr/local/www/firewall_rules_edit.php:1790
+#: src/usr/local/www/firewall_nat_edit.php:1197
+#: src/usr/local/www/firewall_rules_edit.php:1721
+#: src/usr/local/www/firewall_rules_edit.php:1793
 #: src/usr/local/www/interfaces_bridge_edit.php:659
 #: src/usr/local/www/interfaces_ppps_edit.php:1035
-#: src/usr/local/www/services_dhcp.php:1408
-#: src/usr/local/www/services_dhcp.php:1443
-#: src/usr/local/www/services_dhcp.php:1478
-#: src/usr/local/www/services_dhcp.php:1512
-#: src/usr/local/www/services_dhcp.php:1546
-#: src/usr/local/www/services_dhcp.php:1581
-#: src/usr/local/www/services_dhcp.php:1620
-#: src/usr/local/www/services_dhcp_edit.php:708
-#: src/usr/local/www/services_dhcp_edit.php:743
-#: src/usr/local/www/services_dhcp_edit.php:777
-#: src/usr/local/www/services_dhcpv6.php:1067
-#: src/usr/local/www/services_dhcpv6.php:1102
-#: src/usr/local/www/services_dhcpv6.php:1136
-#: src/usr/local/www/services_dhcpv6.php:1171
-#: src/usr/local/www/services_dhcpv6.php:1207
-#: src/usr/local/www/services_ntpd.php:408
-#: src/usr/local/www/services_ntpd.php:445
+#: src/usr/local/www/services_dhcp.php:1438
+#: src/usr/local/www/services_dhcp.php:1473
+#: src/usr/local/www/services_dhcp.php:1508
+#: src/usr/local/www/services_dhcp.php:1542
+#: src/usr/local/www/services_dhcp.php:1576
+#: src/usr/local/www/services_dhcp.php:1611
+#: src/usr/local/www/services_dhcp.php:1650
+#: src/usr/local/www/services_dhcp_edit.php:727
+#: src/usr/local/www/services_dhcp_edit.php:762
+#: src/usr/local/www/services_dhcp_edit.php:796
+#: src/usr/local/www/services_dhcpv6.php:1091
+#: src/usr/local/www/services_dhcpv6.php:1126
+#: src/usr/local/www/services_dhcpv6.php:1160
+#: src/usr/local/www/services_dhcpv6.php:1195
+#: src/usr/local/www/services_dhcpv6.php:1231
+#: src/usr/local/www/services_ntpd.php:422
+#: src/usr/local/www/services_ntpd.php:459
 #: src/usr/local/www/services_ntpd_gps.php:532
-#: src/usr/local/www/system_gateways_edit.php:873
+#: src/usr/local/www/system_gateways_edit.php:893
 msgid "Hide Advanced"
 msgstr ""
 
@@ -11334,8 +11382,8 @@ msgstr ""
 
 #: src/usr/local/www/firewall_nat_npt_edit.php:213
 #: src/usr/local/www/firewall_nat_npt_edit.php:228
-#: src/usr/local/www/firewall_nat_out_edit.php:551
-#: src/usr/local/www/status_lb_vs.php:63 src/usr/local/www/system.php:390
+#: src/usr/local/www/firewall_nat_out_edit.php:549
+#: src/usr/local/www/status_lb_vs.php:63 src/usr/local/www/system.php:393
 #: src/usr/local/www/vpn_ipsec_phase2.php:521
 #: src/usr/local/www/vpn_ipsec_phase2.php:528
 #: src/usr/local/www/vpn_ipsec_phase2.php:541
@@ -11412,6 +11460,7 @@ msgstr ""
 
 #: src/usr/local/www/firewall_nat_out.php:285
 #: src/usr/local/www/firewall_nat_out.php:538
+#: src/usr/local/www/firewall_nat_out_edit.php:609
 msgid "Static Port"
 msgstr ""
 
@@ -11538,96 +11587,114 @@ msgstr ""
 msgid "Interface Address"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat_out_edit.php:415
+#: src/usr/local/www/firewall_nat_out_edit.php:413
 msgid "Host Alias: "
 msgstr ""
 
-#: src/usr/local/www/firewall_nat_out_edit.php:418
+#: src/usr/local/www/firewall_nat_out_edit.php:416
 msgid "Other Subnet (Enter Below)"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat_out_edit.php:429
+#: src/usr/local/www/firewall_nat_out_edit.php:427
 msgid "Edit Advanced Outbound NAT Entry"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat_out_edit.php:440
+#: src/usr/local/www/firewall_nat_out_edit.php:438
 msgid "Do not NAT"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat_out_edit.php:443
+#: src/usr/local/www/firewall_nat_out_edit.php:441
 msgid "In most cases this option is not required."
 msgstr ""
 
-#: src/usr/local/www/firewall_nat_out_edit.php:487
+#: src/usr/local/www/firewall_nat_out_edit.php:476
+msgid ""
+"The interface on which traffic is matched as it exits the firewall. In most "
+"cases this is \"WAN\" or another externally-connected interface."
+msgstr ""
+
+#: src/usr/local/www/firewall_nat_out_edit.php:485
 msgid ""
 "Choose which protocol this rule should match. In most cases \"any\" is "
 "specified."
 msgstr ""
 
-#: src/usr/local/www/firewall_nat_out_edit.php:502
+#: src/usr/local/www/firewall_nat_out_edit.php:500
 msgid "Source network for the outbound NAT mapping."
 msgstr ""
 
-#: src/usr/local/www/firewall_nat_out_edit.php:526
+#: src/usr/local/www/firewall_nat_out_edit.php:507
+#: src/usr/local/www/firewall_nat_out_edit.php:531
+#: src/usr/local/www/firewall_nat_out_edit.php:593
+msgid "Port or Range"
+msgstr ""
+
+#: src/usr/local/www/firewall_nat_out_edit.php:524
 msgid "Destination network for the outbound NAT mapping."
 msgstr ""
 
-#: src/usr/local/www/firewall_nat_out_edit.php:542
+#: src/usr/local/www/firewall_nat_out_edit.php:540
 msgid "Invert the sense of the destination match."
 msgstr ""
 
-#: src/usr/local/www/firewall_nat_out_edit.php:546
+#: src/usr/local/www/firewall_nat_out_edit.php:544
 msgid "Translation"
 msgstr ""
 
+#: src/usr/local/www/firewall_nat_out_edit.php:552
+msgid ""
+"Connections matching this rule will be mapped to the specified <b>Address</"
+"b>.<br />The <b>Address</b> can be an Interface, a Host-type Alias, or a <a "
+"href=\"firewall_virtual_ip.php\">"
+msgstr ""
+
 #: src/usr/local/www/firewall_nat_out_edit.php:558
 msgid "Other subnet"
 msgstr ""
 
 #: src/usr/local/www/firewall_nat_out_edit.php:561
 msgid ""
-"Packets matching this rule will be mapped to the IP address given here.<br /"
-">To apply this rule to a different IP address than the IP address of the "
-"interface chosen above, select it here (<a href=\"firewall_virtual_ip.php\">"
+"This subnet must be routed to the firewall or each address in the subnet "
+"must be defined in one or more <a href=\"firewall_virtual_ip.php\">"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat_out_edit.php:572
-#: src/usr/local/www/interfaces.php:1838 src/usr/local/www/interfaces.php:2818
-#: src/usr/local/www/interfaces.php:2827 src/usr/local/www/interfaces.php:2836
-#: src/usr/local/www/interfaces.php:2894 src/usr/local/www/interfaces.php:3149
+#: src/usr/local/www/firewall_nat_out_edit.php:569
+#: src/usr/local/www/interfaces.php:1842 src/usr/local/www/interfaces.php:2828
+#: src/usr/local/www/interfaces.php:2837 src/usr/local/www/interfaces.php:2846
+#: src/usr/local/www/interfaces.php:2904 src/usr/local/www/interfaces.php:3159
 #: src/usr/local/www/services_ntpd_gps.php:215
 msgid "Default"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat_out_edit.php:573
+#: src/usr/local/www/firewall_nat_out_edit.php:570
 msgid "Round Robin"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat_out_edit.php:574
+#: src/usr/local/www/firewall_nat_out_edit.php:571
 msgid "Round Robin with Sticky Address"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat_out_edit.php:575
+#: src/usr/local/www/firewall_nat_out_edit.php:572
 msgid "Random"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat_out_edit.php:576
+#: src/usr/local/www/firewall_nat_out_edit.php:573
 msgid "Random with Sticky Address"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat_out_edit.php:577
+#: src/usr/local/www/firewall_nat_out_edit.php:574
 msgid "Source hash"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat_out_edit.php:578
+#: src/usr/local/www/firewall_nat_out_edit.php:575
 msgid "Bit mask"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat_out_edit.php:569
+#: src/usr/local/www/firewall_nat_out_edit.php:566
 msgid "Pool options"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat_out_edit.php:580
+#: src/usr/local/www/firewall_nat_out_edit.php:577
 msgid ""
 "Only Round Robin types work with Host Aliases. Any type can be used with a "
 "Subnet.<br /></span><ul class=\"help-block\"><li>Round Robin: Loops through "
@@ -11642,19 +11709,23 @@ msgid ""
 "ul><span class=\"help-block\">"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat_out_edit.php:591
+#: src/usr/local/www/firewall_nat_out_edit.php:588
 msgid "Source Hash Key"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat_out_edit.php:594
+#: src/usr/local/www/firewall_nat_out_edit.php:591
 msgid ""
 "The key that is fed to the hashing algorithm in hex format, preceeded by \"0x"
 "\", or any string. A non-hex string is hashed using md5 to a hexadecimal "
 "key. Defaults to a randomly generated value."
 msgstr ""
 
-#: src/usr/local/www/firewall_nat_out_edit.php:604
-msgid "Enter the source port or range for the outbound NAT mapping."
+#: src/usr/local/www/firewall_nat_out_edit.php:601
+msgid ""
+"Enter the external source <b>Port or Range</b> used for remapping the "
+"original source port on connections matching the rule. <br/><br/>Port ranges "
+"are a low port and high port number separated by \":\".<br/>Leave blank when "
+"<b>Static Port</b> is checked."
 msgstr ""
 
 #: src/usr/local/www/firewall_nat_out_edit.php:616
@@ -11698,55 +11769,55 @@ msgstr ""
 msgid "The firewall rule configuration has been changed."
 msgstr ""
 
-#: src/usr/local/www/firewall_rules.php:367
+#: src/usr/local/www/firewall_rules.php:376
 msgid "Rules (Drag to Change Order)"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules.php:380
-#: src/usr/local/www/firewall_rules_edit.php:1601
+#: src/usr/local/www/firewall_rules.php:389
+#: src/usr/local/www/firewall_rules_edit.php:1604
 #: src/usr/local/www/interfaces.php:527 src/usr/local/www/interfaces.php:578
-#: src/usr/local/www/services_dhcp.php:914
-#: src/usr/local/www/services_dhcp_edit.php:534
-#: src/usr/local/www/status_gateways.php:60 src/usr/local/www/system.php:412
-#: src/usr/local/www/system.php:415
+#: src/usr/local/www/services_dhcp.php:930
+#: src/usr/local/www/services_dhcp_edit.php:544
+#: src/usr/local/www/status_gateways.php:60 src/usr/local/www/system.php:415
+#: src/usr/local/www/system.php:418
 #: src/usr/local/www/system_gateway_groups_edit.php:305
-#: src/usr/local/www/system_gateways.php:244
-#: src/usr/local/www/system_gateways_edit.php:611
+#: src/usr/local/www/system_gateways.php:258
+#: src/usr/local/www/system_gateways_edit.php:624
 #: src/usr/local/www/system_routes.php:244
 #: src/usr/local/www/system_routes_edit.php:82
 #: src/usr/local/www/system_routes_edit.php:257
 msgid "Gateway"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules.php:381
+#: src/usr/local/www/firewall_rules.php:390
 #: src/usr/local/www/status_queues.php:159
 msgid "Queue"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules.php:382
-#: src/usr/local/www/firewall_rules_edit.php:1570
+#: src/usr/local/www/firewall_rules.php:391
+#: src/usr/local/www/firewall_rules_edit.php:1573
 msgid "Schedule"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules.php:398
-#: src/usr/local/www/firewall_rules.php:489
+#: src/usr/local/www/firewall_rules.php:407
+#: src/usr/local/www/firewall_rules.php:498
 msgid "traffic is passed"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules.php:408
+#: src/usr/local/www/firewall_rules.php:417
 msgid "Anti-Lockout Rule"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules.php:410
-#: src/usr/local/www/firewall_rules.php:429
-#: src/usr/local/www/firewall_rules.php:448 src/usr/local/www/head.inc:517
+#: src/usr/local/www/firewall_rules.php:419
+#: src/usr/local/www/firewall_rules.php:438
+#: src/usr/local/www/firewall_rules.php:457 src/usr/local/www/head.inc:547
 #: src/usr/local/www/load_balancer_monitor.php:95
 #: src/usr/local/www/load_balancer_pool.php:109
 #: src/usr/local/www/load_balancer_setting.php:86
 #: src/usr/local/www/load_balancer_setting.php:108
 #: src/usr/local/www/load_balancer_virtual_server.php:129
-#: src/usr/local/www/services_ntpd.php:184
-#: src/usr/local/www/services_ntpd.php:196
+#: src/usr/local/www/services_ntpd.php:188
+#: src/usr/local/www/services_ntpd.php:200
 #: src/usr/local/www/services_ntpd_acls.php:173
 #: src/usr/local/www/services_ntpd_gps.php:196
 #: src/usr/local/www/services_ntpd_pps.php:115
@@ -11765,219 +11836,219 @@ msgstr ""
 msgid "Settings"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules.php:417
-#: src/usr/local/www/firewall_rules.php:436
-#: src/usr/local/www/firewall_rules.php:480
+#: src/usr/local/www/firewall_rules.php:426
+#: src/usr/local/www/firewall_rules.php:445
+#: src/usr/local/www/firewall_rules.php:489
 msgid "traffic is blocked"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules.php:420
+#: src/usr/local/www/firewall_rules.php:429
 msgid "RFC 1918 networks"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules.php:427
+#: src/usr/local/www/firewall_rules.php:436
 msgid "Block private networks"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules.php:439
+#: src/usr/local/www/firewall_rules.php:448
 #, php-format
 msgid "Reserved%sNot assigned by IANA"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules.php:446
-#: src/usr/local/www/interfaces.php:3110
+#: src/usr/local/www/firewall_rules.php:455
+#: src/usr/local/www/interfaces.php:3120
 msgid "Block bogon networks"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules.php:483
+#: src/usr/local/www/firewall_rules.php:492
 msgid "traffic is rejected"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules.php:486
+#: src/usr/local/www/firewall_rules.php:495
 msgid "traffic is matched"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules.php:498
-#: src/usr/local/www/firewall_rules.php:839
+#: src/usr/local/www/firewall_rules.php:507
+#: src/usr/local/www/firewall_rules.php:848
 msgid "&quot;Quick&quot; rule. Applied immediately on match."
 msgstr ""
 
-#: src/usr/local/www/firewall_rules.php:503
+#: src/usr/local/www/firewall_rules.php:512
 msgid "advanced setting"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules.php:507
+#: src/usr/local/www/firewall_rules.php:516
 msgid "traffic is logged"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules.php:526
+#: src/usr/local/www/firewall_rules.php:535
 #: src/usr/local/www/firewall_schedule.php:35
 #: src/usr/local/www/firewall_schedule_edit.php:56
 #: src/usr/local/www/firewall_schedule_edit.php:255
 msgid "Mon"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules.php:526
+#: src/usr/local/www/firewall_rules.php:535
 #: src/usr/local/www/firewall_schedule.php:35
 #: src/usr/local/www/firewall_schedule_edit.php:56
 msgid "Tues"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules.php:526
+#: src/usr/local/www/firewall_rules.php:535
 #: src/usr/local/www/firewall_schedule.php:35
 #: src/usr/local/www/firewall_schedule_edit.php:56
 #: src/usr/local/www/firewall_schedule_edit.php:257
 msgid "Wed"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules.php:526
+#: src/usr/local/www/firewall_rules.php:535
 #: src/usr/local/www/firewall_schedule.php:35
 #: src/usr/local/www/firewall_schedule_edit.php:56
 msgid "Thur"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules.php:526
+#: src/usr/local/www/firewall_rules.php:535
 #: src/usr/local/www/firewall_schedule.php:35
 #: src/usr/local/www/firewall_schedule_edit.php:56
 #: src/usr/local/www/firewall_schedule_edit.php:259
 msgid "Fri"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules.php:526
+#: src/usr/local/www/firewall_rules.php:535
 #: src/usr/local/www/firewall_schedule.php:35
 #: src/usr/local/www/firewall_schedule_edit.php:56
 #: src/usr/local/www/firewall_schedule_edit.php:260
 msgid "Sat"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules.php:526
+#: src/usr/local/www/firewall_rules.php:535
 #: src/usr/local/www/firewall_schedule.php:35
 #: src/usr/local/www/firewall_schedule_edit.php:56
 #: src/usr/local/www/firewall_schedule_edit.php:261
 msgid "Sun"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules.php:527
+#: src/usr/local/www/firewall_rules.php:536
 #: src/usr/local/www/firewall_schedule.php:36
 #: src/usr/local/www/firewall_schedule_edit.php:57
 msgid "January"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules.php:527
+#: src/usr/local/www/firewall_rules.php:536
 #: src/usr/local/www/firewall_schedule.php:36
 #: src/usr/local/www/firewall_schedule_edit.php:57
 msgid "February"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules.php:527
+#: src/usr/local/www/firewall_rules.php:536
 #: src/usr/local/www/firewall_schedule.php:36
 #: src/usr/local/www/firewall_schedule_edit.php:57
 msgid "March"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules.php:527
+#: src/usr/local/www/firewall_rules.php:536
 #: src/usr/local/www/firewall_schedule.php:36
 #: src/usr/local/www/firewall_schedule_edit.php:57
 msgid "April"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules.php:527
+#: src/usr/local/www/firewall_rules.php:536
 #: src/usr/local/www/firewall_schedule.php:36
 #: src/usr/local/www/firewall_schedule_edit.php:57
 msgid "May"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules.php:527
+#: src/usr/local/www/firewall_rules.php:536
 #: src/usr/local/www/firewall_schedule.php:36
 #: src/usr/local/www/firewall_schedule_edit.php:57
 msgid "June"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules.php:527
+#: src/usr/local/www/firewall_rules.php:536
 #: src/usr/local/www/firewall_schedule.php:36
 #: src/usr/local/www/firewall_schedule_edit.php:57
 msgid "July"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules.php:527
+#: src/usr/local/www/firewall_rules.php:536
 #: src/usr/local/www/firewall_schedule.php:36
 #: src/usr/local/www/firewall_schedule_edit.php:57
 msgid "August"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules.php:527
+#: src/usr/local/www/firewall_rules.php:536
 #: src/usr/local/www/firewall_schedule.php:36
 #: src/usr/local/www/firewall_schedule_edit.php:57
 msgid "September"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules.php:527
+#: src/usr/local/www/firewall_rules.php:536
 #: src/usr/local/www/firewall_schedule.php:36
 #: src/usr/local/www/firewall_schedule_edit.php:57
 msgid "October"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules.php:527
+#: src/usr/local/www/firewall_rules.php:536
 #: src/usr/local/www/firewall_schedule.php:36
 #: src/usr/local/www/firewall_schedule_edit.php:57
 msgid "November"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules.php:527
+#: src/usr/local/www/firewall_rules.php:536
 #: src/usr/local/www/firewall_schedule.php:36
 #: src/usr/local/www/firewall_schedule_edit.php:57
 msgid "December"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules.php:640
+#: src/usr/local/www/firewall_rules.php:649
 msgid "Traffic matching this rule is currently being denied"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules.php:644
+#: src/usr/local/www/firewall_rules.php:653
 msgid "Traffic matching this rule is currently being allowed"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules.php:653
+#: src/usr/local/www/firewall_rules.php:662
 msgid "This rule is not currently active because its period has expired"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules.php:682
+#: src/usr/local/www/firewall_rules.php:691
 #: src/usr/local/www/firewall_rules_edit.php:1239
 msgid "ICMP type"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules.php:763
+#: src/usr/local/www/firewall_rules.php:772
 msgid "Copy"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules.php:772
+#: src/usr/local/www/firewall_rules.php:781
 msgid "Delete this rule"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules.php:794
+#: src/usr/local/www/firewall_rules.php:803
 msgid "No floating rules are currently defined."
 msgstr ""
 
-#: src/usr/local/www/firewall_rules.php:796
+#: src/usr/local/www/firewall_rules.php:805
 msgid "No rules are currently defined for this interface"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules.php:797
+#: src/usr/local/www/firewall_rules.php:806
 msgid ""
 "All incoming connections on this interface will be blocked until pass rules "
 "are added."
 msgstr ""
 
-#: src/usr/local/www/firewall_rules.php:799
+#: src/usr/local/www/firewall_rules.php:808
 msgid "Click the button to add a new rule."
 msgstr ""
 
-#: src/usr/local/www/firewall_rules.php:834
+#: src/usr/local/www/firewall_rules.php:843
 #: src/usr/local/www/firewall_rules_edit.php:1098
 msgid "Match"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules.php:835
+#: src/usr/local/www/firewall_rules.php:844
 #: src/usr/local/www/firewall_rules_edit.php:1093
 #: src/usr/local/www/services_captiveportal_mac.php:63
 #: src/usr/local/www/services_captiveportal_mac_edit.php:204
@@ -11987,36 +12058,36 @@ msgstr ""
 msgid "Block"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules.php:836
+#: src/usr/local/www/firewall_rules.php:845
 #: src/usr/local/www/firewall_rules_edit.php:1094
 #: src/usr/local/www/widgets/widgets/log.widget.php:232
 msgid "Reject"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules.php:837
-#: src/usr/local/www/firewall_rules_edit.php:1384
+#: src/usr/local/www/firewall_rules.php:846
+#: src/usr/local/www/firewall_rules_edit.php:1387
 #: src/usr/local/www/status_logs_common.inc:783
 msgid "Log"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules.php:838
+#: src/usr/local/www/firewall_rules.php:847
 msgid "Advanced filter"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules.php:844
+#: src/usr/local/www/firewall_rules.php:853
 msgid ""
 "Rules are evaluated on a first-match basis (i.e. the action of the first "
 "rule to match a packet will be executed). "
 msgstr ""
 
-#: src/usr/local/www/firewall_rules.php:846
+#: src/usr/local/www/firewall_rules.php:855
 msgid ""
 "This means that if block rules are used, it is important to pay attention to "
 "the rule order. Everything that isn't explicitly passed is blocked by "
 "default. "
 msgstr ""
 
-#: src/usr/local/www/firewall_rules.php:850
+#: src/usr/local/www/firewall_rules.php:859
 msgid ""
 "Floating rules are evaluated on a first-match basis (i.e. the action of the "
 "first rule to match a packet will be executed) only if the 'quick' option is "
@@ -12025,14 +12096,14 @@ msgid ""
 "matches, the per-interface or default rules are used. "
 msgstr ""
 
-#: src/usr/local/www/firewall_rules.php:857
+#: src/usr/local/www/firewall_rules.php:866
 #, php-format
 msgid ""
 "%sClick the anchor icon %s to move checked rules before the clicked row. "
 "Hold down the shift key and click to move the rules after the clicked row."
 msgstr ""
 
-#: src/usr/local/www/firewall_rules.php:972
+#: src/usr/local/www/firewall_rules.php:984
 msgid "One or more rules have been moved but have not yet been saved"
 msgstr ""
 
@@ -12381,7 +12452,7 @@ msgstr ""
 
 #: src/usr/local/www/firewall_rules_edit.php:1186
 #: src/usr/local/www/services_captiveportal_hostname_edit.php:176
-#: src/usr/local/www/services_captiveportal_ip_edit.php:233
+#: src/usr/local/www/services_captiveportal_ip_edit.php:236
 #: src/usr/local/www/status_ipsec_spd.php:60
 msgid "Direction"
 msgstr ""
@@ -12409,68 +12480,68 @@ msgstr ""
 msgid " not"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:1288
+#: src/usr/local/www/firewall_rules_edit.php:1291
 msgid "This firewall (self)"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:1312
+#: src/usr/local/www/firewall_rules_edit.php:1315
 msgid " Type"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:1319
+#: src/usr/local/www/firewall_rules_edit.php:1322
 msgid " Address"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:1332
+#: src/usr/local/www/firewall_rules_edit.php:1335
 msgid ""
-"The source port (or port range) is usually random and almost never equal to "
-"the destination port range. It is not usually required, and should usually "
-"be left at its default value, <b>any</b>)."
+"The <b>Source Port Range</b> for a connection is typically random and almost "
+"never equal to the destination port. In most cases this setting must remain "
+"at its default value, <b>any</b>."
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:1337
+#: src/usr/local/www/firewall_rules_edit.php:1340
 msgid "(other)"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:1342
-msgid " port range"
+#: src/usr/local/www/firewall_rules_edit.php:1345
+msgid " Port Range"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:1348
+#: src/usr/local/www/firewall_rules_edit.php:1351
 msgid " port begin"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:1351
+#: src/usr/local/www/firewall_rules_edit.php:1354
 #: src/usr/local/www/services_captiveportal_hostname_edit.php:154
-#: src/usr/local/www/services_captiveportal_ip_edit.php:198
-#: src/usr/local/www/services_dhcp.php:848
-#: src/usr/local/www/services_dhcpv6.php:608
-#: src/usr/local/www/services_dhcpv6.php:633
-#: src/usr/local/www/system_gateways_edit.php:707
+#: src/usr/local/www/services_captiveportal_ip_edit.php:201
+#: src/usr/local/www/services_dhcp.php:860
+#: src/usr/local/www/services_dhcpv6.php:622
+#: src/usr/local/www/services_dhcpv6.php:647
 #: src/usr/local/www/system_gateways_edit.php:727
+#: src/usr/local/www/system_gateways_edit.php:747
 msgid "From"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:1362
+#: src/usr/local/www/firewall_rules_edit.php:1365
 msgid " port end"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:1365
+#: src/usr/local/www/firewall_rules_edit.php:1368
 #: src/usr/local/www/services_captiveportal_hostname_edit.php:154
-#: src/usr/local/www/services_captiveportal_ip_edit.php:198
-#: src/usr/local/www/services_dhcp.php:854
-#: src/usr/local/www/services_dhcpv6.php:617
-#: src/usr/local/www/services_dhcpv6.php:642
-#: src/usr/local/www/system_gateways_edit.php:714
+#: src/usr/local/www/services_captiveportal_ip_edit.php:201
+#: src/usr/local/www/services_dhcp.php:867
+#: src/usr/local/www/services_dhcpv6.php:631
+#: src/usr/local/www/services_dhcpv6.php:656
 #: src/usr/local/www/system_gateways_edit.php:734
+#: src/usr/local/www/system_gateways_edit.php:754
 msgid "To"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:1381
+#: src/usr/local/www/firewall_rules_edit.php:1384
 msgid "Extra Options"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:1387
+#: src/usr/local/www/firewall_rules_edit.php:1390
 msgid ""
 "Hint: the firewall has limited local log space. Don't turn on logging for "
 "everything. If doing a lot of logging, consider using a remote syslog server "
@@ -12478,189 +12549,189 @@ msgid ""
 "a> page)."
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:1397
+#: src/usr/local/www/firewall_rules_edit.php:1400
 #: src/usr/local/www/services_unbound_acls.php:239
 msgid "A description may be entered here for administrative reference."
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:1420
+#: src/usr/local/www/firewall_rules_edit.php:1423
 msgid "Source OS"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:1423
+#: src/usr/local/www/firewall_rules_edit.php:1426
 msgid ""
 "Note: this only works for TCP rules. General OS choice matches all subtypes."
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:1427
+#: src/usr/local/www/firewall_rules_edit.php:1430
 msgid "Diffserv Code Point"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:1434
+#: src/usr/local/www/firewall_rules_edit.php:1437
 msgid "Allow IP options"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:1442
-#: src/usr/local/www/system_advanced_firewall.php:519
+#: src/usr/local/www/firewall_rules_edit.php:1445
+#: src/usr/local/www/system_advanced_firewall.php:522
 msgid "Disable reply-to"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:1449
+#: src/usr/local/www/firewall_rules_edit.php:1452
 #: src/usr/local/www/interfaces_qinq.php:110
 msgid "Tag"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:1452
+#: src/usr/local/www/firewall_rules_edit.php:1455
 msgid ""
 "A packet matching this rule can be marked and this mark used to match on "
 "other NAT/filter rules. It is called <b>Policy filtering</b>."
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:1457
+#: src/usr/local/www/firewall_rules_edit.php:1460
 msgid "Tagged"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:1460
+#: src/usr/local/www/firewall_rules_edit.php:1463
 msgid "A packet can be matched on a mark placed before on another rule."
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:1464
+#: src/usr/local/www/firewall_rules_edit.php:1467
 msgid "Max. states"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:1467
+#: src/usr/local/www/firewall_rules_edit.php:1470
 msgid "Maximum state entries this rule can create."
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:1471
+#: src/usr/local/www/firewall_rules_edit.php:1474
 msgid "Max. src nodes"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:1474
+#: src/usr/local/www/firewall_rules_edit.php:1477
 msgid "Maximum number of unique source hosts."
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:1478
+#: src/usr/local/www/firewall_rules_edit.php:1481
 msgid "Max. connections"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:1481
+#: src/usr/local/www/firewall_rules_edit.php:1484
 msgid "Maximum number of established connections per host (TCP only)."
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:1485
+#: src/usr/local/www/firewall_rules_edit.php:1488
 msgid "Max. src. states"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:1488
+#: src/usr/local/www/firewall_rules_edit.php:1491
 msgid "Maximum state entries per host."
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:1492
+#: src/usr/local/www/firewall_rules_edit.php:1495
 msgid "Max. src. conn. Rate"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:1495
+#: src/usr/local/www/firewall_rules_edit.php:1498
 msgid "Maximum new connections per host (TCP only)."
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:1499
+#: src/usr/local/www/firewall_rules_edit.php:1502
 msgid "Max. src. conn. Rates"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:1503
+#: src/usr/local/www/firewall_rules_edit.php:1506
 msgid "/ per how many second(s) (TCP only)"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:1507
+#: src/usr/local/www/firewall_rules_edit.php:1510
 msgid "State timeout"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:1511
+#: src/usr/local/www/firewall_rules_edit.php:1514
 msgid "State Timeout in seconds (TCP only)"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:1514
+#: src/usr/local/www/firewall_rules_edit.php:1517
 #: src/usr/local/www/status_logs_filter.php:331
 #: src/usr/local/www/status_logs_filter_dynamic.php:477
 msgid "TCP Flags"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:1516
+#: src/usr/local/www/firewall_rules_edit.php:1519
 msgid ""
 "Use this to choose TCP flags that must be set or cleared for this rule to "
 "match."
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:1520
+#: src/usr/local/www/firewall_rules_edit.php:1523
 msgid "No pfSync"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:1530
+#: src/usr/local/www/firewall_rules_edit.php:1533
 msgid "Keep"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:1531
+#: src/usr/local/www/firewall_rules_edit.php:1534
 msgid "Sloppy"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:1532
+#: src/usr/local/www/firewall_rules_edit.php:1535
 msgid "Synproxy"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:1527
+#: src/usr/local/www/firewall_rules_edit.php:1530
 msgid "State type"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:1535
+#: src/usr/local/www/firewall_rules_edit.php:1538
 msgid ""
 "Select which type of state tracking mechanism to use.  If in doubt, use keep "
 "state.<br /><span></span>"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:1543
+#: src/usr/local/www/firewall_rules_edit.php:1546
 msgid "This does NOT prevent the rule from being overwritten on Slave."
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:1549
+#: src/usr/local/www/firewall_rules_edit.php:1552
 msgid "VLAN Prio"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:1552
+#: src/usr/local/www/firewall_rules_edit.php:1555
 msgid "Choose 802.1p priority to match on."
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:1556
+#: src/usr/local/www/firewall_rules_edit.php:1559
 msgid "VLAN Prio Set"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:1559
+#: src/usr/local/www/firewall_rules_edit.php:1562
 msgid "Choose 802.1p priority to apply."
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:1573
+#: src/usr/local/www/firewall_rules_edit.php:1576
 msgid "Leave as 'none' to leave the rule enabled all the time."
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:1604
+#: src/usr/local/www/firewall_rules_edit.php:1607
 msgid ""
 "Leave as 'default' to use the system routing table. Or choose a gateway to "
 "utilize policy based routing."
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:1607
+#: src/usr/local/www/firewall_rules_edit.php:1610
 msgid "In / Out pipe"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:1611
+#: src/usr/local/www/firewall_rules_edit.php:1614
 msgid "DNpipe"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:1618
+#: src/usr/local/www/firewall_rules_edit.php:1621
 msgid "PDNpipe"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:1623
+#: src/usr/local/www/firewall_rules_edit.php:1626
 msgid ""
 "Choose the Out queue/Virtual interface only if In is also selected. The Out "
 "selection is applied to traffic leaving the interface where the rule is "
@@ -12670,22 +12741,22 @@ msgid ""
 "is for incoming and In is for outgoing."
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:1631
+#: src/usr/local/www/firewall_rules_edit.php:1634
 msgid "Ackqueue / Queue"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:1648
+#: src/usr/local/www/firewall_rules_edit.php:1651
 msgid "Ackqueue"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:1660
+#: src/usr/local/www/firewall_rules_edit.php:1663
 msgid "Choose the Acknowledge Queue only if there is a selected Queue."
 msgstr ""
 
 #: src/usr/local/www/firewall_schedule.php:42
 #: src/usr/local/www/firewall_schedule.php:87
 #: src/usr/local/www/firewall_schedule_edit.php:52
-#: src/usr/local/www/head.inc:249
+#: src/usr/local/www/head.inc:276
 #: src/usr/local/www/system_advanced_misc.php:462
 msgid "Schedules"
 msgstr ""
@@ -13013,24 +13084,24 @@ msgid ""
 msgstr ""
 
 #: src/usr/local/www/firewall_virtual_ip.php:232
-#: src/usr/local/www/firewall_virtual_ip_edit.php:351
+#: src/usr/local/www/firewall_virtual_ip_edit.php:344
 msgid "Proxy ARP"
 msgstr ""
 
 #: src/usr/local/www/firewall_virtual_ip.php:233
 #: src/usr/local/www/status_carp.php:106
-#: src/usr/local/www/firewall_virtual_ip_edit.php:343
+#: src/usr/local/www/firewall_virtual_ip_edit.php:336
 msgid "CARP"
 msgstr ""
 
 #: src/usr/local/www/firewall_virtual_ip.php:235
-#: src/usr/local/www/firewall_virtual_ip_edit.php:335
+#: src/usr/local/www/firewall_virtual_ip_edit.php:328
 msgid "IP Alias"
 msgstr ""
 
 #: src/usr/local/www/firewall_virtual_ip.php:238
-#: src/usr/local/www/firewall_virtual_ip_edit.php:296
-#: src/usr/local/www/head.inc:251
+#: src/usr/local/www/firewall_virtual_ip_edit.php:289
+#: src/usr/local/www/head.inc:278
 msgid "Virtual IPs"
 msgstr ""
 
@@ -13066,138 +13137,137 @@ msgstr ""
 msgid "Check the status of CARP Virtual IPs and interfaces %1$shere%2$s."
 msgstr ""
 
-#: src/usr/local/www/firewall_virtual_ip_edit.php:106
-#: src/usr/local/www/services_dhcp_edit.php:177
-#: src/usr/local/www/services_dnsmasq_edit.php:96
+#: src/usr/local/www/firewall_virtual_ip_edit.php:105
+#: src/usr/local/www/services_dnsmasq_edit.php:82
 #: src/usr/local/www/services_unbound_host_edit.php:97
 msgid "A valid IP address must be specified."
 msgstr ""
 
-#: src/usr/local/www/firewall_virtual_ip_edit.php:125
+#: src/usr/local/www/firewall_virtual_ip_edit.php:124
 msgid "This IP address is being used by another interface or VIP."
 msgstr ""
 
-#: src/usr/local/www/firewall_virtual_ip_edit.php:135
+#: src/usr/local/www/firewall_virtual_ip_edit.php:134
 msgid ""
 "The interface chosen for the VIP has no IPv4 or IPv6 address configured so "
 "it cannot be used as a parent for the VIP."
 msgstr ""
 
-#: src/usr/local/www/firewall_virtual_ip_edit.php:150
+#: src/usr/local/www/firewall_virtual_ip_edit.php:149
 msgid "The network address cannot be used for this VIP"
 msgstr ""
 
-#: src/usr/local/www/firewall_virtual_ip_edit.php:152
+#: src/usr/local/www/firewall_virtual_ip_edit.php:151
 msgid "The broadcast address cannot be used for this VIP"
 msgstr ""
 
-#: src/usr/local/www/firewall_virtual_ip_edit.php:171
+#: src/usr/local/www/firewall_virtual_ip_edit.php:170
 msgid ""
 "A CARP password that is shared between the two VHID members must be "
 "specified."
 msgstr ""
 
-#: src/usr/local/www/firewall_virtual_ip_edit.php:175
+#: src/usr/local/www/firewall_virtual_ip_edit.php:174
 msgid "Password and confirm password must match"
 msgstr ""
 
-#: src/usr/local/www/firewall_virtual_ip_edit.php:179
-#: src/usr/local/www/firewall_virtual_ip_edit.php:199
+#: src/usr/local/www/firewall_virtual_ip_edit.php:178
+#: src/usr/local/www/firewall_virtual_ip_edit.php:198
 msgid "For this type of vip localhost is not allowed."
 msgstr ""
 
-#: src/usr/local/www/firewall_virtual_ip_edit.php:181
-#: src/usr/local/www/firewall_virtual_ip_edit.php:201
+#: src/usr/local/www/firewall_virtual_ip_edit.php:180
+#: src/usr/local/www/firewall_virtual_ip_edit.php:200
 msgid ""
 "A CARP parent interface can only be used with IP Alias type Virtual IPs."
 msgstr ""
 
-#: src/usr/local/www/firewall_virtual_ip_edit.php:190
+#: src/usr/local/www/firewall_virtual_ip_edit.php:189
 msgid "An IPv4 Virtual IP cannot have an IPv6 CARP parent."
 msgstr ""
 
-#: src/usr/local/www/firewall_virtual_ip_edit.php:193
+#: src/usr/local/www/firewall_virtual_ip_edit.php:192
 msgid "An IPv6 Virtual IP cannot have an IPv4 CARP parent."
 msgstr ""
 
-#: src/usr/local/www/firewall_virtual_ip_edit.php:293
+#: src/usr/local/www/firewall_virtual_ip_edit.php:286
 msgid ""
 "The mask must be the network's subnet mask. It does not specify a CIDR range."
 msgstr ""
 
-#: src/usr/local/www/firewall_virtual_ip_edit.php:294
+#: src/usr/local/www/firewall_virtual_ip_edit.php:287
 msgid "Enter a CIDR block of proxy ARP addresses."
 msgstr ""
 
-#: src/usr/local/www/firewall_virtual_ip_edit.php:328
+#: src/usr/local/www/firewall_virtual_ip_edit.php:321
 msgid "Edit Virtual IP"
 msgstr ""
 
-#: src/usr/local/www/firewall_virtual_ip_edit.php:378
+#: src/usr/local/www/firewall_virtual_ip_edit.php:371
 msgid "Single address"
 msgstr ""
 
-#: src/usr/local/www/firewall_virtual_ip_edit.php:375
+#: src/usr/local/www/firewall_virtual_ip_edit.php:368
 msgid "Address type"
 msgstr ""
 
-#: src/usr/local/www/firewall_virtual_ip_edit.php:385
+#: src/usr/local/www/firewall_virtual_ip_edit.php:378
 msgid "Address(es)"
 msgstr ""
 
-#: src/usr/local/www/firewall_virtual_ip_edit.php:387
+#: src/usr/local/www/firewall_virtual_ip_edit.php:380
 msgid "<span id=\"address_note\"></span>"
 msgstr ""
 
-#: src/usr/local/www/firewall_virtual_ip_edit.php:391
+#: src/usr/local/www/firewall_virtual_ip_edit.php:384
 msgid "Expansion"
 msgstr ""
 
-#: src/usr/local/www/firewall_virtual_ip_edit.php:398
+#: src/usr/local/www/firewall_virtual_ip_edit.php:391
 msgid "Virtual IP Password"
 msgstr ""
 
-#: src/usr/local/www/firewall_virtual_ip_edit.php:401
+#: src/usr/local/www/firewall_virtual_ip_edit.php:394
 msgid "Enter the VHID group password."
 msgstr ""
 
-#: src/usr/local/www/firewall_virtual_ip_edit.php:405
+#: src/usr/local/www/firewall_virtual_ip_edit.php:398
 msgid "VHID Group"
 msgstr ""
 
-#: src/usr/local/www/firewall_virtual_ip_edit.php:408
+#: src/usr/local/www/firewall_virtual_ip_edit.php:401
 msgid "Enter the VHID group that the machines will share."
 msgstr ""
 
-#: src/usr/local/www/firewall_virtual_ip_edit.php:410
+#: src/usr/local/www/firewall_virtual_ip_edit.php:403
 msgid "Advertising frequency"
 msgstr ""
 
-#: src/usr/local/www/firewall_virtual_ip_edit.php:413
-#: src/usr/local/www/firewall_virtual_ip_edit.php:416
+#: src/usr/local/www/firewall_virtual_ip_edit.php:406
+#: src/usr/local/www/firewall_virtual_ip_edit.php:409
 msgid "Base"
 msgstr ""
 
-#: src/usr/local/www/firewall_virtual_ip_edit.php:420
-#: src/usr/local/www/firewall_virtual_ip_edit.php:423
+#: src/usr/local/www/firewall_virtual_ip_edit.php:413
+#: src/usr/local/www/firewall_virtual_ip_edit.php:416
 msgid "Skew"
 msgstr ""
 
-#: src/usr/local/www/firewall_virtual_ip_edit.php:425
+#: src/usr/local/www/firewall_virtual_ip_edit.php:418
 msgid ""
 "The frequency that this machine will advertise. 0 means usually master. "
 "Otherwise the lowest combination of both values in the cluster determines "
 "the master."
 msgstr ""
 
-#: src/usr/local/www/firewall_virtual_ip_edit.php:458
+#: src/usr/local/www/firewall_virtual_ip_edit.php:451
 msgid ""
 "Proxy ARP and Other type Virtual IPs cannot be bound to by anything running "
 "on the firewall, such as IPsec, OpenVPN, etc.  Use a CARP or IP Alias type "
 "address for these types."
 msgstr ""
 
-#: src/usr/local/www/firewall_virtual_ip_edit.php:459
+#: src/usr/local/www/firewall_virtual_ip_edit.php:452
 #, php-format
 msgid "For more information on CARP and the above values, visit the OpenBSD %s"
 msgstr ""
@@ -13284,158 +13354,158 @@ msgstr ""
 msgid "Cannot get CPU load"
 msgstr ""
 
-#: src/usr/local/www/guiconfig.inc:128
+#: src/usr/local/www/guiconfig.inc:129
 msgid "One Level"
 msgstr ""
 
-#: src/usr/local/www/guiconfig.inc:129
+#: src/usr/local/www/guiconfig.inc:130
 msgid "Entire Subtree"
 msgstr ""
 
-#: src/usr/local/www/guiconfig.inc:156
+#: src/usr/local/www/guiconfig.inc:157
 msgid "Authentication and Accounting"
 msgstr ""
 
-#: src/usr/local/www/guiconfig.inc:158
-#: src/usr/local/www/services_captiveportal.php:877
+#: src/usr/local/www/guiconfig.inc:159
+#: src/usr/local/www/services_captiveportal.php:867
 #: src/usr/local/www/vpn_l2tp.php:289
 msgid "Accounting"
 msgstr ""
 
-#: src/usr/local/www/guiconfig.inc:218
+#: src/usr/local/www/guiconfig.inc:219
 msgid "This Firewall"
 msgstr ""
 
-#: src/usr/local/www/guiconfig.inc:229
+#: src/usr/local/www/guiconfig.inc:230
 msgid "autoselect"
 msgstr ""
 
-#: src/usr/local/www/guiconfig.inc:230
+#: src/usr/local/www/guiconfig.inc:231
 msgid "100BASE-TX full-duplex"
 msgstr ""
 
-#: src/usr/local/www/guiconfig.inc:231
+#: src/usr/local/www/guiconfig.inc:232
 msgid "100BASE-TX half-duplex"
 msgstr ""
 
-#: src/usr/local/www/guiconfig.inc:232
+#: src/usr/local/www/guiconfig.inc:233
 msgid "10BASE-T full-duplex"
 msgstr ""
 
-#: src/usr/local/www/guiconfig.inc:233
+#: src/usr/local/www/guiconfig.inc:234
 msgid "10BASE-T half-duplex"
 msgstr ""
 
-#: src/usr/local/www/guiconfig.inc:236 src/usr/local/www/interfaces.php:2909
-#: src/usr/local/www/interfaces_wireless_edit.php:190
+#: src/usr/local/www/guiconfig.inc:237 src/usr/local/www/interfaces.php:2919
+#: src/usr/local/www/interfaces_wireless_edit.php:188
 msgid "Infrastructure (BSS)"
 msgstr ""
 
-#: src/usr/local/www/guiconfig.inc:237 src/usr/local/www/interfaces.php:2909
-#: src/usr/local/www/interfaces_wireless_edit.php:191
+#: src/usr/local/www/guiconfig.inc:238 src/usr/local/www/interfaces.php:2919
+#: src/usr/local/www/interfaces_wireless_edit.php:189
 msgid "Ad-hoc (IBSS)"
 msgstr ""
 
-#: src/usr/local/www/guiconfig.inc:238 src/usr/local/www/interfaces.php:2909
-#: src/usr/local/www/interfaces_wireless_edit.php:192
+#: src/usr/local/www/guiconfig.inc:239 src/usr/local/www/interfaces.php:2919
+#: src/usr/local/www/interfaces_wireless_edit.php:190
 msgid "Access Point"
 msgstr ""
 
-#: src/usr/local/www/guiconfig.inc:245
+#: src/usr/local/www/guiconfig.inc:246
 #, php-format
 msgid "The field %s contains invalid characters."
 msgstr ""
 
-#: src/usr/local/www/guiconfig.inc:251
+#: src/usr/local/www/guiconfig.inc:252
 #, php-format
 msgid "The field %s is required."
 msgstr ""
 
-#: src/usr/local/www/guiconfig.inc:258
+#: src/usr/local/www/guiconfig.inc:259
 msgid "The following input errors were detected:"
 msgstr ""
 
-#: src/usr/local/www/guiconfig.inc:315
+#: src/usr/local/www/guiconfig.inc:316
 msgid "Apply Changes"
 msgstr ""
 
-#: src/usr/local/www/guiconfig.inc:348
+#: src/usr/local/www/guiconfig.inc:349
 #: src/usr/local/www/status_logs_common.inc:720
 msgid "The changes have been applied successfully."
 msgstr ""
 
-#: src/usr/local/www/guiconfig.inc:355
+#: src/usr/local/www/guiconfig.inc:356
 msgid ""
 "<a href=\"status_filter_reload.php\">Monitor</a> the filter reload progress."
 msgstr ""
 
-#: src/usr/local/www/guiconfig.inc:536 src/usr/local/www/guiconfig.inc:587
+#: src/usr/local/www/guiconfig.inc:537 src/usr/local/www/guiconfig.inc:588
 #, php-format
 msgid "File %s is a directory."
 msgstr ""
 
-#: src/usr/local/www/guiconfig.inc:538 src/usr/local/www/guiconfig.inc:589
+#: src/usr/local/www/guiconfig.inc:539 src/usr/local/www/guiconfig.inc:590
 msgid "Log file started."
 msgstr ""
 
-#: src/usr/local/www/guiconfig.inc:976
+#: src/usr/local/www/guiconfig.inc:977
 msgid "Currently viewing: "
 msgstr ""
 
-#: src/usr/local/www/guiconfig.inc:1063
+#: src/usr/local/www/guiconfig.inc:1064
 msgid "listing only first 10k items"
 msgstr ""
 
-#: src/usr/local/www/guiconfig.inc:1073
-#: src/usr/local/www/services_dhcp.php:1254
-#: src/usr/local/www/services_dhcpv6.php:918
+#: src/usr/local/www/guiconfig.inc:1074
+#: src/usr/local/www/services_dhcp.php:1283
+#: src/usr/local/www/services_dhcpv6.php:940
 #: src/usr/local/www/system_advanced_sysctl.php:162
 #: src/usr/local/www/system_advanced_sysctl.php:211
-#: src/usr/local/www/system_certmanager.php:751
+#: src/usr/local/www/system_certmanager.php:754
 msgid "Value"
 msgstr ""
 
-#: src/usr/local/www/head.inc:211
+#: src/usr/local/www/head.inc:220
 #: src/usr/local/www/system_advanced_admin.php:283
 #: src/usr/local/www/system_advanced_firewall.php:371
 #: src/usr/local/www/system_advanced_misc.php:286
 #: src/usr/local/www/system_advanced_network.php:140
 #: src/usr/local/www/system_advanced_notifications.php:188
 #: src/usr/local/www/system_advanced_sysctl.php:121
-#: src/usr/local/www/system_gateways_edit.php:685
+#: src/usr/local/www/system_gateways_edit.php:705
 #: src/usr/local/www/vpn_openvpn_csc.php:560
 #: src/usr/local/www/widgets/widgets/thermal_sensors.widget.php:246
 msgid "Advanced"
 msgstr ""
 
-#: src/usr/local/www/head.inc:213 src/usr/local/www/system.php:341
+#: src/usr/local/www/head.inc:222 src/usr/local/www/system.php:344
 msgid "General Setup"
 msgstr ""
 
-#: src/usr/local/www/head.inc:214
+#: src/usr/local/www/head.inc:223
 msgid "High Avail. Sync"
 msgstr ""
 
-#: src/usr/local/www/head.inc:216
+#: src/usr/local/www/head.inc:225
 msgid "Setup Wizard"
 msgstr ""
 
-#: src/usr/local/www/head.inc:217 src/usr/local/www/status_logs.php:59
+#: src/usr/local/www/head.inc:226 src/usr/local/www/status_logs.php:59
 #: src/usr/local/www/status_logs_common.inc:105
 #: src/usr/local/www/system_gateway_groups.php:104
 #: src/usr/local/www/system_gateway_groups_edit.php:147
-#: src/usr/local/www/system_gateways.php:211
-#: src/usr/local/www/system_gateways_edit.php:538
+#: src/usr/local/www/system_gateways.php:225
+#: src/usr/local/www/system_gateways_edit.php:551
 #: src/usr/local/www/system_routes.php:213
 #: src/usr/local/www/system_routes_edit.php:224
 msgid "Routing"
 msgstr ""
 
-#: src/usr/local/www/head.inc:218
+#: src/usr/local/www/head.inc:227
 msgid "Cert. Manager"
 msgstr ""
 
-#: src/usr/local/www/head.inc:220 src/usr/local/www/head.inc:222
+#: src/usr/local/www/head.inc:229 src/usr/local/www/head.inc:231
 #: src/usr/local/www/system_authservers.php:403
 #: src/usr/local/www/system_groupmanager.php:257
 #: src/usr/local/www/system_groupmanager_addprivs.php:36
@@ -13445,28 +13515,36 @@ msgstr ""
 msgid "User Manager"
 msgstr ""
 
-#: src/usr/local/www/head.inc:226 src/usr/local/www/system_user_settings.php:32
+#: src/usr/local/www/head.inc:235 src/usr/local/www/system_user_settings.php:32
 msgid "User Settings"
 msgstr ""
 
-#: src/usr/local/www/head.inc:234
-msgid "(assign)"
+#: src/usr/local/www/head.inc:245
+msgid "Assignments"
+msgstr ""
+
+#: src/usr/local/www/head.inc:252
+msgid "Switches"
+msgstr ""
+
+#: src/usr/local/www/head.inc:257
+msgid "-DIVIDER-"
 msgstr ""
 
-#: src/usr/local/www/head.inc:264 src/usr/local/www/services_dhcpv6.php:467
+#: src/usr/local/www/head.inc:291 src/usr/local/www/services_dhcpv6.php:481
 #: src/usr/local/www/services_dhcpv6_edit.php:201
 #: src/usr/local/www/services_router_advertisements.php:237
 msgid "DHCPv6 Server & RA"
 msgstr ""
 
-#: src/usr/local/www/head.inc:268 src/usr/local/www/services_igmpproxy.php:68
+#: src/usr/local/www/head.inc:295 src/usr/local/www/services_igmpproxy.php:68
 #: src/usr/local/www/services_igmpproxy.php:82
 #: src/usr/local/www/services_igmpproxy_edit.php:33
 #: src/usr/local/www/status_logs_settings.php:296
 msgid "IGMP Proxy"
 msgstr ""
 
-#: src/usr/local/www/head.inc:269 src/usr/local/www/head.inc:303
+#: src/usr/local/www/head.inc:296 src/usr/local/www/head.inc:330
 #: src/usr/local/www/load_balancer_monitor.php:73
 #: src/usr/local/www/load_balancer_monitor_edit.php:202
 #: src/usr/local/www/load_balancer_pool.php:87
@@ -13481,44 +13559,44 @@ msgstr ""
 msgid "Load Balancer"
 msgstr ""
 
-#: src/usr/local/www/head.inc:270 src/usr/local/www/head.inc:304
-#: src/usr/local/www/services_dhcp.php:1069
-#: src/usr/local/www/services_ntpd.php:184
+#: src/usr/local/www/head.inc:297 src/usr/local/www/head.inc:331
+#: src/usr/local/www/services_dhcp.php:1095
+#: src/usr/local/www/services_ntpd.php:188
 #: src/usr/local/www/services_ntpd_acls.php:161
 #: src/usr/local/www/services_ntpd_gps.php:191
 #: src/usr/local/www/services_ntpd_pps.php:102
 #: src/usr/local/www/status_logs.php:55
 #: src/usr/local/www/status_logs_common.inc:97
 #: src/usr/local/www/status_logs_settings.php:221
-#: src/usr/local/www/status_ntpd.php:254
+#: src/usr/local/www/status_ntpd.php:258
 msgid "NTP"
 msgstr ""
 
-#: src/usr/local/www/head.inc:272 src/usr/local/www/services_snmp.php:177
+#: src/usr/local/www/head.inc:299 src/usr/local/www/services_snmp.php:194
 msgid "SNMP"
 msgstr ""
 
-#: src/usr/local/www/head.inc:278 src/usr/local/www/head.inc:313
+#: src/usr/local/www/head.inc:305 src/usr/local/www/head.inc:340
 #: src/usr/local/www/status_upnp.php:42
 msgid "UPnP &amp; NAT-PMP"
 msgstr ""
 
-#: src/usr/local/www/head.inc:289 src/usr/local/www/interfaces.php:1619
+#: src/usr/local/www/head.inc:316 src/usr/local/www/interfaces.php:1621
 #: src/usr/local/www/interfaces_ppps_edit.php:464
 #: src/usr/local/www/vpn_l2tp.php:173 src/usr/local/www/vpn_l2tp_users.php:29
 #: src/usr/local/www/vpn_l2tp_users_edit.php:29
 msgid "L2TP"
 msgstr ""
 
-#: src/usr/local/www/head.inc:295
+#: src/usr/local/www/head.inc:322
 msgid "CARP (failover)"
 msgstr ""
 
-#: src/usr/local/www/head.inc:296 src/usr/local/www/index.php:289
+#: src/usr/local/www/head.inc:323 src/usr/local/www/index.php:289
 msgid "Dashboard"
 msgstr ""
 
-#: src/usr/local/www/head.inc:297
+#: src/usr/local/www/head.inc:324
 #: src/usr/local/www/status_gateway_groups.php:47
 #: src/usr/local/www/status_gateway_groups.php:52
 #: src/usr/local/www/status_gateway_groups.php:64
@@ -13529,33 +13607,33 @@ msgstr ""
 #: src/usr/local/www/status_logs_common.inc:104
 #: src/usr/local/www/system_gateway_groups.php:118
 #: src/usr/local/www/system_gateway_groups.php:131
-#: src/usr/local/www/system_gateways.php:211
-#: src/usr/local/www/system_gateways.php:228
-#: src/usr/local/www/system_gateways.php:235
-#: src/usr/local/www/system_gateways_edit.php:538
+#: src/usr/local/www/system_gateways.php:225
+#: src/usr/local/www/system_gateways.php:242
+#: src/usr/local/www/system_gateways.php:249
+#: src/usr/local/www/system_gateways_edit.php:551
 #: src/usr/local/www/system_routes.php:229
 #: src/usr/local/www/widgets/include/gateways.inc:23
 msgid "Gateways"
 msgstr ""
 
-#: src/usr/local/www/head.inc:298 src/usr/local/www/status_dhcp_leases.php:36
+#: src/usr/local/www/head.inc:325 src/usr/local/www/status_dhcp_leases.php:36
 msgid "DHCP Leases"
 msgstr ""
 
-#: src/usr/local/www/head.inc:299 src/usr/local/www/status_dhcpv6_leases.php:37
+#: src/usr/local/www/head.inc:326 src/usr/local/www/status_dhcpv6_leases.php:37
 msgid "DHCPv6 Leases"
 msgstr ""
 
-#: src/usr/local/www/head.inc:300 src/usr/local/www/status_filter_reload.php:33
-#: src/usr/local/www/status_filter_reload.php:60
+#: src/usr/local/www/head.inc:327 src/usr/local/www/status_filter_reload.php:33
+#: src/usr/local/www/status_filter_reload.php:59
 msgid "Filter Reload"
 msgstr ""
 
-#: src/usr/local/www/head.inc:306 src/usr/local/www/status_pkglogs.php:71
+#: src/usr/local/www/head.inc:333 src/usr/local/www/status_pkglogs.php:71
 msgid "Package Logs"
 msgstr ""
 
-#: src/usr/local/www/head.inc:308
+#: src/usr/local/www/head.inc:335
 #: src/usr/local/www/load_balancer_monitor.php:73
 #: src/usr/local/www/load_balancer_monitor_edit.php:202
 #: src/usr/local/www/load_balancer_pool.php:87
@@ -13577,20 +13655,20 @@ msgstr ""
 #: src/usr/local/www/services_captiveportal_zones_edit.php:35
 #: src/usr/local/www/services_checkip.php:65
 #: src/usr/local/www/services_checkip_edit.php:106
-#: src/usr/local/www/services_dhcp.php:699
-#: src/usr/local/www/services_dhcp_edit.php:388
-#: src/usr/local/www/services_dhcp_relay.php:120
-#: src/usr/local/www/services_dhcpv6.php:467
+#: src/usr/local/www/services_dhcp.php:707
+#: src/usr/local/www/services_dhcp_edit.php:397
+#: src/usr/local/www/services_dhcp_relay.php:124
+#: src/usr/local/www/services_dhcpv6.php:481
 #: src/usr/local/www/services_dhcpv6_edit.php:201
-#: src/usr/local/www/services_dhcpv6_relay.php:118
-#: src/usr/local/www/services_dnsmasq.php:182
+#: src/usr/local/www/services_dhcpv6_relay.php:124
+#: src/usr/local/www/services_dnsmasq.php:227
 #: src/usr/local/www/services_dnsmasq_domainoverride_edit.php:120
-#: src/usr/local/www/services_dnsmasq_edit.php:199
-#: src/usr/local/www/services_dyndns.php:66
-#: src/usr/local/www/services_dyndns_edit.php:239
+#: src/usr/local/www/services_dnsmasq_edit.php:185
+#: src/usr/local/www/services_dyndns.php:67
+#: src/usr/local/www/services_dyndns_edit.php:240
 #: src/usr/local/www/services_igmpproxy.php:68
 #: src/usr/local/www/services_igmpproxy_edit.php:33
-#: src/usr/local/www/services_ntpd.php:184
+#: src/usr/local/www/services_ntpd.php:188
 #: src/usr/local/www/services_ntpd_acls.php:161
 #: src/usr/local/www/services_ntpd_gps.php:191
 #: src/usr/local/www/services_ntpd_pps.php:102
@@ -13599,7 +13677,7 @@ msgstr ""
 #: src/usr/local/www/services_rfc2136.php:58
 #: src/usr/local/www/services_rfc2136_edit.php:148
 #: src/usr/local/www/services_router_advertisements.php:237
-#: src/usr/local/www/services_snmp.php:177
+#: src/usr/local/www/services_snmp.php:194
 #: src/usr/local/www/services_unbound.php:238
 #: src/usr/local/www/services_unbound_acls.php:174
 #: src/usr/local/www/services_unbound_advanced.php:187
@@ -13613,12 +13691,12 @@ msgstr ""
 msgid "Services"
 msgstr ""
 
-#: src/usr/local/www/head.inc:310 src/usr/local/www/status_graph.php:120
+#: src/usr/local/www/head.inc:337 src/usr/local/www/status_graph.php:120
 #: src/usr/local/www/status_graph.php:448
 msgid "Traffic Graph"
 msgstr ""
 
-#: src/usr/local/www/head.inc:325 src/usr/local/www/interfaces_assign.php:498
+#: src/usr/local/www/head.inc:352 src/usr/local/www/interfaces_assign.php:498
 #: src/usr/local/www/interfaces_bridge.php:85
 #: src/usr/local/www/interfaces_gif.php:80
 #: src/usr/local/www/interfaces_gre.php:80
@@ -13629,91 +13707,95 @@ msgstr ""
 #: src/usr/local/www/interfaces_vlan.php:85
 #: src/usr/local/www/interfaces_wireless.php:71
 #: src/usr/local/www/interfaces_wireless.php:82
-#: src/usr/local/www/interfaces_wireless_edit.php:167
+#: src/usr/local/www/interfaces_wireless_edit.php:165
 #: src/usr/local/www/status_logs.php:63
 #: src/usr/local/www/status_logs_common.inc:107
 #: src/usr/local/www/status_wireless.php:31
 msgid "Wireless"
 msgstr ""
 
-#: src/usr/local/www/head.inc:365
+#: src/usr/local/www/head.inc:392
 msgid "pfSense Gold"
 msgstr ""
 
-#: src/usr/local/www/head.inc:370
+#: src/usr/local/www/head.inc:397
 msgid "About this Page"
 msgstr ""
 
-#: src/usr/local/www/head.inc:372
+#: src/usr/local/www/head.inc:399
 msgid "Bug Database"
 msgstr ""
 
-#: src/usr/local/www/head.inc:375
+#: src/usr/local/www/head.inc:402
 msgid "User Forum"
 msgstr ""
 
-#: src/usr/local/www/head.inc:376
+#: src/usr/local/www/head.inc:403
 msgid "Documentation"
 msgstr ""
 
-#: src/usr/local/www/head.inc:377
+#: src/usr/local/www/head.inc:404
 msgid "Paid Support"
 msgstr ""
 
-#: src/usr/local/www/head.inc:378
+#: src/usr/local/www/head.inc:405
 msgid "pfSense Book"
 msgstr ""
 
-#: src/usr/local/www/head.inc:379
+#: src/usr/local/www/head.inc:406
 msgid "FreeBSD Handbook"
 msgstr ""
 
-#: src/usr/local/www/head.inc:447 src/usr/local/www/head.inc:609
+#: src/usr/local/www/head.inc:477 src/usr/local/www/head.inc:644
 msgid "Notices"
 msgstr ""
 
-#: src/usr/local/www/head.inc:456
+#: src/usr/local/www/head.inc:486
 msgid "Log out"
 msgstr ""
 
-#: src/usr/local/www/head.inc:480
+#: src/usr/local/www/head.inc:510
 msgid "Save dashboard layout"
 msgstr ""
 
-#: src/usr/local/www/head.inc:488
+#: src/usr/local/www/head.inc:518
 msgid "Available widgets"
 msgstr ""
 
-#: src/usr/local/www/head.inc:496
+#: src/usr/local/www/head.inc:526
 msgid "Log filter"
 msgstr ""
 
-#: src/usr/local/www/head.inc:507
+#: src/usr/local/www/head.inc:537
 msgid "Manage log"
 msgstr ""
 
-#: src/usr/local/www/head.inc:525
+#: src/usr/local/www/head.inc:555
 msgid "Refresh Graph"
 msgstr ""
 
-#: src/usr/local/www/head.inc:565
+#: src/usr/local/www/head.inc:560
+msgid "Export Graph"
+msgstr ""
+
+#: src/usr/local/www/head.inc:600
 msgid "Help for items on this page"
 msgstr ""
 
-#: src/usr/local/www/head.inc:576
+#: src/usr/local/www/head.inc:611
 #, php-format
 msgid ""
 "<p>%s is booting, then packages will be reinstalled in the background.</"
 "p><p>Do not make changes in the GUI until this is complete.</p>"
 msgstr ""
 
-#: src/usr/local/www/head.inc:579
+#: src/usr/local/www/head.inc:614
 msgid ""
 "<p>Packages are currently being reinstalled in the background.</p><p>Do not "
 "make changes in the GUI until this is complete.</p>"
 msgstr ""
 
-#: src/usr/local/www/head.inc:580
+#: src/usr/local/www/head.inc:615
 #, php-format
 msgid ""
 "<p>If the above message is still displayed after a couple of hours, use the "
@@ -13721,15 +13803,15 @@ msgid ""
 "&gt; %2$s\">%1$s &gt; %2$s</a> page and reinstall packages manually.</p>"
 msgstr ""
 
-#: src/usr/local/www/head.inc:590
+#: src/usr/local/www/head.inc:625
 msgid "This page is currently being managed by a remote machine."
 msgstr ""
 
-#: src/usr/local/www/head.inc:648
+#: src/usr/local/www/head.inc:683
 msgid "Close"
 msgstr ""
 
-#: src/usr/local/www/head.inc:649
+#: src/usr/local/www/head.inc:684
 msgid "Mark All as Read"
 msgstr ""
 
@@ -13836,8 +13918,8 @@ msgid "PPPoE password"
 msgstr ""
 
 #: src/usr/local/www/interfaces.php:547 src/usr/local/www/interfaces.php:557
-#: src/usr/local/www/interfaces.php:567 src/usr/local/www/interfaces.php:2570
-#: src/usr/local/www/interfaces.php:2700
+#: src/usr/local/www/interfaces.php:567 src/usr/local/www/interfaces.php:2578
+#: src/usr/local/www/interfaces.php:2710
 #: src/usr/local/www/interfaces_ppps_edit.php:210
 #: src/usr/local/www/interfaces_ppps_edit.php:221
 msgid "Dial on demand"
@@ -13931,6 +14013,7 @@ msgid "This track6 prefix ID is already being used in %s."
 msgstr ""
 
 #: src/usr/local/www/interfaces.php:663
+#: src/usr/local/www/services_dhcp_edit.php:179
 msgid "A valid IPv4 address must be specified."
 msgstr ""
 
@@ -13951,212 +14034,212 @@ msgstr ""
 msgid "This IPv4 address conflicts with a Static Route."
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:695
+#: src/usr/local/www/interfaces.php:697
 #: src/usr/local/www/services_dhcpv6_edit.php:127
 msgid "A valid IPv6 address must be specified."
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:698
+#: src/usr/local/www/interfaces.php:700
 msgid "IPv6 link local addresses cannot be configured as an interface IP."
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:702
+#: src/usr/local/www/interfaces.php:704
 #, php-format
 msgid "IPv6 address %s is being used by or overlaps with:"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:712
+#: src/usr/local/www/interfaces.php:714
 msgid "This IPv6 address conflicts with a Static Route."
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:720 src/usr/local/www/interfaces.php:723
+#: src/usr/local/www/interfaces.php:722 src/usr/local/www/interfaces.php:725
 msgid "A valid subnet bit count must be specified."
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:726
+#: src/usr/local/www/interfaces.php:728
 msgid "A valid alias IP address must be specified."
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:729
+#: src/usr/local/www/interfaces.php:731
 msgid "A valid alias subnet bit count must be specified."
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:732
+#: src/usr/local/www/interfaces.php:734
 msgid "A valid alias IP address must be specified to reject DHCP Leases from."
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:747
+#: src/usr/local/www/interfaces.php:749
 #: src/usr/local/www/system_routes_edit.php:94
 msgid "A valid gateway must be specified."
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:751
+#: src/usr/local/www/interfaces.php:753
 msgid "The service name contains invalid characters."
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:754 src/usr/local/www/interfaces.php:777
+#: src/usr/local/www/interfaces.php:756 src/usr/local/www/interfaces.php:779
 #: src/usr/local/www/interfaces_ppps_edit.php:251
 msgid "The idle timeout value must be an integer."
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:758
+#: src/usr/local/www/interfaces.php:760
 #: src/usr/local/www/interfaces_ppps_edit.php:255
 msgid "A valid PPPoE reset hour must be specified (0-23)."
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:762
+#: src/usr/local/www/interfaces.php:764
 #: src/usr/local/www/interfaces_ppps_edit.php:259
 msgid "A valid PPPoE reset minute must be specified (0-59)."
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:765
+#: src/usr/local/www/interfaces.php:767
 #: src/usr/local/www/interfaces_ppps_edit.php:262
 msgid "A valid PPPoE reset date must be specified (mm/dd/yyyy)."
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:768
+#: src/usr/local/www/interfaces.php:770
 msgid "A valid PPTP local IP address must be specified."
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:771
+#: src/usr/local/www/interfaces.php:773
 msgid "A valid PPTP subnet bit count must be specified."
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:774
+#: src/usr/local/www/interfaces.php:776
 msgid "A valid PPTP remote IP address must be specified."
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:780
-#: src/usr/local/www/services_dhcp_edit.php:181
+#: src/usr/local/www/interfaces.php:782
+#: src/usr/local/www/services_dhcp_edit.php:183
 #: src/usr/local/www/services_wol.php:79
 #: src/usr/local/www/services_wol_edit.php:81
 msgid "A valid MAC address must be specified."
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:795
+#: src/usr/local/www/interfaces.php:797
 #, php-format
 msgid "The MTU must be between %d and %d bytes."
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:811
+#: src/usr/local/www/interfaces.php:813
 msgid "The MTU of a VLAN cannot be greater than that of its parent interface."
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:827
+#: src/usr/local/www/interfaces.php:829
 #, php-format
 msgid "Interface %s (VLAN) has MTU set to a larger value."
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:834
+#: src/usr/local/www/interfaces.php:836
 msgid "The MSS must be an integer between 576 and 65535 bytes."
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:843 src/usr/local/www/interfaces.php:2914
+#: src/usr/local/www/interfaces.php:845 src/usr/local/www/interfaces.php:2924
 #: src/usr/local/www/status_interfaces.php:142
 msgid "SSID"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:846
+#: src/usr/local/www/interfaces.php:848
 msgid "A specific channel, not auto, must be selected for Access Point mode."
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:851
+#: src/usr/local/www/interfaces.php:853
 msgid "802.11n standards require enabling WME."
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:857
+#: src/usr/local/www/interfaces.php:859
 msgid "Key Rotation must be an integer between 1 and 9999."
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:860
+#: src/usr/local/www/interfaces.php:862
 msgid "Master Key Regeneration must be an integer between 1 and 9999."
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:864
+#: src/usr/local/www/interfaces.php:866
 msgid "Master Key Regeneration must be greater than Key Rotation."
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:869
+#: src/usr/local/www/interfaces.php:871
 msgid "802.1X Authentication Server must be an IP or hostname."
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:874
+#: src/usr/local/www/interfaces.php:876
 msgid "Secondary 802.1X Authentication Server must be an IP or hostname."
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:879
+#: src/usr/local/www/interfaces.php:881
 msgid ""
 "802.1X Authentication Server Port must be a valid port number (1-65535)."
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:884
+#: src/usr/local/www/interfaces.php:886
 msgid ""
 "Secondary 802.1X Authentication Server Port must be a valid port number "
 "(1-65535)."
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:889
+#: src/usr/local/www/interfaces.php:891
 msgid "Invalid channel specified."
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:892
+#: src/usr/local/www/interfaces.php:894
 msgid "Channel must be between 0-255."
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:897
+#: src/usr/local/www/interfaces.php:899
 msgid "Distance must be an integer."
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:901
+#: src/usr/local/www/interfaces.php:903
 msgid "Channel selected is not valid for 802.11a or 802.11na."
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:906
+#: src/usr/local/www/interfaces.php:908
 msgid "Channel selected is not valid for 802.11b or 802.11g."
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:910
+#: src/usr/local/www/interfaces.php:912
 msgid "Invalid option chosen for OFDM Protection Mode"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:916
+#: src/usr/local/www/interfaces.php:918
 msgid "The WPA passphrase must be between 8 and 63 characters long."
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:922
+#: src/usr/local/www/interfaces.php:924
 msgid "A WPA Passphrase must be specified when WPA PSK is enabled."
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:928
+#: src/usr/local/www/interfaces.php:930
 msgid "PPP Password and confirmed password must match!"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:932
+#: src/usr/local/www/interfaces.php:934
 msgid "PPPoE Password and confirmed password must match!"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:936
+#: src/usr/local/www/interfaces.php:938
 msgid "PTPP Password and confirmed password must match!"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:1593
+#: src/usr/local/www/interfaces.php:1595
 #, php-format
 msgid ""
 "Unable to change mode to %s. The maximum number of wireless clones supported "
 "in this mode may have been reached."
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:1619
+#: src/usr/local/www/interfaces.php:1621
 msgid "Static IPv4"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:1619 src/usr/local/www/status_logs.php:43
+#: src/usr/local/www/interfaces.php:1621 src/usr/local/www/status_logs.php:43
 #: src/usr/local/www/status_logs_common.inc:90
 #: src/usr/local/www/status_logs_settings.php:214
 msgid "DHCP"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:1619
+#: src/usr/local/www/interfaces.php:1621
 #: src/usr/local/www/interfaces_ppps_edit.php:464
 #: src/usr/local/www/status_logs.php:49
 #: src/usr/local/www/status_logs_common.inc:93
@@ -14164,239 +14247,239 @@ msgstr ""
 msgid "PPP"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:1619
+#: src/usr/local/www/interfaces.php:1621
 #: src/usr/local/www/interfaces_ppps_edit.php:464
 msgid "PPPoE"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:1619
+#: src/usr/local/www/interfaces.php:1621
 #: src/usr/local/www/interfaces_ppps_edit.php:464
 msgid "PPTP"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:1620
+#: src/usr/local/www/interfaces.php:1622
 msgid "Static IPv6"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:1620
+#: src/usr/local/www/interfaces.php:1622
 msgid "DHCP6"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:1620
+#: src/usr/local/www/interfaces.php:1622
 msgid "SLAAC"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:1620
+#: src/usr/local/www/interfaces.php:1622
 msgid "6rd Tunnel"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:1620
+#: src/usr/local/www/interfaces.php:1622
 msgid "6to4 Tunnel"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:1620
+#: src/usr/local/www/interfaces.php:1622
 msgid "Track Interface"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:1630
+#: src/usr/local/www/interfaces.php:1632
 msgid "Default (no preference, typically autoselect)"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:1631
+#: src/usr/local/www/interfaces.php:1633
 msgid "------- Media Supported by this interface -------"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:1674
+#: src/usr/local/www/interfaces.php:1676
 #, php-format
 msgid "The %s configuration has been changed."
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:1675
+#: src/usr/local/www/interfaces.php:1677
 msgid "The changes must be applied to take effect."
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:1676
+#: src/usr/local/www/interfaces.php:1678
 msgid "Don't forget to adjust the DHCP Server range if needed after applying."
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:1686
+#: src/usr/local/www/interfaces.php:1688
 msgid "General Configuration"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:1701
+#: src/usr/local/www/interfaces.php:1703
 msgid "Enter a description (name) for the interface here."
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:1705
+#: src/usr/local/www/interfaces.php:1707
 msgid "IPv4 Configuration Type"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:1712
+#: src/usr/local/www/interfaces.php:1714
 msgid "IPv6 Configuration Type"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:1719 src/usr/local/www/interfaces.php:1734
+#: src/usr/local/www/interfaces.php:1721 src/usr/local/www/interfaces.php:1736
 #: src/usr/local/www/services_captiveportal_mac_edit.php:209
 #: src/usr/local/www/services_captiveportal_mac_edit.php:224
-#: src/usr/local/www/services_dhcp_edit.php:403
-#: src/usr/local/www/services_dhcp_edit.php:418
+#: src/usr/local/www/services_dhcp_edit.php:412
+#: src/usr/local/www/services_dhcp_edit.php:427
 #: src/usr/local/www/status_interfaces.php:114
 msgid "MAC Address"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:1727
+#: src/usr/local/www/interfaces.php:1729
 #: src/usr/local/www/services_captiveportal_mac_edit.php:217
-#: src/usr/local/www/services_dhcp_edit.php:411
+#: src/usr/local/www/services_dhcp_edit.php:420
 msgid "Copy My MAC"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:1737
+#: src/usr/local/www/interfaces.php:1739
 msgid ""
 "This field can be used to modify (\"spoof\") the MAC address of this "
 "interface.<br />Enter a MAC address in the following format: xx:xx:xx:xx:xx:"
 "xx or leave blank."
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:1743
+#: src/usr/local/www/interfaces.php:1745
 #: src/usr/local/www/interfaces_ppps_edit.php:917
 #: src/usr/local/www/status_interfaces.php:137
 msgid "MTU"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:1746
+#: src/usr/local/www/interfaces.php:1748
 msgid ""
 "If this field is blank, the adapter's default MTU will be used. This is "
 "typically 1500 bytes but can vary in some circumstances."
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:1751
+#: src/usr/local/www/interfaces.php:1753
 msgid "MSS"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:1754
+#: src/usr/local/www/interfaces.php:1756
 msgid ""
 "If a value is entered in this field, then MSS clamping for TCP connections "
 "to the value entered above minus 40 (TCP/IP header size) will be in effect."
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:1760
+#: src/usr/local/www/interfaces.php:1762
 msgid "Speed and Duplex"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:1763
+#: src/usr/local/www/interfaces.php:1765
 msgid ""
 "Explicitly set speed and duplex mode for this interface.<br />WARNING: MUST "
 "be set to autoselect (automatically negotiate speed) unless the port this "
 "interface connects to has its speed and duplex forced."
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:1769
+#: src/usr/local/www/interfaces.php:1771
 msgid "Static IPv4 Configuration"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:1774
+#: src/usr/local/www/interfaces.php:1776
 #: src/usr/local/www/status_interfaces.php:119
 msgid "IPv4 Address"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:1778
+#: src/usr/local/www/interfaces.php:1781
 msgid "IPv4 Upstream gateway"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:1782
+#: src/usr/local/www/interfaces.php:1785
 msgid "IPv4 Upstream Gateway"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:1789 src/usr/local/www/interfaces.php:1822
+#: src/usr/local/www/interfaces.php:1792 src/usr/local/www/interfaces.php:1826
 msgid "Add a new gateway"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:1796
+#: src/usr/local/www/interfaces.php:1799
 msgid "Gateways can be managed by "
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:1796
+#: src/usr/local/www/interfaces.php:1799
 msgid " clicking here"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:1794
+#: src/usr/local/www/interfaces.php:1797
 msgid ""
 "If this interface is an Internet connection, select an existing Gateway from "
 "the list or add a new one using the \"Add\" button.<br />On local area "
 "network interfaces the upstream gateway should be \"none\". "
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:1802
+#: src/usr/local/www/interfaces.php:1805
 msgid "Static IPv6 Configuration"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:1811
+#: src/usr/local/www/interfaces.php:1815
 msgid "IPv6 Upstream gateway"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:1815
+#: src/usr/local/www/interfaces.php:1819
 msgid "IPv6 Upstream Gateway"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:1827
+#: src/usr/local/www/interfaces.php:1831
 msgid ""
 "If this interface is an Internet connection, select an existing Gateway from "
 "the list or add a new one using the \"Add\" button.<br />On local LANs the "
 "upstream gateway should be \"none\". "
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:1834
+#: src/usr/local/www/interfaces.php:1838
 msgid "New IPv6 Gateway"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:1845 src/usr/local/www/interfaces.php:3156
-#: src/usr/local/www/system_gateways_edit.php:607
+#: src/usr/local/www/interfaces.php:1849 src/usr/local/www/interfaces.php:3166
+#: src/usr/local/www/system_gateways_edit.php:620
 msgid "Gateway name"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:1852
+#: src/usr/local/www/interfaces.php:1856
 #: src/usr/local/www/status_interfaces.php:125
 msgid "Gateway IPv6"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:1889
+#: src/usr/local/www/interfaces.php:1894
 msgid "DHCP Client Configuration"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:1892 src/usr/local/www/interfaces.php:2075
+#: src/usr/local/www/interfaces.php:1897 src/usr/local/www/interfaces.php:2081
 msgid "Options"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:1899
+#: src/usr/local/www/interfaces.php:1904
 msgid "Use advanced DHCP configuration options."
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:1906 src/usr/local/www/interfaces.php:2089
+#: src/usr/local/www/interfaces.php:1911 src/usr/local/www/interfaces.php:2095
 msgid "Override the configuration from this file."
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:1915
+#: src/usr/local/www/interfaces.php:1920
 msgid ""
 "The value in this field is sent as the DHCP client identifier and hostname "
 "when requesting a DHCP lease. Some ISPs may require this (for client "
 "identification)."
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:1919
+#: src/usr/local/www/interfaces.php:1924
 msgid "Alias IPv4 address"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:1921
+#: src/usr/local/www/interfaces.php:1927
 msgid ""
 "The value in this field is used as a fixed alias IPv4 address by the DHCP "
 "client."
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:1925
+#: src/usr/local/www/interfaces.php:1931
 msgid "Reject leases from"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:1928
+#: src/usr/local/www/interfaces.php:1934
 msgid ""
 "To make the DHCP client reject leases from an undesirable DHCP server, place "
 "the IP address of the DHCP server here. This is useful for rejecting leases "
@@ -14404,106 +14487,106 @@ msgid ""
 "sync."
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:1931
+#: src/usr/local/www/interfaces.php:1937
 msgid "Protocol timing"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:1939
+#: src/usr/local/www/interfaces.php:1945
 #: src/usr/local/www/load_balancer_setting.php:117
 msgid "Timeout"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:1946
+#: src/usr/local/www/interfaces.php:1952
 #: src/usr/local/www/load_balancer_pool_edit.php:336
 msgid "Retry"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:1954
+#: src/usr/local/www/interfaces.php:1960
 msgid "Select timeout"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:1968
+#: src/usr/local/www/interfaces.php:1974
 msgid "Backoff cutoff"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:1975
+#: src/usr/local/www/interfaces.php:1981
 msgid "Initial interval"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:1979
+#: src/usr/local/www/interfaces.php:1985
 msgid "Presets"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2014
+#: src/usr/local/www/interfaces.php:2020
 msgid ""
 "The values in these fields are DHCP protocol timings used when requesting a "
 "lease.<br /><a target=\"_blank\" href=\"https://www.freebsd.org/cgi/man.cgi?"
 "query=dhclient.conf&sektion=5#PROTOCOL_TIMING\">See here more information</a>"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2021 src/usr/local/www/interfaces.php:2135
+#: src/usr/local/www/interfaces.php:2027 src/usr/local/www/interfaces.php:2141
 msgid "Configuration File Override"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2031
+#: src/usr/local/www/interfaces.php:2037
 msgid "Lease Requirements and Requests"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2036 src/usr/local/www/interfaces.php:2160
+#: src/usr/local/www/interfaces.php:2042 src/usr/local/www/interfaces.php:2166
 msgid "Send options"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2046
+#: src/usr/local/www/interfaces.php:2052
 msgid "Request options"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2054
+#: src/usr/local/www/interfaces.php:2060
 msgid "Require options"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2061
+#: src/usr/local/www/interfaces.php:2067
 msgid "Option modifiers"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2072
+#: src/usr/local/www/interfaces.php:2078
 msgid "DHCP6 Client Configuration"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2082
+#: src/usr/local/www/interfaces.php:2088
 msgid "Use advanced DHCPv6 configuration options."
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2095
+#: src/usr/local/www/interfaces.php:2101
 msgid "Use IPv4 connectivity as parent interface"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2102
+#: src/usr/local/www/interfaces.php:2108
 msgid "Request only an IPv6 prefix"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2109
+#: src/usr/local/www/interfaces.php:2115
 msgid "DHCPv6 Prefix Delegation size"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2112
+#: src/usr/local/www/interfaces.php:2118
 msgid ""
 "The value in this field is the delegated prefix length provided by the "
 "DHCPv6 server. Normally specified by the ISP."
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2116
+#: src/usr/local/www/interfaces.php:2122
 msgid "Send IPv6 prefix hint"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2123
+#: src/usr/local/www/interfaces.php:2129
 msgid "Debug"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2129
+#: src/usr/local/www/interfaces.php:2135
 msgid "Do not wait for a RA"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2138
+#: src/usr/local/www/interfaces.php:2144
 msgid ""
 "The value in this field is the full absolute path to a DHCP client "
 "configuration file.\t [/[dirname/[.../]]filename[.ext]]<br />Value "
@@ -14513,234 +14596,234 @@ msgid ""
 "ISPs may require certain options be or not be sent."
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2147
+#: src/usr/local/www/interfaces.php:2153
 msgid "Advanced DHCP6 Client Configuration"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2152
+#: src/usr/local/www/interfaces.php:2158
 msgid "Information only"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2156
+#: src/usr/local/www/interfaces.php:2162
 msgid "Only exchange informational configuration parameters with servers."
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2170
+#: src/usr/local/www/interfaces.php:2176
 msgid "Request Options"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2178
+#: src/usr/local/www/interfaces.php:2184
 msgid "Scripts"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2184
+#: src/usr/local/www/interfaces.php:2190
 msgid "Identity Association Statement"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2263
+#: src/usr/local/www/interfaces.php:2271
 msgid "Prefix interface statement"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2281
+#: src/usr/local/www/interfaces.php:2289
 msgid "Authentication statement"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2313
+#: src/usr/local/www/interfaces.php:2321
 msgid "Keyinfo statement"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2354
+#: src/usr/local/www/interfaces.php:2362
 msgid ""
 "<a target=\"_blank\" href=\"https://www.freebsd.org/cgi/man.cgi?query=dhcp6c."
 "conf&sektion=5&apropos=0&manpath=FreeBSD+10.1-RELEASE+and"
 "+Ports#Interface_statement\">See here more information</a>"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2360
+#: src/usr/local/www/interfaces.php:2368
 msgid "6RD Configuration"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2365
+#: src/usr/local/www/interfaces.php:2373
 msgid "6RD Prefix"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2372
+#: src/usr/local/www/interfaces.php:2380
 msgid "6RD Border relay"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2379
+#: src/usr/local/www/interfaces.php:2387
 msgid "6RD IPv4 Prefix length"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2382
+#: src/usr/local/www/interfaces.php:2390
 msgid ""
 "6RD IPv4 prefix length. Normally specified by the ISP. A value of 0 means "
 "embed the entire IPv4 address in the 6RD prefix."
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2387
+#: src/usr/local/www/interfaces.php:2395
 msgid "Track IPv6 Interface"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2429
+#: src/usr/local/www/interfaces.php:2437
 msgid "IPv6 Interface"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2432
+#: src/usr/local/www/interfaces.php:2440
 msgid "Selects the dynamic IPv6 WAN interface to track for configuration."
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2440
+#: src/usr/local/www/interfaces.php:2448
 msgid "IPv6 Prefix ID"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2443
+#: src/usr/local/www/interfaces.php:2451
 msgid ""
 "<span id=\"track6-prefix-id-range\"></span>The value in this field is the "
 "(Delegated) IPv6 prefix ID. This determines the configurable network ID "
 "based on the dynamic IPv6 connection. The default value is 0."
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2456
+#: src/usr/local/www/interfaces.php:2464
 #: src/usr/local/www/interfaces_ppps_edit.php:572
 msgid "PPP Configuration"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2461 src/usr/local/www/interfaces.php:2885
+#: src/usr/local/www/interfaces.php:2469 src/usr/local/www/interfaces.php:2895
 #: src/usr/local/www/interfaces_ppps_edit.php:600
 msgid "Country"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2468
+#: src/usr/local/www/interfaces.php:2476
 #: src/usr/local/www/interfaces_ppps_edit.php:607
 msgid "Provider"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2475
+#: src/usr/local/www/interfaces.php:2483
 #: src/usr/local/www/interfaces_ppps_edit.php:614
 msgid "Plan"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2478
+#: src/usr/local/www/interfaces.php:2486
 #: src/usr/local/www/interfaces_ppps_edit.php:617
 msgid "Select to fill in service provider data."
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2496
+#: src/usr/local/www/interfaces.php:2504
 #: src/usr/local/www/interfaces_ppps_edit.php:663
 msgid "Phone number"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2499
+#: src/usr/local/www/interfaces.php:2507
 msgid "Typically *99# for GSM networks and #777 for CDMA networks."
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2503
+#: src/usr/local/www/interfaces.php:2511
 msgid "Access Point Name"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2529
+#: src/usr/local/www/interfaces.php:2537
 msgid "Modem port"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2536
+#: src/usr/local/www/interfaces.php:2544
 msgid "Advanced PPP"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2539
+#: src/usr/local/www/interfaces.php:2547
 msgid "Create a new PPP configuration."
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2544
+#: src/usr/local/www/interfaces.php:2552
 msgid "PPPoE Configuration"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2563
+#: src/usr/local/www/interfaces.php:2571
 #: src/usr/local/www/interfaces_ppps_edit.php:720
 msgid "Service name"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2566
+#: src/usr/local/www/interfaces.php:2574
 msgid "This field can usually be left empty."
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2578
+#: src/usr/local/www/interfaces.php:2586
 msgid "Idle timeout"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2582 src/usr/local/www/interfaces.php:2713
+#: src/usr/local/www/interfaces.php:2590 src/usr/local/www/interfaces.php:2723
 msgid ""
 "If no qualifying outgoing packets are transmitted for the specified number "
 "of seconds, the connection is brought down. An idle timeout of zero disables "
 "this feature."
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2589
+#: src/usr/local/www/interfaces.php:2597
 #: src/usr/local/www/interfaces_ppps_edit.php:750
 msgid "Pre-set"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2587
+#: src/usr/local/www/interfaces.php:2595
 msgid "Periodic reset"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2590
+#: src/usr/local/www/interfaces.php:2598
 msgid "Select a reset timing type."
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2592
+#: src/usr/local/www/interfaces.php:2600
 msgid "Custom reset"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2601
+#: src/usr/local/www/interfaces.php:2609
 msgid "Hour (0-23)"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2609
+#: src/usr/local/www/interfaces.php:2617
 msgid "Minutes (0-59)"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2616
+#: src/usr/local/www/interfaces.php:2624
 msgid "Specific date (mm/dd/yyyy)"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2618
+#: src/usr/local/www/interfaces.php:2626
 msgid ""
 "Leave the date field empty, for the reset to be executed each day at the "
 "time specified by the minutes and hour fields"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2622
+#: src/usr/local/www/interfaces.php:2630
 msgid "cron based reset"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2661 src/usr/local/www/interfaces.php:2724
+#: src/usr/local/www/interfaces.php:2669 src/usr/local/www/interfaces.php:2734
 msgid "Advanced and MLPPP"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2664
+#: src/usr/local/www/interfaces.php:2672
 msgid ""
 "Click for additional PPPoE configuration options. Save first if changes have "
 "been made."
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2669
+#: src/usr/local/www/interfaces.php:2677
 msgid "PPTP/L2TP Configuration"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2688
+#: src/usr/local/www/interfaces.php:2696
 #: src/usr/local/www/interfaces_ppps_edit.php:221
 #: src/usr/local/www/interfaces_ppps_edit.php:224
 msgid "Local IP address"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2694
+#: src/usr/local/www/interfaces.php:2703
 #: src/usr/local/www/interfaces_ppps_edit.php:221
 #: src/usr/local/www/interfaces_ppps_edit.php:224
 msgid "Remote IP address"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2704
+#: src/usr/local/www/interfaces.php:2714
 msgid ""
 "This option causes the interface to operate in dial-on-demand mode, allowing "
 "it to be a virtual full time connection. The interface is configured, but "
@@ -14748,156 +14831,156 @@ msgid ""
 "traffic is detected."
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2709
+#: src/usr/local/www/interfaces.php:2719
 msgid "Idle timeout (seconds)"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2717
+#: src/usr/local/www/interfaces.php:2727
 msgid "There are additional Local and Remote IP addresses defined for MLPPP."
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2727
+#: src/usr/local/www/interfaces.php:2737
 msgid ""
 "Click for additional PPTP and L2TP configuration options. Save first if "
 "changes have been made."
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2734
+#: src/usr/local/www/interfaces.php:2744
 msgid ""
 "Common Wireless Configuration - Settings apply to all wireless networks on "
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2738
+#: src/usr/local/www/interfaces.php:2748
 msgid "Persist common settings"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2758
+#: src/usr/local/www/interfaces.php:2768
 msgid "Standard"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2768 src/usr/local/www/interfaces.php:2818
+#: src/usr/local/www/interfaces.php:2778 src/usr/local/www/interfaces.php:2828
 msgid "Off"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2768
+#: src/usr/local/www/interfaces.php:2778
 msgid "CTS to self"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2768
+#: src/usr/local/www/interfaces.php:2778
 msgid "RTS and CTS"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2766
+#: src/usr/local/www/interfaces.php:2776
 msgid "802.11g OFDM Protection Mode"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2769
+#: src/usr/local/www/interfaces.php:2779
 msgid ""
 "For IEEE 802.11g, use the specified technique for protecting OFDM frames in "
 "a mixed 11b/11g network."
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2779 src/usr/local/www/interfaces.php:2827
-#: src/usr/local/www/interfaces.php:2836
+#: src/usr/local/www/interfaces.php:2789 src/usr/local/www/interfaces.php:2837
+#: src/usr/local/www/interfaces.php:2846
 #: src/usr/local/www/vpn_ipsec_phase1.php:662
 #: src/usr/local/www/vpn_ipsec_phase1.php:847
 #: src/usr/local/www/vpn_ipsec_phase2.php:626
 msgid "Auto"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2803
+#: src/usr/local/www/interfaces.php:2813
 #: src/usr/local/www/status_interfaces.php:141
 msgid "Channel"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2806
+#: src/usr/local/www/interfaces.php:2816
 msgid ""
 "Legend: wireless standards - channel # (frequency @ max TX power / TX power "
 "allowed in reg. domain)<br />Not all channels may be supported by some "
 "cards.  Auto may override the wireless standard selected above."
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2811
+#: src/usr/local/www/interfaces.php:2821
 msgid "Antenna Settings"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2818
+#: src/usr/local/www/interfaces.php:2828
 msgid "On"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2819
+#: src/usr/local/www/interfaces.php:2829
 msgid "Diversity"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2827 src/usr/local/www/interfaces.php:2836
+#: src/usr/local/www/interfaces.php:2837 src/usr/local/www/interfaces.php:2846
 msgid "#1"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2827 src/usr/local/www/interfaces.php:2836
+#: src/usr/local/www/interfaces.php:2837 src/usr/local/www/interfaces.php:2846
 msgid "#2"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2828
+#: src/usr/local/www/interfaces.php:2838
 msgid "Transmit antenna"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2837
+#: src/usr/local/www/interfaces.php:2847
 msgid "Receive antenna"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2840
+#: src/usr/local/www/interfaces.php:2850
 msgid ""
 "Note: The antenna numbers do not always match up with the labels on the card."
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2849
+#: src/usr/local/www/interfaces.php:2859
 msgid "Distance setting (meters)"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2852
+#: src/usr/local/www/interfaces.php:2862
 msgid ""
 "This field can be used to tune ACK/CTS timers to fit the distance between AP "
 "and Client"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2858
+#: src/usr/local/www/interfaces.php:2868
 msgid "Regulatory Settings"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2870
+#: src/usr/local/www/interfaces.php:2880
 msgid "Regulatory domain"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2873
+#: src/usr/local/www/interfaces.php:2883
 msgid ""
 "Some cards have a default that is not recognized and require changing the "
 "regulatory domain to one in this list for the changes to other regulatory "
 "settings to work"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2888
+#: src/usr/local/www/interfaces.php:2898
 msgid ""
 "Any country setting other than \"Default\" will override the regulatory "
 "domain setting"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2894
+#: src/usr/local/www/interfaces.php:2904
 msgid "Indoor"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2894
+#: src/usr/local/www/interfaces.php:2904
 msgid "Outdoor"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2894
+#: src/usr/local/www/interfaces.php:2904
 msgid "Anywhere"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2892
+#: src/usr/local/www/interfaces.php:2902
 msgid "Location"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2895
+#: src/usr/local/www/interfaces.php:2905
 msgid ""
 "These settings may affect which channels are available and the maximum "
 "transmit power allowed on those channels. Using the correct settings to "
@@ -14908,87 +14991,87 @@ msgid ""
 "additional channels that are not already supported."
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2903
+#: src/usr/local/www/interfaces.php:2913
 msgid "Network-Specific Wireless Configuration"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2924
+#: src/usr/local/www/interfaces.php:2934
 msgid "802.11g"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2924
+#: src/usr/local/www/interfaces.php:2934
 msgid "802.11n"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2922
+#: src/usr/local/www/interfaces.php:2932
 msgid "Minimum wireless standard"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2925
+#: src/usr/local/www/interfaces.php:2935
 msgid ""
 "When operating as an access point, allow only stations capable of the "
 "selected wireless standard to associate (stations not capable are not "
 "permitted to associate)"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2929
+#: src/usr/local/www/interfaces.php:2939
 msgid "802.11g only"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2933
+#: src/usr/local/www/interfaces.php:2943
 msgid ""
 "When operating as an access point in 802.11g mode, allow only 11g-capable "
 "stations to associate (11b-only stations are not permitted to associate)"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2938
+#: src/usr/local/www/interfaces.php:2948
 msgid "Allow intra-BSS communication"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2942
+#: src/usr/local/www/interfaces.php:2952
 msgid ""
 "Provides extra security by isolating clients so they cannot directly "
 "communicate with one another"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2946
+#: src/usr/local/www/interfaces.php:2956
 msgid "Enable WME"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2954
+#: src/usr/local/www/interfaces.php:2964
 msgid "Hide SSID"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2963 src/usr/local/www/interfaces.php:2984
+#: src/usr/local/www/interfaces.php:2973 src/usr/local/www/interfaces.php:2994
 msgid "WPA"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2975
+#: src/usr/local/www/interfaces.php:2985
 msgid "WPA Pre-Shared Key"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2978
+#: src/usr/local/www/interfaces.php:2988
 msgid "WPA Passphrase must be between 8 and 63 characters long"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2984
+#: src/usr/local/www/interfaces.php:2994
 msgid "WPA2"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2984 src/usr/local/www/interfaces.php:2991
-#: src/usr/local/www/interfaces.php:2998 src/usr/local/www/pkg_mgr.php:158
+#: src/usr/local/www/interfaces.php:2994 src/usr/local/www/interfaces.php:3001
+#: src/usr/local/www/interfaces.php:3008 src/usr/local/www/pkg_mgr.php:158
 #: src/usr/local/www/services_captiveportal_hostname_edit.php:154
-#: src/usr/local/www/services_captiveportal_ip_edit.php:198
+#: src/usr/local/www/services_captiveportal_ip_edit.php:201
 #: src/usr/local/www/widgets/widgets/gateways.widget.php:111
 #: src/usr/local/www/services_rfc2136_edit.php:279
 msgid "Both"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2982
+#: src/usr/local/www/interfaces.php:2992
 msgid "WPA mode"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2991
+#: src/usr/local/www/interfaces.php:3001
 #: src/usr/local/www/vpn_ipsec_keys.php:102
 #: src/usr/local/www/vpn_ipsec_keys_edit.php:68
 #: src/usr/local/www/vpn_ipsec_keys_edit.php:150
@@ -14997,101 +15080,101 @@ msgstr ""
 msgid "Pre-Shared Key"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2991
+#: src/usr/local/www/interfaces.php:3001
 msgid "Extensible Authentication Protocol"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2989
+#: src/usr/local/www/interfaces.php:2999
 msgid "WPA Key Management Mode"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2998
+#: src/usr/local/www/interfaces.php:3008
 msgid "AES (recommended)"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2998
+#: src/usr/local/www/interfaces.php:3008
 msgid "TKIP"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2996
+#: src/usr/local/www/interfaces.php:3006
 msgid "WPA Pairwise"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:3003
+#: src/usr/local/www/interfaces.php:3013
 msgid "Group Key Rotation"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:3007
+#: src/usr/local/www/interfaces.php:3017
 msgid ""
 "Time between group rekey events, specified in seconds. Allowed values are "
 "1-9999. Must be shorter than Master Key Regeneration time"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:3011
+#: src/usr/local/www/interfaces.php:3021
 msgid "Group Master Key Regeneration"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:3015
+#: src/usr/local/www/interfaces.php:3025
 msgid ""
 "Time between GMK rekey events, specified in seconds. Allowed values are "
 "1-9999. Must be longer than Group Key Rotation time"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:3019
+#: src/usr/local/www/interfaces.php:3029
 msgid "Strict Key Regeneration"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:3027
+#: src/usr/local/www/interfaces.php:3037
 msgid "802.1x RADIUS Options"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:3031
+#: src/usr/local/www/interfaces.php:3041
 msgid "IEEE802.1X"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:3035
+#: src/usr/local/www/interfaces.php:3045
 msgid "This option requires that the \"Enable WPA box\" is checked"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:3037
+#: src/usr/local/www/interfaces.php:3047
 msgid "Primary 802.1X server"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:3043 src/usr/local/www/interfaces.php:3067
+#: src/usr/local/www/interfaces.php:3053 src/usr/local/www/interfaces.php:3077
 msgid "IP address of the RADIUS server"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:3050 src/usr/local/www/interfaces.php:3074
+#: src/usr/local/www/interfaces.php:3060 src/usr/local/www/interfaces.php:3084
 msgid "Server auth port. Default is 1812"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:3054 src/usr/local/www/interfaces.php:3078
+#: src/usr/local/www/interfaces.php:3064 src/usr/local/www/interfaces.php:3088
 #: src/usr/local/www/system_authservers.php:271
-#: src/usr/local/www/system_authservers.php:735
+#: src/usr/local/www/system_authservers.php:736
 msgid "Shared Secret"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:3057 src/usr/local/www/interfaces.php:3081
+#: src/usr/local/www/interfaces.php:3067 src/usr/local/www/interfaces.php:3091
 msgid "RADIUS Shared secret for this firewall"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:3061
+#: src/usr/local/www/interfaces.php:3071
 msgid "Secondary 802.1X server"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:3087
+#: src/usr/local/www/interfaces.php:3097
 msgid "Authentication Roaming Preauth"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:3096
+#: src/usr/local/www/interfaces.php:3106
 msgid "Reserved Networks"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:3100
+#: src/usr/local/www/interfaces.php:3110
 msgid "Block private networks and loopback addresses"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:3104
+#: src/usr/local/www/interfaces.php:3114
 msgid ""
 "Blocks traffic from IP addresses that are reserved for private networks per "
 "RFC 1918 (10/8, 172.16/12, 192.168/16) and unique local addresses per RFC "
@@ -15100,7 +15183,7 @@ msgid ""
 "private address space, too."
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:3114
+#: src/usr/local/www/interfaces.php:3124
 msgid ""
 "Blocks traffic from reserved IP addresses (but not RFC 1918) or not yet "
 "assigned by IANA. Bogons are prefixes that should never appear in the "
@@ -15109,11 +15192,11 @@ msgid ""
 "System->Advanced Firewall/NAT settings."
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:3145
+#: src/usr/local/www/interfaces.php:3155
 msgid "New Gateway"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:3163
+#: src/usr/local/www/interfaces.php:3173
 #: src/usr/local/www/status_interfaces.php:121
 msgid "Gateway IPv4"
 msgstr ""
@@ -15277,7 +15360,7 @@ msgstr ""
 #: src/usr/local/www/interfaces_gif.php:84
 #: src/usr/local/www/interfaces_gre.php:70
 #: src/usr/local/www/interfaces_gre.php:84
-#: src/usr/local/www/interfaces_gre_edit.php:155
+#: src/usr/local/www/interfaces_gre_edit.php:159
 #: src/usr/local/www/interfaces_groups.php:66
 #: src/usr/local/www/interfaces_lagg.php:91
 #: src/usr/local/www/interfaces_ppps.php:84
@@ -15354,6 +15437,12 @@ msgid ""
 "shown."
 msgstr ""
 
+#: src/usr/local/www/interfaces_assign.php:582
+msgid ""
+"Wireless interfaces must be created on the Wireless tab before they can be "
+"assigned."
+msgstr ""
+
 #: src/usr/local/www/interfaces_bridge.php:53
 #: src/usr/local/www/interfaces_gif.php:52
 #: src/usr/local/www/interfaces_gre.php:53
@@ -15464,7 +15553,7 @@ msgstr ""
 
 #: src/usr/local/www/interfaces_bridge_edit.php:344
 #: src/usr/local/www/interfaces_gif_edit.php:133
-#: src/usr/local/www/interfaces_gre_edit.php:123
+#: src/usr/local/www/interfaces_gre_edit.php:127
 #: src/usr/local/www/interfaces_lagg_edit.php:169
 #: src/usr/local/www/interfaces_vlan_edit.php:136
 msgid "Error occurred creating interface, please retry."
@@ -15483,7 +15572,7 @@ msgstr ""
 #: src/usr/local/www/vpn_ipsec_phase2.php:672
 #: src/usr/local/www/vpn_openvpn_client.php:745
 #: src/usr/local/www/vpn_openvpn_server.php:1137
-#: src/usr/local/www/interfaces.php:1897 src/usr/local/www/interfaces.php:2080
+#: src/usr/local/www/interfaces.php:1902 src/usr/local/www/interfaces.php:2086
 msgid "Advanced Configuration"
 msgstr ""
 
@@ -15709,7 +15798,7 @@ msgid "Delete GIF interface"
 msgstr ""
 
 #: src/usr/local/www/interfaces_gif_edit.php:65
-#: src/usr/local/www/interfaces_gre_edit.php:65
+#: src/usr/local/www/interfaces_gre_edit.php:69
 #: src/usr/local/www/interfaces_qinq_edit.php:231
 #: src/usr/local/www/interfaces_vlan_edit.php:72
 #: src/usr/local/www/interfaces_wireless_edit.php:81
@@ -15733,7 +15822,7 @@ msgid "gif tunnel remote netmask"
 msgstr ""
 
 #: src/usr/local/www/interfaces_gif_edit.php:72
-#: src/usr/local/www/interfaces_gre_edit.php:72
+#: src/usr/local/www/interfaces_gre_edit.php:76
 msgid "The tunnel local and tunnel remote fields must have valid IP addresses."
 msgstr ""
 
@@ -15777,9 +15866,9 @@ msgid "GIF Configuration"
 msgstr ""
 
 #: src/usr/local/www/interfaces_gif_edit.php:179
-#: src/usr/local/www/interfaces_gre_edit.php:169
+#: src/usr/local/www/interfaces_gre_edit.php:173
 #: src/usr/local/www/interfaces_vlan_edit.php:185
-#: src/usr/local/www/interfaces_wireless_edit.php:180
+#: src/usr/local/www/interfaces_wireless_edit.php:178
 msgid "Parent Interface"
 msgstr ""
 
@@ -15817,7 +15906,7 @@ msgid "GIF tunnel subnet"
 msgstr ""
 
 #: src/usr/local/www/interfaces_gif_edit.php:207
-#: src/usr/local/www/interfaces_gre_edit.php:197
+#: src/usr/local/www/interfaces_gre_edit.php:201
 msgid "The subnet is used for determining the network that is tunnelled."
 msgstr ""
 
@@ -15847,89 +15936,89 @@ msgstr ""
 msgid "Delete GRE interface"
 msgstr ""
 
-#: src/usr/local/www/interfaces_gre_edit.php:65
+#: src/usr/local/www/interfaces_gre_edit.php:69
 msgid "Remote tunnel endpoint IP address"
 msgstr ""
 
-#: src/usr/local/www/interfaces_gre_edit.php:65
+#: src/usr/local/www/interfaces_gre_edit.php:69
 msgid "Local tunnel IP address"
 msgstr ""
 
-#: src/usr/local/www/interfaces_gre_edit.php:65
+#: src/usr/local/www/interfaces_gre_edit.php:69
 msgid "Remote tunnel IP address"
 msgstr ""
 
-#: src/usr/local/www/interfaces_gre_edit.php:65
+#: src/usr/local/www/interfaces_gre_edit.php:69
 msgid "Remote tunnel network"
 msgstr ""
 
-#: src/usr/local/www/interfaces_gre_edit.php:76
+#: src/usr/local/www/interfaces_gre_edit.php:80
 msgid "The GRE tunnel subnet must be an integer."
 msgstr ""
 
-#: src/usr/local/www/interfaces_gre_edit.php:81
+#: src/usr/local/www/interfaces_gre_edit.php:85
 msgid ""
 "The GRE Tunnel remote address must be IPv4 where tunnel local address is "
 "IPv4."
 msgstr ""
 
-#: src/usr/local/www/interfaces_gre_edit.php:84
+#: src/usr/local/www/interfaces_gre_edit.php:88
 msgid "The GRE tunnel subnet must be an integer between 1 and 32."
 msgstr ""
 
-#: src/usr/local/www/interfaces_gre_edit.php:90
+#: src/usr/local/www/interfaces_gre_edit.php:94
 msgid ""
 "The GRE Tunnel remote address must be IPv6 where tunnel local address is "
 "IPv6."
 msgstr ""
 
-#: src/usr/local/www/interfaces_gre_edit.php:93
+#: src/usr/local/www/interfaces_gre_edit.php:97
 msgid "The GRE tunnel subnet must be an integer between 1 and 128."
 msgstr ""
 
-#: src/usr/local/www/interfaces_gre_edit.php:103
+#: src/usr/local/www/interfaces_gre_edit.php:107
 #, php-format
 msgid "A GRE tunnel with the network %s is already defined."
 msgstr ""
 
-#: src/usr/local/www/interfaces_gre_edit.php:165
+#: src/usr/local/www/interfaces_gre_edit.php:169
 msgid "GRE Configuration"
 msgstr ""
 
-#: src/usr/local/www/interfaces_gre_edit.php:172
+#: src/usr/local/www/interfaces_gre_edit.php:176
 msgid ""
 "This interface serves as the local address to be used for the GRE tunnel."
 msgstr ""
 
-#: src/usr/local/www/interfaces_gre_edit.php:176
+#: src/usr/local/www/interfaces_gre_edit.php:180
 msgid "GRE Remote Address"
 msgstr ""
 
-#: src/usr/local/www/interfaces_gre_edit.php:178
+#: src/usr/local/www/interfaces_gre_edit.php:182
 msgid "Peer address where encapsulated GRE packets will be sent."
 msgstr ""
 
-#: src/usr/local/www/interfaces_gre_edit.php:182
+#: src/usr/local/www/interfaces_gre_edit.php:186
 msgid "GRE tunnel local address"
 msgstr ""
 
-#: src/usr/local/www/interfaces_gre_edit.php:184
+#: src/usr/local/www/interfaces_gre_edit.php:188
 msgid "Local GRE tunnel endpoint."
 msgstr ""
 
-#: src/usr/local/www/interfaces_gre_edit.php:188
+#: src/usr/local/www/interfaces_gre_edit.php:192
 msgid "GRE tunnel remote address"
 msgstr ""
 
-#: src/usr/local/www/interfaces_gre_edit.php:190
+#: src/usr/local/www/interfaces_gre_edit.php:194
 msgid "Remote GRE address endpoint."
 msgstr ""
 
-#: src/usr/local/www/interfaces_gre_edit.php:194
+#: src/usr/local/www/interfaces_gre_edit.php:198
 msgid "GRE tunnel subnet"
 msgstr ""
 
-#: src/usr/local/www/interfaces_gre_edit.php:201
+#: src/usr/local/www/interfaces_gre_edit.php:205
 msgid "Add Static Route"
 msgstr ""
 
@@ -15955,14 +16044,27 @@ msgid "Group name already exists!"
 msgstr ""
 
 #: src/usr/local/www/interfaces_groups_edit.php:71
-msgid "Only letters A-Z are allowed as the group name."
+msgid "Group name cannot have more than 16 characters."
 msgstr ""
 
-#: src/usr/local/www/interfaces_groups_edit.php:176
+#: src/usr/local/www/interfaces_groups_edit.php:75
+msgid ""
+"Only letters (A-Z), digits (0-9), '-' and '_' are allowed as the group name."
+msgstr ""
+
+#: src/usr/local/www/interfaces_groups_edit.php:79
+msgid "Group name cannot end with digit."
+msgstr ""
+
+#: src/usr/local/www/interfaces_groups_edit.php:87
+msgid "Group name cannot start with pkg-"
+msgstr ""
+
+#: src/usr/local/www/interfaces_groups_edit.php:201
 msgid "Interface Group Configuration"
 msgstr ""
 
-#: src/usr/local/www/interfaces_groups_edit.php:180
+#: src/usr/local/www/interfaces_groups_edit.php:205
 #: src/usr/local/www/status_gateway_groups.php:63
 #: src/usr/local/www/system_gateway_groups.php:130
 #: src/usr/local/www/system_gateway_groups_edit.php:208
@@ -15972,33 +16074,33 @@ msgstr ""
 msgid "Group Name"
 msgstr ""
 
-#: src/usr/local/www/interfaces_groups_edit.php:184
+#: src/usr/local/www/interfaces_groups_edit.php:209
 msgid "No numbers or spaces are allowed. Only characters: a-zA-Z"
 msgstr ""
 
-#: src/usr/local/www/interfaces_groups_edit.php:189
+#: src/usr/local/www/interfaces_groups_edit.php:214
 msgid "Group Description"
 msgstr ""
 
-#: src/usr/local/www/interfaces_groups_edit.php:193
+#: src/usr/local/www/interfaces_groups_edit.php:218
 #: src/usr/local/www/interfaces_vlan_edit.php:212
 msgid ""
 "A group description may be entered here for administrative reference (not "
 "parsed)."
 msgstr ""
 
-#: src/usr/local/www/interfaces_groups_edit.php:198
+#: src/usr/local/www/interfaces_groups_edit.php:223
 msgid "Group Members"
 msgstr ""
 
-#: src/usr/local/www/interfaces_groups_edit.php:202
+#: src/usr/local/www/interfaces_groups_edit.php:227
 msgid ""
 "NOTE: Rules for WAN type interfaces in groups do not contain the reply-to "
 "mechanism upon which Multi-WAN typically relies. <a href=\"https://doc."
 "pfsense.org/index.php/ifgroups\">More Information</a>"
 msgstr ""
 
-#: src/usr/local/www/interfaces_groups_edit.php:210
+#: src/usr/local/www/interfaces_groups_edit.php:235
 #: src/usr/local/www/interfaces_vlan_edit.php:224
 #: src/usr/local/www/system_advanced_sysctl.php:226
 msgid "id"
@@ -16167,8 +16269,8 @@ msgstr ""
 
 #: src/usr/local/www/interfaces_ppps_edit.php:221
 #: src/usr/local/www/interfaces_ppps_edit.php:224
-#: src/usr/local/www/services_dhcp.php:803
-#: src/usr/local/www/services_dhcpv6.php:577
+#: src/usr/local/www/services_dhcp.php:814
+#: src/usr/local/www/services_dhcpv6.php:591
 msgid "Subnet"
 msgstr ""
 
@@ -16179,7 +16281,7 @@ msgstr ""
 #: src/usr/local/www/interfaces_ppps_edit.php:239
 #: src/usr/local/www/services_captiveportal_vouchers.php:249
 #: src/usr/local/www/services_checkip_edit.php:74
-#: src/usr/local/www/services_dyndns_edit.php:111
+#: src/usr/local/www/services_dyndns_edit.php:112
 msgid "Password and confirmed password must match."
 msgstr ""
 
@@ -16614,6 +16716,10 @@ msgid ""
 "supported cards."
 msgstr ""
 
+#: src/usr/local/www/interfaces_vlan.php:164
+msgid "Are you sure you want to delete this VLAN?"
+msgstr ""
+
 #: src/usr/local/www/interfaces_vlan_edit.php:77
 msgid "The VLAN tag must be an integer between 1 and 4094."
 msgstr ""
@@ -16714,11 +16820,11 @@ msgstr ""
 msgid "Created without id"
 msgstr ""
 
-#: src/usr/local/www/interfaces_wireless_edit.php:163
+#: src/usr/local/www/interfaces_wireless_edit.php:161
 msgid "None available"
 msgstr ""
 
-#: src/usr/local/www/interfaces_wireless_edit.php:176
+#: src/usr/local/www/interfaces_wireless_edit.php:174
 msgid "Wireless Interface Configuration"
 msgstr ""
 
@@ -16925,7 +17031,7 @@ msgid "The 'name' field must be 16 characters or less."
 msgstr ""
 
 #: src/usr/local/www/load_balancer_monitor_edit.php:117
-#: src/usr/local/www/services_dhcp_edit.php:168
+#: src/usr/local/www/services_dhcp_edit.php:170
 #: src/usr/local/www/services_dhcpv6_edit.php:118
 msgid "The hostname can only contain the characters A-Z, 0-9 and '-'."
 msgstr ""
@@ -16988,7 +17094,7 @@ msgid "HTTP Code"
 msgstr ""
 
 #: src/usr/local/www/load_balancer_monitor_edit.php:317
-#: src/usr/local/www/services_captiveportal.php:1011
+#: src/usr/local/www/services_captiveportal.php:1010
 msgid "HTTPS Options"
 msgstr ""
 
@@ -17023,7 +17129,7 @@ msgid "Pool"
 msgstr ""
 
 #: src/usr/local/www/load_balancer_pool.php:122
-#: src/usr/local/www/services_dhcp.php:886
+#: src/usr/local/www/services_dhcp.php:899
 #: src/usr/local/www/status_lb_pool.php:131
 #: src/usr/local/www/status_lb_vs.php:64
 #: src/usr/local/www/vpn_openvpn_client.php:414
@@ -17034,7 +17140,7 @@ msgid "Servers"
 msgstr ""
 
 #: src/usr/local/www/load_balancer_pool.php:163
-#: src/usr/local/www/services_dhcp.php:683
+#: src/usr/local/www/services_dhcp.php:691
 msgid "Edit pool"
 msgstr ""
 
@@ -17043,7 +17149,7 @@ msgid "Copy pool"
 msgstr ""
 
 #: src/usr/local/www/load_balancer_pool.php:165
-#: src/usr/local/www/services_dhcp.php:685
+#: src/usr/local/www/services_dhcp.php:693
 msgid "Delete pool"
 msgstr ""
 
@@ -17409,7 +17515,7 @@ msgstr ""
 msgid "Advanced Features"
 msgstr ""
 
-#: src/usr/local/www/pkg_edit.php:721 src/usr/local/www/services_dhcp.php:758
+#: src/usr/local/www/pkg_edit.php:721 src/usr/local/www/services_dhcp.php:760
 msgid "General Options"
 msgstr ""
 
@@ -17450,12 +17556,12 @@ msgid "View more information"
 msgstr ""
 
 #: src/usr/local/www/pkg_mgr.php:129 src/usr/local/www/pkg_mgr.php:134
-#: src/usr/local/www/pkg_mgr_install.php:244
+#: src/usr/local/www/pkg_mgr_install.php:250
 #: src/usr/local/www/pkg_mgr_installed.php:208
 msgid "Available Packages"
 msgstr ""
 
-#: src/usr/local/www/pkg_mgr.php:133 src/usr/local/www/pkg_mgr_install.php:243
+#: src/usr/local/www/pkg_mgr.php:133 src/usr/local/www/pkg_mgr_install.php:249
 #: src/usr/local/www/pkg_mgr_installed.php:203
 #: src/usr/local/www/pkg_mgr_installed.php:207
 #: src/usr/local/www/pkg_mgr_installed.php:214
@@ -17492,184 +17598,191 @@ msgstr ""
 msgid "Unable to retrieve package information."
 msgstr ""
 
-#: src/usr/local/www/pkg_mgr_install.php:120
+#: src/usr/local/www/pkg_mgr_install.php:121
 msgid "Failed"
 msgstr ""
 
-#: src/usr/local/www/pkg_mgr_install.php:238
-#: src/usr/local/www/pkg_mgr_install.php:239
+#: src/usr/local/www/pkg_mgr_install.php:244
+#: src/usr/local/www/pkg_mgr_install.php:245
 #: src/usr/local/www/system_update_settings.php:116
 msgid "System Update"
 msgstr ""
 
-#: src/usr/local/www/pkg_mgr_install.php:240
+#: src/usr/local/www/pkg_mgr_install.php:246
 #: src/usr/local/www/system_update_settings.php:77
 #: src/usr/local/www/system_update_settings.php:117
 msgid "Update Settings"
 msgstr ""
 
-#: src/usr/local/www/pkg_mgr_install.php:242
-#: src/usr/local/www/pkg_mgr_install.php:245
+#: src/usr/local/www/pkg_mgr_install.php:248
+#: src/usr/local/www/pkg_mgr_install.php:251
 msgid "Package Installer"
 msgstr ""
 
-#: src/usr/local/www/pkg_mgr_install.php:268
+#: src/usr/local/www/pkg_mgr_install.php:274
 #, php-format
 msgid "Confirmation Required to reinstall package %s."
 msgstr ""
 
-#: src/usr/local/www/pkg_mgr_install.php:271
+#: src/usr/local/www/pkg_mgr_install.php:277
 #, php-format
 msgid "Confirmation Required to remove package %s."
 msgstr ""
 
-#: src/usr/local/www/pkg_mgr_install.php:275
+#: src/usr/local/www/pkg_mgr_install.php:281
 #, php-format
 msgid "Confirmation Required to install package %s."
 msgstr ""
 
-#: src/usr/local/www/pkg_mgr_install.php:285
+#: src/usr/local/www/pkg_mgr_install.php:291
 msgid "Confirmation Required to reinstall all packages."
 msgstr ""
 
-#: src/usr/local/www/pkg_mgr_install.php:289
+#: src/usr/local/www/pkg_mgr_install.php:295
 #, php-format
 msgid "Confirmation Required to upgrade package %1$s from %2$s to %3$s."
 msgstr ""
 
-#: src/usr/local/www/pkg_mgr_install.php:293
+#: src/usr/local/www/pkg_mgr_install.php:299
 #, php-format
 msgid "Confirmation Required to update %s system."
 msgstr ""
 
-#: src/usr/local/www/pkg_mgr_install.php:311
+#: src/usr/local/www/pkg_mgr_install.php:317
 msgid "Current Base System"
 msgstr ""
 
-#: src/usr/local/www/pkg_mgr_install.php:319
+#: src/usr/local/www/pkg_mgr_install.php:325
 msgid "Latest Base System"
 msgstr ""
 
-#: src/usr/local/www/pkg_mgr_install.php:327
+#: src/usr/local/www/pkg_mgr_install.php:333
 msgid "Retrieving"
 msgstr ""
 
-#: src/usr/local/www/pkg_mgr_install.php:358
+#: src/usr/local/www/pkg_mgr_install.php:364
 msgid "Unable to retrieve system versions."
 msgstr ""
 
-#: src/usr/local/www/pkg_mgr_install.php:371
+#: src/usr/local/www/pkg_mgr_install.php:377
 msgid "Updating System"
 msgstr ""
 
-#: src/usr/local/www/pkg_mgr_install.php:372
+#: src/usr/local/www/pkg_mgr_install.php:378
 msgid "System update successfully completed."
 msgstr ""
 
-#: src/usr/local/www/pkg_mgr_install.php:373
+#: src/usr/local/www/pkg_mgr_install.php:379
 msgid "System update failed!"
 msgstr ""
 
-#: src/usr/local/www/pkg_mgr_install.php:374
+#: src/usr/local/www/pkg_mgr_install.php:380
 msgid "Please wait while the system update completes."
 msgstr ""
 
-#: src/usr/local/www/pkg_mgr_install.php:376
+#: src/usr/local/www/pkg_mgr_install.php:382
 msgid "Package Removal"
 msgstr ""
 
-#: src/usr/local/www/pkg_mgr_install.php:377
+#: src/usr/local/www/pkg_mgr_install.php:383
 #, php-format
 msgid "<b>%1$s</b> removal successfully completed."
 msgstr ""
 
-#: src/usr/local/www/pkg_mgr_install.php:378
+#: src/usr/local/www/pkg_mgr_install.php:384
 #, php-format
 msgid "<b>%1$s</b> removal failed!"
 msgstr ""
 
-#: src/usr/local/www/pkg_mgr_install.php:379
+#: src/usr/local/www/pkg_mgr_install.php:385
 #, php-format
 msgid "Please wait while the removal of <b>%1$s</b> completes."
 msgstr ""
 
-#: src/usr/local/www/pkg_mgr_install.php:381
+#: src/usr/local/www/pkg_mgr_install.php:387
 msgid "Packages Reinstallation"
 msgstr ""
 
-#: src/usr/local/www/pkg_mgr_install.php:382
+#: src/usr/local/www/pkg_mgr_install.php:388
 msgid "All packages reinstallation successfully completed."
 msgstr ""
 
-#: src/usr/local/www/pkg_mgr_install.php:383
+#: src/usr/local/www/pkg_mgr_install.php:389
 msgid "All packages reinstallation failed!"
 msgstr ""
 
-#: src/usr/local/www/pkg_mgr_install.php:384
-#: src/usr/local/www/pkg_mgr_install.php:545
+#: src/usr/local/www/pkg_mgr_install.php:390
+#: src/usr/local/www/pkg_mgr_install.php:555
 msgid "Please wait while the reinstallation of all packages completes."
 msgstr ""
 
-#: src/usr/local/www/pkg_mgr_install.php:386
+#: src/usr/local/www/pkg_mgr_install.php:392
 msgid "Package Reinstallation"
 msgstr ""
 
-#: src/usr/local/www/pkg_mgr_install.php:387
+#: src/usr/local/www/pkg_mgr_install.php:393
 #, php-format
 msgid "<b>%1$s</b> reinstallation successfully completed."
 msgstr ""
 
-#: src/usr/local/www/pkg_mgr_install.php:388
+#: src/usr/local/www/pkg_mgr_install.php:394
 #, php-format
 msgid "<b>%1$s</b> reinstallation failed!"
 msgstr ""
 
-#: src/usr/local/www/pkg_mgr_install.php:389
+#: src/usr/local/www/pkg_mgr_install.php:395
 #, php-format
 msgid "Please wait while the reinstallation of <b>%1$s</b> completes."
 msgstr ""
 
-#: src/usr/local/www/pkg_mgr_install.php:391
+#: src/usr/local/www/pkg_mgr_install.php:397
 msgid "Package Installation"
 msgstr ""
 
-#: src/usr/local/www/pkg_mgr_install.php:392
+#: src/usr/local/www/pkg_mgr_install.php:398
 #, php-format
 msgid "<b>%1$s</b> installation successfully completed."
 msgstr ""
 
-#: src/usr/local/www/pkg_mgr_install.php:393
+#: src/usr/local/www/pkg_mgr_install.php:399
 #, php-format
 msgid "<b>%1$s</b> installation failed!"
 msgstr ""
 
-#: src/usr/local/www/pkg_mgr_install.php:394
+#: src/usr/local/www/pkg_mgr_install.php:400
 #, php-format
 msgid "Please wait while the installation of <b>%1$s</b> completes."
 msgstr ""
 
-#: src/usr/local/www/pkg_mgr_install.php:437
+#: src/usr/local/www/pkg_mgr_install.php:429
+msgid "Please wait while the update system initializes"
+msgstr ""
+
+#: src/usr/local/www/pkg_mgr_install.php:443
 msgid "Creating restore point before package installation."
 msgstr ""
 
-#: src/usr/local/www/pkg_mgr_install.php:473
+#: src/usr/local/www/pkg_mgr_install.php:483
 msgid "Up to date."
 msgstr ""
 
-#: src/usr/local/www/pkg_mgr_install.php:474
+#: src/usr/local/www/pkg_mgr_install.php:484
 msgid "Confirm Update"
 msgstr ""
 
-#: src/usr/local/www/pkg_mgr_install.php:520
+#: src/usr/local/www/pkg_mgr_install.php:530
 msgid "Reinstallation of all packages successfully completed."
 msgstr ""
 
-#: src/usr/local/www/pkg_mgr_install.php:533
+#: src/usr/local/www/pkg_mgr_install.php:543
 msgid "Reinstallation of all packages failed."
 msgstr ""
 
-#: src/usr/local/www/pkg_mgr_install.php:543
-#: src/usr/local/www/pkg_mgr_install.php:546
+#: src/usr/local/www/pkg_mgr_install.php:553
+msgid "This may take several minutes. Do not leave or refresh the page!"
+msgstr ""
+
+#: src/usr/local/www/pkg_mgr_install.php:556
 msgid "This may take several minutes!"
 msgstr ""
 
@@ -17734,6 +17847,18 @@ msgstr ""
 msgid "There are no packages currently installed."
 msgstr ""
 
+#: src/usr/local/www/services_captiveportal.php:64
+#: src/usr/local/www/services_captiveportal.php:520
+#: src/usr/local/www/services_captiveportal_filemanager.php:138
+#: src/usr/local/www/services_captiveportal_hostname.php:106
+#: src/usr/local/www/services_captiveportal_ip.php:100
+#: src/usr/local/www/services_captiveportal_mac.php:164
+#: src/usr/local/www/services_captiveportal_vouchers.php:374
+#: src/usr/local/www/vpn_l2tp.php:173 src/usr/local/www/vpn_l2tp.php:186
+#: src/usr/local/www/vpn_l2tp.php:210 src/usr/local/www/vpn_l2tp_users.php:84
+msgid "Configuration"
+msgstr ""
+
 #: src/usr/local/www/services_captiveportal.php:84
 #, php-format
 msgid "Captive Portal: zone %s: Restore default portal page"
@@ -17749,99 +17874,99 @@ msgstr ""
 msgid "Captive Portal: zone %s: Restore default logout page"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:214
+#: src/usr/local/www/services_captiveportal.php:215
 #: src/usr/local/www/services_captiveportal_zones_edit.php:49
 #: src/usr/local/www/services_captiveportal_zones_edit.php:89
 msgid "Zone name"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:218
+#: src/usr/local/www/services_captiveportal.php:219
 msgid "RADIUS Protocol"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:220
+#: src/usr/local/www/services_captiveportal.php:221
 msgid "Primary RADIUS server IP address"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:229
+#: src/usr/local/www/services_captiveportal.php:230
 #, php-format
 msgid ""
 "The captive portal cannot be used on interface %s since it is part of a "
 "bridge."
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:234
+#: src/usr/local/www/services_captiveportal.php:235
 #, php-format
 msgid ""
 "The captive portal cannot be used on interface %s since it is used already "
 "on %s instance."
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:243
+#: src/usr/local/www/services_captiveportal.php:244
 msgid "Certificate must be specified for HTTPS login."
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:246
+#: src/usr/local/www/services_captiveportal.php:247
 msgid "The HTTPS server name must be specified for HTTPS login."
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:253
+#: src/usr/local/www/services_captiveportal.php:254
 msgid "The timeout must be at least 1 minute."
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:269
+#: src/usr/local/www/services_captiveportal.php:270
 msgid ""
 "Hard timeout must be less than or equal to the Default lease time set on "
 "DHCP Server"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:276
+#: src/usr/local/www/services_captiveportal.php:277
 msgid "The idle timeout must be at least 1 minute."
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:280
+#: src/usr/local/www/services_captiveportal.php:281
 msgid "The pass-through credit count must be a number or left blank."
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:283
+#: src/usr/local/www/services_captiveportal.php:284
 msgid ""
 "The waiting period to restore pass-through credits must be above 0 hours."
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:288
-#: src/usr/local/www/services_captiveportal.php:292
-#: src/usr/local/www/services_captiveportal.php:296
-#: src/usr/local/www/services_captiveportal.php:300
+#: src/usr/local/www/services_captiveportal.php:289
+#: src/usr/local/www/services_captiveportal.php:293
+#: src/usr/local/www/services_captiveportal.php:297
+#: src/usr/local/www/services_captiveportal.php:301
 #: src/usr/local/www/services_captiveportal_ip_edit.php:101
 #, php-format
 msgid "A valid IP address must be specified. [%s]"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:304
-#: src/usr/local/www/services_captiveportal.php:308
-#: src/usr/local/www/services_captiveportal.php:312
-#: src/usr/local/www/services_captiveportal.php:316
-#: src/usr/local/www/services_captiveportal.php:320
+#: src/usr/local/www/services_captiveportal.php:305
+#: src/usr/local/www/services_captiveportal.php:309
+#: src/usr/local/www/services_captiveportal.php:313
+#: src/usr/local/www/services_captiveportal.php:317
+#: src/usr/local/www/services_captiveportal.php:321
 #, php-format
 msgid "A valid port number must be specified. [%s]"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:324
+#: src/usr/local/www/services_captiveportal.php:325
 msgid ""
 "The maximum number of concurrent connections per client IP address may not "
 "be larger than the global maximum."
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:328
+#: src/usr/local/www/services_captiveportal.php:329
 msgid ""
 "The NAS-Identifier must be 3-253 characters long and should only contain "
 "ASCII characters."
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:531
+#: src/usr/local/www/services_captiveportal.php:521
 #: src/usr/local/www/services_captiveportal_filemanager.php:139
-#: src/usr/local/www/services_captiveportal_hostname.php:106
-#: src/usr/local/www/services_captiveportal_ip.php:100
+#: src/usr/local/www/services_captiveportal_hostname.php:107
+#: src/usr/local/www/services_captiveportal_ip.php:101
 #: src/usr/local/www/services_captiveportal_mac.php:59
 #: src/usr/local/www/services_captiveportal_mac.php:165
 #: src/usr/local/www/services_captiveportal_mac_edit.php:69
@@ -17849,64 +17974,64 @@ msgstr ""
 msgid "MACs"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:532
+#: src/usr/local/www/services_captiveportal.php:522
 #: src/usr/local/www/services_captiveportal_filemanager.php:140
-#: src/usr/local/www/services_captiveportal_hostname.php:107
+#: src/usr/local/www/services_captiveportal_hostname.php:108
 #: src/usr/local/www/services_captiveportal_ip.php:62
-#: src/usr/local/www/services_captiveportal_ip.php:101
+#: src/usr/local/www/services_captiveportal_ip.php:102
 #: src/usr/local/www/services_captiveportal_ip_edit.php:66
 #: src/usr/local/www/services_captiveportal_mac.php:166
 #: src/usr/local/www/services_captiveportal_vouchers.php:376
 msgid "Allowed IP Addresses"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:533
+#: src/usr/local/www/services_captiveportal.php:523
 #: src/usr/local/www/services_captiveportal_filemanager.php:141
 #: src/usr/local/www/services_captiveportal_hostname.php:62
-#: src/usr/local/www/services_captiveportal_hostname.php:108
+#: src/usr/local/www/services_captiveportal_hostname.php:109
 #: src/usr/local/www/services_captiveportal_hostname_edit.php:64
-#: src/usr/local/www/services_captiveportal_ip.php:102
+#: src/usr/local/www/services_captiveportal_ip.php:103
 #: src/usr/local/www/services_captiveportal_mac.php:167
 #: src/usr/local/www/services_captiveportal_vouchers.php:377
 msgid "Allowed Hostnames"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:534
+#: src/usr/local/www/services_captiveportal.php:524
 #: src/usr/local/www/services_captiveportal_filemanager.php:142
-#: src/usr/local/www/services_captiveportal_hostname.php:109
-#: src/usr/local/www/services_captiveportal_ip.php:103
+#: src/usr/local/www/services_captiveportal_hostname.php:110
+#: src/usr/local/www/services_captiveportal_ip.php:104
 #: src/usr/local/www/services_captiveportal_mac.php:168
 #: src/usr/local/www/services_captiveportal_vouchers.php:78
 #: src/usr/local/www/services_captiveportal_vouchers.php:378
 #: src/usr/local/www/services_captiveportal_vouchers_edit.php:53
-#: src/usr/local/www/status_captiveportal_expire.php:81
-#: src/usr/local/www/status_captiveportal_test.php:89
+#: src/usr/local/www/status_captiveportal_expire.php:85
+#: src/usr/local/www/status_captiveportal_test.php:93
 msgid "Vouchers"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:535
+#: src/usr/local/www/services_captiveportal.php:525
 #: src/usr/local/www/services_captiveportal_filemanager.php:67
 #: src/usr/local/www/services_captiveportal_filemanager.php:143
-#: src/usr/local/www/services_captiveportal_hostname.php:110
-#: src/usr/local/www/services_captiveportal_ip.php:104
+#: src/usr/local/www/services_captiveportal_hostname.php:111
+#: src/usr/local/www/services_captiveportal_ip.php:105
 #: src/usr/local/www/services_captiveportal_mac.php:169
 #: src/usr/local/www/services_captiveportal_vouchers.php:379
 msgid "File Manager"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:541
+#: src/usr/local/www/services_captiveportal.php:531
 msgid "Captive Portal Configuration"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:556
+#: src/usr/local/www/services_captiveportal.php:546
 msgid "Select the interface(s) to enable for captive portal."
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:560
+#: src/usr/local/www/services_captiveportal.php:550
 msgid "Maximum concurrent connections"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:564
+#: src/usr/local/www/services_captiveportal.php:554
 msgid ""
 "Limits the number of concurrent connections to the captive portal HTTP(S) "
 "server. This does not set how many users can be logged in to the captive "
@@ -17914,32 +18039,32 @@ msgid ""
 "portal web server."
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:569
+#: src/usr/local/www/services_captiveportal.php:559
 msgid "Idle timeout (Minutes)"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:572
+#: src/usr/local/www/services_captiveportal.php:562
 msgid ""
 "Clients will be disconnected after this amount of inactivity. They may log "
 "in again immediately, though. Leave this field blank for no idle timeout."
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:576
+#: src/usr/local/www/services_captiveportal.php:566
 msgid "Hard timeout (Minutes)"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:579
+#: src/usr/local/www/services_captiveportal.php:569
 msgid ""
 "Clients will be disconnected after this amount of time, regardless of "
 "activity. They may log in again immediately, though. Leave this field blank "
 "for no hard timeout (not recommended unless an idle timeout is set)."
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:584
+#: src/usr/local/www/services_captiveportal.php:574
 msgid "Pass-through credits per MAC address."
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:587
+#: src/usr/local/www/services_captiveportal.php:577
 msgid ""
 "Allows passing through the captive portal without authentication a limited "
 "number of times per MAC address. Once used up, the client can only log in "
@@ -17948,83 +18073,83 @@ msgid ""
 "to be effective."
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:593
+#: src/usr/local/www/services_captiveportal.php:583
 msgid "Waiting period to restore pass-through credits. (Hours)"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:596
+#: src/usr/local/www/services_captiveportal.php:586
 msgid ""
 "Clients will have their available pass-through credits restored to the "
 "original count after this amount of time since using the first one. This "
 "must be above 0 hours if pass-through credits are enabled."
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:601
+#: src/usr/local/www/services_captiveportal.php:591
 msgid "Reset waiting period"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:604
+#: src/usr/local/www/services_captiveportal.php:594
 msgid ""
 "If enabled, the waiting period is reset to the original duration if access "
 "is attempted when all pass-through credits have already been exhausted."
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:608
+#: src/usr/local/www/services_captiveportal.php:598
 msgid "Logout popup window"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:611
+#: src/usr/local/www/services_captiveportal.php:601
 msgid ""
 "If enabled, a popup window will appear when clients are allowed through the "
 "captive portal. This allows clients to explicitly disconnect themselves "
 "before the idle or hard timeout occurs."
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:616
+#: src/usr/local/www/services_captiveportal.php:606
 msgid "Pre-authentication redirect URL"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:619
+#: src/usr/local/www/services_captiveportal.php:609
 msgid ""
 "Use this field to set $PORTAL_REDIRURL$ variable which can be accessed using "
 "the custom captive portal index.php page or error pages."
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:623
+#: src/usr/local/www/services_captiveportal.php:613
 msgid "After authentication Redirection URL"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:626
+#: src/usr/local/www/services_captiveportal.php:616
 msgid ""
 "Clients will be redirected to this URL instead of the one they initially "
 "tried to access after they've authenticated."
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:630
+#: src/usr/local/www/services_captiveportal.php:620
 msgid "Blocked MAC address redirect URL"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:633
+#: src/usr/local/www/services_captiveportal.php:623
 msgid ""
 "Blocked MAC addresses will be redirected to this URL when attempting access."
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:637
+#: src/usr/local/www/services_captiveportal.php:627
 msgid "Concurrent user logins"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:640
+#: src/usr/local/www/services_captiveportal.php:630
 msgid ""
 "If enabled only the most recent login per username will be active. "
 "Subsequent logins will cause machines previously logged in with the same "
 "username to be disconnected."
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:645
+#: src/usr/local/www/services_captiveportal.php:635
 msgid "MAC filtering"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:648
+#: src/usr/local/www/services_captiveportal.php:638
 msgid ""
 "If enabled no attempts will be made to ensure that the MAC address of "
 "clients stays the same while they are logged in. This is required when the "
@@ -18033,99 +18158,99 @@ msgid ""
 "authentication cannot be used."
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:654
+#: src/usr/local/www/services_captiveportal.php:644
 msgid "Pass-through MAC Auto Entry"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:673
+#: src/usr/local/www/services_captiveportal.php:663
 msgid "Per-user bandwidth restriction"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:680
+#: src/usr/local/www/services_captiveportal.php:670
 msgid "Default download (Kbit/s)"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:687
+#: src/usr/local/www/services_captiveportal.php:677
 msgid "Default upload (Kbit/s)"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:690
+#: src/usr/local/www/services_captiveportal.php:680
 msgid ""
 "If this option is set, the captive portal will restrict each user who logs "
 "in to the specified default bandwidth. RADIUS can override the default "
-"settings. Leave empty or set to 0 for no limit."
+"settings. Leave empty for no limit."
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:698
+#: src/usr/local/www/services_captiveportal.php:688
 msgid "Authentication method"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:733
+#: src/usr/local/www/services_captiveportal.php:723
 msgid "RADIUS protocol"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:772
+#: src/usr/local/www/services_captiveportal.php:762
 msgid "Primary Authentication Source"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:775
-#: src/usr/local/www/services_captiveportal.php:828
+#: src/usr/local/www/services_captiveportal.php:765
+#: src/usr/local/www/services_captiveportal.php:818
 msgid "Primary RADIUS server"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:799
-#: src/usr/local/www/services_captiveportal.php:852
+#: src/usr/local/www/services_captiveportal.php:789
+#: src/usr/local/www/services_captiveportal.php:842
 msgid "Secondary RADIUS server"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:805
-#: src/usr/local/www/services_captiveportal.php:858
+#: src/usr/local/www/services_captiveportal.php:795
+#: src/usr/local/www/services_captiveportal.php:848
 msgid "IP address of the RADIUS server to authenticate against."
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:812
-#: src/usr/local/www/services_captiveportal.php:865
+#: src/usr/local/www/services_captiveportal.php:802
+#: src/usr/local/www/services_captiveportal.php:855
 msgid "RADIUS port. Leave blank for default (1812)"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:819
-#: src/usr/local/www/services_captiveportal.php:872
+#: src/usr/local/www/services_captiveportal.php:809
+#: src/usr/local/www/services_captiveportal.php:862
 msgid ""
 "RADIUS shared secret. Leave blank to not use a shared secret (not "
 "recommended)"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:825
+#: src/usr/local/www/services_captiveportal.php:815
 msgid "Secondary Authentication Source"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:882
+#: src/usr/local/www/services_captiveportal.php:872
 #: src/usr/local/www/services_pppoe_edit.php:369
 #: src/usr/local/www/vpn_l2tp.php:277
 msgid "RADIUS"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:889
+#: src/usr/local/www/services_captiveportal.php:879
 msgid "Accounting Port"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:892
+#: src/usr/local/www/services_captiveportal.php:882
 msgid "Leave blank to use the default port (1813)."
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:894
+#: src/usr/local/www/services_captiveportal.php:884
 msgid "Accounting updates"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:932
+#: src/usr/local/www/services_captiveportal.php:922
 msgid "RADIUS Options"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:937
+#: src/usr/local/www/services_captiveportal.php:927
 msgid "Reauthentication"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:940
+#: src/usr/local/www/services_captiveportal.php:930
 msgid ""
 "If reauthentication is enabled, Access-Requests will be sent to the RADIUS "
 "server for each user that is logged in every minute. If an Access-Reject is "
@@ -18133,41 +18258,41 @@ msgid ""
 "immediately."
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:945
+#: src/usr/local/www/services_captiveportal.php:935
 msgid "RADIUS MAC Authentication"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:948
+#: src/usr/local/www/services_captiveportal.php:938
 msgid ""
 "If this option is enabled, the captive portal will try to authenticate users "
 "by sending their MAC address as the username and the password entered below "
 "to the RADIUS server."
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:953
+#: src/usr/local/www/services_captiveportal.php:943
 msgid "MAC authentication secret"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:960
+#: src/usr/local/www/services_captiveportal.php:950
 msgid "RADIUS NAS IP Attribute"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:963
+#: src/usr/local/www/services_captiveportal.php:953
 msgid "Choose the IP to use for calling station attribute."
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:967
+#: src/usr/local/www/services_captiveportal.php:957
 #: src/usr/local/www/system_usermanager_settings.php:182
 msgid "Session timeout"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:970
+#: src/usr/local/www/services_captiveportal.php:960
 msgid ""
 "When enabled, clients will be disconnected after the amount of time "
 "retrieved from the RADIUS Session-Timeout attribute."
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:977
+#: src/usr/local/www/services_captiveportal.php:967
 msgid ""
 "If RADIUS type is set to Cisco, in Access-Requests the value of Calling-"
 "Station-ID will be set to the client's IP address and the Called-Station-Id "
@@ -18175,39 +18300,51 @@ msgid ""
 "client's MAC address and Called-Station-ID = pfSense's WAN IP address."
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:983
+#: src/usr/local/www/services_captiveportal.php:973
 msgid "Accounting style"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:986
+#: src/usr/local/www/services_captiveportal.php:976
 msgid ""
 "When enabled, data counts for RADIUS accounting packets will be taken from "
 "the client perspective, not the NAS. Acct-Input-Octets will represent "
 "download, and Acct-Output-Octets will represent upload."
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:991
+#: src/usr/local/www/services_captiveportal.php:981
+msgid "Idle time accounting"
+msgstr ""
+
+#: src/usr/local/www/services_captiveportal.php:984
+msgid ""
+"When enabled, if a client is disconnected for exceeding the idle timeout the "
+"time spent idle is included in the total session time. Otherwise the session "
+"time reported to the RADIUS server is the time between when the session "
+"started and when the last activity was recorded."
+msgstr ""
+
+#: src/usr/local/www/services_captiveportal.php:990
 msgid "NAS Identifier"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:994
+#: src/usr/local/www/services_captiveportal.php:993
 msgid ""
 "Specify a NAS identifier to override the default value (pfSense.localdomain)"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:1000
+#: src/usr/local/www/services_captiveportal.php:999
 msgid "Single dash"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:1000
+#: src/usr/local/www/services_captiveportal.php:999
 msgid "Unformatted"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:998
+#: src/usr/local/www/services_captiveportal.php:997
 msgid "MAC address format"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:1001
+#: src/usr/local/www/services_captiveportal.php:1000
 msgid ""
 "This option changes the MAC address format used in the whole RADIUS system. "
 "Change this if the username format also needs to be changed for RADIUS MAC "
@@ -18216,18 +18353,18 @@ msgid ""
 ">Unformatted: 001122334455"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:1019
+#: src/usr/local/www/services_captiveportal.php:1018
 msgid ""
 "When enabled, the username and password will be transmitted over an HTTPS "
 "connection to protect against eavesdroppers. A server name and certificate "
 "must also be specified below."
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:1024
+#: src/usr/local/www/services_captiveportal.php:1023
 msgid "HTTPS server name"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:1027
+#: src/usr/local/www/services_captiveportal.php:1026
 msgid ""
 "This name will be used in the form action for the HTTPS POST and should "
 "match the Common Name (CN) in the certificate (otherwise, the client browser "
@@ -18236,22 +18373,22 @@ msgid ""
 "resolves to the correct interface IP on pfSense."
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:1033
+#: src/usr/local/www/services_captiveportal.php:1032
 #: src/usr/local/www/system_advanced_admin.php:337
 msgid "SSL Certificate"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:1036
+#: src/usr/local/www/services_captiveportal.php:1035
 msgid ""
 "If no certificates are defined, one may be defined here: <a href="
 "\"system_certmanager.php\">System &gt; Cert. Manager</a>"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:1040
+#: src/usr/local/www/services_captiveportal.php:1039
 msgid "HTTPS Forwards"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:1043
+#: src/usr/local/www/services_captiveportal.php:1042
 msgid ""
 "If this option is set, attempts to connect to SSL/HTTPS (Port 443) sites "
 "will not be forwarded to the captive portalThis prevents certificate errors "
@@ -18261,15 +18398,15 @@ msgid ""
 "the HTTPS login page."
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:1050
+#: src/usr/local/www/services_captiveportal.php:1049
 msgid "HTML Page Contents"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:1055
+#: src/usr/local/www/services_captiveportal.php:1054
 msgid "Portal page contents"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:1058
+#: src/usr/local/www/services_captiveportal.php:1057
 msgid ""
 "Upload an HTML/PHP file for the portal page here (leave blank to keep the "
 "current one). Make sure to include a form (POST to \"$PORTAL_ACTION$\") with "
@@ -18293,21 +18430,21 @@ msgid ""
 "\t\t\t &lt;/form&gt;"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:1082
+#: src/usr/local/www/services_captiveportal.php:1081
 msgid "Current Portal Page"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:1099
-#: src/usr/local/www/services_captiveportal.php:1133
-#: src/usr/local/www/services_captiveportal.php:1165
+#: src/usr/local/www/services_captiveportal.php:1098
+#: src/usr/local/www/services_captiveportal.php:1132
+#: src/usr/local/www/services_captiveportal.php:1164
 msgid "Restore Default Page"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:1108
+#: src/usr/local/www/services_captiveportal.php:1107
 msgid "Auth error page contents"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:1111
+#: src/usr/local/www/services_captiveportal.php:1110
 msgid ""
 "The contents of the HTML/PHP file that is uploaded here are displayed when "
 "an authentication error occurs. It may include \"$PORTAL_MESSAGE$\", which "
@@ -18315,25 +18452,25 @@ msgid ""
 "any."
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:1116
+#: src/usr/local/www/services_captiveportal.php:1115
 msgid "Current Auth Error Page"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:1142
+#: src/usr/local/www/services_captiveportal.php:1141
 msgid "Logout page contents"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:1145
+#: src/usr/local/www/services_captiveportal.php:1144
 msgid ""
 "The contents of the HTML/PHP file that is uploaded here are displayed on "
 "authentication success when the logout popup is enabled."
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:1148
+#: src/usr/local/www/services_captiveportal.php:1147
 msgid "Current Logout Page"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:1181
+#: src/usr/local/www/services_captiveportal.php:1180
 msgid ""
 "Don't forget to enable the DHCP server on the captive portal interface! Make "
 "sure that the default/maximum DHCP lease time is higher than the hard "
@@ -18413,26 +18550,26 @@ msgid ""
 "to always allow pass-through access from a client behind the captive portal."
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal_hostname.php:137
+#: src/usr/local/www/services_captiveportal_hostname.php:138
 msgid "Edit hostname"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal_hostname.php:138
+#: src/usr/local/www/services_captiveportal_hostname.php:139
 msgid "Delete hostname"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal_hostname.php:146
+#: src/usr/local/www/services_captiveportal_hostname.php:147
 #, php-format
 msgid "All connections %sto%s the hostname are allowed"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal_hostname.php:147
+#: src/usr/local/www/services_captiveportal_hostname.php:148
 #, php-format
 msgid "All connections %sfrom%s the hostname are allowed"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal_hostname.php:148
-#: src/usr/local/www/services_captiveportal_ip.php:145
+#: src/usr/local/www/services_captiveportal_hostname.php:149
+#: src/usr/local/www/services_captiveportal_ip.php:146
 #, php-format
 msgid "All connections %sto or from%s are allowed"
 msgstr ""
@@ -18475,7 +18612,7 @@ msgid ""
 msgstr ""
 
 #: src/usr/local/www/services_captiveportal_hostname_edit.php:198
-#: src/usr/local/www/services_captiveportal_ip_edit.php:241
+#: src/usr/local/www/services_captiveportal_ip_edit.php:244
 #: src/usr/local/www/services_captiveportal_mac_edit.php:239
 msgid "Bandwidth up"
 msgstr ""
@@ -18485,7 +18622,7 @@ msgid "Enter a upload limit to be enforced on this Hostname in Kbit/s"
 msgstr ""
 
 #: src/usr/local/www/services_captiveportal_hostname_edit.php:205
-#: src/usr/local/www/services_captiveportal_ip_edit.php:248
+#: src/usr/local/www/services_captiveportal_ip_edit.php:251
 #: src/usr/local/www/services_captiveportal_mac_edit.php:246
 msgid "Bandwidth down"
 msgstr ""
@@ -18494,29 +18631,29 @@ msgstr ""
 msgid "Enter a download limit to be enforced on this Hostname in Kbit/s"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal_ip.php:112
+#: src/usr/local/www/services_captiveportal_ip.php:113
 msgid "IP Addresses"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal_ip.php:133
+#: src/usr/local/www/services_captiveportal_ip.php:134
 msgid "Edit IP"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal_ip.php:134
+#: src/usr/local/www/services_captiveportal_ip.php:135
 msgid "Delete IP"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal_ip.php:143
+#: src/usr/local/www/services_captiveportal_ip.php:144
 #, php-format
 msgid "All connections %sto%s the address are allowed"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal_ip.php:144
+#: src/usr/local/www/services_captiveportal_ip.php:145
 #, php-format
 msgid "All connections %sfrom%s the address are allowed"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal_ip.php:164
+#: src/usr/local/www/services_captiveportal_ip.php:165
 msgid ""
 "Adding allowed IP addresses will allow IP access to/from these addresses "
 "through the captive portal without being taken to the portal page. This can "
@@ -18529,8 +18666,8 @@ msgid "Allowed IP address"
 msgstr ""
 
 #: src/usr/local/www/services_captiveportal_ip_edit.php:96
-#: src/usr/local/www/services_dhcp.php:808
-#: src/usr/local/www/services_dhcp.php:836
+#: src/usr/local/www/services_dhcp.php:819
+#: src/usr/local/www/services_dhcp.php:847
 #: src/usr/local/www/services_pppoe_edit.php:342
 msgid "Subnet mask"
 msgstr ""
@@ -18553,26 +18690,26 @@ msgstr ""
 msgid "already allowed"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal_ip_edit.php:216
+#: src/usr/local/www/services_captiveportal_ip_edit.php:219
 msgid "Edit Captive Portal IP Rule"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal_ip_edit.php:229
+#: src/usr/local/www/services_captiveportal_ip_edit.php:232
 msgid "Enter a description here for reference only. (Not parsed)"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal_ip_edit.php:236
+#: src/usr/local/www/services_captiveportal_ip_edit.php:239
 msgid ""
 "Use \"From\" to always allow access to an address through the captive portal "
 "(without authentication). Use \"To\" to allow access from all clients (even "
 "non-authenticated ones) behind the portal to this IP."
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal_ip_edit.php:244
+#: src/usr/local/www/services_captiveportal_ip_edit.php:247
 msgid "Enter an upload limit to be enforced on this address in Kbit/s"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal_ip_edit.php:251
+#: src/usr/local/www/services_captiveportal_ip_edit.php:254
 msgid "Enter a download limit to be enforced on this address in Kbit/s"
 msgstr ""
 
@@ -18765,12 +18902,12 @@ msgstr ""
 
 #: src/usr/local/www/services_captiveportal_vouchers.php:385
 #: src/usr/local/www/services_captiveportal_vouchers_edit.php:184
-#: src/usr/local/www/status_captiveportal.php:109
-#: src/usr/local/www/status_captiveportal_expire.php:70
-#: src/usr/local/www/status_captiveportal_test.php:78
-#: src/usr/local/www/status_captiveportal_voucher_rolls.php:52
-#: src/usr/local/www/status_captiveportal_voucher_rolls.php:66
-#: src/usr/local/www/status_captiveportal_vouchers.php:102
+#: src/usr/local/www/status_captiveportal.php:114
+#: src/usr/local/www/status_captiveportal_expire.php:74
+#: src/usr/local/www/status_captiveportal_test.php:82
+#: src/usr/local/www/status_captiveportal_voucher_rolls.php:57
+#: src/usr/local/www/status_captiveportal_voucher_rolls.php:71
+#: src/usr/local/www/status_captiveportal_vouchers.php:107
 msgid "Voucher Rolls"
 msgstr ""
 
@@ -18780,18 +18917,18 @@ msgid "Roll #"
 msgstr ""
 
 #: src/usr/local/www/services_captiveportal_vouchers.php:392
-#: src/usr/local/www/status_captiveportal_voucher_rolls.php:77
+#: src/usr/local/www/status_captiveportal_voucher_rolls.php:82
 msgid "Minutes/Ticket"
 msgstr ""
 
 #: src/usr/local/www/services_captiveportal_vouchers.php:393
-#: src/usr/local/www/status_captiveportal_voucher_rolls.php:78
+#: src/usr/local/www/status_captiveportal_voucher_rolls.php:83
 msgid "# of Tickets"
 msgstr ""
 
 #: src/usr/local/www/services_captiveportal_vouchers.php:394
 #: src/usr/local/www/services_captiveportal_vouchers_edit.php:209
-#: src/usr/local/www/status_captiveportal_voucher_rolls.php:79
+#: src/usr/local/www/status_captiveportal_voucher_rolls.php:84
 msgid "Comment"
 msgstr ""
 
@@ -18957,8 +19094,8 @@ msgid "Generate new keys"
 msgstr ""
 
 #: src/usr/local/www/services_captiveportal_vouchers_edit.php:91
-#: src/usr/local/www/services_dhcp.php:1239
-#: src/usr/local/www/services_dhcpv6.php:911
+#: src/usr/local/www/services_dhcp.php:1268
+#: src/usr/local/www/services_dhcpv6.php:933
 msgid "Number"
 msgstr ""
 
@@ -19079,22 +19216,22 @@ msgstr ""
 #: src/usr/local/www/services_checkip.php:71
 #: src/usr/local/www/services_checkip.php:81
 #: src/usr/local/www/services_checkip_edit.php:106
-#: src/usr/local/www/services_dyndns.php:76
+#: src/usr/local/www/services_dyndns.php:77
 #: src/usr/local/www/services_rfc2136.php:64
 msgid "Check IP Services"
 msgstr ""
 
 #: src/usr/local/www/services_checkip.php:69
-#: src/usr/local/www/services_dyndns.php:66
-#: src/usr/local/www/services_dyndns.php:74
-#: src/usr/local/www/services_dyndns.php:81
-#: src/usr/local/www/services_dyndns_edit.php:239
+#: src/usr/local/www/services_dyndns.php:67
+#: src/usr/local/www/services_dyndns.php:75
+#: src/usr/local/www/services_dyndns.php:82
+#: src/usr/local/www/services_dyndns_edit.php:240
 #: src/usr/local/www/services_rfc2136.php:62
 msgid "Dynamic DNS Clients"
 msgstr ""
 
 #: src/usr/local/www/services_checkip.php:70
-#: src/usr/local/www/services_dyndns.php:75
+#: src/usr/local/www/services_dyndns.php:76
 #: src/usr/local/www/services_rfc2136.php:58
 #: src/usr/local/www/services_rfc2136.php:63
 #: src/usr/local/www/services_rfc2136_edit.php:148
@@ -19114,22 +19251,22 @@ msgid "Verify SSL Peer"
 msgstr ""
 
 #: src/usr/local/www/services_checkip.php:129
-#: src/usr/local/www/services_dyndns.php:186
+#: src/usr/local/www/services_dyndns.php:187
 msgid "Edit service"
 msgstr ""
 
 #: src/usr/local/www/services_checkip.php:132
-#: src/usr/local/www/services_dyndns.php:189
+#: src/usr/local/www/services_dyndns.php:190
 msgid "Disable service"
 msgstr ""
 
 #: src/usr/local/www/services_checkip.php:135
-#: src/usr/local/www/services_dyndns.php:192
+#: src/usr/local/www/services_dyndns.php:193
 msgid "Enable service"
 msgstr ""
 
 #: src/usr/local/www/services_checkip.php:138
-#: src/usr/local/www/services_dyndns.php:195
+#: src/usr/local/www/services_dyndns.php:196
 msgid "Delete service"
 msgstr ""
 
@@ -19166,404 +19303,404 @@ msgstr ""
 msgid "User name"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:236
-#: src/usr/local/www/services_dhcpv6.php:211
+#: src/usr/local/www/services_dhcp.php:239
+#: src/usr/local/www/services_dhcpv6.php:214
 msgid "Range begin"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:236
-#: src/usr/local/www/services_dhcpv6.php:211
+#: src/usr/local/www/services_dhcp.php:239
+#: src/usr/local/www/services_dhcpv6.php:214
 msgid "Range end"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:241
+#: src/usr/local/www/services_dhcp.php:245
 msgid ""
 "Ignore Denied Clients may not be used when a Failover Peer IP is defined."
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:245
-#: src/usr/local/www/services_dhcp.php:248
-#: src/usr/local/www/services_dhcpv6.php:249
-#: src/usr/local/www/services_dhcpv6.php:259
-msgid "A valid range must be specified."
+#: src/usr/local/www/services_dhcp.php:249
+msgid "A valid IPv4 address must be specified for range from."
+msgstr ""
+
+#: src/usr/local/www/services_dhcp.php:252
+msgid "A valid IPv4 address must be specified for range to."
+msgstr ""
+
+#: src/usr/local/www/services_dhcp.php:255
+#: src/usr/local/www/services_dhcpv6.php:278
+msgid "Range From and Range To must both be entered."
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:251
-#: src/usr/local/www/services_dhcp_edit.php:235
+#: src/usr/local/www/services_dhcp.php:258
 msgid "A valid IP address must be specified for the gateway."
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:254
-#: src/usr/local/www/services_dhcp_edit.php:238
+#: src/usr/local/www/services_dhcp.php:261
 msgid ""
 "A valid IP address must be specified for the primary/secondary WINS servers."
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:260
-#: src/usr/local/www/services_dhcp_edit.php:245
+#: src/usr/local/www/services_dhcp.php:267
+#: src/usr/local/www/services_dhcp_edit.php:247
 #, php-format
 msgid ""
 "The gateway address %s does not lie within the chosen interface's subnet."
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:265
-#: src/usr/local/www/services_dhcp_edit.php:252
+#: src/usr/local/www/services_dhcp.php:272
 msgid "A valid IP address must be specified for each of the DNS servers."
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:269
-#: src/usr/local/www/services_dhcp_edit.php:256
-#: src/usr/local/www/services_dhcpv6.php:278
+#: src/usr/local/www/services_dhcp.php:276
+#: src/usr/local/www/services_dhcp_edit.php:258
+#: src/usr/local/www/services_dhcpv6.php:291
 msgid "The default lease time must be at least 60 seconds."
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:291
+#: src/usr/local/www/services_dhcp.php:298
 #, php-format
 msgid ""
 "The Captive Portal zone (%1$s) has Hard Timeout parameter set to a value "
 "bigger than Default lease time (%2$s)."
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:297
-#: src/usr/local/www/services_dhcp_edit.php:259
-#: src/usr/local/www/services_dhcpv6.php:281
+#: src/usr/local/www/services_dhcp.php:304
+#: src/usr/local/www/services_dhcp_edit.php:261
+#: src/usr/local/www/services_dhcpv6.php:294
 msgid ""
 "The maximum lease time must be at least 60 seconds and higher than the "
 "default lease time."
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:300
-#: src/usr/local/www/services_dhcp_edit.php:262
-#: src/usr/local/www/services_dhcpv6.php:284
+#: src/usr/local/www/services_dhcp.php:307
+#: src/usr/local/www/services_dhcp_edit.php:264
+#: src/usr/local/www/services_dhcpv6.php:297
 msgid "A valid domain name must be specified for the dynamic DNS registration."
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:303
-#: src/usr/local/www/services_dhcp_edit.php:265
+#: src/usr/local/www/services_dhcp.php:310
 msgid ""
 "A valid primary domain name server IP address must be specified for the "
 "dynamic domain name."
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:307
-#: src/usr/local/www/services_dhcp_edit.php:269
-#: src/usr/local/www/services_dhcpv6.php:291
+#: src/usr/local/www/services_dhcp.php:314
+#: src/usr/local/www/services_dhcp_edit.php:271
+#: src/usr/local/www/services_dhcpv6.php:304
 msgid "Both a valid domain key and key name must be specified."
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:313
-#: src/usr/local/www/services_dhcp_edit.php:275
-#: src/usr/local/www/services_dhcpv6.php:297
+#: src/usr/local/www/services_dhcp.php:320
+#: src/usr/local/www/services_dhcp_edit.php:277
+#: src/usr/local/www/services_dhcpv6.php:310
 #: src/usr/local/www/services_router_advertisements.php:161
 msgid "A valid domain search list must be specified."
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:321
+#: src/usr/local/www/services_dhcp.php:328
 msgid ""
 "If a mac allow list is specified, it must contain only valid partial MAC "
 "addresses."
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:324
+#: src/usr/local/www/services_dhcp.php:331
 msgid ""
 "If a mac deny list is specified, it must contain only valid partial MAC "
 "addresses."
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:328
+#: src/usr/local/www/services_dhcp.php:335
 msgid ""
 "A valid IP address or hostname must be specified for the primary/secondary "
 "NTP servers."
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:331
-#: src/usr/local/www/services_dhcpv6.php:307
+#: src/usr/local/www/services_dhcp.php:338
+#: src/usr/local/www/services_dhcpv6.php:320
 msgid "A valid domain name must be specified for the DNS domain."
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:334
-#: src/usr/local/www/services_dhcp_edit.php:285
+#: src/usr/local/www/services_dhcp.php:341
 msgid ""
 "A valid IP address, hostname or URL must be specified for the TFTP server."
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:337
-#: src/usr/local/www/services_dhcp_edit.php:288
+#: src/usr/local/www/services_dhcp.php:344
 msgid "A valid IP address must be specified for the network boot server."
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:341
+#: src/usr/local/www/services_dhcp.php:348
 msgid "The network address cannot be used in the starting subnet range."
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:344
+#: src/usr/local/www/services_dhcp.php:351
 msgid "The broadcast address cannot be used in the ending subnet range."
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:352
+#: src/usr/local/www/services_dhcp.php:359
 #, php-format
 msgid "The subnet range cannot overlap with virtual IP address %s."
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:368
+#: src/usr/local/www/services_dhcp.php:375
 msgid ""
 "Cannot enable static ARP when there are static map entries without IP "
 "addresses. Ensure all static maps have IP addresses and try again."
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:375
+#: src/usr/local/www/services_dhcp.php:382
 msgid "Text type cannot include quotation marks."
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:377
+#: src/usr/local/www/services_dhcp.php:384
 msgid ""
 "String type must be enclosed in quotes like \"this\" or must be a series of "
 "octets specified in hexadecimal, separated by colons, like 01:23:45:67:89:ab:"
 "cd:ef"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:379
+#: src/usr/local/www/services_dhcp.php:386
 msgid "Boolean type must be true, false, on, or off."
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:381
+#: src/usr/local/www/services_dhcp.php:388
 msgid "Unsigned 8-bit integer type must be a number in the range 0 to 255."
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:383
+#: src/usr/local/www/services_dhcp.php:390
 msgid "Unsigned 16-bit integer type must be a number in the range 0 to 65535."
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:385
+#: src/usr/local/www/services_dhcp.php:392
 msgid ""
 "Unsigned 32-bit integer type must be a number in the range 0 to 4294967295."
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:387
+#: src/usr/local/www/services_dhcp.php:394
 msgid "Signed 8-bit integer type must be a number in the range -128 to 127."
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:389
+#: src/usr/local/www/services_dhcp.php:396
 msgid ""
 "Signed 16-bit integer type must be a number in the range -32768 to 32767."
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:391
+#: src/usr/local/www/services_dhcp.php:398
 msgid ""
 "Signed 32-bit integer type must be a number in the range -2147483648 to "
 "2147483647."
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:393
+#: src/usr/local/www/services_dhcp.php:400
 msgid "IP address or host type must be an IP address or host name."
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:401
-#: src/usr/local/www/services_dhcpv6.php:348
+#: src/usr/local/www/services_dhcp.php:407
+#: src/usr/local/www/services_dhcpv6.php:351
+#, php-format
+msgid ""
+"The DHCP relay on the %s interface must be disabled before enabling the DHCP "
+"server."
+msgstr ""
+
+#: src/usr/local/www/services_dhcp.php:414
+#: src/usr/local/www/services_dhcpv6.php:368
 msgid "The range is invalid (first element higher than second element)."
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:406
-#: src/usr/local/www/services_dhcpv6.php:343
+#: src/usr/local/www/services_dhcp.php:419
+#: src/usr/local/www/services_dhcpv6.php:363
 msgid "The specified range lies outside of the current subnet."
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:416
+#: src/usr/local/www/services_dhcp.php:429
 msgid ""
 "The specified range must not be within the DHCP range for this interface."
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:429
+#: src/usr/local/www/services_dhcp.php:442
 msgid ""
 "The specified range must not be within the range configured on a DHCP pool "
 "for this interface."
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:436
-#: src/usr/local/www/services_dhcpv6.php:353
-#, php-format
-msgid ""
-"The DHCP relay on the %s interface must be disabled before enabling the DHCP "
-"server."
-msgstr ""
-
-#: src/usr/local/www/services_dhcp.php:445
-#: src/usr/local/www/services_dhcpv6.php:370
+#: src/usr/local/www/services_dhcp.php:453
+#: src/usr/local/www/services_dhcpv6.php:384
 #, php-format
 msgid "The DHCP range cannot overlap any static DHCP mappings."
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:661
-#: src/usr/local/www/status_dhcp_leases.php:465
+#: src/usr/local/www/services_dhcp.php:669
+#: src/usr/local/www/status_dhcp_leases.php:498
 msgid "Pool Start"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:662
-#: src/usr/local/www/status_dhcp_leases.php:466
+#: src/usr/local/www/services_dhcp.php:670
+#: src/usr/local/www/status_dhcp_leases.php:499
 msgid "Pool End"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:717
-msgid ""
-"DHCP Relay is currently enabled. Cannot enable the DHCP Server service while "
-"the DHCP Relay is enabled on any interface."
-msgstr ""
-
-#: src/usr/local/www/services_dhcp.php:723
-#: src/usr/local/www/services_dhcpv6.php:490
+#: src/usr/local/www/services_dhcp.php:725
+#: src/usr/local/www/services_dhcpv6.php:500
 msgid "The static mapping configuration has been changed."
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:749
+#: src/usr/local/www/services_dhcp.php:751
 msgid ""
 "The DHCP Server can only be enabled on interfaces configured with a static "
 "IPv4 address. This system has none."
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:764
+#: src/usr/local/www/services_dhcp.php:767
+msgid ""
+"DHCP Relay is currently enabled. DHCP Server canot be enabled while the DHCP "
+"Relay is enabled on any interface."
+msgstr ""
+
+#: src/usr/local/www/services_dhcp.php:774
 #, php-format
 msgid "Enable DHCP server on %s interface"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:768
+#: src/usr/local/www/services_dhcp.php:779
 msgid ""
 "Editing pool-specific options. To return to the Interface, click its tab "
 "above."
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:773
+#: src/usr/local/www/services_dhcp.php:784
 msgid "BOOTP"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:780
+#: src/usr/local/www/services_dhcp.php:791
 msgid "Deny unknown clients"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:787
+#: src/usr/local/www/services_dhcp.php:798
 msgid "Ignore denied clients"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:790
+#: src/usr/local/www/services_dhcp.php:801
 msgid ""
 "This option is not compatible with failover and cannot be enabled when a "
 "Failover Peer IP address is configured."
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:796
+#: src/usr/local/www/services_dhcp.php:807
 msgid "Pool Description"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:816
+#: src/usr/local/www/services_dhcp.php:827
 msgid "In-use DHCP Pool Ranges:"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:829
+#: src/usr/local/www/services_dhcp.php:840
 msgid "Available range"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:842
-#: src/usr/local/www/services_dhcpv6.php:619
+#: src/usr/local/www/services_dhcp.php:853
+#: src/usr/local/www/services_dhcpv6.php:633
 msgid "Range"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:861
+#: src/usr/local/www/services_dhcp.php:874
 msgid "Additional Pools"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:865
+#: src/usr/local/www/services_dhcp.php:878
 msgid "Add pool"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:874
+#: src/usr/local/www/services_dhcp.php:887
 msgid ""
 "If additional pools of addresses are needed inside of this subnet outside "
 "the above Range, they may be specified here."
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:890
+#: src/usr/local/www/services_dhcp.php:903
 #: src/usr/local/www/vpn_openvpn_csc.php:533
 msgid "WINS servers"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:903
+#: src/usr/local/www/services_dhcp.php:918
 #: src/usr/local/www/status_interfaces.php:131
 msgid "DNS servers"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:905
+#: src/usr/local/www/services_dhcp.php:921
 msgid ""
 "Leave blank to use the system default DNS servers: this interface's IP if "
 "DNS Forwarder or Resolver is enabled, otherwise the servers configured on "
 "the System / General Setup page."
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:910
+#: src/usr/local/www/services_dhcp.php:926
 msgid "Other Options"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:917
+#: src/usr/local/www/services_dhcp.php:934
 msgid ""
 "The default is to use the IP on this interface of the firewall as the "
 "gateway. Specify an alternate gateway here if this is not the correct "
 "gateway for the network. Type \"none\" for no gateway assignment."
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:921
-#: src/usr/local/www/services_dhcp_edit.php:541
-#: src/usr/local/www/services_dhcpv6.php:683
-#: src/usr/local/www/services_dyndns_edit.php:101
-#: src/usr/local/www/services_dyndns_edit.php:296
+#: src/usr/local/www/services_dhcp.php:938
+#: src/usr/local/www/services_dhcp_edit.php:551
+#: src/usr/local/www/services_dhcpv6.php:697
+#: src/usr/local/www/services_dyndns_edit.php:102
+#: src/usr/local/www/services_dyndns_edit.php:297
 msgid "Domain name"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:924
+#: src/usr/local/www/services_dhcp.php:941
 msgid ""
 "The default is to use the domain name of this system as the default domain "
 "name provided by DHCP. An alternate domain name may be specified here."
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:928
-#: src/usr/local/www/services_dhcp_edit.php:548
-#: src/usr/local/www/services_dhcpv6.php:690
+#: src/usr/local/www/services_dhcp.php:945
+#: src/usr/local/www/services_dhcp_edit.php:558
+#: src/usr/local/www/services_dhcpv6.php:704
 #: src/usr/local/www/services_router_advertisements.php:439
 msgid "Domain search list"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:931
-#: src/usr/local/www/services_dhcp_edit.php:551
-#: src/usr/local/www/services_dhcpv6.php:693
+#: src/usr/local/www/services_dhcp.php:948
+#: src/usr/local/www/services_dhcp_edit.php:561
+#: src/usr/local/www/services_dhcpv6.php:707
 msgid ""
 "The DHCP server can optionally provide a domain search list. Use the "
 "semicolon character as separator."
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:935
-#: src/usr/local/www/services_dhcpv6.php:697
+#: src/usr/local/www/services_dhcp.php:952
+#: src/usr/local/www/services_dhcpv6.php:711
 msgid "Default lease time"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:938
+#: src/usr/local/www/services_dhcp.php:955
 msgid ""
 "This is used for clients that do not ask for a specific expiration time. The "
 "default is 7200 seconds."
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:942
+#: src/usr/local/www/services_dhcp.php:959
 msgid "Maximum lease time"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:945
-#: src/usr/local/www/services_dhcp_edit.php:565
+#: src/usr/local/www/services_dhcp.php:962
+#: src/usr/local/www/services_dhcp_edit.php:575
 msgid ""
 "This is the maximum lease time for clients that ask for a specific "
 "expiration time. The default is 86400 seconds."
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:950
+#: src/usr/local/www/services_dhcp.php:967
 msgid "Failover peer IP"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:952
+#: src/usr/local/www/services_dhcp.php:970
 msgid ""
 "Leave blank to disable. Enter the interface IP address of the other machine. "
 "Machines must be using CARP. Interface's advskew determines whether the "
@@ -19571,688 +19708,750 @@ msgid ""
 "(and the other is &gt; 20)."
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:959
-#: src/usr/local/www/services_dhcp.php:1315
+#: src/usr/local/www/services_dhcp.php:977
+#: src/usr/local/www/services_dhcp.php:1344
 #: src/usr/local/www/widgets/widgets/wake_on_lan.widget.php:64
 msgid "Static ARP"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:962
+#: src/usr/local/www/services_dhcp.php:980
 msgid ""
 "This option persists even if DHCP server is disabled. Only the machines "
 "listed below will be able to communicate with the firewall on this interface."
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:966
+#: src/usr/local/www/services_dhcp.php:984
 msgid "Time format change"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:969
+#: src/usr/local/www/services_dhcp.php:987
 msgid ""
 "By default DHCP leases are displayed in UTC time.\tBy checking this box DHCP "
 "lease time will be displayed in local time and set to the time zone "
 "selected. This will be used for all DHCP interfaces lease time."
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:973
+#: src/usr/local/www/services_dhcp.php:991
 msgid "Statistics graphs"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:976
+#: src/usr/local/www/services_dhcp.php:994
 msgid ""
 "Enable this to add DHCP leases statistics to the RRD graphs. Disabled by "
 "default."
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:1003
-#: src/usr/local/www/services_dhcp_edit.php:590
-#: src/usr/local/www/services_dhcpv6.php:743
+#: src/usr/local/www/services_dhcp.php:1021
+#: src/usr/local/www/services_dhcp_edit.php:607
+#: src/usr/local/www/services_dhcpv6.php:757
 msgid "DDNS Domain"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:1006
+#: src/usr/local/www/services_dhcp.php:1024
 msgid ""
 "Leave blank to disable dynamic DNS registration.<br />Enter the dynamic DNS "
 "domain which will be used to register client names in the DNS server."
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:1011
+#: src/usr/local/www/services_dhcp.php:1029
+#: src/usr/local/www/services_dhcpv6.php:764
+msgid "DDNS Hostnames"
+msgstr ""
+
+#: src/usr/local/www/services_dhcp.php:1032
+#: src/usr/local/www/services_dhcpv6.php:767
+msgid "Default registers host name option supplied by DHCP client."
+msgstr ""
+
+#: src/usr/local/www/services_dhcp.php:1036
 msgid "Primary DDNS address"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:1013
+#: src/usr/local/www/services_dhcp.php:1039
 msgid "Primary domain name server IP address for the dynamic domain name."
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:1017
+#: src/usr/local/www/services_dhcp.php:1043
 msgid "DNS Domain key"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:1020
+#: src/usr/local/www/services_dhcp.php:1046
 msgid ""
 "Dynamic DNS domain key name which will be used to register client names in "
 "the DNS server."
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:1024
+#: src/usr/local/www/services_dhcp.php:1050
 msgid "DNS Domain key secret"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:1027
+#: src/usr/local/www/services_dhcp.php:1053
 msgid ""
 "Dynamic DNS domain key secret (HMAC-MD5) which will be used to register "
 "client names in the DNS server."
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:1040
+#: src/usr/local/www/services_dhcp.php:1066
 msgid "MAC address control"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:1046
+#: src/usr/local/www/services_dhcp.php:1072
 msgid "MAC Allow"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:1049
+#: src/usr/local/www/services_dhcp.php:1075
 msgid ""
 "List of partial MAC addresses to allow, comma separated, no spaces, e.g.: "
 "00:00:00,01:E5:FF"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:1053
+#: src/usr/local/www/services_dhcp.php:1079
 msgid "MAC Deny"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:1056
+#: src/usr/local/www/services_dhcp.php:1082
 msgid ""
 "List of partial MAC addresses to deny access, comma separated, no spaces, e."
 "g.: 00:00:00,01:E5:FF"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:1075
-#: src/usr/local/www/services_dhcp_edit.php:633
-#: src/usr/local/www/services_dhcpv6.php:806
+#: src/usr/local/www/services_dhcp.php:1101
+#: src/usr/local/www/services_dhcp_edit.php:651
+#: src/usr/local/www/services_dhcpv6.php:828
 #: src/usr/local/www/vpn_openvpn_server.php:1063
 msgid "NTP Server 1"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:1081
-#: src/usr/local/www/services_dhcp_edit.php:641
-#: src/usr/local/www/services_dhcpv6.php:814
+#: src/usr/local/www/services_dhcp.php:1108
+#: src/usr/local/www/services_dhcp_edit.php:659
+#: src/usr/local/www/services_dhcpv6.php:836
 #: src/usr/local/www/vpn_openvpn_server.php:1070
 msgid "NTP Server 2"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:1096
+#: src/usr/local/www/services_dhcp.php:1124
 msgid "TFTP"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:1102
-#: src/usr/local/www/services_dhcp_edit.php:667
+#: src/usr/local/www/services_dhcp.php:1130
+#: src/usr/local/www/services_dhcp_edit.php:685
 msgid "TFTP Server"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:1104
+#: src/usr/local/www/services_dhcp.php:1132
 msgid ""
 "Leave blank to disable. Enter a valid IP address, hostname or URL for the "
 "TFTP server."
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:1117
-#: src/usr/local/www/services_dhcpv6.php:834
+#: src/usr/local/www/services_dhcp.php:1145
+#: src/usr/local/www/services_dhcpv6.php:856
 msgid "LDAP"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:1123
+#: src/usr/local/www/services_dhcp.php:1151
 msgid "LDAP Server URI"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:1126
+#: src/usr/local/www/services_dhcp.php:1154
 msgid ""
 "Leave blank to disable. Enter a full URI for the LDAP server in the form "
 "ldap://ldap.example.com/dc=example,dc=com "
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:1139
+#: src/usr/local/www/services_dhcp.php:1167
 msgid "Network Booting"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:1152
+#: src/usr/local/www/services_dhcp.php:1180
 msgid "Next Server"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:1154
+#: src/usr/local/www/services_dhcp.php:1183
 msgid "Enter the IP address of the next server"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:1158
+#: src/usr/local/www/services_dhcp.php:1187
 msgid "Default BIOS file name"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:1165
+#: src/usr/local/www/services_dhcp.php:1194
 msgid "UEFI 32 bit file name"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:1172
+#: src/usr/local/www/services_dhcp.php:1201
 msgid "UEFI 64 bit file name"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:1175
+#: src/usr/local/www/services_dhcp.php:1204
 msgid ""
 "Both a filename and a boot server must be configured for this to work! All "
 "three filenames and a configured boot server are necessary for UEFI to work! "
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:1180
+#: src/usr/local/www/services_dhcp.php:1209
 #: src/usr/local/www/services_dhcpv6_edit.php:256
 msgid "Root path"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:1183
+#: src/usr/local/www/services_dhcp.php:1212
 msgid "string-format: iscsi:(servername):(protocol):(port):(LUN):targetname "
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:1196
-#: src/usr/local/www/services_dhcp.php:1202
-#: src/usr/local/www/services_dhcpv6.php:883
+#: src/usr/local/www/services_dhcp.php:1225
+#: src/usr/local/www/services_dhcp.php:1231
+#: src/usr/local/www/services_dhcpv6.php:905
 msgid "Additional BOOTP/DHCP Options"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:1207
+#: src/usr/local/www/services_dhcp.php:1236
 msgid ""
 "Enter the DHCP option number and the value for each item to include in the "
 "DHCP lease information."
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:1208
+#: src/usr/local/www/services_dhcp.php:1237
 #, php-format
 msgid "For a list of available options please visit this %1$s URL%2$s"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:1216
+#: src/usr/local/www/services_dhcp.php:1245
 msgid "Text"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:1216
+#: src/usr/local/www/services_dhcp.php:1245
 msgid "String"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:1216
+#: src/usr/local/www/services_dhcp.php:1245
 msgid "Boolean"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:1217
+#: src/usr/local/www/services_dhcp.php:1246
 msgid "Unsigned 8-bit integer"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:1217
+#: src/usr/local/www/services_dhcp.php:1246
 msgid "Unsigned 16-bit integer"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:1217
+#: src/usr/local/www/services_dhcp.php:1246
 msgid "Unsigned 32-bit integer"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:1218
+#: src/usr/local/www/services_dhcp.php:1247
 msgid "Signed 8-bit integer"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:1218
+#: src/usr/local/www/services_dhcp.php:1247
 msgid "Signed 16-bit integer"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:1218
+#: src/usr/local/www/services_dhcp.php:1247
 msgid "Signed 32-bit integer"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:1218
+#: src/usr/local/www/services_dhcp.php:1247
 msgid "IP address or host"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:1231
+#: src/usr/local/www/services_dhcp.php:1260
 msgid "Option"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:1310
+#: src/usr/local/www/services_dhcp.php:1339
 msgid "DHCP Static Mappings for this Interface"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:1350
-#: src/usr/local/www/services_dhcpv6.php:1006
-#: src/usr/local/www/status_dhcp_leases.php:440
+#: src/usr/local/www/services_dhcp.php:1379
+#: src/usr/local/www/services_dhcpv6.php:1028
+#: src/usr/local/www/status_dhcp_leases.php:467
 msgid "Edit static mapping"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:1351
-#: src/usr/local/www/services_dhcpv6.php:1007
+#: src/usr/local/www/services_dhcp.php:1380
+#: src/usr/local/www/services_dhcpv6.php:1029
 msgid "Delete static mapping"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp_edit.php:156
+#: src/usr/local/www/services_dhcp_edit.php:158
 msgid "Either MAC address or Client identifier must be specified"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp_edit.php:165
+#: src/usr/local/www/services_dhcp_edit.php:167
 #: src/usr/local/www/services_dhcpv6_edit.php:115
 msgid "The hostname cannot end with a hyphen according to RFC952"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp_edit.php:171
+#: src/usr/local/www/services_dhcp_edit.php:173
 #: src/usr/local/www/services_dhcpv6_edit.php:121
-#: src/usr/local/www/services_dnsmasq_edit.php:86
+#: src/usr/local/www/services_dnsmasq_edit.php:72
 #: src/usr/local/www/services_unbound_host_edit.php:87
-#: src/usr/local/www/system.php:150
+#: src/usr/local/www/system.php:153
 msgid ""
 "A valid hostname is specified, but the domain name part should be omitted"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp_edit.php:184
+#: src/usr/local/www/services_dhcp_edit.php:186
 msgid "Static ARP is enabled.  An IP address must be specified."
 msgstr ""
 
-#: src/usr/local/www/services_dhcp_edit.php:201
+#: src/usr/local/www/services_dhcp_edit.php:203
 msgid ""
 "This fully qualified hostname (Hostname + Domainname), IP, MAC address or "
 "Client identifier already exists."
 msgstr ""
 
-#: src/usr/local/www/services_dhcp_edit.php:209
+#: src/usr/local/www/services_dhcp_edit.php:211
 #, php-format
 msgid "The IP address must not be within the DHCP range for this interface."
 msgstr ""
 
-#: src/usr/local/www/services_dhcp_edit.php:214
+#: src/usr/local/www/services_dhcp_edit.php:216
 msgid ""
 "The IP address must not be within the range configured on a DHCP pool for "
 "this interface."
 msgstr ""
 
-#: src/usr/local/www/services_dhcp_edit.php:222
+#: src/usr/local/www/services_dhcp_edit.php:224
 #, php-format
 msgid "The IP address must lie in the %s subnet."
 msgstr ""
 
-#: src/usr/local/www/services_dhcp_edit.php:226
+#: src/usr/local/www/services_dhcp_edit.php:228
 #, php-format
 msgid "The IP address cannot be the %s network address."
 msgstr ""
 
-#: src/usr/local/www/services_dhcp_edit.php:230
+#: src/usr/local/www/services_dhcp_edit.php:232
 #, php-format
 msgid "The IP address cannot be the %s broadcast address."
 msgstr ""
 
-#: src/usr/local/www/services_dhcp_edit.php:282
+#: src/usr/local/www/services_dhcp_edit.php:237
+msgid "A valid IPv4 address must be specified for the gateway."
+msgstr ""
+
+#: src/usr/local/www/services_dhcp_edit.php:240
+msgid ""
+"A valid IPv4 address must be specified for the primary/secondary WINS "
+"servers."
+msgstr ""
+
+#: src/usr/local/www/services_dhcp_edit.php:254
+msgid "A valid IPV4 address must be specified for each of the DNS servers."
+msgstr ""
+
+#: src/usr/local/www/services_dhcp_edit.php:267
+#: src/usr/local/www/services_dhcpv6.php:300
 msgid ""
-"A valid IP address must be specified for the primary/secondary NTP servers."
+"A valid primary domain name server IPv4 address must be specified for the "
+"dynamic domain name."
+msgstr ""
+
+#: src/usr/local/www/services_dhcp_edit.php:284
+msgid ""
+"A valid IPv4 address must be specified for the primary/secondary NTP servers."
+msgstr ""
+
+#: src/usr/local/www/services_dhcp_edit.php:287
+msgid ""
+"A valid IPv4 address, hostname or URL must be specified for the TFTP server."
+msgstr ""
+
+#: src/usr/local/www/services_dhcp_edit.php:290
+msgid "A valid IPv4 address must be specified for the network boot server."
 msgstr ""
 
-#: src/usr/local/www/services_dhcp_edit.php:388
+#: src/usr/local/www/services_dhcp_edit.php:293
+msgid "A valid MAC address must be specified for use with static ARP."
+msgstr ""
+
+#: src/usr/local/www/services_dhcp_edit.php:296
+msgid "A valid IPv4 address must be specified for use with static ARP."
+msgstr ""
+
+#: src/usr/local/www/services_dhcp_edit.php:397
 #: src/usr/local/www/services_dhcpv6_edit.php:201
 msgid "Edit Static Mapping"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp_edit.php:421
+#: src/usr/local/www/services_dhcp_edit.php:430
 msgid "MAC address (6 hex octets separated by colons)"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp_edit.php:426
+#: src/usr/local/www/services_dhcp_edit.php:435
 msgid "Client Identifier"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp_edit.php:435
+#: src/usr/local/www/services_dhcp_edit.php:445
 msgid ""
 "If an IPv4 address is entered, the address must be outside of the pool.<br /"
 ">If no IPv4 address is given, one will be dynamically allocated from the "
 "pool."
 msgstr ""
 
-#: src/usr/local/www/services_dhcp_edit.php:443
+#: src/usr/local/www/services_dhcp_edit.php:453
 #: src/usr/local/www/services_dhcpv6_edit.php:237
 msgid "Name of the host, without domain part."
 msgstr ""
 
-#: src/usr/local/www/services_dhcp_edit.php:448
+#: src/usr/local/www/services_dhcp_edit.php:458
 #: src/usr/local/www/services_dhcpv6_edit.php:249
 msgid "Netboot filename"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp_edit.php:451
+#: src/usr/local/www/services_dhcp_edit.php:461
 #: src/usr/local/www/services_dhcpv6_edit.php:252
 msgid ""
 "Name of the file that should be loaded when this host boots off of the "
 "network, overrides setting on main page."
 msgstr ""
 
-#: src/usr/local/www/services_dhcp_edit.php:455
+#: src/usr/local/www/services_dhcp_edit.php:465
 msgid "Root Path"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp_edit.php:458
+#: src/usr/local/www/services_dhcp_edit.php:468
 msgid "Enter the root-path-string, overrides setting on main page."
 msgstr ""
 
-#: src/usr/local/www/services_dhcp_edit.php:470
+#: src/usr/local/www/services_dhcp_edit.php:480
 msgid "ARP Table Static Entry"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp_edit.php:475
+#: src/usr/local/www/services_dhcp_edit.php:485
 #: src/usr/local/www/vpn_ipsec_mobile.php:632
 msgid "WINS Servers"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp_edit.php:494
-#: src/usr/local/www/services_dhcpv6.php:666
+#: src/usr/local/www/services_dhcp_edit.php:504
+#: src/usr/local/www/services_dhcpv6.php:680
 #: src/usr/local/www/services_pppoe_edit.php:356
 #: src/usr/local/www/vpn_ipsec_mobile.php:607
 #: src/usr/local/www/vpn_openvpn_csc.php:441
 msgid "DNS Servers"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp_edit.php:528
+#: src/usr/local/www/services_dhcp_edit.php:538
 msgid ""
 "Note: leave blank to use the system default DNS servers - this interface's "
 "IP if DNS Forwarder or Resolver is enabled, otherwise the servers configured "
 "on the General page."
 msgstr ""
 
-#: src/usr/local/www/services_dhcp_edit.php:537
+#: src/usr/local/www/services_dhcp_edit.php:547
 msgid ""
 "The default is to use the IP on this interface of the firewall as the "
 "gateway. Specify an alternate gateway here if this is not the correct "
 "gateway for the network."
 msgstr ""
 
-#: src/usr/local/www/services_dhcp_edit.php:544
-#: src/usr/local/www/services_dhcpv6.php:686
+#: src/usr/local/www/services_dhcp_edit.php:554
+#: src/usr/local/www/services_dhcpv6.php:700
 msgid ""
 "The default is to use the domain name of this system as the default domain "
 "name provided by DHCP. An alternate domain name may be specified here. "
 msgstr ""
 
-#: src/usr/local/www/services_dhcp_edit.php:555
+#: src/usr/local/www/services_dhcp_edit.php:565
 msgid "Default lease time (Seconds)"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp_edit.php:558
+#: src/usr/local/www/services_dhcp_edit.php:568
 msgid ""
 "Used for clients that do not ask for a specific expiration time. The default "
 "is 7200 seconds."
 msgstr ""
 
-#: src/usr/local/www/services_dhcp_edit.php:562
+#: src/usr/local/www/services_dhcp_edit.php:572
 msgid "Maximum lease time (Seconds)"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp_edit.php:583
-#: src/usr/local/www/services_dhcpv6.php:736
-#: src/usr/local/www/services_dnsmasq.php:211
+#: src/usr/local/www/services_dhcp_edit.php:593
+#: src/usr/local/www/services_dhcpv6.php:750
+#: src/usr/local/www/services_dnsmasq.php:256
 #: src/usr/local/www/services_unbound.php:324
 msgid "DHCP Registration"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp_edit.php:593
-#: src/usr/local/www/services_dhcpv6.php:746
+#: src/usr/local/www/services_dhcp_edit.php:600
+msgid "DDNS Hostname"
+msgstr ""
+
+#: src/usr/local/www/services_dhcp_edit.php:610
+#: src/usr/local/www/services_dhcpv6.php:760
 msgid ""
 "Leave blank to disable dynamic DNS registration. Enter the dynamic DNS "
 "domain which will be used to register client names in the DNS server."
 msgstr ""
 
-#: src/usr/local/www/services_dhcp_edit.php:597
-#: src/usr/local/www/services_dhcpv6.php:750
+#: src/usr/local/www/services_dhcp_edit.php:614
+#: src/usr/local/www/services_dhcpv6.php:771
 msgid "DDNS Server IP"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp_edit.php:599
-#: src/usr/local/www/services_dhcpv6.php:752
+#: src/usr/local/www/services_dhcp_edit.php:617
 msgid ""
 "Enter the primary domain name server IP address for the dynamic domain name."
 msgstr ""
 
-#: src/usr/local/www/services_dhcp_edit.php:603
-#: src/usr/local/www/services_dhcpv6.php:756
+#: src/usr/local/www/services_dhcp_edit.php:621
+#: src/usr/local/www/services_dhcpv6.php:778
 msgid "DDNS Domain Key name"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp_edit.php:606
-#: src/usr/local/www/services_dhcpv6.php:759
+#: src/usr/local/www/services_dhcp_edit.php:624
+#: src/usr/local/www/services_dhcpv6.php:781
 msgid ""
 "Enter the dynamic DNS domain key name which will be used to register client "
 "names in the DNS server."
 msgstr ""
 
-#: src/usr/local/www/services_dhcp_edit.php:610
-#: src/usr/local/www/services_dhcpv6.php:763
+#: src/usr/local/www/services_dhcp_edit.php:628
+#: src/usr/local/www/services_dhcpv6.php:785
 msgid "DDNS Domain Key secret"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp_edit.php:613
-#: src/usr/local/www/services_dhcpv6.php:766
+#: src/usr/local/www/services_dhcp_edit.php:631
+#: src/usr/local/www/services_dhcpv6.php:788
 msgid ""
 "Enter the dynamic DNS domain key secret which will be used to register "
 "client names in the DNS server."
 msgstr ""
 
-#: src/usr/local/www/services_dhcp_edit.php:625
-#: src/usr/local/www/services_dhcpv6.php:798
+#: src/usr/local/www/services_dhcp_edit.php:643
+#: src/usr/local/www/services_dhcpv6.php:820
 msgid "NTP servers"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp_edit.php:629
-#: src/usr/local/www/services_dhcpv6.php:802
+#: src/usr/local/www/services_dhcp_edit.php:647
+#: src/usr/local/www/services_dhcpv6.php:824
 #: src/usr/local/www/vpn_openvpn_csc.php:482
 msgid "NTP Servers"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp_edit.php:661
+#: src/usr/local/www/services_dhcp_edit.php:679
 msgid "TFTP servers"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp_edit.php:670
+#: src/usr/local/www/services_dhcp_edit.php:688
 msgid ""
 "Leave blank to disable. Enter a full hostname or IP for the TFTP server."
 msgstr ""
 
-#: src/usr/local/www/services_dhcp_relay.php:77
-#: src/usr/local/www/services_dhcpv6_relay.php:78
+#: src/usr/local/www/services_dhcp_relay.php:78
+#: src/usr/local/www/services_dhcpv6_relay.php:79
 msgid "Destination Server"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp_relay.php:86
-msgid "A valid Destination Server IP address must be specified."
+#: src/usr/local/www/services_dhcp_relay.php:88
+#, php-format
+msgid "Destination Server IP address %s is not a valid IPv4 address."
+msgstr ""
+
+#: src/usr/local/www/services_dhcp_relay.php:101
+#: src/usr/local/www/services_dhcpv6_relay.php:102
+msgid "At least one Destination Server IP address must be specified."
 msgstr ""
 
-#: src/usr/local/www/services_dhcp_relay.php:125
+#: src/usr/local/www/services_dhcp_relay.php:129
 msgid ""
 "DHCP Server is currently enabled. Cannot enable the DHCP Relay service while "
 "the DHCP Server is enabled on any interface."
 msgstr ""
 
-#: src/usr/local/www/services_dhcp_relay.php:140
+#: src/usr/local/www/services_dhcp_relay.php:144
 msgid "DHCP Relay Configuration"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp_relay.php:151
-#: src/usr/local/www/services_dhcpv6_relay.php:149
+#: src/usr/local/www/services_dhcp_relay.php:155
+#: src/usr/local/www/services_dhcpv6_relay.php:155
 msgid "Interface(s)"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp_relay.php:155
+#: src/usr/local/www/services_dhcp_relay.php:159
 msgid "Interfaces without an IP address will not be shown."
 msgstr ""
 
-#: src/usr/local/www/services_dhcp_relay.php:163
+#: src/usr/local/www/services_dhcp_relay.php:167
 #, php-format
 msgid ""
 "If this is checked, the DHCP relay will append the circuit ID (%s interface "
 "number) and the agent ID to the DHCP request."
 msgstr ""
 
-#: src/usr/local/www/services_dhcp_relay.php:169
 #: src/usr/local/www/services_dhcp_relay.php:173
-#: src/usr/local/www/services_dhcpv6_relay.php:167
-#: src/usr/local/www/services_dhcpv6_relay.php:171
+#: src/usr/local/www/services_dhcp_relay.php:177
+#: src/usr/local/www/services_dhcpv6_relay.php:173
+#: src/usr/local/www/services_dhcpv6_relay.php:177
 msgid "Destination server"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp_relay.php:176
+#: src/usr/local/www/services_dhcp_relay.php:181
 msgid ""
-"This is the IP address of the server to which DHCP requests are relayed."
+"This is the IPv4 address of the server to which DHCP requests are relayed."
 msgstr ""
 
-#: src/usr/local/www/services_dhcpv6.php:216
-#: src/usr/local/www/services_dhcpv6.php:219
+#: src/usr/local/www/services_dhcpv6.php:220
+#: src/usr/local/www/services_dhcpv6.php:223
 msgid "A valid prefix range must be specified."
 msgstr ""
 
-#: src/usr/local/www/services_dhcpv6.php:231
+#: src/usr/local/www/services_dhcpv6.php:235
 #, php-format
 msgid "Prefix Delegation From address is not a valid IPv6 Netmask for %s"
 msgstr ""
 
-#: src/usr/local/www/services_dhcpv6.php:242
+#: src/usr/local/www/services_dhcpv6.php:246
 #, php-format
 msgid "Prefix Delegation To address is not a valid IPv6 Netmask for %s"
 msgstr ""
 
-#: src/usr/local/www/services_dhcpv6.php:253
-#: src/usr/local/www/services_dhcpv6.php:263
+#: src/usr/local/www/services_dhcpv6.php:255
+#: src/usr/local/www/services_dhcpv6.php:267
+msgid "A valid range must be specified."
+msgstr ""
+
+#: src/usr/local/www/services_dhcpv6.php:260
+#: src/usr/local/www/services_dhcpv6.php:272
 #: src/usr/local/www/services_dhcpv6_edit.php:134
 #, php-format
 msgid "The prefix (upper %s bits) must be zero.  Use the form %s"
 msgstr ""
 
-#: src/usr/local/www/services_dhcpv6.php:268
+#: src/usr/local/www/services_dhcpv6.php:281
 msgid "A valid IPv6 address must be specified for the gateway."
 msgstr ""
 
-#: src/usr/local/www/services_dhcpv6.php:274
+#: src/usr/local/www/services_dhcpv6.php:287
 #: src/usr/local/www/services_router_advertisements.php:155
 msgid "A valid IPv6 address must be specified for each of the DNS servers."
 msgstr ""
 
-#: src/usr/local/www/services_dhcpv6.php:287
-msgid ""
-"A valid primary domain name server IPv4 address must be specified for the "
-"dynamic domain name."
-msgstr ""
-
-#: src/usr/local/www/services_dhcpv6.php:304
+#: src/usr/local/www/services_dhcpv6.php:317
 msgid ""
 "A valid IPv6 address must be specified for the primary/secondary NTP servers."
 msgstr ""
 
-#: src/usr/local/www/services_dhcpv6.php:310
+#: src/usr/local/www/services_dhcpv6.php:323
 msgid "A valid IPv6 address or hostname must be specified for the TFTP server."
 msgstr ""
 
-#: src/usr/local/www/services_dhcpv6.php:313
+#: src/usr/local/www/services_dhcpv6.php:326
 msgid "A valid URL must be specified for the network bootfile."
 msgstr ""
 
-#: src/usr/local/www/services_dhcpv6.php:321
+#: src/usr/local/www/services_dhcpv6.php:334
 #, php-format
 msgid "The subnet range cannot overlap with virtual IPv6 address %s."
 msgstr ""
 
-#: src/usr/local/www/services_dhcpv6.php:486
-msgid ""
-"DHCPv6 Relay is currently enabled. Cannot enable the DHCPv6 Server service "
-"while the DHCPv6 Relay is enabled on any interface."
-msgstr ""
-
-#: src/usr/local/www/services_dhcpv6.php:541
+#: src/usr/local/www/services_dhcpv6.php:551
 msgid ""
 "The DHCPv6 Server can only be enabled on interfaces configured with a static "
 "IPv6 address. This system has none."
 msgstr ""
 
-#: src/usr/local/www/services_dhcpv6.php:550
+#: src/usr/local/www/services_dhcpv6.php:560
 #: src/usr/local/www/services_router_advertisements.php:242
 #: src/usr/local/www/services_router_advertisements.php:284
 msgid "Router Advertisements"
 msgstr ""
 
-#: src/usr/local/www/services_dhcpv6.php:560
+#: src/usr/local/www/services_dhcpv6.php:565
 msgid "DHCPv6 Options"
 msgstr ""
 
-#: src/usr/local/www/services_dhcpv6.php:582
-#: src/usr/local/www/services_dhcpv6.php:595
+#: src/usr/local/www/services_dhcpv6.php:571
+msgid ""
+"DHCPv6 Relay is currently enabled. DHCPv6 Server canot be enabled while the "
+"DHCPv6 Relay is enabled on any interface."
+msgstr ""
+
+#: src/usr/local/www/services_dhcpv6.php:596
+#: src/usr/local/www/services_dhcpv6.php:609
 msgid "Subnet Mask"
 msgstr ""
 
-#: src/usr/local/www/services_dhcpv6.php:587
+#: src/usr/local/www/services_dhcpv6.php:601
 msgid "Available Range"
 msgstr ""
 
-#: src/usr/local/www/services_dhcpv6.php:589
+#: src/usr/local/www/services_dhcpv6.php:603
 msgid ""
 "Prefix Delegation subnet will be appended to the beginning of the defined "
 "range"
 msgstr ""
 
-#: src/usr/local/www/services_dhcpv6.php:644
+#: src/usr/local/www/services_dhcpv6.php:658
 msgid "Prefix Delegation Range"
 msgstr ""
 
-#: src/usr/local/www/services_dhcpv6.php:653
+#: src/usr/local/www/services_dhcpv6.php:667
 msgid "Prefix Delegation Size"
 msgstr ""
 
-#: src/usr/local/www/services_dhcpv6.php:664
+#: src/usr/local/www/services_dhcpv6.php:678
 msgid ""
 "A Prefix range can be defined here for DHCP Prefix Delegation. This allows "
 "for assigning networks to subrouters. The start and end of the range must "
 "end on boundaries of the prefix delegation size."
 msgstr ""
 
-#: src/usr/local/www/services_dhcpv6.php:678
+#: src/usr/local/www/services_dhcpv6.php:692
 msgid ""
 "Leave blank to use the system default DNS servers, this interface's IP if "
 "DNS forwarder is enabled, or the servers configured on the \"General\" page."
 msgstr ""
 
-#: src/usr/local/www/services_dhcpv6.php:700
+#: src/usr/local/www/services_dhcpv6.php:714
 msgid ""
 "Lease time in seconds. Used for clients that do not ask for a specific "
 "expiration time.  <br />The default is 7200 seconds."
 msgstr ""
 
-#: src/usr/local/www/services_dhcpv6.php:705
+#: src/usr/local/www/services_dhcpv6.php:719
 msgid "Max lease time"
 msgstr ""
 
-#: src/usr/local/www/services_dhcpv6.php:708
+#: src/usr/local/www/services_dhcpv6.php:722
 msgid ""
 "Maximum lease time for clients that ask for a specific expiration time. <br /"
 ">The default is 86400 seconds."
 msgstr ""
 
-#: src/usr/local/www/services_dhcpv6.php:713
+#: src/usr/local/www/services_dhcpv6.php:727
 msgid "Time Format Change"
 msgstr ""
 
-#: src/usr/local/www/services_dhcpv6.php:716
+#: src/usr/local/www/services_dhcpv6.php:730
 msgid ""
 "By default DHCPv6 leases are displayed in UTC time. By checking this box "
 "DHCPv6 lease time will be displayed in local time and set to time zone "
 "selected. This will be used for all DHCPv6 interfaces lease time."
 msgstr ""
 
-#: src/usr/local/www/services_dhcpv6.php:773
+#: src/usr/local/www/services_dhcpv6.php:774
+msgid ""
+"Enter the primary domain name server IPv4 address for the dynamic domain "
+"name."
+msgstr ""
+
+#: src/usr/local/www/services_dhcpv6.php:795
 #: src/usr/local/www/services_unbound_acls.php:231
 msgid "Allow"
 msgstr ""
 
-#: src/usr/local/www/services_dhcpv6.php:775
+#: src/usr/local/www/services_dhcpv6.php:797
 msgid "Ignore"
 msgstr ""
 
-#: src/usr/local/www/services_dhcpv6.php:770
+#: src/usr/local/www/services_dhcpv6.php:792
 msgid "DDNS Client Updates"
 msgstr ""
 
-#: src/usr/local/www/services_dhcpv6.php:776
+#: src/usr/local/www/services_dhcpv6.php:798
 msgid ""
 "How Forward entries are handled when client indicates they wish to update "
 "DNS.  Allow prevents DHCP from updating Forward entries, Deny indicates that "
@@ -20261,49 +20460,49 @@ msgid ""
 "using a different domain name."
 msgstr ""
 
-#: src/usr/local/www/services_dhcpv6.php:783
+#: src/usr/local/www/services_dhcpv6.php:805
 msgid "DDNS Reverse"
 msgstr ""
 
-#: src/usr/local/www/services_dhcpv6.php:840
+#: src/usr/local/www/services_dhcpv6.php:862
 msgid "LDAP URI"
 msgstr ""
 
-#: src/usr/local/www/services_dhcpv6.php:855
-#: src/usr/local/www/services_dhcpv6.php:861
+#: src/usr/local/www/services_dhcpv6.php:877
+#: src/usr/local/www/services_dhcpv6.php:883
 msgid "Network booting"
 msgstr ""
 
-#: src/usr/local/www/services_dhcpv6.php:868
+#: src/usr/local/www/services_dhcpv6.php:890
 msgid "Bootfile URL"
 msgstr ""
 
-#: src/usr/local/www/services_dhcpv6.php:936
+#: src/usr/local/www/services_dhcpv6.php:958
 msgid "Add Option"
 msgstr ""
 
-#: src/usr/local/www/services_dhcpv6.php:959
+#: src/usr/local/www/services_dhcpv6.php:981
 #, php-format
 msgid ""
 "The DNS servers entered in %1$sSystem: General Setup%3$s (or the %2$sDNS "
 "forwarder%3$s if enabled) will be assigned to clients by the DHCP server."
 msgstr ""
 
-#: src/usr/local/www/services_dhcpv6.php:965
+#: src/usr/local/www/services_dhcpv6.php:987
 #, php-format
 msgid ""
 "The DHCP lease table can be viewed on the %1$sStatus: DHCPv6 leases%2$s page."
 msgstr ""
 
-#: src/usr/local/www/services_dhcpv6.php:973
+#: src/usr/local/www/services_dhcpv6.php:995
 msgid "DHCPv6 Static Mappings for this Interface"
 msgstr ""
 
-#: src/usr/local/www/services_dhcpv6.php:978
+#: src/usr/local/www/services_dhcpv6.php:1000
 #: src/usr/local/www/services_dhcpv6_edit.php:108
 #: src/usr/local/www/services_dhcpv6_edit.php:216
-#: src/usr/local/www/status_dhcpv6_leases.php:432
-#: src/usr/local/www/status_dhcpv6_leases.php:529
+#: src/usr/local/www/status_dhcpv6_leases.php:439
+#: src/usr/local/www/status_dhcpv6_leases.php:536
 msgid "DUID"
 msgstr ""
 
@@ -20340,87 +20539,88 @@ msgstr ""
 msgid "Enter the root-path string. This overrides setting on main page."
 msgstr ""
 
-#: src/usr/local/www/services_dhcpv6_relay.php:87
-msgid "A valid Destination Server IPv6 address must be specified."
+#: src/usr/local/www/services_dhcpv6_relay.php:89
+#, php-format
+msgid "Destination Server IP address %s is not a valid IPv6 address."
 msgstr ""
 
-#: src/usr/local/www/services_dhcpv6_relay.php:123
+#: src/usr/local/www/services_dhcpv6_relay.php:129
 msgid ""
 "DHCPv6 Server is currently enabled. Cannot enable the DHCPv6 Relay service "
 "while the DHCPv6 Server is enabled on any interface."
 msgstr ""
 
-#: src/usr/local/www/services_dhcpv6_relay.php:138
+#: src/usr/local/www/services_dhcpv6_relay.php:144
 msgid "DHCPv6 Relay Configuration"
 msgstr ""
 
-#: src/usr/local/www/services_dhcpv6_relay.php:153
+#: src/usr/local/www/services_dhcpv6_relay.php:159
 msgid "Interfaces without an IPv6 address will not be shown."
 msgstr ""
 
-#: src/usr/local/www/services_dhcpv6_relay.php:162
+#: src/usr/local/www/services_dhcpv6_relay.php:168
 #, php-format
 msgid ""
 "If this is checked, the DHCPv6 relay will append the circuit ID (%s "
 "interface number) and the agent ID to the DHCPv6 request."
 msgstr ""
 
-#: src/usr/local/www/services_dhcpv6_relay.php:174
+#: src/usr/local/www/services_dhcpv6_relay.php:181
 msgid ""
 "This is the IPv6 address of the server to which DHCPv6 requests are relayed."
 msgstr ""
 
-#: src/usr/local/www/services_dnsmasq.php:100
+#: src/usr/local/www/services_dnsmasq.php:145
 msgid ""
 "The DNS Resolver is enabled using this port. Choose a non-conflicting port, "
 "or disable DNS Resolver."
 msgstr ""
 
-#: src/usr/local/www/services_dnsmasq.php:108
+#: src/usr/local/www/services_dnsmasq.php:153
 #: src/usr/local/www/services_unbound.php:146
 msgid "A valid port number must be specified."
 msgstr ""
 
-#: src/usr/local/www/services_dnsmasq.php:127
+#: src/usr/local/www/services_dnsmasq.php:172
 msgid "Invalid custom options"
 msgstr ""
 
-#: src/usr/local/www/services_dnsmasq.php:195
+#: src/usr/local/www/services_dnsmasq.php:240
 msgid "The DNS forwarder configuration has been changed."
 msgstr ""
 
-#: src/usr/local/www/services_dnsmasq.php:200
+#: src/usr/local/www/services_dnsmasq.php:245
 msgid "General DNS Forwarder Options"
 msgstr ""
 
-#: src/usr/local/www/services_dnsmasq.php:223
+#: src/usr/local/www/services_dnsmasq.php:268
 #: src/usr/local/www/services_unbound.php:333
 msgid "Static DHCP"
 msgstr ""
 
-#: src/usr/local/www/services_dnsmasq.php:234
+#: src/usr/local/www/services_dnsmasq.php:279
 msgid "Prefer DHCP"
 msgstr ""
 
-#: src/usr/local/www/services_dnsmasq.php:242
-#: src/usr/local/www/services_dnsmasq.php:246
+#: src/usr/local/www/services_dnsmasq.php:287
+#: src/usr/local/www/services_dnsmasq.php:291
 #: src/usr/local/www/services_unbound.php:317
 msgid "DNS Query Forwarding"
 msgstr ""
 
-#: src/usr/local/www/services_dnsmasq.php:276
+#: src/usr/local/www/services_dnsmasq.php:321
 #: src/usr/local/www/services_unbound.php:274
 msgid "Listen Port"
 msgstr ""
 
-#: src/usr/local/www/services_dnsmasq.php:280
+#: src/usr/local/www/services_dnsmasq.php:325
 #: src/usr/local/www/services_unbound.php:278
 msgid ""
 "The port used for responding to DNS queries. It should normally be left "
 "blank unless another service needs to bind to TCP/UDP port 53."
 msgstr ""
 
-#: src/usr/local/www/services_dnsmasq.php:290
+#: src/usr/local/www/services_dnsmasq.php:335
 msgid ""
 "Interface IPs used by the DNS Forwarder for responding to queries from "
 "clients. If an interface has both IPv4 and IPv6 IPs, both are used. Queries "
@@ -20428,11 +20628,11 @@ msgid ""
 "behavior is to respond to queries on every available IPv4 and IPv6 address."
 msgstr ""
 
-#: src/usr/local/www/services_dnsmasq.php:295
+#: src/usr/local/www/services_dnsmasq.php:340
 msgid "Strict binding"
 msgstr ""
 
-#: src/usr/local/www/services_dnsmasq.php:298
+#: src/usr/local/www/services_dnsmasq.php:343
 msgid ""
 "If this option is set, the DNS forwarder will only bind to the interfaces "
 "containing the IP addresses selected above, rather than binding to all "
@@ -20440,7 +20640,7 @@ msgid ""
 "does NOT work with IPv6. If set, dnsmasq will not bind to IPv6 addresses."
 msgstr ""
 
-#: src/usr/local/www/services_dnsmasq.php:304
+#: src/usr/local/www/services_dnsmasq.php:349
 #: src/usr/local/www/services_unbound.php:341
 #: src/usr/local/www/services_unbound.php:355
 #: src/usr/local/www/vpn_openvpn_client.php:750
@@ -20448,24 +20648,24 @@ msgstr ""
 msgid "Custom options"
 msgstr ""
 
-#: src/usr/local/www/services_dnsmasq.php:306
+#: src/usr/local/www/services_dnsmasq.php:351
 msgid ""
 "Enter any additional options to add to the dnsmasq configuration here, "
 "separated by a space or newline."
 msgstr ""
 
-#: src/usr/local/www/services_dnsmasq.php:314
+#: src/usr/local/www/services_dnsmasq.php:359
 #: src/usr/local/www/services_unbound.php:428
 msgid "Host Overrides"
 msgstr ""
 
-#: src/usr/local/www/services_dnsmasq.php:320
-#: src/usr/local/www/services_dnsmasq.php:394
+#: src/usr/local/www/services_dnsmasq.php:365
+#: src/usr/local/www/services_dnsmasq.php:439
 #: src/usr/local/www/services_dnsmasq_domainoverride_edit.php:67
 #: src/usr/local/www/services_dnsmasq_domainoverride_edit.php:134
-#: src/usr/local/www/services_dnsmasq_edit.php:77
-#: src/usr/local/www/services_dnsmasq_edit.php:221
-#: src/usr/local/www/services_dnsmasq_edit.php:278
+#: src/usr/local/www/services_dnsmasq_edit.php:63
+#: src/usr/local/www/services_dnsmasq_edit.php:207
+#: src/usr/local/www/services_dnsmasq_edit.php:264
 #: src/usr/local/www/services_unbound.php:434
 #: src/usr/local/www/services_unbound.php:510
 #: src/usr/local/www/services_unbound_domainoverride_edit.php:63
@@ -20473,50 +20673,50 @@ msgstr ""
 #: src/usr/local/www/services_unbound_host_edit.php:78
 #: src/usr/local/www/services_unbound_host_edit.php:222
 #: src/usr/local/www/services_unbound_host_edit.php:279
-#: src/usr/local/www/system.php:113 src/usr/local/www/system.php:367
+#: src/usr/local/www/system.php:114 src/usr/local/www/system.php:370
 msgid "Domain"
 msgstr ""
 
-#: src/usr/local/www/services_dnsmasq.php:344
-#: src/usr/local/www/services_dnsmasq.php:368
+#: src/usr/local/www/services_dnsmasq.php:389
+#: src/usr/local/www/services_dnsmasq.php:413
 #: src/usr/local/www/services_unbound.php:459
 #: src/usr/local/www/services_unbound.php:483
 msgid "Edit host override"
 msgstr ""
 
-#: src/usr/local/www/services_dnsmasq.php:345
+#: src/usr/local/www/services_dnsmasq.php:390
 #: src/usr/local/www/services_unbound.php:460
 msgid "Delete host override"
 msgstr ""
 
-#: src/usr/local/www/services_dnsmasq.php:361
+#: src/usr/local/www/services_dnsmasq.php:406
 #: src/usr/local/www/services_unbound.php:476
 msgid "Alias for "
 msgstr ""
 
-#: src/usr/local/www/services_dnsmasq.php:389
+#: src/usr/local/www/services_dnsmasq.php:434
 #: src/usr/local/www/services_unbound.php:505
 msgid "Domain Overrides"
 msgstr ""
 
-#: src/usr/local/www/services_dnsmasq.php:416
+#: src/usr/local/www/services_dnsmasq.php:461
 #: src/usr/local/www/services_unbound.php:533
 msgid "Edit domain override"
 msgstr ""
 
-#: src/usr/local/www/services_dnsmasq.php:417
+#: src/usr/local/www/services_dnsmasq.php:462
 #: src/usr/local/www/services_unbound.php:534
 msgid "Delete domain override"
 msgstr ""
 
-#: src/usr/local/www/services_dnsmasq.php:438
+#: src/usr/local/www/services_dnsmasq.php:483
 msgid ""
 "If the DNS forwarder is enabled, the DHCP service (if enabled) will "
 "automatically serve the LAN IP address as a DNS server to DHCP clients so "
 "they will use the forwarder."
 msgstr ""
 
-#: src/usr/local/www/services_dnsmasq.php:440
+#: src/usr/local/www/services_dnsmasq.php:485
 #, php-format
 msgid ""
 "The DNS forwarder will use the DNS servers entered in %1$sSystem > General "
@@ -20532,7 +20732,7 @@ msgid "A valid domain must be specified after _msdcs."
 msgstr ""
 
 #: src/usr/local/www/services_dnsmasq_domainoverride_edit.php:82
-#: src/usr/local/www/services_dnsmasq_edit.php:92
+#: src/usr/local/www/services_dnsmasq_edit.php:78
 #: src/usr/local/www/services_unbound_domainoverride_edit.php:77
 #: src/usr/local/www/services_unbound_host_edit.php:93
 msgid "A valid domain must be specified."
@@ -20581,185 +20781,185 @@ msgid ""
 "Leave blank unless the DNS server is accessed through a VPN tunnel."
 msgstr ""
 
-#: src/usr/local/www/services_dnsmasq_edit.php:83
-#: src/usr/local/www/system.php:147
+#: src/usr/local/www/services_dnsmasq_edit.php:69
+#: src/usr/local/www/system.php:150
 msgid ""
 "The hostname can only contain the characters A-Z, 0-9 and '-'. It may not "
 "start or end with '-'."
 msgstr ""
 
-#: src/usr/local/www/services_dnsmasq_edit.php:124
+#: src/usr/local/www/services_dnsmasq_edit.php:110
 #: src/usr/local/www/services_unbound_host_edit.php:125
 msgid "Alias Domain"
 msgstr ""
 
-#: src/usr/local/www/services_dnsmasq_edit.php:129
+#: src/usr/local/www/services_dnsmasq_edit.php:115
 #: src/usr/local/www/services_unbound_host_edit.php:131
 msgid ""
 "Hostnames in an alias list can only contain the characters A-Z, 0-9 and '-'. "
 "They may not start or end with '-'."
 msgstr ""
 
-#: src/usr/local/www/services_dnsmasq_edit.php:132
+#: src/usr/local/www/services_dnsmasq_edit.php:118
 #: src/usr/local/www/services_unbound_host_edit.php:134
 msgid ""
 "A valid alias hostname is specified, but the domain name part should be "
 "omitted"
 msgstr ""
 
-#: src/usr/local/www/services_dnsmasq_edit.php:138
+#: src/usr/local/www/services_dnsmasq_edit.php:124
 #: src/usr/local/www/services_unbound_host_edit.php:139
 msgid "A valid domain must be specified in alias list."
 msgstr ""
 
-#: src/usr/local/www/services_dnsmasq_edit.php:152
+#: src/usr/local/www/services_dnsmasq_edit.php:139
 #: src/usr/local/www/services_unbound_host_edit.php:153
 msgid "This host/domain already exists."
 msgstr ""
 
-#: src/usr/local/www/services_dnsmasq_edit.php:199
+#: src/usr/local/www/services_dnsmasq_edit.php:185
 #: src/usr/local/www/services_unbound_host_edit.php:200
 msgid "Edit Host Override"
 msgstr ""
 
-#: src/usr/local/www/services_dnsmasq_edit.php:209
+#: src/usr/local/www/services_dnsmasq_edit.php:195
 #: src/usr/local/www/services_unbound_host_edit.php:210
 msgid "Host Override Options"
 msgstr ""
 
-#: src/usr/local/www/services_dnsmasq_edit.php:216
+#: src/usr/local/www/services_dnsmasq_edit.php:202
 #: src/usr/local/www/services_unbound_host_edit.php:217
 msgid "Name of the host, without the domain part<br />e.g.: \"myhost\""
 msgstr ""
 
-#: src/usr/local/www/services_dnsmasq_edit.php:224
+#: src/usr/local/www/services_dnsmasq_edit.php:210
 #: src/usr/local/www/services_unbound_host_edit.php:225
 msgid "Domain of the host<br />e.g.: \"example.com\""
 msgstr ""
 
-#: src/usr/local/www/services_dnsmasq_edit.php:231
+#: src/usr/local/www/services_dnsmasq_edit.php:217
 #: src/usr/local/www/services_unbound_host_edit.php:232
 msgid "IP address of the host<br />e.g.: 192.168.100.100 or fd00:abcd::1"
 msgstr ""
 
-#: src/usr/local/www/services_dnsmasq_edit.php:252
+#: src/usr/local/www/services_dnsmasq_edit.php:238
 #: src/usr/local/www/services_unbound_host_edit.php:253
 msgid "Additional Names for this Host"
 msgstr ""
 
-#: src/usr/local/www/services_dnsmasq_edit.php:271
+#: src/usr/local/www/services_dnsmasq_edit.php:257
 #: src/usr/local/www/services_unbound_host_edit.php:272
 msgid "Host name"
 msgstr ""
 
-#: src/usr/local/www/services_dnsmasq_edit.php:301
+#: src/usr/local/www/services_dnsmasq_edit.php:287
 #: src/usr/local/www/services_unbound_host_edit.php:302
 msgid "Add Host Name"
 msgstr ""
 
-#: src/usr/local/www/services_dyndns.php:88
+#: src/usr/local/www/services_dyndns.php:89
 #: src/usr/local/www/services_ntpd_acls.php:206
 #: src/usr/local/www/status_openvpn.php:231
 #: src/usr/local/www/status_openvpn.php:287
 #: src/usr/local/www/status_services.php:86
-#: src/usr/local/www/widgets/widgets/dyn_dns_status.widget.php:95
+#: src/usr/local/www/widgets/widgets/dyn_dns_status.widget.php:108
 #: src/usr/local/www/widgets/widgets/services_status.widget.php:74
 msgid "Service"
 msgstr ""
 
-#: src/usr/local/www/services_dyndns.php:90
+#: src/usr/local/www/services_dyndns.php:91
 #: src/usr/local/www/services_rfc2136.php:83
-#: src/usr/local/www/widgets/widgets/dyn_dns_status.widget.php:97
+#: src/usr/local/www/widgets/widgets/dyn_dns_status.widget.php:110
 msgid "Cached IP"
 msgstr ""
 
-#: src/usr/local/www/services_dyndns.php:217
+#: src/usr/local/www/services_dyndns.php:218
 msgid ""
 "IP addresses appearing in <span class=\"text-success\">green</span> are up "
 "to date with Dynamic DNS provider. "
 msgstr ""
 
-#: src/usr/local/www/services_dyndns.php:218
+#: src/usr/local/www/services_dyndns.php:219
 msgid ""
 "An update for an IP address can be forced on the edit page for that service."
 msgstr ""
 
-#: src/usr/local/www/services_dyndns_edit.php:90
+#: src/usr/local/www/services_dyndns_edit.php:91
 msgid "Service type"
 msgstr ""
 
-#: src/usr/local/www/services_dyndns_edit.php:105
-#: src/usr/local/www/services_dyndns_edit.php:375
+#: src/usr/local/www/services_dyndns_edit.php:106
+#: src/usr/local/www/services_dyndns_edit.php:376
 msgid "Update URL"
 msgstr ""
 
-#: src/usr/local/www/services_dyndns_edit.php:134
+#: src/usr/local/www/services_dyndns_edit.php:135
 msgid "The hostname contains invalid characters."
 msgstr ""
 
-#: src/usr/local/www/services_dyndns_edit.php:141
+#: src/usr/local/www/services_dyndns_edit.php:142
 msgid "The MX contains invalid characters."
 msgstr ""
 
-#: src/usr/local/www/services_dyndns_edit.php:144
+#: src/usr/local/www/services_dyndns_edit.php:145
 #: src/usr/local/www/system_usermanager.php:198
 #: src/usr/local/www/vpn_l2tp_users_edit.php:83
 msgid "The username contains invalid characters."
 msgstr ""
 
-#: src/usr/local/www/services_dyndns_edit.php:252
+#: src/usr/local/www/services_dyndns_edit.php:253
 msgid "Dynamic DNS Client"
 msgstr ""
 
-#: src/usr/local/www/services_dyndns_edit.php:265
+#: src/usr/local/www/services_dyndns_edit.php:266
 msgid "Service Type"
 msgstr ""
 
-#: src/usr/local/www/services_dyndns_edit.php:274
+#: src/usr/local/www/services_dyndns_edit.php:275
 msgid "Interface to monitor"
 msgstr ""
 
-#: src/usr/local/www/services_dyndns_edit.php:281
+#: src/usr/local/www/services_dyndns_edit.php:282
 msgid "Interface to send update from"
 msgstr ""
 
-#: src/usr/local/www/services_dyndns_edit.php:284
+#: src/usr/local/www/services_dyndns_edit.php:285
 msgid "This is almost always the same as the Interface to Monitor. "
 msgstr ""
 
-#: src/usr/local/www/services_dyndns_edit.php:301
+#: src/usr/local/www/services_dyndns_edit.php:302
 msgid ""
 "Enter the complete fully qualified domain name. Example: myhost.dyndns."
 "org<br />he.net tunnelbroker: Enter the tunnel ID.<br />GleSYS: Enter the "
-"record ID.<br />DNSimple: Enter only the domain name.<br />Namecheap: Enter "
-"the hostname and the domain separately, with the domain being the domain or "
-"subdomain zone being handled by Namecheap."
+"record ID.<br />DNSimple: Enter only the domain name.<br />Namecheap, "
+"Cloudflare, GratisDNS: Enter the hostname and the domain separately, with "
+"the domain being the domain or subdomain zone being handled by the provider."
 msgstr ""
 
-#: src/usr/local/www/services_dyndns_edit.php:311
+#: src/usr/local/www/services_dyndns_edit.php:312
 msgid "MX"
 msgstr ""
 
-#: src/usr/local/www/services_dyndns_edit.php:314
+#: src/usr/local/www/services_dyndns_edit.php:315
 msgid ""
 "Note: With DynDNS service only a hostname can be used, not an IP address. "
 "Set this option only if a special MX record is needed. Not all services "
 "support this."
 msgstr ""
 
-#: src/usr/local/www/services_dyndns_edit.php:319
+#: src/usr/local/www/services_dyndns_edit.php:320
 msgid "Wildcards"
 msgstr ""
 
-#: src/usr/local/www/services_dyndns_edit.php:326
+#: src/usr/local/www/services_dyndns_edit.php:327
 msgid "Verbose logging"
 msgstr ""
 
-#: src/usr/local/www/services_dyndns_edit.php:333
+#: src/usr/local/www/services_dyndns_edit.php:334
 msgid "CURL options"
 msgstr ""
 
-#: src/usr/local/www/services_dyndns_edit.php:350
+#: src/usr/local/www/services_dyndns_edit.php:351
 msgid ""
 "Username is required for all types except Namecheap, FreeDNS and Custom "
 "Entries.<br />Route 53: Enter the Access Key ID.<br />GleSYS: Enter the API "
@@ -20767,43 +20967,43 @@ msgid ""
 "Authentication username and passwords."
 msgstr ""
 
-#: src/usr/local/www/services_dyndns_edit.php:360
+#: src/usr/local/www/services_dyndns_edit.php:361
 msgid ""
 "FreeDNS (freedns.afraid.org): Enter the \"Authentication Token\" provided by "
 "FreeDNS.<br />Route 53: Enter the Secret Access Key.<br />GleSYS: Enter the "
 "API key.<br />DNSimple: Enter the API token."
 msgstr ""
 
-#: src/usr/local/www/services_dyndns_edit.php:367
+#: src/usr/local/www/services_dyndns_edit.php:368
 msgid "Zone ID"
 msgstr ""
 
-#: src/usr/local/www/services_dyndns_edit.php:370
+#: src/usr/local/www/services_dyndns_edit.php:371
 msgid ""
 "Enter Zone ID that was received when creating the domain in Route 53.<br /"
 ">DNSimple: Enter the Record ID of record to update."
 msgstr ""
 
-#: src/usr/local/www/services_dyndns_edit.php:378
+#: src/usr/local/www/services_dyndns_edit.php:379
 msgid ""
 "This is the only field required by for Custom Dynamic DNS, and is only used "
 "by Custom Entries."
 msgstr ""
 
-#: src/usr/local/www/services_dyndns_edit.php:382
+#: src/usr/local/www/services_dyndns_edit.php:383
 msgid "Result Match"
 msgstr ""
 
-#: src/usr/local/www/services_dyndns_edit.php:391
+#: src/usr/local/www/services_dyndns_edit.php:392
 #: src/usr/local/www/services_rfc2136_edit.php:78
 msgid "TTL"
 msgstr ""
 
-#: src/usr/local/www/services_dyndns_edit.php:394
+#: src/usr/local/www/services_dyndns_edit.php:395
 msgid "Choose TTL for the dns record."
 msgstr ""
 
-#: src/usr/local/www/services_dyndns_edit.php:413
+#: src/usr/local/www/services_dyndns_edit.php:414
 #: src/usr/local/www/services_rfc2136_edit.php:303
 msgid "Save & Force Update"
 msgstr ""
@@ -20872,7 +21072,7 @@ msgstr ""
 msgid "Upgraded settings from openttpd"
 msgstr ""
 
-#: src/usr/local/www/services_ntpd.php:197
+#: src/usr/local/www/services_ntpd.php:201
 #: src/usr/local/www/services_ntpd_acls.php:161
 #: src/usr/local/www/services_ntpd_acls.php:174
 #: src/usr/local/www/services_ntpd_gps.php:197
@@ -20880,7 +21080,7 @@ msgstr ""
 msgid "ACLs"
 msgstr ""
 
-#: src/usr/local/www/services_ntpd.php:198
+#: src/usr/local/www/services_ntpd.php:202
 #: src/usr/local/www/services_ntpd_acls.php:175
 #: src/usr/local/www/services_ntpd_gps.php:191
 #: src/usr/local/www/services_ntpd_gps.php:198
@@ -20888,7 +21088,7 @@ msgstr ""
 msgid "Serial GPS"
 msgstr ""
 
-#: src/usr/local/www/services_ntpd.php:199
+#: src/usr/local/www/services_ntpd.php:203
 #: src/usr/local/www/services_ntpd_acls.php:176
 #: src/usr/local/www/services_ntpd_gps.php:199
 #: src/usr/local/www/services_ntpd_pps.php:102
@@ -20898,35 +21098,37 @@ msgstr ""
 msgid "PPS"
 msgstr ""
 
-#: src/usr/local/www/services_ntpd.php:205
+#: src/usr/local/www/services_ntpd.php:209
 msgid "NTP Server Configuration"
 msgstr ""
 
-#: src/usr/local/www/services_ntpd.php:215
+#: src/usr/local/www/services_ntpd.php:219
 msgid ""
 "Interfaces without an IP address will not be shown.<br />Selecting no "
 "interfaces will listen on all interfaces with a wildcard.<br />Selecting all "
 "interfaces will explicitly listen on only the interfaces/IPs specified."
 msgstr ""
 
-#: src/usr/local/www/services_ntpd.php:222
+#: src/usr/local/www/services_ntpd.php:227
 msgid "Time Servers"
 msgstr ""
 
-#: src/usr/local/www/services_ntpd.php:267
+#: src/usr/local/www/services_ntpd.php:280
 msgid ""
-"For best results three to five servers should be configured here.<br />The "
-"prefer option indicates that NTP should favor the use of this server more "
-"than all others.<br />The no select option indicates that NTP should not use "
-"this server for time, but stats for this server will be collected and "
-"displayed."
+"For best results three to five servers should be configured here, or at "
+"least one pool.<br />The <b>Prefer</b> option indicates that NTP should "
+"favor the use of this server more than all others.<br />The <b>No Select</b> "
+"option indicates that NTP should not use this server for time, but stats for "
+"this server will be collected and displayed.<br />The <b>Is a Pool</b> "
+"option indicates this entry is a pool of NTP servers and not a single "
+"address. This is assumed for *.pool.ntp.org."
 msgstr ""
 
-#: src/usr/local/www/services_ntpd.php:273
+#: src/usr/local/www/services_ntpd.php:287
 msgid "Orphan Mode"
 msgstr ""
 
-#: src/usr/local/www/services_ntpd.php:276
+#: src/usr/local/www/services_ntpd.php:290
 msgid ""
 "Orphan mode allows the system clock to be used when no other clocks are "
 "available. The number here specifies the stratum reported during orphan mode "
@@ -20934,61 +21136,59 @@ msgid ""
 "servers available to clients are preferred over this server (default: 12)."
 msgstr ""
 
-#: src/usr/local/www/services_ntpd.php:282
+#: src/usr/local/www/services_ntpd.php:296
 msgid "NTP Graphs"
 msgstr ""
 
-#: src/usr/local/www/services_ntpd.php:289
+#: src/usr/local/www/services_ntpd.php:303
 msgid "Logging"
 msgstr ""
 
-#: src/usr/local/www/services_ntpd.php:299
+#: src/usr/local/www/services_ntpd.php:313
 msgid ""
 "These options enable additional messages from NTP to be written to the "
 "System Log <a href=\"status_logs.php?logfile=ntpd\">Status > System Logs > "
 "NTP</a>."
 msgstr ""
 
-#: src/usr/local/www/services_ntpd.php:313
+#: src/usr/local/www/services_ntpd.php:327
 msgid "Statistics Logging"
 msgstr ""
 
-#: src/usr/local/www/services_ntpd.php:315
+#: src/usr/local/www/services_ntpd.php:329
 msgid ""
 "Warning: These options will create persistent daily log files in /var/log/"
 "ntp."
 msgstr ""
 
-#: src/usr/local/www/services_ntpd.php:349
+#: src/usr/local/www/services_ntpd.php:363
 msgid "Leap seconds"
 msgstr ""
 
-#: src/usr/local/www/services_ntpd.php:351
+#: src/usr/local/www/services_ntpd.php:365
 msgid ""
 "A leap second file allows NTP to advertise an upcoming leap second addition "
 "or subtraction. Normally this is only useful if this server is a stratum 1 "
 "time server. "
 msgstr ""
 
-#: src/usr/local/www/services_ntpd.php:358
+#: src/usr/local/www/services_ntpd.php:372
 msgid "Enter Leap second configuration as text OR select a file to upload."
 msgstr ""
 
-#: src/usr/local/www/services_ntpd_acls.php:88
-#: src/usr/local/www/services_ntpd_acls.php:101
-#: src/usr/local/www/services_unbound_acls.php:117
-#: src/usr/local/www/services_unbound_acls.php:131
-msgid "A valid IP address must be entered for each row under Networks."
+#: src/usr/local/www/services_ntpd_acls.php:92
+#, php-format
+msgid "A valid IP address must be entered for row %s under Networks."
 msgstr ""
 
-#: src/usr/local/www/services_ntpd_acls.php:92
-#: src/usr/local/www/services_unbound_acls.php:122
-msgid "A valid IPv4 netmask must be entered for each IPv4 row under Networks."
+#: src/usr/local/www/services_ntpd_acls.php:96
+#, php-format
+msgid "A valid IPv4 netmask must be entered for IPv4 row %s under Networks."
 msgstr ""
 
-#: src/usr/local/www/services_ntpd_acls.php:98
-#: src/usr/local/www/services_unbound_acls.php:128
-msgid "A valid IPv6 netmask must be entered for each IPv6 row under Networks."
+#: src/usr/local/www/services_ntpd_acls.php:99
+#, php-format
+msgid "A valid IPv6 netmask must be entered for IPv6 row %s under Networks."
 msgstr ""
 
 #: src/usr/local/www/services_ntpd_acls.php:181
@@ -21213,7 +21413,7 @@ msgid ""
 msgstr ""
 
 #: src/usr/local/www/services_ntpd_pps.php:161
-#: src/usr/local/www/status_ntpd.php:269
+#: src/usr/local/www/status_ntpd.php:273
 msgid "Stratum"
 msgstr ""
 
@@ -21409,7 +21609,7 @@ msgstr ""
 #: src/usr/local/www/services_pppoe_edit.php:422
 #: src/usr/local/www/services_pppoe_edit.php:455
 #: src/usr/local/www/system_authservers.php:260
-#: src/usr/local/www/system_authservers.php:749
+#: src/usr/local/www/system_authservers.php:750
 msgid "Authentication port"
 msgstr ""
 
@@ -21751,113 +21951,113 @@ msgid ""
 "character as separator."
 msgstr ""
 
-#: src/usr/local/www/services_snmp.php:84
+#: src/usr/local/www/services_snmp.php:88
 msgid "Invalid character '#' in system location"
 msgstr ""
 
-#: src/usr/local/www/services_snmp.php:87
+#: src/usr/local/www/services_snmp.php:91
 msgid "Invalid character '#' in system contact"
 msgstr ""
 
-#: src/usr/local/www/services_snmp.php:90
+#: src/usr/local/www/services_snmp.php:94
 msgid "Invalid character '#' in read community string"
 msgstr ""
 
-#: src/usr/local/www/services_snmp.php:94
+#: src/usr/local/www/services_snmp.php:98
 msgid "Community"
 msgstr ""
 
-#: src/usr/local/www/services_snmp.php:98
-#: src/usr/local/www/services_snmp.php:207
+#: src/usr/local/www/services_snmp.php:102
+#: src/usr/local/www/services_snmp.php:224
 msgid "Polling Port"
 msgstr ""
 
-#: src/usr/local/www/services_snmp.php:106
+#: src/usr/local/www/services_snmp.php:110
 msgid "Invalid character '#' in SNMP trap string"
 msgstr ""
 
-#: src/usr/local/www/services_snmp.php:110
-#: src/usr/local/www/services_snmp.php:256
+#: src/usr/local/www/services_snmp.php:114
+#: src/usr/local/www/services_snmp.php:273
 msgid "Trap server"
 msgstr ""
 
-#: src/usr/local/www/services_snmp.php:114
+#: src/usr/local/www/services_snmp.php:118
 msgid "Trap server port"
 msgstr ""
 
-#: src/usr/local/www/services_snmp.php:118
+#: src/usr/local/www/services_snmp.php:122
 msgid "Trap string"
 msgstr ""
 
-#: src/usr/local/www/services_snmp.php:192
+#: src/usr/local/www/services_snmp.php:209
 msgid "SNMP Daemon"
 msgstr ""
 
-#: src/usr/local/www/services_snmp.php:203
+#: src/usr/local/www/services_snmp.php:220
 msgid "SNMP Daemon Settings"
 msgstr ""
 
-#: src/usr/local/www/services_snmp.php:210
+#: src/usr/local/www/services_snmp.php:227
 msgid "Enter the port to accept polling events on (default 161)."
 msgstr ""
 
-#: src/usr/local/www/services_snmp.php:214
+#: src/usr/local/www/services_snmp.php:231
 msgid "System Location"
 msgstr ""
 
-#: src/usr/local/www/services_snmp.php:221
+#: src/usr/local/www/services_snmp.php:238
 msgid "System Contact"
 msgstr ""
 
-#: src/usr/local/www/services_snmp.php:228
+#: src/usr/local/www/services_snmp.php:245
 msgid "Read Community String"
 msgstr ""
 
-#: src/usr/local/www/services_snmp.php:231
+#: src/usr/local/www/services_snmp.php:248
 msgid ""
 "The community string is like a password, restricting access to querying SNMP "
 "to hosts knowing the community string. Use a strong value here to protect "
 "from unauthorized information disclosure."
 msgstr ""
 
-#: src/usr/local/www/services_snmp.php:235
+#: src/usr/local/www/services_snmp.php:252
 msgid "SNMP Traps Enable"
 msgstr ""
 
-#: src/usr/local/www/services_snmp.php:246
+#: src/usr/local/www/services_snmp.php:263
 msgid "SNMP Trap Settings"
 msgstr ""
 
-#: src/usr/local/www/services_snmp.php:259
+#: src/usr/local/www/services_snmp.php:276
 msgid "Enter the trap server name"
 msgstr ""
 
-#: src/usr/local/www/services_snmp.php:263
+#: src/usr/local/www/services_snmp.php:280
 msgid "Trap Server Port"
 msgstr ""
 
-#: src/usr/local/www/services_snmp.php:266
+#: src/usr/local/www/services_snmp.php:283
 msgid "Enter the port to send the traps to (default 162)"
 msgstr ""
 
-#: src/usr/local/www/services_snmp.php:270
+#: src/usr/local/www/services_snmp.php:287
 msgid "SNMP Trap String"
 msgstr ""
 
-#: src/usr/local/www/services_snmp.php:277
+#: src/usr/local/www/services_snmp.php:294
 msgid "SNMP Modules"
 msgstr ""
 
-#: src/usr/local/www/services_snmp.php:279
+#: src/usr/local/www/services_snmp.php:296
 msgid "SNMP modules"
 msgstr ""
 
-#: src/usr/local/www/services_snmp.php:326
+#: src/usr/local/www/services_snmp.php:343
 msgid "Interface Binding"
 msgstr ""
 
-#: src/usr/local/www/services_snmp.php:330
-msgid "Bind Interface"
+#: src/usr/local/www/services_snmp.php:349
+msgid "Bind Interfaces"
 msgstr ""
 
 #: src/usr/local/www/services_unbound.php:106
@@ -22001,6 +22201,19 @@ msgid ""
 "overridden by DHCP/PPP on WAN&quot; is checked."
 msgstr ""
 
+#: src/usr/local/www/services_unbound_acls.php:117
+#: src/usr/local/www/services_unbound_acls.php:131
+msgid "A valid IP address must be entered for each row under Networks."
+msgstr ""
+
+#: src/usr/local/www/services_unbound_acls.php:122
+msgid "A valid IPv4 netmask must be entered for each IPv4 row under Networks."
+msgstr ""
+
+#: src/usr/local/www/services_unbound_acls.php:128
+msgid "A valid IPv6 netmask must be entered for each IPv6 row under Networks."
+msgstr ""
+
 #: src/usr/local/www/services_unbound_acls.php:139
 msgid "save"
 msgstr ""
@@ -22486,162 +22699,162 @@ msgstr ""
 msgid "Done."
 msgstr ""
 
-#: src/usr/local/www/status_captiveportal.php:98
-#: src/usr/local/www/status_captiveportal.php:107
-#: src/usr/local/www/status_captiveportal_expire.php:68
-#: src/usr/local/www/status_captiveportal_test.php:76
-#: src/usr/local/www/status_captiveportal_voucher_rolls.php:64
-#: src/usr/local/www/status_captiveportal_vouchers.php:100
+#: src/usr/local/www/status_captiveportal.php:103
+#: src/usr/local/www/status_captiveportal.php:112
+#: src/usr/local/www/status_captiveportal_expire.php:72
+#: src/usr/local/www/status_captiveportal_test.php:80
+#: src/usr/local/www/status_captiveportal_voucher_rolls.php:69
+#: src/usr/local/www/status_captiveportal_vouchers.php:105
 msgid "Active Users"
 msgstr ""
 
-#: src/usr/local/www/status_captiveportal.php:108
-#: src/usr/local/www/status_captiveportal_expire.php:69
-#: src/usr/local/www/status_captiveportal_test.php:77
-#: src/usr/local/www/status_captiveportal_voucher_rolls.php:65
-#: src/usr/local/www/status_captiveportal_vouchers.php:52
-#: src/usr/local/www/status_captiveportal_vouchers.php:101
+#: src/usr/local/www/status_captiveportal.php:113
+#: src/usr/local/www/status_captiveportal_expire.php:73
+#: src/usr/local/www/status_captiveportal_test.php:81
+#: src/usr/local/www/status_captiveportal_voucher_rolls.php:70
+#: src/usr/local/www/status_captiveportal_vouchers.php:57
+#: src/usr/local/www/status_captiveportal_vouchers.php:106
 msgid "Active Vouchers"
 msgstr ""
 
-#: src/usr/local/www/status_captiveportal.php:110
-#: src/usr/local/www/status_captiveportal_expire.php:71
-#: src/usr/local/www/status_captiveportal_test.php:53
-#: src/usr/local/www/status_captiveportal_test.php:79
-#: src/usr/local/www/status_captiveportal_test.php:85
-#: src/usr/local/www/status_captiveportal_voucher_rolls.php:67
-#: src/usr/local/www/status_captiveportal_vouchers.php:103
+#: src/usr/local/www/status_captiveportal.php:115
+#: src/usr/local/www/status_captiveportal_expire.php:75
+#: src/usr/local/www/status_captiveportal_test.php:57
+#: src/usr/local/www/status_captiveportal_test.php:83
+#: src/usr/local/www/status_captiveportal_test.php:89
+#: src/usr/local/www/status_captiveportal_voucher_rolls.php:72
+#: src/usr/local/www/status_captiveportal_vouchers.php:108
 msgid "Test Vouchers"
 msgstr ""
 
-#: src/usr/local/www/status_captiveportal.php:111
-#: src/usr/local/www/status_captiveportal_expire.php:53
-#: src/usr/local/www/status_captiveportal_expire.php:72
-#: src/usr/local/www/status_captiveportal_expire.php:77
-#: src/usr/local/www/status_captiveportal_test.php:80
-#: src/usr/local/www/status_captiveportal_voucher_rolls.php:68
-#: src/usr/local/www/status_captiveportal_vouchers.php:104
+#: src/usr/local/www/status_captiveportal.php:116
+#: src/usr/local/www/status_captiveportal_expire.php:57
+#: src/usr/local/www/status_captiveportal_expire.php:76
+#: src/usr/local/www/status_captiveportal_expire.php:81
+#: src/usr/local/www/status_captiveportal_test.php:84
+#: src/usr/local/www/status_captiveportal_voucher_rolls.php:73
+#: src/usr/local/www/status_captiveportal_vouchers.php:109
 msgid "Expire Vouchers"
 msgstr ""
 
-#: src/usr/local/www/status_captiveportal.php:121
+#: src/usr/local/www/status_captiveportal.php:126
 msgid "Captive Portal Zone"
 msgstr ""
 
-#: src/usr/local/www/status_captiveportal.php:131
+#: src/usr/local/www/status_captiveportal.php:136
 msgid "Display Zone"
 msgstr ""
 
-#: src/usr/local/www/status_captiveportal.php:144
+#: src/usr/local/www/status_captiveportal.php:149
 #, php-format
 msgid "Users Logged In (%d)"
 msgstr ""
 
-#: src/usr/local/www/status_captiveportal.php:159
+#: src/usr/local/www/status_captiveportal.php:164
 #: src/usr/local/www/widgets/widgets/captive_portal_status.widget.php:85
 msgid "Session start"
 msgstr ""
 
-#: src/usr/local/www/status_captiveportal.php:166
+#: src/usr/local/www/status_captiveportal.php:171
 #: src/usr/local/www/widgets/widgets/captive_portal_status.widget.php:86
 msgid "Last activity"
 msgstr ""
 
-#: src/usr/local/www/status_captiveportal.php:218
+#: src/usr/local/www/status_captiveportal.php:223
 msgid "Disconnect this User"
 msgstr ""
 
-#: src/usr/local/www/status_captiveportal.php:231
+#: src/usr/local/www/status_captiveportal.php:236
 #, php-format
 msgid ""
 "No Captive Portal zones have been configured. New zones may be added here: "
 "%1$sServices > Captive Portal%2$s."
 msgstr ""
 
-#: src/usr/local/www/status_captiveportal.php:244
+#: src/usr/local/www/status_captiveportal.php:249
 msgid "Don't show last activity"
 msgstr ""
 
-#: src/usr/local/www/status_captiveportal.php:246
+#: src/usr/local/www/status_captiveportal.php:251
 msgid "Hide Last Activity"
 msgstr ""
 
-#: src/usr/local/www/status_captiveportal.php:252
+#: src/usr/local/www/status_captiveportal.php:257
 msgid "Show last activity"
 msgstr ""
 
-#: src/usr/local/www/status_captiveportal.php:254
+#: src/usr/local/www/status_captiveportal.php:259
 msgid "Show Last Activity"
 msgstr ""
 
-#: src/usr/local/www/status_captiveportal_expire.php:60
+#: src/usr/local/www/status_captiveportal_expire.php:64
 msgid "Voucher(s) successfully marked."
 msgstr ""
 
-#: src/usr/local/www/status_captiveportal_expire.php:62
+#: src/usr/local/www/status_captiveportal_expire.php:66
 msgid "Voucher(s) could not be processed."
 msgstr ""
 
-#: src/usr/local/www/status_captiveportal_expire.php:83
+#: src/usr/local/www/status_captiveportal_expire.php:87
 msgid ""
 "Enter multiple vouchers separated by space or newline. All valid vouchers "
 "will be marked as expired."
 msgstr ""
 
-#: src/usr/local/www/status_captiveportal_expire.php:96
+#: src/usr/local/www/status_captiveportal_expire.php:100
 msgid "Expire"
 msgstr ""
 
-#: src/usr/local/www/status_captiveportal_test.php:91
+#: src/usr/local/www/status_captiveportal_test.php:95
 msgid ""
 "Enter multiple vouchers separated by space or newline. The remaining time, "
 "if valid, will be shown for each voucher."
 msgstr ""
 
-#: src/usr/local/www/status_captiveportal_voucher_rolls.php:76
+#: src/usr/local/www/status_captiveportal_voucher_rolls.php:81
 msgid "Roll#"
 msgstr ""
 
-#: src/usr/local/www/status_captiveportal_voucher_rolls.php:80
+#: src/usr/local/www/status_captiveportal_voucher_rolls.php:85
 msgid "used"
 msgstr ""
 
-#: src/usr/local/www/status_captiveportal_voucher_rolls.php:81
+#: src/usr/local/www/status_captiveportal_voucher_rolls.php:86
 #: src/usr/local/www/status_dhcp_leases.php:143
-#: src/usr/local/www/status_dhcpv6_leases.php:189
+#: src/usr/local/www/status_dhcpv6_leases.php:196
 msgid "active"
 msgstr ""
 
-#: src/usr/local/www/status_captiveportal_voucher_rolls.php:82
+#: src/usr/local/www/status_captiveportal_voucher_rolls.php:87
 msgid "ready"
 msgstr ""
 
-#: src/usr/local/www/status_captiveportal_vouchers.php:109
+#: src/usr/local/www/status_captiveportal_vouchers.php:114
 #, php-format
 msgid "Vouchers in Use (%d)"
 msgstr ""
 
-#: src/usr/local/www/status_captiveportal_vouchers.php:114
+#: src/usr/local/www/status_captiveportal_vouchers.php:119
 msgid "Voucher"
 msgstr ""
 
-#: src/usr/local/www/status_captiveportal_vouchers.php:115
+#: src/usr/local/www/status_captiveportal_vouchers.php:120
 msgid "Roll"
 msgstr ""
 
-#: src/usr/local/www/status_captiveportal_vouchers.php:116
+#: src/usr/local/www/status_captiveportal_vouchers.php:121
 msgid "Activated at"
 msgstr ""
 
-#: src/usr/local/www/status_captiveportal_vouchers.php:117
+#: src/usr/local/www/status_captiveportal_vouchers.php:122
 msgid "Expires in"
 msgstr ""
 
-#: src/usr/local/www/status_captiveportal_vouchers.php:118
+#: src/usr/local/www/status_captiveportal_vouchers.php:123
 msgid "Expires at"
 msgstr ""
 
-#: src/usr/local/www/status_captiveportal_vouchers.php:129
+#: src/usr/local/www/status_captiveportal_vouchers.php:134
 msgid "min"
 msgstr ""
 
@@ -22716,64 +22929,64 @@ msgid "pfSync nodes"
 msgstr ""
 
 #: src/usr/local/www/status_dhcp_leases.php:141
-#: src/usr/local/www/status_dhcpv6_leases.php:187
+#: src/usr/local/www/status_dhcpv6_leases.php:194
 msgid "online"
 msgstr ""
 
 #: src/usr/local/www/status_dhcp_leases.php:142
-#: src/usr/local/www/status_dhcpv6_leases.php:188
+#: src/usr/local/www/status_dhcpv6_leases.php:195
 msgid "offline"
 msgstr ""
 
 #: src/usr/local/www/status_dhcp_leases.php:144
-#: src/usr/local/www/status_dhcpv6_leases.php:190
+#: src/usr/local/www/status_dhcpv6_leases.php:197
 msgid "expired"
 msgstr ""
 
 #: src/usr/local/www/status_dhcp_leases.php:145
-#: src/usr/local/www/status_dhcpv6_leases.php:191
+#: src/usr/local/www/status_dhcpv6_leases.php:198
 msgid "reserved"
 msgstr ""
 
 #: src/usr/local/www/status_dhcp_leases.php:146
-#: src/usr/local/www/status_dhcpv6_leases.php:193
+#: src/usr/local/www/status_dhcpv6_leases.php:200
 msgid "dynamic"
 msgstr ""
 
 #: src/usr/local/www/status_dhcp_leases.php:147
-#: src/usr/local/www/status_dhcpv6_leases.php:194
+#: src/usr/local/www/status_dhcpv6_leases.php:201
 msgid "static"
 msgstr ""
 
-#: src/usr/local/www/status_dhcp_leases.php:309
-#: src/usr/local/www/status_dhcpv6_leases.php:388
+#: src/usr/local/www/status_dhcp_leases.php:317
+#: src/usr/local/www/status_dhcpv6_leases.php:395
 msgid "Pool Status"
 msgstr ""
 
-#: src/usr/local/www/status_dhcp_leases.php:314
-#: src/usr/local/www/status_dhcpv6_leases.php:393
+#: src/usr/local/www/status_dhcp_leases.php:322
+#: src/usr/local/www/status_dhcpv6_leases.php:400
 msgid "Failover Group"
 msgstr ""
 
-#: src/usr/local/www/status_dhcp_leases.php:315
-#: src/usr/local/www/status_dhcpv6_leases.php:394
+#: src/usr/local/www/status_dhcp_leases.php:323
+#: src/usr/local/www/status_dhcpv6_leases.php:401
 msgid "My State"
 msgstr ""
 
-#: src/usr/local/www/status_dhcp_leases.php:316
-#: src/usr/local/www/status_dhcp_leases.php:318
-#: src/usr/local/www/status_dhcpv6_leases.php:395
-#: src/usr/local/www/status_dhcpv6_leases.php:397
+#: src/usr/local/www/status_dhcp_leases.php:324
+#: src/usr/local/www/status_dhcp_leases.php:326
+#: src/usr/local/www/status_dhcpv6_leases.php:402
+#: src/usr/local/www/status_dhcpv6_leases.php:404
 msgid "Since"
 msgstr ""
 
-#: src/usr/local/www/status_dhcp_leases.php:317
-#: src/usr/local/www/status_dhcpv6_leases.php:396
+#: src/usr/local/www/status_dhcp_leases.php:325
+#: src/usr/local/www/status_dhcpv6_leases.php:403
 msgid "Peer State"
 msgstr ""
 
-#: src/usr/local/www/status_dhcp_leases.php:340
-#: src/usr/local/www/status_dhcpv6_leases.php:424
+#: src/usr/local/www/status_dhcp_leases.php:348
+#: src/usr/local/www/status_dhcpv6_leases.php:431
 #: src/usr/local/www/status_ipsec.php:463
 #: src/usr/local/www/status_ipsec_leases.php:32
 #: src/usr/local/www/status_ipsec_leases.php:40
@@ -22782,122 +22995,130 @@ msgstr ""
 msgid "Leases"
 msgstr ""
 
-#: src/usr/local/www/status_dhcp_leases.php:351
-#: src/usr/local/www/status_dhcpv6_leases.php:436
-#: src/usr/local/www/status_dhcpv6_leases.php:531
+#: src/usr/local/www/status_dhcp_leases.php:360
+msgid "Client Id"
+msgstr ""
+
+#: src/usr/local/www/status_dhcp_leases.php:367
+#: src/usr/local/www/status_dhcpv6_leases.php:443
+#: src/usr/local/www/status_dhcpv6_leases.php:538
 msgid "End"
 msgstr ""
 
-#: src/usr/local/www/status_dhcp_leases.php:352
-#: src/usr/local/www/status_dhcpv6_leases.php:437
+#: src/usr/local/www/status_dhcp_leases.php:368
+#: src/usr/local/www/status_dhcpv6_leases.php:444
 #: src/usr/local/www/status_gateway_groups.php:128
-#: src/usr/local/www/status_gateways.php:137
-#: src/usr/local/www/status_gateways.php:141
+#: src/usr/local/www/status_gateways.php:143
+#: src/usr/local/www/status_gateways.php:147
 #: src/usr/local/www/status_ipsec_leases.php:53
-#: src/usr/local/www/widgets/widgets/gateways.widget.php:233
+#: src/usr/local/www/widgets/widgets/gateways.widget.php:239
 #: src/usr/local/www/widgets/widgets/wake_on_lan.widget.php:62
 msgid "Online"
 msgstr ""
 
-#: src/usr/local/www/status_dhcp_leases.php:353
-#: src/usr/local/www/status_dhcpv6_leases.php:438
+#: src/usr/local/www/status_dhcp_leases.php:369
+#: src/usr/local/www/status_dhcpv6_leases.php:445
 msgid "Lease Type"
 msgstr ""
 
-#: src/usr/local/www/status_dhcp_leases.php:431
-#: src/usr/local/www/status_dhcp_leases.php:432
+#: src/usr/local/www/status_dhcp_leases.php:458
+#: src/usr/local/www/status_dhcp_leases.php:459
 msgid "n/a"
 msgstr ""
 
-#: src/usr/local/www/status_dhcp_leases.php:438
-#: src/usr/local/www/status_dhcpv6_leases.php:506
+#: src/usr/local/www/status_dhcp_leases.php:465
+#: src/usr/local/www/status_dhcpv6_leases.php:513
 msgid "Add static mapping"
 msgstr ""
 
-#: src/usr/local/www/status_dhcp_leases.php:442
-#: src/usr/local/www/status_dhcpv6_leases.php:508
+#: src/usr/local/www/status_dhcp_leases.php:469
+#: src/usr/local/www/status_dhcpv6_leases.php:515
 msgid "Add WOL mapping"
 msgstr ""
 
-#: src/usr/local/www/status_dhcp_leases.php:444
+#: src/usr/local/www/status_dhcp_leases.php:471
 msgid "Send WOL packet"
 msgstr ""
 
-#: src/usr/local/www/status_dhcp_leases.php:448
-#: src/usr/local/www/status_dhcpv6_leases.php:510
+#: src/usr/local/www/status_dhcp_leases.php:475
+#: src/usr/local/www/status_dhcpv6_leases.php:517
 msgid "Delete lease"
 msgstr ""
 
-#: src/usr/local/www/status_dhcp_leases.php:459
+#: src/usr/local/www/status_dhcp_leases.php:483
+msgid "No leases to display"
+msgstr ""
+
+#: src/usr/local/www/status_dhcp_leases.php:492
 msgid "Leases in Use"
 msgstr ""
 
-#: src/usr/local/www/status_dhcp_leases.php:467
+#: src/usr/local/www/status_dhcp_leases.php:500
 msgid "# of leases in use"
 msgstr ""
 
-#: src/usr/local/www/status_dhcp_leases.php:488
-#: src/usr/local/www/status_dhcpv6_leases.php:600
+#: src/usr/local/www/status_dhcp_leases.php:520
+msgid "No leases are in use"
+msgstr ""
+
+#: src/usr/local/www/status_dhcp_leases.php:529
+#: src/usr/local/www/status_dhcpv6_leases.php:607
 msgid "Show active and static leases only"
 msgstr ""
 
-#: src/usr/local/www/status_dhcp_leases.php:490
-#: src/usr/local/www/status_dhcpv6_leases.php:602
+#: src/usr/local/www/status_dhcp_leases.php:531
+#: src/usr/local/www/status_dhcpv6_leases.php:609
 msgid "Show all configured leases"
 msgstr ""
 
-#: src/usr/local/www/status_dhcpv6_leases.php:192
+#: src/usr/local/www/status_dhcpv6_leases.php:199
 msgid "released"
 msgstr ""
 
-#: src/usr/local/www/status_dhcpv6_leases.php:419
+#: src/usr/local/www/status_dhcpv6_leases.php:426
 msgid "No leases file found. Is the DHCPv6 server active?"
 msgstr ""
 
-#: src/usr/local/www/status_dhcpv6_leases.php:431
-#: src/usr/local/www/status_dhcpv6_leases.php:528
+#: src/usr/local/www/status_dhcpv6_leases.php:438
+#: src/usr/local/www/status_dhcpv6_leases.php:535
 msgid "IAID"
 msgstr ""
 
-#: src/usr/local/www/status_dhcpv6_leases.php:521
+#: src/usr/local/www/status_dhcpv6_leases.php:528
 msgid "Delegated Prefixes"
 msgstr ""
 
-#: src/usr/local/www/status_dhcpv6_leases.php:527
+#: src/usr/local/www/status_dhcpv6_leases.php:534
 msgid "IPv6 Prefix"
 msgstr ""
 
-#: src/usr/local/www/status_dhcpv6_leases.php:579
+#: src/usr/local/www/status_dhcpv6_leases.php:586
 msgid "Routed To"
 msgstr ""
 
-#: src/usr/local/www/status_filter_reload.php:64
+#: src/usr/local/www/status_filter_reload.php:63
 msgid "Reload Filter"
 msgstr ""
 
-#: src/usr/local/www/status_filter_reload.php:67
+#: src/usr/local/www/status_filter_reload.php:66
 msgid "Force Config Sync"
 msgstr ""
 
-#: src/usr/local/www/status_filter_reload.php:84
+#: src/usr/local/www/status_filter_reload.php:75
+msgid "Reload status"
+msgstr ""
+
+#: src/usr/local/www/status_filter_reload.php:82
 msgid ""
 "This page will automatically refresh every 3 seconds until the filter is "
 "done reloading."
 msgstr ""
 
-#: src/usr/local/www/status_filter_reload.php:106
+#: src/usr/local/www/status_filter_reload.php:104
 msgid "Obtaining filter status..."
 msgstr ""
 
-#: src/usr/local/www/status_filter_reload.php:109
-msgid "Initializing..."
-msgstr ""
-
-#: src/usr/local/www/status_filter_reload.php:112
-msgid "Done.  The filter rules have been reloaded."
-msgstr ""
-
-#: src/usr/local/www/status_filter_reload.php:115
+#: src/usr/local/www/status_filter_reload.php:110
 msgid "Queue Status"
 msgstr ""
 
@@ -22911,7 +23132,7 @@ msgstr ""
 #: src/usr/local/www/system_gateway_groups.php:120
 #: src/usr/local/www/system_gateway_groups.php:124
 #: src/usr/local/www/system_gateway_groups_edit.php:147
-#: src/usr/local/www/system_gateways.php:230
+#: src/usr/local/www/system_gateways.php:244
 #: src/usr/local/www/system_routes.php:231
 msgid "Gateway Groups"
 msgstr ""
@@ -22925,17 +23146,17 @@ msgstr ""
 #: src/usr/local/www/status_gateways.php:128
 #: src/usr/local/www/widgets/widgets/gateways.widget.php:221
 #: src/usr/local/www/widgets/widgets/wake_on_lan.widget.php:66
-#: src/usr/local/www/diag_smart.php:399
+#: src/usr/local/www/diag_smart.php:299
 msgid "Offline"
 msgstr ""
 
 #: src/usr/local/www/status_gateway_groups.php:122
-#: src/usr/local/www/status_gateways.php:131
+#: src/usr/local/www/status_gateways.php:134
 msgid "Warning, Packetloss"
 msgstr ""
 
 #: src/usr/local/www/status_gateway_groups.php:125
-#: src/usr/local/www/status_gateways.php:134
+#: src/usr/local/www/status_gateways.php:140
 msgid "Warning, Latency"
 msgstr ""
 
@@ -22959,11 +23180,11 @@ msgstr ""
 #: src/usr/local/www/status_gateways.php:95
 #: src/usr/local/www/status_gateways.php:106
 #: src/usr/local/www/status_gateways.php:117
-#: src/usr/local/www/status_gateways.php:144
-#: src/usr/local/www/widgets/widgets/gateways.widget.php:237
-#: src/usr/local/www/widgets/widgets/gateways.widget.php:245
-#: src/usr/local/www/widgets/widgets/gateways.widget.php:246
-#: src/usr/local/www/widgets/widgets/gateways.widget.php:247
+#: src/usr/local/www/status_gateways.php:150
+#: src/usr/local/www/widgets/widgets/gateways.widget.php:243
+#: src/usr/local/www/widgets/widgets/gateways.widget.php:251
+#: src/usr/local/www/widgets/widgets/gateways.widget.php:252
+#: src/usr/local/www/widgets/widgets/gateways.widget.php:253
 msgid "Pending"
 msgstr ""
 
@@ -22972,7 +23193,15 @@ msgstr ""
 msgid "Offline (forced)"
 msgstr ""
 
-#: src/usr/local/www/status_gateways.php:158
+#: src/usr/local/www/status_gateways.php:131
+msgid "Danger, Packetloss"
+msgstr ""
+
+#: src/usr/local/www/status_gateways.php:137
+msgid "Danger, Latency"
+msgstr ""
+
+#: src/usr/local/www/status_gateways.php:164
 msgid "Last checked"
 msgstr ""
 
@@ -24038,112 +24267,116 @@ msgstr ""
 msgid "Log Message"
 msgstr ""
 
-#: src/usr/local/www/status_ntpd.php:51
+#: src/usr/local/www/status_ntpd.php:66
+msgid "Pool Placeholder"
+msgstr ""
+
+#: src/usr/local/www/status_ntpd.php:68
 msgid "Unreach/Pending"
 msgstr ""
 
-#: src/usr/local/www/status_ntpd.php:54
+#: src/usr/local/www/status_ntpd.php:72
 msgid "Active Peer"
 msgstr ""
 
-#: src/usr/local/www/status_ntpd.php:57
+#: src/usr/local/www/status_ntpd.php:75
 msgid "Candidate"
 msgstr ""
 
-#: src/usr/local/www/status_ntpd.php:60
+#: src/usr/local/www/status_ntpd.php:78
 msgid "PPS Peer"
 msgstr ""
 
-#: src/usr/local/www/status_ntpd.php:63
+#: src/usr/local/www/status_ntpd.php:81
 msgid "Selected"
 msgstr ""
 
-#: src/usr/local/www/status_ntpd.php:66
+#: src/usr/local/www/status_ntpd.php:84
 msgid "Excess Peer"
 msgstr ""
 
-#: src/usr/local/www/status_ntpd.php:69
+#: src/usr/local/www/status_ntpd.php:87
 msgid "False Ticker"
 msgstr ""
 
-#: src/usr/local/www/status_ntpd.php:72
+#: src/usr/local/www/status_ntpd.php:90
 msgid "Outlier"
 msgstr ""
 
-#: src/usr/local/www/status_ntpd.php:172
+#: src/usr/local/www/status_ntpd.php:176
 #, php-format
 msgid ""
 "Statistics unavailable because ntpq and ntpdc queries are disabled in the "
 "%sNTP service settings%s"
 msgstr ""
 
-#: src/usr/local/www/status_ntpd.php:178
+#: src/usr/local/www/status_ntpd.php:182
 #, php-format
 msgid "No peers found, %sis the ntp service running?%s"
 msgstr ""
 
-#: src/usr/local/www/status_ntpd.php:235
+#: src/usr/local/www/status_ntpd.php:239
 msgid "in view "
 msgstr ""
 
-#: src/usr/local/www/status_ntpd.php:242
+#: src/usr/local/www/status_ntpd.php:246
 msgid "in use "
 msgstr ""
 
-#: src/usr/local/www/status_ntpd.php:250
+#: src/usr/local/www/status_ntpd.php:254
 msgid "Google Maps Link"
 msgstr ""
 
-#: src/usr/local/www/status_ntpd.php:261
+#: src/usr/local/www/status_ntpd.php:265
 msgid "Network Time Protocol Status"
 msgstr ""
 
-#: src/usr/local/www/status_ntpd.php:268
+#: src/usr/local/www/status_ntpd.php:272
 msgid "Ref ID"
 msgstr ""
 
-#: src/usr/local/www/status_ntpd.php:271
+#: src/usr/local/www/status_ntpd.php:275
 msgid "When"
 msgstr ""
 
-#: src/usr/local/www/status_ntpd.php:272
+#: src/usr/local/www/status_ntpd.php:276
 msgid "Poll"
 msgstr ""
 
-#: src/usr/local/www/status_ntpd.php:273
+#: src/usr/local/www/status_ntpd.php:277
 msgid "Reach"
 msgstr ""
 
-#: src/usr/local/www/status_ntpd.php:274
+#: src/usr/local/www/status_ntpd.php:278
 #: src/usr/local/www/vpn_ipsec_phase1.php:893
 msgid "Delay"
 msgstr ""
 
-#: src/usr/local/www/status_ntpd.php:275
+#: src/usr/local/www/status_ntpd.php:279
 msgid "Offset"
 msgstr ""
 
-#: src/usr/local/www/status_ntpd.php:276
+#: src/usr/local/www/status_ntpd.php:280
 msgid "Jitter"
 msgstr ""
 
-#: src/usr/local/www/status_ntpd.php:298
+#: src/usr/local/www/status_ntpd.php:302
 msgid "GPS Information"
 msgstr ""
 
-#: src/usr/local/www/status_ntpd.php:303
+#: src/usr/local/www/status_ntpd.php:307
 msgid "Clock Latitude"
 msgstr ""
 
-#: src/usr/local/www/status_ntpd.php:304
+#: src/usr/local/www/status_ntpd.php:308
 msgid "Clock Longitude"
 msgstr ""
 
-#: src/usr/local/www/status_ntpd.php:308
+#: src/usr/local/www/status_ntpd.php:312
 msgid "Clock Altitude"
 msgstr ""
 
-#: src/usr/local/www/status_ntpd.php:315
+#: src/usr/local/www/status_ntpd.php:319
 #: src/usr/local/www/widgets/widgets/ntp_status.widget.php:179
 msgid "Satellites"
 msgstr ""
@@ -24159,9 +24392,9 @@ msgstr ""
 
 #: src/usr/local/www/status_openvpn.php:103
 #: src/usr/local/www/status_openvpn.php:176
-#: src/usr/local/www/system_camanager.php:597
-#: src/usr/local/www/system_certmanager.php:715
-#: src/usr/local/www/system_certmanager.php:842
+#: src/usr/local/www/system_camanager.php:619
+#: src/usr/local/www/system_certmanager.php:718
+#: src/usr/local/www/system_certmanager.php:845
 #: src/usr/local/www/vpn_openvpn_csc.php:640
 msgid "Common Name"
 msgstr ""
@@ -24359,72 +24592,72 @@ msgid ""
 "time."
 msgstr ""
 
-#: src/usr/local/www/system.php:155
+#: src/usr/local/www/system.php:158
 msgid "The domain may only contain the characters a-z, 0-9, '-' and '.'."
 msgstr ""
 
-#: src/usr/local/www/system.php:166
+#: src/usr/local/www/system.php:169
 #, php-format
 msgid "A valid IP address must be specified for DNS server %s."
 msgstr ""
 
-#: src/usr/local/www/system.php:172
+#: src/usr/local/www/system.php:175
 #, php-format
 msgid ""
 "The IPv6 gateway \"%1$s\" can not be specified for IPv4 DNS server \"%2$s\"."
 msgstr ""
 
-#: src/usr/local/www/system.php:175
+#: src/usr/local/www/system.php:178
 #, php-format
 msgid ""
 "The IPv4 gateway \"%1$s\" can not be specified for IPv6 DNS server \"%2$s\"."
 msgstr ""
 
-#: src/usr/local/www/system.php:186
+#: src/usr/local/www/system.php:189
 msgid ""
 "Each configured DNS server must have a unique IP address. Remove the "
 "duplicated IP."
 msgstr ""
 
-#: src/usr/local/www/system.php:197
+#: src/usr/local/www/system.php:200
 #, php-format
 msgid ""
 "A gateway can not be assigned to DNS '%s' server which is on a directly "
 "connected network."
 msgstr ""
 
-#: src/usr/local/www/system.php:209
+#: src/usr/local/www/system.php:212
 msgid ""
 "A NTP Time Server name may only contain the characters a-z, 0-9, '-' and '.'."
 msgstr ""
 
-#: src/usr/local/www/system.php:363
+#: src/usr/local/www/system.php:366
 msgid "Name of the firewall host, without domain part"
 msgstr ""
 
-#: src/usr/local/www/system.php:371
+#: src/usr/local/www/system.php:374
 msgid ""
 "Do not use 'local' as a domain name. It will cause local hosts running mDNS "
 "(avahi, bonjour, etc.) to be unable to resolve local hosts not running mDNS."
 msgstr ""
 
-#: src/usr/local/www/system.php:377
+#: src/usr/local/www/system.php:380
 msgid "DNS Server Settings"
 msgstr ""
 
-#: src/usr/local/www/system.php:383
+#: src/usr/local/www/system.php:386
 msgid "DNS Server "
 msgstr ""
 
-#: src/usr/local/www/system.php:387
+#: src/usr/local/www/system.php:390
 msgid "DNS Server"
 msgstr ""
 
-#: src/usr/local/www/system.php:430
+#: src/usr/local/www/system.php:433
 msgid "DNS Server Override"
 msgstr ""
 
-#: src/usr/local/www/system.php:433
+#: src/usr/local/www/system.php:436
 #, php-format
 msgid ""
 "If this option is set, %s will use DNS servers assigned by a DHCP/PPP server "
@@ -24432,11 +24665,11 @@ msgid ""
 "will not be assigned to DHCP and PPTP VPN clients."
 msgstr ""
 
-#: src/usr/local/www/system.php:440
+#: src/usr/local/www/system.php:443
 msgid "Disable DNS Forwarder"
 msgstr ""
 
-#: src/usr/local/www/system.php:443
+#: src/usr/local/www/system.php:446
 msgid ""
 "By default localhost (127.0.0.1) will be used as the first DNS server where "
 "the DNS Forwarder or DNS Resolver is enabled and set to listen on Localhost, "
@@ -24444,56 +24677,60 @@ msgid ""
 "box omits localhost from the list of DNS servers."
 msgstr ""
 
-#: src/usr/local/www/system.php:450
+#: src/usr/local/www/system.php:453
 msgid "Localization"
 msgstr ""
 
-#: src/usr/local/www/system.php:454
+#: src/usr/local/www/system.php:457
 msgid "Timezone"
 msgstr ""
 
-#: src/usr/local/www/system.php:457
+#: src/usr/local/www/system.php:460
 msgid ""
 "Select the timezone or location within the timezone to be used by this "
 "system."
 msgstr ""
 
-#: src/usr/local/www/system.php:461
+#: src/usr/local/www/system.php:464
 msgid "Timeservers"
 msgstr ""
 
-#: src/usr/local/www/system.php:464
+#: src/usr/local/www/system.php:467
 msgid ""
 "Use a space to separate multiple hosts (only one required). Remember to set "
 "up at least one DNS server if a host name is entered here!"
 msgstr ""
 
-#: src/usr/local/www/system.php:469
+#: src/usr/local/www/system.php:472
 msgid "Language"
 msgstr ""
 
-#: src/usr/local/www/system.php:472
+#: src/usr/local/www/system.php:475
 msgid "Choose a language for the webConfigurator"
 msgstr ""
 
-#: src/usr/local/www/system.php:476
+#: src/usr/local/www/system.php:479
 #: src/usr/local/www/system_advanced_admin.php:306
-#: src/usr/local/www/system_certmanager.php:1018
+#: src/usr/local/www/system_certmanager.php:1021
 msgid "webConfigurator"
 msgstr ""
 
-#: src/usr/local/www/system.php:492
+#: src/usr/local/www/system.php:495
+msgid "Login hostname"
+msgstr ""
+
+#: src/usr/local/www/system.php:502
 msgid "Dashboard update period"
 msgstr ""
 
-#: src/usr/local/www/system.php:496
+#: src/usr/local/www/system.php:506
 msgid ""
 "Time in seconds between dashboard widget updates. Small values cause more "
 "frequent updates but increase the load on the web server. Minimum is 5 "
 "seconds, maximum 600 seconds"
 msgstr ""
 
-#: src/usr/local/www/system.php:504
+#: src/usr/local/www/system.php:514
 #: src/usr/local/www/system_user_settings.php:152
 #: src/usr/local/www/system_usermanager.php:928
 #, php-format
@@ -24941,35 +25178,40 @@ msgid "Adaptive start"
 msgstr ""
 
 #: src/usr/local/www/system_advanced_firewall.php:452
+#, php-format
 msgid ""
 "When the number of state entries exceeds this value, adaptive scaling "
 "begins.  All timeout values are scaled linearly with factor (adaptive.end - "
-"number of states) / (adaptive.end - adaptive.start)."
+"number of states) / (adaptive.end - adaptive.start). Defaults to 60% of the "
+"Firewall Maximum States value"
 msgstr ""
 
-#: src/usr/local/www/system_advanced_firewall.php:458
+#: src/usr/local/www/system_advanced_firewall.php:459
 msgid "Adaptive end"
 msgstr ""
 
-#: src/usr/local/www/system_advanced_firewall.php:462
+#: src/usr/local/www/system_advanced_firewall.php:463
+#, php-format
 msgid ""
 "When reaching this number of state entries, all timeout values become zero, "
 "effectively purging all state entries immediately.  This value is used to "
 "define the scale factor, it should not actually be reached (set a lower "
-"state limit, see below)."
+"state limit, see below). Defaults to 120% of the Firewall Maximum States "
+"value"
 msgstr ""
 
-#: src/usr/local/www/system_advanced_firewall.php:467
+#: src/usr/local/www/system_advanced_firewall.php:469
 msgid ""
 "Timeouts for states can be scaled adaptively as the number of state table "
-"entries grows. Leave blank for the default (0)"
+"entries grows. Leave blank to use default values, set to 0 to disable "
+"Adaptive Timeouts"
 msgstr ""
 
-#: src/usr/local/www/system_advanced_firewall.php:474
+#: src/usr/local/www/system_advanced_firewall.php:477
 msgid "Firewall Maximum States"
 msgstr ""
 
-#: src/usr/local/www/system_advanced_firewall.php:478
+#: src/usr/local/www/system_advanced_firewall.php:481
 #, php-format
 msgid ""
 "Maximum number of connections to hold in the firewall state table. <br/"
@@ -24977,11 +25219,11 @@ msgid ""
 "%d"
 msgstr ""
 
-#: src/usr/local/www/system_advanced_firewall.php:484
+#: src/usr/local/www/system_advanced_firewall.php:487
 msgid "Firewall Maximum Table Entries"
 msgstr ""
 
-#: src/usr/local/www/system_advanced_firewall.php:488
+#: src/usr/local/www/system_advanced_firewall.php:491
 #, php-format
 msgid ""
 "Maximum number of table entries for systems such as aliases, sshlockout, "
@@ -24989,21 +25231,21 @@ msgid ""
 "system the default size is: %d"
 msgstr ""
 
-#: src/usr/local/www/system_advanced_firewall.php:495
+#: src/usr/local/www/system_advanced_firewall.php:498
 msgid "Firewall Maximum Fragment Entries"
 msgstr ""
 
-#: src/usr/local/www/system_advanced_firewall.php:498
+#: src/usr/local/www/system_advanced_firewall.php:501
 msgid ""
 "Maximum number of packet fragments to hold for reassembly by scrub rules. "
 "Leave this blank for the default (5000)"
 msgstr ""
 
-#: src/usr/local/www/system_advanced_firewall.php:502
+#: src/usr/local/www/system_advanced_firewall.php:505
 msgid "Static route filtering"
 msgstr ""
 
-#: src/usr/local/www/system_advanced_firewall.php:505
+#: src/usr/local/www/system_advanced_firewall.php:508
 msgid ""
 "This option only applies if one or more static routes have been defined. If "
 "it is enabled, traffic that enters and leaves through the same interface "
@@ -25011,15 +25253,15 @@ msgid ""
 "situations where multiple subnets are connected to the same interface."
 msgstr ""
 
-#: src/usr/local/www/system_advanced_firewall.php:512
+#: src/usr/local/www/system_advanced_firewall.php:515
 msgid "Disable Auto-added VPN rules"
 msgstr ""
 
-#: src/usr/local/www/system_advanced_firewall.php:515
+#: src/usr/local/www/system_advanced_firewall.php:518
 msgid "Note: This disables automatically added rules for IPsec."
 msgstr ""
 
-#: src/usr/local/www/system_advanced_firewall.php:522
+#: src/usr/local/www/system_advanced_firewall.php:525
 msgid ""
 "With Multi-WAN it is generally desired to ensure traffic leaves the same "
 "interface it arrives on, hence reply-to is added automatically by default. "
@@ -25027,11 +25269,11 @@ msgid ""
 "different from the gateway IP of the hosts behind the bridged interface."
 msgstr ""
 
-#: src/usr/local/www/system_advanced_firewall.php:529
+#: src/usr/local/www/system_advanced_firewall.php:532
 msgid "Disable Negate rules"
 msgstr ""
 
-#: src/usr/local/www/system_advanced_firewall.php:532
+#: src/usr/local/www/system_advanced_firewall.php:535
 msgid ""
 "With Multi-WAN it is generally desired to ensure traffic reaches directly "
 "connected networks and VPN networks when using policy routing. This can be "
@@ -25039,73 +25281,73 @@ msgid ""
 "these networks."
 msgstr ""
 
-#: src/usr/local/www/system_advanced_firewall.php:538
+#: src/usr/local/www/system_advanced_firewall.php:541
 msgid "Aliases Hostnames Resolve Interval"
 msgstr ""
 
-#: src/usr/local/www/system_advanced_firewall.php:542
+#: src/usr/local/www/system_advanced_firewall.php:545
 msgid ""
 "Interval, in seconds, that will be used to resolve hostnames configured on "
 "aliases. <br/>Note:\t Leave this blank for the default (300s)."
 msgstr ""
 
-#: src/usr/local/www/system_advanced_firewall.php:548
+#: src/usr/local/www/system_advanced_firewall.php:551
 msgid "Check certificate of aliases URLs"
 msgstr ""
 
-#: src/usr/local/www/system_advanced_firewall.php:551
+#: src/usr/local/www/system_advanced_firewall.php:554
 msgid ""
 "Make sure the certificate is valid for all HTTPS addresses on aliases. If "
 "it's not valid or is revoked, do not download it."
 msgstr ""
 
-#: src/usr/local/www/system_advanced_firewall.php:555
+#: src/usr/local/www/system_advanced_firewall.php:558
 msgid "Bogon Networks"
 msgstr ""
 
-#: src/usr/local/www/system_advanced_firewall.php:562
+#: src/usr/local/www/system_advanced_firewall.php:565
 msgid "Monthly"
 msgstr ""
 
-#: src/usr/local/www/system_advanced_firewall.php:563
+#: src/usr/local/www/system_advanced_firewall.php:566
 msgid "Weekly"
 msgstr ""
 
-#: src/usr/local/www/system_advanced_firewall.php:564
+#: src/usr/local/www/system_advanced_firewall.php:567
 msgid "Daily"
 msgstr ""
 
-#: src/usr/local/www/system_advanced_firewall.php:559
+#: src/usr/local/www/system_advanced_firewall.php:562
 msgid "Update Frequency"
 msgstr ""
 
-#: src/usr/local/www/system_advanced_firewall.php:566
+#: src/usr/local/www/system_advanced_firewall.php:569
 msgid ""
 "The frequency of updating the lists of IP addresses that are reserved (but "
 "not RFC 1918) or not yet assigned by IANA."
 msgstr ""
 
-#: src/usr/local/www/system_advanced_firewall.php:572
+#: src/usr/local/www/system_advanced_firewall.php:575
 msgid "Network Address Translation"
 msgstr ""
 
-#: src/usr/local/www/system_advanced_firewall.php:587
+#: src/usr/local/www/system_advanced_firewall.php:590
 msgid "disabled"
 msgstr ""
 
-#: src/usr/local/www/system_advanced_firewall.php:588
+#: src/usr/local/www/system_advanced_firewall.php:591
 msgid "NAT + proxy"
 msgstr ""
 
-#: src/usr/local/www/system_advanced_firewall.php:589
+#: src/usr/local/www/system_advanced_firewall.php:592
 msgid "Pure NAT"
 msgstr ""
 
-#: src/usr/local/www/system_advanced_firewall.php:584
+#: src/usr/local/www/system_advanced_firewall.php:587
 msgid "NAT Reflection mode for port forwards"
 msgstr ""
 
-#: src/usr/local/www/system_advanced_firewall.php:591
+#: src/usr/local/www/system_advanced_firewall.php:594
 msgid ""
 "</span><ul class=\"help-block\"><li>The pure NAT mode uses a set of NAT "
 "rules to direct packets to the target of the port forward. It has better "
@@ -25123,21 +25365,21 @@ msgid ""
 "configured to override this system setting on a per-rule basis."
 msgstr ""
 
-#: src/usr/local/www/system_advanced_firewall.php:609
+#: src/usr/local/www/system_advanced_firewall.php:612
 msgid "Reflection Timeout"
 msgstr ""
 
-#: src/usr/local/www/system_advanced_firewall.php:613
+#: src/usr/local/www/system_advanced_firewall.php:616
 msgid ""
 "Enter value for Reflection timeout in seconds.<br/>Note: Only applies to "
 "Reflection on port forwards in NAT + proxy mode."
 msgstr ""
 
-#: src/usr/local/www/system_advanced_firewall.php:618
+#: src/usr/local/www/system_advanced_firewall.php:621
 msgid "Enable NAT Reflection for 1:1 NAT"
 msgstr ""
 
-#: src/usr/local/www/system_advanced_firewall.php:621
+#: src/usr/local/www/system_advanced_firewall.php:624
 msgid ""
 "Note: Reflection on 1:1 mappings is only for the inbound component of the "
 "1:1 mappings. This functions the same as the pure NAT mode for port "
@@ -25146,11 +25388,11 @@ msgid ""
 "rule basis."
 msgstr ""
 
-#: src/usr/local/www/system_advanced_firewall.php:629
+#: src/usr/local/www/system_advanced_firewall.php:632
 msgid "Enable automatic outbound NAT for Reflection"
 msgstr ""
 
-#: src/usr/local/www/system_advanced_firewall.php:632
+#: src/usr/local/www/system_advanced_firewall.php:635
 msgid ""
 "Required for full functionality of the pure NAT mode of NAT Reflection for "
 "port forwards or NAT Reflection for 1:1 NAT. Note: This only works for "
@@ -25158,50 +25400,50 @@ msgid ""
 "outbound NAT rules that direct the reply packets back through the router."
 msgstr ""
 
-#: src/usr/local/www/system_advanced_firewall.php:639
+#: src/usr/local/www/system_advanced_firewall.php:642
 msgid "TFTP Proxy"
 msgstr ""
 
-#: src/usr/local/www/system_advanced_firewall.php:643
+#: src/usr/local/www/system_advanced_firewall.php:646
 msgid "Choose the interfaces on which to enable TFTP proxy helper."
 msgstr ""
 
-#: src/usr/local/www/system_advanced_firewall.php:648
+#: src/usr/local/www/system_advanced_firewall.php:651
 msgid "State Timeouts (seconds - blank for default)"
 msgstr ""
 
-#: src/usr/local/www/system_advanced_firewall.php:655
+#: src/usr/local/www/system_advanced_firewall.php:658
 msgid "TCP "
 msgstr ""
 
-#: src/usr/local/www/system_advanced_firewall.php:666
+#: src/usr/local/www/system_advanced_firewall.php:669
 msgid "UDP "
 msgstr ""
 
-#: src/usr/local/www/system_advanced_firewall.php:677
+#: src/usr/local/www/system_advanced_firewall.php:680
 msgid "ICMP "
 msgstr ""
 
-#: src/usr/local/www/system_advanced_firewall.php:688
+#: src/usr/local/www/system_advanced_firewall.php:691
 msgid "Other "
 msgstr ""
 
-#: src/usr/local/www/system_advanced_firewall.php:711
+#: src/usr/local/www/system_advanced_firewall.php:714
 msgid "The default optimization algorithm"
 msgstr ""
 
-#: src/usr/local/www/system_advanced_firewall.php:713
+#: src/usr/local/www/system_advanced_firewall.php:716
 msgid ""
 "Used for eg. satellite links. Expires idle connections later than default"
 msgstr ""
 
-#: src/usr/local/www/system_advanced_firewall.php:715
+#: src/usr/local/www/system_advanced_firewall.php:718
 msgid ""
 "Expires idle connections quicker. More efficient use of CPU and memory but "
 "can drop legitimate idle connections"
 msgstr ""
 
-#: src/usr/local/www/system_advanced_firewall.php:717
+#: src/usr/local/www/system_advanced_firewall.php:720
 msgid ""
 "Tries to avoid dropping any legitimate idle connections at the expense of "
 "increased memory usage and CPU utilization"
@@ -25437,7 +25679,7 @@ msgid ""
 msgstr ""
 
 #: src/usr/local/www/system_advanced_misc.php:474
-#: src/usr/local/www/system_gateways_edit.php:633
+#: src/usr/local/www/system_gateways_edit.php:646
 msgid "Gateway Monitoring"
 msgstr ""
 
@@ -25914,7 +26156,7 @@ msgid "Select LDAP containers for authentication"
 msgstr ""
 
 #: src/usr/local/www/system_authservers.php:56
-#: src/usr/local/www/system_authservers.php:591
+#: src/usr/local/www/system_authservers.php:592
 msgid "Containers"
 msgstr ""
 
@@ -25926,16 +26168,16 @@ msgstr ""
 #: src/usr/local/www/system_authservers.php:229
 #: src/usr/local/www/system_authservers.php:252
 #: src/usr/local/www/system_authservers.php:486
-#: src/usr/local/www/system_camanager.php:168
-#: src/usr/local/www/system_camanager.php:182
-#: src/usr/local/www/system_camanager.php:197
-#: src/usr/local/www/system_camanager.php:461
+#: src/usr/local/www/system_camanager.php:170
+#: src/usr/local/www/system_camanager.php:187
+#: src/usr/local/www/system_camanager.php:202
+#: src/usr/local/www/system_camanager.php:483
 #: src/usr/local/www/system_certmanager.php:228
-#: src/usr/local/www/system_certmanager.php:241
-#: src/usr/local/www/system_certmanager.php:259
-#: src/usr/local/www/system_certmanager.php:471
-#: src/usr/local/www/system_certmanager.php:585
-#: src/usr/local/www/system_certmanager.php:894
+#: src/usr/local/www/system_certmanager.php:244
+#: src/usr/local/www/system_certmanager.php:262
+#: src/usr/local/www/system_certmanager.php:474
+#: src/usr/local/www/system_certmanager.php:588
+#: src/usr/local/www/system_certmanager.php:897
 #: src/usr/local/www/system_crlmanager.php:198
 #: src/usr/local/www/system_crlmanager.php:204
 #: src/usr/local/www/system_crlmanager.php:356
@@ -25956,7 +26198,7 @@ msgid "Port value"
 msgstr ""
 
 #: src/usr/local/www/system_authservers.php:234
-#: src/usr/local/www/system_authservers.php:553
+#: src/usr/local/www/system_authservers.php:554
 msgid "Protocol version"
 msgstr ""
 
@@ -25973,7 +26215,7 @@ msgid "Group naming Attribute"
 msgstr ""
 
 #: src/usr/local/www/system_authservers.php:238
-#: src/usr/local/www/system_authservers.php:682
+#: src/usr/local/www/system_authservers.php:683
 msgid "Group member attribute"
 msgstr ""
 
@@ -25990,7 +26232,7 @@ msgid "Bind Password"
 msgstr ""
 
 #: src/usr/local/www/system_authservers.php:266
-#: src/usr/local/www/system_authservers.php:756
+#: src/usr/local/www/system_authservers.php:757
 msgid "Accounting port"
 msgstr ""
 
@@ -26069,14 +26311,14 @@ msgid "LDAP Server Settings"
 msgstr ""
 
 #: src/usr/local/www/system_authservers.php:509
-#: src/usr/local/www/system_authservers.php:728
+#: src/usr/local/www/system_authservers.php:729
 msgid "Hostname or IP address"
 msgstr ""
 
 #: src/usr/local/www/system_authservers.php:512
 msgid ""
-"NOTE: When using SSL, this hostname MUST match the Common Name (CN) of the "
-"LDAP server's SSL Certificate."
+"NOTE: When using SSL or STARTTLS, this hostname MUST match the Common Name "
+"(CN) of the LDAP server's SSL Certificate."
 msgstr ""
 
 #: src/usr/local/www/system_authservers.php:532
@@ -26091,135 +26333,135 @@ msgstr ""
 
 #: src/usr/local/www/system_authservers.php:547
 msgid ""
-"This option is used if 'SSL Encrypted' option is choosen. It must match with "
-"the CA in the AD otherwise problems will arise."
+"This option is used if 'SSL Encrypted' or 'TCP - STARTTLS' options are "
+"chosen. It must match with the CA in the AD otherwise problems will arise."
 msgstr ""
 
-#: src/usr/local/www/system_authservers.php:560
+#: src/usr/local/www/system_authservers.php:561
 msgid "Server Timeout"
 msgstr ""
 
-#: src/usr/local/www/system_authservers.php:564
+#: src/usr/local/www/system_authservers.php:565
 msgid "Timeout for LDAP operations (seconds)"
 msgstr ""
 
-#: src/usr/local/www/system_authservers.php:566
-#: src/usr/local/www/system_authservers.php:584
+#: src/usr/local/www/system_authservers.php:567
+#: src/usr/local/www/system_authservers.php:585
 msgid "Search scope"
 msgstr ""
 
-#: src/usr/local/www/system_authservers.php:570
+#: src/usr/local/www/system_authservers.php:571
 msgid "Level"
 msgstr ""
 
-#: src/usr/local/www/system_authservers.php:577
+#: src/usr/local/www/system_authservers.php:578
 msgid "Base DN"
 msgstr ""
 
-#: src/usr/local/www/system_authservers.php:588
+#: src/usr/local/www/system_authservers.php:589
 msgid "Authentication containers"
 msgstr ""
 
-#: src/usr/local/www/system_authservers.php:594
+#: src/usr/local/www/system_authservers.php:595
 msgid ""
 "Note: Semi-Colon separated. This will be prepended to the search base dn "
 "above or the full container path can be specified containing a dc= component."
 "<br/>Example: CN=Users;DC=example,DC=com or OU=Staff;OU=Freelancers"
 msgstr ""
 
-#: src/usr/local/www/system_authservers.php:600
+#: src/usr/local/www/system_authservers.php:601
 msgid "Select a container"
 msgstr ""
 
-#: src/usr/local/www/system_authservers.php:609
+#: src/usr/local/www/system_authservers.php:610
 msgid "Extended query"
 msgstr ""
 
-#: src/usr/local/www/system_authservers.php:614
-#: src/usr/local/www/system_authservers.php:619
+#: src/usr/local/www/system_authservers.php:615
+#: src/usr/local/www/system_authservers.php:620
 msgid "Query"
 msgstr ""
 
-#: src/usr/local/www/system_authservers.php:622
+#: src/usr/local/www/system_authservers.php:623
 msgid "Example: &amp;(objectClass=inetOrgPerson)(mail=*@example.com)"
 msgstr ""
 
-#: src/usr/local/www/system_authservers.php:628
+#: src/usr/local/www/system_authservers.php:629
 msgid "Bind anonymous"
 msgstr ""
 
-#: src/usr/local/www/system_authservers.php:633
+#: src/usr/local/www/system_authservers.php:634
 msgid "Bind credentials"
 msgstr ""
 
-#: src/usr/local/www/system_authservers.php:638
+#: src/usr/local/www/system_authservers.php:639
 msgid "User DN:"
 msgstr ""
 
-#: src/usr/local/www/system_authservers.php:660
+#: src/usr/local/www/system_authservers.php:661
 msgid "Initial Template"
 msgstr ""
 
-#: src/usr/local/www/system_authservers.php:668
+#: src/usr/local/www/system_authservers.php:669
 msgid "User naming attribute"
 msgstr ""
 
-#: src/usr/local/www/system_authservers.php:675
+#: src/usr/local/www/system_authservers.php:676
 msgid "Group naming attribute"
 msgstr ""
 
-#: src/usr/local/www/system_authservers.php:689
+#: src/usr/local/www/system_authservers.php:690
 msgid "RFC 2307 Groups"
 msgstr ""
 
-#: src/usr/local/www/system_authservers.php:692
+#: src/usr/local/www/system_authservers.php:693
 msgid ""
 "RFC 2307 style group membership has members listed on the group object "
 "rather than using groups listed on user object. Leave unchecked for Active "
 "Directory style group membership (RFC 2307bis)."
 msgstr ""
 
-#: src/usr/local/www/system_authservers.php:698
+#: src/usr/local/www/system_authservers.php:699
 msgid "Group Object Class"
 msgstr ""
 
-#: src/usr/local/www/system_authservers.php:702
+#: src/usr/local/www/system_authservers.php:703
 msgid ""
 "Object class used for groups in RFC2307 mode. Typically \"posixGroup\" or "
 "\"group\"."
 msgstr ""
 
-#: src/usr/local/www/system_authservers.php:707
+#: src/usr/local/www/system_authservers.php:708
 msgid "UTF8 Encode"
 msgstr ""
 
-#: src/usr/local/www/system_authservers.php:710
+#: src/usr/local/www/system_authservers.php:711
 msgid ""
 "Required to support international characters, but may not be supported by "
 "every LDAP server."
 msgstr ""
 
-#: src/usr/local/www/system_authservers.php:715
+#: src/usr/local/www/system_authservers.php:716
 msgid "Username Alterations"
 msgstr ""
 
-#: src/usr/local/www/system_authservers.php:718
+#: src/usr/local/www/system_authservers.php:719
 msgid "e.g. user@host becomes user when unchecked."
 msgstr ""
 
-#: src/usr/local/www/system_authservers.php:723
+#: src/usr/local/www/system_authservers.php:724
 msgid "RADIUS Server Settings"
 msgstr ""
 
-#: src/usr/local/www/system_authservers.php:742
+#: src/usr/local/www/system_authservers.php:743
 msgid "Services offered"
 msgstr ""
 
-#: src/usr/local/www/system_authservers.php:763
+#: src/usr/local/www/system_authservers.php:764
 msgid "Authentication Timeout"
 msgstr ""
 
-#: src/usr/local/www/system_authservers.php:766
+#: src/usr/local/www/system_authservers.php:767
 msgid ""
 "This value controls how long, in seconds, that the RADIUS server may take to "
 "respond to an authentication request. If left blank, the default value is 5 "
@@ -26228,15 +26470,15 @@ msgid ""
 "receive and enter a token."
 msgstr ""
 
-#: src/usr/local/www/system_authservers.php:785
+#: src/usr/local/www/system_authservers.php:786
 msgid "LDAP containers"
 msgstr ""
 
-#: src/usr/local/www/system_authservers.php:802
+#: src/usr/local/www/system_authservers.php:803
 msgid "Please fill the required values."
 msgstr ""
 
-#: src/usr/local/www/system_authservers.php:809
+#: src/usr/local/www/system_authservers.php:810
 msgid "Please fill the bind username/password."
 msgstr ""
 
@@ -26252,301 +26494,332 @@ msgstr ""
 msgid "Create an intermediate Certificate Authority"
 msgstr ""
 
-#: src/usr/local/www/system_camanager.php:95
+#: src/usr/local/www/system_camanager.php:97
 #, php-format
 msgid "Certificate Authority %s and its CRLs (if any) successfully deleted."
 msgstr ""
 
-#: src/usr/local/www/system_camanager.php:169
-#: src/usr/local/www/system_camanager.php:482
+#: src/usr/local/www/system_camanager.php:171
+#: src/usr/local/www/system_camanager.php:504
 #: src/usr/local/www/system_certmanager.php:229
-#: src/usr/local/www/system_certmanager.php:596
+#: src/usr/local/www/system_certmanager.php:599
 msgid "Certificate data"
 msgstr ""
 
-#: src/usr/local/www/system_camanager.php:171
+#: src/usr/local/www/system_camanager.php:173
 #: src/usr/local/www/system_certmanager.php:232
 msgid "This certificate does not appear to be valid."
 msgstr ""
 
-#: src/usr/local/www/system_camanager.php:174
+#: src/usr/local/www/system_camanager.php:176
 msgid "Encrypted private keys are not yet supported."
 msgstr ""
 
-#: src/usr/local/www/system_camanager.php:183
-#: src/usr/local/www/system_camanager.php:199
-#: src/usr/local/www/system_certmanager.php:243
-#: src/usr/local/www/system_certmanager.php:260
-#: src/usr/local/www/system_certmanager.php:638
-#: src/usr/local/www/system_certmanager.php:780
+#: src/usr/local/www/system_camanager.php:179
+#: src/usr/local/www/system_certmanager.php:235
+msgid ""
+"The submitted private key does not match the submitted certificate data."
+msgstr ""
+
+#: src/usr/local/www/system_camanager.php:188
+#: src/usr/local/www/system_camanager.php:204
+#: src/usr/local/www/system_certmanager.php:246
+#: src/usr/local/www/system_certmanager.php:263
+#: src/usr/local/www/system_certmanager.php:641
+#: src/usr/local/www/system_certmanager.php:783
 #: src/usr/local/www/system_usermanager.php:190
 #: src/usr/local/www/system_usermanager.php:874
 msgid "Key length"
 msgstr ""
 
-#: src/usr/local/www/system_camanager.php:184
-#: src/usr/local/www/system_camanager.php:200
-#: src/usr/local/www/system_certmanager.php:245
+#: src/usr/local/www/system_camanager.php:189
+#: src/usr/local/www/system_camanager.php:205
+#: src/usr/local/www/system_certmanager.php:248
 #: src/usr/local/www/system_usermanager.php:191
 #: src/usr/local/www/system_usermanager.php:891
 #: src/usr/local/www/vpn_ipsec_phase2.php:665
 msgid "Lifetime"
 msgstr ""
 
-#: src/usr/local/www/system_camanager.php:185
-#: src/usr/local/www/system_camanager.php:201
-#: src/usr/local/www/system_certmanager.php:246
-#: src/usr/local/www/system_certmanager.php:261
+#: src/usr/local/www/system_camanager.php:190
+#: src/usr/local/www/system_camanager.php:206
+#: src/usr/local/www/system_certmanager.php:249
+#: src/usr/local/www/system_certmanager.php:264
 msgid "Distinguished name Country Code"
 msgstr ""
 
-#: src/usr/local/www/system_camanager.php:186
-#: src/usr/local/www/system_camanager.php:202
-#: src/usr/local/www/system_certmanager.php:247
-#: src/usr/local/www/system_certmanager.php:262
+#: src/usr/local/www/system_camanager.php:191
+#: src/usr/local/www/system_camanager.php:207
+#: src/usr/local/www/system_certmanager.php:250
+#: src/usr/local/www/system_certmanager.php:265
 msgid "Distinguished name State or Province"
 msgstr ""
 
-#: src/usr/local/www/system_camanager.php:187
-#: src/usr/local/www/system_camanager.php:203
-#: src/usr/local/www/system_certmanager.php:248
-#: src/usr/local/www/system_certmanager.php:263
+#: src/usr/local/www/system_camanager.php:192
+#: src/usr/local/www/system_camanager.php:208
+#: src/usr/local/www/system_certmanager.php:251
+#: src/usr/local/www/system_certmanager.php:266
 msgid "Distinguished name City"
 msgstr ""
 
-#: src/usr/local/www/system_camanager.php:188
-#: src/usr/local/www/system_camanager.php:204
-#: src/usr/local/www/system_certmanager.php:249
-#: src/usr/local/www/system_certmanager.php:264
+#: src/usr/local/www/system_camanager.php:193
+#: src/usr/local/www/system_camanager.php:209
+#: src/usr/local/www/system_certmanager.php:252
+#: src/usr/local/www/system_certmanager.php:267
 msgid "Distinguished name Organization"
 msgstr ""
 
-#: src/usr/local/www/system_camanager.php:189
-#: src/usr/local/www/system_camanager.php:205
-#: src/usr/local/www/system_certmanager.php:250
-#: src/usr/local/www/system_certmanager.php:265
+#: src/usr/local/www/system_camanager.php:194
+#: src/usr/local/www/system_camanager.php:210
+#: src/usr/local/www/system_certmanager.php:253
+#: src/usr/local/www/system_certmanager.php:268
 msgid "Distinguished name Email Address"
 msgstr ""
 
-#: src/usr/local/www/system_camanager.php:190
-#: src/usr/local/www/system_camanager.php:206
-#: src/usr/local/www/system_certmanager.php:251
-#: src/usr/local/www/system_certmanager.php:266
+#: src/usr/local/www/system_camanager.php:195
+#: src/usr/local/www/system_camanager.php:211
+#: src/usr/local/www/system_certmanager.php:254
+#: src/usr/local/www/system_certmanager.php:269
 msgid "Distinguished name Common Name"
 msgstr ""
 
-#: src/usr/local/www/system_camanager.php:198
-#: src/usr/local/www/system_camanager.php:516
+#: src/usr/local/www/system_camanager.php:203
+#: src/usr/local/www/system_camanager.php:538
 msgid "Signing Certificate Authority"
 msgstr ""
 
-#: src/usr/local/www/system_camanager.php:213
+#: src/usr/local/www/system_camanager.php:218
 msgid "The field 'Descriptive Name' contains invalid characters."
 msgstr ""
 
-#: src/usr/local/www/system_camanager.php:219
-#: src/usr/local/www/system_certmanager.php:337
+#: src/usr/local/www/system_camanager.php:224
+#: src/usr/local/www/system_certmanager.php:340
 msgid ""
 "The field 'Distinguished name Email Address' contains invalid characters."
 msgstr ""
 
-#: src/usr/local/www/system_camanager.php:223
-#: src/usr/local/www/system_certmanager.php:341
+#: src/usr/local/www/system_camanager.php:228
+#: src/usr/local/www/system_certmanager.php:344
 msgid "The field 'Distinguished name Common Name' contains invalid characters."
 msgstr ""
 
-#: src/usr/local/www/system_camanager.php:230
-#: src/usr/local/www/system_certmanager.php:349
-#: src/usr/local/www/system_certmanager.php:356
+#: src/usr/local/www/system_camanager.php:235
+#: src/usr/local/www/system_certmanager.php:352
+#: src/usr/local/www/system_certmanager.php:359
 msgid "Please select a valid Key Length."
 msgstr ""
 
-#: src/usr/local/www/system_camanager.php:233
-#: src/usr/local/www/system_certmanager.php:352
-#: src/usr/local/www/system_certmanager.php:359
+#: src/usr/local/www/system_camanager.php:238
+#: src/usr/local/www/system_certmanager.php:355
+#: src/usr/local/www/system_certmanager.php:362
 msgid "Please select a valid Digest Algorithm."
 msgstr ""
 
-#: src/usr/local/www/system_camanager.php:316
-#: src/usr/local/www/system_certmanager.php:518
+#: src/usr/local/www/system_camanager.php:321
+#: src/usr/local/www/system_certmanager.php:521
 #: src/usr/local/www/system_crlmanager.php:253
 msgid "Certificate Manager"
 msgstr ""
 
-#: src/usr/local/www/system_camanager.php:316
-#: src/usr/local/www/system_camanager.php:343
-#: src/usr/local/www/system_certmanager.php:534
+#: src/usr/local/www/system_camanager.php:321
+#: src/usr/local/www/system_camanager.php:348
+#: src/usr/local/www/system_certmanager.php:537
 #: src/usr/local/www/system_crlmanager.php:334
 msgid "CAs"
 msgstr ""
 
-#: src/usr/local/www/system_camanager.php:344
-#: src/usr/local/www/system_camanager.php:360
-#: src/usr/local/www/system_certmanager.php:518
-#: src/usr/local/www/system_certmanager.php:535
-#: src/usr/local/www/system_certmanager.php:943
+#: src/usr/local/www/system_camanager.php:349
+#: src/usr/local/www/system_camanager.php:365
+#: src/usr/local/www/system_certmanager.php:521
+#: src/usr/local/www/system_certmanager.php:538
+#: src/usr/local/www/system_certmanager.php:946
 #: src/usr/local/www/system_crlmanager.php:335
 #: src/usr/local/www/system_crlmanager.php:578
 msgid "Certificates"
 msgstr ""
 
-#: src/usr/local/www/system_camanager.php:345
-#: src/usr/local/www/system_certmanager.php:536
+#: src/usr/local/www/system_camanager.php:350
+#: src/usr/local/www/system_certmanager.php:539
 #: src/usr/local/www/system_crlmanager.php:253
 #: src/usr/local/www/system_crlmanager.php:336
 msgid "Certificate Revocation"
 msgstr ""
 
-#: src/usr/local/www/system_camanager.php:351
+#: src/usr/local/www/system_camanager.php:356
 msgid "Certificate Authorities"
 msgstr ""
 
-#: src/usr/local/www/system_camanager.php:358
+#: src/usr/local/www/system_camanager.php:363
 #: src/usr/local/www/system_crlmanager.php:577
 msgid "Internal"
 msgstr ""
 
-#: src/usr/local/www/system_camanager.php:359
-#: src/usr/local/www/system_certmanager.php:950
+#: src/usr/local/www/system_camanager.php:364
+#: src/usr/local/www/system_certmanager.php:953
 msgid "Issuer"
 msgstr ""
 
-#: src/usr/local/www/system_camanager.php:361
-#: src/usr/local/www/system_certmanager.php:951
+#: src/usr/local/www/system_camanager.php:366
+#: src/usr/local/www/system_certmanager.php:954
 msgid "Distinguished Name"
 msgstr ""
 
-#: src/usr/local/www/system_camanager.php:373
-#: src/usr/local/www/system_certmanager.php:975
+#: src/usr/local/www/system_camanager.php:379
+#: src/usr/local/www/system_certmanager.php:978
 msgid "self-signed"
 msgstr ""
 
-#: src/usr/local/www/system_camanager.php:375
-#: src/usr/local/www/system_certmanager.php:977
+#: src/usr/local/www/system_camanager.php:381
+#: src/usr/local/www/system_certmanager.php:980
 msgid "external"
 msgstr ""
 
-#: src/usr/local/www/system_camanager.php:407
-#: src/usr/local/www/system_certmanager.php:1009
+#: src/usr/local/www/system_camanager.php:413
+#: src/usr/local/www/system_certmanager.php:1012
 msgid "Valid From"
 msgstr ""
 
-#: src/usr/local/www/system_camanager.php:407
-#: src/usr/local/www/system_certmanager.php:1009
+#: src/usr/local/www/system_camanager.php:413
+#: src/usr/local/www/system_certmanager.php:1012
 msgid "Valid Until"
 msgstr ""
 
-#: src/usr/local/www/system_camanager.php:411
+#: src/usr/local/www/system_camanager.php:418
+#: src/usr/local/www/system_certmanager.php:1027
+msgid "OpenVPN Server"
+msgstr ""
+
+#: src/usr/local/www/system_camanager.php:421
+#: src/usr/local/www/system_certmanager.php:1030
+msgid "OpenVPN Client"
+msgstr ""
+
+#: src/usr/local/www/system_camanager.php:424
+#: src/usr/local/www/system_certmanager.php:1033
+msgid "IPsec Tunnel"
+msgstr ""
+
+#: src/usr/local/www/system_camanager.php:427
+msgid "LDAP Server"
+msgstr ""
+
+#: src/usr/local/www/system_camanager.php:431
 msgid "Edit CA"
 msgstr ""
 
-#: src/usr/local/www/system_camanager.php:412
+#: src/usr/local/www/system_camanager.php:432
 msgid "Export CA"
 msgstr ""
 
-#: src/usr/local/www/system_camanager.php:414
+#: src/usr/local/www/system_camanager.php:434
 msgid "Export key"
 msgstr ""
 
-#: src/usr/local/www/system_camanager.php:416
-msgid "Delete CA"
+#: src/usr/local/www/system_camanager.php:437
+msgid "Delete CA and its CRLs"
 msgstr ""
 
-#: src/usr/local/www/system_camanager.php:457
+#: src/usr/local/www/system_camanager.php:479
 msgid "Create / Edit CA"
 msgstr ""
 
-#: src/usr/local/www/system_camanager.php:469
-#: src/usr/local/www/system_certmanager.php:577
+#: src/usr/local/www/system_camanager.php:491
+#: src/usr/local/www/system_certmanager.php:580
 #: src/usr/local/www/system_crlmanager.php:347
 msgid "Method"
 msgstr ""
 
-#: src/usr/local/www/system_camanager.php:477
+#: src/usr/local/www/system_camanager.php:499
 msgid "Existing Certificate Authority"
 msgstr ""
 
-#: src/usr/local/www/system_camanager.php:484
-#: src/usr/local/www/system_certmanager.php:598
+#: src/usr/local/www/system_camanager.php:506
+#: src/usr/local/www/system_certmanager.php:601
 msgid "Paste a certificate in X.509 PEM format here."
 msgstr ""
 
-#: src/usr/local/www/system_camanager.php:488
+#: src/usr/local/www/system_camanager.php:510
 msgid "Certificate Private Key (optional)"
 msgstr ""
 
-#: src/usr/local/www/system_camanager.php:490
+#: src/usr/local/www/system_camanager.php:512
 msgid ""
 "Paste the private key for the above certificate here. This is optional in "
 "most cases, but is required when generating a Certificate Revocation List "
 "(CRL)."
 msgstr ""
 
-#: src/usr/local/www/system_camanager.php:496
+#: src/usr/local/www/system_camanager.php:518
 msgid "Serial for next certificate"
 msgstr ""
 
-#: src/usr/local/www/system_camanager.php:499
+#: src/usr/local/www/system_camanager.php:521
 msgid ""
 "Enter a decimal number to be used as the serial number for the next "
 "certificate to be created using this CA."
 msgstr ""
 
-#: src/usr/local/www/system_camanager.php:504
+#: src/usr/local/www/system_camanager.php:526
 msgid "Internal Certificate Authority"
 msgstr ""
 
-#: src/usr/local/www/system_camanager.php:528
+#: src/usr/local/www/system_camanager.php:550
 msgid "Key length (bits)"
 msgstr ""
 
-#: src/usr/local/www/system_camanager.php:535
-#: src/usr/local/www/system_certmanager.php:645
-#: src/usr/local/www/system_certmanager.php:787
+#: src/usr/local/www/system_camanager.php:557
+#: src/usr/local/www/system_certmanager.php:648
+#: src/usr/local/www/system_certmanager.php:790
 msgid "Digest Algorithm"
 msgstr ""
 
-#: src/usr/local/www/system_camanager.php:538
-#: src/usr/local/www/system_certmanager.php:648
+#: src/usr/local/www/system_camanager.php:560
+#: src/usr/local/www/system_certmanager.php:651
 msgid ""
 "NOTE: It is recommended to use an algorithm stronger than SHA1 when possible."
 msgstr ""
 
-#: src/usr/local/www/system_camanager.php:543
-#: src/usr/local/www/system_certmanager.php:661
+#: src/usr/local/www/system_camanager.php:565
+#: src/usr/local/www/system_certmanager.php:664
 msgid "Lifetime (days)"
 msgstr ""
 
-#: src/usr/local/www/system_camanager.php:550
-#: src/usr/local/www/system_certmanager.php:668
-#: src/usr/local/www/system_certmanager.php:795
+#: src/usr/local/www/system_camanager.php:572
+#: src/usr/local/www/system_certmanager.php:671
+#: src/usr/local/www/system_certmanager.php:798
 msgid "Country Code"
 msgstr ""
 
-#: src/usr/local/www/system_camanager.php:557
-#: src/usr/local/www/system_certmanager.php:675
-#: src/usr/local/www/system_certmanager.php:802
+#: src/usr/local/www/system_camanager.php:579
+#: src/usr/local/www/system_certmanager.php:678
+#: src/usr/local/www/system_certmanager.php:805
 msgid "State or Province"
 msgstr ""
 
-#: src/usr/local/www/system_camanager.php:565
-#: src/usr/local/www/system_certmanager.php:683
-#: src/usr/local/www/system_certmanager.php:810
+#: src/usr/local/www/system_camanager.php:587
+#: src/usr/local/www/system_certmanager.php:686
+#: src/usr/local/www/system_certmanager.php:813
 msgid "City"
 msgstr ""
 
-#: src/usr/local/www/system_camanager.php:573
-#: src/usr/local/www/system_certmanager.php:691
-#: src/usr/local/www/system_certmanager.php:818
+#: src/usr/local/www/system_camanager.php:595
+#: src/usr/local/www/system_certmanager.php:694
+#: src/usr/local/www/system_certmanager.php:821
 msgid "Organization"
 msgstr ""
 
-#: src/usr/local/www/system_camanager.php:581
-#: src/usr/local/www/system_certmanager.php:699
-#: src/usr/local/www/system_certmanager.php:826
+#: src/usr/local/www/system_camanager.php:603
+#: src/usr/local/www/system_certmanager.php:702
+#: src/usr/local/www/system_certmanager.php:829
 msgid "Organizational Unit"
 msgstr ""
 
+#: src/usr/local/www/system_camanager.php:611
+#: src/usr/local/www/system_certmanager.php:710
+#: src/usr/local/www/system_certmanager.php:837
+msgid "Email Address"
+msgstr ""
+
 #: src/usr/local/www/system_certmanager.php:34
 msgid "Import an existing Certificate"
 msgstr ""
@@ -26572,172 +26845,160 @@ msgstr ""
 msgid "Key data"
 msgstr ""
 
-#: src/usr/local/www/system_certmanager.php:242
-#: src/usr/local/www/system_certmanager.php:612
-#: src/usr/local/www/system_certmanager.php:630
+#: src/usr/local/www/system_certmanager.php:245
+#: src/usr/local/www/system_certmanager.php:615
+#: src/usr/local/www/system_certmanager.php:633
 #: src/usr/local/www/system_usermanager.php:189
 #: src/usr/local/www/system_usermanager.php:867
 msgid "Certificate authority"
 msgstr ""
 
-#: src/usr/local/www/system_certmanager.php:244
-#: src/usr/local/www/system_certmanager.php:653
+#: src/usr/local/www/system_certmanager.php:247
+#: src/usr/local/www/system_certmanager.php:656
 msgid "Certificate Type"
 msgstr ""
 
-#: src/usr/local/www/system_certmanager.php:271
+#: src/usr/local/www/system_certmanager.php:274
 msgid "Existing Certificate Choice"
 msgstr ""
 
-#: src/usr/local/www/system_certmanager.php:472
+#: src/usr/local/www/system_certmanager.php:475
 msgid "Final Certificate data"
 msgstr ""
 
-#: src/usr/local/www/system_certmanager.php:496
+#: src/usr/local/www/system_certmanager.php:499
 #, php-format
 msgid "The certificate modulus does not match the signing request modulus."
 msgstr ""
 
-#: src/usr/local/www/system_certmanager.php:572
+#: src/usr/local/www/system_certmanager.php:575
 msgid "Add a New Certificate"
 msgstr ""
 
-#: src/usr/local/www/system_certmanager.php:591
+#: src/usr/local/www/system_certmanager.php:594
 msgid "Import Certificate"
 msgstr ""
 
-#: src/usr/local/www/system_certmanager.php:602
+#: src/usr/local/www/system_certmanager.php:605
 msgid "Private key data"
 msgstr ""
 
-#: src/usr/local/www/system_certmanager.php:604
+#: src/usr/local/www/system_certmanager.php:607
 msgid "Paste a private key in X.509 PEM format here."
 msgstr ""
 
-#: src/usr/local/www/system_certmanager.php:607
+#: src/usr/local/www/system_certmanager.php:610
 msgid "Internal Certificate"
 msgstr ""
 
-#: src/usr/local/www/system_certmanager.php:613
+#: src/usr/local/www/system_certmanager.php:616
 msgid "No internal Certificate Authorities have been defined. "
 msgstr ""
 
-#: src/usr/local/www/system_certmanager.php:614
+#: src/usr/local/www/system_certmanager.php:617
 msgid ""
 "An internal CA must be defined in order to create an internal certificate. "
 msgstr ""
 
-#: src/usr/local/www/system_certmanager.php:615
+#: src/usr/local/www/system_certmanager.php:618
 msgid "Create"
 msgstr ""
 
-#: src/usr/local/www/system_certmanager.php:616
+#: src/usr/local/www/system_certmanager.php:619
 msgid " an internal CA."
 msgstr ""
 
-#: src/usr/local/www/system_certmanager.php:656
+#: src/usr/local/www/system_certmanager.php:659
 msgid ""
 "Type of certificate to generate. Used for placing restrictions on the usage "
 "of the generated certificate."
 msgstr ""
 
-#: src/usr/local/www/system_certmanager.php:732
+#: src/usr/local/www/system_certmanager.php:735
 msgid "Alternative Names"
 msgstr ""
 
-#: src/usr/local/www/system_certmanager.php:739
+#: src/usr/local/www/system_certmanager.php:742
 msgid "FQDN or Hostname"
 msgstr ""
 
-#: src/usr/local/www/system_certmanager.php:741
+#: src/usr/local/www/system_certmanager.php:744
 msgid "URI"
 msgstr ""
 
-#: src/usr/local/www/system_certmanager.php:742
+#: src/usr/local/www/system_certmanager.php:745
 msgid "email address"
 msgstr ""
 
-#: src/usr/local/www/system_certmanager.php:775
+#: src/usr/local/www/system_certmanager.php:778
 msgid "External Signing Request"
 msgstr ""
 
-#: src/usr/local/www/system_certmanager.php:790
+#: src/usr/local/www/system_certmanager.php:793
 msgid ""
 "NOTE: It is recommended to use an algorithm stronger than SHA1 when possible"
 msgstr ""
 
-#: src/usr/local/www/system_certmanager.php:849
+#: src/usr/local/www/system_certmanager.php:852
 msgid "Choose an Existing Certificate"
 msgstr ""
 
-#: src/usr/local/www/system_certmanager.php:878
+#: src/usr/local/www/system_certmanager.php:881
 msgid "Existing Certificates"
 msgstr ""
 
-#: src/usr/local/www/system_certmanager.php:890
+#: src/usr/local/www/system_certmanager.php:893
 msgid "Complete Signing Request for "
 msgstr ""
 
-#: src/usr/local/www/system_certmanager.php:901
+#: src/usr/local/www/system_certmanager.php:904
 msgid "Signing request data"
 msgstr ""
 
-#: src/usr/local/www/system_certmanager.php:905
+#: src/usr/local/www/system_certmanager.php:908
 msgid ""
 "Copy the certificate signing data from here and forward it to a certificate "
 "authority for signing."
 msgstr ""
 
-#: src/usr/local/www/system_certmanager.php:909
+#: src/usr/local/www/system_certmanager.php:912
 msgid "Final certificate data"
 msgstr ""
 
-#: src/usr/local/www/system_certmanager.php:912
+#: src/usr/local/www/system_certmanager.php:915
 msgid "Paste the certificate received from the certificate authority here."
 msgstr ""
 
-#: src/usr/local/www/system_certmanager.php:985
+#: src/usr/local/www/system_certmanager.php:988
 msgid "external - signature pending"
 msgstr ""
 
-#: src/usr/local/www/system_certmanager.php:1021
-msgid "User Cert"
-msgstr ""
-
 #: src/usr/local/www/system_certmanager.php:1024
-msgid "OpenVPN Server"
-msgstr ""
-
-#: src/usr/local/www/system_certmanager.php:1027
-msgid "OpenVPN Client"
-msgstr ""
-
-#: src/usr/local/www/system_certmanager.php:1030
-msgid "IPsec Tunnel"
+msgid "User Cert"
 msgstr ""
 
-#: src/usr/local/www/system_certmanager.php:1057
+#: src/usr/local/www/system_certmanager.php:1060
 msgid "Export Certificate"
 msgstr ""
 
-#: src/usr/local/www/system_certmanager.php:1058
-#: src/usr/local/www/system_certmanager.php:1063
+#: src/usr/local/www/system_certmanager.php:1061
+#: src/usr/local/www/system_certmanager.php:1066
 msgid "Export Key"
 msgstr ""
 
-#: src/usr/local/www/system_certmanager.php:1059
+#: src/usr/local/www/system_certmanager.php:1062
 msgid "Export P12"
 msgstr ""
 
-#: src/usr/local/www/system_certmanager.php:1061
+#: src/usr/local/www/system_certmanager.php:1064
 msgid "Update CSR"
 msgstr ""
 
-#: src/usr/local/www/system_certmanager.php:1062
+#: src/usr/local/www/system_certmanager.php:1065
 msgid "Export Request"
 msgstr ""
 
-#: src/usr/local/www/system_certmanager.php:1066
+#: src/usr/local/www/system_certmanager.php:1069
 msgid "Delete Certificate"
 msgstr ""
 
@@ -26902,12 +27163,12 @@ msgid "removed gateway group %s"
 msgstr ""
 
 #: src/usr/local/www/system_gateway_groups.php:114
-#: src/usr/local/www/system_gateways.php:224
+#: src/usr/local/www/system_gateways.php:238
 msgid "The gateway configuration has been changed."
 msgstr ""
 
 #: src/usr/local/www/system_gateway_groups.php:119
-#: src/usr/local/www/system_gateways.php:229
+#: src/usr/local/www/system_gateways.php:243
 #: src/usr/local/www/system_routes.php:44
 #: src/usr/local/www/system_routes.php:213
 #: src/usr/local/www/system_routes.php:230
@@ -27023,7 +27284,7 @@ msgid ""
 msgstr ""
 
 #: src/usr/local/www/system_gateways.php:86
-#: src/usr/local/www/system_gateways_edit.php:125
+#: src/usr/local/www/system_gateways_edit.php:126
 #, php-format
 msgid ""
 "Gateway \"%1$s\" cannot be disabled because it is in use on Gateway Group "
@@ -27038,433 +27299,439 @@ msgid ""
 msgstr ""
 
 #: src/usr/local/www/system_gateways.php:102
-#: src/usr/local/www/system_gateways_edit.php:137
+#: src/usr/local/www/system_gateways_edit.php:138
 #, php-format
 msgid ""
 "Gateway \"%1$s\" cannot be disabled because it is in use on Static Route "
 "\"%2$s\""
 msgstr ""
 
-#: src/usr/local/www/system_gateways.php:177
+#: src/usr/local/www/system_gateways.php:185
 #, php-format
 msgid "Gateways: removed gateways %s"
 msgstr ""
 
-#: src/usr/local/www/system_gateways.php:245
-#: src/usr/local/www/system_gateways_edit.php:638
+#: src/usr/local/www/system_gateways.php:259
+#: src/usr/local/www/system_gateways_edit.php:658
 #: src/usr/local/www/widgets/widgets/gateways.widget.php:108
 msgid "Monitor IP"
 msgstr ""
 
-#: src/usr/local/www/system_gateways.php:262
+#: src/usr/local/www/system_gateways.php:276
 msgid "This gateway is inactive because interface is missing"
 msgstr ""
 
-#: src/usr/local/www/system_gateways.php:290
+#: src/usr/local/www/system_gateways.php:304
 msgid "Edit gateway"
 msgstr ""
 
-#: src/usr/local/www/system_gateways.php:291
+#: src/usr/local/www/system_gateways.php:305
 msgid "Copy gateway"
 msgstr ""
 
-#: src/usr/local/www/system_gateways.php:296
+#: src/usr/local/www/system_gateways.php:310
 msgid "Enable gateway"
 msgstr ""
 
-#: src/usr/local/www/system_gateways.php:299
+#: src/usr/local/www/system_gateways.php:313
 msgid "Disable gateway"
 msgstr ""
 
-#: src/usr/local/www/system_gateways.php:302
+#: src/usr/local/www/system_gateways.php:316
 msgid "Delete gateway"
 msgstr ""
 
-#: src/usr/local/www/system_gateways_edit.php:116
+#: src/usr/local/www/system_gateways_edit.php:117
 msgid "gateway"
 msgstr ""
 
-#: src/usr/local/www/system_gateways_edit.php:145
+#: src/usr/local/www/system_gateways_edit.php:146
 msgid "A valid gateway IP address must be specified."
 msgstr ""
 
-#: src/usr/local/www/system_gateways_edit.php:153
+#: src/usr/local/www/system_gateways_edit.php:154
 msgid ""
 "Cannot add IPv4 Gateway Address because no IPv4 address could be found on "
 "the interface."
 msgstr ""
 
-#: src/usr/local/www/system_gateways_edit.php:175
-#: src/usr/local/www/system_gateways_edit.php:206
+#: src/usr/local/www/system_gateways_edit.php:176
+#: src/usr/local/www/system_gateways_edit.php:207
 #, php-format
 msgid ""
 "The gateway address %1$s does not lie within one of the chosen interface's "
 "subnets."
 msgstr ""
 
-#: src/usr/local/www/system_gateways_edit.php:184
+#: src/usr/local/www/system_gateways_edit.php:185
 msgid ""
 "Cannot add IPv6 Gateway Address because no IPv6 address could be found on "
 "the interface."
 msgstr ""
 
-#: src/usr/local/www/system_gateways_edit.php:214
+#: src/usr/local/www/system_gateways_edit.php:215
 msgid ""
 "Dynamic gateway values cannot be specified for interfaces with a static IPv4 "
 "configuration."
 msgstr ""
 
-#: src/usr/local/www/system_gateways_edit.php:219
+#: src/usr/local/www/system_gateways_edit.php:220
 msgid ""
 "Dynamic gateway values cannot be specified for interfaces with a static IPv6 "
 "configuration."
 msgstr ""
 
-#: src/usr/local/www/system_gateways_edit.php:224
-msgid "A valid monitor IP address must be specified."
-msgstr ""
-
-#: src/usr/local/www/system_gateways_edit.php:227
+#: src/usr/local/www/system_gateways_edit.php:228
 msgid "A valid data payload must be specified."
 msgstr ""
 
-#: src/usr/local/www/system_gateways_edit.php:232
+#: src/usr/local/www/system_gateways_edit.php:233
 #, php-format
 msgid "The IPv6 gateway address '%s' can not be used as a IPv4 gateway."
 msgstr ""
 
-#: src/usr/local/www/system_gateways_edit.php:235
+#: src/usr/local/www/system_gateways_edit.php:236
 #, php-format
 msgid "The IPv4 gateway address '%s' can not be used as a IPv6 gateway."
 msgstr ""
 
-#: src/usr/local/www/system_gateways_edit.php:241
+#: src/usr/local/www/system_gateways_edit.php:242
 #, php-format
 msgid "The IPv6 monitor address '%s' can not be used on a IPv4 gateway."
 msgstr ""
 
-#: src/usr/local/www/system_gateways_edit.php:244
+#: src/usr/local/www/system_gateways_edit.php:245
 #, php-format
 msgid "The IPv4 monitor address '%s' can not be used on a IPv6 gateway."
 msgstr ""
 
-#: src/usr/local/www/system_gateways_edit.php:253
+#: src/usr/local/www/system_gateways_edit.php:254
 msgid "Changing name on a gateway is not allowed."
 msgstr ""
 
-#: src/usr/local/www/system_gateways_edit.php:259
+#: src/usr/local/www/system_gateways_edit.php:260
 #, php-format
 msgid "The gateway name \"%s\" already exists."
 msgstr ""
 
-#: src/usr/local/www/system_gateways_edit.php:265
+#: src/usr/local/www/system_gateways_edit.php:266
 #, php-format
 msgid "The gateway IP address \"%s\" already exists."
 msgstr ""
 
-#: src/usr/local/www/system_gateways_edit.php:271
+#: src/usr/local/www/system_gateways_edit.php:272
 #, php-format
 msgid ""
 "The monitor IP address \"%s\" is already in use. A different monitor IP must "
 "be chosen."
 msgstr ""
 
-#: src/usr/local/www/system_gateways_edit.php:283
+#: src/usr/local/www/system_gateways_edit.php:284
 msgid "The low latency threshold needs to be a numeric value."
 msgstr ""
 
-#: src/usr/local/www/system_gateways_edit.php:285
+#: src/usr/local/www/system_gateways_edit.php:286
 msgid "The low latency threshold needs to be positive."
 msgstr ""
 
-#: src/usr/local/www/system_gateways_edit.php:294
+#: src/usr/local/www/system_gateways_edit.php:295
 msgid "The high latency threshold needs to be a numeric value."
 msgstr ""
 
-#: src/usr/local/www/system_gateways_edit.php:296
+#: src/usr/local/www/system_gateways_edit.php:297
 msgid "The high latency threshold needs to be positive."
 msgstr ""
 
-#: src/usr/local/www/system_gateways_edit.php:305
+#: src/usr/local/www/system_gateways_edit.php:306
 msgid "The low Packet Loss threshold needs to be a numeric value."
 msgstr ""
 
-#: src/usr/local/www/system_gateways_edit.php:307
+#: src/usr/local/www/system_gateways_edit.php:308
 msgid "The low Packet Loss threshold needs to be positive."
 msgstr ""
 
-#: src/usr/local/www/system_gateways_edit.php:309
+#: src/usr/local/www/system_gateways_edit.php:310
 msgid "The low Packet Loss threshold needs to be less than 100."
 msgstr ""
 
-#: src/usr/local/www/system_gateways_edit.php:318
+#: src/usr/local/www/system_gateways_edit.php:319
 msgid "The high Packet Loss threshold needs to be a numeric value."
 msgstr ""
 
-#: src/usr/local/www/system_gateways_edit.php:320
+#: src/usr/local/www/system_gateways_edit.php:321
 msgid "The high Packet Loss threshold needs to be positive."
 msgstr ""
 
-#: src/usr/local/www/system_gateways_edit.php:322
+#: src/usr/local/www/system_gateways_edit.php:323
 msgid "The high Packet Loss threshold needs to be 100 or less."
 msgstr ""
 
-#: src/usr/local/www/system_gateways_edit.php:331
+#: src/usr/local/www/system_gateways_edit.php:332
 msgid ""
 "The time period over which results are averaged needs to be a numeric value."
 msgstr ""
 
-#: src/usr/local/www/system_gateways_edit.php:333
+#: src/usr/local/www/system_gateways_edit.php:334
 msgid "The time period over which results are averaged needs to be positive."
 msgstr ""
 
-#: src/usr/local/www/system_gateways_edit.php:342
+#: src/usr/local/www/system_gateways_edit.php:343
 msgid "The probe interval needs to be a numeric value."
 msgstr ""
 
-#: src/usr/local/www/system_gateways_edit.php:344
+#: src/usr/local/www/system_gateways_edit.php:345
 msgid "The probe interval needs to be positive."
 msgstr ""
 
-#: src/usr/local/www/system_gateways_edit.php:353
+#: src/usr/local/www/system_gateways_edit.php:354
 msgid "The loss interval needs to be a numeric value."
 msgstr ""
 
-#: src/usr/local/www/system_gateways_edit.php:355
+#: src/usr/local/www/system_gateways_edit.php:356
 msgid "The loss interval setting needs to be positive."
 msgstr ""
 
-#: src/usr/local/www/system_gateways_edit.php:364
+#: src/usr/local/www/system_gateways_edit.php:365
 msgid "The alert interval needs to be a numeric value."
 msgstr ""
 
-#: src/usr/local/www/system_gateways_edit.php:366
+#: src/usr/local/www/system_gateways_edit.php:367
 msgid "The alert interval setting needs to be positive."
 msgstr ""
 
-#: src/usr/local/www/system_gateways_edit.php:374
+#: src/usr/local/www/system_gateways_edit.php:375
 msgid ""
 "The high latency threshold needs to be greater than the low latency threshold"
 msgstr ""
 
-#: src/usr/local/www/system_gateways_edit.php:379
+#: src/usr/local/www/system_gateways_edit.php:380
 msgid ""
 "The high packet loss threshold needs to be higher than the low packet loss "
 "threshold"
 msgstr ""
 
-#: src/usr/local/www/system_gateways_edit.php:385
+#: src/usr/local/www/system_gateways_edit.php:386
 msgid ""
 "The loss interval needs to be greater than or equal to the high latency "
 "threshold."
 msgstr ""
 
-#: src/usr/local/www/system_gateways_edit.php:390
+#: src/usr/local/www/system_gateways_edit.php:391
 msgid ""
 "The time period needs to be greater than twice the probe interval plus the "
 "loss interval."
 msgstr ""
 
-#: src/usr/local/www/system_gateways_edit.php:396
+#: src/usr/local/www/system_gateways_edit.php:397
 msgid ""
 "The alert interval needs to be greater than or equal to the probe interval."
 msgstr ""
 
-#: src/usr/local/www/system_gateways_edit.php:575
+#: src/usr/local/www/system_gateways_edit.php:588
 msgid "Edit Gateway"
 msgstr ""
 
-#: src/usr/local/www/system_gateways_edit.php:582
+#: src/usr/local/www/system_gateways_edit.php:595
 msgid ""
 "Set this option to disable this gateway without removing it from the list."
 msgstr ""
 
-#: src/usr/local/www/system_gateways_edit.php:590
+#: src/usr/local/www/system_gateways_edit.php:603
 msgid "Choose which interface this gateway applies to."
 msgstr ""
 
-#: src/usr/local/www/system_gateways_edit.php:600
+#: src/usr/local/www/system_gateways_edit.php:613
 msgid "Choose the Internet Protocol this gateway uses."
 msgstr ""
 
-#: src/usr/local/www/system_gateways_edit.php:616
+#: src/usr/local/www/system_gateways_edit.php:629
 msgid "Gateway IP address"
 msgstr ""
 
-#: src/usr/local/www/system_gateways_edit.php:626
+#: src/usr/local/www/system_gateways_edit.php:639
 msgid "Default Gateway"
 msgstr ""
 
-#: src/usr/local/www/system_gateways_edit.php:636
+#: src/usr/local/www/system_gateways_edit.php:649
 msgid "This will consider this gateway as always being up."
 msgstr ""
 
-#: src/usr/local/www/system_gateways_edit.php:649
+#: src/usr/local/www/system_gateways_edit.php:653
+msgid "Gateway Action"
+msgstr ""
+
+#: src/usr/local/www/system_gateways_edit.php:656
+msgid ""
+"No action will be taken on gateway events. The gateway is always considered "
+"up."
+msgstr ""
+
+#: src/usr/local/www/system_gateways_edit.php:669
 msgid ""
 "Enter an alternative address here to be used to monitor the link. This is "
 "used for the quality RRD graphs as well as the load balancer entries. Use "
 "this if the gateway does not respond to ICMP echo requests (pings)."
 msgstr ""
 
-#: src/usr/local/www/system_gateways_edit.php:657
+#: src/usr/local/www/system_gateways_edit.php:677
 msgid "Force state"
 msgstr ""
 
-#: src/usr/local/www/system_gateways_edit.php:660
+#: src/usr/local/www/system_gateways_edit.php:680
 msgid "This will force this gateway to be considered down."
 msgstr ""
 
-#: src/usr/local/www/system_gateways_edit.php:667
+#: src/usr/local/www/system_gateways_edit.php:687
 msgid "A description may be entered here for reference (not parsed)."
 msgstr ""
 
-#: src/usr/local/www/system_gateways_edit.php:694
+#: src/usr/local/www/system_gateways_edit.php:714
 msgid "Weight for this gateway when used in a Gateway Group."
 msgstr ""
 
-#: src/usr/local/www/system_gateways_edit.php:698
+#: src/usr/local/www/system_gateways_edit.php:718
 msgid "Data Payload"
 msgstr ""
 
-#: src/usr/local/www/system_gateways_edit.php:702
+#: src/usr/local/www/system_gateways_edit.php:722
 msgid "Define data payload to send on ICMP packets to gateway monitor IP."
 msgstr ""
 
-#: src/usr/local/www/system_gateways_edit.php:704
+#: src/usr/local/www/system_gateways_edit.php:724
 msgid "Latency thresholds"
 msgstr ""
 
-#: src/usr/local/www/system_gateways_edit.php:719
+#: src/usr/local/www/system_gateways_edit.php:739
 #, php-format
 msgid ""
 "Low and high thresholds for latency in milliseconds.\n"
 "\tDefault is %d/%d."
 msgstr ""
 
-#: src/usr/local/www/system_gateways_edit.php:724
+#: src/usr/local/www/system_gateways_edit.php:744
 msgid "Packet Loss thresholds"
 msgstr ""
 
-#: src/usr/local/www/system_gateways_edit.php:739
+#: src/usr/local/www/system_gateways_edit.php:759
 #, php-format
 msgid ""
 "Low and high thresholds for packet loss in %%.\n"
 "\tDefault is %d/%d."
 msgstr ""
 
-#: src/usr/local/www/system_gateways_edit.php:745
+#: src/usr/local/www/system_gateways_edit.php:765
 msgid "Probe Interval"
 msgstr ""
 
-#: src/usr/local/www/system_gateways_edit.php:752
+#: src/usr/local/www/system_gateways_edit.php:772
 #, php-format
 msgid "How often an ICMP probe will be sent in milliseconds. Default is %d."
 msgstr ""
 
-#: src/usr/local/www/system_gateways_edit.php:756
+#: src/usr/local/www/system_gateways_edit.php:776
 msgid "Loss Interval"
 msgstr ""
 
-#: src/usr/local/www/system_gateways_edit.php:760
+#: src/usr/local/www/system_gateways_edit.php:780
 #, php-format
 msgid ""
 "Time interval in milliseconds before packets are treated as lost. Default is "
 "%d."
 msgstr ""
 
-#: src/usr/local/www/system_gateways_edit.php:763
+#: src/usr/local/www/system_gateways_edit.php:783
 msgid "Time Period"
 msgstr ""
 
-#: src/usr/local/www/system_gateways_edit.php:773
+#: src/usr/local/www/system_gateways_edit.php:793
 #, php-format
 msgid ""
 "Time period in milliseconds over which results are averaged. Default is %d."
 msgstr ""
 
-#: src/usr/local/www/system_gateways_edit.php:777
+#: src/usr/local/www/system_gateways_edit.php:797
 msgid "Alert interval"
 msgstr ""
 
-#: src/usr/local/www/system_gateways_edit.php:787
+#: src/usr/local/www/system_gateways_edit.php:807
 #, php-format
 msgid ""
 "Time interval in milliseconds between checking for an alert condition. "
 "Default is %d."
 msgstr ""
 
-#: src/usr/local/www/system_gateways_edit.php:792
+#: src/usr/local/www/system_gateways_edit.php:812
 msgid "Additional information"
 msgstr ""
 
-#: src/usr/local/www/system_gateways_edit.php:794
+#: src/usr/local/www/system_gateways_edit.php:814
 msgid ""
 "The time period, probe interval and loss interval are closely related. The "
 "ratio between these values control the accuracy of the numbers reported and "
 "the timeliness of alerts."
 msgstr ""
 
-#: src/usr/local/www/system_gateways_edit.php:798
+#: src/usr/local/www/system_gateways_edit.php:818
 msgid ""
 "A longer time period will provide smoother results for round trip time and "
 "loss, but will increase the time before a latency or loss alert is triggered."
 msgstr ""
 
-#: src/usr/local/www/system_gateways_edit.php:801
+#: src/usr/local/www/system_gateways_edit.php:821
 msgid ""
 "A shorter probe interval will decrease the time required before a latency or "
 "loss alert is triggered, but will use more network resource. Longer probe "
 "intervals will degrade the accuracy of the quality graphs."
 msgstr ""
 
-#: src/usr/local/www/system_gateways_edit.php:805
+#: src/usr/local/www/system_gateways_edit.php:825
 msgid ""
 "The ratio of the probe interval to the time period (minus the loss interval) "
 "also controls the resolution of loss reporting. To determine the resolution, "
 "the following formula can be used:"
 msgstr ""
 
-#: src/usr/local/www/system_gateways_edit.php:809
+#: src/usr/local/www/system_gateways_edit.php:829
 msgid ""
 "&nbsp;&nbsp;&nbsp;&nbsp;100 * probe interval / (time period - loss interval)"
 msgstr ""
 
-#: src/usr/local/www/system_gateways_edit.php:811
+#: src/usr/local/www/system_gateways_edit.php:831
 msgid ""
 "Rounding up to the nearest whole number will yield the resolution of loss "
 "reporting in percent. The default values provide a resolution of 1%."
 msgstr ""
 
-#: src/usr/local/www/system_gateways_edit.php:814
+#: src/usr/local/www/system_gateways_edit.php:834
 msgid ""
 "The default settings are recommended for most use cases. However if changing "
 "the settings, please observe the following restrictions:"
 msgstr ""
 
-#: src/usr/local/www/system_gateways_edit.php:817
+#: src/usr/local/www/system_gateways_edit.php:837
 msgid ""
 "- The time period must be greater than twice the probe interval plus the "
 "loss interval. This guarantees there is at least one completed probe at all "
 "times. "
 msgstr ""
 
-#: src/usr/local/www/system_gateways_edit.php:820
+#: src/usr/local/www/system_gateways_edit.php:840
 msgid ""
 "- The alert interval must be greater than or equal to the probe interval. "
 "There is no point checking for alerts more often than probes are done."
 msgstr ""
 
-#: src/usr/local/www/system_gateways_edit.php:823
+#: src/usr/local/www/system_gateways_edit.php:843
 msgid ""
 "- The loss interval must be greater than or equal to the high latency "
 "threshold."
 msgstr ""
 
-#: src/usr/local/www/system_gateways_edit.php:829
+#: src/usr/local/www/system_gateways_edit.php:849
 msgid "Use non-local gateway"
 msgstr ""
 
-#: src/usr/local/www/system_gateways_edit.php:832
+#: src/usr/local/www/system_gateways_edit.php:852
 msgid ""
 "This will allow use of a gateway outside of this interface's subnet. This is "
 "usually indicative of a configuration error, but is required for some "
@@ -28088,7 +28355,7 @@ msgstr ""
 #: src/usr/local/www/system_usermanager.php:737
 msgid ""
 "Leave blank if the account shouldn't expire, otherwise enter the expiration "
-"date"
+"date as MM/DD/YYYY"
 msgstr ""
 
 #: src/usr/local/www/system_usermanager.php:742
@@ -29263,7 +29530,7 @@ msgid "IPComp compression of content is proposed on the connection."
 msgstr ""
 
 #: src/usr/local/www/vpn_ipsec_settings.php:283
-#: src/usr/local/www/services_dnsmasq.php:296
+#: src/usr/local/www/services_dnsmasq.php:341
 msgid "Strict interface binding"
 msgstr ""
 
@@ -30451,11 +30718,11 @@ msgstr ""
 msgid "Click %1$shere%2$s to configure CARP."
 msgstr ""
 
-#: src/usr/local/www/widgets/widgets/dyn_dns_status.widget.php:94
+#: src/usr/local/www/widgets/widgets/dyn_dns_status.widget.php:107
 msgid "Int."
 msgstr ""
 
-#: src/usr/local/www/widgets/widgets/dyn_dns_status.widget.php:149
+#: src/usr/local/www/widgets/widgets/dyn_dns_status.widget.php:162
 msgid "Checking ..."
 msgstr ""
 
@@ -30473,14 +30740,16 @@ msgid "Save Settings"
 msgstr ""
 
 #: src/usr/local/www/widgets/widgets/gateways.widget.php:224
+#: src/usr/local/www/widgets/widgets/gateways.widget.php:227
 msgid "Packetloss"
 msgstr ""
 
-#: src/usr/local/www/widgets/widgets/gateways.widget.php:227
+#: src/usr/local/www/widgets/widgets/gateways.widget.php:230
+#: src/usr/local/www/widgets/widgets/gateways.widget.php:233
 msgid "Latency"
 msgstr ""
 
-#: src/usr/local/www/widgets/widgets/gateways.widget.php:231
+#: src/usr/local/www/widgets/widgets/gateways.widget.php:237
 msgid "Online <br/>(unmonitored)"
 msgstr ""
 
@@ -30988,50 +31257,50 @@ msgstr ""
 msgid "Only percentage bandwidth specification is allowed."
 msgstr ""
 
-#: src/usr/local/www/wizards/traffic_shaper_wizard_dedicated.inc:756
-#: src/usr/local/www/wizards/traffic_shaper_wizard_multi_all.inc:823
+#: src/usr/local/www/wizards/traffic_shaper_wizard_dedicated.inc:758
+#: src/usr/local/www/wizards/traffic_shaper_wizard_multi_all.inc:824
 msgid ""
 "Custom Bandwidths are greater than 30%. Please lower them for the wizard to "
 "continue."
 msgstr ""
 
-#: src/usr/local/www/wizards/traffic_shaper_wizard_dedicated.inc:1140
+#: src/usr/local/www/wizards/traffic_shaper_wizard_dedicated.inc:1142
 #: src/usr/local/www/wizards/traffic_shaper_wizard_multi_all.inc:1222
 msgid ""
 "Custom Bandwidths are greater than 40%. Please lower them for the wizard to "
 "continue."
 msgstr ""
 
-#: src/usr/local/www/wizards/traffic_shaper_wizard_dedicated.inc:1445
-#: src/usr/local/www/wizards/traffic_shaper_wizard_multi_all.inc:1533
+#: src/usr/local/www/wizards/traffic_shaper_wizard_dedicated.inc:1448
+#: src/usr/local/www/wizards/traffic_shaper_wizard_multi_all.inc:1535
 msgid "Penalty Box"
 msgstr ""
 
-#: src/usr/local/www/wizards/traffic_shaper_wizard_dedicated.inc:1452
-#: src/usr/local/www/wizards/traffic_shaper_wizard_dedicated.inc:1472
-#: src/usr/local/www/wizards/traffic_shaper_wizard_dedicated.inc:1486
-#: src/usr/local/www/wizards/traffic_shaper_wizard_dedicated.inc:1503
-#: src/usr/local/www/wizards/traffic_shaper_wizard_dedicated.inc:1522
-#: src/usr/local/www/wizards/traffic_shaper_wizard_dedicated.inc:1546
-#: src/usr/local/www/wizards/traffic_shaper_wizard_dedicated.inc:1625
-#: src/usr/local/www/wizards/traffic_shaper_wizard_multi_all.inc:1540
-#: src/usr/local/www/wizards/traffic_shaper_wizard_multi_all.inc:1561
-#: src/usr/local/www/wizards/traffic_shaper_wizard_multi_all.inc:1575
-#: src/usr/local/www/wizards/traffic_shaper_wizard_multi_all.inc:1592
-#: src/usr/local/www/wizards/traffic_shaper_wizard_multi_all.inc:1611
-#: src/usr/local/www/wizards/traffic_shaper_wizard_multi_all.inc:1635
-#: src/usr/local/www/wizards/traffic_shaper_wizard_multi_all.inc:1662
-#: src/usr/local/www/wizards/traffic_shaper_wizard_multi_all.inc:1715
+#: src/usr/local/www/wizards/traffic_shaper_wizard_dedicated.inc:1455
+#: src/usr/local/www/wizards/traffic_shaper_wizard_dedicated.inc:1475
+#: src/usr/local/www/wizards/traffic_shaper_wizard_dedicated.inc:1489
+#: src/usr/local/www/wizards/traffic_shaper_wizard_dedicated.inc:1506
+#: src/usr/local/www/wizards/traffic_shaper_wizard_dedicated.inc:1525
+#: src/usr/local/www/wizards/traffic_shaper_wizard_dedicated.inc:1549
+#: src/usr/local/www/wizards/traffic_shaper_wizard_dedicated.inc:1628
+#: src/usr/local/www/wizards/traffic_shaper_wizard_multi_all.inc:1542
+#: src/usr/local/www/wizards/traffic_shaper_wizard_multi_all.inc:1563
+#: src/usr/local/www/wizards/traffic_shaper_wizard_multi_all.inc:1577
+#: src/usr/local/www/wizards/traffic_shaper_wizard_multi_all.inc:1594
+#: src/usr/local/www/wizards/traffic_shaper_wizard_multi_all.inc:1613
+#: src/usr/local/www/wizards/traffic_shaper_wizard_multi_all.inc:1637
+#: src/usr/local/www/wizards/traffic_shaper_wizard_multi_all.inc:1664
+#: src/usr/local/www/wizards/traffic_shaper_wizard_multi_all.inc:1717
 msgid "Traffic Shaper Wizard"
 msgstr ""
 
-#: src/usr/local/www/wizards/traffic_shaper_wizard_dedicated.inc:1464
-#: src/usr/local/www/wizards/traffic_shaper_wizard_multi_all.inc:1553
+#: src/usr/local/www/wizards/traffic_shaper_wizard_dedicated.inc:1467
+#: src/usr/local/www/wizards/traffic_shaper_wizard_multi_all.inc:1555
 msgid "Connections From Upstream SIP Server"
 msgstr ""
 
-#: src/usr/local/www/wizards/traffic_shaper_wizard_dedicated.inc:1478
-#: src/usr/local/www/wizards/traffic_shaper_wizard_multi_all.inc:1567
+#: src/usr/local/www/wizards/traffic_shaper_wizard_dedicated.inc:1481
+#: src/usr/local/www/wizards/traffic_shaper_wizard_multi_all.inc:1569
 msgid "Connections To Upstream SIP Server"
 msgstr ""
 
@@ -31047,16 +31316,16 @@ msgstr ""
 msgid "The same interface cannot be selected twice on local interfaces."
 msgstr ""
 
-#: src/usr/local/www/xmlrpc.php:66
+#: src/usr/local/www/xmlrpc.php:68
 msgid "Authentication failed: Invalid username or password"
 msgstr ""
 
-#: src/usr/local/www/xmlrpc.php:83
+#: src/usr/local/www/xmlrpc.php:85
 msgid "Authentication failed: not enough privileges"
 msgstr ""
 
-#: src/usr/local/www/xmlrpc.php:302 src/usr/local/www/xmlrpc.php:429
-#: src/usr/local/www/xmlrpc.php:458
+#: src/usr/local/www/xmlrpc.php:292 src/usr/local/www/xmlrpc.php:418
+#: src/usr/local/www/xmlrpc.php:445
 #, php-format
 msgid "Merged in config (%s sections) from XMLRPC client."
 msgstr ""
@@ -31077,27 +31346,27 @@ msgstr ""
 msgid "Enable/disable discipline and its children"
 msgstr ""
 
-#: src/etc/inc/shaper.inc:2293
+#: src/etc/inc/shaper.inc:2294
 msgid "Upper Limit"
 msgstr ""
 
-#: src/etc/inc/shaper.inc:2326
+#: src/etc/inc/shaper.inc:2327
 msgid "Real Time"
 msgstr ""
 
-#: src/etc/inc/shaper.inc:2358
+#: src/etc/inc/shaper.inc:2359
 msgid "Link Share"
 msgstr ""
 
-#: src/etc/inc/shaper.inc:2803
+#: src/etc/inc/shaper.inc:2804
 msgid "Borrow from other queues when available"
 msgstr ""
 
-#: src/etc/inc/shaper.inc:3821
+#: src/etc/inc/shaper.inc:3822
 msgid "Enable limiter and its children"
 msgstr ""
 
-#: src/etc/inc/shaper.inc:4134
+#: src/etc/inc/shaper.inc:4135
 msgid "Enable this queue"
 msgstr ""
 
@@ -31139,35 +31408,35 @@ msgstr ""
 msgid "Reset firewall source tracking"
 msgstr ""
 
-#: src/usr/local/www/diag_smart.php:319
+#: src/usr/local/www/diag_smart.php:219
 msgid "Info"
 msgstr ""
 
-#: src/usr/local/www/diag_smart.php:327
+#: src/usr/local/www/diag_smart.php:227
 msgid "Health"
 msgstr ""
 
-#: src/usr/local/www/diag_smart.php:335
+#: src/usr/local/www/diag_smart.php:235
 msgid "S.M.A.R.T. Capabilities"
 msgstr ""
 
-#: src/usr/local/www/diag_smart.php:343
+#: src/usr/local/www/diag_smart.php:243
 msgid "Attributes"
 msgstr ""
 
-#: src/usr/local/www/diag_smart.php:407
+#: src/usr/local/www/diag_smart.php:307
 msgid "Short"
 msgstr ""
 
-#: src/usr/local/www/diag_smart.php:415
+#: src/usr/local/www/diag_smart.php:315
 msgid "Long"
 msgstr ""
 
-#: src/usr/local/www/diag_smart.php:423
+#: src/usr/local/www/diag_smart.php:323
 msgid "Conveyance"
 msgstr ""
 
-#: src/usr/local/www/diag_smart.php:480
+#: src/usr/local/www/diag_smart.php:380
 msgid "Self-test"
 msgstr ""
 
@@ -31175,54 +31444,50 @@ msgstr ""
 msgid "Show remote text"
 msgstr ""
 
-#: src/usr/local/www/firewall_aliases_edit.php:665
+#: src/usr/local/www/firewall_aliases_edit.php:675
 msgid "<span class=\"helptext\">"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat_1to1_edit.php:369
-#: src/usr/local/www/firewall_nat_edit.php:635
+#: src/usr/local/www/firewall_nat_1to1_edit.php:379
+#: src/usr/local/www/firewall_nat_edit.php:652
 #: src/usr/local/www/firewall_nat_npt_edit.php:192
-#: src/usr/local/www/firewall_nat_out_edit.php:434
+#: src/usr/local/www/firewall_nat_out_edit.php:432
 #: src/usr/local/www/firewall_rules_edit.php:1115
 msgid "Disable this rule"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat_1to1_edit.php:376
+#: src/usr/local/www/firewall_nat_1to1_edit.php:386
 msgid "Do not perform binat for the specified address"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat_1to1_edit.php:427
-#: src/usr/local/www/firewall_nat_1to1_edit.php:454
+#: src/usr/local/www/firewall_nat_1to1_edit.php:437
+#: src/usr/local/www/firewall_nat_1to1_edit.php:464
 #: src/usr/local/www/firewall_nat_npt_edit.php:207
 #: src/usr/local/www/firewall_nat_npt_edit.php:222
-#: src/usr/local/www/firewall_nat_out_edit.php:540
+#: src/usr/local/www/firewall_nat_out_edit.php:538
 msgid "Not"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat_edit.php:642
+#: src/usr/local/www/firewall_nat_edit.php:659
 msgid "Disable redirection for traffic matching this rule"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat_edit.php:710
-#: src/usr/local/www/firewall_nat_edit.php:777
+#: src/usr/local/www/firewall_nat_edit.php:727
+#: src/usr/local/www/firewall_nat_edit.php:794
 #: src/usr/local/www/firewall_rules_edit.php:1262
 msgid "Invert match."
 msgstr ""
 
-#: src/usr/local/www/firewall_nat_edit.php:873
+#: src/usr/local/www/firewall_nat_edit.php:890
 msgid "Do not automatically sync to other CARP members"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat_out_edit.php:441
+#: src/usr/local/www/firewall_nat_out_edit.php:439
 msgid ""
 "Enabling this option will disable NAT for traffic matching this rule and "
 "stop processing Outbound NAT rules"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat_out_edit.php:609
-msgid "Static port"
-msgstr ""
-
 #: src/usr/local/www/firewall_rules_edit.php:1124
 msgid "Apply the action immediately on match."
 msgstr ""
@@ -31234,148 +31499,148 @@ msgid ""
 "is not permitted."
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:1385
+#: src/usr/local/www/firewall_rules_edit.php:1388
 msgid "Log packets that are handled by this rule"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:1435
+#: src/usr/local/www/firewall_rules_edit.php:1438
 msgid ""
 "Allow packets with IP options to pass. Otherwise they are blocked by "
 "default. This is usually only seen with multicast traffic."
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:1443
+#: src/usr/local/www/firewall_rules_edit.php:1446
 msgid "Disable auto generated reply-to for this rule."
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:1521
+#: src/usr/local/www/firewall_rules_edit.php:1524
 msgid "Prevent states created by this rule to be sync'ed over pfsync."
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:1541
+#: src/usr/local/www/firewall_rules_edit.php:1544
 msgid ""
 "Prevent the rule on Master from automatically syncing to other CARP members"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:1675
-#: src/usr/local/www/firewall_rules_edit.php:1682
+#: src/usr/local/www/firewall_rules_edit.php:1678
+#: src/usr/local/www/firewall_rules_edit.php:1685
 msgid "<b>"
 msgstr ""
 
-#: src/usr/local/www/firewall_virtual_ip_edit.php:392
+#: src/usr/local/www/firewall_virtual_ip_edit.php:385
 msgid ""
 "Disable expansion of this entry into IPs on NAT lists (e.g. 192.168.1.0/24 "
 "expands to 256 entries.) "
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:1691
+#: src/usr/local/www/interfaces.php:1693
 msgid "Enable interface"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:1839 src/usr/local/www/interfaces.php:3150
+#: src/usr/local/www/interfaces.php:1843 src/usr/local/www/interfaces.php:3160
 msgid "Default gateway"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:1904 src/usr/local/www/interfaces.php:2087
+#: src/usr/local/www/interfaces.php:1909 src/usr/local/www/interfaces.php:2093
 msgid "Configuration Override"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:1985
+#: src/usr/local/www/interfaces.php:1991
 msgid "FreeBSD default"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2001
+#: src/usr/local/www/interfaces.php:2007
 msgid "pfSense Default"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2009
+#: src/usr/local/www/interfaces.php:2015
 msgid "Saved Cfg"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2096
+#: src/usr/local/www/interfaces.php:2102
 msgid "Request a IPv6 prefix/information through the IPv4 connectivity link"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2103
+#: src/usr/local/www/interfaces.php:2109
 msgid "Only request an IPv6 prefix, do not request an IPv6 address"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2117
+#: src/usr/local/www/interfaces.php:2123
 msgid ""
 "Send an IPv6 prefix hint to indicate the desired prefix size for delegation"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2124
+#: src/usr/local/www/interfaces.php:2130
 msgid "Start DHCP6 client in debug mode"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2130
+#: src/usr/local/www/interfaces.php:2136
 msgid "Required by some ISPs, especially those not using PPPoE"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2153
+#: src/usr/local/www/interfaces.php:2159
 msgid "Exchange Information Only"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2189
+#: src/usr/local/www/interfaces.php:2195
 msgid "Non-Temporary Address Allocation"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2229
+#: src/usr/local/www/interfaces.php:2236
 msgid "Prefix Delegation "
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2571 src/usr/local/www/interfaces.php:2701
+#: src/usr/local/www/interfaces.php:2579 src/usr/local/www/interfaces.php:2711
 msgid "Enable Dial-On-Demand mode "
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2628
+#: src/usr/local/www/interfaces.php:2636
 msgid "Reset at each month (\"0 0 1 * *\")"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2636
+#: src/usr/local/www/interfaces.php:2644
 msgid "Reset at each week (\"0 0 * * 0\")"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2644
+#: src/usr/local/www/interfaces.php:2652
 msgid "Reset at each day (\"0 0 * * *\")"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2652
+#: src/usr/local/www/interfaces.php:2660
 msgid "Reset at each hour (\"0 * * * *\")"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2739
+#: src/usr/local/www/interfaces.php:2749
 msgid ""
 "Preserve common wireless configuration through interface deletions and "
 "reassignments."
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2939
+#: src/usr/local/www/interfaces.php:2949
 msgid ""
 "Allow packets to pass between wireless clients directly when operating as an "
 "access point"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2947
+#: src/usr/local/www/interfaces.php:2957
 msgid "Force the card to use WME (wireless QoS)"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2955
+#: src/usr/local/www/interfaces.php:2965
 msgid ""
 "Disable broadcasting of the SSID for this network (This may cause problems "
 "for some clients, and the SSID may still be discovered by other means.)"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2968
+#: src/usr/local/www/interfaces.php:2978
 msgid "Enable WPA"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:3020
+#: src/usr/local/www/interfaces.php:3030
 msgid "Force the AP to rekey whenever a client disassociates"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:3032
+#: src/usr/local/www/interfaces.php:3042
 msgid "Enable 802.1X authentication"
 msgstr ""
 
@@ -31393,7 +31658,7 @@ msgid ""
 "traffic."
 msgstr ""
 
-#: src/usr/local/www/interfaces_gre_edit.php:202
+#: src/usr/local/www/interfaces_gre_edit.php:206
 msgid ""
 "Add an explicit static route for the remote inner tunnel address/subnet via "
 "the local tunnel address"
@@ -31472,111 +31737,115 @@ msgstr ""
 msgid "Please add a pool on the \"Pools\" tab to use this feature. "
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:546
+#: src/usr/local/www/services_captiveportal.php:536
 msgid "Enable Captive Portal"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:602
+#: src/usr/local/www/services_captiveportal.php:592
 msgid "Enable waiting period reset on attempted access"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:609
+#: src/usr/local/www/services_captiveportal.php:599
 msgid "Enable logout popup window"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:638
+#: src/usr/local/www/services_captiveportal.php:628
 msgid "Disable Concurrent user logins"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:646
+#: src/usr/local/www/services_captiveportal.php:636
 msgid "Disable MAC filtering"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:655
+#: src/usr/local/www/services_captiveportal.php:645
 msgid "Enable Pass-through MAC automatic additions"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:665
+#: src/usr/local/www/services_captiveportal.php:655
 msgid "Enable Pass-through MAC automatic addition with username"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:674
+#: src/usr/local/www/services_captiveportal.php:664
 msgid "Enable per-user bandwidth restriction"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:703
+#: src/usr/local/www/services_captiveportal.php:693
 msgid "No Authentication"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:711
+#: src/usr/local/www/services_captiveportal.php:701
 msgid "Local User Manager / Vouchers"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:719
+#: src/usr/local/www/services_captiveportal.php:709
 msgid "RADIUS Authentication"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:729
+#: src/usr/local/www/services_captiveportal.php:719
 msgid "Allow only users/groups with \"Captive portal login\" privilege set"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:739
+#: src/usr/local/www/services_captiveportal.php:729
 msgid "PAP"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:747
+#: src/usr/local/www/services_captiveportal.php:737
 msgid "CHAP-MD5"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:755
+#: src/usr/local/www/services_captiveportal.php:745
 msgid "MSCHAPv1"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:763
+#: src/usr/local/www/services_captiveportal.php:753
 msgid "MSCHAPv2"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:883
+#: src/usr/local/www/services_captiveportal.php:873
 msgid "Send RADIUS accounting packets to the primary RADIUS server."
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:899
+#: src/usr/local/www/services_captiveportal.php:889
 msgid "No updates"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:907
+#: src/usr/local/www/services_captiveportal.php:897
 msgid "Stop/Start"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:915
+#: src/usr/local/www/services_captiveportal.php:905
 msgid "Stop/Start (FreeRADIUS)"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:923
+#: src/usr/local/www/services_captiveportal.php:913
 msgid "Interim"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:938
+#: src/usr/local/www/services_captiveportal.php:928
 msgid "Reauthenticate connected users every minute"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:946
+#: src/usr/local/www/services_captiveportal.php:936
 msgid "Enable RADIUS MAC authentication"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:968
+#: src/usr/local/www/services_captiveportal.php:958
 msgid "Use RADIUS Session-Timeout attributes"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:984
+#: src/usr/local/www/services_captiveportal.php:974
 msgid "Invert Acct-Input-Octets and Acct-Output-Octets"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:1017
+#: src/usr/local/www/services_captiveportal.php:982
+msgid "Include idle time in session time"
+msgstr ""
+
+#: src/usr/local/www/services_captiveportal.php:1016
 msgid "Enable HTTPS login"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:1041
+#: src/usr/local/www/services_captiveportal.php:1040
 msgid "Disable HTTPS Forwards"
 msgstr ""
 
@@ -31584,158 +31853,169 @@ msgstr ""
 msgid "Enable the creation, generation and activation of rolls with vouchers"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:774
+#: src/usr/local/www/services_dhcp.php:785
 msgid "Ignore BOOTP queries"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:781
+#: src/usr/local/www/services_dhcp.php:792
 msgid "Only the clients defined below will get DHCP leases from this server."
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:788
+#: src/usr/local/www/services_dhcp.php:799
 msgid "Denied clients will be ignored rather than rejected."
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:960
+#: src/usr/local/www/services_dhcp.php:978
 msgid "Enable Static ARP entries"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:967
+#: src/usr/local/www/services_dhcp.php:985
 msgid "Change DHCP display lease time from UTC to local time"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:974
+#: src/usr/local/www/services_dhcp.php:992
 msgid "Enable RRD statistics graphs"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:997
+#: src/usr/local/www/services_dhcp.php:1015
 msgid "Enable registration of DHCP client names in DNS"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:1146
+#: src/usr/local/www/services_dhcp.php:1030
+#: src/usr/local/www/services_dhcpv6.php:765
+msgid ""
+"Force dynamic DNS hostname to be the same as configured hostname for Static "
+"Mappings"
+msgstr ""
+
+#: src/usr/local/www/services_dhcp.php:1174
 msgid "Enables network booting"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:1207
+#: src/usr/local/www/services_dhcp.php:1236
 msgid "<div class=\"alert alert-info\"> "
 msgstr ""
 
-#: src/usr/local/www/services_dhcp_edit.php:471
+#: src/usr/local/www/services_dhcp_edit.php:481
 msgid "Create an ARP Table Static Entry for this MAC & IP Address pair."
 msgstr ""
 
-#: src/usr/local/www/services_dhcp_edit.php:584
-#: src/usr/local/www/services_dhcpv6.php:737
+#: src/usr/local/www/services_dhcp_edit.php:594
+#: src/usr/local/www/services_dhcpv6.php:751
 msgid "Enable registration of DHCP client names in DNS."
 msgstr ""
 
-#: src/usr/local/www/services_dhcp_relay.php:145
+#: src/usr/local/www/services_dhcp_edit.php:601
+msgid "Make dynamic DNS registered hostname the same as Hostname above."
+msgstr ""
+
+#: src/usr/local/www/services_dhcp_relay.php:149
 msgid "Enable DHCP relay on interface"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp_relay.php:160
-#: src/usr/local/www/services_dhcpv6_relay.php:159
+#: src/usr/local/www/services_dhcp_relay.php:164
+#: src/usr/local/www/services_dhcpv6_relay.php:165
 msgid "Append circuit ID and agent ID to requests"
 msgstr ""
 
-#: src/usr/local/www/services_dhcpv6.php:565
+#: src/usr/local/www/services_dhcpv6.php:578
 msgid "Enable DHCPv6 server on interface "
 msgstr ""
 
-#: src/usr/local/www/services_dhcpv6.php:583
+#: src/usr/local/www/services_dhcpv6.php:597
 msgid " bits"
 msgstr ""
 
-#: src/usr/local/www/services_dhcpv6.php:588
+#: src/usr/local/www/services_dhcpv6.php:602
 msgid " to "
 msgstr ""
 
-#: src/usr/local/www/services_dhcpv6.php:714
+#: src/usr/local/www/services_dhcpv6.php:728
 msgid "Change DHCPv6 display lease time from UTC to local time"
 msgstr ""
 
-#: src/usr/local/www/services_dhcpv6.php:784
+#: src/usr/local/www/services_dhcpv6.php:806
 msgid "Add reverse dynamic DNS entries."
 msgstr ""
 
-#: src/usr/local/www/services_dhcpv6.php:862
+#: src/usr/local/www/services_dhcpv6.php:884
 msgid "Enable Network Booting"
 msgstr ""
 
-#: src/usr/local/www/services_dhcpv6_relay.php:143
+#: src/usr/local/www/services_dhcpv6_relay.php:149
 msgid "Enable DHCPv6 relay on interface"
 msgstr ""
 
-#: src/usr/local/www/services_dnsmasq.php:205
+#: src/usr/local/www/services_dnsmasq.php:250
 msgid "Enable DNS forwarder"
 msgstr ""
 
-#: src/usr/local/www/services_dnsmasq.php:212
+#: src/usr/local/www/services_dnsmasq.php:257
 msgid "Register DHCP leases in DNS forwarder"
 msgstr ""
 
-#: src/usr/local/www/services_dnsmasq.php:224
+#: src/usr/local/www/services_dnsmasq.php:269
 msgid "Register DHCP static mappings in DNS forwarder"
 msgstr ""
 
-#: src/usr/local/www/services_dnsmasq.php:235
+#: src/usr/local/www/services_dnsmasq.php:280
 msgid "Resolve DHCP mappings first"
 msgstr ""
 
-#: src/usr/local/www/services_dnsmasq.php:247
+#: src/usr/local/www/services_dnsmasq.php:292
 msgid "Query DNS servers sequentially"
 msgstr ""
 
-#: src/usr/local/www/services_dnsmasq.php:256
+#: src/usr/local/www/services_dnsmasq.php:301
 msgid "Require domain"
 msgstr ""
 
-#: src/usr/local/www/services_dnsmasq.php:265
+#: src/usr/local/www/services_dnsmasq.php:310
 msgid "Do not forward private reverse lookups"
 msgstr ""
 
-#: src/usr/local/www/services_dyndns_edit.php:259
+#: src/usr/local/www/services_dyndns_edit.php:260
 #: src/usr/local/www/vpn_openvpn_client.php:429
 msgid "Disable this client"
 msgstr ""
 
-#: src/usr/local/www/services_dyndns_edit.php:320
+#: src/usr/local/www/services_dyndns_edit.php:321
 msgid "Enable Wildcard"
 msgstr ""
 
-#: src/usr/local/www/services_dyndns_edit.php:327
+#: src/usr/local/www/services_dyndns_edit.php:328
 msgid "Enable verbose logging"
 msgstr ""
 
-#: src/usr/local/www/services_dyndns_edit.php:334
+#: src/usr/local/www/services_dyndns_edit.php:335
 msgid "Force IPv4 resolving"
 msgstr ""
 
-#: src/usr/local/www/services_dyndns_edit.php:341
+#: src/usr/local/www/services_dyndns_edit.php:342
 msgid "Verify SSL peer"
 msgstr ""
 
-#: src/usr/local/www/services_ntpd.php:283
+#: src/usr/local/www/services_ntpd.php:297
 msgid "Enable RRD graphs of NTP statistics (default: disabled)."
 msgstr ""
 
-#: src/usr/local/www/services_ntpd.php:290
+#: src/usr/local/www/services_ntpd.php:304
 msgid "Log peer messages (default: disabled)."
 msgstr ""
 
-#: src/usr/local/www/services_ntpd.php:297
+#: src/usr/local/www/services_ntpd.php:311
 msgid "Log system messages (default: disabled)."
 msgstr ""
 
-#: src/usr/local/www/services_ntpd.php:320
+#: src/usr/local/www/services_ntpd.php:334
 msgid "Log reference clock statistics (default: disabled)."
 msgstr ""
 
-#: src/usr/local/www/services_ntpd.php:327
+#: src/usr/local/www/services_ntpd.php:341
 msgid "Log clock discipline statistics (default: disabled)."
 msgstr ""
 
-#: src/usr/local/www/services_ntpd.php:334
+#: src/usr/local/www/services_ntpd.php:348
 msgid "Log NTP peer statistics (default: disabled)."
 msgstr ""
 
@@ -31876,35 +32156,35 @@ msgstr ""
 msgid "Use same settings as DHCPv6 server"
 msgstr ""
 
-#: src/usr/local/www/services_snmp.php:197
+#: src/usr/local/www/services_snmp.php:214
 msgid "Enable the SNMP Daemon and its controls"
 msgstr ""
 
-#: src/usr/local/www/services_snmp.php:240
+#: src/usr/local/www/services_snmp.php:257
 msgid "Enable the SNMP Trap and its controls"
 msgstr ""
 
-#: src/usr/local/www/services_snmp.php:284
+#: src/usr/local/www/services_snmp.php:301
 msgid "MibII"
 msgstr ""
 
-#: src/usr/local/www/services_snmp.php:291
+#: src/usr/local/www/services_snmp.php:308
 msgid "Netgraph"
 msgstr ""
 
-#: src/usr/local/www/services_snmp.php:298
+#: src/usr/local/www/services_snmp.php:315
 msgid "PF"
 msgstr ""
 
-#: src/usr/local/www/services_snmp.php:305
+#: src/usr/local/www/services_snmp.php:322
 msgid "Host Resources"
 msgstr ""
 
-#: src/usr/local/www/services_snmp.php:312
+#: src/usr/local/www/services_snmp.php:329
 msgid "UCD"
 msgstr ""
 
-#: src/usr/local/www/services_snmp.php:319
+#: src/usr/local/www/services_snmp.php:336
 msgid "Regex"
 msgstr ""
 
@@ -32079,14 +32359,18 @@ msgstr ""
 msgid "Wireless Events (hostapd)"
 msgstr ""
 
-#: src/usr/local/www/system.php:431
+#: src/usr/local/www/system.php:434
 msgid "Allow DNS server list to be overridden by DHCP/PPP on WAN"
 msgstr ""
 
-#: src/usr/local/www/system.php:441
+#: src/usr/local/www/system.php:444
 msgid "Do not use the DNS Forwarder as a DNS server for the firewall"
 msgstr ""
 
+#: src/usr/local/www/system.php:496
+msgid "Show hostname on login banner"
+msgstr ""
+
 #: src/usr/local/www/system_advanced_admin.php:364
 msgid "Disable webConfigurator redirect rule"
 msgstr ""
@@ -32148,33 +32432,33 @@ msgid ""
 "traffic."
 msgstr ""
 
-#: src/usr/local/www/system_advanced_firewall.php:503
+#: src/usr/local/www/system_advanced_firewall.php:506
 msgid "Bypass firewall rules for traffic on the same interface"
 msgstr ""
 
-#: src/usr/local/www/system_advanced_firewall.php:513
+#: src/usr/local/www/system_advanced_firewall.php:516
 msgid "Disable all auto-added VPN rules."
 msgstr ""
 
-#: src/usr/local/www/system_advanced_firewall.php:520
+#: src/usr/local/www/system_advanced_firewall.php:523
 msgid "Disable reply-to on WAN rules"
 msgstr ""
 
-#: src/usr/local/www/system_advanced_firewall.php:530
+#: src/usr/local/www/system_advanced_firewall.php:533
 msgid "Disable Negate rule on policy routing rules"
 msgstr ""
 
-#: src/usr/local/www/system_advanced_firewall.php:549
+#: src/usr/local/www/system_advanced_firewall.php:552
 msgid "Verify HTTPS certificates when downloading alias URLs"
 msgstr ""
 
-#: src/usr/local/www/system_advanced_firewall.php:619
+#: src/usr/local/www/system_advanced_firewall.php:622
 msgid ""
 "Automatic creation of additional NAT redirect rules from within the internal "
 "networks."
 msgstr ""
 
-#: src/usr/local/www/system_advanced_firewall.php:630
+#: src/usr/local/www/system_advanced_firewall.php:633
 msgid ""
 "Automatic create outbound NAT rules that direct traffic back out to the same "
 "subnet it originated from."
@@ -32263,31 +32547,31 @@ msgid ""
 "\"system_camanager.php\">System &gt; Cert. Manager</a>."
 msgstr ""
 
-#: src/usr/local/www/system_authservers.php:585
+#: src/usr/local/www/system_authservers.php:586
 msgid "Level "
 msgstr ""
 
-#: src/usr/local/www/system_authservers.php:610
+#: src/usr/local/www/system_authservers.php:611
 msgid "Enable extended query"
 msgstr ""
 
-#: src/usr/local/www/system_authservers.php:629
+#: src/usr/local/www/system_authservers.php:630
 msgid "Use anonymous binds to resolve distinguished names"
 msgstr ""
 
-#: src/usr/local/www/system_authservers.php:690
+#: src/usr/local/www/system_authservers.php:691
 msgid "LDAP Server uses RFC 2307 style group membership"
 msgstr ""
 
-#: src/usr/local/www/system_authservers.php:708
+#: src/usr/local/www/system_authservers.php:709
 msgid "UTF8 encode LDAP parameters before sending them to the server."
 msgstr ""
 
-#: src/usr/local/www/system_authservers.php:716
+#: src/usr/local/www/system_authservers.php:717
 msgid "Do not strip away parts of the username after the @ symbol"
 msgstr ""
 
-#: src/usr/local/www/system_certmanager.php:615
+#: src/usr/local/www/system_certmanager.php:618
 msgid "<a href=\"system_camanager.php?act=new&amp;method=internal\"> "
 msgstr ""
 
@@ -32306,27 +32590,31 @@ msgid ""
 "group applies to a local Dynamic DNS, IPsec or OpenVPN endpoint."
 msgstr ""
 
-#: src/usr/local/www/system_gateways_edit.php:580
+#: src/usr/local/www/system_gateways_edit.php:593
 msgid "Disable this gateway"
 msgstr ""
 
-#: src/usr/local/www/system_gateways_edit.php:627
+#: src/usr/local/www/system_gateways_edit.php:640
 msgid "This will select the above gateway as the default gateway."
 msgstr ""
 
-#: src/usr/local/www/system_gateways_edit.php:634
+#: src/usr/local/www/system_gateways_edit.php:647
 msgid "Disable Gateway Monitoring"
 msgstr ""
 
-#: src/usr/local/www/system_gateways_edit.php:658
+#: src/usr/local/www/system_gateways_edit.php:654
+msgid "Disable Gateway Monitoring Action"
+msgstr ""
+
+#: src/usr/local/www/system_gateways_edit.php:678
 msgid "Mark Gateway as Down"
 msgstr ""
 
-#: src/usr/local/www/system_gateways_edit.php:793
+#: src/usr/local/www/system_gateways_edit.php:813
 msgid "<span class=\"help-block\">"
 msgstr ""
 
-#: src/usr/local/www/system_gateways_edit.php:830
+#: src/usr/local/www/system_gateways_edit.php:850
 msgid "Use non-local gateway through interface specific route."
 msgstr ""