From 2e8cb9a00fa0570be4fb8a96d098122aca36d731 Mon Sep 17 00:00:00 2001
From: Renato Botelho <renato@netgate.com>
Date: Fri, 4 Mar 2016 08:22:46 -0300
Subject: Re-generate pfSense.pot

---
 .../local/share/locale/en/LC_MESSAGES/pfSense.pot  | 14412 ++++++++++---------
 1 file changed, 7900 insertions(+), 6512 deletions(-)

(limited to 'src/usr/local/share/locale/en')

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 573e449..c2226d0 100644
--- a/src/usr/local/share/locale/en/LC_MESSAGES/pfSense.pot
+++ b/src/usr/local/share/locale/en/LC_MESSAGES/pfSense.pot
@@ -5,14 +5,22 @@
 #
 #: src/usr/local/www/diag_traceroute.php:194
 #: src/usr/local/www/diag_traceroute.php:201
-#: src/usr/local/www/interfaces.php:3118 src/usr/local/www/interfaces.php:3128
+#: src/usr/local/www/interfaces.php:3120 src/usr/local/www/interfaces.php:3130
+#: src/usr/local/www/system_gateway_groups_edit.php:236
+#: src/usr/local/www/system_gateway_groups_edit.php:237
+#: src/usr/local/www/system_gateway_groups_edit.php:238
+#: src/usr/local/www/system_gateway_groups_edit.php:239
+#: src/usr/local/www/system_gateway_groups_edit.php:310
+#: src/usr/local/www/system_gateway_groups_edit.php:311
+#: src/usr/local/www/system_gateway_groups_edit.php:312
+#: src/usr/local/www/system_gateway_groups_edit.php:313
 #: src/usr/local/www/vpn_ipsec_settings.php:285
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-02 17:55-0200\n"
+"POT-Creation-Date: 2016-03-04 08:22-0300\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"
@@ -28,7 +36,7 @@ msgid ""
 "hostname."
 msgstr ""
 
-#: src/etc/inc/auth.inc:147
+#: src/etc/inc/auth.inc:147 src/etc/inc/captiveportal.inc:289
 msgid "Redirecting..."
 msgstr ""
 
@@ -131,87 +139,193 @@ msgstr ""
 
 #: src/etc/inc/auth.inc:1389
 #, php-format
-msgid "Radius start: %s<br />\n"
+msgid "RADIUS start: %s<br />\n"
 msgstr ""
 
 #: src/etc/inc/auth.inc:1401
 #, php-format
-msgid "Radius send failed: %s<br />\n"
+msgid "RADIUS send failed: %s<br />\n"
 msgstr ""
 
 #: src/etc/inc/auth.inc:1409
 #, php-format
-msgid "Radius Auth succeeded"
+msgid "RADIUS Auth succeeded"
 msgstr ""
 
 #: src/etc/inc/auth.inc:1415
 #, php-format
-msgid "Radius Auth rejected"
+msgid "RADIUS Auth rejected"
 msgstr ""
 
 #: src/etc/inc/auth.inc:1481 src/etc/inc/auth.inc:1497
 msgid "Local Database"
 msgstr ""
 
-#: src/etc/inc/auth.inc:1596
+#: src/etc/inc/auth.inc:1600
 #, php-format
 msgid "Successful login for user '%1$s' from: %2$s"
 msgstr ""
 
-#: src/etc/inc/auth.inc:1654
+#: src/etc/inc/auth.inc:1658
 #, php-format
 msgid "Session timed out for user '%1$s' from: %2$s"
 msgstr ""
 
-#: src/etc/inc/auth.inc:1656
+#: src/etc/inc/auth.inc:1660
 #, php-format
 msgid "User logged out for user '%1$s' from: %2$s"
 msgstr ""
 
-#: src/etc/inc/authgui.inc:92
+#: src/etc/inc/authgui.inc:98
 msgid "No page assigned to this user! Click here to logout."
 msgstr ""
 
-#: src/etc/inc/authgui.inc:123
+#: src/etc/inc/authgui.inc:129
 #, php-format
 msgid "Error: %1$s Description: %2$s"
 msgstr ""
 
-#: src/etc/inc/authgui.inc:141
+#: src/etc/inc/authgui.inc:147
 msgid "Error: not allowed"
 msgstr ""
 
-#: src/etc/inc/authgui.inc:168
+#: src/etc/inc/authgui.inc:174
 msgid "unknown reason"
 msgstr ""
 
-#: src/etc/inc/authgui.inc:169
+#: src/etc/inc/authgui.inc:175
 #, php-format
 msgid "Invalid login (%s)."
 msgstr ""
 
-#: src/etc/inc/authgui.inc:174
+#: src/etc/inc/authgui.inc:180
 #, php-format
 msgid "This device is currently being maintained by: %s."
 msgstr ""
 
-#: src/etc/inc/authgui.inc:245
-#: src/usr/local/www/services_captiveportal.php:1039
+#: src/etc/inc/authgui.inc:251 src/etc/inc/authgui.inc:299
+#: src/usr/local/www/services_captiveportal.php:1040
 msgid "Login"
 msgstr ""
 
-#: src/etc/inc/authgui.inc:259
+#: src/etc/inc/authgui.inc:265
 msgid ""
 "You are accessing this router by an IP address not configured locally, which "
 "may be forwarded by NAT or other means. <br /><br />If you did not setup "
 "this forwarding, you may be the target of a man-in-the-middle attack."
 msgstr ""
 
-#: src/etc/inc/authgui.inc:274
+#: src/etc/inc/authgui.inc:273
+#, php-format
+msgid "Login to %s"
+msgstr ""
+
+#: src/etc/inc/authgui.inc:280
 msgid "Your browser must support cookies to login."
 msgstr ""
 
-#: src/etc/inc/captiveportal.inc:1571
+#: src/etc/inc/authgui.inc:284 src/usr/local/www/diag_authentication.php:132
+#: src/usr/local/www/interfaces.php:2491 src/usr/local/www/interfaces.php:2557
+#: src/usr/local/www/interfaces.php:2688
+#: src/usr/local/www/interfaces_ppps_edit.php:227
+#: src/usr/local/www/interfaces_ppps_edit.php:230
+#: src/usr/local/www/interfaces_ppps_edit.php:238
+#: src/usr/local/www/interfaces_ppps_edit.php:241
+#: src/usr/local/www/interfaces_ppps_edit.php:623
+#: src/usr/local/www/services_dyndns_edit.php:132
+#: src/usr/local/www/services_dyndns_edit.php:381
+#: src/usr/local/www/services_pppoe_edit.php:540
+#: src/usr/local/www/status_captiveportal.php:189
+#: src/usr/local/www/system_usermanager.php:179
+#: src/usr/local/www/system_usermanager.php:184
+#: src/usr/local/www/system_usermanager.php:189
+#: src/usr/local/www/system_usermanager.php:500
+#: src/usr/local/www/system_usermanager.php:627
+#: src/usr/local/www/vpn_l2tp_users.php:129
+#: src/usr/local/www/vpn_l2tp_users_edit.php:108
+#: src/usr/local/www/vpn_l2tp_users_edit.php:111
+#: src/usr/local/www/vpn_l2tp_users_edit.php:189
+#: src/usr/local/www/vpn_openvpn_client.php:533
+#: src/usr/local/www/vpn_openvpn_client.php:566
+#: src/usr/local/www/widgets/widgets/captive_portal_status.widget.php:131
+msgid "Username"
+msgstr ""
+
+#: src/etc/inc/authgui.inc:286
+msgid "Enter your username"
+msgstr ""
+
+#: src/etc/inc/authgui.inc:291 src/usr/local/www/diag_authentication.php:140
+#: src/usr/local/www/diag_backup.php:658 src/usr/local/www/diag_backup.php:703
+#: src/usr/local/www/interfaces.php:2498 src/usr/local/www/interfaces.php:2564
+#: src/usr/local/www/interfaces.php:2695
+#: src/usr/local/www/interfaces_ppps_edit.php:227
+#: src/usr/local/www/interfaces_ppps_edit.php:230
+#: src/usr/local/www/interfaces_ppps_edit.php:238
+#: src/usr/local/www/interfaces_ppps_edit.php:241
+#: src/usr/local/www/interfaces_ppps_edit.php:630
+#: src/usr/local/www/services_dyndns_edit.php:130
+#: src/usr/local/www/services_dyndns_edit.php:391
+#: src/usr/local/www/services_pppoe_edit.php:547
+#: src/usr/local/www/system_advanced_notifications.php:275
+#: src/usr/local/www/system_authservers.php:617
+#: src/usr/local/www/system_usermanager.php:185
+#: src/usr/local/www/system_usermanager.php:190
+#: src/usr/local/www/system_usermanager.php:643
+#: src/usr/local/www/system_usermanager.php:646
+#: src/usr/local/www/system_usermanager_passwordmg.php:74
+#: src/usr/local/www/system_usermanager_passwordmg.php:135
+#: src/usr/local/www/vpn_l2tp_users_edit.php:111
+#: src/usr/local/www/vpn_l2tp_users_edit.php:196
+#: src/usr/local/www/vpn_openvpn_client.php:540
+#: src/usr/local/www/vpn_openvpn_client.php:573
+msgid "Password"
+msgstr ""
+
+#: src/etc/inc/authgui.inc:293
+msgid "Enter your password"
+msgstr ""
+
+#: src/etc/inc/captiveportal.inc:67
+#, php-format
+msgid "%s captive portal"
+msgstr ""
+
+#: src/etc/inc/captiveportal.inc:68
+#, php-format
+msgid "Welcome to the %s Captive Portal!"
+msgstr ""
+
+#: src/etc/inc/captiveportal.inc:69
+msgid "Username:"
+msgstr ""
+
+#: src/etc/inc/captiveportal.inc:70
+msgid "Password:"
+msgstr ""
+
+#: src/etc/inc/captiveportal.inc:122
+msgid "Enter Voucher Code:"
+msgstr ""
+
+#: src/etc/inc/captiveportal.inc:132 src/usr/local/www/crash_reporter.php:124
+#: src/usr/local/www/services_captiveportal_zones_edit.php:119
+msgid "Continue"
+msgstr ""
+
+#: src/etc/inc/captiveportal.inc:290
+msgid "Redirecting to"
+msgstr ""
+
+#: src/etc/inc/captiveportal.inc:291 src/usr/local/www/head.inc:241
+msgid "Logout"
+msgstr ""
+
+#: src/etc/inc/captiveportal.inc:292
+msgid "Click the button below to disconnect"
+msgstr ""
+
+#: src/etc/inc/captiveportal.inc:1588
 #, php-format
 msgid "Error: cannot open '%s' in captiveportal_write_elements()%s"
 msgstr ""
@@ -319,6 +433,10 @@ msgstr ""
 msgid "%sWriting configuration..."
 msgstr ""
 
+#: src/etc/inc/config.console.inc:450
+msgid "Console assignment of interfaces"
+msgstr ""
+
 #: src/etc/inc/config.console.inc:451
 #, php-format
 msgid "done.%s"
@@ -380,27 +498,27 @@ msgstr ""
 msgid "CDROM build"
 msgstr ""
 
-#: src/etc/inc/config.inc:146 src/etc/inc/config.inc:147
+#: src/etc/inc/config.inc:146
 msgid "CFG:"
 msgstr ""
 
-#: src/etc/inc/config.inc:148
+#: src/etc/inc/config.inc:147
 msgid "TYPE:"
 msgstr ""
 
-#: src/etc/inc/config.inc:164 src/etc/inc/config.inc:182
+#: src/etc/inc/config.inc:163 src/etc/inc/config.inc:181
 #, php-format
 msgid "Found configuration on %s.%s"
 msgstr ""
 
-#: src/etc/inc/config.inc:197 src/etc/inc/config.inc:198
+#: src/etc/inc/config.inc:196 src/etc/inc/config.inc:197
 #: src/etc/inc/config.lib.inc:122 src/etc/inc/config.lib.inc:123
 #: src/etc/inc/config.lib.inc:277 src/etc/inc/config.lib.inc:299
 #: src/etc/inc/config.lib.inc:300
 msgid "No config.xml found, attempting last known config restore."
 msgstr ""
 
-#: src/etc/inc/config.inc:201
+#: src/etc/inc/config.inc:200
 msgid "No config.xml or config backups found, resetting to factory defaults."
 msgstr ""
 
@@ -419,7 +537,7 @@ msgid ""
 msgstr ""
 
 #: src/etc/inc/config.lib.inc:159 src/etc/inc/config.lib.inc:170
-#: src/etc/inc/config.lib.inc:588
+#: src/etc/inc/config.lib.inc:589
 msgid "Could not restore config.xml."
 msgstr ""
 
@@ -482,411 +600,992 @@ msgstr ""
 msgid "Upgraded config version level from %1$s to %2$s"
 msgstr ""
 
-#: src/etc/inc/config.lib.inc:565
+#: src/etc/inc/config.lib.inc:566
 msgid "WARNING: Config contents could not be saved. Could not open file!"
 msgstr ""
 
-#: src/etc/inc/config.lib.inc:567
+#: src/etc/inc/config.lib.inc:568
 #, php-format
 msgid "Unable to open %s/config.xml for writing in write_config()%s"
 msgstr ""
 
-#: src/etc/inc/config.lib.inc:693
-msgid "Reverted to"
+#: src/etc/inc/config.lib.inc:697
+#, php-format
+msgid "Reverted to %s."
 msgstr ""
 
-#: src/etc/inc/config.lib.inc:710
+#: src/etc/inc/config.lib.inc:714
 msgid "Installing configuration..."
 msgstr ""
 
-#: src/etc/inc/config.lib.inc:712
+#: src/etc/inc/config.lib.inc:716
 msgid "Installing configuration ...."
 msgstr ""
 
-#: src/etc/inc/config.lib.inc:765
+#: src/etc/inc/config.lib.inc:769
 msgid "XML error: unable to open file"
 msgstr ""
 
-#: src/etc/inc/config.lib.inc:771
+#: src/etc/inc/config.lib.inc:775
 #, php-format
 msgid "%1$s at line %2$d"
 msgstr ""
 
-#: src/etc/inc/config.lib.inc:825 src/etc/inc/config.lib.inc:827
+#: src/etc/inc/config.lib.inc:829 src/etc/inc/config.lib.inc:831
 #, php-format
 msgid "The backup cache file %s is corrupted.  Unlinking."
 msgstr ""
 
-#: src/etc/inc/config.lib.inc:984
+#: src/etc/inc/config.lib.inc:988
 #, php-format
 msgid "%s made unknown change"
 msgstr ""
 
-#: src/etc/inc/dyndns.class:1472
+#: src/etc/inc/crypt.inc:67
+msgid "Failed to encrypt/decrypt data!"
+msgstr ""
+
+#: src/etc/inc/dyndns.class:164
+msgid "Dynamic DNS: updatedns() starting"
+msgstr ""
+
+#: src/etc/inc/dyndns.class:218
 #, php-format
-msgid "DynDNS updated IP Address on %s (%s) to %s"
+msgid "Dynamic DNS (%1$s): running get_failover_interface for %2$s. found %3$s"
 msgstr ""
 
-#: src/etc/inc/dyndns.class:1480
+#: src/etc/inc/dyndns.class:227
 #, php-format
-msgid "DynDNS updated IPv6 Address on %s (%s) to %s"
+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/easyrule.inc:144
-msgid "Easy Rule: Blocked from Firewall Log View"
+#: src/etc/inc/dyndns.class:300
+#, php-format
+msgid "Dynamic DNS %1$s (%2$s): _update() starting."
 msgstr ""
 
-#: src/etc/inc/easyrule.inc:224 src/etc/inc/easyrule.inc:236
-msgid "Entry added"
+#: src/etc/inc/dyndns.class:398
+#, 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/easyrule.inc:233
-msgid "Hosts blocked from Firewall Log view"
+#: src/etc/inc/dyndns.class:665
+#, php-format
+msgid "Sending request to: %s"
 msgstr ""
 
-#: src/etc/inc/easyrule.inc:315
-msgid "Easy Rule: Passed from Firewall Log View"
+#: src/etc/inc/dyndns.class:819
+#, php-format
+msgid "Dynamic DNS %1$s (%2$s): _checkStatus() starting."
 msgstr ""
 
-#: src/etc/inc/easyrule.inc:374
-msgid "Tried to block invalid IP:"
+#: src/etc/inc/dyndns.class:822 src/usr/local/www/pkg_mgr_install.php:144
+msgid "Success"
 msgstr ""
 
-#: src/etc/inc/easyrule.inc:378 src/etc/inc/easyrule.inc:401
-#: src/etc/inc/easyrule.inc:458
-msgid "Invalid interface for block rule:"
+#: src/etc/inc/dyndns.class:823 src/etc/inc/dyndns.class:1455
+#: src/usr/local/www/diag_smart.php:471
+msgid "Error"
 msgstr ""
 
-#: src/etc/inc/easyrule.inc:381
-msgid "Host added successfully"
+#: src/etc/inc/dyndns.class:827
+msgid "Curl error occurred:"
 msgstr ""
 
-#: src/etc/inc/easyrule.inc:383
-msgid "Failed to create block rule, alias, or add host."
+#: src/etc/inc/dyndns.class:836 src/etc/inc/dyndns.class:857
+#: src/etc/inc/dyndns.class:876 src/etc/inc/dyndns.class:894
+#: src/etc/inc/dyndns.class:911 src/etc/inc/dyndns.class:928
+#: src/etc/inc/dyndns.class:1076 src/etc/inc/dyndns.class:1089
+#: src/etc/inc/dyndns.class:1102 src/etc/inc/dyndns.class:1119
+#: src/etc/inc/dyndns.class:1229 src/etc/inc/dyndns.class:1285
+#: src/etc/inc/dyndns.class:1345 src/etc/inc/dyndns.class:1366
+#: src/etc/inc/dyndns.class:1411
+msgid "IP Address Changed Successfully!"
 msgstr ""
 
-#: src/etc/inc/easyrule.inc:386
-msgid "Tried to block but had no host IP or interface"
+#: src/etc/inc/dyndns.class:839 src/etc/inc/dyndns.class:862
+#: src/etc/inc/dyndns.class:881 src/etc/inc/dyndns.class:899
+#: src/etc/inc/dyndns.class:916 src/etc/inc/dyndns.class:933
+#: src/etc/inc/dyndns.class:1000 src/etc/inc/dyndns.class:1018
+#: src/etc/inc/dyndns.class:1038 src/etc/inc/dyndns.class:1056
+#: src/etc/inc/dyndns.class:1066 src/etc/inc/dyndns.class:1079
+#: src/etc/inc/dyndns.class:1092 src/etc/inc/dyndns.class:1107
+#: src/etc/inc/dyndns.class:1126 src/etc/inc/dyndns.class:1150
+#: src/etc/inc/dyndns.class:1169 src/etc/inc/dyndns.class:1190
+#: src/etc/inc/dyndns.class:1217 src/etc/inc/dyndns.class:1234
+#: src/etc/inc/dyndns.class:1290 src/etc/inc/dyndns.class:1308
+#: src/etc/inc/dyndns.class:1333 src/etc/inc/dyndns.class:1358
+#: src/etc/inc/dyndns.class:1395 src/etc/inc/dyndns.class:1416
+msgid "Unknown Response"
 msgstr ""
 
-#: src/etc/inc/easyrule.inc:388
-msgid "Unknown block error."
+#: src/etc/inc/dyndns.class:840 src/etc/inc/dyndns.class:863
+#: src/etc/inc/dyndns.class:882 src/etc/inc/dyndns.class:900
+#: src/etc/inc/dyndns.class:917 src/etc/inc/dyndns.class:934
+#: src/etc/inc/dyndns.class:1019 src/etc/inc/dyndns.class:1039
+#: src/etc/inc/dyndns.class:1057 src/etc/inc/dyndns.class:1067
+#: src/etc/inc/dyndns.class:1080 src/etc/inc/dyndns.class:1093
+#: src/etc/inc/dyndns.class:1108 src/etc/inc/dyndns.class:1127
+#: src/etc/inc/dyndns.class:1151 src/etc/inc/dyndns.class:1170
+#: src/etc/inc/dyndns.class:1191 src/etc/inc/dyndns.class:1218
+#: src/etc/inc/dyndns.class:1235 src/etc/inc/dyndns.class:1275
+#: src/etc/inc/dyndns.class:1291 src/etc/inc/dyndns.class:1309
+#: src/etc/inc/dyndns.class:1334 src/etc/inc/dyndns.class:1359
+#: src/etc/inc/dyndns.class:1396 src/etc/inc/dyndns.class:1417
+msgid "PAYLOAD:"
 msgstr ""
 
-#: src/etc/inc/easyrule.inc:397
-msgid "Tried to unblock invalid IP:"
+#: src/etc/inc/dyndns.class:847
+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/easyrule.inc:407 src/etc/inc/easyrule.inc:465
-msgid "No block rules set on interface:"
+#: src/etc/inc/dyndns.class:849
+msgid ""
+"The hostname specified is not a fully-qualified domain name. If no hostnames "
+"included, notfqdn will be returned once."
 msgstr ""
 
-#: src/etc/inc/easyrule.inc:442
-msgid "Host unblocked successfully"
+#: src/etc/inc/dyndns.class:851
+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/easyrule.inc:445
-msgid "Host ist not on block list: "
+#: src/etc/inc/dyndns.class:853
+msgid ""
+"You may update up to 20 hosts. numhost is returned if you try to update more "
+"than 20 or update a round-robin."
 msgstr ""
 
-#: src/etc/inc/easyrule.inc:449
-msgid "Tried to unblock but had no host IP or interface"
+#: src/etc/inc/dyndns.class:855
+msgid "The hostname is blocked for update abuse."
 msgstr ""
 
-#: src/etc/inc/easyrule.inc:480
-msgid "Invalid interface for pass rule:"
+#: src/etc/inc/dyndns.class:860
+msgid "DNS error encountered. Stop updating for 30 minutes."
 msgstr ""
 
-#: src/etc/inc/easyrule.inc:483
-msgid "Invalid protocol for pass rule:"
+#: src/etc/inc/dyndns.class:869 src/etc/inc/dyndns.class:889
+#: src/etc/inc/dyndns.class:906 src/etc/inc/dyndns.class:923
+#: src/etc/inc/dyndns.class:1224 src/etc/inc/dyndns.class:1280
+#: src/etc/inc/dyndns.class:1404
+msgid "Not A FQDN!"
 msgstr ""
 
-#: src/etc/inc/easyrule.inc:486
-msgid "Tried to pass invalid source IP:"
+#: src/etc/inc/dyndns.class:871 src/etc/inc/dyndns.class:1406
+msgid "No such host"
 msgstr ""
 
-#: src/etc/inc/easyrule.inc:489
-msgid "Tried to pass invalid destination IP:"
+#: src/etc/inc/dyndns.class:873 src/etc/inc/dyndns.class:891
+#: src/etc/inc/dyndns.class:908 src/etc/inc/dyndns.class:925
+#: src/etc/inc/dyndns.class:1073 src/etc/inc/dyndns.class:1086
+#: src/etc/inc/dyndns.class:1099 src/etc/inc/dyndns.class:1282
+#: src/etc/inc/dyndns.class:1342 src/etc/inc/dyndns.class:1385
+#: src/etc/inc/dyndns.class:1408
+msgid "No Change In IP Address"
 msgstr ""
 
-#: src/etc/inc/easyrule.inc:493
-msgid "Missing destination port:"
+#: src/etc/inc/dyndns.class:879 src/etc/inc/dyndns.class:897
+#: src/etc/inc/dyndns.class:914 src/etc/inc/dyndns.class:931
+#: src/etc/inc/dyndns.class:1105 src/etc/inc/dyndns.class:1232
+#: src/etc/inc/dyndns.class:1288 src/etc/inc/dyndns.class:1348
+#: src/etc/inc/dyndns.class:1414
+msgid "User Authorization Failed"
 msgstr ""
 
-#: src/etc/inc/easyrule.inc:496
-msgid "Tried to pass invalid destination port:"
+#: src/etc/inc/dyndns.class:945
+msgid "IP address is current, no update performed."
 msgstr ""
 
-#: src/etc/inc/easyrule.inc:503
-msgid "Successfully added pass rule!"
+#: src/etc/inc/dyndns.class:949
+msgid "DNS hostname update successful."
 msgstr ""
 
-#: src/etc/inc/easyrule.inc:505
-msgid "Failed to add pass rule."
+#: src/etc/inc/dyndns.class:953
+msgid "Hostname supplied does not exist."
 msgstr ""
 
-#: src/etc/inc/easyrule.inc:508
-msgid "Missing parameters for pass rule."
+#: src/etc/inc/dyndns.class:956
+msgid "Invalid Username."
 msgstr ""
 
-#: src/etc/inc/easyrule.inc:510
-msgid "Unknown pass error."
+#: src/etc/inc/dyndns.class:959
+msgid "Invalid Password."
 msgstr ""
 
-#: src/etc/inc/filter.inc:80 src/etc/inc/filter.inc:110
-#: src/usr/local/www/firewall_rules_edit.php:1174
-#: src/usr/local/www/firewall_rules_edit.php:1216
-#: src/usr/local/www/firewall_rules_edit.php:1267
-#: src/usr/local/www/firewall_rules_edit.php:1317
-msgid "any"
+#: src/etc/inc/dyndns.class:962
+msgid "Too many updates sent."
 msgstr ""
 
-#: src/etc/inc/filter.inc:81 src/etc/inc/filter.inc:115
-msgid "Echo request"
+#: src/etc/inc/dyndns.class:965
+msgid "Account disabled due to violation of No-IP terms of service."
 msgstr ""
 
-#: src/etc/inc/filter.inc:82 src/etc/inc/filter.inc:116
-msgid "Echo reply"
+#: src/etc/inc/dyndns.class:968
+msgid ""
+"Invalid IP. IP Address submitted is improperly formatted or is a private IP "
+"address or is on a blacklist."
 msgstr ""
 
-#: src/etc/inc/filter.inc:83 src/etc/inc/filter.inc:111
-msgid "Destination unreachable"
+#: src/etc/inc/dyndns.class:971
+msgid "Disabled / Locked Hostname."
 msgstr ""
 
-#: src/etc/inc/filter.inc:84
-msgid "Source quench"
+#: src/etc/inc/dyndns.class:974
+msgid ""
+"Host updated is configured as a web redirect and no update was performed."
 msgstr ""
 
-#: src/etc/inc/filter.inc:85 src/etc/inc/filter.inc:127
-#: src/etc/inc/unbound.inc:805
-msgid "Redirect"
+#: src/etc/inc/dyndns.class:977
+msgid "Group supplied does not exist."
 msgstr ""
 
-#: src/etc/inc/filter.inc:86
-msgid "Alternate Host"
+#: src/etc/inc/dyndns.class:980
+msgid "DNS group update is successful."
 msgstr ""
 
-#: src/etc/inc/filter.inc:87 src/etc/inc/filter.inc:124
-msgid "Router advertisement"
+#: src/etc/inc/dyndns.class:984
+msgid "DNS group is current, no update performed."
 msgstr ""
 
-#: src/etc/inc/filter.inc:88 src/etc/inc/filter.inc:123
-msgid "Router solicitation"
+#: src/etc/inc/dyndns.class:988
+msgid "Update client support not available for supplied hostname or group."
 msgstr ""
 
-#: src/etc/inc/filter.inc:89 src/etc/inc/filter.inc:113
-msgid "Time exceeded"
+#: src/etc/inc/dyndns.class:991
+msgid "Hostname supplied does not have offline settings configured."
 msgstr ""
 
-#: src/etc/inc/filter.inc:90
-msgid "Invalid IP header"
+#: src/etc/inc/dyndns.class:994 src/etc/inc/dyndns.class:997
+msgid ""
+"Client disabled. Client should exit and not perform any more updates without "
+"user intervention."
 msgstr ""
 
-#: src/etc/inc/filter.inc:91
-msgid "Timestamp"
+#: src/etc/inc/dyndns.class:1001
+msgid "Unknown Response:"
 msgstr ""
 
-#: src/etc/inc/filter.inc:92
-msgid "Timestamp reply"
+#: src/etc/inc/dyndns.class:1007
+msgid "Authentication Failed: Username and/or Password was Incorrect."
 msgstr ""
 
-#: src/etc/inc/filter.inc:93
-msgid "Information request"
+#: src/etc/inc/dyndns.class:1009
+msgid "No Service: Dynamic DNS Service has been disabled for this domain."
 msgstr ""
 
-#: src/etc/inc/filter.inc:94
-msgid "Information reply"
+#: src/etc/inc/dyndns.class:1011
+msgid "Illegal Input: Self-Explanatory"
 msgstr ""
 
-#: src/etc/inc/filter.inc:95
-msgid "Address mask request"
+#: src/etc/inc/dyndns.class:1013
+msgid "Too Soon: Not Enough Time Has Elapsed Since Last Update"
 msgstr ""
 
-#: src/etc/inc/filter.inc:96
-msgid "Address mask reply"
+#: src/etc/inc/dyndns.class:1015
+msgid "IP Updated Successfully!"
 msgstr ""
 
-#: src/etc/inc/filter.inc:97 src/usr/local/www/diag_dns.php:294
-#: src/usr/local/www/diag_traceroute.php:70
-#: src/usr/local/www/diag_traceroute.php:160 src/usr/local/www/head.inc:356
-msgid "Traceroute"
+#: src/etc/inc/dyndns.class:1028
+msgid "Error 799"
 msgstr ""
 
-#: src/etc/inc/filter.inc:98
-msgid "Datagram conversion error"
+#: src/etc/inc/dyndns.class:1028 src/etc/inc/dyndns.class:1030
+msgid "Update Failed!"
 msgstr ""
 
-#: src/etc/inc/filter.inc:99
-msgid "Mobile host redirect"
+#: src/etc/inc/dyndns.class:1030
+msgid "Error 700"
 msgstr ""
 
-#: src/etc/inc/filter.inc:100
-msgid "IPv6 where-are-you"
+#: src/etc/inc/dyndns.class:1032 src/etc/inc/dyndns.class:1035
+#: src/etc/inc/dyndns.class:1053 src/etc/inc/dyndns.class:1063
+#: src/etc/inc/dyndns.class:1147 src/etc/inc/dyndns.class:1163
+#: src/etc/inc/dyndns.class:1184 src/etc/inc/dyndns.class:1211
+#: src/etc/inc/dyndns.class:1259 src/etc/inc/dyndns.class:1305
+#: src/etc/inc/dyndns.class:1321
+msgid "IP Address Updated Successfully!"
 msgstr ""
 
-#: src/etc/inc/filter.inc:101
-msgid "IPv6 I-am-here"
+#: src/etc/inc/dyndns.class:1045
+msgid ""
+"Bad Request - The URL was malformed. Required parameters were not provided."
 msgstr ""
 
-#: src/etc/inc/filter.inc:102
-msgid "Mobile registration request"
+#: src/etc/inc/dyndns.class:1047
+msgid "Update Too Soon - You have tried updating to quickly since last change."
 msgstr ""
 
-#: src/etc/inc/filter.inc:103
-msgid "Mobile registration reply"
+#: src/etc/inc/dyndns.class:1049
+msgid "Database Error - There was a server-sided database error."
 msgstr ""
 
-#: src/etc/inc/filter.inc:104
-msgid "SKIP"
+#: src/etc/inc/dyndns.class:1051
+#, php-format
+msgid "Hostname Error - The hostname (%s) doesn't belong to you."
 msgstr ""
 
-#: src/etc/inc/filter.inc:105
-msgid "Photuris"
+#: src/etc/inc/dyndns.class:1114
+msgid "Not a valid username or password!"
 msgstr ""
 
-#: src/etc/inc/filter.inc:112
-msgid "Packet too big"
+#: src/etc/inc/dyndns.class:1116
+msgid "Hostname you are trying to update does not exist."
 msgstr ""
 
-#: src/etc/inc/filter.inc:114
-msgid "Parameter problem"
+#: src/etc/inc/dyndns.class:1122
+msgid "Hostname specified exists, but not under the username specified."
 msgstr ""
 
-#: src/etc/inc/filter.inc:117
-msgid "Group membership query"
+#: src/etc/inc/dyndns.class:1124
+msgid "Updating too frequently, considered abuse."
 msgstr ""
 
-#: src/etc/inc/filter.inc:118
-msgid "Multicast listener query"
+#: src/etc/inc/dyndns.class:1133 src/etc/inc/dyndns.class:1178
+msgid "Bad Request - The IP provided was invalid."
 msgstr ""
 
-#: src/etc/inc/filter.inc:119
-msgid "Group membership report"
+#: src/etc/inc/dyndns.class:1135
+msgid "Bad Request - Required parameters were not provided."
 msgstr ""
 
-#: src/etc/inc/filter.inc:120
-msgid "Multicast listener report"
+#: src/etc/inc/dyndns.class:1137
+msgid ""
+"Bad Request - Illegal characters in either the username or the password."
 msgstr ""
 
-#: src/etc/inc/filter.inc:121
-msgid "Group membership termination"
+#: src/etc/inc/dyndns.class:1139
+msgid "Invalid password."
 msgstr ""
 
-#: src/etc/inc/filter.inc:122
-msgid "Multicast listener done"
+#: src/etc/inc/dyndns.class:1141
+msgid "This account has been administratively locked."
 msgstr ""
 
-#: src/etc/inc/filter.inc:125
-msgid "Neighbor solicitation"
+#: src/etc/inc/dyndns.class:1143
+msgid "Updating too frequently."
 msgstr ""
 
-#: src/etc/inc/filter.inc:126
-msgid "Neighbor advertisement"
+#: src/etc/inc/dyndns.class:1145 src/etc/inc/dyndns.class:1159
+msgid "Server side error."
 msgstr ""
 
-#: src/etc/inc/filter.inc:128
-msgid "Router renumbering"
+#: src/etc/inc/dyndns.class:1161
+msgid "Badly Formed Request (check your settings)."
 msgstr ""
 
-#: src/etc/inc/filter.inc:129
-msgid "Who are you request"
+#: src/etc/inc/dyndns.class:1180
+msgid "Bad Request - A hostname was not provided."
 msgstr ""
 
-#: src/etc/inc/filter.inc:130
-msgid "Who are you reply"
+#: src/etc/inc/dyndns.class:1182 src/etc/inc/dyndns.class:1209
+msgid "Invalid username or password."
 msgstr ""
 
-#: src/etc/inc/filter.inc:131
-msgid "FQDN query"
+#: src/etc/inc/dyndns.class:1187 src/etc/inc/dyndns.class:1214
+#: src/etc/inc/dyndns.class:1226
+msgid "No Change In IP Address."
 msgstr ""
 
-#: src/etc/inc/filter.inc:132
-msgid "FQDN reply"
+#: src/etc/inc/dyndns.class:1205
+msgid "Bad Request - Missing/Invalid Parameters."
 msgstr ""
 
-#: src/etc/inc/filter.inc:133
-msgid "Node information request"
+#: src/etc/inc/dyndns.class:1207
+msgid "Bad Request - Invalid Tunnel ID."
 msgstr ""
 
-#: src/etc/inc/filter.inc:134
-msgid "Node information reply"
+#: src/etc/inc/dyndns.class:1261
+msgid "Result did not match."
 msgstr ""
 
-#: src/etc/inc/filter.inc:135
-msgid "mtrace resp"
+#: src/etc/inc/dyndns.class:1267
+#, php-format
+msgid "%1$s updated to %2$s"
 msgstr ""
 
-#: src/etc/inc/filter.inc:136
-msgid "mtrace messages"
+#: src/etc/inc/dyndns.class:1270
+msgid ""
+"Invalid Credentials! Don't forget to use API Key for password field with "
+"CloudFlare."
 msgstr ""
 
-#: src/etc/inc/filter.inc:267
-msgid "Initializing"
+#: src/etc/inc/dyndns.class:1272
+msgid "Zone or Host ID was not found, check your hostname."
 msgstr ""
 
-#: src/etc/inc/filter.inc:279
-msgid "Configuring firewall"
+#: src/etc/inc/dyndns.class:1274
+msgid "UNKNOWN ERROR"
 msgstr ""
 
-#: src/etc/inc/filter.inc:286
-msgid "Creating aliases"
+#: src/etc/inc/dyndns.class:1297
+msgid "Wrong values - Update could not be completed."
 msgstr ""
 
-#: src/etc/inc/filter.inc:292
-msgid "Generating Limiter rules"
+#: src/etc/inc/dyndns.class:1299
+msgid "Unknown username - User does not exist."
 msgstr ""
 
-#: src/etc/inc/filter.inc:295
-msgid "Generating NAT rules"
+#: src/etc/inc/dyndns.class:1301
+msgid "Wrong password - Remember password is case sensitive."
 msgstr ""
 
-#: src/etc/inc/filter.inc:301
-msgid "Generating filter rules"
+#: src/etc/inc/dyndns.class:1303
+msgid "User unable to administer the selected domain."
 msgstr ""
 
-#: src/etc/inc/filter.inc:308
-msgid "Generating ALTQ queues"
+#: src/etc/inc/dyndns.class:1340
+msgid "Not A FQDN"
 msgstr ""
 
-#: src/etc/inc/filter.inc:313
-msgid "Loading filter rules"
+#: src/etc/inc/dyndns.class:1350
+msgid "Hostname does not exist or DynDNS not enabled"
 msgstr ""
 
-#: src/etc/inc/filter.inc:320
-msgid "Filter is disabled.  Not loading rules."
+#: src/etc/inc/dyndns.class:1352
+msgid "Bad request"
 msgstr ""
 
-#: src/etc/inc/filter.inc:322 src/etc/inc/filter.inc:574
-#: src/etc/inc/interfaces.inc:207 src/etc/inc/interfaces.inc:231
-#: src/etc/inc/interfaces.inc:369 src/etc/inc/interfaces.inc:431
-#: src/etc/inc/interfaces.inc:714 src/etc/inc/interfaces.inc:1065
-#: src/etc/inc/interfaces.inc:1096 src/etc/inc/interfaces.inc:1120
-#: src/etc/inc/interfaces.inc:1141 src/etc/inc/interfaces.inc:2164
-#: src/etc/inc/pkg-utils.inc:514 src/etc/inc/pkg-utils.inc:663
-#: src/etc/inc/pkg-utils.inc:687 src/etc/inc/pkg-utils.inc:723
-#: src/etc/inc/pkg-utils.inc:728 src/etc/inc/pkg-utils.inc:733
-#: src/etc/inc/pkg-utils.inc:751 src/etc/inc/pkg-utils.inc:768
-#: src/etc/inc/pkg-utils.inc:790 src/etc/inc/pkg-utils.inc:833
-#: src/etc/inc/pkg-utils.inc:859 src/etc/inc/pkg-utils.inc:902
-#: src/etc/inc/pkg-utils.inc:921 src/etc/inc/rrd.inc:1052
-#: src/etc/inc/services.inc:1588 src/etc/inc/services.inc:1969
-#: src/etc/inc/services.inc:2185 src/etc/inc/services.inc:2227
-#: src/etc/inc/services.inc:2436 src/etc/inc/system.inc:1077
-#: src/etc/inc/system.inc:1175 src/etc/inc/system.inc:1464
-#: src/etc/inc/system.inc:1849 src/etc/inc/system.inc:2000
-msgid "done."
+#: src/etc/inc/dyndns.class:1354
+msgid "Dynamic DNS access has been blocked!"
 msgstr ""
 
-#: src/etc/inc/filter.inc:418
-msgid "Setting up logging information"
+#: src/etc/inc/dyndns.class:1356
+msgid "Error on Google's end, retry in 5 minutes"
 msgstr ""
 
-#: src/etc/inc/filter.inc:423
-msgid "Setting up SCRUB information"
+#: src/etc/inc/dyndns.class:1370
+msgid "Invalid username or password"
 msgstr ""
 
-#: src/etc/inc/filter.inc:469
-#, php-format
+#: src/etc/inc/dyndns.class:1373
+msgid "Account suspended"
+msgstr ""
+
+#: src/etc/inc/dyndns.class:1376
+msgid "Account revoked"
+msgstr ""
+
+#: src/etc/inc/dyndns.class:1379
+msgid "Record does not exist in the system. Unable to update record"
+msgstr ""
+
+#: src/etc/inc/dyndns.class:1382
+msgid "User does not have access to this record"
+msgstr ""
+
+#: src/etc/inc/dyndns.class:1389
+msgid "General system error recognized by the system"
+msgstr ""
+
+#: src/etc/inc/dyndns.class:1392
+msgid "General system error unrecognized by the system"
+msgstr ""
+
+#: src/etc/inc/dyndns.class:1429
+#, php-format
+msgid "DynDNS updated IP Address on %1$s (%2$s) to %3$s"
+msgstr ""
+
+#: src/etc/inc/dyndns.class:1430 src/etc/inc/dyndns.class:1438
+#: src/etc/inc/services.inc:2498
+#, php-format
+msgid "phpDynDNS: updating cache file %1$s: %2$s"
+msgstr ""
+
+#: src/etc/inc/dyndns.class:1437
+#, php-format
+msgid "DynDNS updated IPv6 Address on %s (%s) to %s"
+msgstr ""
+
+#: src/etc/inc/dyndns.class:1454
+msgid "ERROR!"
+msgstr ""
+
+#: src/etc/inc/dyndns.class:1460
+msgid "No Dynamic DNS Service provider was selected."
+msgstr ""
+
+#: src/etc/inc/dyndns.class:1463
+msgid "No Username Provided."
+msgstr ""
+
+#: src/etc/inc/dyndns.class:1466
+msgid "No Password Provided."
+msgstr ""
+
+#: src/etc/inc/dyndns.class:1469
+msgid "No Hostname Provided."
+msgstr ""
+
+#: src/etc/inc/dyndns.class:1472
+msgid "The Dynamic DNS Service provided is not yet supported."
+msgstr ""
+
+#: src/etc/inc/dyndns.class:1475
+msgid "No Update URL Provided."
+msgstr ""
+
+#: src/etc/inc/dyndns.class:1478
+msgid "Invalid ZoneID"
+msgstr ""
+
+#: src/etc/inc/dyndns.class:1481
+msgid "Invalid TTL"
+msgstr ""
+
+#: src/etc/inc/dyndns.class:1484
+#, 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:1487
+msgid "Unknown Response."
+msgstr ""
+
+#: src/etc/inc/dyndns.class:1506
+#, php-format
+msgid "Dynamic DNS %1$s (%2$s): _detectChange() starting."
+msgstr ""
+
+#: src/etc/inc/dyndns.class:1513
+#, php-format
+msgid ""
+"Dynamic Dns (%s): Current WAN IP could not be determined, skipping update "
+"process."
+msgstr ""
+
+#: src/etc/inc/dyndns.class:1516
+#, php-format
+msgid "Dynamic Dns (%1$s): Current WAN IP: %2$s"
+msgstr ""
+
+#: src/etc/inc/dyndns.class:1524
+#, php-format
+msgid "Cached IPv6: %s"
+msgstr ""
+
+#: src/etc/inc/dyndns.class:1532
+msgid "No Cached IPv6 found."
+msgstr ""
+
+#: src/etc/inc/dyndns.class:1540
+#, php-format
+msgid "Cached IP: %s"
+msgstr ""
+
+#: src/etc/inc/dyndns.class:1548
+msgid "No Cached IP found."
+msgstr ""
+
+#: src/etc/inc/dyndns.class:1562
+msgid "Dynamic Dns: cacheIP != wan_ip. Updating."
+msgstr ""
+
+#: src/etc/inc/dyndns.class:1563
+#, php-format
+msgid "Cached IP: %1$s WAN IP: %2$s"
+msgstr ""
+
+#: src/etc/inc/dyndns.class:1568
+#, php-format
+msgid "Dynamic Dns: More than %s days. Updating."
+msgstr ""
+
+#: src/etc/inc/dyndns.class:1573
+msgid "Initial update."
+msgstr ""
+
+#: src/etc/inc/dyndns.class:1612
+#, php-format
+msgid "Dynamic DNS %1$s (%2$s): _checkIP() starting."
+msgstr ""
+
+#: src/etc/inc/dyndns.class:1637
+#, 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:1656
+#, php-format
+msgid "Dynamic DNS %1$s (%2$s): %3$s extracted from %4$s"
+msgstr ""
+
+#: src/etc/inc/dyndns.class:1659
+#, php-format
+msgid "Dynamic DNS %1$s (%2$s): IP address could not be extracted from %3$s"
+msgstr ""
+
+#: src/etc/inc/dyndns.class:1664
+#, php-format
+msgid "Dynamic DNS %1$s (%2$s): %3$s extracted from local system."
+msgstr ""
+
+#: src/etc/inc/easyrule.inc:144
+msgid "Easy Rule: Blocked from Firewall Log View"
+msgstr ""
+
+#: src/etc/inc/easyrule.inc:224 src/etc/inc/easyrule.inc:236
+msgid "Entry added"
+msgstr ""
+
+#: src/etc/inc/easyrule.inc:233
+msgid "Hosts blocked from Firewall Log view"
+msgstr ""
+
+#: src/etc/inc/easyrule.inc:315
+msgid "Easy Rule: Passed from Firewall Log View"
+msgstr ""
+
+#: src/etc/inc/easyrule.inc:374
+msgid "Tried to block invalid IP:"
+msgstr ""
+
+#: src/etc/inc/easyrule.inc:378 src/etc/inc/easyrule.inc:401
+#: src/etc/inc/easyrule.inc:458
+msgid "Invalid interface for block rule:"
+msgstr ""
+
+#: src/etc/inc/easyrule.inc:381
+msgid "Host added successfully"
+msgstr ""
+
+#: src/etc/inc/easyrule.inc:383
+msgid "Failed to create block rule, alias, or add host."
+msgstr ""
+
+#: src/etc/inc/easyrule.inc:386
+msgid "Tried to block but had no host IP or interface"
+msgstr ""
+
+#: src/etc/inc/easyrule.inc:388
+msgid "Unknown block error."
+msgstr ""
+
+#: src/etc/inc/easyrule.inc:397
+msgid "Tried to unblock invalid IP:"
+msgstr ""
+
+#: src/etc/inc/easyrule.inc:407 src/etc/inc/easyrule.inc:465
+msgid "No block rules set on interface:"
+msgstr ""
+
+#: src/etc/inc/easyrule.inc:442
+msgid "Host unblocked successfully"
+msgstr ""
+
+#: src/etc/inc/easyrule.inc:445
+msgid "Host is not on block list: "
+msgstr ""
+
+#: src/etc/inc/easyrule.inc:449
+msgid "Tried to unblock but had no host IP or interface"
+msgstr ""
+
+#: src/etc/inc/easyrule.inc:480
+msgid "Invalid interface for pass rule:"
+msgstr ""
+
+#: src/etc/inc/easyrule.inc:483
+msgid "Invalid protocol for pass rule:"
+msgstr ""
+
+#: src/etc/inc/easyrule.inc:486
+msgid "Tried to pass invalid source IP:"
+msgstr ""
+
+#: src/etc/inc/easyrule.inc:489
+msgid "Tried to pass invalid destination IP:"
+msgstr ""
+
+#: src/etc/inc/easyrule.inc:493
+msgid "Missing destination port:"
+msgstr ""
+
+#: src/etc/inc/easyrule.inc:496
+msgid "Tried to pass invalid destination port:"
+msgstr ""
+
+#: src/etc/inc/easyrule.inc:503
+msgid "Successfully added pass rule!"
+msgstr ""
+
+#: src/etc/inc/easyrule.inc:505
+msgid "Failed to add pass rule."
+msgstr ""
+
+#: src/etc/inc/easyrule.inc:508
+msgid "Missing parameters for pass rule."
+msgstr ""
+
+#: src/etc/inc/easyrule.inc:510
+msgid "Unknown pass error."
+msgstr ""
+
+#: src/etc/inc/filter.inc:80 src/etc/inc/filter.inc:110
+#: src/usr/local/www/firewall_rules_edit.php:1211
+#: src/usr/local/www/firewall_rules_edit.php:1253
+#: src/usr/local/www/firewall_rules_edit.php:1304
+#: src/usr/local/www/firewall_rules_edit.php:1354
+msgid "any"
+msgstr ""
+
+#: src/etc/inc/filter.inc:81 src/etc/inc/filter.inc:115
+msgid "Echo request"
+msgstr ""
+
+#: src/etc/inc/filter.inc:82 src/etc/inc/filter.inc:116
+msgid "Echo reply"
+msgstr ""
+
+#: src/etc/inc/filter.inc:83 src/etc/inc/filter.inc:111
+msgid "Destination unreachable"
+msgstr ""
+
+#: src/etc/inc/filter.inc:84
+msgid "Source quench"
+msgstr ""
+
+#: src/etc/inc/filter.inc:85 src/etc/inc/filter.inc:127
+#: src/etc/inc/unbound.inc:807
+msgid "Redirect"
+msgstr ""
+
+#: src/etc/inc/filter.inc:86
+msgid "Alternate Host"
+msgstr ""
+
+#: src/etc/inc/filter.inc:87 src/etc/inc/filter.inc:124
+msgid "Router advertisement"
+msgstr ""
+
+#: src/etc/inc/filter.inc:88 src/etc/inc/filter.inc:123
+msgid "Router solicitation"
+msgstr ""
+
+#: src/etc/inc/filter.inc:89 src/etc/inc/filter.inc:113
+msgid "Time exceeded"
+msgstr ""
+
+#: src/etc/inc/filter.inc:90
+msgid "Invalid IP header"
+msgstr ""
+
+#: src/etc/inc/filter.inc:91
+msgid "Timestamp"
+msgstr ""
+
+#: src/etc/inc/filter.inc:92
+msgid "Timestamp reply"
+msgstr ""
+
+#: src/etc/inc/filter.inc:93
+msgid "Information request"
+msgstr ""
+
+#: src/etc/inc/filter.inc:94
+msgid "Information reply"
+msgstr ""
+
+#: src/etc/inc/filter.inc:95
+msgid "Address mask request"
+msgstr ""
+
+#: src/etc/inc/filter.inc:96
+msgid "Address mask reply"
+msgstr ""
+
+#: src/etc/inc/filter.inc:97 src/usr/local/www/diag_dns.php:294
+#: src/usr/local/www/diag_traceroute.php:70
+#: src/usr/local/www/diag_traceroute.php:160 src/usr/local/www/head.inc:392
+msgid "Traceroute"
+msgstr ""
+
+#: src/etc/inc/filter.inc:98
+msgid "Datagram conversion error"
+msgstr ""
+
+#: src/etc/inc/filter.inc:99
+msgid "Mobile host redirect"
+msgstr ""
+
+#: src/etc/inc/filter.inc:100
+msgid "IPv6 where-are-you"
+msgstr ""
+
+#: src/etc/inc/filter.inc:101
+msgid "IPv6 I-am-here"
+msgstr ""
+
+#: src/etc/inc/filter.inc:102
+msgid "Mobile registration request"
+msgstr ""
+
+#: src/etc/inc/filter.inc:103
+msgid "Mobile registration reply"
+msgstr ""
+
+#: src/etc/inc/filter.inc:104
+msgid "SKIP"
+msgstr ""
+
+#: src/etc/inc/filter.inc:105
+msgid "Photuris"
+msgstr ""
+
+#: src/etc/inc/filter.inc:112
+msgid "Packet too big"
+msgstr ""
+
+#: src/etc/inc/filter.inc:114
+msgid "Parameter problem"
+msgstr ""
+
+#: src/etc/inc/filter.inc:117
+msgid "Group membership query"
+msgstr ""
+
+#: src/etc/inc/filter.inc:118
+msgid "Multicast listener query"
+msgstr ""
+
+#: src/etc/inc/filter.inc:119
+msgid "Group membership report"
+msgstr ""
+
+#: src/etc/inc/filter.inc:120
+msgid "Multicast listener report"
+msgstr ""
+
+#: src/etc/inc/filter.inc:121
+msgid "Group membership termination"
+msgstr ""
+
+#: src/etc/inc/filter.inc:122
+msgid "Multicast listener done"
+msgstr ""
+
+#: src/etc/inc/filter.inc:125
+msgid "Neighbor solicitation"
+msgstr ""
+
+#: src/etc/inc/filter.inc:126
+msgid "Neighbor advertisement"
+msgstr ""
+
+#: src/etc/inc/filter.inc:128
+msgid "Router renumbering"
+msgstr ""
+
+#: src/etc/inc/filter.inc:129
+msgid "Who are you request"
+msgstr ""
+
+#: src/etc/inc/filter.inc:130
+msgid "Who are you reply"
+msgstr ""
+
+#: src/etc/inc/filter.inc:131
+msgid "FQDN query"
+msgstr ""
+
+#: src/etc/inc/filter.inc:132
+msgid "FQDN reply"
+msgstr ""
+
+#: src/etc/inc/filter.inc:133
+msgid "Node information request"
+msgstr ""
+
+#: src/etc/inc/filter.inc:134
+msgid "Node information reply"
+msgstr ""
+
+#: src/etc/inc/filter.inc:135
+msgid "mtrace resp"
+msgstr ""
+
+#: src/etc/inc/filter.inc:136
+msgid "mtrace messages"
+msgstr ""
+
+#: src/etc/inc/filter.inc:267
+msgid "Initializing"
+msgstr ""
+
+#: src/etc/inc/filter.inc:279
+msgid "Configuring firewall"
+msgstr ""
+
+#: src/etc/inc/filter.inc:286
+msgid "Creating aliases"
+msgstr ""
+
+#: src/etc/inc/filter.inc:292
+msgid "Generating Limiter rules"
+msgstr ""
+
+#: src/etc/inc/filter.inc:295
+msgid "Generating NAT rules"
+msgstr ""
+
+#: src/etc/inc/filter.inc:301
+msgid "Generating filter rules"
+msgstr ""
+
+#: src/etc/inc/filter.inc:308
+msgid "Generating ALTQ queues"
+msgstr ""
+
+#: src/etc/inc/filter.inc:313
+msgid "Loading filter rules"
+msgstr ""
+
+#: src/etc/inc/filter.inc:320
+msgid "Filter is disabled.  Not loading rules."
+msgstr ""
+
+#: src/etc/inc/filter.inc:322 src/etc/inc/filter.inc:574
+#: src/etc/inc/interfaces.inc:209 src/etc/inc/interfaces.inc:233
+#: src/etc/inc/interfaces.inc:371 src/etc/inc/interfaces.inc:433
+#: src/etc/inc/interfaces.inc:741 src/etc/inc/interfaces.inc:1106
+#: src/etc/inc/interfaces.inc:1137 src/etc/inc/interfaces.inc:1161
+#: src/etc/inc/interfaces.inc:1182 src/etc/inc/interfaces.inc:2199
+#: src/etc/inc/pkg-utils.inc:545 src/etc/inc/pkg-utils.inc:694
+#: src/etc/inc/pkg-utils.inc:718 src/etc/inc/pkg-utils.inc:754
+#: src/etc/inc/pkg-utils.inc:759 src/etc/inc/pkg-utils.inc:764
+#: src/etc/inc/pkg-utils.inc:782 src/etc/inc/pkg-utils.inc:799
+#: src/etc/inc/pkg-utils.inc:821 src/etc/inc/pkg-utils.inc:864
+#: src/etc/inc/pkg-utils.inc:890 src/etc/inc/pkg-utils.inc:933
+#: src/etc/inc/pkg-utils.inc:952 src/etc/inc/rrd.inc:1077
+#: src/etc/inc/services.inc:1561 src/etc/inc/services.inc:1942
+#: src/etc/inc/services.inc:2138 src/etc/inc/services.inc:2180
+#: src/etc/inc/services.inc:2389 src/etc/inc/system.inc:1089
+#: src/etc/inc/system.inc:1187 src/etc/inc/system.inc:1479
+#: src/etc/inc/system.inc:1896 src/etc/inc/system.inc:2047
+msgid "done."
+msgstr ""
+
+#: src/etc/inc/filter.inc:418
+msgid "Setting up logging information"
+msgstr ""
+
+#: src/etc/inc/filter.inc:423
+msgid "Setting up SCRUB information"
+msgstr ""
+
+#: src/etc/inc/filter.inc:469
+#, php-format
 msgid "The line in question reads [%1$d]: %2$s"
 msgstr ""
 
@@ -922,155 +1621,211 @@ msgstr ""
 msgid "Done"
 msgstr ""
 
+#: src/etc/inc/filter.inc:800
+#, php-format
+msgid "Aliases with numeric-only names are not valid. Skipping alias %s"
+msgstr ""
+
 #: src/etc/inc/filter.inc:877
 msgid "Creating gateway group item..."
 msgstr ""
 
-#: src/etc/inc/filter.inc:915
+#: src/etc/inc/filter.inc:916
 #, php-format
 msgid "Setting up route with %1$s on %2$s"
 msgstr ""
 
-#: src/etc/inc/filter.inc:924
+#: src/etc/inc/filter.inc:920
+#, php-format
+msgid "Too many members in group %s, gateway group truncated in ruleset."
+msgstr ""
+
+#: src/etc/inc/filter.inc:932
 #, php-format
 msgid ""
 "An error occurred while trying to find the interface got %s .  The rule has "
 "not been added."
 msgstr ""
 
-#: src/etc/inc/filter.inc:1275
+#: src/etc/inc/filter.inc:1285
 #, php-format
 msgid "Creating reflection NAT rule for %s..."
 msgstr ""
 
-#: src/etc/inc/filter.inc:1373
+#: src/etc/inc/filter.inc:1383
 #, php-format
 msgid "Creating reflection rule for %s..."
 msgstr ""
 
-#: src/etc/inc/filter.inc:1581
+#: src/etc/inc/filter.inc:1504
+msgid "Not installing NAT reflection rules for a port range > 500"
+msgstr ""
+
+#: src/etc/inc/filter.inc:1510
+msgid "Installing partial NAT reflection rules. Maximum 1,000 reached."
+msgstr ""
+
+#: src/etc/inc/filter.inc:1591
 msgid "localhost"
 msgstr ""
 
-#: src/etc/inc/filter.inc:1589
+#: src/etc/inc/filter.inc:1599
 msgid "static route"
 msgstr ""
 
-#: src/etc/inc/filter.inc:1601
+#: src/etc/inc/filter.inc:1611
 msgid "DHCP alias address"
 msgstr ""
 
-#: src/etc/inc/filter.inc:1635
+#: src/etc/inc/filter.inc:1645
 msgid "PPPoE server"
 msgstr ""
 
-#: src/etc/inc/filter.inc:1646
+#: src/etc/inc/filter.inc:1656
 msgid "L2TP server"
 msgstr ""
 
-#: src/etc/inc/filter.inc:1655
+#: src/etc/inc/filter.inc:1665
 msgid "OpenVPN server"
 msgstr ""
 
-#: src/etc/inc/filter.inc:1664
+#: src/etc/inc/filter.inc:1674
 msgid "OpenVPN client"
 msgstr ""
 
-#: src/etc/inc/filter.inc:1674
+#: src/etc/inc/filter.inc:1684
 msgid "IPsec client"
 msgstr ""
 
-#: src/etc/inc/filter.inc:1710
+#: src/etc/inc/filter.inc:1720
 msgid "Auto created rule for ISAKMP"
 msgstr ""
 
-#: src/etc/inc/filter.inc:1720
+#: src/etc/inc/filter.inc:1730
 msgid "Auto created rule"
 msgstr ""
 
-#: src/etc/inc/filter.inc:1853
+#: src/etc/inc/filter.inc:1863
 msgid "Creating 1:1 rules..."
 msgstr ""
 
-#: src/etc/inc/filter.inc:2039
+#: src/etc/inc/filter.inc:2049
 #, php-format
 msgid "Creating advanced outbound rule %s"
 msgstr ""
 
-#: src/etc/inc/filter.inc:2081
+#: src/etc/inc/filter.inc:2091
 msgid "Creating outbound NAT rules"
 msgstr ""
 
-#: src/etc/inc/filter.inc:2088
+#: src/etc/inc/filter.inc:2098
 msgid "Creating automatic outbound rules"
 msgstr ""
 
-#: src/etc/inc/filter.inc:2118
-msgid "Setting up TFTP helper"
+#: src/etc/inc/filter.inc:2128
+msgid "Setting up TFTP helper"
+msgstr ""
+
+#: src/etc/inc/filter.inc:2170
+#, php-format
+msgid "Creating NAT rule %s"
+msgstr ""
+
+#: src/etc/inc/filter.inc:2398
+#, php-format
+msgid "Creating filter rule %s ..."
+msgstr ""
+
+#: src/etc/inc/filter.inc:2422
+#, php-format
+msgid "filter_generate_port: %1$s is not a valid %2$s port."
+msgstr ""
+
+#: src/etc/inc/filter.inc:2658
+#, php-format
+msgid "Creating filter rules %s ..."
+msgstr ""
+
+#: src/etc/inc/filter.inc:2709
+#, php-format
+msgid "Unresolvable source alias '%1$s' for rule '%2$s'"
+msgstr ""
+
+#: src/etc/inc/filter.inc:2714
+#, php-format
+msgid "Unresolvable destination alias '%1$s' for rule '%2$s'"
+msgstr ""
+
+#: src/etc/inc/filter.inc:2718
+msgid "Setting up pass/block rules"
 msgstr ""
 
-#: src/etc/inc/filter.inc:2160
+#: src/etc/inc/filter.inc:2745
 #, php-format
-msgid "Creating NAT rule %s"
+msgid "Setting up pass/block rules %s"
 msgstr ""
 
-#: src/etc/inc/filter.inc:2388
+#: src/etc/inc/filter.inc:2769
 #, php-format
-msgid "Creating filter rule %s ..."
+msgid "The gateway: %s is invalid or unknown, not using it."
 msgstr ""
 
-#: src/etc/inc/filter.inc:2735
+#: src/etc/inc/filter.inc:2788
 #, php-format
-msgid "Setting up pass/block rules %s"
+msgid "Creating rule %s"
 msgstr ""
 
-#: src/etc/inc/filter.inc:2778
+#: src/etc/inc/filter.inc:3033
 #, php-format
-msgid "Creating rule %s"
+msgid "[TDR DEBUG] status true -- rule type '%s'"
 msgstr ""
 
-#: src/etc/inc/filter.inc:3067
+#: src/etc/inc/filter.inc:3077
 msgid "Creating default rules"
 msgstr ""
 
-#: src/etc/inc/filter.inc:3719
+#: src/etc/inc/filter.inc:3729
 msgid "Creating IPsec rules..."
 msgstr ""
 
-#: src/etc/inc/filter.inc:3772
+#: src/etc/inc/filter.inc:3782
 msgid ""
 "Please use filter_tdr_install_cron() function tdr_install_cron will be "
 "deprecated!"
 msgstr ""
 
-#: src/etc/inc/filter.inc:3821
+#: src/etc/inc/filter.inc:3831
 msgid "Installed 15 minute filter reload for Time Based Rules"
 msgstr ""
 
-#: src/etc/inc/filter.inc:3828
+#: src/etc/inc/filter.inc:3838
 msgid "Removed 15 minute filter reload for Time Based Rules"
 msgstr ""
 
-#: src/etc/inc/filter.inc:4184
+#: src/etc/inc/filter.inc:4203
 #, php-format
 msgid "Checking for %1$s PF hooks in package %2$s"
 msgstr ""
 
-#: src/etc/inc/filter.inc:4191
+#: src/etc/inc/filter.inc:4210
 #, php-format
 msgid "Processing early %1$s rules for package %2$s"
 msgstr ""
 
-#: src/etc/inc/filter.inc:4196
+#: src/etc/inc/filter.inc:4215
 #, php-format
 msgid "There was an error while parsing the package filter rules for %s."
 msgstr ""
 
+#: src/etc/inc/filter.inc:4281
+msgid "delete this separator"
+msgstr ""
+
 #: src/etc/inc/filter_log.inc:260 src/etc/inc/filter_log.inc:282
 #: src/etc/inc/filter_log.inc:305 src/etc/inc/filter_log.inc:328
 #, php-format
 msgid ""
-"There was a error parsing log entry: %s.   Please report to mailing list or "
+"There was a error parsing log entry: %s. Please report to mailing list or "
 "forum."
 msgstr ""
 
@@ -1108,303 +1863,752 @@ msgstr ""
 msgid "unread notices"
 msgstr ""
 
-#: src/etc/inc/gwlb.inc:1029
+#: src/etc/inc/gmirror.inc:96
+msgid "No mirrors found."
+msgstr ""
+
+#: src/etc/inc/gmirror.inc:104 src/etc/inc/shaper.inc:789
+#: src/etc/inc/shaper.inc:1167 src/etc/inc/shaper.inc:1376
+#: src/etc/inc/shaper.inc:3345 src/etc/inc/shaper.inc:3891
+#: src/etc/inc/shaper.inc:4213 src/usr/local/www/diag_gmirror.php:251
+#: src/usr/local/www/diag_gmirror.php:331
+#: src/usr/local/www/firewall_aliases.php:226
+#: src/usr/local/www/firewall_aliases_edit.php:174
+#: src/usr/local/www/firewall_aliases_edit.php:674
+#: src/usr/local/www/firewall_aliases_import.php:93
+#: src/usr/local/www/firewall_schedule.php:126
+#: src/usr/local/www/interfaces_groups.php:113
+#: src/usr/local/www/load_balancer_monitor.php:140
+#: src/usr/local/www/load_balancer_monitor_edit.php:118
+#: src/usr/local/www/load_balancer_monitor_edit.php:306
+#: src/usr/local/www/load_balancer_pool.php:154
+#: src/usr/local/www/load_balancer_pool_edit.php:107
+#: src/usr/local/www/load_balancer_pool_edit.php:347
+#: src/usr/local/www/load_balancer_virtual_server.php:154
+#: src/usr/local/www/load_balancer_virtual_server_edit.php:104
+#: src/usr/local/www/load_balancer_virtual_server_edit.php:109
+#: src/usr/local/www/load_balancer_virtual_server_edit.php:208
+#: src/usr/local/www/pkg_mgr.php:99 src/usr/local/www/pkg_mgr.php:190
+#: src/usr/local/www/pkg_mgr_installed.php:102
+#: src/usr/local/www/services_captiveportal_filemanager.php:218
+#: src/usr/local/www/services_igmpproxy.php:121
+#: src/usr/local/www/status_gateways.php:93
+#: src/usr/local/www/status_lb_pool.php:162
+#: src/usr/local/www/status_lb_vs.php:96
+#: src/usr/local/www/status_openvpn.php:252
+#: src/usr/local/www/status_openvpn.php:308
+#: src/usr/local/www/system_camanager.php:392
+#: src/usr/local/www/system_certmanager.php:1006
+#: src/usr/local/www/system_crlmanager.php:614
+#: src/usr/local/www/system_gateways.php:276
+#: src/usr/local/www/system_gateways_edit.php:142
+#: src/usr/local/www/system_gateways_edit.php:638
+#: src/usr/local/www/system_groupmanager.php:249
+#: src/usr/local/www/system_usermanager.php:379
+#: src/usr/local/www/system_usermanager.php:428
+#: src/usr/local/www/widgets/widgets/gateways.widget.php:89
+#: src/usr/local/www/widgets/widgets/installed_packages.widget.php:82
+#: src/usr/local/www/widgets/widgets/system_information.widget.php:113
+msgid "Name"
+msgstr ""
+
+#: src/etc/inc/gmirror.inc:105 src/usr/local/www/diag_gmirror.php:252
+#: src/usr/local/www/easyrule.php:112 src/usr/local/www/index.php:315
+#: src/usr/local/www/status_captiveportal.php:125
+#: src/usr/local/www/status_captiveportal_expire.php:86
+#: src/usr/local/www/status_captiveportal_test.php:86
+#: src/usr/local/www/status_captiveportal_voucher_rolls.php:85
+#: src/usr/local/www/status_captiveportal_vouchers.php:85
+#: src/usr/local/www/status_carp.php:140 src/usr/local/www/status_carp.php:206
+#: src/usr/local/www/status_dhcp_leases.php:69
+#: src/usr/local/www/status_dhcpv6_leases.php:70
+#: src/usr/local/www/status_filter_reload.php:67
+#: src/usr/local/www/status_gateway_groups.php:80
+#: src/usr/local/www/status_gateways.php:75
+#: src/usr/local/www/status_gateways.php:99
+#: src/usr/local/www/status_graph.php:150
+#: src/usr/local/www/status_graph_cpu.php:66
+#: src/usr/local/www/status_interfaces.php:108
+#: src/usr/local/www/status_interfaces.php:124
+#: src/usr/local/www/status_ipsec.php:70 src/usr/local/www/status_ipsec.php:140
+#: src/usr/local/www/status_ipsec_leases.php:66
+#: src/usr/local/www/status_ipsec_leases.php:90
+#: src/usr/local/www/status_ipsec_sad.php:69
+#: src/usr/local/www/status_ipsec_spd.php:72
+#: src/usr/local/www/status_lb_pool.php:92
+#: src/usr/local/www/status_lb_vs.php:79 src/usr/local/www/status_lb_vs.php:99
+#: src/usr/local/www/status_logs.php:129 src/usr/local/www/status_logs.php:131
+#: src/usr/local/www/status_logs_filter.php:135
+#: src/usr/local/www/status_logs_filter_dynamic.php:115
+#: src/usr/local/www/status_logs_filter_summary.php:101
+#: src/usr/local/www/status_logs_settings.php:209
+#: src/usr/local/www/status_logs_vpn.php:117
+#: src/usr/local/www/status_ntpd.php:186 src/usr/local/www/status_ntpd.php:198
+#: src/usr/local/www/status_openvpn.php:64
+#: src/usr/local/www/status_openvpn.php:253
+#: src/usr/local/www/status_openvpn.php:309
+#: src/usr/local/www/status_pkglogs.php:104
+#: src/usr/local/www/status_queues.php:145
+#: src/usr/local/www/status_services.php:100
+#: src/usr/local/www/status_services.php:132
+#: src/usr/local/www/status_upnp.php:76
+#: src/usr/local/www/status_wireless.php:65
+#: src/usr/local/www/status_wireless.php:96
+#: src/usr/local/www/widgets/widgets/gateways.widget.php:93
+#: src/usr/local/www/widgets/widgets/ipsec.widget.php:236
+#: src/usr/local/www/widgets/widgets/ipsec.widget.php:252
+#: src/usr/local/www/widgets/widgets/wake_on_lan.widget.php:75
+msgid "Status"
+msgstr ""
+
+#: src/etc/inc/gmirror.inc:106 src/usr/local/www/diag_gmirror.php:253
+msgid "Component"
+msgstr ""
+
+#: src/etc/inc/gwlb.inc:202
+msgid "No gateways to monitor. dpinger will not run."
+msgstr ""
+
+#: src/etc/inc/gwlb.inc:250 src/etc/inc/gwlb.inc:292
+#, php-format
+msgid ""
+"Removing static route for monitor %1$s and adding a new route through %2$s"
+msgstr ""
+
+#: src/etc/inc/gwlb.inc:321
+#, php-format
+msgid "Error starting gateway monitor for %s"
+msgstr ""
+
+#: src/etc/inc/gwlb.inc:334
+#, php-format
+msgid "dpinger: No dpinger session running for gateway %s"
+msgstr ""
+
+#: src/etc/inc/gwlb.inc:348
+#, php-format
+msgid "dpinger: cannot connect to status socket %1$s - %2$s (%3$s)"
+msgstr ""
+
+#: src/etc/inc/gwlb.inc:927
+#, php-format
+msgid "MONITOR: %1$s is down, omitting from routing group %2$s"
+msgstr ""
+
+#: src/etc/inc/gwlb.inc:931
+#, php-format
+msgid "MONITOR: %1$s has packet loss, omitting from routing group %2$s"
+msgstr ""
+
+#: src/etc/inc/gwlb.inc:935
+#, php-format
+msgid "MONITOR: %1$s has high latency, omitting from routing group %2$s"
+msgstr ""
+
+#: src/etc/inc/gwlb.inc:957
+#, php-format
+msgid ""
+"Gateways status could not be determined, considering all as up/active. "
+"(Group: %s)"
+msgstr ""
+
+#: src/etc/inc/gwlb.inc:1000
+#, php-format
+msgid "GATEWAYS: Group %1$s did not have any gateways up on tier %2$s!"
+msgstr ""
+
+#: src/etc/inc/gwlb.inc:1022
 #, php-format
 msgid "Updating gateway group gateway for %1$s - new gateway is %2$s"
 msgstr ""
 
-#: src/etc/inc/interfaces.inc:63
+#: src/etc/inc/interfaces.inc:65
 msgid "interfaces_bring_up() was called but no variable defined."
 msgstr ""
 
-#: src/etc/inc/interfaces.inc:202
+#: src/etc/inc/interfaces.inc:204
 msgid "Configuring loopback interface..."
 msgstr ""
 
-#: src/etc/inc/interfaces.inc:215
+#: src/etc/inc/interfaces.inc:217
 msgid "Configuring VLAN interfaces..."
 msgstr ""
 
-#: src/etc/inc/interfaces.inc:239
+#: src/etc/inc/interfaces.inc:241
 msgid "VLAN: called with wrong options. Problems with config!"
 msgstr ""
 
-#: src/etc/inc/interfaces.inc:244
+#: src/etc/inc/interfaces.inc:246
 msgid "interface_vlan_configure called with if undefined."
 msgstr ""
 
-#: src/etc/inc/interfaces.inc:282 src/etc/inc/interfaces.inc:377
+#: src/etc/inc/interfaces.inc:284 src/etc/inc/interfaces.inc:379
 #, php-format
 msgid "QinQ compat VLAN: called with wrong options. Problems with config!%s"
 msgstr ""
 
-#: src/etc/inc/interfaces.inc:289
+#: src/etc/inc/interfaces.inc:291
 #, php-format
 msgid "interface_qinq_configure called with if undefined.%s"
 msgstr ""
 
-#: src/etc/inc/interfaces.inc:294
+#: src/etc/inc/interfaces.inc:296
 #, php-format
 msgid "interface_qinq_configure called with invalid if.%s"
 msgstr ""
 
-#: src/etc/inc/interfaces.inc:360
+#: src/etc/inc/interfaces.inc:362
 msgid "Configuring QinQ interfaces..."
 msgstr ""
 
-#: src/etc/inc/interfaces.inc:385
+#: src/etc/inc/interfaces.inc:387
 #, php-format
 msgid "interface_qinq2_configure called with if undefined.%s"
 msgstr ""
 
-#: src/etc/inc/interfaces.inc:406
+#: src/etc/inc/interfaces.inc:408
 msgid "Creating wireless clone interfaces..."
 msgstr ""
 
-#: src/etc/inc/interfaces.inc:484
+#: src/etc/inc/interfaces.inc:486
 #, php-format
 msgid "No members found on %s"
 msgstr ""
 
-#: src/etc/inc/interfaces.inc:548
+#: src/etc/inc/interfaces.inc:550
 msgid "realif not defined in interfaces bridge - up"
 msgstr ""
 
-#: src/etc/inc/interfaces.inc:670
+#: src/etc/inc/interfaces.inc:569
 msgid "bridgeif not defined -- could not bring interface up"
 msgstr ""
 
-#: src/etc/inc/interfaces.inc:697
+#: src/etc/inc/interfaces.inc:724
 msgid "Configuring LAGG interfaces..."
 msgstr ""
 
-#: src/etc/inc/interfaces.inc:859
+#: src/etc/inc/interfaces.inc:886
 msgid "Could not bring greif up -- variable not defined."
 msgstr ""
 
-#: src/etc/inc/interfaces.inc:942
+#: src/etc/inc/interfaces.inc:969
 msgid ""
 "could not bring realif up -- variable not defined -- "
 "interface_gif_configure()"
 msgstr ""
 
-#: src/etc/inc/interfaces.inc:975
+#: src/etc/inc/interfaces.inc:1016
 msgid "could not bring gifif up -- variable not defined"
 msgstr ""
 
-#: src/etc/inc/interfaces.inc:1057 src/etc/inc/interfaces.inc:1087
-#: src/etc/inc/interfaces.inc:1111 src/etc/inc/interfaces.inc:1129
+#: src/etc/inc/interfaces.inc:1098 src/etc/inc/interfaces.inc:1128
+#: src/etc/inc/interfaces.inc:1152 src/etc/inc/interfaces.inc:1170
 #, php-format
 msgid "Configuring %s interface..."
 msgstr ""
 
-#: src/etc/inc/interfaces.inc:1061 src/etc/inc/interfaces.inc:1090
-#: src/etc/inc/interfaces.inc:1114 src/etc/inc/interfaces.inc:1132
+#: src/etc/inc/interfaces.inc:1102 src/etc/inc/interfaces.inc:1131
+#: src/etc/inc/interfaces.inc:1155 src/etc/inc/interfaces.inc:1173
 #, php-format
 msgid "Configuring %s"
 msgstr ""
 
-#: src/etc/inc/interfaces.inc:1241
+#: src/etc/inc/interfaces.inc:1255
+#, php-format
+msgid "Calling interface down for interface %1$s, destroy is %2$s"
+msgstr ""
+
+#: src/etc/inc/interfaces.inc:1269
 msgid "Wrong parameters used during interface_bring_down"
 msgstr ""
 
-#: src/etc/inc/interfaces.inc:1602
+#: src/etc/inc/interfaces.inc:1444
+msgid "Enter CARP maintenance mode"
+msgstr ""
+
+#: src/etc/inc/interfaces.inc:1630
 #, php-format
 msgid "Can't find PPP config for %s in interface_ppps_configure()."
 msgstr ""
 
-#: src/etc/inc/interfaces.inc:1664
+#: src/etc/inc/interfaces.inc:1688
+#, php-format
+msgid ""
+"Could not get a Local IP address for PPTP/L2TP link on %s in "
+"interfaces_ppps_configure. Using 0.0.0.0 ip!"
+msgstr ""
+
+#: src/etc/inc/interfaces.inc:1692
 #, 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:1671
+#: src/etc/inc/interfaces.inc:1699
 #, php-format
 msgid ""
 "Device %s does not exist. PPP link cannot start without the modem device."
 msgstr ""
 
-#: src/etc/inc/interfaces.inc:1676
+#: src/etc/inc/interfaces.inc:1704
 #, php-format
 msgid "Unknown %s configured as ppp interface."
 msgstr ""
 
-#: src/etc/inc/interfaces.inc:1988
-#, php-format
-msgid "Error: cannot open mpd_%s.conf in interface_ppps_configure().%s"
+#: src/etc/inc/interfaces.inc:2022
+#, php-format
+msgid "Error: cannot open mpd_%1$s.conf in interface_ppps_configure().%2$s"
+msgstr ""
+
+#: src/etc/inc/interfaces.inc:2120
+#, php-format
+msgid "Starting 3gstats.php on device '%1$s' for interface '%2$s'"
+msgstr ""
+
+#: src/etc/inc/interfaces.inc:2137
+msgid "Configuring CARP settings..."
+msgstr ""
+
+#: src/etc/inc/interfaces.inc:2178
+msgid "waiting for pfsync..."
+msgstr ""
+
+#: src/etc/inc/interfaces.inc:2184
+#, php-format
+msgid "pfsync done in %s seconds."
+msgstr ""
+
+#: src/etc/inc/interfaces.inc:2185
+msgid "Configuring CARP settings finalize..."
+msgstr ""
+
+#: src/etc/inc/interfaces.inc:2408
+#, php-format
+msgid ""
+"Interface specified for the virtual IP address %s does not exist. Skipping "
+"this VIP."
+msgstr ""
+
+#: src/etc/inc/interfaces.inc:2468
+#, php-format
+msgid "Interface %s changed to hostap mode"
+msgstr ""
+
+#: src/etc/inc/interfaces.inc:2472
+#, php-format
+msgid "Interface %s changed to adhoc mode"
+msgstr ""
+
+#: src/etc/inc/interfaces.inc:2476
+#, php-format
+msgid "Interface %s changed to infrastructure mode"
+msgstr ""
+
+#: src/etc/inc/interfaces.inc:2489
+#, php-format
+msgid "Cloning new wireless interface %s"
+msgstr ""
+
+#: src/etc/inc/interfaces.inc:2494
+#, php-format
+msgid "Failed to clone interface %1$s with error code %2$s, output %3$s"
+msgstr ""
+
+#: src/etc/inc/interfaces.inc:3079
+#, php-format
+msgid "OpenVPN: Resync server %s"
+msgstr ""
+
+#: src/etc/inc/interfaces.inc:3092
+#, php-format
+msgid "OpenVPN: Resync client %s"
+msgstr ""
+
+#: src/etc/inc/interfaces.inc:3227
+#, php-format
+msgid "Deny router advertisements for interface %s"
+msgstr ""
+
+#: src/etc/inc/interfaces.inc:3252
+msgid "Generating new MAC address."
+msgstr ""
+
+#: src/etc/inc/interfaces.inc:3258
+#, 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:3324
+#, php-format
+msgid "There is a conflict on MTU between parent %1$s and VLAN(%2$s)"
+msgstr ""
+
+#: src/etc/inc/interfaces.inc:3514 src/etc/inc/interfaces.inc:3579
+#: src/etc/inc/interfaces.inc:3643
+#, php-format
+msgid "Interface %1$s tracking non-existant interface %2$s"
+msgstr ""
+
+#: src/etc/inc/interfaces.inc:3521 src/etc/inc/interfaces.inc:3527
+#, php-format
+msgid "Interface %1$s configured via %2$s type %3$s"
+msgstr ""
+
+#: src/etc/inc/interfaces.inc:3585
+#, 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:3621
+#, php-format
+msgid "rd6 %1$s with ipv6 address %2$s based on %3$s ipv4 %4$s"
+msgstr ""
+
+#: src/etc/inc/interfaces.inc:3649 src/etc/inc/interfaces.inc:3704
+#: src/etc/inc/interfaces.inc:3790
+#, 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:3681
+#, php-format
+msgid "sixto4 %1$s with ipv6 address %2$s based on %3$s ipv4 %4$s"
+msgstr ""
+
+#: src/etc/inc/interfaces.inc:4176
+#, php-format
+msgid "Error: cannot open %s in DHCP6_Config_File_Override() for reading."
+msgstr ""
+
+#: src/etc/inc/interfaces.inc:4204
+#, php-format
+msgid ""
+"Error: cannot open dhclient_%s.conf in interface_dhcp_configure() for "
+"writing."
+msgstr ""
+
+#: src/etc/inc/interfaces.inc:4217
+#, php-format
+msgid "Invalid interface \"%s\" in interface_dhcp_configure()"
+msgstr ""
+
+#: src/etc/inc/interfaces.inc:4273
+#, php-format
+msgid "Could not bring up %s interface in interface_dhcp_configure()"
+msgstr ""
+
+#: src/etc/inc/interfaces.inc:4359
+#, php-format
+msgid "Error: cannot open %s in DHCP_Config_File_Override() for reading.\n"
+msgstr ""
+
+#: src/etc/inc/interfaces.inc:5320 src/etc/inc/service-utils.inc:390
+#: src/usr/local/www/diag_backup.php:567
+#: src/usr/local/www/diag_packet_capture.php:143
+#: src/usr/local/www/firewall_nat_1to1_edit.php:441
+#: src/usr/local/www/firewall_nat_edit.php:706
+#: src/usr/local/www/firewall_nat_npt_edit.php:206
+#: src/usr/local/www/firewall_rules.php:192
+#: src/usr/local/www/firewall_rules_edit.php:1054
+#: src/usr/local/www/head.inc:316 src/usr/local/www/head.inc:334
+#: src/usr/local/www/status_graph.php:94 src/usr/local/www/status_logs.php:86
+#: src/usr/local/www/status_logs_common.inc:129
+#: src/usr/local/www/status_logs_settings.php:241
+#: src/usr/local/www/status_openvpn.php:64
+#: src/usr/local/www/vpn_openvpn_client.php:426
+#: src/usr/local/www/vpn_openvpn_csc.php:308
+#: src/usr/local/www/vpn_openvpn_server.php:592
+#: src/usr/local/www/widgets/include/openvpn.inc:2
+msgid "OpenVPN"
+msgstr ""
+
+#: src/etc/inc/ipsec.inc:58 src/etc/inc/ipsec.inc:88
+msgid "Daemon"
+msgstr ""
+
+#: src/etc/inc/ipsec.inc:59 src/etc/inc/ipsec.inc:89
+msgid "SA Manager"
+msgstr ""
+
+#: src/etc/inc/ipsec.inc:60 src/etc/inc/ipsec.inc:90
+msgid "IKE SA"
+msgstr ""
+
+#: src/etc/inc/ipsec.inc:61 src/etc/inc/ipsec.inc:91
+msgid "IKE Child SA"
+msgstr ""
+
+#: src/etc/inc/ipsec.inc:62 src/etc/inc/ipsec.inc:92
+msgid "Job Processing"
+msgstr ""
+
+#: src/etc/inc/ipsec.inc:63 src/etc/inc/ipsec.inc:93
+msgid "Configuration backend"
+msgstr ""
+
+#: src/etc/inc/ipsec.inc:64 src/etc/inc/ipsec.inc:94
+msgid "Kernel Interface"
+msgstr ""
+
+#: src/etc/inc/ipsec.inc:65 src/etc/inc/ipsec.inc:95
+#: src/usr/local/www/system_advanced_admin.php:330
+#: src/usr/local/www/system_advanced_firewall.php:417
+#: src/usr/local/www/system_advanced_misc.php:318
+#: src/usr/local/www/system_advanced_network.php:173
+#: src/usr/local/www/system_advanced_network.php:186
+#: src/usr/local/www/system_advanced_notifications.php:230
+#: src/usr/local/www/system_advanced_sysctl.php:188
+msgid "Networking"
+msgstr ""
+
+#: src/etc/inc/ipsec.inc:66 src/etc/inc/ipsec.inc:96
+msgid "ASN encoding"
 msgstr ""
 
-#: src/etc/inc/interfaces.inc:2103
-msgid "Configuring CARP settings..."
+#: src/etc/inc/ipsec.inc:67 src/etc/inc/ipsec.inc:97
+msgid "Message encoding"
 msgstr ""
 
-#: src/etc/inc/interfaces.inc:2383
-#, php-format
-msgid ""
-"Interface specified for the virtual IP address %s does not exist. Skipping "
-"this VIP."
+#: src/etc/inc/ipsec.inc:68 src/etc/inc/ipsec.inc:98
+msgid "Integrity checker"
 msgstr ""
 
-#: src/etc/inc/interfaces.inc:2443
-#, php-format
-msgid "Interface %s changed to hostap mode"
+#: src/etc/inc/ipsec.inc:69 src/etc/inc/ipsec.inc:99
+msgid "Integrity Verifier"
 msgstr ""
 
-#: src/etc/inc/interfaces.inc:2447
-#, php-format
-msgid "Interface %s changed to adhoc mode"
+#: src/etc/inc/ipsec.inc:70 src/etc/inc/ipsec.inc:100
+msgid "Platform Trust Service"
 msgstr ""
 
-#: src/etc/inc/interfaces.inc:2451
-#, php-format
-msgid "Interface %s changed to infrastructure mode"
+#: src/etc/inc/ipsec.inc:71 src/etc/inc/ipsec.inc:101
+msgid "TLS handler"
 msgstr ""
 
-#: src/etc/inc/interfaces.inc:2464
-#, php-format
-msgid "Cloning new wireless interface %s"
+#: src/etc/inc/ipsec.inc:72 src/etc/inc/ipsec.inc:102
+msgid "IPsec traffic"
 msgstr ""
 
-#: src/etc/inc/interfaces.inc:2469
-#, php-format
-msgid "Failed to clone interface %1$s with error code %2$s, output %3$s"
+#: src/etc/inc/ipsec.inc:73 src/etc/inc/ipsec.inc:103
+msgid "StrongSwan Lib"
 msgstr ""
 
-#: src/etc/inc/interfaces.inc:3264
-msgid "Generating new MAC address."
+#: src/etc/inc/ipsec.inc:78
+msgid "Silent"
 msgstr ""
 
-#: src/etc/inc/interfaces.inc:3270
-#, php-format
-msgid ""
-"The INVALID MAC address (ff:ff:ff:ff:ff:ff) on interface %1$s has been "
-"automatically replaced with %2$s"
+#: src/etc/inc/ipsec.inc:79
+msgid "Audit"
 msgstr ""
 
-#: src/etc/inc/interfaces.inc:4232
-#, php-format
-msgid ""
-"Error: cannot open dhclient_%s.conf in interface_dhcp_configure() for "
-"writing.%s"
+#: src/etc/inc/ipsec.inc:80
+msgid "Control"
 msgstr ""
 
-#: src/etc/inc/interfaces.inc:4245
-#, php-format
-msgid "Invalid interface \"%s\" in interface_dhcp_configure()"
+#: src/etc/inc/ipsec.inc:81
+msgid "Diag"
 msgstr ""
 
-#: src/etc/inc/interfaces.inc:4301
-#, php-format
-msgid "Could not bring up %s interface in interface_dhcp_configure()"
+#: src/etc/inc/ipsec.inc:82 src/usr/local/www/status_logs_common.inc:896
+msgid "Raw"
 msgstr ""
 
-#: src/etc/inc/interfaces.inc:5453 src/etc/inc/service-utils.inc:390
-#: src/usr/local/www/diag_backup.php:567
-#: src/usr/local/www/diag_packet_capture.php:143
-#: src/usr/local/www/firewall_nat_1to1_edit.php:441
-#: src/usr/local/www/firewall_nat_edit.php:712
-#: src/usr/local/www/firewall_nat_npt_edit.php:206
-#: src/usr/local/www/firewall_rules.php:187
-#: src/usr/local/www/firewall_rules_edit.php:1022
-#: src/usr/local/www/head.inc:279 src/usr/local/www/head.inc:297
-#: src/usr/local/www/license.php:171 src/usr/local/www/status_graph.php:94
-#: src/usr/local/www/status_logs.php:86
-#: src/usr/local/www/status_logs_common.inc:118
-#: src/usr/local/www/status_logs_settings.php:241
-#: src/usr/local/www/status_openvpn.php:64
-#: src/usr/local/www/vpn_openvpn_client.php:70
-#: src/usr/local/www/vpn_openvpn_csc.php:70
-#: src/usr/local/www/vpn_openvpn_server.php:592
-#: src/usr/local/www/widgets/include/openvpn.inc:2
-msgid "OpenVPN"
+#: src/etc/inc/ipsec.inc:83
+msgid "Highest"
 msgstr ""
 
-#: src/etc/inc/ipsec.inc:95
+#: src/etc/inc/ipsec.inc:108
 msgid "My IP address"
 msgstr ""
 
-#: src/etc/inc/ipsec.inc:96 src/etc/inc/ipsec.inc:107
-#: src/usr/local/www/diag_arp.php:345 src/usr/local/www/services_dhcp.php:1294
+#: src/etc/inc/ipsec.inc:109 src/etc/inc/ipsec.inc:121
+#: src/usr/local/www/diag_arp.php:345 src/usr/local/www/services_dhcp.php:1317
 #: src/usr/local/www/services_dnsmasq_domainoverride_edit.php:100
 #: src/usr/local/www/services_dnsmasq_edit.php:110
 #: src/usr/local/www/services_unbound_domainoverride_edit.php:96
 #: src/usr/local/www/services_unbound_host_edit.php:111
-#: src/usr/local/www/status_captiveportal.php:176
+#: src/usr/local/www/status_captiveportal.php:183
 #: src/usr/local/www/status_dhcp_leases.php:379
 #: src/usr/local/www/system_advanced_network.php:214
-#: src/usr/local/www/system_certmanager.php:812
+#: src/usr/local/www/system_certmanager.php:814
 #: src/usr/local/www/vpn_l2tp_users.php:130
-#: src/usr/local/www/widgets/widgets/captive_portal_status.widget.php:133
+#: src/usr/local/www/widgets/widgets/captive_portal_status.widget.php:129
 msgid "IP address"
 msgstr ""
 
-#: src/etc/inc/ipsec.inc:97 src/etc/inc/ipsec.inc:108
+#: src/etc/inc/ipsec.inc:110 src/etc/inc/ipsec.inc:122
 msgid "Distinguished name"
 msgstr ""
 
-#: src/etc/inc/ipsec.inc:98 src/etc/inc/ipsec.inc:109
+#: src/etc/inc/ipsec.inc:111 src/etc/inc/ipsec.inc:123
 msgid "User distinguished name"
 msgstr ""
 
-#: src/etc/inc/ipsec.inc:99 src/etc/inc/ipsec.inc:110
+#: src/etc/inc/ipsec.inc:112 src/etc/inc/ipsec.inc:124
 msgid "ASN.1 distinguished Name"
 msgstr ""
 
-#: src/etc/inc/ipsec.inc:100 src/etc/inc/ipsec.inc:111
+#: src/etc/inc/ipsec.inc:113 src/etc/inc/ipsec.inc:125
 msgid "KeyID tag"
 msgstr ""
 
-#: src/etc/inc/ipsec.inc:101 src/usr/local/www/head.inc:259
-#: src/usr/local/www/services_dhcp.php:987
-#: src/usr/local/www/services_dhcp_edit.php:595
-#: src/usr/local/www/services_dhcpv6.php:686
+#: src/etc/inc/ipsec.inc:114 src/usr/local/www/head.inc:296
+#: src/usr/local/www/services_dhcp.php:1010
+#: src/usr/local/www/services_dhcp_edit.php:599
+#: src/usr/local/www/services_dhcpv6.php:766
 #: src/usr/local/www/services_dyndns.php:100
-#: src/usr/local/www/services_dyndns.php:108
-#: src/usr/local/www/services_dyndns_edit.php:263
+#: src/usr/local/www/services_dyndns_edit.php:273
 #: src/usr/local/www/services_rfc2136.php:92
-#: src/usr/local/www/services_rfc2136.php:96
-#: src/usr/local/www/services_rfc2136_edit.php:160
+#: src/usr/local/www/services_rfc2136_edit.php:182
 msgid "Dynamic DNS"
 msgstr ""
 
-#: src/etc/inc/ipsec.inc:105 src/usr/local/www/diag_traceroute.php:84
+#: src/etc/inc/ipsec.inc:119 src/usr/local/www/diag_traceroute.php:84
 #: src/usr/local/www/firewall_nat_1to1_edit.php:287
 #: src/usr/local/www/firewall_nat_1to1_edit.php:329
-#: src/usr/local/www/firewall_nat_edit.php:547
-#: src/usr/local/www/firewall_nat_edit.php:593
-#: src/usr/local/www/firewall_nat_edit.php:768
+#: src/usr/local/www/firewall_nat_edit.php:541
+#: src/usr/local/www/firewall_nat_edit.php:587
+#: src/usr/local/www/firewall_nat_edit.php:762
 #: src/usr/local/www/firewall_nat_out_edit.php:513
 #: src/usr/local/www/firewall_nat_out_edit.php:537
-#: src/usr/local/www/firewall_rules_edit.php:1414
-#: src/usr/local/www/interfaces.php:2941
+#: src/usr/local/www/firewall_rules_edit.php:1451
+#: src/usr/local/www/interfaces.php:2943
 msgid "Any"
 msgstr ""
 
-#: src/etc/inc/ipsec.inc:106
+#: src/etc/inc/ipsec.inc:120
 msgid "Peer IP address"
 msgstr ""
 
-#: src/etc/inc/ipsec.inc:426 src/usr/local/www/vpn_ipsec.php:353
-#: src/usr/local/www/vpn_ipsec_phase1.php:638
-#: src/usr/local/www/vpn_ipsec_phase2.php:441
+#: src/etc/inc/ipsec.inc:195
+msgid "Hybrid RSA + Xauth"
+msgstr ""
+
+#: src/etc/inc/ipsec.inc:196
+msgid "Mutual RSA + Xauth"
+msgstr ""
+
+#: src/etc/inc/ipsec.inc:197
+msgid "Mutual PSK + Xauth"
+msgstr ""
+
+#: src/etc/inc/ipsec.inc:198
+msgid "EAP-TLS"
+msgstr ""
+
+#: src/etc/inc/ipsec.inc:199
+msgid "EAP-RADIUS"
+msgstr ""
+
+#: src/etc/inc/ipsec.inc:200
+msgid "EAP-MSChapv2"
+msgstr ""
+
+#: src/etc/inc/ipsec.inc:201
+msgid "Mutual RSA"
+msgstr ""
+
+#: src/etc/inc/ipsec.inc:202
+msgid "Mutual PSK"
+msgstr ""
+
+#: src/etc/inc/ipsec.inc:213
+msgid "Tunnel IPv4"
+msgstr ""
+
+#: src/etc/inc/ipsec.inc:214
+msgid "Tunnel IPv6"
+msgstr ""
+
+#: src/etc/inc/ipsec.inc:215 src/usr/local/www/system_authservers.php:201
+#: src/usr/local/www/system_authservers.php:498
+msgid "Transport"
+msgstr ""
+
+#: src/etc/inc/ipsec.inc:226
+msgid "off"
+msgstr ""
+
+#: src/etc/inc/ipsec.inc:227
+msgid "1 (768 bit)"
+msgstr ""
+
+#: src/etc/inc/ipsec.inc:228
+msgid "2 (1024 bit)"
+msgstr ""
+
+#: src/etc/inc/ipsec.inc:229
+msgid "5 (1536 bit)"
+msgstr ""
+
+#: src/etc/inc/ipsec.inc:230
+msgid "14 (2048 bit)"
+msgstr ""
+
+#: src/etc/inc/ipsec.inc:231
+msgid "15 (3072 bit)"
+msgstr ""
+
+#: src/etc/inc/ipsec.inc:232
+msgid "16 (4096 bit)"
+msgstr ""
+
+#: src/etc/inc/ipsec.inc:233
+msgid "17 (6144 bit)"
+msgstr ""
+
+#: src/etc/inc/ipsec.inc:234
+msgid "18 (8192 bit)"
+msgstr ""
+
+#: src/etc/inc/ipsec.inc:235
+msgid "19 (nist ecp256)"
+msgstr ""
+
+#: src/etc/inc/ipsec.inc:236
+msgid "20 (nist ecp384)"
+msgstr ""
+
+#: src/etc/inc/ipsec.inc:237
+msgid "21 (nist ecp521)"
+msgstr ""
+
+#: src/etc/inc/ipsec.inc:238
+msgid "28 (brainpool ecp256)"
+msgstr ""
+
+#: src/etc/inc/ipsec.inc:239
+msgid "29 (brainpool ecp384)"
+msgstr ""
+
+#: src/etc/inc/ipsec.inc:240
+msgid "30 (brainpool ecp512)"
+msgstr ""
+
+#: src/etc/inc/ipsec.inc:437 src/usr/local/www/vpn_ipsec.php:351
 msgid "Mobile Client"
 msgstr ""
 
-#: src/etc/inc/ipsec.inc:429 src/etc/inc/shaper.inc:3936
-#: src/etc/inc/shaper.inc:4240 src/usr/local/www/diag_pftop.php:150
-#: src/usr/local/www/firewall_nat_edit.php:932
-#: src/usr/local/www/firewall_rules_edit.php:1525
-#: src/usr/local/www/interfaces.php:1651 src/usr/local/www/interfaces.php:1652
-#: src/usr/local/www/interfaces.php:1676 src/usr/local/www/interfaces.php:1689
-#: src/usr/local/www/interfaces_bridge_edit.php:318
+#: src/etc/inc/ipsec.inc:440 src/etc/inc/pfsense-utils.inc:2930
+#: src/etc/inc/shaper.inc:3936 src/etc/inc/shaper.inc:4240
+#: src/usr/local/www/diag_pftop.php:150
+#: src/usr/local/www/firewall_nat_edit.php:926
+#: src/usr/local/www/firewall_rules_edit.php:1562
+#: src/usr/local/www/interfaces.php:1640 src/usr/local/www/interfaces.php:1641
+#: src/usr/local/www/interfaces.php:1665 src/usr/local/www/interfaces.php:1678
 #: src/usr/local/www/system_advanced_misc.php:454
 #: src/usr/local/www/vpn_ipsec_phase2.php:579
 msgid "None"
 msgstr ""
 
-#: src/etc/inc/ipsec.inc:623
+#: src/etc/inc/ipsec.inc:634
 msgid ""
 "Unable to find IPsec daemon leases file. Could not display mobile user stats!"
 msgstr ""
@@ -1444,6 +2648,11 @@ msgstr ""
 msgid "Could not open %s for writing"
 msgstr ""
 
+#: src/etc/inc/notices.inc:109
+#, php-format
+msgid "New alert found: %s"
+msgstr ""
+
 #: src/etc/inc/notices.inc:393
 #, php-format
 msgid "Message sent to %s OK"
@@ -1454,6 +2663,46 @@ msgstr ""
 msgid "Could not send the message to %1$s -- Error: %2$s"
 msgstr ""
 
+#: src/etc/inc/openvpn.inc:77 src/usr/local/www/firewall_rules.php:777
+#: src/usr/local/www/firewall_rules_edit.php:1601
+#: src/usr/local/www/firewall_rules_edit.php:1642
+#: src/usr/local/www/firewall_rules_edit.php:1649
+#: src/usr/local/www/status_ipsec.php:379
+#: src/usr/local/www/vpn_ipsec_mobile.php:495
+#: src/usr/local/www/vpn_openvpn_client.php:528
+msgid "none"
+msgstr ""
+
+#: src/etc/inc/openvpn.inc:78 src/usr/local/www/diag_pftop.php:128
+#: src/usr/local/www/firewall_rules_edit.php:1604
+#: src/usr/local/www/services_captiveportal.php:1000
+msgid "default"
+msgstr ""
+
+#: src/etc/inc/openvpn.inc:80
+msgid "3 (recommended)"
+msgstr ""
+
+#: src/etc/inc/openvpn.inc:110
+msgid "One (Client+Server)"
+msgstr ""
+
+#: src/etc/inc/openvpn.inc:111
+msgid "Two (Client+Intermediate+Server)"
+msgstr ""
+
+#: src/etc/inc/openvpn.inc:112
+msgid "Three (Client+2xIntermediate+Server)"
+msgstr ""
+
+#: src/etc/inc/openvpn.inc:113
+msgid "Four (Client+3xIntermediate+Server)"
+msgstr ""
+
+#: src/etc/inc/openvpn.inc:114
+msgid "Five (Client+4xIntermediate+Server)"
+msgstr ""
+
 #: src/etc/inc/openvpn.inc:119 src/etc/inc/openvpn.inc:130
 msgid "Peer to Peer ( SSL/TLS )"
 msgstr ""
@@ -1498,136 +2747,339 @@ msgstr ""
 msgid "net30 -- Isolated /30 network per client"
 msgstr ""
 
-#: src/etc/inc/openvpn.inc:420
+#: src/etc/inc/openvpn.inc:217
+msgid "None (Username and/or Password required)"
+msgstr ""
+
+#: src/etc/inc/openvpn.inc:225
+msgid "===== Server Certificates ====="
+msgstr ""
+
+#: src/etc/inc/openvpn.inc:226
+msgid "===== Non-Server Certificates ====="
+msgstr ""
+
+#: src/etc/inc/openvpn.inc:236
+msgid "Server: Yes"
+msgstr ""
+
+#: src/etc/inc/openvpn.inc:238
+msgid "Server: NO"
+msgstr ""
+
+#: src/etc/inc/openvpn.inc:241
+#, php-format
+msgid "CA: %s"
+msgstr ""
+
+#: src/etc/inc/openvpn.inc:244 src/usr/local/www/system_certmanager.php:1009
+#: src/usr/local/www/system_crlmanager.php:617
+msgid "In Use"
+msgstr ""
+
+#: src/etc/inc/openvpn.inc:247 src/usr/local/www/system_certmanager.php:1072
+msgid "Revoked"
+msgstr ""
+
+#: src/etc/inc/openvpn.inc:410
 msgid "None (No Encryption)"
 msgstr ""
 
-#: src/etc/inc/openvpn.inc:434
+#: src/etc/inc/openvpn.inc:424
 msgid "None (No Authentication)"
 msgstr ""
 
-#: src/etc/inc/openvpn.inc:483
+#: src/etc/inc/openvpn.inc:429
+msgid "No Hardware Crypto Acceleration"
+msgstr ""
+
+#: src/etc/inc/openvpn.inc:473
 #, php-format
 msgid "The field '%s' must contain a valid IP address or domain name."
 msgstr ""
 
-#: src/etc/inc/openvpn.inc:491
+#: src/etc/inc/openvpn.inc:481
 #, php-format
 msgid "The field '%s' must contain a valid port, ranging from 0 to 65535."
 msgstr ""
 
-#: src/etc/inc/openvpn.inc:505
+#: src/etc/inc/openvpn.inc:495
 #, php-format
-msgid "The field '%s' must contain a single valid %s CIDR range."
+msgid "The field '%1$s' must contain a single valid %2$s CIDR range."
 msgstr ""
 
-#: src/etc/inc/openvpn.inc:520
+#: src/etc/inc/openvpn.inc:510
 #, php-format
 msgid ""
-"The field '%s' must contain only valid %s CIDR range(s) separated by commas."
+"The field '%1$s' must contain only valid %2$s CIDR range(s) separated by "
+"commas."
+msgstr ""
+
+#: src/etc/inc/openvpn.inc:1116
+#, php-format
+msgid "OpenVPN ID %1$s PID %2$s still running, killing."
+msgstr ""
+
+#: src/etc/inc/openvpn.inc:1332
+#, php-format
+msgid "Resyncing OpenVPN instances for interface %s."
+msgstr ""
+
+#: src/etc/inc/openvpn.inc:1334
+msgid "Resyncing OpenVPN instances."
+msgstr ""
+
+#: src/etc/inc/openvpn.inc:1371
+#, php-format
+msgid "Resyncing OpenVPN for gateway group %1$s server %2$s."
+msgstr ""
+
+#: src/etc/inc/openvpn.inc:1380
+#, php-format
+msgid "Resyncing OpenVPN for gateway group %1$s client %2$s."
+msgstr ""
+
+#: src/etc/inc/openvpn.inc:1389
+msgid "openvpn_resync_gwgroup called with null gwgroup parameter."
+msgstr ""
+
+#: src/etc/inc/openvpn.inc:1490 src/etc/inc/openvpn.inc:1618
+msgid "Unable to contact daemon"
+msgstr ""
+
+#: src/etc/inc/openvpn.inc:1491 src/etc/inc/openvpn.inc:1619
+msgid "Service not running?"
 msgstr ""
 
-#: src/etc/inc/pfsense-utils.inc:498
+#: src/etc/inc/pfsense-utils.inc:489
 msgid "After synch increase advertising skew"
 msgstr ""
 
-#: src/etc/inc/pfsense-utils.inc:545
+#: src/etc/inc/pfsense-utils.inc:536
 msgid "Error creating socket!"
 msgstr ""
 
-#: src/etc/inc/pfsense-utils.inc:546
+#: src/etc/inc/pfsense-utils.inc:537
 #, php-format
 msgid "Error code is '%1$s' - %2$s"
 msgstr ""
 
-#: src/etc/inc/pfsense-utils.inc:551
+#: src/etc/inc/pfsense-utils.inc:542
 #, php-format
 msgid "setsockopt() failed, error: %s"
 msgstr ""
 
-#: src/etc/inc/pfsense-utils.inc:555
+#: src/etc/inc/pfsense-utils.inc:546
 #, php-format
-msgid "Magic Packet sent (%1$s) to {%2$s} MAC=%3$s"
+msgid "Magic Packet sent (%1$s) to (%2$s) MAC=%3$s"
 msgstr ""
 
-#: src/etc/inc/pfsense-utils.inc:619 src/etc/inc/pfsense-utils.inc:641
+#: src/etc/inc/pfsense-utils.inc:610 src/etc/inc/pfsense-utils.inc:632
 #, php-format
 msgid "Restored %s of config file (maybe from CARP partner)"
 msgstr ""
 
-#: src/etc/inc/pfsense-utils.inc:776
+#: src/etc/inc/pfsense-utils.inc:767
 msgid "reload_interfaces_sync() is starting."
 msgstr ""
 
-#: src/etc/inc/pfsense-utils.inc:785
+#: src/etc/inc/pfsense-utils.inc:776
 msgid "Enabling system routing"
 msgstr ""
 
-#: src/etc/inc/pfsense-utils.inc:789
+#: src/etc/inc/pfsense-utils.inc:780
 msgid "Cleaning up Interfaces"
 msgstr ""
 
-#: src/etc/inc/pfsense-utils.inc:1189
+#: src/etc/inc/pfsense-utils.inc:1182
 msgid "No history data found!"
 msgstr ""
 
-#: src/etc/inc/pfsense-utils.inc:1321
+#: src/etc/inc/pfsense-utils.inc:1314
 msgid "device not present! Is the modem attached to the system?"
 msgstr ""
 
-#: src/etc/inc/pfsense-utils.inc:1390
+#: src/etc/inc/pfsense-utils.inc:1383
 msgid "running"
 msgstr ""
 
-#: src/etc/inc/pfsense-utils.inc:1391 src/usr/local/www/graph.php:229
+#: src/etc/inc/pfsense-utils.inc:1384 src/usr/local/www/graph.php:229
 msgid "up"
 msgstr ""
 
-#: src/etc/inc/pfsense-utils.inc:1436
+#: src/etc/inc/pfsense-utils.inc:1429
 msgid "blocking"
 msgstr ""
 
-#: src/etc/inc/pfsense-utils.inc:1436
+#: src/etc/inc/pfsense-utils.inc:1429
 msgid "check for ethernet loops"
 msgstr ""
 
-#: src/etc/inc/pfsense-utils.inc:1439
+#: src/etc/inc/pfsense-utils.inc:1432
 msgid "learning"
 msgstr ""
 
-#: src/etc/inc/pfsense-utils.inc:1442
+#: src/etc/inc/pfsense-utils.inc:1435
 msgid "forwarding"
 msgstr ""
 
-#: src/etc/inc/pfsense-utils.inc:1576
+#: src/etc/inc/pfsense-utils.inc:1569
 #, php-format
 msgid "DNSCACHE: Found old IP %1$s and new IP %2$s"
 msgstr ""
 
-#: src/etc/inc/pfsense-utils.inc:2010
-msgid ""
-"Alias archive is a .zip file which cannot be decompressed because utility is "
-"missing!"
+#: src/etc/inc/pfsense-utils.inc:1589
+#, php-format
+msgid "Loading %s cryptographic accelerator module."
+msgstr ""
+
+#: src/etc/inc/pfsense-utils.inc:1606
+#, php-format
+msgid "Loading %s thermal monitor module."
+msgstr ""
+
+#: src/etc/inc/pfsense-utils.inc:1682 src/etc/inc/pfsense-utils.inc:1737
+#, php-format
+msgid "Download file failed with status code %1$s. URL: %2$s"
+msgstr ""
+
+#: src/etc/inc/pfsense-utils.inc:1934
+#, php-format
+msgid "Could not process aliases from alias: %s"
+msgstr ""
+
+#: src/etc/inc/pfsense-utils.inc:1991
+#, php-format
+msgid "Failed to download alias %s"
 msgstr ""
 
-#: src/etc/inc/pfsense-utils.inc:2043
+#: src/etc/inc/pfsense-utils.inc:2020
 msgid ""
 "Alias archive is a .tar/tgz file which cannot be decompressed because "
 "utility is missing!"
 msgstr ""
 
-#: src/etc/inc/pfsense-utils.inc:2778
+#: src/etc/inc/pfsense-utils.inc:2030
+#, php-format
+msgid "Could not open %s/aliases for writing!"
+msgstr ""
+
+#: src/etc/inc/pfsense-utils.inc:2036
+#, php-format
+msgid "The following file could not be read %1$s from %2$s"
+msgstr ""
+
+#: src/etc/inc/pfsense-utils.inc:2750
 msgid "English"
 msgstr ""
 
-#: src/etc/inc/pfsense-utils.inc:2779
+#: src/etc/inc/pfsense-utils.inc:2751
 msgid "Portuguese (Brazil)"
 msgstr ""
 
-#: src/etc/inc/pfsense-utils.inc:2780
+#: src/etc/inc/pfsense-utils.inc:2752
 msgid "Turkish"
 msgstr ""
 
+#: src/etc/inc/pfsense-utils.inc:2938 src/etc/inc/pfsense-utils.inc:2953
+#: src/etc/inc/pfsense-utils.inc:2978
+msgid "No Service"
+msgstr ""
+
+#: src/etc/inc/pfsense-utils.inc:2948 src/etc/inc/pfsense-utils.inc:2990
+#: src/usr/local/www/firewall_nat_out.php:262
+#: src/usr/local/www/firewall_nat_out.php:266
+#: src/usr/local/www/interfaces.php:864 src/usr/local/www/interfaces.php:2926
+#: src/usr/local/www/interfaces_wireless.php:134
+#: src/usr/local/www/interfaces_wireless_edit.php:115
+#: src/usr/local/www/interfaces_wireless_edit.php:221
+#: src/usr/local/www/load_balancer_pool.php:155
+#: src/usr/local/www/load_balancer_pool_edit.php:107
+#: src/usr/local/www/load_balancer_pool_edit.php:354
+#: src/usr/local/www/load_balancer_virtual_server_edit.php:104
+#: src/usr/local/www/load_balancer_virtual_server_edit.php:109
+#: src/usr/local/www/status_lb_pool.php:163 src/usr/local/www/vpn_ipsec.php:284
+#: src/usr/local/www/vpn_ipsec.php:426
+#: src/usr/local/www/vpn_ipsec_phase2.php:542
+msgid "Mode"
+msgstr ""
+
+#: src/etc/inc/pfsense-utils.inc:2954
+msgid "Restricted Service"
+msgstr ""
+
+#: src/etc/inc/pfsense-utils.inc:2955
+msgid "Valid Service"
+msgstr ""
+
+#: src/etc/inc/pfsense-utils.inc:2956
+msgid "Restricted Regional Service"
+msgstr ""
+
+#: src/etc/inc/pfsense-utils.inc:2957
+msgid "Powersaving Service"
+msgstr ""
+
+#: src/etc/inc/pfsense-utils.inc:2963
+msgid "Invalid SIM/locked State"
+msgstr ""
+
+#: src/etc/inc/pfsense-utils.inc:2964
+msgid "Valid SIM State"
+msgstr ""
+
+#: src/etc/inc/pfsense-utils.inc:2965
+msgid "Invalid SIM CS State"
+msgstr ""
+
+#: src/etc/inc/pfsense-utils.inc:2966
+msgid "Invalid SIM PS State"
+msgstr ""
+
+#: src/etc/inc/pfsense-utils.inc:2967
+msgid "Invalid SIM CS/PS State"
+msgstr ""
+
+#: src/etc/inc/pfsense-utils.inc:2968
+msgid "Missing SIM State"
+msgstr ""
+
+#: src/etc/inc/pfsense-utils.inc:2979
+msgid "Limited Service"
+msgstr ""
+
+#: src/etc/inc/pfsense-utils.inc:2995
+msgid "Initializing Service"
+msgstr ""
+
+#: src/etc/inc/pfsense-utils.inc:2996
+msgid "Network Lock error Service"
+msgstr ""
+
+#: src/etc/inc/pfsense-utils.inc:2997
+msgid "Network Locked Service"
+msgstr ""
+
+#: src/etc/inc/pfsense-utils.inc:2998
+msgid "Unlocked or correct MCC/MNC Service"
+msgstr ""
+
+#: src/etc/inc/pfsense-utils.inc:3004
+msgid "No action State"
+msgstr ""
+
+#: src/etc/inc/pfsense-utils.inc:3005
+msgid "Network lock State"
+msgstr ""
+
+#: src/etc/inc/pfsense-utils.inc:3006
+msgid "(U)SIM card lock State"
+msgstr ""
+
+#: src/etc/inc/pfsense-utils.inc:3007
+msgid "Network Lock and (U)SIM card Lock State"
+msgstr ""
+
 #: src/etc/inc/pkg-utils.inc:79
 msgid "Warning, could not open log for writing."
 msgstr ""
@@ -1646,163 +3098,215 @@ msgstr ""
 msgid "ERROR: Error trying to get package version. Aborting..."
 msgstr ""
 
-#: src/etc/inc/pkg-utils.inc:462
+#: src/etc/inc/pkg-utils.inc:480
+#, php-format
+msgid "Running last steps of %s installation."
+msgstr ""
+
+#: src/etc/inc/pkg-utils.inc:493
 msgid "Resyncing configuration for all packages."
 msgstr ""
 
-#: src/etc/inc/pkg-utils.inc:485
+#: src/etc/inc/pkg-utils.inc:516
 msgid "Syncing packages..."
 msgstr ""
 
-#: src/etc/inc/pkg-utils.inc:508
+#: src/etc/inc/pkg-utils.inc:539
 msgid "Removing package..."
 msgstr ""
 
-#: src/etc/inc/pkg-utils.inc:541
+#: src/etc/inc/pkg-utils.inc:572
 #, php-format
 msgid ""
 "The %s package is missing its configuration file and must be reinstalled."
 msgstr ""
 
-#: src/etc/inc/pkg-utils.inc:654
+#: src/etc/inc/pkg-utils.inc:588
+#, php-format
+msgid "Reinstalling package %1$s because its include file(%2$s) is missing!"
+msgstr ""
+
+#: src/etc/inc/pkg-utils.inc:591
+#, php-format
+msgid "Reinstalling package %s failed. Take appropriate measures!!!"
+msgstr ""
+
+#: src/etc/inc/pkg-utils.inc:685
 msgid "Beginning package installation."
 msgstr ""
 
-#: src/etc/inc/pkg-utils.inc:655
+#: src/etc/inc/pkg-utils.inc:686
 #, php-format
 msgid "Beginning package installation for %s ."
 msgstr ""
 
-#: src/etc/inc/pkg-utils.inc:659
+#: src/etc/inc/pkg-utils.inc:690
 msgid "Saving updated package information..."
 msgstr ""
 
-#: src/etc/inc/pkg-utils.inc:662
+#: src/etc/inc/pkg-utils.inc:693
 #, php-format
 msgid "Installed %s package."
 msgstr ""
 
-#: src/etc/inc/pkg-utils.inc:666
+#: src/etc/inc/pkg-utils.inc:697
 #, php-format
 msgid "Overwrote previous installation of %s."
 msgstr ""
 
-#: src/etc/inc/pkg-utils.inc:667
+#: src/etc/inc/pkg-utils.inc:698
 msgid "overwrite!"
 msgstr ""
 
-#: src/etc/inc/pkg-utils.inc:675
+#: src/etc/inc/pkg-utils.inc:701
+#, php-format
+msgid "Intermediate config write during package install for %s."
+msgstr ""
+
+#: src/etc/inc/pkg-utils.inc:706
 #, php-format
 msgid "The %s package is not installed.%sInstallation aborted."
 msgstr ""
 
-#: src/etc/inc/pkg-utils.inc:679 src/etc/inc/pkg-utils.inc:711
-#: src/etc/inc/pkg-utils.inc:777
+#: src/etc/inc/pkg-utils.inc:710 src/etc/inc/pkg-utils.inc:742
+#: src/etc/inc/pkg-utils.inc:808
 #, php-format
 msgid "Failed to install package: %s."
 msgstr ""
 
-#: src/etc/inc/pkg-utils.inc:680 src/etc/inc/pkg-utils.inc:712
-#: src/etc/inc/pkg-utils.inc:778
+#: src/etc/inc/pkg-utils.inc:711 src/etc/inc/pkg-utils.inc:743
+#: src/etc/inc/pkg-utils.inc:809
 msgid "Failed to install package."
 msgstr ""
 
-#: src/etc/inc/pkg-utils.inc:685
+#: src/etc/inc/pkg-utils.inc:716
 msgid "Loading package configuration... "
 msgstr ""
 
-#: src/etc/inc/pkg-utils.inc:688
+#: src/etc/inc/pkg-utils.inc:719
 msgid "Configuring package components..."
 msgstr ""
 
-#: src/etc/inc/pkg-utils.inc:700 src/etc/inc/pkg-utils.inc:874
+#: src/etc/inc/pkg-utils.inc:731 src/etc/inc/pkg-utils.inc:905
 msgid "Loading package instructions..."
 msgstr ""
 
-#: src/etc/inc/pkg-utils.inc:718
+#: src/etc/inc/pkg-utils.inc:738
+#, php-format
+msgid "Include %s is missing!"
+msgstr ""
+
+#: src/etc/inc/pkg-utils.inc:749
 msgid "Custom commands..."
 msgstr ""
 
-#: src/etc/inc/pkg-utils.inc:721
+#: src/etc/inc/pkg-utils.inc:752
 msgid "Executing custom_php_global_functions()..."
 msgstr ""
 
-#: src/etc/inc/pkg-utils.inc:726
+#: src/etc/inc/pkg-utils.inc:757
 msgid "Executing custom_php_install_command()..."
 msgstr ""
 
-#: src/etc/inc/pkg-utils.inc:731
+#: src/etc/inc/pkg-utils.inc:762
 msgid "Executing custom_php_resync_config_command()..."
 msgstr ""
 
-#: src/etc/inc/pkg-utils.inc:738 src/etc/inc/pkg-utils.inc:822
+#: src/etc/inc/pkg-utils.inc:769 src/etc/inc/pkg-utils.inc:853
 msgid "Menu items... "
 msgstr ""
 
-#: src/etc/inc/pkg-utils.inc:755 src/etc/inc/pkg-utils.inc:837
+#: src/etc/inc/pkg-utils.inc:786 src/etc/inc/pkg-utils.inc:868
 msgid "Services... "
 msgstr ""
 
-#: src/etc/inc/pkg-utils.inc:772
+#: src/etc/inc/pkg-utils.inc:803
 msgid "Loading package configuration... failed!"
 msgstr ""
 
-#: src/etc/inc/pkg-utils.inc:772
+#: src/etc/inc/pkg-utils.inc:803
 msgid "Installation aborted."
 msgstr ""
 
-#: src/etc/inc/pkg-utils.inc:773
+#: src/etc/inc/pkg-utils.inc:804
 msgid "Unable to load package configuration. Installation aborted."
 msgstr ""
 
-#: src/etc/inc/pkg-utils.inc:787
+#: src/etc/inc/pkg-utils.inc:818
 msgid "Writing configuration... "
 msgstr ""
 
-#: src/etc/inc/pkg-utils.inc:789
+#: src/etc/inc/pkg-utils.inc:820
 #, php-format
 msgid "Successfully installed package: %s."
 msgstr ""
 
-#: src/etc/inc/pkg-utils.inc:805
+#: src/etc/inc/pkg-utils.inc:836
 #, php-format
 msgid "The %s package is not installed.%sDeletion aborted."
 msgstr ""
 
-#: src/etc/inc/pkg-utils.inc:811
+#: src/etc/inc/pkg-utils.inc:842
 #, php-format
 msgid "Removing %s package... "
 msgstr ""
 
-#: src/etc/inc/pkg-utils.inc:812
+#: src/etc/inc/pkg-utils.inc:843
 #, php-format
 msgid "Removing %s components..."
 msgstr ""
 
-#: src/etc/inc/pkg-utils.inc:899
+#: src/etc/inc/pkg-utils.inc:896
+#, php-format
+msgid "Intermediate config write during package removal for %s."
+msgstr ""
+
+#: src/etc/inc/pkg-utils.inc:912
+#, php-format
+msgid "Include file %s could not be found for inclusion."
+msgstr ""
+
+#: src/etc/inc/pkg-utils.inc:930
 msgid "Deinstall commands... "
 msgstr ""
 
-#: src/etc/inc/pkg-utils.inc:919
-msgid "Configuration... "
+#: src/etc/inc/pkg-utils.inc:935
+msgid "Not executing custom deinstall hook because an include is missing."
+msgstr ""
+
+#: src/etc/inc/pkg-utils.inc:942
+msgid "Syslog entries... "
 msgstr ""
 
 #: src/etc/inc/pkg-utils.inc:950
+msgid "Configuration... "
+msgstr ""
+
+#: src/etc/inc/pkg-utils.inc:953
+#, php-format
+msgid "Removed %s package."
+msgstr ""
+
+#: src/etc/inc/pkg-utils.inc:981
 msgid ""
-"Waiting for internet connection to update pkg metadata and fini package "
+"Waiting for internet connection to update pkg metadata and finish package "
 "reinstallation"
 msgstr ""
 
-#: src/etc/inc/pkg-utils.inc:979
+#: src/etc/inc/pkg-utils.inc:1010
 msgid "Package reinstall"
 msgstr ""
 
-#: src/etc/inc/pkg-utils.inc:980
+#: src/etc/inc/pkg-utils.inc:1011
 #, php-format
 msgid ""
 "Package %s does not exist in current %s version and it has been removed."
 msgstr ""
 
+#: src/etc/inc/pkg-utils.inc:1037
+msgid "Stopping all packages."
+msgstr ""
+
 #: src/etc/inc/priv/user.priv.inc:6
 msgid "User - Services: Captive Portal login"
 msgstr ""
@@ -1816,7 +3320,7 @@ msgid "WebCfg - Help pages"
 msgstr ""
 
 #: src/etc/inc/priv/user.priv.inc:11
-msgid "Show all items on help menu"
+msgid "Show all items on help menu and allow access to Help shortcut links"
 msgstr ""
 
 #: src/etc/inc/priv/user.priv.inc:16
@@ -1899,11 +3403,11 @@ msgid "Indicates whether the user is allowed to dial in via PPPOE"
 msgstr ""
 
 #: src/etc/inc/priv/user.priv.inc:70
-msgid "WebCfg - Status: System logs: Portal Auth"
+msgid "WebCfg - Status: System Logs: Portal Auth"
 msgstr ""
 
 #: src/etc/inc/priv/user.priv.inc:71
-msgid "Allow access to the 'Status: System logs: Portal Auth' page."
+msgid "Allow access to the 'Status: System Logs: Portal Auth' page."
 msgstr ""
 
 #: src/etc/inc/priv/user.priv.inc:76
@@ -1931,51 +3435,51 @@ msgid "Allow access to the 'Status: Logs: System: Resolver' page."
 msgstr ""
 
 #: src/etc/inc/priv/user.priv.inc:94 src/etc/inc/priv/user.priv.inc:112
-msgid "WebCfg - Status: System logs: IPsec VPN"
+msgid "WebCfg - Status: System Logs: IPsec VPN"
 msgstr ""
 
 #: src/etc/inc/priv/user.priv.inc:95 src/etc/inc/priv/user.priv.inc:113
-msgid "Allow access to the 'Status: System logs: IPsec VPN' page."
+msgid "Allow access to the 'Status: System Logs: IPsec VPN' page."
 msgstr ""
 
 #: src/etc/inc/priv/user.priv.inc:100
-msgid "WebCfg - Status: System logs: NTP"
+msgid "WebCfg - Status: System Logs: NTP"
 msgstr ""
 
 #: src/etc/inc/priv/user.priv.inc:101
-msgid "Allow access to the 'Status: System logs: NTP' page."
+msgid "Allow access to the 'Status: System Logs: NTP' page."
 msgstr ""
 
 #: src/etc/inc/priv/user.priv.inc:106
-msgid "WebCfg - Status: System logs: OpenVPN"
+msgid "WebCfg - Status: System Logs: OpenVPN"
 msgstr ""
 
 #: src/etc/inc/priv/user.priv.inc:107
-msgid "Allow access to the 'Status: System logs: OpenVPN' page."
+msgid "Allow access to the 'Status: System Logs: OpenVPN' page."
 msgstr ""
 
 #: src/etc/inc/priv/user.priv.inc:118
-msgid "WebCfg - Status: System logs: Load Balancer"
+msgid "WebCfg - Status: System Logs: Load Balancer"
 msgstr ""
 
 #: src/etc/inc/priv/user.priv.inc:119
-msgid "Allow access to the 'Status: System logs: Load Balancer' page."
+msgid "Allow access to the 'Status: System Logs: Load Balancer' page."
 msgstr ""
 
 #: src/etc/inc/priv/user.priv.inc:124
-msgid "WebCfg - Status: System logs: Routing"
+msgid "WebCfg - Status: System Logs: Routing"
 msgstr ""
 
 #: src/etc/inc/priv/user.priv.inc:125
-msgid "Allow access to the 'Status: System logs: System: Routing' page."
+msgid "Allow access to the 'Status: System Logs: System: Routing' page."
 msgstr ""
 
 #: src/etc/inc/priv/user.priv.inc:130
-msgid "WebCfg - Status: System logs: Wireless"
+msgid "WebCfg - Status: System Logs: Wireless"
 msgstr ""
 
 #: src/etc/inc/priv/user.priv.inc:131
-msgid "Allow access to the 'Status: System logs: System: Wireless' page."
+msgid "Allow access to the 'Status: System Logs: System: Wireless' page."
 msgstr ""
 
 #: src/etc/inc/priv.defs.inc:17
@@ -2019,11 +3523,11 @@ msgid "Allow access to the 'Diagnostics: Authentication' page."
 msgstr ""
 
 #: src/etc/inc/priv.defs.inc:47
-msgid "WebCfg - Diagnostics: Backup/restore"
+msgid "WebCfg - Diagnostics: Backup & Restore"
 msgstr ""
 
 #: src/etc/inc/priv.defs.inc:48
-msgid "Allow access to the 'Diagnostics: Backup/restore' page."
+msgid "Allow access to the 'Diagnostics: Backup & Restore' page."
 msgstr ""
 
 #: src/etc/inc/priv.defs.inc:53
@@ -2091,19 +3595,19 @@ msgid "Allow access to the 'Status: IPsec: Leases' page."
 msgstr ""
 
 #: src/etc/inc/priv.defs.inc:101
-msgid "WebCfg - Status: IPsec: SAD"
+msgid "WebCfg - Status: IPsec: SADs"
 msgstr ""
 
 #: src/etc/inc/priv.defs.inc:102
-msgid "Allow access to the 'Status: IPsec: SAD' page."
+msgid "Allow access to the 'Status: IPsec: SADs' page."
 msgstr ""
 
 #: src/etc/inc/priv.defs.inc:107
-msgid "WebCfg - Status: IPsec: SPD"
+msgid "WebCfg - Status: IPsec: SPDs"
 msgstr ""
 
 #: src/etc/inc/priv.defs.inc:108
-msgid "Allow access to the 'Status: IPsec: SPD' page."
+msgid "Allow access to the 'Status: IPsec: SPDs' page."
 msgstr ""
 
 #: src/etc/inc/priv.defs.inc:113
@@ -2227,11 +3731,11 @@ msgid "Allow access to the 'Diagnostics: Routing tables' page."
 msgstr ""
 
 #: src/etc/inc/priv.defs.inc:203
-msgid "WebCfg - Diagnostics: S.M.A.R.T. Monitor Tools"
+msgid "WebCfg - Diagnostics: S.M.A.R.T. Status"
 msgstr ""
 
 #: src/etc/inc/priv.defs.inc:204
-msgid "Allow access to the 'Diagnostics: S.M.A.R.T. Monitor Tools' page."
+msgid "Allow access to the 'Diagnostics: S.M.A.R.T. Status' page."
 msgstr ""
 
 #: src/etc/inc/priv.defs.inc:209
@@ -2451,11 +3955,11 @@ msgid "Allow access to the 'Firewall: Traffic Shaper: Queues' page."
 msgstr ""
 
 #: src/etc/inc/priv.defs.inc:373
-msgid "WebCfg - Firewall: Traffic Shaper: Limiter"
+msgid "WebCfg - Firewall: Traffic Shaper: Limiters"
 msgstr ""
 
 #: src/etc/inc/priv.defs.inc:374
-msgid "Allow access to the 'Firewall: Traffic Shaper: Limiter' page."
+msgid "Allow access to the 'Firewall: Traffic Shaper: Limiters' page."
 msgstr ""
 
 #: src/etc/inc/priv.defs.inc:379
@@ -2547,11 +4051,11 @@ msgid "Allow access to the 'Interfaces' page."
 msgstr ""
 
 #: src/etc/inc/priv.defs.inc:446
-msgid "WebCfg - Interfaces: Assign network ports"
+msgid "WebCfg - Interfaces: Interface Assignments"
 msgstr ""
 
 #: src/etc/inc/priv.defs.inc:447
-msgid "Allow access to the 'Interfaces: Assign network ports' page."
+msgid "Allow access to the 'Interfaces: Interface Assignments' page."
 msgstr ""
 
 #: src/etc/inc/priv.defs.inc:452
@@ -2925,11 +4429,11 @@ msgid "Allow access to the 'Services: DHCP Server' page."
 msgstr ""
 
 #: src/etc/inc/priv.defs.inc:728
-msgid "WebCfg - Services: DHCP Server: Edit static mapping"
+msgid "WebCfg - Services: DHCP Server: Edit Static Mapping"
 msgstr ""
 
 #: src/etc/inc/priv.defs.inc:729
-msgid "Allow access to the 'Services: DHCP Server: Edit static mapping' page."
+msgid "Allow access to the 'Services: DHCP Server: Edit Static Mapping' page."
 msgstr ""
 
 #: src/etc/inc/priv.defs.inc:734
@@ -2949,12 +4453,12 @@ msgid "Allow access to the 'Services: DHCPv6 server' page."
 msgstr ""
 
 #: src/etc/inc/priv.defs.inc:746
-msgid "WebCfg - Services: DHCPv6 Server: Edit static mapping"
+msgid "WebCfg - Services: DHCPv6 Server: Edit Static Mapping"
 msgstr ""
 
 #: src/etc/inc/priv.defs.inc:747
 msgid ""
-"Allow access to the 'Services: DHCPv6 Server : Edit static mapping' page."
+"Allow access to the 'Services: DHCPv6 Server : Edit Static Mapping' page."
 msgstr ""
 
 #: src/etc/inc/priv.defs.inc:752
@@ -3023,11 +4527,11 @@ msgid "Allow access to the 'Services: IGMP Proxy: Edit' page."
 msgstr ""
 
 #: src/etc/inc/priv.defs.inc:800
-msgid "WebCfg - Services: NTP"
+msgid "WebCfg - Services: NTP Settings"
 msgstr ""
 
 #: src/etc/inc/priv.defs.inc:801
-msgid "Allow access to the 'Services: NTP' page."
+msgid "Allow access to the 'Services: NTP Settings' page."
 msgstr ""
 
 #: src/etc/inc/priv.defs.inc:806
@@ -3120,19 +4624,19 @@ msgid "Allow access to the 'Services: DNS Resolver: Edit host' page."
 msgstr ""
 
 #: src/etc/inc/priv.defs.inc:872
-msgid "WebCfg - Services: Wake on LAN"
+msgid "WebCfg - Services: Wake-on-LAN"
 msgstr ""
 
 #: src/etc/inc/priv.defs.inc:873
-msgid "Allow access to the 'Services: Wake on LAN' page."
+msgid "Allow access to the 'Services: Wake-on-LAN' page."
 msgstr ""
 
 #: src/etc/inc/priv.defs.inc:878
-msgid "WebCfg - Services: Wake on LAN: Edit"
+msgid "WebCfg - Services: Wake-on-LAN: Edit"
 msgstr ""
 
 #: src/etc/inc/priv.defs.inc:879
-msgid "Allow access to the 'Services: Wake on LAN: Edit' page."
+msgid "Allow access to the 'Services: Wake-on-LAN: Edit' page."
 msgstr ""
 
 #: src/etc/inc/priv.defs.inc:884
@@ -3288,402 +4792,386 @@ msgid "Allow access to the 'Status: Traffic shaper: Queues' page."
 msgstr ""
 
 #: src/etc/inc/priv.defs.inc:1001
-msgid "WebCfg - Status: RRD Graphs"
-msgstr ""
-
-#: src/etc/inc/priv.defs.inc:1002
-msgid "Allow access to the 'Status: RRD Graphs' page."
-msgstr ""
-
-#: src/etc/inc/priv.defs.inc:1008
-msgid "WebCfg - Status: RRD Graphs: Settings"
-msgstr ""
-
-#: src/etc/inc/priv.defs.inc:1009
-msgid "Allow access to the 'Status: RRD Graphs: Settings' page."
-msgstr ""
-
-#: src/etc/inc/priv.defs.inc:1014
 msgid "WebCfg - Status: Services"
 msgstr ""
 
-#: src/etc/inc/priv.defs.inc:1015
+#: src/etc/inc/priv.defs.inc:1002
 msgid "Allow access to the 'Status: Services' page."
 msgstr ""
 
-#: src/etc/inc/priv.defs.inc:1020
+#: src/etc/inc/priv.defs.inc:1007
 msgid "WebCfg - Status: UPnP Status"
 msgstr ""
 
-#: src/etc/inc/priv.defs.inc:1021
+#: src/etc/inc/priv.defs.inc:1008
 msgid "Allow access to the 'Status: UPnP Status' page."
 msgstr ""
 
-#: src/etc/inc/priv.defs.inc:1026
+#: src/etc/inc/priv.defs.inc:1013
 msgid "WebCfg - Status: Wireless"
 msgstr ""
 
-#: src/etc/inc/priv.defs.inc:1027
+#: src/etc/inc/priv.defs.inc:1014
 msgid "Allow access to the 'Status: Wireless' page."
 msgstr ""
 
-#: src/etc/inc/priv.defs.inc:1032
+#: src/etc/inc/priv.defs.inc:1019
 msgid "WebCfg - System: General Setup"
 msgstr ""
 
-#: src/etc/inc/priv.defs.inc:1033
+#: src/etc/inc/priv.defs.inc:1020
 msgid "Allow access to the 'System: General Setup' page."
 msgstr ""
 
-#: src/etc/inc/priv.defs.inc:1038
+#: src/etc/inc/priv.defs.inc:1025
 msgid "WebCfg - System: Advanced: Admin Access Page"
 msgstr ""
 
-#: src/etc/inc/priv.defs.inc:1039
+#: src/etc/inc/priv.defs.inc:1026
 msgid "Allow access to the 'System: Advanced: Admin Access' page."
 msgstr ""
 
-#: src/etc/inc/priv.defs.inc:1044
+#: src/etc/inc/priv.defs.inc:1031
 msgid "WebCfg - System: Advanced: Firewall and NAT"
 msgstr ""
 
-#: src/etc/inc/priv.defs.inc:1045
+#: src/etc/inc/priv.defs.inc:1032
 msgid "Allow access to the 'System: Advanced: Firewall and NAT' page."
 msgstr ""
 
-#: src/etc/inc/priv.defs.inc:1050
+#: src/etc/inc/priv.defs.inc:1037
 msgid "WebCfg - System: Advanced: Miscellaneous"
 msgstr ""
 
-#: src/etc/inc/priv.defs.inc:1051
+#: src/etc/inc/priv.defs.inc:1038
 msgid "Allow access to the 'System: Advanced: Miscellaneous' page."
 msgstr ""
 
-#: src/etc/inc/priv.defs.inc:1056
+#: src/etc/inc/priv.defs.inc:1043
 msgid "WebCfg - System: Advanced: Networking"
 msgstr ""
 
-#: src/etc/inc/priv.defs.inc:1057
+#: src/etc/inc/priv.defs.inc:1044
 msgid "Allow access to the 'System: Advanced: Networking' page."
 msgstr ""
 
-#: src/etc/inc/priv.defs.inc:1062
+#: src/etc/inc/priv.defs.inc:1049
 msgid "WebCfg - System: Advanced: Notifications"
 msgstr ""
 
-#: src/etc/inc/priv.defs.inc:1063
+#: src/etc/inc/priv.defs.inc:1050
 msgid "Allow access to the 'System: Advanced: Notifications' page."
 msgstr ""
 
-#: src/etc/inc/priv.defs.inc:1068
+#: src/etc/inc/priv.defs.inc:1055
 msgid "WebCfg - System: Advanced: Tunables"
 msgstr ""
 
-#: src/etc/inc/priv.defs.inc:1069
+#: src/etc/inc/priv.defs.inc:1056
 msgid "Allow access to the 'System: Advanced: Tunables' page."
 msgstr ""
 
-#: src/etc/inc/priv.defs.inc:1074
+#: src/etc/inc/priv.defs.inc:1061
 msgid "WebCfg - System: Authentication Servers"
 msgstr ""
 
-#: src/etc/inc/priv.defs.inc:1075
+#: src/etc/inc/priv.defs.inc:1062
 msgid "Allow access to the 'System: Authentication Servers' page."
 msgstr ""
 
-#: src/etc/inc/priv.defs.inc:1080
+#: src/etc/inc/priv.defs.inc:1067
 msgid "WebCfg - System: CA Manager"
 msgstr ""
 
-#: src/etc/inc/priv.defs.inc:1081
+#: src/etc/inc/priv.defs.inc:1068
 msgid "Allow access to the 'System: CA Manager' page."
 msgstr ""
 
-#: src/etc/inc/priv.defs.inc:1086
+#: src/etc/inc/priv.defs.inc:1073
 msgid "WebCfg - System: Certificate Manager"
 msgstr ""
 
-#: src/etc/inc/priv.defs.inc:1087
+#: src/etc/inc/priv.defs.inc:1074
 msgid "Allow access to the 'System: Certificate Manager' page."
 msgstr ""
 
-#: src/etc/inc/priv.defs.inc:1092
+#: src/etc/inc/priv.defs.inc:1079
 msgid "WebCfg - System: CRL Manager"
 msgstr ""
 
-#: src/etc/inc/priv.defs.inc:1093
+#: src/etc/inc/priv.defs.inc:1080
 msgid "Allow access to the 'System: CRL Manager' page."
 msgstr ""
 
-#: src/etc/inc/priv.defs.inc:1098
+#: src/etc/inc/priv.defs.inc:1085
 msgid "WebCfg - System: Gateway Groups"
 msgstr ""
 
-#: src/etc/inc/priv.defs.inc:1099
+#: src/etc/inc/priv.defs.inc:1086
 msgid "Allow access to the 'System: Gateway Groups' page."
 msgstr ""
 
-#: src/etc/inc/priv.defs.inc:1104
+#: src/etc/inc/priv.defs.inc:1091
 msgid "WebCfg - System: Gateways: Edit Gateway Groups"
 msgstr ""
 
-#: src/etc/inc/priv.defs.inc:1105
+#: src/etc/inc/priv.defs.inc:1092
 msgid "Allow access to the 'System: Gateways: Edit Gateway Groups' page."
 msgstr ""
 
-#: src/etc/inc/priv.defs.inc:1110
+#: src/etc/inc/priv.defs.inc:1097
 msgid "WebCfg - System: Gateways"
 msgstr ""
 
-#: src/etc/inc/priv.defs.inc:1111
+#: src/etc/inc/priv.defs.inc:1098
 msgid "Allow access to the 'System: Gateways' page."
 msgstr ""
 
-#: src/etc/inc/priv.defs.inc:1116
+#: src/etc/inc/priv.defs.inc:1103
 msgid "WebCfg - System: Gateways: Edit Gateway"
 msgstr ""
 
-#: src/etc/inc/priv.defs.inc:1117
+#: src/etc/inc/priv.defs.inc:1104
 msgid "Allow access to the 'System: Gateways: Edit Gateway' page."
 msgstr ""
 
-#: src/etc/inc/priv.defs.inc:1122
+#: src/etc/inc/priv.defs.inc:1109
 msgid "WebCfg - System: Group manager"
 msgstr ""
 
-#: src/etc/inc/priv.defs.inc:1123
+#: src/etc/inc/priv.defs.inc:1110
 msgid "Allow access to the 'System: Group manager' page."
 msgstr ""
 
-#: src/etc/inc/priv.defs.inc:1128
+#: src/etc/inc/priv.defs.inc:1115
 msgid "WebCfg - System: Group Manager: Add Privileges"
 msgstr ""
 
-#: src/etc/inc/priv.defs.inc:1129
+#: src/etc/inc/priv.defs.inc:1116
 msgid "Allow access to the 'System: Group Manager: Add Privileges' page."
 msgstr ""
 
-#: src/etc/inc/priv.defs.inc:1134
+#: src/etc/inc/priv.defs.inc:1121
 msgid "WebCfg - System: High Availability Sync"
 msgstr ""
 
-#: src/etc/inc/priv.defs.inc:1135
+#: src/etc/inc/priv.defs.inc:1122
 msgid "Allow access to the 'System: High Availability Sync' page."
 msgstr ""
 
-#: src/etc/inc/priv.defs.inc:1140
+#: src/etc/inc/priv.defs.inc:1127
 msgid "WebCfg - System: Static Routes"
 msgstr ""
 
-#: src/etc/inc/priv.defs.inc:1141
+#: src/etc/inc/priv.defs.inc:1128
 msgid "Allow access to the 'System: Static Routes' page."
 msgstr ""
 
-#: src/etc/inc/priv.defs.inc:1146
+#: src/etc/inc/priv.defs.inc:1133
 msgid "WebCfg - System: Static Routes: Edit route"
 msgstr ""
 
-#: src/etc/inc/priv.defs.inc:1147
+#: src/etc/inc/priv.defs.inc:1134
 msgid "Allow access to the 'System: Static Routes: Edit route' page."
 msgstr ""
 
-#: src/etc/inc/priv.defs.inc:1152
+#: src/etc/inc/priv.defs.inc:1139
 msgid "WebCfg - System: Update: Settings"
 msgstr ""
 
-#: src/etc/inc/priv.defs.inc:1153
+#: src/etc/inc/priv.defs.inc:1140
 msgid "Allow access to the 'System: Update: Settings' page."
 msgstr ""
 
-#: src/etc/inc/priv.defs.inc:1158
+#: src/etc/inc/priv.defs.inc:1145
 msgid "WebCfg - System: User Manager"
 msgstr ""
 
-#: src/etc/inc/priv.defs.inc:1159
+#: src/etc/inc/priv.defs.inc:1146
 msgid "Allow access to the 'System: User Manager' page."
 msgstr ""
 
-#: src/etc/inc/priv.defs.inc:1164
+#: src/etc/inc/priv.defs.inc:1151
 msgid "WebCfg - System: User Manager: Add Privileges"
 msgstr ""
 
-#: src/etc/inc/priv.defs.inc:1165
+#: src/etc/inc/priv.defs.inc:1152
 msgid "Allow access to the 'System: User Manager: Add Privileges' page."
 msgstr ""
 
-#: src/etc/inc/priv.defs.inc:1170
+#: src/etc/inc/priv.defs.inc:1157
 msgid "WebCfg - System: User Password Manager"
 msgstr ""
 
-#: src/etc/inc/priv.defs.inc:1171
+#: src/etc/inc/priv.defs.inc:1158
 msgid "Allow access to the 'System: User Password Manager' page."
 msgstr ""
 
-#: src/etc/inc/priv.defs.inc:1176
+#: src/etc/inc/priv.defs.inc:1163
 msgid "WebCfg - System: User Manager: Settings"
 msgstr ""
 
-#: src/etc/inc/priv.defs.inc:1177
+#: src/etc/inc/priv.defs.inc:1164
 msgid "Allow access to the 'System: User Manager: Settings' page."
 msgstr ""
 
-#: src/etc/inc/priv.defs.inc:1182
+#: src/etc/inc/priv.defs.inc:1169
 msgid "WebCfg - System: User Manager: Settings: LDAP Picker"
 msgstr ""
 
-#: src/etc/inc/priv.defs.inc:1183
+#: src/etc/inc/priv.defs.inc:1170
 msgid "Allow access to the 'System: User Manager: Settings: LDAP Picker' page."
 msgstr ""
 
-#: src/etc/inc/priv.defs.inc:1188
+#: src/etc/inc/priv.defs.inc:1175
 msgid "WebCfg - System: User Manager: Settings: Test LDAP"
 msgstr ""
 
-#: src/etc/inc/priv.defs.inc:1189
+#: src/etc/inc/priv.defs.inc:1176
 msgid "Allow access to the 'System: User Manager: Settings: Test LDAP' page."
 msgstr ""
 
-#: src/etc/inc/priv.defs.inc:1194
+#: src/etc/inc/priv.defs.inc:1181
 msgid "WebCfg - Hidden: Upload Configuration"
 msgstr ""
 
-#: src/etc/inc/priv.defs.inc:1195
+#: src/etc/inc/priv.defs.inc:1182
 msgid "Allow access to the 'Hidden: Upload Configuration' page."
 msgstr ""
 
-#: src/etc/inc/priv.defs.inc:1200
+#: src/etc/inc/priv.defs.inc:1187
 msgid "WebCfg - VPN: IPsec"
 msgstr ""
 
-#: src/etc/inc/priv.defs.inc:1201
+#: src/etc/inc/priv.defs.inc:1188
 msgid "Allow access to the 'VPN: IPsec' page."
 msgstr ""
 
-#: src/etc/inc/priv.defs.inc:1206
+#: src/etc/inc/priv.defs.inc:1193
 msgid "WebCfg - VPN: IPsec: Pre-Shared Keys List"
 msgstr ""
 
-#: src/etc/inc/priv.defs.inc:1207
+#: src/etc/inc/priv.defs.inc:1194
 msgid "Allow access to the 'VPN: IPsec: Pre-Shared Keys List' page."
 msgstr ""
 
-#: src/etc/inc/priv.defs.inc:1212
+#: src/etc/inc/priv.defs.inc:1199
 msgid "WebCfg - VPN: IPsec: Edit Pre-Shared Keys"
 msgstr ""
 
-#: src/etc/inc/priv.defs.inc:1213
+#: src/etc/inc/priv.defs.inc:1200
 msgid "Allow access to the 'VPN: IPsec: Edit Pre-Shared Keys' page."
 msgstr ""
 
-#: src/etc/inc/priv.defs.inc:1218
+#: src/etc/inc/priv.defs.inc:1205
 msgid "WebCfg - VPN: IPsec: Mobile"
 msgstr ""
 
-#: src/etc/inc/priv.defs.inc:1219
+#: src/etc/inc/priv.defs.inc:1206
 msgid "Allow access to the 'VPN: IPsec: Mobile' page."
 msgstr ""
 
-#: src/etc/inc/priv.defs.inc:1224
+#: src/etc/inc/priv.defs.inc:1211
 msgid "WebCfg - VPN: IPsec: Edit Phase 1"
 msgstr ""
 
-#: src/etc/inc/priv.defs.inc:1225
+#: src/etc/inc/priv.defs.inc:1212
 msgid "Allow access to the 'VPN: IPsec: Edit Phase 1' page."
 msgstr ""
 
-#: src/etc/inc/priv.defs.inc:1230
+#: src/etc/inc/priv.defs.inc:1217
 msgid "WebCfg - VPN: IPsec: Edit Phase 2"
 msgstr ""
 
-#: src/etc/inc/priv.defs.inc:1231
+#: src/etc/inc/priv.defs.inc:1218
 msgid "Allow access to the 'VPN: IPsec: Edit Phase 2' page."
 msgstr ""
 
-#: src/etc/inc/priv.defs.inc:1236
+#: src/etc/inc/priv.defs.inc:1223
 msgid "WebCfg - VPN: IPsec: Settings"
 msgstr ""
 
-#: src/etc/inc/priv.defs.inc:1237
+#: src/etc/inc/priv.defs.inc:1224
 msgid "Allow access to the 'VPN: IPsec: Settings' page."
 msgstr ""
 
-#: src/etc/inc/priv.defs.inc:1242
+#: src/etc/inc/priv.defs.inc:1229
 msgid "WebCfg - VPN: L2TP"
 msgstr ""
 
-#: src/etc/inc/priv.defs.inc:1243
+#: src/etc/inc/priv.defs.inc:1230
 msgid "Allow access to the 'VPN: L2TP' page."
 msgstr ""
 
-#: src/etc/inc/priv.defs.inc:1248
+#: src/etc/inc/priv.defs.inc:1235
 msgid "WebCfg - VPN: L2TP: Users"
 msgstr ""
 
-#: src/etc/inc/priv.defs.inc:1249
+#: src/etc/inc/priv.defs.inc:1236
 msgid "Allow access to the 'VPN: L2TP: Users' page."
 msgstr ""
 
-#: src/etc/inc/priv.defs.inc:1254
+#: src/etc/inc/priv.defs.inc:1241
 msgid "WebCfg - VPN: L2TP: Users: Edit"
 msgstr ""
 
-#: src/etc/inc/priv.defs.inc:1255
+#: src/etc/inc/priv.defs.inc:1242
 msgid "Allow access to the 'VPN: L2TP: Users: Edit' page."
 msgstr ""
 
-#: src/etc/inc/priv.defs.inc:1260
-msgid "WebCfg - OpenVPN: Client"
+#: src/etc/inc/priv.defs.inc:1247
+msgid "WebCfg - OpenVPN: Clients"
 msgstr ""
 
-#: src/etc/inc/priv.defs.inc:1261
-msgid "Allow access to the 'OpenVPN: Client' page."
+#: src/etc/inc/priv.defs.inc:1248
+msgid "Allow access to the 'OpenVPN: Clients' page."
 msgstr ""
 
-#: src/etc/inc/priv.defs.inc:1266
+#: src/etc/inc/priv.defs.inc:1253
 msgid "WebCfg - OpenVPN: Client Specific Override"
 msgstr ""
 
-#: src/etc/inc/priv.defs.inc:1267
+#: src/etc/inc/priv.defs.inc:1254
 msgid "Allow access to the 'OpenVPN: Client Specific Override' page."
 msgstr ""
 
-#: src/etc/inc/priv.defs.inc:1272
-msgid "WebCfg - OpenVPN: Server"
+#: src/etc/inc/priv.defs.inc:1259
+msgid "WebCfg - OpenVPN: Servers"
 msgstr ""
 
-#: src/etc/inc/priv.defs.inc:1273
-msgid "Allow access to the 'OpenVPN: Server' page."
+#: src/etc/inc/priv.defs.inc:1260
+msgid "Allow access to the 'OpenVPN: Servers' page."
 msgstr ""
 
-#: src/etc/inc/priv.defs.inc:1278
+#: src/etc/inc/priv.defs.inc:1265
 msgid "WebCfg - Services: PPPoE Server"
 msgstr ""
 
-#: src/etc/inc/priv.defs.inc:1279
+#: src/etc/inc/priv.defs.inc:1266
 msgid "Allow access to the 'Services: PPPoE Server' page."
 msgstr ""
 
-#: src/etc/inc/priv.defs.inc:1284
+#: src/etc/inc/priv.defs.inc:1271
 msgid "WebCfg - Services: PPPoE Server: Edit"
 msgstr ""
 
-#: src/etc/inc/priv.defs.inc:1285
+#: src/etc/inc/priv.defs.inc:1272
 msgid "Allow access to the 'Services: PPPoE Server: Edit' page."
 msgstr ""
 
-#: src/etc/inc/priv.defs.inc:1290
+#: src/etc/inc/priv.defs.inc:1277
 msgid "WebCfg - pfSense wizard subsystem"
 msgstr ""
 
-#: src/etc/inc/priv.defs.inc:1291
+#: src/etc/inc/priv.defs.inc:1278
 msgid "Allow access to the 'pfSense wizard subsystem' page."
 msgstr ""
 
-#: src/etc/inc/priv.defs.inc:1296
+#: src/etc/inc/priv.defs.inc:1283
 msgid "WebCfg - XMLRPC Library"
 msgstr ""
 
-#: src/etc/inc/priv.defs.inc:1297
+#: src/etc/inc/priv.defs.inc:1284
 msgid "Allow access to the 'XMLRPC Library' page."
 msgstr ""
 
@@ -3704,33 +5192,68 @@ msgstr ""
 msgid "Unexpected return value: %s"
 msgstr ""
 
-#: src/etc/inc/rrd.inc:64
+#: src/etc/inc/rrd.inc:60
+msgid "Absolute Timespans"
+msgstr ""
+
+#: src/etc/inc/rrd.inc:60
+msgid "Current Period"
+msgstr ""
+
+#: src/etc/inc/rrd.inc:60
+msgid "Previous Period"
+msgstr ""
+
+#: src/etc/inc/rrd.inc:71
+msgid "Inverse"
+msgstr ""
+
+#: src/etc/inc/rrd.inc:72
+msgid "Absolute"
+msgstr ""
+
+#: src/etc/inc/rrd.inc:81
 #, php-format
 msgid "RRD dump failed exited with %1$s, the error is: %2$s"
 msgstr ""
 
-#: src/etc/inc/rrd.inc:123
+#: src/etc/inc/rrd.inc:101
+#, php-format
+msgid "RRD restore failed exited with %1$s, the error is: %2$s"
+msgstr ""
+
+#: src/etc/inc/rrd.inc:112
+#, php-format
+msgid "Could not extract %s RRD xml file from archive!"
+msgstr ""
+
+#: src/etc/inc/rrd.inc:117
+#, php-format
+msgid "rrdtool restore -f '%1$s' '%2$s' failed returning %3$s."
+msgstr ""
+
+#: src/etc/inc/rrd.inc:140
 #, php-format
 msgid "RRD create failed exited with %1$s, the error is: %2$s"
 msgstr ""
 
-#: src/etc/inc/rrd.inc:138
+#: src/etc/inc/rrd.inc:155
 #, php-format
 msgid ""
 "Import RRD has %1$s DS values and %2$s RRA databases, new format RRD has "
 "%3$s DS values and %4$s RRA databases"
 msgstr ""
 
-#: src/etc/inc/rrd.inc:222
+#: src/etc/inc/rrd.inc:239
 #, php-format
 msgid "The new RRD now has %1$s DS values and %2$s RRA databases"
 msgstr ""
 
-#: src/etc/inc/rrd.inc:230
+#: src/etc/inc/rrd.inc:247
 msgid "Generating RRD graphs..."
 msgstr ""
 
-#: src/etc/inc/rrd.inc:1026
+#: src/etc/inc/rrd.inc:1051
 msgid "Creating rrd update script"
 msgstr ""
 
@@ -3739,19 +5262,20 @@ msgid "Router Advertisement Daemon"
 msgstr ""
 
 #: src/etc/inc/service-utils.inc:280 src/usr/local/www/diag_backup.php:559
-#: src/usr/local/www/head.inc:249 src/usr/local/www/services_dnsmasq.php:215
+#: src/usr/local/www/head.inc:286 src/usr/local/www/services_dnsmasq.php:215
 #: src/usr/local/www/services_dnsmasq_domainoverride_edit.php:153
 #: src/usr/local/www/services_dnsmasq_edit.php:232
 msgid "DNS Forwarder"
 msgstr ""
 
 #: src/etc/inc/service-utils.inc:287 src/usr/local/www/diag_backup.php:560
-#: src/usr/local/www/head.inc:250 src/usr/local/www/services_unbound.php:241
+#: src/usr/local/www/head.inc:287 src/usr/local/www/services_unbound.php:266
 #: src/usr/local/www/services_unbound_acls.php:208
 #: src/usr/local/www/services_unbound_advanced.php:221
 #: src/usr/local/www/services_unbound_domainoverride_edit.php:145
 #: src/usr/local/www/services_unbound_host_edit.php:233
 #: src/usr/local/www/status_logs.php:94
+#: src/usr/local/www/status_logs_common.inc:139
 msgid "DNS Resolver"
 msgstr ""
 
@@ -3760,32 +5284,34 @@ msgid "NTP clock sync"
 msgstr ""
 
 #: src/etc/inc/service-utils.inc:302 src/usr/local/www/diag_backup.php:557
-#: src/usr/local/www/head.inc:248 src/usr/local/www/head.inc:286
+#: src/usr/local/www/head.inc:285 src/usr/local/www/head.inc:323
 #: src/usr/local/www/services_captiveportal.php:96
 #: src/usr/local/www/services_captiveportal_filemanager.php:99
 #: src/usr/local/www/services_captiveportal_hostname.php:95
-#: src/usr/local/www/services_captiveportal_hostname_edit.php:80
+#: src/usr/local/www/services_captiveportal_hostname_edit.php:96
 #: src/usr/local/www/services_captiveportal_ip.php:94
-#: src/usr/local/www/services_captiveportal_ip_edit.php:83
+#: src/usr/local/www/services_captiveportal_ip_edit.php:98
 #: src/usr/local/www/services_captiveportal_mac.php:91
-#: src/usr/local/www/services_captiveportal_mac_edit.php:86
+#: src/usr/local/www/services_captiveportal_mac_edit.php:101
 #: src/usr/local/www/services_captiveportal_vouchers.php:111
-#: src/usr/local/www/services_captiveportal_vouchers_edit.php:71
+#: src/usr/local/www/services_captiveportal_vouchers_edit.php:86
 #: src/usr/local/www/services_captiveportal_zones.php:93
 #: src/usr/local/www/services_captiveportal_zones_edit.php:69
-#: src/usr/local/www/status_rrd_graph.php:460
-#: src/usr/local/www/status_rrd_graph_settings.php:80
-#: src/usr/local/www/status_rrd_graph_settings.php:169
-#: src/usr/local/www/system_certmanager.php:1088
+#: src/usr/local/www/status_captiveportal.php:125
+#: src/usr/local/www/status_captiveportal_expire.php:86
+#: src/usr/local/www/status_captiveportal_test.php:86
+#: src/usr/local/www/status_captiveportal_voucher_rolls.php:85
+#: src/usr/local/www/status_captiveportal_vouchers.php:85
+#: src/usr/local/www/system_certmanager.php:1090
 msgid "Captive Portal"
 msgstr ""
 
-#: src/etc/inc/service-utils.inc:320 src/usr/local/www/head.inc:251
+#: src/etc/inc/service-utils.inc:320 src/usr/local/www/head.inc:288
 #: src/usr/local/www/services_dhcp_relay.php:154
 msgid "DHCP Relay"
 msgstr ""
 
-#: src/etc/inc/service-utils.inc:327 src/usr/local/www/head.inc:252
+#: src/etc/inc/service-utils.inc:327 src/usr/local/www/head.inc:289
 #: src/usr/local/www/services_dhcpv6_relay.php:152
 msgid "DHCPv6 Relay"
 msgstr ""
@@ -3822,179 +5348,232 @@ msgstr ""
 msgid "Server load balancing daemon"
 msgstr ""
 
-#: src/etc/inc/service-utils.inc:452
+#: src/etc/inc/service-utils.inc:459
 msgid "Not available."
 msgstr ""
 
-#: src/etc/inc/service-utils.inc:486 src/usr/local/www/status_services.php:168
+#: src/etc/inc/service-utils.inc:493 src/usr/local/www/status_services.php:168
 msgid "Running"
 msgstr ""
 
-#: src/etc/inc/service-utils.inc:487 src/etc/inc/service-utils.inc:496
+#: src/etc/inc/service-utils.inc:494 src/etc/inc/service-utils.inc:503
 #, php-format
 msgid "%s Service is"
 msgstr ""
 
-#: src/etc/inc/service-utils.inc:495 src/usr/local/www/status_services.php:168
+#: src/etc/inc/service-utils.inc:502 src/usr/local/www/status_services.php:168
 msgid "Stopped"
 msgstr ""
 
-#: src/etc/inc/service-utils.inc:495
-#: src/usr/local/www/firewall_nat_edit.php:675
+#: src/etc/inc/service-utils.inc:502
+#: src/usr/local/www/firewall_nat_edit.php:669
 #: src/usr/local/www/firewall_nat_npt_edit.php:225
 #: src/usr/local/www/firewall_nat_out_edit.php:451
-#: src/usr/local/www/firewall_rules_edit.php:1099
-#: src/usr/local/www/interfaces.php:2595
-#: src/usr/local/www/interfaces_ppps_edit.php:728
+#: src/usr/local/www/firewall_rules_edit.php:1136
+#: 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:445
-#: src/usr/local/www/services_router_advertisements.php:137
-#: src/usr/local/www/system_gateways_edit.php:672
+#: src/usr/local/www/services_router_advertisements.php:141
+#: src/usr/local/www/system_gateways_edit.php:613
 #: src/usr/local/www/system_routes_edit.php:298
-#: src/usr/local/www/system_usermanager.php:497
-#: src/usr/local/www/system_usermanager.php:618
-#: src/usr/local/www/vpn_ipsec_phase1.php:666
+#: src/usr/local/www/system_usermanager.php:502
+#: src/usr/local/www/system_usermanager.php:620
+#: src/usr/local/www/vpn_ipsec_phase1.php:692
 #: src/usr/local/www/vpn_ipsec_phase2.php:535
-#: src/usr/local/www/vpn_openvpn_client.php:458
-#: src/usr/local/www/vpn_openvpn_csc.php:665
-#: src/usr/local/www/vpn_openvpn_server.php:626
+#: src/usr/local/www/vpn_openvpn_client.php:462
+#: src/usr/local/www/vpn_openvpn_csc.php:669
+#: src/usr/local/www/vpn_openvpn_server.php:630
 msgid "Disabled"
 msgstr ""
 
-#: src/etc/inc/service-utils.inc:535 src/etc/inc/service-utils.inc:587
+#: src/etc/inc/service-utils.inc:542 src/etc/inc/service-utils.inc:594
 #, php-format
 msgid "Restart %sService"
 msgstr ""
 
-#: src/etc/inc/service-utils.inc:546 src/etc/inc/service-utils.inc:600
+#: src/etc/inc/service-utils.inc:553 src/etc/inc/service-utils.inc:607
 #, php-format
 msgid "Stop %sService"
 msgstr ""
 
-#: src/etc/inc/service-utils.inc:551 src/etc/inc/service-utils.inc:606
+#: src/etc/inc/service-utils.inc:558 src/etc/inc/service-utils.inc:613
 #, php-format
 msgid "Start %sService"
 msgstr ""
 
-#: src/etc/inc/service-utils.inc:678
+#: src/etc/inc/service-utils.inc:685
 #, php-format
 msgid "%s has been started."
 msgstr ""
 
-#: src/etc/inc/service-utils.inc:748
+#: src/etc/inc/service-utils.inc:755
 #, php-format
 msgid "%s has been stopped."
 msgstr ""
 
-#: src/etc/inc/service-utils.inc:817
+#: src/etc/inc/service-utils.inc:824
 #, php-format
 msgid "%s has been restarted."
 msgstr ""
 
-#: src/etc/inc/services.inc:498
+#: src/etc/inc/services.inc:360
+msgid "Error: cannot open radvd.conf in services_radvd_configure()."
+msgstr ""
+
+#: src/etc/inc/services.inc:377
+msgid "Shutting down Router Advertisment daemon cleanly"
+msgstr ""
+
+#: src/etc/inc/services.inc:465
 #, php-format
 msgid "DHCP leases restore failed exited with %1$s, the error is: %2$s%3$s"
 msgstr ""
 
-#: src/etc/inc/services.inc:525
+#: src/etc/inc/services.inc:492
 msgid "Starting DHCP service..."
 msgstr ""
 
-#: src/etc/inc/services.inc:617
+#: src/etc/inc/services.inc:584
 msgid "Warning!  DHCP Failover setup and no CARP virtual IPs defined!"
 msgstr ""
 
-#: src/etc/inc/services.inc:784
+#: src/etc/inc/services.inc:751
 #, 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:1128
+#: src/etc/inc/services.inc:1095
 #, php-format
 msgid "Error: cannot open dhcpd.conf in services_dhcpdv4_configure().%s"
 msgstr ""
 
-#: src/etc/inc/services.inc:1641
+#: src/etc/inc/services.inc:1222
+#, php-format
+msgid "DHCP leases v6 restore failed exited with %1$s, the error is: %2$s"
+msgstr ""
+
+#: src/etc/inc/services.inc:1614
 msgid "Could not write Igmpproxy configuration file!"
 msgstr ""
 
-#: src/etc/inc/services.inc:1649
+#: src/etc/inc/services.inc:1622
 msgid "Started IGMP proxy service."
 msgstr ""
 
-#: src/etc/inc/services.inc:1673
+#: src/etc/inc/services.inc:1646
 msgid "Starting DHCP relay service..."
 msgstr ""
 
-#: src/etc/inc/services.inc:1807
+#: src/etc/inc/services.inc:1671
+msgid "No destination IP has been configured!"
+msgstr ""
+
+#: src/etc/inc/services.inc:1744
+msgid "No suitable interface found for running dhcrelay!"
+msgstr ""
+
+#: src/etc/inc/services.inc:1780
 msgid "Starting DHCPv6 relay service..."
 msgstr ""
 
-#: src/etc/inc/services.inc:1955
+#: src/etc/inc/services.inc:1868
+msgid "No suitable interface found for running dhcrelay -6!"
+msgstr ""
+
+#: src/etc/inc/services.inc:1928
 msgid "Starting DynDNS clients..."
 msgstr ""
 
-#: src/etc/inc/services.inc:2028
+#: src/etc/inc/services.inc:2001
 msgid "Starting DNS forwarder..."
 msgstr ""
 
-#: src/etc/inc/services.inc:2214
+#: src/etc/inc/services.inc:2167
 msgid "Starting DNS Resolver..."
 msgstr ""
 
-#: src/etc/inc/services.inc:2259
+#: src/etc/inc/services.inc:2212
 msgid "Starting SNMP daemon... "
 msgstr ""
 
-#: src/etc/inc/services.inc:2265
+#: src/etc/inc/services.inc:2218
 #, php-format
 msgid "Error: cannot open snmpd.conf in services_snmpd_configure().%s"
 msgstr ""
 
-#: src/etc/inc/services.inc:2614
+#: src/etc/inc/services.inc:2496
+#, 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:2501
+#, php-format
+msgid ""
+"phpDynDNS: Not updating %s A record because the IP address has not changed."
+msgstr ""
+
+#: src/etc/inc/services.inc:2512
+#, 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:2514
+#, php-format
+msgid "phpDynDNS: updating cache file %1$s.ipv6: %2$s"
+msgstr ""
+
+#: src/etc/inc/services.inc:2517
+#, php-format
+msgid ""
+"phpDynDNS: Not updating %s AAAA record because the IPv6 address has not "
+"changed."
+msgstr ""
+
+#: src/etc/inc/services.inc:2568
 msgid "pfSense specific crontab entries"
 msgstr ""
 
-#: src/etc/inc/services.inc:2615
+#: src/etc/inc/services.inc:2569
 msgid "Created:"
 msgstr ""
 
-#: src/etc/inc/services.inc:2637
+#: src/etc/inc/services.inc:2591
 msgid "If possible do not add items to this file manually."
 msgstr ""
 
-#: src/etc/inc/services.inc:2638
+#: src/etc/inc/services.inc:2592
 msgid ""
 "If you do so, this file must be terminated with a blank line (e.g. new line)"
 msgstr ""
 
-#: src/etc/inc/services.inc:2689
+#: src/etc/inc/services.inc:2643
 msgid "Starting UPnP service... "
 msgstr ""
 
-#: src/etc/inc/services.inc:2729
+#: src/etc/inc/services.inc:2683
 #, php-format
 msgid "Installed cron job for %s"
 msgstr ""
 
-#: src/etc/inc/services.inc:2733
+#: src/etc/inc/services.inc:2687
 #, php-format
 msgid "Checked cron job for %s, no change needed"
 msgstr ""
 
-#: src/etc/inc/services.inc:2736
+#: src/etc/inc/services.inc:2690
 #, php-format
 msgid "Updated cron job for %s"
 msgstr ""
 
-#: src/etc/inc/services.inc:2742
+#: src/etc/inc/services.inc:2696
 #, php-format
 msgid "Removed cron job for %s"
 msgstr ""
 
-#: src/etc/inc/shaper.inc:254 src/usr/local/www/system_camanager.php:262
-#: src/usr/local/www/system_certmanager.php:381
+#: src/etc/inc/shaper.inc:254 src/usr/local/www/system_camanager.php:260
+#: src/usr/local/www/system_certmanager.php:378
 #, php-format
 msgid "The field '%s' contains invalid characters."
 msgstr ""
@@ -4008,9 +5587,9 @@ msgstr ""
 #: src/etc/inc/shaper.inc:2254 src/etc/inc/shaper.inc:2654
 #: src/etc/inc/shaper.inc:2812 src/etc/inc/shaper.inc:2964
 #: src/etc/inc/shaper.inc:3113 src/etc/inc/shaper.inc:3339
-#: src/etc/inc/shaper.inc:3925 src/usr/local/www/interfaces_ppps_edit.php:889
-#: src/usr/local/www/status_queues.php:195
-#: src/usr/local/www/status_queues.php:199
+#: src/etc/inc/shaper.inc:3925 src/usr/local/www/interfaces_ppps_edit.php:908
+#: src/usr/local/www/status_queues.php:198
+#: src/usr/local/www/status_queues.php:202
 msgid "Bandwidth"
 msgstr ""
 
@@ -4020,13 +5599,15 @@ msgstr ""
 msgid "Bandwidthtype"
 msgstr ""
 
-#: src/etc/inc/shaper.inc:418 src/etc/inc/shaper.inc:1886
-#: src/etc/inc/shaper.inc:2661 src/etc/inc/shaper.inc:2971
+#: src/etc/inc/shaper.inc:418 src/etc/inc/shaper.inc:1171
+#: src/etc/inc/shaper.inc:1886 src/etc/inc/shaper.inc:2661
+#: src/etc/inc/shaper.inc:2971
 msgid "Bandwidth must be an integer."
 msgstr ""
 
-#: src/etc/inc/shaper.inc:421 src/etc/inc/shaper.inc:1890
-#: src/etc/inc/shaper.inc:2666 src/etc/inc/shaper.inc:2976
+#: src/etc/inc/shaper.inc:421 src/etc/inc/shaper.inc:1174
+#: src/etc/inc/shaper.inc:1890 src/etc/inc/shaper.inc:2666
+#: src/etc/inc/shaper.inc:2976
 msgid "Bandwidth cannot be negative."
 msgstr ""
 
@@ -4046,49 +5627,67 @@ msgstr ""
 msgid "Tbrsize must be positive."
 msgstr ""
 
+#: src/etc/inc/shaper.inc:533 src/etc/inc/shaper.inc:1703
+#: src/etc/inc/shaper.inc:2530 src/etc/inc/shaper.inc:3469
+#, php-format
+msgid "SHAPER: could not create queue %1$s on interface %2$s because: %3$s"
+msgstr ""
+
+#: src/etc/inc/shaper.inc:670
+#, php-format
+msgid "SHAPER: no default queue specified for interface %s."
+msgstr ""
+
+#: src/etc/inc/shaper.inc:670
+msgid "The interface queue will be enforced as default."
+msgstr ""
+
 #: src/etc/inc/shaper.inc:755
 msgid "Disable shaper on interface"
 msgstr ""
 
 #: src/etc/inc/shaper.inc:773 src/etc/inc/shaper.inc:1359
-#: src/usr/local/www/diag_confbak.php:189
-#: src/usr/local/www/diag_nanobsd.php:203 src/usr/local/www/edit.php:133
-#: src/usr/local/www/firewall_nat.php:467
-#: src/usr/local/www/firewall_nat.php:481
+#: src/usr/local/www/diag_confbak.php:189 src/usr/local/www/diag_edit.php:146
+#: src/usr/local/www/diag_nanobsd.php:203
+#: src/usr/local/www/firewall_nat.php:455
+#: src/usr/local/www/firewall_nat.php:469
 #: src/usr/local/www/firewall_nat_1to1.php:282
 #: src/usr/local/www/firewall_nat_1to1_edit.php:397
-#: src/usr/local/www/firewall_nat_edit.php:668
+#: src/usr/local/www/firewall_nat_edit.php:662
 #: src/usr/local/www/firewall_nat_npt.php:271
-#: src/usr/local/www/firewall_nat_out.php:539
+#: src/usr/local/www/firewall_nat_out.php:538
 #: src/usr/local/www/firewall_nat_out_edit.php:444
-#: src/usr/local/www/firewall_rules.php:836
-#: src/usr/local/www/firewall_rules.php:883
-#: src/usr/local/www/interfaces.php:1717
-#: src/usr/local/www/interfaces_assign.php:597
+#: src/usr/local/www/firewall_rules.php:849
+#: src/usr/local/www/firewall_rules.php:897
+#: src/usr/local/www/interfaces.php:1707
+#: src/usr/local/www/interfaces_assign.php:601
 #: src/usr/local/www/interfaces_qinq_edit.php:261
-#: src/usr/local/www/load_balancer_monitor_edit.php:295
+#: src/usr/local/www/load_balancer_monitor_edit.php:299
 #: src/usr/local/www/load_balancer_pool_edit.php:340
-#: src/usr/local/www/pkg_edit.php:622
+#: src/usr/local/www/pkg_edit.php:623
 #: src/usr/local/www/services_captiveportal_hostname_edit.php:204
-#: src/usr/local/www/services_dhcp.php:754
-#: src/usr/local/www/services_dhcpv6.php:521
+#: src/usr/local/www/services_dhcp.php:786
+#: src/usr/local/www/services_dhcpv6.php:595
 #: src/usr/local/www/services_igmpproxy.php:172
 #: src/usr/local/www/services_igmpproxy.php:174
-#: src/usr/local/www/services_router_advertisements.php:288
-#: src/usr/local/www/status_lb_pool.php:279
-#: src/usr/local/www/status_lb_pool.php:281
-#: src/usr/local/www/status_logs_common.inc:961
+#: src/usr/local/www/services_router_advertisements.php:294
+#: src/usr/local/www/status_lb_pool.php:274
+#: src/usr/local/www/status_lb_pool.php:276
+#: src/usr/local/www/status_logs_common.inc:973
 #: src/usr/local/www/status_logs_settings.php:248
 #: src/usr/local/www/system_advanced_sysctl.php:139
-#: src/usr/local/www/system_camanager.php:380
-#: src/usr/local/www/system_certmanager.php:256
-#: src/usr/local/www/system_certmanager.php:589
-#: src/usr/local/www/system_crlmanager.php:376
+#: src/usr/local/www/system_camanager.php:353
+#: src/usr/local/www/system_camanager.php:383
+#: src/usr/local/www/system_certmanager.php:253
+#: src/usr/local/www/system_certmanager.php:561
+#: src/usr/local/www/system_certmanager.php:591
+#: src/usr/local/www/system_crlmanager.php:295
+#: src/usr/local/www/system_crlmanager.php:379
 #: src/usr/local/www/system_usermanager_settings_ldapacpicker.php:157
 #: src/usr/local/www/vpn_l2tp.php:238
-#: src/usr/local/www/widgets/widgets/log.widget.php:297
+#: src/usr/local/www/widgets/widgets/log.widget.php:296
 #: src/usr/local/www/widgets/widgets/rss.widget.php:190
-#: src/usr/local/www/widgets/widgets/services_status.widget.php:148
+#: src/usr/local/www/widgets/widgets/services_status.widget.php:166
 #: src/usr/local/www/widgets/widgets/traffic_graphs.widget.php:198
 msgid "Save"
 msgstr ""
@@ -4097,51 +5696,6 @@ msgstr ""
 msgid "Enable/Disable"
 msgstr ""
 
-#: src/etc/inc/shaper.inc:789 src/etc/inc/shaper.inc:1167
-#: src/etc/inc/shaper.inc:1376 src/etc/inc/shaper.inc:3345
-#: src/etc/inc/shaper.inc:3891 src/etc/inc/shaper.inc:4213
-#: src/usr/local/www/diag_gmirror.php:251
-#: src/usr/local/www/diag_gmirror.php:331
-#: src/usr/local/www/firewall_aliases.php:222
-#: src/usr/local/www/firewall_aliases_edit.php:174
-#: src/usr/local/www/firewall_aliases_edit.php:672
-#: src/usr/local/www/firewall_aliases_import.php:93
-#: src/usr/local/www/firewall_schedule.php:126
-#: src/usr/local/www/interfaces_groups.php:113
-#: src/usr/local/www/load_balancer_monitor.php:140
-#: src/usr/local/www/load_balancer_monitor_edit.php:114
-#: src/usr/local/www/load_balancer_monitor_edit.php:302
-#: src/usr/local/www/load_balancer_pool.php:154
-#: src/usr/local/www/load_balancer_pool_edit.php:107
-#: src/usr/local/www/load_balancer_pool_edit.php:347
-#: src/usr/local/www/load_balancer_virtual_server.php:154
-#: src/usr/local/www/load_balancer_virtual_server_edit.php:104
-#: src/usr/local/www/load_balancer_virtual_server_edit.php:109
-#: src/usr/local/www/load_balancer_virtual_server_edit.php:208
-#: src/usr/local/www/pkg_mgr.php:99 src/usr/local/www/pkg_mgr.php:190
-#: src/usr/local/www/pkg_mgr_installed.php:104
-#: src/usr/local/www/services_captiveportal_filemanager.php:218
-#: src/usr/local/www/services_igmpproxy.php:121
-#: src/usr/local/www/status_gateways.php:98
-#: src/usr/local/www/status_lb_pool.php:167
-#: src/usr/local/www/status_lb_vs.php:101
-#: src/usr/local/www/status_openvpn.php:253
-#: src/usr/local/www/status_openvpn.php:309
-#: src/usr/local/www/system_camanager.php:389
-#: src/usr/local/www/system_certmanager.php:1004
-#: src/usr/local/www/system_crlmanager.php:611
-#: src/usr/local/www/system_gateways.php:276
-#: src/usr/local/www/system_gateways_edit.php:141
-#: src/usr/local/www/system_gateways_edit.php:697
-#: src/usr/local/www/system_groupmanager.php:237
-#: src/usr/local/www/system_usermanager.php:379
-#: src/usr/local/www/system_usermanager.php:428
-#: src/usr/local/www/widgets/widgets/gateways.widget.php:89
-#: src/usr/local/www/widgets/widgets/installed_packages.widget.php:85
-#: src/usr/local/www/widgets/widgets/system_information.widget.php:113
-msgid "Name"
-msgstr ""
-
 #: src/etc/inc/shaper.inc:795
 msgid "Scheduler Type"
 msgstr ""
@@ -4192,7 +5746,7 @@ msgid ""
 "characters."
 msgstr ""
 
-#: src/etc/inc/shaper.inc:1390 src/usr/local/www/interfaces_bridge_edit.php:557
+#: src/etc/inc/shaper.inc:1390 src/usr/local/www/interfaces_bridge_edit.php:605
 #: src/usr/local/www/interfaces_vlan.php:142
 #: src/usr/local/www/system_gateway_groups.php:152
 msgid "Priority"
@@ -4212,7 +5766,7 @@ msgstr ""
 msgid "Scheduler options"
 msgstr ""
 
-#: src/etc/inc/shaper.inc:1412 src/usr/local/www/firewall_rules_edit.php:1647
+#: src/etc/inc/shaper.inc:1412 src/usr/local/www/firewall_rules_edit.php:1684
 msgid "Default Queue"
 msgstr ""
 
@@ -4252,30 +5806,30 @@ msgid "Select options for this queue"
 msgstr ""
 
 #: src/etc/inc/shaper.inc:1449 src/etc/inc/shaper.inc:3961
-#: src/etc/inc/shaper.inc:4265 src/usr/local/www/firewall_aliases.php:224
-#: src/usr/local/www/firewall_aliases_edit.php:680
-#: src/usr/local/www/firewall_aliases_edit.php:737
+#: src/etc/inc/shaper.inc:4265 src/usr/local/www/firewall_aliases.php:228
+#: src/usr/local/www/firewall_aliases_edit.php:682
+#: src/usr/local/www/firewall_aliases_edit.php:739
 #: src/usr/local/www/firewall_aliases_import.php:208
-#: src/usr/local/www/firewall_nat.php:253
+#: src/usr/local/www/firewall_nat.php:246
 #: src/usr/local/www/firewall_nat_1to1.php:187
 #: src/usr/local/www/firewall_nat_1to1_edit.php:513
-#: src/usr/local/www/firewall_nat_edit.php:903
+#: src/usr/local/www/firewall_nat_edit.php:897
 #: src/usr/local/www/firewall_nat_npt.php:186
 #: src/usr/local/www/firewall_nat_npt_edit.php:267
 #: src/usr/local/www/firewall_nat_out.php:319
-#: src/usr/local/www/firewall_nat_out.php:571
+#: src/usr/local/www/firewall_nat_out.php:570
 #: src/usr/local/www/firewall_nat_out_edit.php:641
-#: src/usr/local/www/firewall_rules.php:394
-#: src/usr/local/www/firewall_rules_edit.php:1384
+#: src/usr/local/www/firewall_rules.php:414
+#: src/usr/local/www/firewall_rules_edit.php:1421
 #: src/usr/local/www/firewall_schedule.php:128
 #: src/usr/local/www/firewall_schedule_edit.php:409
 #: src/usr/local/www/firewall_schedule_edit.php:649
 #: src/usr/local/www/firewall_virtual_ip.php:298
-#: src/usr/local/www/firewall_virtual_ip_edit.php:466
-#: src/usr/local/www/guiconfig.inc:1080 src/usr/local/www/interfaces.php:1732
-#: src/usr/local/www/interfaces.php:1886 src/usr/local/www/interfaces.php:3186
+#: src/usr/local/www/firewall_virtual_ip_edit.php:455
+#: src/usr/local/www/guiconfig.inc:1102 src/usr/local/www/interfaces.php:1722
+#: src/usr/local/www/interfaces.php:1876 src/usr/local/www/interfaces.php:3188
 #: src/usr/local/www/interfaces_bridge.php:138
-#: src/usr/local/www/interfaces_bridge_edit.php:384
+#: src/usr/local/www/interfaces_bridge_edit.php:427
 #: src/usr/local/www/interfaces_gif.php:133
 #: src/usr/local/www/interfaces_gif_edit.php:255
 #: src/usr/local/www/interfaces_gre.php:133
@@ -4283,88 +5837,89 @@ msgstr ""
 #: src/usr/local/www/interfaces_groups.php:115
 #: src/usr/local/www/interfaces_lagg.php:140
 #: src/usr/local/www/interfaces_ppps.php:132
-#: src/usr/local/www/interfaces_ppps_edit.php:575
+#: src/usr/local/www/interfaces_ppps_edit.php:595
 #: src/usr/local/www/interfaces_qinq.php:146
 #: src/usr/local/www/interfaces_qinq_edit.php:290
 #: src/usr/local/www/interfaces_vlan.php:143
-#: src/usr/local/www/interfaces_vlan_edit.php:238
-#: src/usr/local/www/interfaces_wireless.php:137
+#: src/usr/local/www/interfaces_vlan_edit.php:241
+#: src/usr/local/www/interfaces_wireless.php:135
 #: src/usr/local/www/interfaces_wireless_edit.php:232
 #: src/usr/local/www/load_balancer_monitor.php:142
-#: src/usr/local/www/load_balancer_monitor_edit.php:114
-#: src/usr/local/www/load_balancer_monitor_edit.php:309
+#: src/usr/local/www/load_balancer_monitor_edit.php:118
+#: src/usr/local/www/load_balancer_monitor_edit.php:313
 #: src/usr/local/www/load_balancer_pool.php:159
 #: src/usr/local/www/load_balancer_pool_edit.php:364
 #: src/usr/local/www/load_balancer_virtual_server.php:160
 #: src/usr/local/www/load_balancer_virtual_server_edit.php:215
 #: src/usr/local/www/pkg_mgr.php:101 src/usr/local/www/pkg_mgr.php:191
-#: src/usr/local/www/pkg_mgr_installed.php:107
+#: src/usr/local/www/pkg_mgr_installed.php:105
 #: src/usr/local/www/services_captiveportal_hostname.php:151
 #: src/usr/local/www/services_captiveportal_hostname_edit.php:226
 #: src/usr/local/www/services_captiveportal_ip.php:145
 #: src/usr/local/www/services_captiveportal_mac.php:210
 #: src/usr/local/www/services_captiveportal_mac_edit.php:262
 #: src/usr/local/www/services_captiveportal_zones.php:115
-#: src/usr/local/www/services_dhcp.php:662
-#: src/usr/local/www/services_dhcp.php:1296
-#: src/usr/local/www/services_dhcp_edit.php:483
-#: src/usr/local/www/services_dhcpv6.php:905
-#: src/usr/local/www/services_dhcpv6_edit.php:257
-#: src/usr/local/www/services_dnsmasq.php:371
-#: src/usr/local/www/services_dnsmasq.php:452
+#: src/usr/local/www/services_dhcp.php:690
+#: src/usr/local/www/services_dhcp.php:1319
+#: src/usr/local/www/services_dhcp_edit.php:487
+#: src/usr/local/www/services_dhcpv6.php:1005
+#: src/usr/local/www/services_dhcpv6_edit.php:274
+#: src/usr/local/www/services_dnsmasq.php:377
+#: src/usr/local/www/services_dnsmasq.php:457
 #: src/usr/local/www/services_dnsmasq_domainoverride_edit.php:190
 #: src/usr/local/www/services_dnsmasq_edit.php:269
 #: src/usr/local/www/services_dnsmasq_edit.php:318
 #: src/usr/local/www/services_dyndns.php:124
-#: src/usr/local/www/services_dyndns_edit.php:422
+#: src/usr/local/www/services_dyndns_edit.php:432
 #: src/usr/local/www/services_igmpproxy.php:124
 #: src/usr/local/www/services_igmpproxy_edit.php:195
 #: src/usr/local/www/services_pppoe.php:140
 #: src/usr/local/www/services_pppoe_edit.php:383
 #: src/usr/local/www/services_rfc2136.php:117
-#: src/usr/local/www/services_rfc2136_edit.php:303
-#: src/usr/local/www/services_unbound.php:416
-#: src/usr/local/www/services_unbound.php:492
-#: src/usr/local/www/services_unbound_acls.php:266
-#: src/usr/local/www/services_unbound_acls.php:292
-#: src/usr/local/www/services_unbound_acls.php:324
+#: src/usr/local/www/services_rfc2136_edit.php:322
+#: src/usr/local/www/services_unbound.php:441
+#: src/usr/local/www/services_unbound.php:517
+#: src/usr/local/www/services_unbound_acls.php:270
+#: src/usr/local/www/services_unbound_acls.php:296
+#: src/usr/local/www/services_unbound_acls.php:328
 #: src/usr/local/www/services_unbound_domainoverride_edit.php:169
 #: src/usr/local/www/services_unbound_host_edit.php:270
 #: src/usr/local/www/services_unbound_host_edit.php:319
 #: src/usr/local/www/services_wol.php:202
 #: src/usr/local/www/services_wol_edit.php:173
-#: src/usr/local/www/status_gateway_groups.php:104
-#: src/usr/local/www/status_gateways.php:105
+#: src/usr/local/www/status_dhcp_leases.php:382
+#: src/usr/local/www/status_gateway_groups.php:98
+#: src/usr/local/www/status_gateways.php:100
 #: src/usr/local/www/status_graph.php:196
 #: src/usr/local/www/status_ipsec.php:132
-#: src/usr/local/www/status_lb_pool.php:171
-#: src/usr/local/www/status_lb_vs.php:105
+#: src/usr/local/www/status_lb_pool.php:166
+#: src/usr/local/www/status_lb_vs.php:100
 #: src/usr/local/www/status_services.php:131
 #: src/usr/local/www/status_upnp.php:107
-#: src/usr/local/www/system_advanced_sysctl.php:202
-#: src/usr/local/www/system_advanced_sysctl.php:259
+#: src/usr/local/www/system_advanced_sysctl.php:206
+#: src/usr/local/www/system_advanced_sysctl.php:263
 #: src/usr/local/www/system_gateway_groups.php:153
-#: src/usr/local/www/system_gateway_groups_edit.php:308
+#: src/usr/local/www/system_gateway_groups_edit.php:313
 #: src/usr/local/www/system_gateway_groups_edit.php:342
 #: src/usr/local/www/system_gateways.php:280
-#: src/usr/local/www/system_gateways_edit.php:757
-#: src/usr/local/www/system_groupmanager.php:238
-#: src/usr/local/www/system_groupmanager.php:288
-#: src/usr/local/www/system_groupmanager.php:386
+#: src/usr/local/www/system_gateways_edit.php:698
+#: src/usr/local/www/system_groupmanager.php:250
+#: src/usr/local/www/system_groupmanager.php:305
+#: src/usr/local/www/system_groupmanager.php:403
 #: src/usr/local/www/system_routes.php:279
 #: src/usr/local/www/system_routes_edit.php:306
 #: src/usr/local/www/system_usermanager.php:380
-#: src/usr/local/www/vpn_ipsec_phase1.php:703
+#: src/usr/local/www/vpn_ipsec_phase1.php:729
 #: src/usr/local/www/vpn_ipsec_phase2.php:619
-#: src/usr/local/www/vpn_openvpn_client.php:550
-#: src/usr/local/www/vpn_openvpn_client.php:816
-#: src/usr/local/www/vpn_openvpn_csc.php:368
-#: src/usr/local/www/vpn_openvpn_csc.php:667
-#: src/usr/local/www/vpn_openvpn_server.php:690
-#: src/usr/local/www/vpn_openvpn_server.php:1198
+#: src/usr/local/www/vpn_openvpn_client.php:555
+#: src/usr/local/www/vpn_openvpn_client.php:821
+#: src/usr/local/www/vpn_openvpn_csc.php:372
+#: src/usr/local/www/vpn_openvpn_csc.php:671
+#: src/usr/local/www/vpn_openvpn_server.php:695
+#: src/usr/local/www/vpn_openvpn_server.php:1203
 #: src/usr/local/www/widgets/widgets/ipsec.widget.php:235
 #: src/usr/local/www/widgets/widgets/load_balancer_status.widget.php:95
-#: src/usr/local/www/widgets/widgets/services_status.widget.php:91
+#: src/usr/local/www/widgets/widgets/services_status.widget.php:109
 msgid "Description"
 msgstr ""
 
@@ -4544,11 +6099,11 @@ msgstr ""
 #: src/etc/inc/shaper.inc:3849
 #: src/usr/local/www/diag_dump_states_sources.php:179
 #: src/usr/local/www/diag_gmirror.php:279
-#: src/usr/local/www/diag_gmirror.php:297 src/usr/local/www/diag_tables.php:233
+#: src/usr/local/www/diag_gmirror.php:297 src/usr/local/www/diag_tables.php:316
 #: src/usr/local/www/load_balancer_pool_edit.php:461
 #: src/usr/local/www/load_balancer_pool_edit.php:466
-#: src/usr/local/www/pkg_mgr_installed.php:213
-#: src/usr/local/www/widgets/widgets/installed_packages.widget.php:154
+#: src/usr/local/www/pkg_mgr_installed.php:211
+#: src/usr/local/www/widgets/widgets/installed_packages.widget.php:151
 msgid "Remove"
 msgstr ""
 
@@ -4557,26 +6112,31 @@ msgid "Add another schedule"
 msgstr ""
 
 #: src/etc/inc/shaper.inc:3879 src/etc/inc/shaper.inc:4201
+#: src/usr/local/www/firewall_shaper.php:438
+#: src/usr/local/www/firewall_shaper_queues.php:245
+#: src/usr/local/www/firewall_shaper_vinterface.php:73
+#: src/usr/local/www/firewall_shaper_vinterface.php:417
+#: src/usr/local/www/firewall_shaper_wizards.php:113
 msgid "Limiters"
 msgstr ""
 
 #: src/etc/inc/shaper.inc:3883 src/etc/inc/shaper.inc:4205
 #: src/usr/local/www/firewall_nat_1to1_edit.php:524
-#: src/usr/local/www/firewall_rules.php:777
-#: src/usr/local/www/interfaces.php:1724 src/usr/local/www/interfaces.php:2984
-#: src/usr/local/www/services_captiveportal.php:576
+#: src/usr/local/www/firewall_rules.php:796
+#: src/usr/local/www/interfaces.php:1714 src/usr/local/www/interfaces.php:2986
+#: src/usr/local/www/services_captiveportal.php:577
 #: src/usr/local/www/services_captiveportal_vouchers.php:514
-#: src/usr/local/www/services_dhcp.php:762
-#: src/usr/local/www/services_dhcp.php:1212
+#: src/usr/local/www/services_dhcp.php:794
+#: src/usr/local/www/services_dhcp.php:1235
 #: src/usr/local/www/services_dhcp_relay.php:178
 #: src/usr/local/www/services_dhcpv6_relay.php:176
 #: src/usr/local/www/services_dnsmasq.php:237
 #: src/usr/local/www/services_pppoe_edit.php:332
-#: src/usr/local/www/services_rfc2136_edit.php:177
+#: src/usr/local/www/services_rfc2136_edit.php:199
 #: src/usr/local/www/services_snmp.php:229
 #: src/usr/local/www/services_snmp.php:272
-#: src/usr/local/www/services_unbound.php:270
-#: src/usr/local/www/vpn_ipsec_phase1.php:868
+#: src/usr/local/www/services_unbound.php:295
+#: src/usr/local/www/vpn_ipsec_phase1.php:894
 #: src/usr/local/www/vpn_l2tp.php:245 src/usr/local/www/vpn_l2tp.php:331
 #: src/usr/local/www/diag_routes.php:114
 msgid "Enable"
@@ -4613,45 +6173,43 @@ msgid ""
 msgstr ""
 
 #: src/etc/inc/shaper.inc:3964 src/etc/inc/shaper.inc:4268
-#: src/usr/local/www/firewall_aliases_edit.php:683
+#: src/usr/local/www/firewall_aliases_edit.php:685
 #: src/usr/local/www/firewall_aliases_import.php:211
 #: src/usr/local/www/firewall_nat_1to1_edit.php:516
-#: src/usr/local/www/firewall_nat_edit.php:906
+#: src/usr/local/www/firewall_nat_edit.php:900
 #: src/usr/local/www/firewall_nat_npt_edit.php:270
 #: src/usr/local/www/firewall_nat_out_edit.php:644
-#: src/usr/local/www/firewall_virtual_ip_edit.php:469
+#: src/usr/local/www/firewall_virtual_ip_edit.php:458
 #: src/usr/local/www/interfaces_gif_edit.php:258
 #: src/usr/local/www/interfaces_gre_edit.php:259
 #: src/usr/local/www/interfaces_qinq_edit.php:293
 #: src/usr/local/www/interfaces_wireless_edit.php:235
 #: src/usr/local/www/services_captiveportal_hostname_edit.php:229
 #: src/usr/local/www/services_captiveportal_zones_edit.php:132
-#: src/usr/local/www/services_dhcp_edit.php:486
-#: src/usr/local/www/services_dhcpv6_edit.php:260
+#: src/usr/local/www/services_dhcp_edit.php:490
+#: src/usr/local/www/services_dhcpv6_edit.php:277
 #: src/usr/local/www/services_dnsmasq_domainoverride_edit.php:193
 #: src/usr/local/www/services_dnsmasq_edit.php:272
-#: src/usr/local/www/services_dyndns_edit.php:425
+#: src/usr/local/www/services_dyndns_edit.php:435
 #: src/usr/local/www/services_igmpproxy_edit.php:198
-#: src/usr/local/www/services_rfc2136_edit.php:306
+#: src/usr/local/www/services_rfc2136_edit.php:325
 #: src/usr/local/www/services_unbound_domainoverride_edit.php:172
 #: src/usr/local/www/services_unbound_host_edit.php:273
 #: src/usr/local/www/services_wol_edit.php:176
 #: src/usr/local/www/system_gateway_groups_edit.php:345
-#: src/usr/local/www/system_gateways_edit.php:760
+#: src/usr/local/www/system_gateways_edit.php:701
 #: src/usr/local/www/system_routes_edit.php:309
-#: src/usr/local/www/vpn_ipsec_phase1.php:706
+#: src/usr/local/www/vpn_ipsec_phase1.php:732
 #: src/usr/local/www/vpn_ipsec_phase2.php:622
-#: src/usr/local/www/vpn_openvpn_client.php:553
-#: src/usr/local/www/vpn_openvpn_server.php:693
+#: src/usr/local/www/vpn_openvpn_client.php:558
+#: src/usr/local/www/vpn_openvpn_server.php:698
 msgid "You may enter a description here for your reference (not parsed)."
 msgstr ""
 
 #: src/etc/inc/shaper.inc:3968 src/etc/inc/shaper.inc:4272
-#: src/usr/local/www/firewall_rules_edit.php:1393
-#: src/usr/local/www/firewall_rules_edit.php:1407
-#: src/usr/local/www/interfaces_ppps_edit.php:808
-#: src/usr/local/www/system_gateways_edit.php:775
-msgid "Advanced options"
+#: src/usr/local/www/firewall_rules_edit.php:1444
+#: src/usr/local/www/vpn_ipsec_phase1.php:859
+msgid "Advanced Options"
 msgstr ""
 
 #: src/etc/inc/shaper.inc:3972
@@ -4698,7 +6256,7 @@ msgstr ""
 msgid "Weight must be an integer between 1 and 100."
 msgstr ""
 
-#: src/etc/inc/shaper.inc:4276 src/usr/local/www/system_gateways_edit.php:800
+#: src/etc/inc/shaper.inc:4276 src/usr/local/www/system_gateways_edit.php:741
 msgid "Weight"
 msgstr ""
 
@@ -4723,462 +6281,618 @@ msgid ""
 "the bottom represent queue actions and are activated accordingly."
 msgstr ""
 
-#: src/etc/inc/system.inc:601
-#, php-format
+#: src/etc/inc/system.inc:463
+msgid "Error: cannot open hosts file in system_hosts_generate()."
+msgstr ""
+
+#: src/etc/inc/system.inc:613
 msgid "Not adding default route because OLSR dynamic gateway is enabled."
 msgstr ""
 
-#: src/etc/inc/system.inc:661
+#: src/etc/inc/system.inc:641
+#, php-format
+msgid "ROUTING: setting default route to %s"
+msgstr ""
+
+#: src/etc/inc/system.inc:652
+#, php-format
+msgid "ROUTING: setting IPv6 default route to %s"
+msgstr ""
+
+#: src/etc/inc/system.inc:673
 #, php-format
 msgid "Static Routes: Gateway IP could not be found for %s"
 msgstr ""
 
-#: src/etc/inc/system.inc:872
+#: src/etc/inc/system.inc:884
 msgid "Starting syslog..."
 msgstr ""
 
-#: src/etc/inc/system.inc:1030
+#: src/etc/inc/system.inc:1042
 #, php-format
 msgid "Error: cannot open syslog.conf in system_syslogd_start().%s"
 msgstr ""
 
-#: src/etc/inc/system.inc:1127
+#: src/etc/inc/system.inc:1106
+msgid "Creating SSL Certificate for this host"
+msgstr ""
+
+#: src/etc/inc/system.inc:1110
+#, php-format
+msgid "webConfigurator default (%s)"
+msgstr ""
+
+#: src/etc/inc/system.inc:1122
+#, php-format
+msgid "Error creating WebGUI Certificate: openssl library returns: %s"
+msgstr ""
+
+#: src/etc/inc/system.inc:1131
+#, php-format
+msgid "Generated new self-signed HTTPS certificate (%s)"
+msgstr ""
+
+#: src/etc/inc/system.inc:1139
 msgid "Starting webConfigurator..."
 msgstr ""
 
-#: src/etc/inc/system.inc:1177 src/etc/inc/system.inc:2003
-#: src/etc/inc/system.inc:2006
+#: src/etc/inc/system.inc:1189 src/etc/inc/system.inc:2050
+#: src/etc/inc/system.inc:2053
 msgid "failed!"
 msgstr ""
 
-#: src/etc/inc/system.inc:1363
+#: src/etc/inc/system.inc:1378
 #, php-format
 msgid "Error: cannot open certificate file in system_webgui_start().%s"
 msgstr ""
 
-#: src/etc/inc/system.inc:1376
+#: src/etc/inc/system.inc:1391
 #, php-format
 msgid "Error: cannot open certificate key file in system_webgui_start().%s"
 msgstr ""
 
-#: src/etc/inc/system.inc:1403
+#: src/etc/inc/system.inc:1418
 #, php-format
 msgid "Error: cannot open %s in system_generate_nginx_config().%s"
 msgstr ""
 
-#: src/etc/inc/system.inc:1452
+#: src/etc/inc/system.inc:1467
 msgid "Setting timezone..."
 msgstr ""
 
-#: src/etc/inc/system.inc:1840
+#: src/etc/inc/system.inc:1855
+#, php-format
+msgid "Could not open %s/ntpd.conf for writing"
+msgstr ""
+
+#: src/etc/inc/system.inc:1887
 msgid "Syncing system time before startup..."
 msgstr ""
 
-#: src/etc/inc/system.inc:1958
+#: src/etc/inc/system.inc:2005
 #, php-format
 msgid "Error: cannot open dmesg.boot in system_dmesg_save().%s"
 msgstr ""
 
-#: src/etc/inc/system.inc:1982
+#: src/etc/inc/system.inc:2029
 msgid "Setting hard disk standby... "
 msgstr ""
 
-#: src/etc/inc/system.inc:2119
+#: src/etc/inc/system.inc:2166
 msgid "Generic PC"
 msgstr ""
 
-#: src/etc/inc/system.inc:2123
+#: src/etc/inc/system.inc:2170
 msgid "Generic PC (CD-ROM)"
 msgstr ""
 
-#: src/etc/inc/system.inc:2159
+#: src/etc/inc/system.inc:2206
 msgid "PC Engines WRAP"
 msgstr ""
 
-#: src/etc/inc/system.inc:2163 src/etc/inc/system.inc:2182
+#: src/etc/inc/system.inc:2210 src/etc/inc/system.inc:2229
 msgid "PC Engines ALIX"
 msgstr ""
 
-#: src/etc/inc/system.inc:2187
+#: src/etc/inc/system.inc:2234
 msgid "embedded (unknown)"
 msgstr ""
 
-#: src/etc/inc/unbound.inc:800 src/usr/local/www/services_unbound_acls.php:261
+#: src/etc/inc/unbound.inc:802 src/usr/local/www/services_dhcpv6.php:810
+#: src/usr/local/www/services_unbound_acls.php:265
 msgid "Deny"
 msgstr ""
 
-#: src/etc/inc/unbound.inc:801 src/usr/local/www/services_unbound_acls.php:261
+#: src/etc/inc/unbound.inc:803 src/usr/local/www/services_unbound_acls.php:265
 msgid "Refuse"
 msgstr ""
 
-#: src/etc/inc/unbound.inc:802
+#: src/etc/inc/unbound.inc:804
 msgid "Static"
 msgstr ""
 
-#: src/etc/inc/unbound.inc:803
+#: src/etc/inc/unbound.inc:805
 msgid "Transparent"
 msgstr ""
 
-#: src/etc/inc/unbound.inc:804
+#: src/etc/inc/unbound.inc:806
 msgid "Type Transparent"
 msgstr ""
 
-#: src/etc/inc/unbound.inc:806
+#: src/etc/inc/unbound.inc:808
 msgid "Inform"
 msgstr ""
 
-#: src/etc/inc/unbound.inc:807
+#: src/etc/inc/unbound.inc:809
 msgid "Inform Deny"
 msgstr ""
 
-#: src/etc/inc/unbound.inc:808
+#: src/etc/inc/unbound.inc:810
 msgid "No Default"
 msgstr ""
 
-#: src/etc/inc/upgrade_config.inc:133
+#: src/etc/inc/upgrade_config.inc:136
 #, php-format
 msgid "%sWarning: filter rule removed (interface '%s' does not exist anymore)."
 msgstr ""
 
-#: src/etc/inc/upgrade_config.inc:145
+#: src/etc/inc/upgrade_config.inc:148
 #, php-format
 msgid ""
 "%sWarning: filter rule removed (source network '%s' does not exist anymore)."
 msgstr ""
 
-#: src/etc/inc/upgrade_config.inc:158
+#: src/etc/inc/upgrade_config.inc:161
 #, php-format
 msgid ""
 "%sWarning: filter rule removed (destination network '%s' does not exist "
 "anymore)."
 msgstr ""
 
-#: src/etc/inc/upgrade_config.inc:178
+#: src/etc/inc/upgrade_config.inc:181
 #, php-format
 msgid ""
 "%sWarning: traffic shaper rule removed (interface '%s' does not exist "
 "anymore)."
 msgstr ""
 
-#: src/etc/inc/upgrade_config.inc:190
+#: src/etc/inc/upgrade_config.inc:193
 #, php-format
 msgid ""
 "%sWarning: traffic shaper rule removed (source network '%s' does not exist "
 "anymore)."
 msgstr ""
 
-#: src/etc/inc/upgrade_config.inc:203
+#: src/etc/inc/upgrade_config.inc:206
 #, php-format
 msgid ""
 "%sWarning: traffic shaper rule removed (destination network '%s' does not "
 "exist anymore)."
 msgstr ""
 
-#: src/etc/inc/upgrade_config.inc:374
+#: src/etc/inc/upgrade_config.inc:377
 #, php-format
 msgid "CARP vhid %s"
 msgstr ""
 
-#: src/etc/inc/upgrade_config.inc:554
+#: src/etc/inc/upgrade_config.inc:557
 msgid "Permit IPsec traffic."
 msgstr ""
 
-#: src/etc/inc/upgrade_config.inc:629
+#: src/etc/inc/upgrade_config.inc:632
 msgid "System Administrators"
 msgstr ""
 
-#: src/etc/inc/upgrade_config.inc:648
+#: src/etc/inc/upgrade_config.inc:651
 msgid ""
 "Indicates whether this user will lock access to the webConfigurator for "
 "other users."
 msgstr ""
 
-#: src/etc/inc/upgrade_config.inc:651
+#: src/etc/inc/upgrade_config.inc:654
 msgid ""
 "Indicates whether this user will lock individual HTML pages after having "
 "accessed a particular page (the lock will be freed if the user leaves or "
 "saves the page form)."
 msgstr ""
 
-#: src/etc/inc/upgrade_config.inc:654
+#: src/etc/inc/upgrade_config.inc:657
 msgid "Indicates whether this user is able to login for example via SSH."
 msgstr ""
 
-#: src/etc/inc/upgrade_config.inc:657
+#: src/etc/inc/upgrade_config.inc:660
 #, php-format
 msgid ""
 "Indicates whether this user is allowed to copy files onto the %s appliance "
 "via SCP/SFTP."
 msgstr ""
 
-#: src/etc/inc/upgrade_config.inc:660
+#: src/etc/inc/upgrade_config.inc:663
 msgid ""
 "This user is associated with the UNIX root user (you should associate this "
 "privilege only with one single user)."
 msgstr ""
 
-#: src/etc/inc/upgrade_config.inc:679
+#: src/etc/inc/upgrade_config.inc:682
 msgid "Drop packets to closed TCP ports without returning a RST"
 msgstr ""
 
-#: src/etc/inc/upgrade_config.inc:683
+#: src/etc/inc/upgrade_config.inc:686
 msgid "Do not send ICMP port unreachable messages for closed UDP ports"
 msgstr ""
 
-#: src/etc/inc/upgrade_config.inc:687
+#: src/etc/inc/upgrade_config.inc:690
 msgid "Randomize the ID field in IP packets (default is 0: sequential IP IDs)"
 msgstr ""
 
-#: src/etc/inc/upgrade_config.inc:691
+#: src/etc/inc/upgrade_config.inc:694
 msgid "Drop SYN-FIN packets (breaks RFC1379, but nobody uses it anyway)"
 msgstr ""
 
-#: src/etc/inc/upgrade_config.inc:695
+#: src/etc/inc/upgrade_config.inc:698
 msgid "Sending of IPv4 ICMP redirects"
 msgstr ""
 
-#: src/etc/inc/upgrade_config.inc:699
+#: src/etc/inc/upgrade_config.inc:702
 msgid "Sending of IPv6 ICMP redirects"
 msgstr ""
 
-#: src/etc/inc/upgrade_config.inc:703
+#: src/etc/inc/upgrade_config.inc:706
 msgid "Generate SYN cookies for outbound SYN-ACK packets"
 msgstr ""
 
-#: src/etc/inc/upgrade_config.inc:707
+#: src/etc/inc/upgrade_config.inc:710
 msgid "Maximum incoming TCP datagram size"
 msgstr ""
 
-#: src/etc/inc/upgrade_config.inc:711
+#: src/etc/inc/upgrade_config.inc:714
 msgid "Maximum outgoing TCP datagram size"
 msgstr ""
 
-#: src/etc/inc/upgrade_config.inc:715
+#: src/etc/inc/upgrade_config.inc:718
 msgid "Do not delay ACK to try and piggyback it onto a data packet"
 msgstr ""
 
-#: src/etc/inc/upgrade_config.inc:719
+#: src/etc/inc/upgrade_config.inc:722
 msgid "Maximum outgoing UDP datagram size"
 msgstr ""
 
-#: src/etc/inc/upgrade_config.inc:723
+#: src/etc/inc/upgrade_config.inc:726
 msgid ""
 "Handling of non-IP packets which are not passed to pfil (see if_bridge(4))"
 msgstr ""
 
-#: src/etc/inc/upgrade_config.inc:727
+#: src/etc/inc/upgrade_config.inc:730
 msgid "Allow unprivileged access to tap(4) device nodes"
 msgstr ""
 
-#: src/etc/inc/upgrade_config.inc:731
+#: src/etc/inc/upgrade_config.inc:734
 msgid "Randomize PID's (see src/sys/kern/kern_fork.c: sysctl_kern_randompid())"
 msgstr ""
 
-#: src/etc/inc/upgrade_config.inc:735
+#: src/etc/inc/upgrade_config.inc:738
 msgid ""
 "The system will attempt to calculate the bandwidth delay product for each "
 "connection and limit the amount of data queued to the network to just the "
 "amount required to maintain optimum throughput. "
 msgstr ""
 
-#: src/etc/inc/upgrade_config.inc:739
+#: src/etc/inc/upgrade_config.inc:742
 msgid "Set ICMP Limits"
 msgstr ""
 
-#: src/etc/inc/upgrade_config.inc:743
+#: src/etc/inc/upgrade_config.inc:746
 msgid "TCP Offload engine"
 msgstr ""
 
-#: src/etc/inc/upgrade_config.inc:786
+#: src/etc/inc/upgrade_config.inc:789
 #, php-format
 msgid "Interface %s Static Gateway"
 msgstr ""
 
-#: src/etc/inc/upgrade_config.inc:789
+#: src/etc/inc/upgrade_config.inc:792
 #, php-format
 msgid "Interface %s Dynamic Gateway"
 msgstr ""
 
-#: src/etc/inc/upgrade_config.inc:856
+#: src/etc/inc/upgrade_config.inc:859
 #, php-format
 msgid "Upgraded static route for %s"
 msgstr ""
 
-#: src/etc/inc/upgrade_config.inc:954
+#: src/etc/inc/upgrade_config.inc:957
 #, php-format
 msgid "Sitedown pool for VS: %s"
 msgstr ""
 
-#: src/etc/inc/upgrade_config.inc:1117
+#: src/etc/inc/upgrade_config.inc:1120
 #, php-format
 msgid "phase2 for %s"
 msgstr ""
 
-#: src/etc/inc/upgrade_config.inc:1354
+#: src/etc/inc/upgrade_config.inc:1357
 #, php-format
 msgid "Upgraded Dyndns %s"
 msgstr ""
 
-#: src/etc/inc/upgrade_config.inc:1408
+#: src/etc/inc/upgrade_config.inc:1411
 msgid "All Users"
 msgstr ""
 
-#: src/etc/inc/upgrade_config.inc:1551
+#: src/etc/inc/upgrade_config.inc:1554
 #, php-format
 msgid "Converted bridged %s"
 msgstr ""
 
-#: src/etc/inc/upgrade_config.inc:1942
+#: src/etc/inc/upgrade_config.inc:1945
 msgid "Auto added OpenVPN rule from config upgrade."
 msgstr ""
 
-#: src/etc/inc/util.inc:126
+#: src/etc/inc/upgrade_config.inc:4005
+#, php-format
+msgid ""
+"WEP is no longer supported. It will be disabled on the %s interface and the "
+"interface will be disabled. Please reconfigure the interface."
+msgstr ""
+
+#: src/etc/inc/upgrade_config.inc:4215
+#, php-format
+msgid "DES is no longer supported, IPsec phase 1 item '%s' is being disabled."
+msgstr ""
+
+#: src/etc/inc/upgrade_config.inc:4232
+#, php-format
+msgid "DES is no longer supported, IPsec phase 2 item '%s' is being disabled."
+msgstr ""
+
+#: src/etc/inc/upgrade_config.inc:4277
+msgid ""
+"Layer 7 shaping is no longer supported. Its configuration has been removed."
+msgstr ""
+
+#: src/etc/inc/util.inc:130
 #, php-format
 msgid "WARNING: Could not mark subsystem: %s dirty"
 msgstr ""
 
-#: src/etc/inc/util.inc:147
+#: src/etc/inc/util.inc:151
 msgid "WARNING: You must give a name as parameter to lock() function."
 msgstr ""
 
-#: src/etc/inc/util.inc:166
+#: src/etc/inc/util.inc:170
 msgid "WARNING: You must give a name as parameter to try_lock() function."
 msgstr ""
 
-#: src/etc/inc/util.inc:309
+#: src/etc/inc/util.inc:280 src/etc/inc/util.inc:305
+#, php-format
+msgid "Could not open shared memory %s"
+msgstr ""
+
+#: src/etc/inc/util.inc:313
 #, php-format
 msgid "Reference %s is going negative, not doing unreference."
 msgstr ""
 
-#: src/etc/inc/util.inc:1542
+#: src/etc/inc/util.inc:332
+#, php-format
+msgid "Could not open shared memory for read %s"
+msgstr ""
+
+#: src/etc/inc/util.inc:1651
 #, php-format
 msgid "The command '%1$s' returned exit code '%2$d', the output was '%3$s' "
 msgstr ""
 
-#: src/etc/inc/voucher.inc:443
+#: src/etc/inc/voucher.inc:96 src/etc/inc/voucher.inc:156
+#: src/etc/inc/voucher.inc:215
+#, php-format
+msgid "Captive Portal Voucher XMLRPC sync data %s."
+msgstr ""
+
+#: src/etc/inc/voucher.inc:102 src/etc/inc/voucher.inc:162
+#: src/etc/inc/voucher.inc:221
+#, php-format
+msgid ""
+"A communications error occurred while attempting CaptivePortalVoucherSync "
+"XMLRPC sync with %s (pfsense.exec_php)."
+msgstr ""
+
+#: src/etc/inc/voucher.inc:107 src/etc/inc/voucher.inc:167
+#: src/etc/inc/voucher.inc:226
+#, php-format
+msgid ""
+"An error code was received while attempting CaptivePortalVoucherSync XMLRPC "
+"sync with %1$s - Code %2$s"
+msgstr ""
+
+#: src/etc/inc/voucher.inc:112 src/etc/inc/voucher.inc:172
+#: src/etc/inc/voucher.inc:231
+#, php-format
+msgid ""
+"CaptivePortalVoucherSync XMLRPC reload data success with %s (pfsense."
+"exec_php)."
+msgstr ""
+
+#: src/etc/inc/voucher.inc:240
+#, php-format
+msgid "Captive Portal Voucher database synchronized with %s"
+msgstr ""
+
+#: src/etc/inc/voucher.inc:327 src/etc/inc/voucher.inc:469
+#, php-format
+msgid "%1$s (%2$s/%3$s): not found on any registered Roll"
+msgstr ""
+
+#: src/etc/inc/voucher.inc:331
+#, php-format
+msgid "%1$s invalid: %2$s!!"
+msgstr ""
+
+#: src/etc/inc/voucher.inc:418
+#, php-format
+msgid "%s invalid: Too short!"
+msgstr ""
+
+#: src/etc/inc/voucher.inc:444
 #, php-format
 msgid "%1$s (%2$s/%3$s) active and good for %4$d Minutes"
 msgstr ""
 
-#: src/etc/inc/voucher.inc:481
+#: src/etc/inc/voucher.inc:456
+#, php-format
+msgid "%1$s (%2$s/%3$s) already used and expired"
+msgstr ""
+
+#: src/etc/inc/voucher.inc:464
+#, php-format
+msgid "%1$s (%2$s/%3$s) good for %4$s Minutes"
+msgstr ""
+
+#: src/etc/inc/voucher.inc:475
+#, php-format
+msgid "%1$s invalid: %2$s !!"
+msgstr ""
+
+#: src/etc/inc/voucher.inc:485
 msgid "Access denied!"
 msgstr ""
 
-#: src/etc/inc/voucher.inc:483
+#: src/etc/inc/voucher.inc:487
 #, php-format
 msgid "Access granted for %d Minutes in total."
 msgstr ""
 
-#: src/etc/inc/voucher.inc:552
+#: src/etc/inc/voucher.inc:556
 msgid "Enabling voucher support... "
 msgstr ""
 
-#: src/etc/inc/voucher.inc:595
+#: src/etc/inc/voucher.inc:599
 #, php-format
 msgid "Error: cannot write voucher.cfg"
 msgstr ""
 
-#: src/etc/inc/voucher.inc:650
+#: src/etc/inc/voucher.inc:654
 #, php-format
-msgid "cant write %1$s/voucher_%s_used_%2$s.db"
+msgid "cant write %1$s/voucher_%2$s_used_%3$s.db"
 msgstr ""
 
-#: src/etc/inc/voucher.inc:736
+#: src/etc/inc/voucher.inc:740
 #, php-format
-msgid "cant read %1$s/voucher_%s_used_%2$s.db"
+msgid "cant read %1$s/voucher_%2$s_used_%3$s.db"
 msgstr ""
 
-#: src/etc/inc/voucher.inc:753
+#: src/etc/inc/voucher.inc:757
 #, php-format
 msgid "Voucher: %s"
 msgstr ""
 
+#: src/etc/inc/voucher.inc:812
+msgid "Syncing vouchers"
+msgstr ""
+
 #: src/etc/inc/vpn.inc:271
 msgid "Configuring IPsec VPN... "
 msgstr ""
 
-#: src/etc/inc/vpn.inc:659
+#: src/etc/inc/vpn.inc:312
+#, php-format
+msgid ""
+"IPsec ERROR: Could not find phase 1 source for connection %s. Omitting from "
+"configuration file."
+msgstr ""
+
+#: src/etc/inc/vpn.inc:341
+#, php-format
+msgid "The remote gateway %s already exists on another phase 1 entry"
+msgstr ""
+
+#: src/etc/inc/vpn.inc:657
 #, php-format
 msgid "Warning: Missing CRL data for %s"
 msgstr ""
 
-#: src/etc/inc/vpn.inc:664
+#: src/etc/inc/vpn.inc:662
 #, php-format
 msgid "Error: Cannot write IPsec CRL file for %s"
 msgstr ""
 
-#: src/etc/inc/vpn.inc:688
+#: src/etc/inc/vpn.inc:686
 #, php-format
 msgid "Error: Invalid phase1 certificate reference for %s"
 msgstr ""
 
-#: src/etc/inc/vpn.inc:706
+#: src/etc/inc/vpn.inc:704
 #, php-format
 msgid "Error: Cannot write phase1 key file for %s"
 msgstr ""
 
-#: src/etc/inc/vpn.inc:713
+#: src/etc/inc/vpn.inc:711
 #, php-format
 msgid "Error: Cannot write phase1 certificate file for %s"
 msgstr ""
 
-#: src/etc/inc/vpn.inc:778
+#: src/etc/inc/vpn.inc:776
 #, php-format
 msgid "Error: Invalid certificate hash info for %s"
 msgstr ""
 
-#: src/etc/inc/vpn.inc:783
+#: src/etc/inc/vpn.inc:781
 #, php-format
 msgid "Error: Cannot write IPsec CA file for %s"
 msgstr ""
 
-#: src/etc/inc/vpn.inc:1520
+#: src/etc/inc/vpn.inc:1406
+#, php-format
+msgid "No phase2 specifications for tunnel with REQID = %s"
+msgstr ""
+
+#: src/etc/inc/vpn.inc:1524
 #, php-format
 msgid "Ignoring IPsec reload since there are no tunnels on interface %s"
 msgstr ""
 
-#: src/etc/inc/vpn.inc:1526
+#: src/etc/inc/vpn.inc:1530
 msgid "Forcefully reloading IPsec"
 msgstr ""
 
-#: src/etc/inc/vpn.inc:1576
+#: src/etc/inc/vpn.inc:1580
 msgid "Configuring PPPoE Server service... "
 msgstr ""
 
-#: src/etc/inc/vpn.inc:1601
+#: src/etc/inc/vpn.inc:1605
 #, php-format
 msgid "Error: cannot open mpd.conf in vpn_pppoe_configure()."
 msgstr ""
 
-#: src/etc/inc/vpn.inc:1723
+#: src/etc/inc/vpn.inc:1727
 #, php-format
 msgid "Error: cannot open mpd.links in vpn_pppoe_configure()."
 msgstr ""
 
-#: src/etc/inc/vpn.inc:1750
+#: src/etc/inc/vpn.inc:1754
 #, php-format
 msgid "Error: cannot open mpd.secret in vpn_pppoe_configure()."
 msgstr ""
 
-#: src/etc/inc/vpn.inc:1784
+#: src/etc/inc/vpn.inc:1788
 msgid "done"
 msgstr ""
 
-#: src/etc/inc/vpn.inc:1806
+#: src/etc/inc/vpn.inc:1810
 msgid "Configuring l2tp VPN service... "
 msgstr ""
 
-#: src/etc/inc/vpn.inc:1845
+#: src/etc/inc/vpn.inc:1849
 #, php-format
 msgid "Error: cannot open mpd.conf in vpn_l2tp_configure()."
 msgstr ""
 
-#: src/etc/inc/vpn.inc:1948
+#: src/etc/inc/vpn.inc:1952
 #, php-format
 msgid "Error: cannot open mpd.links in vpn_l2tp_configure()."
 msgstr ""
 
-#: src/etc/inc/vpn.inc:1975
+#: src/etc/inc/vpn.inc:1979
 #, php-format
 msgid "Error: cannot open mpd.secret in vpn_l2tp_configure()."
 msgstr ""
@@ -5212,6 +6926,13 @@ msgstr ""
 msgid "Error returned while trying to parse %s"
 msgstr ""
 
+#: src/etc/inc/xmlrpc.inc:122
+#, php-format
+msgid ""
+"webConfigurator authentication error for 'admin' from %s during sync "
+"settings."
+msgstr ""
+
 #: src/etc/inc/xmlrpc_client.inc:152
 msgid "Unknown method"
 msgstr ""
@@ -5358,96 +7079,92 @@ msgstr ""
 
 #: src/usr/local/www/crash_reporter.php:90 src/usr/local/www/diag_arp.php:286
 #: src/usr/local/www/diag_authentication.php:103
-#: src/usr/local/www/diag_backup.php:596 src/usr/local/www/diag_confbak.php:135
+#: src/usr/local/www/diag_backup.php:596 src/usr/local/www/diag_command.php:125
+#: src/usr/local/www/diag_confbak.php:135
 #: src/usr/local/www/diag_defaults.php:73 src/usr/local/www/diag_dns.php:63
 #: src/usr/local/www/diag_dump_states.php:108
 #: src/usr/local/www/diag_dump_states_sources.php:87
-#: src/usr/local/www/diag_gmirror.php:67 src/usr/local/www/diag_halt.php:78
+#: src/usr/local/www/diag_edit.php:65 src/usr/local/www/diag_gmirror.php:67
+#: src/usr/local/www/diag_halt.php:78
 #: src/usr/local/www/diag_limiter_info.php:65
 #: src/usr/local/www/diag_nanobsd.php:74 src/usr/local/www/diag_ndp.php:128
 #: src/usr/local/www/diag_packet_capture.php:118
 #: src/usr/local/www/diag_pf_info.php:65 src/usr/local/www/diag_pftop.php:65
 #: src/usr/local/www/diag_ping.php:68 src/usr/local/www/diag_reboot.php:76
 #: src/usr/local/www/diag_resetstate.php:89
-#: src/usr/local/www/diag_routes.php:97 src/usr/local/www/diag_smart.php:66
+#: src/usr/local/www/diag_routes.php:97 src/usr/local/www/diag_smart.php:70
 #: src/usr/local/www/diag_sockets.php:65
 #: src/usr/local/www/diag_states_summary.php:221
 #: src/usr/local/www/diag_system_activity.php:65
 #: src/usr/local/www/diag_tables.php:64 src/usr/local/www/diag_testport.php:71
-#: src/usr/local/www/diag_traceroute.php:70 src/usr/local/www/edit.php:65
-#: src/usr/local/www/exec.php:125
+#: src/usr/local/www/diag_traceroute.php:70 src/usr/local/www/head.inc:596
 msgid "Diagnostics"
 msgstr ""
 
 #: src/usr/local/www/crash_reporter.php:90
-msgid "Crash reporter"
+msgid "Crash Reporter"
 msgstr ""
 
-#: src/usr/local/www/crash_reporter.php:103
+#: src/usr/local/www/crash_reporter.php:102
 msgid "Processing..."
 msgstr ""
 
-#: src/usr/local/www/crash_reporter.php:115
+#: src/usr/local/www/crash_reporter.php:114
 msgid "Uploading..."
 msgstr ""
 
-#: src/usr/local/www/crash_reporter.php:125
-#: src/usr/local/www/services_captiveportal_zones_edit.php:119
-msgid "Continue"
-msgstr ""
-
-#: src/usr/local/www/crash_reporter.php:125
+#: src/usr/local/www/crash_reporter.php:124
 msgid " and delete crash report files from local disk."
 msgstr ""
 
-#: src/usr/local/www/crash_reporter.php:127
+#: src/usr/local/www/crash_reporter.php:126
 msgid "Could not find any crash files."
 msgstr ""
 
-#: src/usr/local/www/crash_reporter.php:150
+#: src/usr/local/www/crash_reporter.php:149
 msgid "Could not locate any crash data."
 msgstr ""
 
-#: src/usr/local/www/crash_reporter.php:154
-msgid "Unfortunately we have detected a programming bug."
+#: src/usr/local/www/crash_reporter.php:153
+msgid "Unfortunately We Have Detected a Programming Bug"
 msgstr ""
 
-#: src/usr/local/www/crash_reporter.php:158
+#: src/usr/local/www/crash_reporter.php:157
 msgid ""
 "Would you like to submit the programming debug logs to the pfSense "
 "developers for inspection?"
 msgstr ""
 
-#: src/usr/local/www/crash_reporter.php:159
+#: src/usr/local/www/crash_reporter.php:158
 msgid ""
 "Please double check the contents to ensure you are comfortable sending this "
 "information before clicking Yes."
 msgstr ""
 
-#: src/usr/local/www/crash_reporter.php:165
+#: src/usr/local/www/crash_reporter.php:164
 #: src/usr/local/www/diag_defaults.php:77
-#: src/usr/local/www/diag_defaults.php:105 src/usr/local/www/pkg.php:508
+#: src/usr/local/www/diag_defaults.php:105 src/usr/local/www/pkg.php:509
 msgid "Yes"
 msgstr ""
 
-#: src/usr/local/www/crash_reporter.php:165
+#: src/usr/local/www/crash_reporter.php:164
 msgid "Submit this to the developers for inspection"
 msgstr ""
 
-#: src/usr/local/www/crash_reporter.php:166
+#: src/usr/local/www/crash_reporter.php:165
 #: src/usr/local/www/diag_defaults.php:68
-#: src/usr/local/www/diag_defaults.php:106 src/usr/local/www/diag_halt.php:108
+#: src/usr/local/www/diag_defaults.php:106 src/usr/local/www/diag_halt.php:106
 #: src/usr/local/www/diag_pf_info.php:67 src/usr/local/www/diag_reboot.php:147
-#: src/usr/local/www/pkg.php:506
+#: src/usr/local/www/pkg.php:507
 msgid "No"
 msgstr ""
 
-#: src/usr/local/www/crash_reporter.php:166
+#: src/usr/local/www/crash_reporter.php:165
 msgid "Just delete the crash report and take me back to the Dashboard"
 msgstr ""
 
 #: src/usr/local/www/diag_arp.php:286 src/usr/local/www/diag_arp.php:337
-#: src/usr/local/www/head.inc:329
+#: src/usr/local/www/head.inc:365
 msgid "ARP Table"
 msgstr ""
 
@@ -5456,29 +7173,30 @@ msgid " Loading, please wait..."
 msgstr ""
 
 #: src/usr/local/www/diag_arp.php:344
-#: src/usr/local/www/diag_dump_states.php:187
+#: src/usr/local/www/diag_dump_states.php:163
+#: src/usr/local/www/diag_dump_states.php:202
 #: src/usr/local/www/diag_ndp.php:143
-#: src/usr/local/www/diag_packet_capture.php:297
-#: src/usr/local/www/firewall_nat.php:245
+#: src/usr/local/www/diag_packet_capture.php:301
+#: src/usr/local/www/firewall_nat.php:238
 #: src/usr/local/www/firewall_nat_1to1.php:183
 #: src/usr/local/www/firewall_nat_1to1_edit.php:152
 #: src/usr/local/www/firewall_nat_1to1_edit.php:155
 #: src/usr/local/www/firewall_nat_1to1_edit.php:446
 #: src/usr/local/www/firewall_nat_edit.php:245
 #: src/usr/local/www/firewall_nat_edit.php:248
-#: src/usr/local/www/firewall_nat_edit.php:717
+#: src/usr/local/www/firewall_nat_edit.php:711
 #: src/usr/local/www/firewall_nat_npt.php:183
 #: src/usr/local/www/firewall_nat_npt_edit.php:133
 #: src/usr/local/www/firewall_nat_npt_edit.php:232
 #: src/usr/local/www/firewall_nat_out.php:311
-#: src/usr/local/www/firewall_nat_out.php:563
+#: src/usr/local/www/firewall_nat_out.php:562
 #: src/usr/local/www/firewall_nat_out_edit.php:181
 #: src/usr/local/www/firewall_nat_out_edit.php:493
-#: src/usr/local/www/firewall_rules_edit.php:1154
-#: src/usr/local/www/firewall_rules_edit.php:1162
+#: src/usr/local/www/firewall_rules_edit.php:1191
+#: src/usr/local/www/firewall_rules_edit.php:1199
 #: src/usr/local/www/firewall_virtual_ip.php:296
-#: src/usr/local/www/firewall_virtual_ip_edit.php:403
-#: src/usr/local/www/interfaces_assign.php:535
+#: src/usr/local/www/firewall_virtual_ip_edit.php:392
+#: src/usr/local/www/interfaces_assign.php:539
 #: src/usr/local/www/interfaces_bridge.php:136
 #: src/usr/local/www/interfaces_gif.php:131
 #: src/usr/local/www/interfaces_gre.php:131
@@ -5486,36 +7204,36 @@ msgstr ""
 #: src/usr/local/www/interfaces_ppps.php:130
 #: src/usr/local/www/interfaces_qinq.php:143
 #: src/usr/local/www/interfaces_vlan.php:140
-#: src/usr/local/www/interfaces_wireless.php:135
+#: src/usr/local/www/interfaces_wireless.php:133
 #: src/usr/local/www/services_captiveportal.php:246
 #: src/usr/local/www/services_dhcp_relay.php:111
 #: src/usr/local/www/services_dhcpv6_relay.php:112
 #: src/usr/local/www/services_dyndns.php:120
 #: src/usr/local/www/services_igmpproxy_edit.php:188
-#: src/usr/local/www/services_ntpd.php:292
+#: src/usr/local/www/services_ntpd.php:244
 #: src/usr/local/www/services_pppoe.php:137
 #: src/usr/local/www/services_pppoe_edit.php:340
 #: src/usr/local/www/services_rfc2136.php:113
-#: src/usr/local/www/services_rfc2136_edit.php:191
+#: src/usr/local/www/services_rfc2136_edit.php:210
 #: src/usr/local/www/services_wol.php:173
 #: src/usr/local/www/services_wol.php:200
 #: src/usr/local/www/services_wol_edit.php:106
 #: src/usr/local/www/services_wol_edit.php:159
-#: src/usr/local/www/status_dhcp_leases.php:476
+#: src/usr/local/www/status_dhcp_leases.php:494
 #: src/usr/local/www/status_graph.php:166
-#: src/usr/local/www/status_logs_common.inc:492
-#: src/usr/local/www/status_logs_common.inc:524
-#: src/usr/local/www/status_logs_common.inc:527
+#: src/usr/local/www/status_logs_common.inc:503
+#: src/usr/local/www/status_logs_common.inc:535
+#: src/usr/local/www/status_logs_common.inc:538
 #: src/usr/local/www/status_logs_filter.php:184
 #: src/usr/local/www/status_logs_filter_dynamic.php:424
 #: src/usr/local/www/system_gateways.php:277
-#: src/usr/local/www/system_gateways_edit.php:141
-#: src/usr/local/www/system_gateways_edit.php:680
+#: src/usr/local/www/system_gateways_edit.php:142
+#: src/usr/local/www/system_gateways_edit.php:621
 #: src/usr/local/www/system_routes.php:278
-#: src/usr/local/www/vpn_ipsec_phase1.php:687
+#: src/usr/local/www/vpn_ipsec_phase1.php:713
 #: src/usr/local/www/vpn_l2tp.php:264
-#: src/usr/local/www/vpn_openvpn_client.php:486
-#: src/usr/local/www/vpn_openvpn_server.php:676
+#: src/usr/local/www/vpn_openvpn_client.php:490
+#: src/usr/local/www/vpn_openvpn_server.php:680
 #: src/usr/local/www/widgets/widgets/wake_on_lan.widget.php:74
 msgid "Interface"
 msgstr ""
@@ -5523,40 +7241,40 @@ msgstr ""
 #: src/usr/local/www/diag_arp.php:346 src/usr/local/www/diag_ndp.php:141
 #: src/usr/local/www/services_captiveportal_mac.php:209
 #: src/usr/local/www/services_captiveportal_mac_edit.php:131
-#: src/usr/local/www/services_dhcp.php:1293
+#: src/usr/local/www/services_dhcp.php:1316
 #: src/usr/local/www/services_wol.php:180
 #: src/usr/local/www/services_wol.php:201
 #: src/usr/local/www/services_wol_edit.php:106
 #: src/usr/local/www/services_wol_edit.php:166
-#: src/usr/local/www/status_captiveportal.php:179
+#: src/usr/local/www/status_captiveportal.php:186
 #: src/usr/local/www/status_dhcp_leases.php:380
-#: src/usr/local/www/status_dhcpv6_leases.php:456
-#: src/usr/local/www/widgets/widgets/captive_portal_status.widget.php:134
+#: src/usr/local/www/status_dhcpv6_leases.php:460
+#: src/usr/local/www/widgets/widgets/captive_portal_status.widget.php:130
 msgid "MAC address"
 msgstr ""
 
 #: src/usr/local/www/diag_arp.php:347 src/usr/local/www/diag_dns.php:227
 #: src/usr/local/www/diag_ndp.php:142 src/usr/local/www/diag_ping.php:176
-#: src/usr/local/www/diag_testport.php:255
+#: src/usr/local/www/diag_testport.php:254
 #: src/usr/local/www/diag_traceroute.php:164
-#: src/usr/local/www/interfaces.php:1936
+#: src/usr/local/www/interfaces.php:1926
 #: src/usr/local/www/services_captiveportal_hostname.php:150
 #: src/usr/local/www/services_captiveportal_hostname_edit.php:219
-#: src/usr/local/www/services_dhcp.php:1295
-#: src/usr/local/www/services_dhcp_edit.php:460
-#: src/usr/local/www/services_dhcpv6.php:904
-#: src/usr/local/www/services_dhcpv6_edit.php:250
+#: src/usr/local/www/services_dhcp.php:1318
+#: src/usr/local/www/services_dhcp_edit.php:464
+#: src/usr/local/www/services_dhcpv6.php:1004
+#: src/usr/local/www/services_dhcpv6_edit.php:267
 #: src/usr/local/www/services_dyndns.php:122
 #: src/usr/local/www/services_dyndns_edit.php:128
-#: src/usr/local/www/services_dyndns_edit.php:310
-#: src/usr/local/www/services_dyndns_edit.php:314
+#: src/usr/local/www/services_dyndns_edit.php:320
+#: src/usr/local/www/services_dyndns_edit.php:324
 #: src/usr/local/www/services_rfc2136.php:115
 #: src/usr/local/www/services_rfc2136_edit.php:112
-#: src/usr/local/www/services_rfc2136_edit.php:198
+#: src/usr/local/www/services_rfc2136_edit.php:217
 #: src/usr/local/www/status_dhcp_leases.php:381
-#: src/usr/local/www/status_dhcpv6_leases.php:457
-#: src/usr/local/www/system.php:143 src/usr/local/www/system.php:370
-#: src/usr/local/www/widgets/widgets/dyn_dns_status.widget.php:112
+#: src/usr/local/www/status_dhcpv6_leases.php:461
+#: src/usr/local/www/system.php:143 src/usr/local/www/system.php:376
+#: src/usr/local/www/widgets/widgets/dyn_dns_status.widget.php:130
 msgid "Hostname"
 msgstr ""
 
@@ -5582,12 +7300,10 @@ msgstr ""
 
 #: src/usr/local/www/diag_authentication.php:82
 #: src/usr/local/www/status_logs_vpn.php:172
-#: src/usr/local/www/status_logs_vpn.php:425
-#: src/usr/local/www/system_usermanager.php:121
-#: src/usr/local/www/vpn_l2tp_users_edit.php:63
+#: src/usr/local/www/status_logs_vpn.php:417
 #: src/usr/local/www/vpn_l2tp_users_edit.php:185
 #: src/usr/local/www/widgets/widgets/ipsec.widget.php:250
-#: src/usr/local/www/services_rfc2136_edit.php:238
+#: src/usr/local/www/services_rfc2136_edit.php:257
 msgid "User"
 msgstr ""
 
@@ -5604,78 +7320,24 @@ msgid "Authentication failed."
 msgstr ""
 
 #: src/usr/local/www/diag_authentication.php:103
-#: src/usr/local/www/guiconfig.inc:189 src/usr/local/www/head.inc:330
-#: src/usr/local/www/services_captiveportal.php:718
+#: src/usr/local/www/guiconfig.inc:189 src/usr/local/www/head.inc:366
+#: src/usr/local/www/services_captiveportal.php:719
 msgid "Authentication"
 msgstr ""
 
-#: src/usr/local/www/diag_authentication.php:119
+#: src/usr/local/www/diag_authentication.php:117
 msgid "Authentication Test"
 msgstr ""
 
-#: src/usr/local/www/diag_authentication.php:127
+#: src/usr/local/www/diag_authentication.php:125
 #: src/usr/local/www/system_usermanager_settings.php:175
 msgid "Authentication Server"
 msgstr ""
 
-#: src/usr/local/www/diag_authentication.php:130
+#: src/usr/local/www/diag_authentication.php:128
 msgid "Select the authentication server to test against"
 msgstr ""
 
-#: src/usr/local/www/diag_authentication.php:134
-#: src/usr/local/www/interfaces.php:2489 src/usr/local/www/interfaces.php:2555
-#: src/usr/local/www/interfaces.php:2686
-#: src/usr/local/www/interfaces_ppps_edit.php:238
-#: src/usr/local/www/interfaces_ppps_edit.php:241
-#: src/usr/local/www/interfaces_ppps_edit.php:249
-#: src/usr/local/www/interfaces_ppps_edit.php:252
-#: src/usr/local/www/interfaces_ppps_edit.php:603
-#: src/usr/local/www/services_dyndns_edit.php:132
-#: src/usr/local/www/services_dyndns_edit.php:371
-#: src/usr/local/www/services_pppoe_edit.php:540
-#: src/usr/local/www/status_captiveportal.php:182
-#: src/usr/local/www/system_usermanager.php:182
-#: src/usr/local/www/system_usermanager.php:187
-#: src/usr/local/www/system_usermanager.php:192
-#: src/usr/local/www/system_usermanager.php:495
-#: src/usr/local/www/system_usermanager.php:625
-#: src/usr/local/www/vpn_l2tp_users.php:129
-#: src/usr/local/www/vpn_l2tp_users_edit.php:108
-#: src/usr/local/www/vpn_l2tp_users_edit.php:111
-#: src/usr/local/www/vpn_l2tp_users_edit.php:189
-#: src/usr/local/www/vpn_openvpn_client.php:528
-#: src/usr/local/www/vpn_openvpn_client.php:561
-#: src/usr/local/www/widgets/widgets/captive_portal_status.widget.php:135
-msgid "Username"
-msgstr ""
-
-#: src/usr/local/www/diag_authentication.php:142
-#: src/usr/local/www/diag_backup.php:658 src/usr/local/www/diag_backup.php:702
-#: src/usr/local/www/interfaces.php:2496 src/usr/local/www/interfaces.php:2562
-#: src/usr/local/www/interfaces.php:2693
-#: src/usr/local/www/interfaces_ppps_edit.php:238
-#: src/usr/local/www/interfaces_ppps_edit.php:241
-#: src/usr/local/www/interfaces_ppps_edit.php:249
-#: src/usr/local/www/interfaces_ppps_edit.php:252
-#: src/usr/local/www/interfaces_ppps_edit.php:610
-#: src/usr/local/www/services_dyndns_edit.php:130
-#: src/usr/local/www/services_dyndns_edit.php:381
-#: src/usr/local/www/services_pppoe_edit.php:547
-#: src/usr/local/www/system_advanced_notifications.php:275
-#: src/usr/local/www/system_authservers.php:614
-#: src/usr/local/www/system_usermanager.php:188
-#: src/usr/local/www/system_usermanager.php:193
-#: src/usr/local/www/system_usermanager.php:641
-#: src/usr/local/www/system_usermanager.php:644
-#: src/usr/local/www/system_usermanager_passwordmg.php:74
-#: src/usr/local/www/system_usermanager_passwordmg.php:135
-#: src/usr/local/www/vpn_l2tp_users_edit.php:111
-#: src/usr/local/www/vpn_l2tp_users_edit.php:196
-#: src/usr/local/www/vpn_openvpn_client.php:535
-#: src/usr/local/www/vpn_openvpn_client.php:568
-msgid "Password"
-msgstr ""
-
 #: src/usr/local/www/diag_backup.php:111 src/usr/local/www/diag_backup.php:126
 #, php-format
 msgid "Cannot write %s"
@@ -5700,16 +7362,16 @@ msgid "Restore configuration"
 msgstr ""
 
 #: src/usr/local/www/diag_backup.php:210
-#: src/usr/local/www/pkg_mgr_installed.php:215
-#: src/usr/local/www/widgets/widgets/installed_packages.widget.php:159
+#: src/usr/local/www/pkg_mgr_installed.php:213
+#: src/usr/local/www/widgets/widgets/installed_packages.widget.php:156
 msgid "Reinstall"
 msgstr ""
 
-#: src/usr/local/www/diag_backup.php:212 src/usr/local/www/diag_backup.php:735
+#: src/usr/local/www/diag_backup.php:212 src/usr/local/www/diag_backup.php:739
 msgid "Clear Package Lock"
 msgstr ""
 
-#: src/usr/local/www/diag_backup.php:214 src/usr/local/www/exec.php:265
+#: src/usr/local/www/diag_backup.php:214 src/usr/local/www/diag_command.php:265
 msgid "Download"
 msgstr ""
 
@@ -5748,7 +7410,7 @@ msgstr ""
 
 #: src/usr/local/www/diag_backup.php:350
 msgid ""
-"The configuration area has been restored.  You may need to reboot the "
+"The configuration area has been restored. You may need to reboot the "
 "firewall."
 msgstr ""
 
@@ -5785,11 +7447,11 @@ msgid "No version selected."
 msgstr ""
 
 #: src/usr/local/www/diag_backup.php:556
-#: src/usr/local/www/firewall_aliases.php:197
+#: src/usr/local/www/firewall_aliases.php:201
 #: src/usr/local/www/firewall_aliases_edit.php:71
 #: src/usr/local/www/firewall_aliases_import.php:72
 #: src/usr/local/www/firewall_aliases_import.php:93
-#: src/usr/local/www/head.inc:238
+#: src/usr/local/www/head.inc:275
 msgid "Aliases"
 msgstr ""
 
@@ -5797,18 +7459,18 @@ msgstr ""
 msgid "Captive Portal Vouchers"
 msgstr ""
 
-#: src/usr/local/www/diag_backup.php:561 src/usr/local/www/head.inc:255
-#: src/usr/local/www/services_dhcp.php:698
-#: src/usr/local/www/status_rrd_graph.php:468
-#: src/usr/local/www/status_rrd_graph_settings.php:177
+#: src/usr/local/www/diag_backup.php:561 src/usr/local/www/head.inc:292
+#: src/usr/local/www/services_dhcp.php:726
+#: src/usr/local/www/services_dhcp_edit.php:414
 msgid "DHCP Server"
 msgstr ""
 
 #: src/usr/local/www/diag_backup.php:562
-#: src/usr/local/www/services_dhcpv6.php:439
-#: src/usr/local/www/services_dhcpv6.php:515
-#: src/usr/local/www/services_dhcpv6.php:528
-#: src/usr/local/www/services_router_advertisements.php:282
+#: src/usr/local/www/services_dhcpv6.php:509
+#: src/usr/local/www/services_dhcpv6.php:589
+#: src/usr/local/www/services_dhcpv6.php:602
+#: src/usr/local/www/services_dhcpv6_edit.php:234
+#: src/usr/local/www/services_router_advertisements.php:288
 msgid "DHCPv6 Server"
 msgstr ""
 
@@ -5816,12 +7478,11 @@ msgstr ""
 msgid "Firewall Rules"
 msgstr ""
 
-#: src/usr/local/www/diag_backup.php:564
-#: src/usr/local/www/firewall_shaper.php:75 src/usr/local/www/head.inc:293
-#: src/usr/local/www/interfaces.php:1648
+#: src/usr/local/www/diag_backup.php:564 src/usr/local/www/head.inc:330
+#: src/usr/local/www/interfaces.php:1637
 #: src/usr/local/www/interfaces_assign.php:67
 #: src/usr/local/www/interfaces_bridge.php:109
-#: src/usr/local/www/interfaces_bridge_edit.php:360
+#: src/usr/local/www/interfaces_bridge_edit.php:403
 #: src/usr/local/www/interfaces_gif.php:103
 #: src/usr/local/www/interfaces_gif_edit.php:195
 #: src/usr/local/www/interfaces_gre.php:104
@@ -5831,14 +7492,14 @@ msgstr ""
 #: src/usr/local/www/interfaces_lagg.php:110
 #: src/usr/local/www/interfaces_lagg_edit.php:241
 #: src/usr/local/www/interfaces_ppps.php:106
-#: src/usr/local/www/interfaces_ppps_edit.php:451
+#: src/usr/local/www/interfaces_ppps_edit.php:462
 #: src/usr/local/www/interfaces_qinq.php:114
 #: src/usr/local/www/interfaces_qinq_edit.php:63
 #: src/usr/local/www/interfaces_vlan.php:109
-#: src/usr/local/www/interfaces_vlan_edit.php:202
+#: src/usr/local/www/interfaces_vlan_edit.php:205
 #: src/usr/local/www/interfaces_wireless.php:105
 #: src/usr/local/www/interfaces_wireless_edit.php:201
-#: src/usr/local/www/services_captiveportal.php:583
+#: src/usr/local/www/services_captiveportal.php:584
 #: src/usr/local/www/services_captiveportal_zones.php:113
 #: src/usr/local/www/services_dnsmasq.php:319
 #: src/usr/local/www/status_interfaces.php:108
@@ -5851,21 +7512,21 @@ msgstr ""
 msgid "IPSEC"
 msgstr ""
 
-#: src/usr/local/www/diag_backup.php:566 src/usr/local/www/firewall_nat.php:213
+#: src/usr/local/www/diag_backup.php:566 src/usr/local/www/firewall_nat.php:206
 #: src/usr/local/www/firewall_nat_1to1.php:155
 #: src/usr/local/www/firewall_nat_1to1_edit.php:281
-#: src/usr/local/www/firewall_nat_edit.php:659
+#: src/usr/local/www/firewall_nat_edit.php:653
 #: src/usr/local/www/firewall_nat_npt.php:155
 #: src/usr/local/www/firewall_nat_npt_edit.php:212
 #: src/usr/local/www/firewall_nat_out.php:239
 #: src/usr/local/www/firewall_nat_out_edit.php:393
-#: src/usr/local/www/head.inc:239
+#: src/usr/local/www/head.inc:276
 msgid "NAT"
 msgstr ""
 
-#: src/usr/local/www/diag_backup.php:568 src/usr/local/www/head.inc:536
-#: src/usr/local/www/pkg_mgr.php:72 src/usr/local/www/pkg_mgr.php:163
-#: src/usr/local/www/pkg_mgr_install.php:266
+#: src/usr/local/www/diag_backup.php:568 src/usr/local/www/head.inc:247
+#: src/usr/local/www/head.inc:594 src/usr/local/www/pkg_mgr.php:72
+#: src/usr/local/www/pkg_mgr.php:163 src/usr/local/www/pkg_mgr_install.php:244
 #: src/usr/local/www/pkg_mgr_installed.php:68
 #: src/usr/local/www/pkg_mgr_installed.php:75
 msgid "Package Manager"
@@ -5883,45 +7544,42 @@ msgstr ""
 msgid "Syslog"
 msgstr ""
 
-#: src/usr/local/www/diag_backup.php:572 src/usr/local/www/head.inc:536
+#: src/usr/local/www/diag_backup.php:572 src/usr/local/www/head.inc:594
 #: src/usr/local/www/pkg_mgr.php:72 src/usr/local/www/pkg_mgr.php:163
-#: src/usr/local/www/pkg_mgr_install.php:262
-#: src/usr/local/www/pkg_mgr_install.php:266
+#: src/usr/local/www/pkg_mgr_install.php:240
+#: src/usr/local/www/pkg_mgr_install.php:244
 #: src/usr/local/www/pkg_mgr_installed.php:68
 #: src/usr/local/www/pkg_mgr_installed.php:75
-#: src/usr/local/www/status_logs_common.inc:110
+#: src/usr/local/www/status_logs.php:129
+#: src/usr/local/www/status_logs_common.inc:121
 #: src/usr/local/www/status_logs_settings.php:233
-#: src/usr/local/www/status_rrd_graph.php:436
-#: src/usr/local/www/status_rrd_graph_img.php:66
-#: src/usr/local/www/status_rrd_graph_settings.php:75
-#: src/usr/local/www/status_rrd_graph_settings.php:146
-#: src/usr/local/www/system.php:113 src/usr/local/www/system.php:352
-#: src/usr/local/www/system.php:367
+#: src/usr/local/www/system.php:113 src/usr/local/www/system.php:358
+#: src/usr/local/www/system.php:373
 #: src/usr/local/www/system_advanced_admin.php:316
 #: src/usr/local/www/system_advanced_firewall.php:404
 #: src/usr/local/www/system_advanced_misc.php:304
 #: src/usr/local/www/system_advanced_network.php:173
 #: src/usr/local/www/system_advanced_notifications.php:216
 #: src/usr/local/www/system_advanced_sysctl.php:166
-#: src/usr/local/www/system_authservers.php:67
-#: src/usr/local/www/system_camanager.php:75
-#: src/usr/local/www/system_certmanager.php:82
-#: src/usr/local/www/system_crlmanager.php:70
+#: src/usr/local/www/system_authservers.php:377
+#: src/usr/local/www/system_camanager.php:351
+#: src/usr/local/www/system_certmanager.php:559
+#: src/usr/local/www/system_crlmanager.php:293
 #: src/usr/local/www/system_gateway_groups.php:124
 #: src/usr/local/www/system_gateway_groups_edit.php:180
 #: src/usr/local/www/system_gateways.php:245
-#: src/usr/local/www/system_gateways_edit.php:631
-#: src/usr/local/www/system_groupmanager.php:70
-#: src/usr/local/www/system_groupmanager_addprivs.php:83
-#: src/usr/local/www/system_hasync.php:131
+#: src/usr/local/www/system_gateways_edit.php:572
+#: src/usr/local/www/system_groupmanager.php:274
+#: src/usr/local/www/system_groupmanager_addprivs.php:69
+#: src/usr/local/www/system_hasync.php:137
 #: src/usr/local/www/system_routes.php:246
 #: src/usr/local/www/system_routes_edit.php:257
 #: src/usr/local/www/system_update_settings.php:99
-#: src/usr/local/www/system_usermanager.php:72
+#: src/usr/local/www/system_usermanager.php:467
 #: src/usr/local/www/system_usermanager_addprivs.php:70
 #: src/usr/local/www/system_usermanager_passwordmg.php:67
 #: src/usr/local/www/system_usermanager_settings.php:75
-#: src/usr/local/www/widgets/widgets/installed_packages.widget.php:183
+#: src/usr/local/www/widgets/widgets/installed_packages.widget.php:180
 #: src/usr/local/www/widgets/widgets/thermal_sensors.widget.php:277
 msgid "System"
 msgstr ""
@@ -5943,7 +7601,7 @@ msgstr ""
 #: src/usr/local/www/firewall_shaper_queues.php:221
 #: src/usr/local/www/firewall_shaper_vinterface.php:73
 #: src/usr/local/www/firewall_shaper_wizards.php:96
-#: src/usr/local/www/head.inc:242
+#: src/usr/local/www/head.inc:279
 msgid "Traffic Shaper"
 msgstr ""
 
@@ -5951,25 +7609,27 @@ msgstr ""
 msgid "VLANS"
 msgstr ""
 
-#: src/usr/local/www/diag_backup.php:578 src/usr/local/www/head.inc:273
+#: src/usr/local/www/diag_backup.php:578 src/usr/local/www/head.inc:310
 #: src/usr/local/www/services_wol.php:146
 #: src/usr/local/www/services_wol.php:169
 #: src/usr/local/www/services_wol_edit.php:137
-msgid "Wake on LAN"
+msgid "Wake-on-LAN"
 msgstr ""
 
 #: src/usr/local/www/diag_backup.php:581
-#: src/usr/local/www/firewall_aliases.php:188
-#: src/usr/local/www/pkg_edit.php:1196
+#: src/usr/local/www/firewall_aliases.php:192
+#: src/usr/local/www/pkg_edit.php:1198
 #: src/usr/local/www/services_ntpd_gps.php:205
-#: src/usr/local/www/services_unbound.php:223
-#: src/usr/local/www/status_graph.php:185 src/usr/local/www/diag_smart.php:346
+#: src/usr/local/www/services_unbound.php:248
+#: src/usr/local/www/status_graph.php:185 src/usr/local/www/diag_smart.php:354
 msgid "All"
 msgstr ""
 
-#: src/usr/local/www/diag_backup.php:596 src/usr/local/www/diag_backup.php:620
-#: src/usr/local/www/diag_confbak.php:144 src/usr/local/www/head.inc:331
-msgid "Backup/Restore"
+#: src/usr/local/www/diag_backup.php:596 src/usr/local/www/diag_backup.php:619
+#: src/usr/local/www/diag_confbak.php:135
+#: src/usr/local/www/diag_confbak.php:143 src/usr/local/www/head.inc:367
+#: src/usr/local/www/head.inc:596
+msgid "Backup & Restore"
 msgstr ""
 
 #: src/usr/local/www/diag_backup.php:612
@@ -5980,12 +7640,13 @@ msgstr ""
 msgid "The firewall is now rebooting."
 msgstr ""
 
-#: src/usr/local/www/diag_backup.php:619 src/usr/local/www/diag_confbak.php:143
+#: src/usr/local/www/diag_backup.php:620 src/usr/local/www/diag_confbak.php:135
+#: src/usr/local/www/diag_confbak.php:144
 msgid "Config History"
 msgstr ""
 
 #: src/usr/local/www/diag_backup.php:626
-msgid "Backup configuration"
+msgid "Backup Configuration"
 msgstr ""
 
 #: src/usr/local/www/diag_backup.php:630
@@ -6000,60 +7661,127 @@ msgstr ""
 msgid "Skip RRD data"
 msgstr ""
 
-#: src/usr/local/www/diag_backup.php:651 src/usr/local/www/diag_backup.php:695
+#: src/usr/local/www/diag_backup.php:651 src/usr/local/www/diag_backup.php:696
 msgid "Encryption"
 msgstr ""
 
-#: src/usr/local/www/diag_backup.php:666
+#: src/usr/local/www/diag_backup.php:667
 msgid "Download configuration as XML"
 msgstr ""
 
-#: src/usr/local/www/diag_backup.php:672
-msgid "Restore backup"
+#: src/usr/local/www/diag_backup.php:673
+msgid "Restore Backup"
 msgstr ""
 
-#: src/usr/local/www/diag_backup.php:676
+#: src/usr/local/www/diag_backup.php:677
 #, php-format
 msgid ""
 "Open a %s configuration XML file and click the button below to restore the "
 "configuration."
 msgstr ""
 
-#: src/usr/local/www/diag_backup.php:681
+#: src/usr/local/www/diag_backup.php:682
 msgid "Restore area"
 msgstr ""
 
-#: src/usr/local/www/diag_backup.php:688
+#: src/usr/local/www/diag_backup.php:689
 msgid "Configuration file"
 msgstr ""
 
-#: src/usr/local/www/diag_backup.php:711
+#: src/usr/local/www/diag_backup.php:713
 msgid "Restore Configuration"
 msgstr ""
 
-#: src/usr/local/www/diag_backup.php:712
+#: src/usr/local/www/diag_backup.php:714
 msgid "The firewall will reboot after restoring the configuration."
 msgstr ""
 
-#: src/usr/local/www/diag_backup.php:719
-msgid "Package functions"
+#: src/usr/local/www/diag_backup.php:721
+msgid "Package Functions"
 msgstr ""
 
-#: src/usr/local/www/diag_backup.php:725
+#: src/usr/local/www/diag_backup.php:728
 msgid "Reinstall Packages"
 msgstr ""
 
-#: src/usr/local/www/diag_backup.php:726
+#: src/usr/local/www/diag_backup.php:729
 msgid ""
 "Click this button to reinstall all system packages.  This may take a while."
 msgstr ""
 
-#: src/usr/local/www/diag_backup.php:736
+#: src/usr/local/www/diag_backup.php:740
 msgid ""
 "Click this button to clear the package lock if a package fails to reinstall "
 "properly after an upgrade."
 msgstr ""
 
+#: src/usr/local/www/diag_command.php:93
+#, php-format
+msgid "Uploaded file to /tmp/%s."
+msgstr ""
+
+#: src/usr/local/www/diag_command.php:125 src/usr/local/www/head.inc:368
+msgid "Command Prompt"
+msgstr ""
+
+#: src/usr/local/www/diag_command.php:186
+msgid "Nothing to recall"
+msgstr ""
+
+#: src/usr/local/www/diag_command.php:221
+msgid ""
+"The capabilities offered here can be dangerous. No support is available. Use "
+"them at your own risk!"
+msgstr ""
+
+#: src/usr/local/www/diag_command.php:221
+msgid "Advanced Users Only"
+msgstr ""
+
+#: src/usr/local/www/diag_command.php:226
+#, php-format
+msgid "Shell Output - %s"
+msgstr ""
+
+#: src/usr/local/www/diag_command.php:245
+msgid "Execute Shell Command"
+msgstr ""
+
+#: src/usr/local/www/diag_command.php:252
+#: src/usr/local/www/diag_command.php:328
+msgid "Execute"
+msgstr ""
+
+#: src/usr/local/www/diag_command.php:254 src/usr/local/www/pkg_mgr.php:197
+#: src/usr/local/www/system_groupmanager_addprivs.php:227
+#: src/usr/local/www/system_usermanager_addprivs.php:220
+#: src/usr/local/www/widgets/widgets/services_status.widget.php:167
+#: src/usr/local/www/interfaces.php:2007
+msgid "Clear"
+msgstr ""
+
+#: src/usr/local/www/diag_command.php:260
+msgid "Download File"
+msgstr ""
+
+#: src/usr/local/www/diag_command.php:276
+msgid "Upload File"
+msgstr ""
+
+#: src/usr/local/www/diag_command.php:281
+#: src/usr/local/www/services_captiveportal_filemanager.php:184
+#: src/usr/local/www/widgets/widgets/picture.widget.php:83
+msgid "Upload"
+msgstr ""
+
+#: src/usr/local/www/diag_command.php:323
+msgid "Execute PHP Commands"
+msgstr ""
+
+#: src/usr/local/www/diag_command.php:329
+msgid "Example"
+msgstr ""
+
 #: src/usr/local/www/diag_confbak.php:72
 msgid "(platform default)"
 msgstr ""
@@ -6072,8 +7800,8 @@ msgstr ""
 #: src/usr/local/www/diag_confbak.php:152
 #: src/usr/local/www/diag_confbak.php:253
 #: src/usr/local/www/diag_confbak.php:264
-#: src/usr/local/www/firewall_nat_edit.php:983
-#: src/usr/local/www/firewall_nat_edit.php:990
+#: src/usr/local/www/firewall_nat_edit.php:977
+#: src/usr/local/www/firewall_nat_edit.php:984
 #: src/usr/local/www/firewall_nat_out_edit.php:673
 #: src/usr/local/www/firewall_nat_out_edit.php:680
 msgid "n/j/y H:i:s"
@@ -6088,13 +7816,9 @@ msgstr ""
 msgid "Deleted backup with timestamp %1$s and description \"%2$s\"."
 msgstr ""
 
-#: src/usr/local/www/diag_confbak.php:135
-msgid "Configuration History"
-msgstr ""
-
 #: src/usr/local/www/diag_confbak.php:152
 #, php-format
-msgid "Configuration diff from %1$s to %2$s"
+msgid "Configuration Diff from %1$s to %2$s"
 msgstr ""
 
 #: src/usr/local/www/diag_confbak.php:192
@@ -6134,8 +7858,8 @@ msgid "Date"
 msgstr ""
 
 #: src/usr/local/www/diag_confbak.php:240 src/usr/local/www/pkg_mgr.php:100
-#: src/usr/local/www/pkg_mgr_installed.php:106
-#: src/usr/local/www/widgets/widgets/installed_packages.widget.php:87
+#: src/usr/local/www/pkg_mgr_installed.php:104
+#: src/usr/local/www/widgets/widgets/installed_packages.widget.php:84
 #: src/usr/local/www/widgets/widgets/system_information.widget.php:117
 msgid "Version"
 msgstr ""
@@ -6151,12 +7875,12 @@ msgid "Configuration Change"
 msgstr ""
 
 #: src/usr/local/www/diag_confbak.php:243
-#: src/usr/local/www/firewall_aliases.php:225
-#: src/usr/local/www/firewall_nat.php:254
+#: src/usr/local/www/firewall_aliases.php:229
+#: src/usr/local/www/firewall_nat.php:247
 #: src/usr/local/www/firewall_nat_1to1.php:188
 #: src/usr/local/www/firewall_nat_npt.php:187
 #: src/usr/local/www/firewall_nat_out.php:320
-#: src/usr/local/www/firewall_rules.php:395
+#: src/usr/local/www/firewall_rules.php:415
 #: src/usr/local/www/firewall_schedule.php:129
 #: src/usr/local/www/firewall_virtual_ip.php:299
 #: src/usr/local/www/interfaces_bridge.php:139
@@ -6167,37 +7891,37 @@ msgstr ""
 #: src/usr/local/www/interfaces_ppps.php:133
 #: src/usr/local/www/interfaces_qinq.php:147
 #: src/usr/local/www/interfaces_vlan.php:144
-#: src/usr/local/www/interfaces_wireless.php:138
+#: src/usr/local/www/interfaces_wireless.php:136
 #: src/usr/local/www/load_balancer_monitor.php:143
 #: src/usr/local/www/load_balancer_pool.php:160
 #: src/usr/local/www/load_balancer_virtual_server.php:161
-#: src/usr/local/www/pkg_mgr_installed.php:108
+#: src/usr/local/www/pkg_mgr_installed.php:106
 #: src/usr/local/www/services_captiveportal_zones.php:116
-#: src/usr/local/www/services_dhcp.php:663
+#: src/usr/local/www/services_dhcp.php:691
 #: src/usr/local/www/services_dyndns.php:125
 #: src/usr/local/www/services_igmpproxy.php:125
 #: src/usr/local/www/services_pppoe.php:141
 #: src/usr/local/www/services_rfc2136.php:118
-#: src/usr/local/www/services_unbound_acls.php:325
+#: src/usr/local/www/services_unbound_acls.php:329
 #: src/usr/local/www/services_wol.php:203
-#: src/usr/local/www/status_dhcp_leases.php:386
-#: src/usr/local/www/status_dhcpv6_leases.php:462
+#: src/usr/local/www/status_dhcp_leases.php:387
+#: src/usr/local/www/status_dhcpv6_leases.php:466
 #: src/usr/local/www/status_logs_filter_summary.php:117
-#: src/usr/local/www/status_services.php:133
-#: src/usr/local/www/system_authservers.php:409
-#: src/usr/local/www/system_camanager.php:394
-#: src/usr/local/www/system_certmanager.php:1009
+#: src/usr/local/www/status_services.php:133
+#: src/usr/local/www/system_authservers.php:412
+#: src/usr/local/www/system_camanager.php:397
+#: src/usr/local/www/system_certmanager.php:1011
 #: src/usr/local/www/system_gateway_groups.php:154
 #: src/usr/local/www/system_gateways.php:281
-#: src/usr/local/www/system_groupmanager.php:290
+#: src/usr/local/www/system_groupmanager.php:307
 #: src/usr/local/www/system_routes.php:280
-#: src/usr/local/www/system_usermanager.php:499
-#: src/usr/local/www/vpn_ipsec.php:290 src/usr/local/www/vpn_ipsec_keys.php:141
+#: src/usr/local/www/system_usermanager.php:504
+#: src/usr/local/www/vpn_ipsec.php:288 src/usr/local/www/vpn_ipsec_keys.php:136
 #: src/usr/local/www/vpn_l2tp_users.php:131
-#: src/usr/local/www/vpn_openvpn_client.php:817
-#: src/usr/local/www/vpn_openvpn_csc.php:668
-#: src/usr/local/www/vpn_openvpn_server.php:1199
-#: src/usr/local/www/widgets/widgets/installed_packages.widget.php:88
+#: src/usr/local/www/vpn_openvpn_client.php:822
+#: src/usr/local/www/vpn_openvpn_csc.php:672
+#: src/usr/local/www/vpn_openvpn_server.php:1204
+#: src/usr/local/www/widgets/widgets/installed_packages.widget.php:85
 msgid "Actions"
 msgstr ""
 
@@ -6206,7 +7930,7 @@ msgid "Current configuration"
 msgstr ""
 
 #: src/usr/local/www/diag_confbak.php:266
-#: src/usr/local/www/pkg_mgr_installed.php:149
+#: src/usr/local/www/pkg_mgr_installed.php:147
 #: src/usr/local/www/status_ipsec.php:172
 #: src/usr/local/www/status_ipsec.php:182
 #: src/usr/local/www/status_ipsec.php:213
@@ -6217,8 +7941,8 @@ msgstr ""
 #: src/usr/local/www/status_ipsec.php:446
 #: src/usr/local/www/status_ipsec.php:456
 #: src/usr/local/www/status_ipsec.php:466
-#: src/usr/local/www/widgets/widgets/gateways.widget.php:254
-#: src/usr/local/www/widgets/widgets/installed_packages.widget.php:132
+#: src/usr/local/www/widgets/widgets/gateways.widget.php:258
+#: src/usr/local/www/widgets/widgets/installed_packages.widget.php:129
 #: src/usr/local/www/widgets/widgets/smart_status.widget.php:93
 msgid "Unknown"
 msgstr ""
@@ -6244,8 +7968,8 @@ msgstr ""
 msgid "No backups found."
 msgstr ""
 
-#: src/usr/local/www/diag_defaults.php:73
-msgid "Factory defaults"
+#: src/usr/local/www/diag_defaults.php:73 src/usr/local/www/head.inc:371
+msgid "Factory Defaults"
 msgstr ""
 
 #: src/usr/local/www/diag_defaults.php:78
@@ -6299,7 +8023,7 @@ msgid "Are you sure you want to proceed?"
 msgstr ""
 
 #: src/usr/local/www/diag_dns.php:63 src/usr/local/www/diag_dns.php:223
-#: src/usr/local/www/head.inc:333
+#: src/usr/local/www/head.inc:369
 msgid "DNS Lookup"
 msgstr ""
 
@@ -6319,16 +8043,16 @@ msgstr ""
 msgid "No record found"
 msgstr ""
 
-#: src/usr/local/www/diag_dns.php:193 src/usr/local/www/diag_tables.php:218
-#: src/usr/local/www/interfaces.php:3058 src/usr/local/www/interfaces.php:3082
-#: src/usr/local/www/interfaces_ppps_edit.php:626
+#: src/usr/local/www/diag_dns.php:193 src/usr/local/www/diag_tables.php:290
+#: src/usr/local/www/interfaces.php:3060 src/usr/local/www/interfaces.php:3084
+#: src/usr/local/www/interfaces_ppps_edit.php:646
 #: src/usr/local/www/load_balancer_pool_edit.php:412
 #: src/usr/local/www/load_balancer_virtual_server.php:156
 #: src/usr/local/www/load_balancer_virtual_server_edit.php:104
 #: src/usr/local/www/load_balancer_virtual_server_edit.php:109
 #: src/usr/local/www/load_balancer_virtual_server_edit.php:223
 #: src/usr/local/www/services_captiveportal_ip_edit.php:251
-#: src/usr/local/www/services_dhcp_edit.php:453
+#: src/usr/local/www/services_dhcp_edit.php:457
 #: src/usr/local/www/services_dnsmasq_domainoverride_edit.php:175
 #: src/usr/local/www/services_dnsmasq_edit.php:262
 #: src/usr/local/www/services_pppoe_edit.php:449
@@ -6338,29 +8062,25 @@ msgstr ""
 #: src/usr/local/www/services_unbound_host_edit.php:263
 #: src/usr/local/www/status_graph.php:194
 #: src/usr/local/www/status_logs_vpn.php:173
-#: src/usr/local/www/status_logs_vpn.php:432
+#: src/usr/local/www/status_logs_vpn.php:424
 #: src/usr/local/www/system_advanced_notifications.php:267
-#: src/usr/local/www/vpn_ipsec_phase2.php:714
+#: src/usr/local/www/vpn_ipsec_phase2.php:716
 #: src/usr/local/www/vpn_l2tp_users_edit.php:209
 msgid "IP Address"
 msgstr ""
 
 #: src/usr/local/www/diag_dns.php:194 src/usr/local/www/status_graph.php:195
-#: src/usr/local/www/system_authservers.php:408
+#: src/usr/local/www/system_authservers.php:411
 msgid "Host Name"
 msgstr ""
 
 #: src/usr/local/www/diag_dns.php:197
 #: src/usr/local/www/services_rfc2136.php:114
-#: src/usr/local/www/services_rfc2136_edit.php:254
+#: src/usr/local/www/services_rfc2136_edit.php:273
 #: src/usr/local/www/status_ntpd.php:199
-#: src/usr/local/www/system_certmanager.php:1055
+#: src/usr/local/www/system_certmanager.php:1057
 #: src/usr/local/www/vpn_l2tp.php:345
-#: src/usr/local/www/vpn_openvpn_client.php:444
-#: src/usr/local/www/vpn_openvpn_client.php:815
-#: src/usr/local/www/vpn_openvpn_csc.php:322
-#: src/usr/local/www/vpn_openvpn_server.php:592
-#: src/usr/local/www/vpn_openvpn_server.php:610
+#: src/usr/local/www/vpn_openvpn_client.php:820
 #: src/usr/local/www/widgets/widgets/load_balancer_status.widget.php:93
 msgid "Server"
 msgstr ""
@@ -6371,11 +8091,11 @@ msgstr ""
 
 #: src/usr/local/www/diag_dns.php:215
 #, php-format
-msgid "Host \"%s\" could not be resolved"
+msgid "Host \"%s\" could not be resolved."
 msgstr ""
 
 #: src/usr/local/www/diag_dns.php:219
-msgid "Alias was created/updated successfully"
+msgid "Alias was created/updated successfully."
 msgstr ""
 
 #: src/usr/local/www/diag_dns.php:236
@@ -6400,11 +8120,11 @@ msgid "Query time"
 msgstr ""
 
 #: src/usr/local/www/diag_dns.php:290
-msgid "More information"
+msgid "More Information"
 msgstr ""
 
 #: src/usr/local/www/diag_dns.php:293 src/usr/local/www/diag_ping.php:68
-#: src/usr/local/www/diag_ping.php:172 src/usr/local/www/head.inc:345
+#: src/usr/local/www/diag_ping.php:172 src/usr/local/www/head.inc:381
 msgid "Ping"
 msgstr ""
 
@@ -6430,20 +8150,20 @@ msgid "invalid input"
 msgstr ""
 
 #: src/usr/local/www/diag_dump_states.php:108
-msgid "Show States"
-msgstr ""
-
 #: src/usr/local/www/diag_dump_states.php:139
-#: src/usr/local/www/diag_dump_states.php:181
+#: src/usr/local/www/diag_dump_states.php:196
+#: src/usr/local/www/diag_dump_states_sources.php:87
 #: src/usr/local/www/diag_dump_states_sources.php:91
+#: src/usr/local/www/diag_resetstate.php:89
 #: src/usr/local/www/diag_resetstate.php:113
 #: src/usr/local/www/diag_states_summary.php:181
 #: src/usr/local/www/diag_states_summary.php:183
-#: src/usr/local/www/firewall_rules.php:385 src/usr/local/www/head.inc:353
+#: src/usr/local/www/firewall_rules.php:405 src/usr/local/www/head.inc:389
 msgid "States"
 msgstr ""
 
 #: src/usr/local/www/diag_dump_states.php:141
+#: src/usr/local/www/diag_dump_states_sources.php:87
 #: src/usr/local/www/diag_dump_states_sources.php:92
 #: src/usr/local/www/diag_resetstate.php:116
 #: src/usr/local/www/diag_resetstate.php:143
@@ -6452,54 +8172,59 @@ msgstr ""
 
 #: src/usr/local/www/diag_dump_states.php:143
 #: src/usr/local/www/diag_dump_states_sources.php:93
+#: src/usr/local/www/diag_resetstate.php:89
 #: src/usr/local/www/diag_resetstate.php:119
 msgid "Reset States"
 msgstr ""
 
 #: src/usr/local/www/diag_dump_states.php:151
-msgid "State filter"
+msgid "State Filter"
 msgstr ""
 
-#: src/usr/local/www/diag_dump_states.php:155
+#: src/usr/local/www/diag_dump_states.php:170
 #: src/usr/local/www/diag_dump_states_sources.php:130
 msgid "Filter expression"
 msgstr ""
 
-#: src/usr/local/www/diag_dump_states.php:161
+#: src/usr/local/www/diag_dump_states.php:176
 #: src/usr/local/www/diag_routes.php:129 src/usr/local/www/status_graph.php:187
+#: src/usr/local/www/system_groupmanager_addprivs.php:209
+#: src/usr/local/www/system_groupmanager_addprivs.php:216
+#: src/usr/local/www/system_usermanager_addprivs.php:202
+#: src/usr/local/www/system_usermanager_addprivs.php:209
 msgid "Filter"
 msgstr ""
 
-#: src/usr/local/www/diag_dump_states.php:169
+#: src/usr/local/www/diag_dump_states.php:184
 msgid "Kill States"
 msgstr ""
 
-#: src/usr/local/www/diag_dump_states.php:172
+#: src/usr/local/www/diag_dump_states.php:187
 msgid "Kill filtered states"
 msgstr ""
 
-#: src/usr/local/www/diag_dump_states.php:174
+#: src/usr/local/www/diag_dump_states.php:189
 msgid "Remove all states to and from the filtered address"
 msgstr ""
 
-#: src/usr/local/www/diag_dump_states.php:188
-#: src/usr/local/www/diag_packet_capture.php:323
+#: src/usr/local/www/diag_dump_states.php:203
+#: src/usr/local/www/diag_packet_capture.php:327
 #: src/usr/local/www/diag_states_summary.php:182
-#: src/usr/local/www/firewall_nat.php:246
+#: src/usr/local/www/firewall_nat.php:239
 #: src/usr/local/www/firewall_nat_edit.php:245
 #: src/usr/local/www/firewall_nat_edit.php:248
-#: src/usr/local/www/firewall_nat_edit.php:726
+#: src/usr/local/www/firewall_nat_edit.php:720
 #: src/usr/local/www/firewall_nat_out_edit.php:181
 #: src/usr/local/www/firewall_nat_out_edit.php:502
-#: src/usr/local/www/firewall_rules.php:386
-#: src/usr/local/www/firewall_rules_edit.php:432
-#: src/usr/local/www/firewall_rules_edit.php:1201
-#: src/usr/local/www/interfaces_bridge_edit.php:513
+#: src/usr/local/www/firewall_rules.php:406
+#: src/usr/local/www/firewall_rules_edit.php:433
+#: src/usr/local/www/firewall_rules_edit.php:1238
+#: src/usr/local/www/interfaces_bridge_edit.php:561
 #: src/usr/local/www/load_balancer_virtual_server.php:155
-#: src/usr/local/www/services_rfc2136_edit.php:261
+#: src/usr/local/www/services_rfc2136_edit.php:280
 #: src/usr/local/www/status_ipsec_sad.php:100
 #: src/usr/local/www/status_ipsec_spd.php:94
-#: src/usr/local/www/status_logs_common.inc:465
+#: src/usr/local/www/status_logs_common.inc:476
 #: src/usr/local/www/status_logs_filter.php:196
 #: src/usr/local/www/status_logs_filter_dynamic.php:427
 #: src/usr/local/www/status_upnp.php:104
@@ -6507,48 +8232,41 @@ msgstr ""
 #: src/usr/local/www/system_advanced_admin.php:344
 #: src/usr/local/www/system_advanced_admin.php:352
 #: src/usr/local/www/vpn_ipsec_phase2.php:630
-#: src/usr/local/www/vpn_openvpn_client.php:472
-#: src/usr/local/www/vpn_openvpn_client.php:814
-#: src/usr/local/www/vpn_openvpn_server.php:662
+#: src/usr/local/www/vpn_openvpn_client.php:476
+#: src/usr/local/www/vpn_openvpn_client.php:819
+#: src/usr/local/www/vpn_openvpn_server.php:666
 msgid "Protocol"
 msgstr ""
 
-#: src/usr/local/www/diag_dump_states.php:189
+#: src/usr/local/www/diag_dump_states.php:204
 msgid "Source -> Router -> Destination"
 msgstr ""
 
-#: src/usr/local/www/diag_dump_states.php:190
-#: src/usr/local/www/status_dhcpv6_leases.php:551
+#: src/usr/local/www/diag_dump_states.php:205
+#: src/usr/local/www/status_dhcpv6_leases.php:556
 msgid "State"
 msgstr ""
 
-#: src/usr/local/www/diag_dump_states.php:191
-#: src/usr/local/www/status_rrd_graph.php:438
-#: src/usr/local/www/status_rrd_graph_settings.php:77
-#: src/usr/local/www/status_rrd_graph_settings.php:148
+#: src/usr/local/www/diag_dump_states.php:206
 msgid "Packets"
 msgstr ""
 
-#: src/usr/local/www/diag_dump_states.php:192
+#: src/usr/local/www/diag_dump_states.php:207
 #: src/usr/local/www/diag_pftop.php:152
 msgid "Bytes"
 msgstr ""
 
-#: src/usr/local/www/diag_dump_states.php:254
+#: src/usr/local/www/diag_dump_states.php:277
 #, php-format
 msgid "Remove all state entries from %1$s to %2$s"
 msgstr ""
 
-#: src/usr/local/www/diag_dump_states.php:269
-msgid "No states were found that match the current filter"
-msgstr ""
-
-#: src/usr/local/www/diag_dump_states.php:271
-msgid "No states were found"
+#: src/usr/local/www/diag_dump_states.php:292
+msgid "No states were found that match the current filter."
 msgstr ""
 
-#: src/usr/local/www/diag_dump_states_sources.php:87
-msgid "Show Source Tracking"
+#: src/usr/local/www/diag_dump_states.php:294
+msgid "No states were found."
 msgstr ""
 
 #: src/usr/local/www/diag_dump_states_sources.php:126
@@ -6556,7 +8274,7 @@ msgid "Filters"
 msgstr ""
 
 #: src/usr/local/www/diag_dump_states_sources.php:140
-msgid "Current source tracking entries"
+msgid "Current Source Tracking Entries"
 msgstr ""
 
 #: src/usr/local/www/diag_dump_states_sources.php:145
@@ -6586,7 +8304,55 @@ msgstr ""
 msgid "No source tracking entries were found."
 msgstr ""
 
-#: src/usr/local/www/diag_gmirror.php:67 src/usr/local/www/head.inc:338
+#: src/usr/local/www/diag_edit.php:65 src/usr/local/www/head.inc:370
+msgid "Edit File"
+msgstr ""
+
+#: src/usr/local/www/diag_edit.php:73 src/usr/local/www/diag_edit.php:99
+msgid "No file name specified."
+msgstr ""
+
+#: src/usr/local/www/diag_edit.php:77
+msgid "Loading a directory is not supported."
+msgstr ""
+
+#: src/usr/local/www/diag_edit.php:81
+msgid "File does not exist or is not a regular file."
+msgstr ""
+
+#: src/usr/local/www/diag_edit.php:87
+msgid "Failed to read file."
+msgstr ""
+
+#: src/usr/local/www/diag_edit.php:114
+msgid "Failed to write file."
+msgstr ""
+
+#: src/usr/local/www/diag_edit.php:118
+msgid "Error while writing file."
+msgstr ""
+
+#: src/usr/local/www/diag_edit.php:122
+msgid "File saved successfully."
+msgstr ""
+
+#: src/usr/local/www/diag_edit.php:139
+msgid "Save / Load a File from the Filesystem"
+msgstr ""
+
+#: src/usr/local/www/diag_edit.php:144
+msgid "Load"
+msgstr ""
+
+#: src/usr/local/www/diag_edit.php:145
+msgid "Browse"
+msgstr ""
+
+#: src/usr/local/www/diag_edit.php:148
+msgid "GoTo Line #"
+msgstr ""
+
+#: src/usr/local/www/diag_gmirror.php:67 src/usr/local/www/head.inc:374
 msgid "GEOM Mirrors"
 msgstr ""
 
@@ -6693,62 +8459,7 @@ msgid ""
 msgstr ""
 
 #: src/usr/local/www/diag_gmirror.php:242
-msgid "GEOM Mirror information - Mirror Status"
-msgstr ""
-
-#: src/usr/local/www/diag_gmirror.php:252 src/usr/local/www/easyrule.php:112
-#: src/usr/local/www/index.php:315
-#: src/usr/local/www/status_captiveportal.php:126
-#: src/usr/local/www/status_captiveportal_expire.php:86
-#: src/usr/local/www/status_captiveportal_test.php:86
-#: src/usr/local/www/status_captiveportal_voucher_rolls.php:85
-#: src/usr/local/www/status_captiveportal_vouchers.php:85
-#: src/usr/local/www/status_carp.php:142 src/usr/local/www/status_carp.php:212
-#: src/usr/local/www/status_dhcp_leases.php:69
-#: src/usr/local/www/status_dhcpv6_leases.php:70
-#: src/usr/local/www/status_filter_reload.php:67
-#: src/usr/local/www/status_gateway_groups.php:86
-#: src/usr/local/www/status_gateways.php:80
-#: src/usr/local/www/status_gateways.php:104
-#: src/usr/local/www/status_graph.php:150
-#: src/usr/local/www/status_graph_cpu.php:66
-#: src/usr/local/www/status_interfaces.php:108
-#: src/usr/local/www/status_interfaces.php:124
-#: src/usr/local/www/status_ipsec.php:70 src/usr/local/www/status_ipsec.php:140
-#: src/usr/local/www/status_ipsec_leases.php:68
-#: src/usr/local/www/status_ipsec_leases.php:92
-#: src/usr/local/www/status_ipsec_sad.php:69
-#: src/usr/local/www/status_ipsec_spd.php:72
-#: src/usr/local/www/status_lb_pool.php:97
-#: src/usr/local/www/status_lb_vs.php:84 src/usr/local/www/status_lb_vs.php:104
-#: src/usr/local/www/status_logs.php:128
-#: src/usr/local/www/status_logs_filter.php:135
-#: src/usr/local/www/status_logs_filter_dynamic.php:115
-#: src/usr/local/www/status_logs_filter_summary.php:101
-#: src/usr/local/www/status_logs_settings.php:209
-#: src/usr/local/www/status_logs_vpn.php:117
-#: src/usr/local/www/status_ntpd.php:186 src/usr/local/www/status_ntpd.php:198
-#: src/usr/local/www/status_openvpn.php:64
-#: src/usr/local/www/status_openvpn.php:254
-#: src/usr/local/www/status_openvpn.php:310
-#: src/usr/local/www/status_pkglogs.php:104
-#: src/usr/local/www/status_queues.php:145
-#: src/usr/local/www/status_rrd_graph.php:309
-#: src/usr/local/www/status_rrd_graph_settings.php:143
-#: src/usr/local/www/status_services.php:100
-#: src/usr/local/www/status_services.php:132
-#: src/usr/local/www/status_upnp.php:76
-#: src/usr/local/www/status_wireless.php:65
-#: src/usr/local/www/status_wireless.php:96
-#: src/usr/local/www/widgets/widgets/gateways.widget.php:93
-#: src/usr/local/www/widgets/widgets/ipsec.widget.php:236
-#: src/usr/local/www/widgets/widgets/ipsec.widget.php:252
-#: src/usr/local/www/widgets/widgets/wake_on_lan.widget.php:75
-msgid "Status"
-msgstr ""
-
-#: src/usr/local/www/diag_gmirror.php:253
-msgid "Component"
+msgid "GEOM Mirror Information - Mirror Status"
 msgstr ""
 
 #: src/usr/local/www/diag_gmirror.php:268
@@ -6776,7 +8487,7 @@ msgid ""
 msgstr ""
 
 #: src/usr/local/www/diag_gmirror.php:324
-msgid "Consumer information - Available consumers"
+msgid "Consumer Information - Available Consumers"
 msgstr ""
 
 #: src/usr/local/www/diag_gmirror.php:333
@@ -6803,34 +8514,34 @@ msgid ""
 "followed by an 'insert' action on the new consumer."
 msgstr ""
 
-#: src/usr/local/www/diag_halt.php:78
-msgid "Halt system"
+#: src/usr/local/www/diag_halt.php:78 src/usr/local/www/head.inc:377
+msgid "Halt System"
 msgstr ""
 
 #: src/usr/local/www/diag_halt.php:85
 msgid "The system is halting now. This may take one minute or so."
 msgstr ""
 
-#: src/usr/local/www/diag_halt.php:90
+#: src/usr/local/www/diag_halt.php:88
 #, php-format
 msgid "Not actually halting (DEBUG is set true)%s"
 msgstr ""
 
-#: src/usr/local/www/diag_halt.php:101
+#: src/usr/local/www/diag_halt.php:99
 msgid "Are you sure you want to halt the system?"
 msgstr ""
 
-#: src/usr/local/www/diag_halt.php:105
+#: src/usr/local/www/diag_halt.php:103
 msgid ""
 "Click \"Halt\" to halt the system immediately, or \"No\" to go to the system "
 "dashboard. (There will be a brief delay before the dashboard appears.)"
 msgstr ""
 
-#: src/usr/local/www/diag_halt.php:107
+#: src/usr/local/www/diag_halt.php:105
 msgid "Halt"
 msgstr ""
 
-#: src/usr/local/www/diag_limiter_info.php:65 src/usr/local/www/head.inc:342
+#: src/usr/local/www/diag_limiter_info.php:65 src/usr/local/www/head.inc:378
 msgid "Limiter Info"
 msgstr ""
 
@@ -6842,12 +8553,8 @@ msgstr ""
 msgid "Limiters:"
 msgstr ""
 
-#: src/usr/local/www/diag_limiter_info.php:77
-#: src/usr/local/www/firewall_shaper_queues.php:221
-#: src/usr/local/www/head.inc:303 src/usr/local/www/status_queues.php:145
-#: src/usr/local/www/status_rrd_graph.php:443
-#: src/usr/local/www/status_rrd_graph_settings.php:79
-#: src/usr/local/www/status_rrd_graph_settings.php:152
+#: src/usr/local/www/diag_limiter_info.php:77 src/usr/local/www/head.inc:340
+#: src/usr/local/www/status_queues.php:145
 msgid "Queues"
 msgstr ""
 
@@ -6859,13 +8566,13 @@ msgstr ""
 msgid "Gathering Limiter information, please wait..."
 msgstr ""
 
-#: src/usr/local/www/diag_nanobsd.php:74 src/usr/local/www/head.inc:360
+#: src/usr/local/www/diag_nanobsd.php:74 src/usr/local/www/head.inc:396
 msgid "NanoBSD"
 msgstr ""
 
 #: src/usr/local/www/diag_nanobsd.php:93
 #, php-format
-msgid "The boot slice has been set to %s"
+msgid "The boot slice has been set to %s."
 msgstr ""
 
 #: src/usr/local/www/diag_nanobsd.php:100
@@ -6883,7 +8590,7 @@ msgid ""
 msgstr ""
 
 #: src/usr/local/www/diag_nanobsd.php:106
-msgid "There was an error while duplicating the slice.\t Operation aborted."
+msgid "There was an error while duplicating the slice. Operation aborted."
 msgstr ""
 
 #: src/usr/local/www/diag_nanobsd.php:125
@@ -6899,11 +8606,11 @@ msgid "Changed Permanent Read/Write Setting"
 msgstr ""
 
 #: src/usr/local/www/diag_nanobsd.php:137
-msgid "Saved r/w permanently"
+msgid "Saved read/write permanently."
 msgstr ""
 
 #: src/usr/local/www/diag_nanobsd.php:142
-#: src/usr/local/www/system_advanced_sysctl.php:198
+#: src/usr/local/www/system_advanced_sysctl.php:202
 msgid "The options on this page are intended for use by advanced users only."
 msgstr ""
 
@@ -6986,7 +8693,7 @@ msgid "View previous upgrade log"
 msgstr ""
 
 #: src/usr/local/www/diag_nanobsd.php:246
-msgid "Previous upgrade log"
+msgid "Previous Upgrade Log"
 msgstr ""
 
 #: src/usr/local/www/diag_nanobsd.php:249
@@ -7002,90 +8709,88 @@ msgid "fdisk/bsdlabel log:"
 msgstr ""
 
 #: src/usr/local/www/diag_ndp.php:128 src/usr/local/www/diag_ndp.php:133
-#: src/usr/local/www/head.inc:343
+#: src/usr/local/www/head.inc:379
 msgid "NDP Table"
 msgstr ""
 
-#: src/usr/local/www/diag_ndp.php:140 src/usr/local/www/interfaces.php:619
-#: src/usr/local/www/interfaces.php:1837
-#: src/usr/local/www/services_dhcpv6.php:903
-#: src/usr/local/www/services_dhcpv6_edit.php:242
-#: src/usr/local/www/status_dhcpv6_leases.php:453
+#: src/usr/local/www/diag_ndp.php:140 src/usr/local/www/interfaces.php:602
+#: src/usr/local/www/interfaces.php:1827
+#: src/usr/local/www/services_dhcpv6.php:1003
+#: src/usr/local/www/services_dhcpv6_edit.php:259
+#: src/usr/local/www/status_dhcpv6_leases.php:457
 msgid "IPv6 address"
 msgstr ""
 
 #: src/usr/local/www/diag_packet_capture.php:114
-#: src/usr/local/www/diag_packet_capture.php:409
+#: src/usr/local/www/diag_packet_capture.php:413
 msgid "Download Capture"
 msgstr ""
 
-#: src/usr/local/www/diag_packet_capture.php:118 src/usr/local/www/head.inc:357
+#: src/usr/local/www/diag_packet_capture.php:118 src/usr/local/www/head.inc:393
 msgid "Packet Capture"
 msgstr ""
 
-#: src/usr/local/www/diag_packet_capture.php:160
+#: src/usr/local/www/diag_packet_capture.php:161
 msgid "Invalid interface."
 msgstr ""
 
-#: src/usr/local/www/diag_packet_capture.php:164
+#: src/usr/local/www/diag_packet_capture.php:165
 msgid "Invalid address family."
 msgstr ""
 
-#: src/usr/local/www/diag_packet_capture.php:168
+#: src/usr/local/www/diag_packet_capture.php:169
 msgid "Invalid protocol."
 msgstr ""
 
-#: src/usr/local/www/diag_packet_capture.php:182
+#: src/usr/local/www/diag_packet_capture.php:183
 #, php-format
 msgid "A valid IP address or CIDR block must be specified. [%s]"
 msgstr ""
 
-#: src/usr/local/www/diag_packet_capture.php:189
+#: src/usr/local/www/diag_packet_capture.php:190
 msgid "Invalid value specified for port."
 msgstr ""
 
-#: src/usr/local/www/diag_packet_capture.php:197
+#: src/usr/local/www/diag_packet_capture.php:198
 msgid "Invalid value specified for packet length."
 msgstr ""
 
-#: src/usr/local/www/diag_packet_capture.php:205
+#: src/usr/local/www/diag_packet_capture.php:206
 msgid "Invalid value specified for packet count."
 msgstr ""
 
-#: src/usr/local/www/diag_packet_capture.php:231
-#: src/usr/local/www/diag_packet_capture.php:392
-#: src/usr/local/www/diag_packet_capture.php:460
-#: src/usr/local/www/status_dhcp_leases.php:382
-#: src/usr/local/www/status_dhcpv6_leases.php:458
-#: src/usr/local/www/status_dhcpv6_leases.php:549
-#: src/usr/local/www/status_rrd_graph.php:597
-#: src/usr/local/www/status_rrd_graph.php:600
+#: src/usr/local/www/diag_packet_capture.php:232
+#: src/usr/local/www/diag_packet_capture.php:396
+#: src/usr/local/www/diag_packet_capture.php:464
+#: src/usr/local/www/status_dhcp_leases.php:383
+#: src/usr/local/www/status_dhcpv6_leases.php:462
+#: src/usr/local/www/status_dhcpv6_leases.php:554
 msgid "Start"
 msgstr ""
 
-#: src/usr/local/www/diag_packet_capture.php:239
-#: src/usr/local/www/diag_packet_capture.php:389
-#: src/usr/local/www/diag_packet_capture.php:397
+#: src/usr/local/www/diag_packet_capture.php:240
+#: src/usr/local/www/diag_packet_capture.php:393
+#: src/usr/local/www/diag_packet_capture.php:401
 msgid "Stop"
 msgstr ""
 
-#: src/usr/local/www/diag_packet_capture.php:266
+#: src/usr/local/www/diag_packet_capture.php:267
 msgid "Exclude"
 msgstr ""
 
-#: src/usr/local/www/diag_packet_capture.php:293
+#: src/usr/local/www/diag_packet_capture.php:297
 msgid "Packet Capture Options"
 msgstr ""
 
-#: src/usr/local/www/diag_packet_capture.php:300
+#: src/usr/local/www/diag_packet_capture.php:304
 msgid "Select the interface on which to capture traffic. "
 msgstr ""
 
-#: src/usr/local/www/diag_packet_capture.php:304
+#: src/usr/local/www/diag_packet_capture.php:308
 msgid "Promiscuous"
 msgstr ""
 
-#: src/usr/local/www/diag_packet_capture.php:307
+#: src/usr/local/www/diag_packet_capture.php:311
 msgid ""
 "Note: Some network adapters do not support or work well in promiscuous mode."
 "<br />More: <a target=\"_blank\" href=\"http://www.freebsd.org/cgi/man.cgi?"
@@ -7093,33 +8798,33 @@ msgid ""
 "arch=default&amp;format=html\">Packet capture</a>"
 msgstr ""
 
-#: src/usr/local/www/diag_packet_capture.php:316
+#: src/usr/local/www/diag_packet_capture.php:320
 msgid "IPv4 Only"
 msgstr ""
 
-#: src/usr/local/www/diag_packet_capture.php:317
+#: src/usr/local/www/diag_packet_capture.php:321
 msgid "IPv6 Only"
 msgstr ""
 
-#: src/usr/local/www/diag_packet_capture.php:313
-#: src/usr/local/www/firewall_rules_edit.php:1190
-#: src/usr/local/www/system_gateways_edit.php:687
+#: src/usr/local/www/diag_packet_capture.php:317
+#: src/usr/local/www/firewall_rules_edit.php:1227
+#: src/usr/local/www/system_gateways_edit.php:628
 msgid "Address Family"
 msgstr ""
 
-#: src/usr/local/www/diag_packet_capture.php:319
+#: src/usr/local/www/diag_packet_capture.php:323
 msgid "Select the type of traffic to be captured"
 msgstr ""
 
-#: src/usr/local/www/diag_packet_capture.php:326
+#: src/usr/local/www/diag_packet_capture.php:330
 msgid "Select the protocol to capture, or \"Any\". "
 msgstr ""
 
-#: src/usr/local/www/diag_packet_capture.php:330
+#: src/usr/local/www/diag_packet_capture.php:334
 msgid "Host Address"
 msgstr ""
 
-#: src/usr/local/www/diag_packet_capture.php:333
+#: src/usr/local/www/diag_packet_capture.php:337
 msgid ""
 "This value is either the Source or Destination IP address or subnet in CIDR "
 "notation. The packet capture will look for this address in either field.<br /"
@@ -7130,17 +8835,17 @@ msgid ""
 "interface will be captured."
 msgstr ""
 
-#: src/usr/local/www/diag_packet_capture.php:340
+#: src/usr/local/www/diag_packet_capture.php:344
 #: src/usr/local/www/diag_testport.php:83
-#: src/usr/local/www/diag_testport.php:263
-#: src/usr/local/www/firewall_aliases_edit.php:585
-#: src/usr/local/www/firewall_nat_edit.php:886
+#: src/usr/local/www/diag_testport.php:262
+#: src/usr/local/www/firewall_aliases_edit.php:587
+#: src/usr/local/www/firewall_nat_edit.php:880
 #: src/usr/local/www/firewall_nat_out_edit.php:527
 #: src/usr/local/www/firewall_nat_out_edit.php:551
 #: src/usr/local/www/firewall_nat_out_edit.php:607
-#: src/usr/local/www/firewall_rules.php:388
-#: src/usr/local/www/firewall_rules.php:390
-#: src/usr/local/www/interfaces.php:3064 src/usr/local/www/interfaces.php:3088
+#: src/usr/local/www/firewall_rules.php:408
+#: src/usr/local/www/firewall_rules.php:410
+#: src/usr/local/www/interfaces.php:3066 src/usr/local/www/interfaces.php:3090
 #: src/usr/local/www/load_balancer_pool.php:157
 #: src/usr/local/www/load_balancer_pool_edit.php:107
 #: src/usr/local/www/load_balancer_pool_edit.php:371
@@ -7150,99 +8855,99 @@ msgstr ""
 msgid "Port"
 msgstr ""
 
-#: src/usr/local/www/diag_packet_capture.php:343
+#: src/usr/local/www/diag_packet_capture.php:347
 msgid ""
 "The port can be either the source or destination port. The packet capture "
 "will look for this port in either field. Leave blank if you do not want to "
 "filter by port."
 msgstr ""
 
-#: src/usr/local/www/diag_packet_capture.php:348
+#: src/usr/local/www/diag_packet_capture.php:352
 msgid "Packet Length"
 msgstr ""
 
-#: src/usr/local/www/diag_packet_capture.php:351
+#: src/usr/local/www/diag_packet_capture.php:355
 msgid ""
 "The Packet length is the number of bytes of each packet that will be "
 "captured. Default value is 0, which will capture the entire frame regardless "
 "of its size."
 msgstr ""
 
-#: src/usr/local/www/diag_packet_capture.php:356
+#: src/usr/local/www/diag_packet_capture.php:360
 #: src/usr/local/www/diag_ping.php:95
 #: src/usr/local/www/services_captiveportal_vouchers_edit.php:124
 #: src/usr/local/www/services_captiveportal_vouchers_edit.php:235
 msgid "Count"
 msgstr ""
 
-#: src/usr/local/www/diag_packet_capture.php:359
+#: src/usr/local/www/diag_packet_capture.php:363
 msgid ""
 "This is the number of packets the packet capture will grab. Default value is "
 "100.<br />Enter 0 (zero) for no count limit."
 msgstr ""
 
-#: src/usr/local/www/diag_packet_capture.php:366
-#: src/usr/local/www/services_router_advertisements.php:145
+#: src/usr/local/www/diag_packet_capture.php:370
+#: src/usr/local/www/services_router_advertisements.php:149
 msgid "Normal"
 msgstr ""
 
-#: src/usr/local/www/diag_packet_capture.php:367
+#: src/usr/local/www/diag_packet_capture.php:371
 msgid "Medium"
 msgstr ""
 
-#: src/usr/local/www/diag_packet_capture.php:368
-#: src/usr/local/www/services_router_advertisements.php:146
+#: src/usr/local/www/diag_packet_capture.php:372
+#: src/usr/local/www/services_router_advertisements.php:150
 msgid "High"
 msgstr ""
 
-#: src/usr/local/www/diag_packet_capture.php:369
+#: src/usr/local/www/diag_packet_capture.php:373
 msgid "Full"
 msgstr ""
 
-#: src/usr/local/www/diag_packet_capture.php:364
+#: src/usr/local/www/diag_packet_capture.php:368
 msgid "Level of detail"
 msgstr ""
 
-#: src/usr/local/www/diag_packet_capture.php:371
+#: src/usr/local/www/diag_packet_capture.php:375
 msgid ""
 "This is the level of detail that will be displayed after hitting \"Stop\" "
 "when the packets have been captured.<br />This option does not affect the "
 "level of detail when downloading the packet capture. "
 msgstr ""
 
-#: src/usr/local/www/diag_packet_capture.php:376
+#: src/usr/local/www/diag_packet_capture.php:380
 msgid "Reverse DNS Lookup"
 msgstr ""
 
-#: src/usr/local/www/diag_packet_capture.php:379
+#: src/usr/local/www/diag_packet_capture.php:383
 msgid ""
 "This check box will cause the packet capture to perform a reverse DNS lookup "
 "associated with all IP addresses.<br />This option can cause delays for "
 "large packet captures."
 msgstr ""
 
-#: src/usr/local/www/diag_packet_capture.php:404
+#: src/usr/local/www/diag_packet_capture.php:408
 msgid "View Capture"
 msgstr ""
 
-#: src/usr/local/www/diag_packet_capture.php:413
+#: src/usr/local/www/diag_packet_capture.php:417
 msgid "Last capture"
 msgstr ""
 
-#: src/usr/local/www/diag_packet_capture.php:463
-msgid "Packet Capture is running"
+#: src/usr/local/www/diag_packet_capture.php:467
+msgid "Packet capture is running."
 msgstr ""
 
-#: src/usr/local/www/diag_packet_capture.php:473
+#: src/usr/local/www/diag_packet_capture.php:477
 msgid "Packets Captured"
 msgstr ""
 
-#: src/usr/local/www/diag_pf_info.php:65 src/usr/local/www/head.inc:347
+#: src/usr/local/www/diag_pf_info.php:65 src/usr/local/www/head.inc:383
 msgid "pfInfo"
 msgstr ""
 
 #: src/usr/local/www/diag_pf_info.php:97
-msgid "Auto update page"
+msgid "Auto Update Page"
 msgstr ""
 
 #: src/usr/local/www/diag_pf_info.php:101
@@ -7257,7 +8962,7 @@ msgstr ""
 msgid "Gathering PF information, please wait..."
 msgstr ""
 
-#: src/usr/local/www/diag_pftop.php:65 src/usr/local/www/head.inc:348
+#: src/usr/local/www/diag_pftop.php:65 src/usr/local/www/head.inc:384
 msgid "pfTop"
 msgstr ""
 
@@ -7265,12 +8970,6 @@ msgstr ""
 msgid "pfTop Configuration"
 msgstr ""
 
-#: src/usr/local/www/diag_pftop.php:128
-#: src/usr/local/www/firewall_rules_edit.php:1567
-#: src/usr/local/www/services_captiveportal.php:999
-msgid "default"
-msgstr ""
-
 #: src/usr/local/www/diag_pftop.php:129
 msgid "label"
 msgstr ""
@@ -7303,8 +9002,8 @@ msgstr ""
 msgid "time"
 msgstr ""
 
-#: src/usr/local/www/diag_pftop.php:140 src/usr/local/www/diag_smart.php:297
-#: src/usr/local/www/diag_smart.php:442
+#: src/usr/local/www/diag_pftop.php:140 src/usr/local/www/diag_smart.php:303
+#: src/usr/local/www/diag_smart.php:452
 msgid "View"
 msgstr ""
 
@@ -7318,8 +9017,8 @@ msgstr ""
 
 #: src/usr/local/www/diag_pftop.php:154
 #: src/usr/local/www/firewall_nat_out.php:315
-#: src/usr/local/www/firewall_nat_out.php:567
-#: src/usr/local/www/status_logs_common.inc:499
+#: src/usr/local/www/firewall_nat_out.php:566
+#: src/usr/local/www/status_logs_common.inc:510
 msgid "Destination Port"
 msgstr ""
 
@@ -7335,16 +9034,16 @@ msgstr ""
 msgid "Packet"
 msgstr ""
 
-#: src/usr/local/www/diag_pftop.php:160 src/usr/local/www/diag_testport.php:271
+#: src/usr/local/www/diag_pftop.php:160 src/usr/local/www/diag_testport.php:270
 #: src/usr/local/www/firewall_nat_out.php:313
-#: src/usr/local/www/firewall_nat_out.php:565
-#: src/usr/local/www/status_logs_common.inc:458
+#: src/usr/local/www/firewall_nat_out.php:564
+#: src/usr/local/www/status_logs_common.inc:469
 msgid "Source Port"
 msgstr ""
 
-#: src/usr/local/www/diag_pftop.php:161 src/usr/local/www/diag_testport.php:286
+#: src/usr/local/www/diag_pftop.php:161 src/usr/local/www/diag_testport.php:285
 #: src/usr/local/www/diag_traceroute.php:179
-#: src/usr/local/www/firewall_nat.php:247
+#: src/usr/local/www/firewall_nat.php:240
 #: src/usr/local/www/status_logs_settings.php:355
 msgid "Source Address"
 msgstr ""
@@ -7363,23 +9062,23 @@ msgstr ""
 
 #: src/usr/local/www/diag_ping.php:80
 #: src/usr/local/www/firewall_nat_out_edit.php:590
-#: src/usr/local/www/interfaces.php:1866 src/usr/local/www/interfaces.php:2835
-#: src/usr/local/www/interfaces.php:2844 src/usr/local/www/interfaces.php:2853
-#: src/usr/local/www/interfaces.php:2911 src/usr/local/www/interfaces.php:3166
-#: src/usr/local/www/services_ntpd_gps.php:248
+#: src/usr/local/www/interfaces.php:1856 src/usr/local/www/interfaces.php:2837
+#: src/usr/local/www/interfaces.php:2846 src/usr/local/www/interfaces.php:2855
+#: src/usr/local/www/interfaces.php:2913 src/usr/local/www/interfaces.php:3168
+#: src/usr/local/www/services_ntpd_gps.php:249
 msgid "Default"
 msgstr ""
 
 #: src/usr/local/www/diag_ping.php:95 src/usr/local/www/diag_testport.php:83
 #: src/usr/local/www/diag_traceroute.php:100
-#: src/usr/local/www/load_balancer_monitor_edit.php:335
-#: src/usr/local/www/load_balancer_monitor_edit.php:361
-#: src/usr/local/www/services_dnsmasq.php:368
+#: src/usr/local/www/load_balancer_monitor_edit.php:339
+#: src/usr/local/www/load_balancer_monitor_edit.php:365
+#: src/usr/local/www/services_dnsmasq.php:374
 #: src/usr/local/www/services_dnsmasq_edit.php:246
-#: src/usr/local/www/services_unbound.php:413
+#: src/usr/local/www/services_unbound.php:438
 #: src/usr/local/www/services_unbound_host_edit.php:247
-#: src/usr/local/www/status_ipsec_leases.php:91
-#: src/usr/local/www/services_rfc2136_edit.php:230
+#: src/usr/local/www/status_ipsec_leases.php:89
+#: src/usr/local/www/services_rfc2136_edit.php:249
 msgid "Host"
 msgstr ""
 
@@ -7403,7 +9102,7 @@ msgstr ""
 msgid "Host \"%s\" did not respond or could not be resolved."
 msgstr ""
 
-#: src/usr/local/www/diag_ping.php:184 src/usr/local/www/diag_testport.php:293
+#: src/usr/local/www/diag_ping.php:184 src/usr/local/www/diag_testport.php:292
 #: src/usr/local/www/diag_traceroute.php:172
 #: src/usr/local/www/status_logs_settings.php:362
 msgid "IP Protocol"
@@ -7427,22 +9126,23 @@ msgstr ""
 msgid "Select the maximum number of pings"
 msgstr ""
 
-#: src/usr/local/www/diag_reboot.php:76
-msgid "Reboot System"
+#: src/usr/local/www/diag_reboot.php:76 src/usr/local/www/diag_reboot.php:146
+#: src/usr/local/www/head.inc:385 src/usr/local/www/interfaces.php:1975
+msgid "Reboot"
 msgstr ""
 
 #: src/usr/local/www/diag_reboot.php:82
-msgid "Not actually rebooting (DEBUG is set true)"
+msgid "Not actually rebooting (DEBUG is set true)."
 msgstr ""
 
 #: src/usr/local/www/diag_reboot.php:112
-#: src/usr/local/www/pkg_mgr_install.php:670
+#: src/usr/local/www/pkg_mgr_install.php:650
 #, php-format
 msgid "Rebooting%sPage will automatically reload in %s seconds"
 msgstr ""
 
 #: src/usr/local/www/diag_reboot.php:120
-#: src/usr/local/www/pkg_mgr_install.php:678
+#: src/usr/local/www/pkg_mgr_install.php:658
 #, php-format
 msgid "Not yet ready%s Retrying in another %s seconds"
 msgstr ""
@@ -7458,11 +9158,6 @@ msgid ""
 "dashboard appears.)"
 msgstr ""
 
-#: src/usr/local/www/diag_reboot.php:146 src/usr/local/www/head.inc:349
-#: src/usr/local/www/interfaces.php:1985
-msgid "Reboot"
-msgstr ""
-
 #: src/usr/local/www/diag_resetstate.php:77
 msgid "The state table has been flushed successfully."
 msgstr ""
@@ -7471,10 +9166,6 @@ msgstr ""
 msgid "The source tracking table has been flushed successfully."
 msgstr ""
 
-#: src/usr/local/www/diag_resetstate.php:89
-msgid "Reset state"
-msgstr ""
-
 #: src/usr/local/www/diag_resetstate.php:100
 #, php-format
 msgid ""
@@ -7498,21 +9189,21 @@ msgid ""
 msgstr ""
 
 #: src/usr/local/www/diag_resetstate.php:124
-#: src/usr/local/www/status_lb_pool.php:284
-#: src/usr/local/www/status_lb_pool.php:286
+#: src/usr/local/www/status_lb_pool.php:279
+#: src/usr/local/www/status_lb_pool.php:281
 msgid "Reset"
 msgstr ""
 
 #: src/usr/local/www/diag_resetstate.php:131
-msgid "Select states to reset"
+msgid "Select States to Reset"
 msgstr ""
 
 #: src/usr/local/www/diag_resetstate.php:135
 msgid "State Table"
 msgstr ""
 
-#: src/usr/local/www/diag_routes.php:97
-msgid "Routing tables"
+#: src/usr/local/www/diag_routes.php:97 src/usr/local/www/head.inc:386
+msgid "Routes"
 msgstr ""
 
 #: src/usr/local/www/diag_routes.php:109
@@ -7549,77 +9240,79 @@ msgstr ""
 msgid "IPv6 Routes"
 msgstr ""
 
-#: src/usr/local/www/diag_smart.php:66
-msgid "S.M.A.R.T. Monitor Tools"
+#: src/usr/local/www/diag_smart.php:70 src/usr/local/www/head.inc:387
+#: src/usr/local/www/widgets/include/smart_status.inc:3
+#: src/usr/local/www/widgets/widgets/smart_status.widget.php:72
+msgid "S.M.A.R.T. Status"
 msgstr ""
 
-#: src/usr/local/www/diag_smart.php:83
-msgid "PASSED"
+#: src/usr/local/www/diag_smart.php:73 src/usr/local/www/diag_smart.php:125
+msgid "Information & Tests"
 msgstr ""
 
-#: src/usr/local/www/diag_smart.php:84
-msgid "FAILED"
+#: src/usr/local/www/diag_smart.php:75 src/usr/local/www/diag_smart.php:126
+msgid "Config"
 msgstr ""
 
-#: src/usr/local/www/diag_smart.php:85
-msgid "Warning"
+#: src/usr/local/www/diag_smart.php:93
+msgid "PASSED"
 msgstr ""
 
-#: src/usr/local/www/diag_smart.php:114
-msgid "Device does not exist, bailing."
+#: src/usr/local/www/diag_smart.php:94
+msgid "FAILED"
 msgstr ""
 
-#: src/usr/local/www/diag_smart.php:119
-msgid "Information/Tests"
+#: src/usr/local/www/diag_smart.php:95
+msgid "Warning"
 msgstr ""
 
 #: src/usr/local/www/diag_smart.php:120
-msgid "Config"
+msgid "Device does not exist, bailing."
 msgstr ""
 
-#: src/usr/local/www/diag_smart.php:129
+#: src/usr/local/www/diag_smart.php:135
 msgid "Invalid test type, bailing."
 msgstr ""
 
-#: src/usr/local/www/diag_smart.php:136
-msgid "Test results"
+#: src/usr/local/www/diag_smart.php:142
+msgid "Test Results"
 msgstr ""
 
-#: src/usr/local/www/diag_smart.php:146 src/usr/local/www/diag_smart.php:212
-#: src/usr/local/www/diag_smart.php:492 src/usr/local/www/diag_smart.php:499
+#: src/usr/local/www/diag_smart.php:152 src/usr/local/www/diag_smart.php:218
+#: src/usr/local/www/diag_smart.php:504 src/usr/local/www/diag_smart.php:511
 msgid "Abort"
 msgstr ""
 
-#: src/usr/local/www/diag_smart.php:147 src/usr/local/www/diag_smart.php:175
-#: src/usr/local/www/diag_smart.php:200
+#: src/usr/local/www/diag_smart.php:153 src/usr/local/www/diag_smart.php:181
+#: src/usr/local/www/diag_smart.php:206
 msgid "Back"
 msgstr ""
 
-#: src/usr/local/www/diag_smart.php:161
+#: src/usr/local/www/diag_smart.php:167
 msgid "Invalid info type, bailing."
 msgstr ""
 
-#: src/usr/local/www/diag_smart.php:168 src/usr/local/www/diag_smart.php:300
-#: src/usr/local/www/pkg_mgr_installed.php:214
+#: src/usr/local/www/diag_smart.php:174 src/usr/local/www/diag_smart.php:308
+#: src/usr/local/www/pkg_mgr_installed.php:212
 msgid "Information"
 msgstr ""
 
-#: src/usr/local/www/diag_smart.php:186
+#: src/usr/local/www/diag_smart.php:192
 msgid "Invalid log type, bailing."
 msgstr ""
 
-#: src/usr/local/www/diag_smart.php:193
+#: src/usr/local/www/diag_smart.php:199
 msgid "Logs"
 msgstr ""
 
-#: src/usr/local/www/diag_smart.php:227
+#: src/usr/local/www/diag_smart.php:233
 #, php-format
 msgid "Email sent to %s"
 msgstr ""
 
-#: src/usr/local/www/diag_smart.php:265
+#: src/usr/local/www/diag_smart.php:271
 #: src/usr/local/www/services_captiveportal.php:96
-#: src/usr/local/www/services_captiveportal.php:561
+#: src/usr/local/www/services_captiveportal.php:562
 #: src/usr/local/www/services_captiveportal_filemanager.php:172
 #: src/usr/local/www/services_captiveportal_hostname.php:138
 #: src/usr/local/www/services_captiveportal_ip.php:131
@@ -7630,51 +9323,51 @@ msgstr ""
 msgid "Configuration"
 msgstr ""
 
-#: src/usr/local/www/diag_smart.php:269
-#: src/usr/local/www/system_camanager.php:616
-#: src/usr/local/www/system_certmanager.php:779
-#: src/usr/local/www/system_certmanager.php:894
+#: src/usr/local/www/diag_smart.php:275
+#: src/usr/local/www/system_camanager.php:619
+#: src/usr/local/www/system_certmanager.php:781
+#: src/usr/local/www/system_certmanager.php:896
 msgid "Email Address"
 msgstr ""
 
-#: src/usr/local/www/diag_smart.php:279
+#: src/usr/local/www/diag_smart.php:285
 msgid "Send test email"
 msgstr ""
 
-#: src/usr/local/www/diag_smart.php:309
+#: src/usr/local/www/diag_smart.php:317
 msgid "Info type"
 msgstr ""
 
-#: src/usr/local/www/diag_smart.php:355 src/usr/local/www/diag_smart.php:424
-#: src/usr/local/www/diag_smart.php:476 src/usr/local/www/diag_smart.php:510
+#: src/usr/local/www/diag_smart.php:363 src/usr/local/www/diag_smart.php:434
+#: src/usr/local/www/diag_smart.php:488 src/usr/local/www/diag_smart.php:522
 msgid "Device: /dev/"
 msgstr ""
 
-#: src/usr/local/www/diag_smart.php:373
+#: src/usr/local/www/diag_smart.php:381
 msgid "Test"
 msgstr ""
 
-#: src/usr/local/www/diag_smart.php:376
+#: src/usr/local/www/diag_smart.php:386
 msgid "Perform self-tests"
 msgstr ""
 
-#: src/usr/local/www/diag_smart.php:385
+#: src/usr/local/www/diag_smart.php:395
 msgid "Test type"
 msgstr ""
 
-#: src/usr/local/www/diag_smart.php:419
+#: src/usr/local/www/diag_smart.php:429
 msgid "Select \"Conveyance\" for ATA disks only"
 msgstr ""
 
-#: src/usr/local/www/diag_smart.php:445
-msgid "View logs"
+#: src/usr/local/www/diag_smart.php:457
+msgid "View Logs"
 msgstr ""
 
-#: src/usr/local/www/diag_smart.php:454
+#: src/usr/local/www/diag_smart.php:466
 msgid "Log type"
 msgstr ""
 
-#: src/usr/local/www/diag_sockets.php:65 src/usr/local/www/head.inc:352
+#: src/usr/local/www/diag_sockets.php:65 src/usr/local/www/head.inc:388
 msgid "Sockets"
 msgstr ""
 
@@ -7687,7 +9380,7 @@ msgid "Show all socket connections"
 msgstr ""
 
 #: src/usr/local/www/diag_sockets.php:93
-msgid "system socket information"
+msgid "System Socket Information"
 msgstr ""
 
 #: src/usr/local/www/diag_sockets.php:138
@@ -7716,28 +9409,28 @@ msgid ""
 msgstr ""
 
 #: src/usr/local/www/diag_states_summary.php:180
-#: src/usr/local/www/firewall_aliases.php:185
-#: src/usr/local/www/services_dnsmasq.php:370
-#: src/usr/local/www/services_dnsmasq.php:451
-#: src/usr/local/www/services_unbound.php:415
-#: src/usr/local/www/services_unbound.php:491
+#: src/usr/local/www/firewall_aliases.php:189
+#: src/usr/local/www/services_dnsmasq.php:376
+#: src/usr/local/www/services_dnsmasq.php:456
+#: src/usr/local/www/services_unbound.php:440
+#: src/usr/local/www/services_unbound.php:516
 #: src/usr/local/www/widgets/widgets/ipsec.widget.php:251
 msgid "IP"
 msgstr ""
 
 #: src/usr/local/www/diag_states_summary.php:184
-#: src/usr/local/www/firewall_nat.php:248
+#: src/usr/local/www/firewall_nat.php:241
 #: src/usr/local/www/status_logs_filter_summary.php:122
 msgid "Source Ports"
 msgstr ""
 
 #: src/usr/local/www/diag_states_summary.php:185
-#: src/usr/local/www/firewall_nat.php:250
+#: src/usr/local/www/firewall_nat.php:243
 msgid "Dest. Ports"
 msgstr ""
 
-#: src/usr/local/www/diag_states_summary.php:221
-msgid "State Table Summary"
+#: src/usr/local/www/diag_states_summary.php:221 src/usr/local/www/head.inc:390
+msgid "States Summary"
 msgstr ""
 
 #: src/usr/local/www/diag_states_summary.php:225
@@ -7756,7 +9449,7 @@ msgstr ""
 msgid "By IP Pair"
 msgstr ""
 
-#: src/usr/local/www/diag_system_activity.php:65 src/usr/local/www/head.inc:355
+#: src/usr/local/www/diag_system_activity.php:65 src/usr/local/www/head.inc:391
 msgid "System Activity"
 msgstr ""
 
@@ -7768,61 +9461,85 @@ msgstr ""
 msgid "Gathering CPU activity, please wait..."
 msgstr ""
 
-#: src/usr/local/www/diag_tables.php:64 src/usr/local/www/head.inc:344
+#: src/usr/local/www/diag_tables.php:64 src/usr/local/www/head.inc:380
 msgid "Tables"
 msgstr ""
 
-#: src/usr/local/www/diag_tables.php:115
-msgid "The bogons database has been updated."
+#: src/usr/local/www/diag_tables.php:145
+#, php-format
+msgid "The %s database has been updated."
 msgstr ""
 
-#: src/usr/local/www/diag_tables.php:130
-msgid "Web configurator lockout table"
+#: src/usr/local/www/diag_tables.php:159
+msgid "webConfigurator Lockout Table"
 msgstr ""
 
-#: src/usr/local/www/diag_tables.php:132
+#: src/usr/local/www/diag_tables.php:161
 #, php-format
-msgid "%s table"
+msgid "%s Table"
 msgstr ""
 
-#: src/usr/local/www/diag_tables.php:137
-msgid "Table to display"
+#: src/usr/local/www/diag_tables.php:166
+msgid "Table to Display"
 msgstr ""
 
-#: src/usr/local/www/diag_tables.php:138
+#: src/usr/local/www/diag_tables.php:167
 msgid "Table"
 msgstr ""
 
-#: src/usr/local/www/diag_tables.php:151 src/usr/local/www/head.inc:206
-#: src/usr/local/www/pkg_mgr_install.php:262
-#: src/usr/local/www/pkg_mgr_installed.php:209
-#: src/usr/local/www/system_certmanager.php:502
-#: src/usr/local/www/system_certmanager.php:592
-#: src/usr/local/www/system_certmanager.php:947
-#: src/usr/local/www/system_certmanager.php:950
+#: src/usr/local/www/diag_tables.php:180 src/usr/local/www/head.inc:243
+#: src/usr/local/www/pkg_mgr_install.php:240
+#: src/usr/local/www/pkg_mgr_installed.php:207
+#: src/usr/local/www/system_certmanager.php:499
+#: src/usr/local/www/system_certmanager.php:561
+#: src/usr/local/www/system_certmanager.php:594
+#: src/usr/local/www/system_certmanager.php:949
+#: src/usr/local/www/system_certmanager.php:952
 #: src/usr/local/www/system_update_settings.php:99
-#: src/usr/local/www/widgets/widgets/installed_packages.widget.php:157
+#: src/usr/local/www/widgets/widgets/installed_packages.widget.php:154
 msgid "Update"
 msgstr ""
 
-#: src/usr/local/www/diag_tables.php:156
+#: src/usr/local/www/diag_tables.php:185
 msgid "Clear Table"
 msgstr ""
 
-#: src/usr/local/www/diag_tables.php:172
-msgid "Table last updated on "
+#: src/usr/local/www/diag_tables.php:213
+#, php-format
+msgid "Table last updated on %s."
+msgstr ""
+
+#: src/usr/local/www/diag_tables.php:215
+msgid "Date of last update of table is unknown."
+msgstr ""
+
+#: src/usr/local/www/diag_tables.php:218
+#, php-format
+msgid "%s records."
+msgstr ""
+
+#: src/usr/local/www/diag_tables.php:218
+msgid "."
+msgstr ""
+
+#: src/usr/local/www/diag_tables.php:218
+msgid ","
+msgstr ""
+
+#: src/usr/local/www/diag_tables.php:230
+msgid "Hide table comments."
 msgstr ""
 
-#: src/usr/local/www/diag_tables.php:174
-msgid "Date of last update of table is unknown"
+#: src/usr/local/www/diag_tables.php:231
+msgid "Show table comments."
 msgstr ""
 
-#: src/usr/local/www/diag_tables.php:245
-msgid "No entries exist in this table"
+#: src/usr/local/www/diag_tables.php:280
+msgid "No entries exist in this table."
 msgstr ""
 
 #: src/usr/local/www/diag_testport.php:71
-#: src/usr/local/www/diag_testport.php:251 src/usr/local/www/head.inc:346
+#: src/usr/local/www/diag_testport.php:250 src/usr/local/www/head.inc:382
 msgid "Test Port"
 msgstr ""
 
@@ -7848,7 +9565,7 @@ msgstr ""
 
 #: src/usr/local/www/diag_testport.php:228
 #, php-format
-msgid "Port test to host: %1$s Port: %2$s successful"
+msgid "Port test to host: %1$s Port: %2$s successful."
 msgstr ""
 
 #: src/usr/local/www/diag_testport.php:230
@@ -7865,34 +9582,34 @@ msgstr ""
 msgid "Connection failed."
 msgstr ""
 
-#: src/usr/local/www/diag_testport.php:245
+#: src/usr/local/www/diag_testport.php:244
 msgid ""
 "This page allows you to perform a simple TCP connection test to determine if "
 "a host is up and accepting connections on a given port."
 msgstr ""
 
-#: src/usr/local/www/diag_testport.php:246
+#: src/usr/local/www/diag_testport.php:245
 msgid ""
 "This test does not function for UDP since there is no way to reliably "
 "determine if a UDP port accepts connections in this manner."
 msgstr ""
 
-#: src/usr/local/www/diag_testport.php:279
+#: src/usr/local/www/diag_testport.php:278
 msgid "Remote text"
 msgstr ""
 
-#: src/usr/local/www/diag_testport.php:282
+#: src/usr/local/www/diag_testport.php:281
 msgid ""
 "Shows the text given by the server when connecting to the port. If checked "
 "it will take 10+ seconds to display in a panel below this form."
 msgstr ""
 
-#: src/usr/local/www/diag_testport.php:289
+#: src/usr/local/www/diag_testport.php:288
 #: src/usr/local/www/diag_traceroute.php:182
 msgid "Select source address for the trace"
 msgstr ""
 
-#: src/usr/local/www/diag_testport.php:296
+#: src/usr/local/www/diag_testport.php:295
 msgid ""
 "If you force IPv4 or IPv6 and use a hostname that does not contain a result "
 "using that protocol, it will result in an error. For example if you force "
@@ -7900,7 +9617,7 @@ msgid ""
 "not work."
 msgstr ""
 
-#: src/usr/local/www/diag_testport.php:307
+#: src/usr/local/www/diag_testport.php:306
 msgid "Received Remote Text"
 msgstr ""
 
@@ -7955,9 +9672,9 @@ msgstr ""
 msgid "Firewall: EasyRule"
 msgstr ""
 
-#: src/usr/local/www/easyrule.php:103 src/usr/local/www/status_logs.php:171
-#: src/usr/local/www/status_logs.php:221
-#: src/usr/local/www/status_logs_common.inc:298
+#: src/usr/local/www/easyrule.php:103 src/usr/local/www/status_logs.php:175
+#: src/usr/local/www/status_logs.php:225
+#: src/usr/local/www/status_logs_common.inc:309
 #: src/usr/local/www/status_logs_filter.php:330
 msgid "Message"
 msgstr ""
@@ -7971,158 +9688,56 @@ msgstr ""
 #: src/usr/local/www/easyrule.php:109
 msgid ""
 "If you are seeing this, there apparently was not an error, and you navigated "
-"to the page directly without telling it what to do."
-msgstr ""
-
-#: src/usr/local/www/easyrule.php:111
-msgid ""
-"This page is meant to be called from the block/pass buttons on the Firewall "
-"Logs page"
-msgstr ""
-
-#: src/usr/local/www/easyrule.php:112 src/usr/local/www/head.inc:306
-msgid "System Logs"
-msgstr ""
-
-#: src/usr/local/www/easyrule.php:112
-msgid "Firewall Tab"
-msgstr ""
-
-#: src/usr/local/www/edit.php:65
-msgid "Edit file"
-msgstr ""
-
-#: src/usr/local/www/edit.php:75 src/usr/local/www/edit.php:93
-msgid "No file name specified"
-msgstr ""
-
-#: src/usr/local/www/edit.php:77
-msgid "Loading a directory is not supported"
-msgstr ""
-
-#: src/usr/local/www/edit.php:79
-msgid "File does not exist or is not a regular file"
-msgstr ""
-
-#: src/usr/local/www/edit.php:83
-msgid "Failed to read file"
-msgstr ""
-
-#: src/usr/local/www/edit.php:106
-msgid "Failed to write file"
-msgstr ""
-
-#: src/usr/local/www/edit.php:108
-msgid "Error while writing file"
-msgstr ""
-
-#: src/usr/local/www/edit.php:110
-msgid "File saved successfully"
-msgstr ""
-
-#: src/usr/local/www/edit.php:126
-msgid "Save / Load a file from the filesystem"
-msgstr ""
-
-#: src/usr/local/www/edit.php:131
-msgid "Load"
-msgstr ""
-
-#: src/usr/local/www/edit.php:132
-msgid "Browse"
-msgstr ""
-
-#: src/usr/local/www/edit.php:135
-msgid "GoTo Line #"
-msgstr ""
-
-#: src/usr/local/www/exec.php:93
-#, php-format
-msgid "Uploaded file to /tmp/%s"
-msgstr ""
-
-#: src/usr/local/www/exec.php:125
-msgid "Execute command"
-msgstr ""
-
-#: src/usr/local/www/exec.php:186
-msgid "Nothing to recall"
-msgstr ""
-
-#: src/usr/local/www/exec.php:221
-msgid ""
-"The capabilities offered here can be dangerous. No support is available. Use "
-"them at your own risk!"
-msgstr ""
-
-#: src/usr/local/www/exec.php:226
-#, php-format
-msgid "Shell Output - %s"
-msgstr ""
-
-#: src/usr/local/www/exec.php:245
-msgid "Execute Shell Command"
-msgstr ""
-
-#: src/usr/local/www/exec.php:252 src/usr/local/www/exec.php:328
-msgid "Execute"
-msgstr ""
-
-#: src/usr/local/www/exec.php:254 src/usr/local/www/pkg_mgr.php:197
-#: src/usr/local/www/widgets/widgets/services_status.widget.php:149
-#: src/usr/local/www/interfaces.php:2017
-msgid "Clear"
-msgstr ""
-
-#: src/usr/local/www/exec.php:260
-msgid "Download file"
-msgstr ""
-
-#: src/usr/local/www/exec.php:276
-msgid "Upload file"
+"to the page directly without telling it what to do."
 msgstr ""
 
-#: src/usr/local/www/exec.php:281
-#: src/usr/local/www/services_captiveportal_filemanager.php:184
-#: src/usr/local/www/widgets/widgets/picture.widget.php:83
-msgid "Upload"
+#: src/usr/local/www/easyrule.php:111
+msgid ""
+"This page is meant to be called from the block/pass buttons on the Firewall "
+"Logs page"
 msgstr ""
 
-#: src/usr/local/www/exec.php:323
-msgid "Execute PHP Commands"
+#: src/usr/local/www/easyrule.php:112 src/usr/local/www/head.inc:342
+#: src/usr/local/www/status_logs.php:129 src/usr/local/www/status_logs.php:131
+#: src/usr/local/www/status_logs_filter.php:135
+#: src/usr/local/www/status_logs_filter_dynamic.php:115
+#: src/usr/local/www/status_logs_filter_summary.php:101
+#: src/usr/local/www/status_logs_settings.php:209
+#: src/usr/local/www/status_logs_vpn.php:117
+msgid "System Logs"
 msgstr ""
 
-#: src/usr/local/www/exec.php:329
-msgid "Example"
+#: src/usr/local/www/easyrule.php:112
+msgid "Firewall Tab"
 msgstr ""
 
 #: src/usr/local/www/firewall_aliases.php:133
 #, php-format
-msgid "Cannot delete alias. Currently in use by %s"
+msgid "Cannot delete alias. Currently in use by %s."
 msgstr ""
 
-#: src/usr/local/www/firewall_aliases.php:186
+#: src/usr/local/www/firewall_aliases.php:190
 msgid "Ports"
 msgstr ""
 
-#: src/usr/local/www/firewall_aliases.php:187
+#: src/usr/local/www/firewall_aliases.php:191
 msgid "URLs"
 msgstr ""
 
-#: src/usr/local/www/firewall_aliases.php:197
+#: src/usr/local/www/firewall_aliases.php:201
 #: src/usr/local/www/firewall_aliases_edit.php:71
 #: src/usr/local/www/firewall_aliases_import.php:72
-#: src/usr/local/www/firewall_nat.php:213
+#: src/usr/local/www/firewall_nat.php:206
 #: src/usr/local/www/firewall_nat_1to1.php:155
 #: src/usr/local/www/firewall_nat_1to1_edit.php:281
-#: src/usr/local/www/firewall_nat_edit.php:659
+#: src/usr/local/www/firewall_nat_edit.php:653
 #: src/usr/local/www/firewall_nat_npt.php:155
 #: src/usr/local/www/firewall_nat_npt_edit.php:212
 #: src/usr/local/www/firewall_nat_out.php:239
 #: src/usr/local/www/firewall_nat_out_edit.php:393
 #: src/usr/local/www/firewall_rules.php:72
-#: src/usr/local/www/firewall_rules.php:335
-#: src/usr/local/www/firewall_rules_edit.php:1028
+#: src/usr/local/www/firewall_rules.php:355
+#: src/usr/local/www/firewall_rules_edit.php:1060
 #: src/usr/local/www/firewall_schedule.php:75
 #: src/usr/local/www/firewall_schedule_edit.php:85
 #: src/usr/local/www/firewall_shaper.php:75
@@ -8130,146 +9745,148 @@ msgstr ""
 #: src/usr/local/www/firewall_shaper_vinterface.php:73
 #: src/usr/local/www/firewall_shaper_wizards.php:96
 #: src/usr/local/www/firewall_virtual_ip.php:271
-#: src/usr/local/www/firewall_virtual_ip_edit.php:339
-#: src/usr/local/www/status_logs_common.inc:111
+#: src/usr/local/www/firewall_virtual_ip_edit.php:320
+#: src/usr/local/www/status_logs_common.inc:122
 #: src/usr/local/www/status_logs_settings.php:234
 msgid "Firewall"
 msgstr ""
 
-#: src/usr/local/www/firewall_aliases.php:207
+#: src/usr/local/www/firewall_aliases.php:211
 msgid "The alias list has been changed."
 msgstr ""
 
-#: src/usr/local/www/firewall_aliases.php:207
-#: src/usr/local/www/firewall_nat.php:222
+#: src/usr/local/www/firewall_aliases.php:211
+#: src/usr/local/www/firewall_nat.php:215
 #: src/usr/local/www/firewall_nat_1to1.php:164
 #: src/usr/local/www/firewall_nat_npt.php:164
 #: src/usr/local/www/firewall_nat_out.php:248
-#: src/usr/local/www/firewall_rules.php:346
-#: src/usr/local/www/firewall_shaper.php:433
+#: src/usr/local/www/firewall_rules.php:366
+#: src/usr/local/www/firewall_shaper.php:432
 #: src/usr/local/www/firewall_shaper_queues.php:239
 #: src/usr/local/www/firewall_shaper_vinterface.php:411
 #: src/usr/local/www/firewall_shaper_wizards.php:122
 #: src/usr/local/www/firewall_virtual_ip.php:279
-#: src/usr/local/www/interfaces_assign.php:505
+#: src/usr/local/www/interfaces.php:1696
+#: src/usr/local/www/interfaces_assign.php:509
 #: src/usr/local/www/load_balancer_monitor.php:121
 #: src/usr/local/www/load_balancer_pool.php:135
-#: src/usr/local/www/load_balancer_setting.php:135
+#: src/usr/local/www/load_balancer_setting.php:134
 #: src/usr/local/www/load_balancer_virtual_server.php:135
 #: src/usr/local/www/services_captiveportal_mac.php:192
 #: src/usr/local/www/services_captiveportal_zones.php:102
-#: src/usr/local/www/services_dhcp.php:718
-#: src/usr/local/www/services_dhcpv6.php:459
+#: src/usr/local/www/services_dhcp.php:750
+#: src/usr/local/www/services_dhcpv6.php:530
 #: src/usr/local/www/services_dnsmasq.php:228
 #: src/usr/local/www/services_igmpproxy.php:109
 #: src/usr/local/www/services_pppoe.php:125
-#: src/usr/local/www/services_unbound.php:255
-#: src/usr/local/www/services_unbound_acls.php:221
+#: src/usr/local/www/services_unbound.php:280
+#: src/usr/local/www/services_unbound_acls.php:225
 #: src/usr/local/www/services_unbound_advanced.php:234
-#: src/usr/local/www/status_lb_pool.php:148
-#: src/usr/local/www/system_advanced_sysctl.php:178
+#: src/usr/local/www/status_lb_pool.php:143
+#: src/usr/local/www/system_advanced_sysctl.php:182
 #: src/usr/local/www/system_gateway_groups.php:134
 #: src/usr/local/www/system_gateways.php:258
-#: src/usr/local/www/system_routes.php:258 src/usr/local/www/vpn_ipsec.php:271
-#: src/usr/local/www/vpn_ipsec_keys.php:118
+#: src/usr/local/www/system_routes.php:258 src/usr/local/www/vpn_ipsec.php:269
+#: src/usr/local/www/vpn_ipsec_keys.php:115
 #: src/usr/local/www/vpn_ipsec_mobile.php:440
 msgid "You must apply the changes in order for them to take effect."
 msgstr ""
 
-#: src/usr/local/www/firewall_aliases.php:215
+#: src/usr/local/www/firewall_aliases.php:219
 #, php-format
 msgid "Firewall Aliases %s"
 msgstr ""
 
-#: src/usr/local/www/firewall_aliases.php:223
+#: src/usr/local/www/firewall_aliases.php:227
 #: src/usr/local/www/services_igmpproxy.php:123
 msgid "Values"
 msgstr ""
 
-#: src/usr/local/www/firewall_aliases.php:287
+#: src/usr/local/www/firewall_aliases.php:291
 msgid "Edit alias"
 msgstr ""
 
-#: src/usr/local/www/firewall_aliases.php:288
+#: src/usr/local/www/firewall_aliases.php:292
 msgid "Delete alias"
 msgstr ""
 
-#: src/usr/local/www/firewall_aliases.php:303
-#: src/usr/local/www/firewall_nat.php:455
-#: src/usr/local/www/firewall_nat.php:459
+#: src/usr/local/www/firewall_aliases.php:307
+#: src/usr/local/www/firewall_nat.php:443
+#: src/usr/local/www/firewall_nat.php:447
 #: src/usr/local/www/firewall_nat_1to1.php:270
 #: src/usr/local/www/firewall_nat_1to1.php:274
 #: src/usr/local/www/firewall_nat_npt.php:259
 #: src/usr/local/www/firewall_nat_npt.php:263
-#: src/usr/local/www/firewall_nat_out.php:527
-#: src/usr/local/www/firewall_nat_out.php:531
-#: src/usr/local/www/firewall_rules.php:824
-#: src/usr/local/www/firewall_rules.php:828
+#: src/usr/local/www/firewall_nat_out.php:526
+#: src/usr/local/www/firewall_nat_out.php:530
+#: src/usr/local/www/firewall_rules.php:837
+#: src/usr/local/www/firewall_rules.php:841
 #: src/usr/local/www/firewall_schedule.php:278
-#: src/usr/local/www/firewall_virtual_ip.php:363
-#: src/usr/local/www/interfaces.php:1892 src/usr/local/www/interfaces.php:3192
-#: src/usr/local/www/interfaces_assign.php:588
+#: src/usr/local/www/firewall_virtual_ip.php:371
+#: src/usr/local/www/interfaces.php:1882 src/usr/local/www/interfaces.php:3194
+#: src/usr/local/www/interfaces_assign.php:592
 #: src/usr/local/www/interfaces_bridge.php:190
 #: src/usr/local/www/interfaces_gif.php:164
-#: src/usr/local/www/interfaces_gre.php:164
+#: src/usr/local/www/interfaces_gre.php:170
 #: src/usr/local/www/interfaces_groups.php:160
 #: src/usr/local/www/interfaces_lagg.php:179
 #: src/usr/local/www/interfaces_ppps.php:179
 #: src/usr/local/www/interfaces_qinq.php:186
-#: src/usr/local/www/interfaces_vlan.php:176
-#: src/usr/local/www/interfaces_wireless.php:173
+#: src/usr/local/www/interfaces_vlan.php:183
+#: src/usr/local/www/interfaces_wireless.php:174
 #: src/usr/local/www/load_balancer_monitor.php:180
 #: src/usr/local/www/load_balancer_pool.php:215
 #: src/usr/local/www/load_balancer_virtual_server.php:204
-#: src/usr/local/www/pkg.php:599 src/usr/local/www/pkg_edit.php:1445
+#: src/usr/local/www/pkg.php:600 src/usr/local/www/pkg_edit.php:1447
 #: src/usr/local/www/services_captiveportal_filemanager.php:266
 #: src/usr/local/www/services_captiveportal_hostname.php:195
 #: src/usr/local/www/services_captiveportal_ip.php:191
 #: src/usr/local/www/services_captiveportal_mac.php:254
 #: src/usr/local/www/services_captiveportal_vouchers.php:502
 #: src/usr/local/www/services_captiveportal_zones.php:156
-#: src/usr/local/www/services_dhcp.php:871
-#: src/usr/local/www/services_dhcp.php:1198
-#: src/usr/local/www/services_dhcp.php:1346
-#: src/usr/local/www/services_dhcpv6.php:948
-#: src/usr/local/www/services_dnsmasq.php:433
-#: src/usr/local/www/services_dnsmasq.php:487
+#: src/usr/local/www/services_dhcp.php:894
+#: src/usr/local/www/services_dhcp.php:1221
+#: src/usr/local/www/services_dhcp.php:1369
+#: src/usr/local/www/services_dhcpv6.php:1048
+#: src/usr/local/www/services_dnsmasq.php:439
+#: src/usr/local/www/services_dnsmasq.php:492
 #: src/usr/local/www/services_dyndns.php:245
 #: src/usr/local/www/services_igmpproxy.php:178
-#: src/usr/local/www/services_ntpd.php:338
+#: src/usr/local/www/services_ntpd.php:290
+#: src/usr/local/www/services_ntpd_acls.php:331
 #: src/usr/local/www/services_pppoe.php:181
-#: src/usr/local/www/services_rfc2136.php:226
-#: src/usr/local/www/services_router_advertisements.php:393
-#: src/usr/local/www/services_unbound.php:480
-#: src/usr/local/www/services_unbound.php:529
-#: src/usr/local/www/services_unbound_acls.php:361
+#: src/usr/local/www/services_rfc2136.php:234
+#: src/usr/local/www/services_router_advertisements.php:373
+#: src/usr/local/www/services_unbound.php:505
+#: src/usr/local/www/services_unbound.php:554
+#: src/usr/local/www/services_unbound_acls.php:365
 #: src/usr/local/www/services_wol.php:230
-#: src/usr/local/www/system_authservers.php:435
-#: src/usr/local/www/system_camanager.php:464
-#: src/usr/local/www/system_certmanager.php:839
-#: src/usr/local/www/system_certmanager.php:1137
-#: src/usr/local/www/system_crlmanager.php:572
+#: src/usr/local/www/system_authservers.php:438
+#: src/usr/local/www/system_camanager.php:467
+#: src/usr/local/www/system_certmanager.php:841
+#: src/usr/local/www/system_certmanager.php:1139
+#: src/usr/local/www/system_crlmanager.php:575
 #: src/usr/local/www/system_gateway_groups.php:204
 #: src/usr/local/www/system_gateways.php:351
-#: src/usr/local/www/system_groupmanager.php:256
-#: src/usr/local/www/system_groupmanager.php:331
+#: src/usr/local/www/system_groupmanager.php:268
+#: src/usr/local/www/system_groupmanager.php:348
 #: src/usr/local/www/system_routes.php:332
 #: src/usr/local/www/system_usermanager.php:415
 #: src/usr/local/www/system_usermanager.php:461
-#: src/usr/local/www/system_usermanager.php:540
-#: src/usr/local/www/vpn_ipsec_keys.php:206
+#: src/usr/local/www/system_usermanager.php:545
+#: src/usr/local/www/vpn_ipsec_keys.php:201
 #: src/usr/local/www/vpn_l2tp_users.php:158
-#: src/usr/local/www/vpn_openvpn_client.php:854
-#: src/usr/local/www/vpn_openvpn_csc.php:704
-#: src/usr/local/www/vpn_openvpn_server.php:1236
+#: src/usr/local/www/vpn_openvpn_client.php:859
+#: src/usr/local/www/vpn_openvpn_csc.php:708
+#: src/usr/local/www/vpn_openvpn_server.php:1241
 msgid "Add"
 msgstr ""
 
-#: src/usr/local/www/firewall_aliases.php:307
+#: src/usr/local/www/firewall_aliases.php:311
 msgid "Import"
 msgstr ""
 
-#: src/usr/local/www/firewall_aliases.php:315
+#: src/usr/local/www/firewall_aliases.php:319
 msgid ""
 "Aliases act as placeholders for real hosts, networks or ports. They can be "
 "used to minimize the number of changes that have to be made if a host, "
@@ -8282,35 +9899,52 @@ msgstr ""
 
 #: src/usr/local/www/firewall_aliases_edit.php:71
 #: src/usr/local/www/firewall_nat_1to1_edit.php:281
-#: src/usr/local/www/firewall_nat_edit.php:659
+#: src/usr/local/www/firewall_nat_edit.php:653
 #: src/usr/local/www/firewall_nat_npt_edit.php:212
 #: src/usr/local/www/firewall_nat_out_edit.php:393
-#: src/usr/local/www/firewall_rules.php:773
-#: src/usr/local/www/firewall_rules_edit.php:1028
+#: src/usr/local/www/firewall_rules.php:792
+#: src/usr/local/www/firewall_rules_edit.php:1065
 #: src/usr/local/www/firewall_schedule_edit.php:85
-#: src/usr/local/www/firewall_virtual_ip_edit.php:339
-#: src/usr/local/www/interfaces_bridge_edit.php:360
+#: src/usr/local/www/firewall_virtual_ip_edit.php:320
+#: src/usr/local/www/interfaces_bridge_edit.php:403
 #: src/usr/local/www/interfaces_gif_edit.php:195
 #: src/usr/local/www/interfaces_gre_edit.php:189
 #: src/usr/local/www/interfaces_groups_edit.php:67
 #: src/usr/local/www/interfaces_lagg_edit.php:241
-#: src/usr/local/www/interfaces_ppps_edit.php:451
+#: src/usr/local/www/interfaces_ppps_edit.php:462
 #: src/usr/local/www/interfaces_qinq_edit.php:63
-#: src/usr/local/www/interfaces_vlan_edit.php:202
+#: src/usr/local/www/interfaces_vlan_edit.php:205
 #: src/usr/local/www/interfaces_wireless_edit.php:201
-#: src/usr/local/www/load_balancer_monitor_edit.php:230
+#: src/usr/local/www/load_balancer_monitor_edit.php:234
 #: src/usr/local/www/load_balancer_pool_edit.php:219
 #: src/usr/local/www/load_balancer_virtual_server_edit.php:193
-#: src/usr/local/www/services_dyndns_edit.php:263
+#: src/usr/local/www/services_captiveportal_hostname_edit.php:96
+#: src/usr/local/www/services_captiveportal_ip_edit.php:98
+#: src/usr/local/www/services_captiveportal_mac_edit.php:101
+#: src/usr/local/www/services_captiveportal_vouchers_edit.php:86
+#: src/usr/local/www/services_dyndns_edit.php:273
 #: src/usr/local/www/services_igmpproxy_edit.php:66
 #: src/usr/local/www/services_pppoe_edit.php:314
-#: src/usr/local/www/services_rfc2136_edit.php:160
+#: src/usr/local/www/services_rfc2136_edit.php:182
+#: src/usr/local/www/services_unbound_acls.php:211
 #: src/usr/local/www/services_wol_edit.php:137
+#: src/usr/local/www/system_advanced_sysctl.php:169
+#: src/usr/local/www/system_authservers.php:380
+#: src/usr/local/www/system_camanager.php:354
+#: src/usr/local/www/system_certmanager.php:562
+#: src/usr/local/www/system_crlmanager.php:296
 #: src/usr/local/www/system_gateway_groups_edit.php:180
-#: src/usr/local/www/system_gateways_edit.php:631
+#: src/usr/local/www/system_gateways_edit.php:572
+#: src/usr/local/www/system_groupmanager.php:277
+#: src/usr/local/www/system_groupmanager_addprivs.php:69
 #: src/usr/local/www/system_routes_edit.php:257
+#: src/usr/local/www/system_usermanager.php:470
+#: src/usr/local/www/system_usermanager_addprivs.php:70
 #: src/usr/local/www/vpn_ipsec_keys_edit.php:155
 #: src/usr/local/www/vpn_l2tp_users_edit.php:63
+#: src/usr/local/www/vpn_openvpn_client.php:429
+#: src/usr/local/www/vpn_openvpn_csc.php:311
+#: src/usr/local/www/vpn_openvpn_server.php:595
 msgid "Edit"
 msgstr ""
 
@@ -8382,7 +10016,7 @@ msgid "You must provide a valid URL."
 msgstr ""
 
 #: src/usr/local/www/firewall_aliases_edit.php:229
-msgid "Unable to fetch usable data."
+msgid "Unable to fetch usable data from URL"
 msgstr ""
 
 #: src/usr/local/www/firewall_aliases_edit.php:241
@@ -8408,7 +10042,7 @@ msgid "Range is too large to expand into individual host IP addresses (%s)"
 msgstr ""
 
 #: src/usr/local/www/firewall_aliases_edit.php:360
-#: src/usr/local/www/firewall_aliases_edit.php:388
+#: src/usr/local/www/firewall_aliases_edit.php:390
 #, php-format
 msgid "The maximum number of entries in an alias is %s"
 msgstr ""
@@ -8419,116 +10053,116 @@ msgstr ""
 msgid "IPv6 address ranges are not supported (%s)"
 msgstr ""
 
-#: src/usr/local/www/firewall_aliases_edit.php:387
+#: src/usr/local/www/firewall_aliases_edit.php:389
 #, php-format
 msgid "Subnet is too large to expand into individual host IP addresses (%s)"
 msgstr ""
 
-#: src/usr/local/www/firewall_aliases_edit.php:395
+#: src/usr/local/www/firewall_aliases_edit.php:397
 #, php-format
 msgid "IPv6 subnets are not supported in host aliases (%s)"
 msgstr ""
 
-#: src/usr/local/www/firewall_aliases_edit.php:422
+#: src/usr/local/www/firewall_aliases_edit.php:424
 #, php-format
 msgid "The maximum number of entries in an alias has been exceeded (%s)"
 msgstr ""
 
-#: src/usr/local/www/firewall_aliases_edit.php:441
+#: src/usr/local/www/firewall_aliases_edit.php:443
 #, php-format
 msgid "%s is not a valid port or alias."
 msgstr ""
 
-#: src/usr/local/www/firewall_aliases_edit.php:446
+#: src/usr/local/www/firewall_aliases_edit.php:448
 #, php-format
 msgid "%1$s is not a valid %2$s address, FQDN or alias."
 msgstr ""
 
-#: src/usr/local/www/firewall_aliases_edit.php:452
+#: src/usr/local/www/firewall_aliases_edit.php:454
 #, php-format
 msgid "%1$s/%2$s is not a valid subnet."
 msgstr ""
 
-#: src/usr/local/www/firewall_aliases_edit.php:461
+#: src/usr/local/www/firewall_aliases_edit.php:463
 #, 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:563
-#: src/usr/local/www/firewall_aliases_edit.php:621
-msgid "Network(s)"
-msgstr ""
-
-#: src/usr/local/www/firewall_aliases_edit.php:564
-#: src/usr/local/www/firewall_aliases_edit.php:620
-msgid "Host(s)"
-msgstr ""
-
 #: src/usr/local/www/firewall_aliases_edit.php:565
-#: src/usr/local/www/firewall_aliases_edit.php:622
-msgid "Port(s)"
+#: src/usr/local/www/firewall_aliases_edit.php:623
+msgid "Network(s)"
 msgstr ""
 
 #: src/usr/local/www/firewall_aliases_edit.php:566
-#: src/usr/local/www/firewall_aliases_edit.php:586
-#: src/usr/local/www/firewall_aliases_edit.php:623
-msgid "URL (IPs)"
+#: src/usr/local/www/firewall_aliases_edit.php:622
+msgid "Host(s)"
 msgstr ""
 
 #: src/usr/local/www/firewall_aliases_edit.php:567
-#: src/usr/local/www/firewall_aliases_edit.php:587
 #: src/usr/local/www/firewall_aliases_edit.php:624
-msgid "URL (Ports)"
+msgid "Port(s)"
 msgstr ""
 
 #: src/usr/local/www/firewall_aliases_edit.php:568
 #: src/usr/local/www/firewall_aliases_edit.php:588
 #: src/usr/local/www/firewall_aliases_edit.php:625
-msgid "URL Table (IPs)"
+msgid "URL (IPs)"
 msgstr ""
 
 #: src/usr/local/www/firewall_aliases_edit.php:569
 #: src/usr/local/www/firewall_aliases_edit.php:589
 #: src/usr/local/www/firewall_aliases_edit.php:626
-msgid "URL Table (Ports)"
+msgid "URL (Ports)"
 msgstr ""
 
-#: src/usr/local/www/firewall_aliases_edit.php:573
-msgid "Add Network"
+#: src/usr/local/www/firewall_aliases_edit.php:570
+#: src/usr/local/www/firewall_aliases_edit.php:590
+#: src/usr/local/www/firewall_aliases_edit.php:627
+msgid "URL Table (IPs)"
 msgstr ""
 
-#: src/usr/local/www/firewall_aliases_edit.php:574
-msgid "Add Host"
+#: src/usr/local/www/firewall_aliases_edit.php:571
+#: src/usr/local/www/firewall_aliases_edit.php:591
+#: src/usr/local/www/firewall_aliases_edit.php:628
+msgid "URL Table (Ports)"
 msgstr ""
 
 #: src/usr/local/www/firewall_aliases_edit.php:575
-msgid "Add Port"
+msgid "Add Network"
 msgstr ""
 
 #: src/usr/local/www/firewall_aliases_edit.php:576
+msgid "Add Host"
+msgstr ""
+
 #: src/usr/local/www/firewall_aliases_edit.php:577
-msgid "Add URL"
+msgid "Add Port"
 msgstr ""
 
 #: src/usr/local/www/firewall_aliases_edit.php:578
 #: src/usr/local/www/firewall_aliases_edit.php:579
+msgid "Add URL"
+msgstr ""
+
+#: src/usr/local/www/firewall_aliases_edit.php:580
+#: src/usr/local/www/firewall_aliases_edit.php:581
 msgid "Add URL Table"
 msgstr ""
 
-#: src/usr/local/www/firewall_aliases_edit.php:583
+#: src/usr/local/www/firewall_aliases_edit.php:585
 msgid "Network or FQDN"
 msgstr ""
 
-#: src/usr/local/www/firewall_aliases_edit.php:584
+#: src/usr/local/www/firewall_aliases_edit.php:586
 msgid "IP or FQDN"
 msgstr ""
 
-#: src/usr/local/www/firewall_aliases_edit.php:592
+#: src/usr/local/www/firewall_aliases_edit.php:594
 msgid "The value after the \"/\" is the update frequency in days."
 msgstr ""
 
-#: src/usr/local/www/firewall_aliases_edit.php:595
+#: src/usr/local/www/firewall_aliases_edit.php:597
 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 "
@@ -8538,7 +10172,7 @@ msgid ""
 "and a list of CIDR networks will be derived to fill the range."
 msgstr ""
 
-#: src/usr/local/www/firewall_aliases_edit.php:596
+#: src/usr/local/www/firewall_aliases_edit.php:598
 msgid ""
 "Enter as many hosts as you would like. Hosts must be specified by their IP "
 "address or fully qualified domain name (FQDN). FQDN hostnames are "
@@ -8548,27 +10182,27 @@ msgid ""
 "list of individual IP addresses will be generated."
 msgstr ""
 
-#: src/usr/local/www/firewall_aliases_edit.php:597
+#: src/usr/local/www/firewall_aliases_edit.php:599
 msgid ""
 "Enter as many ports as you wish. Port ranges can be expressed by separating "
 "with a colon."
 msgstr ""
 
-#: src/usr/local/www/firewall_aliases_edit.php:598
+#: src/usr/local/www/firewall_aliases_edit.php:600
 msgid ""
 "Enter as many URLs as you wish. After saving we will download the URL and "
 "import the items into the alias. Use only with small sets of IP addresses "
 "(less than 3000)."
 msgstr ""
 
-#: src/usr/local/www/firewall_aliases_edit.php:599
+#: src/usr/local/www/firewall_aliases_edit.php:601
 msgid ""
 "Enter as many URLs as you wish. After saving we will download the URL and "
 "import the items into the alias. Use only with small sets of Ports (less "
 "than 3000)."
 msgstr ""
 
-#: src/usr/local/www/firewall_aliases_edit.php:600
+#: src/usr/local/www/firewall_aliases_edit.php:602
 msgid ""
 "Enter a single URL containing a large number of IPs and/or Subnets. After "
 "saving we will download the URL and create a table file containing these "
@@ -8576,66 +10210,66 @@ msgid ""
 "numbers."
 msgstr ""
 
-#: src/usr/local/www/firewall_aliases_edit.php:602
+#: src/usr/local/www/firewall_aliases_edit.php:604
 msgid ""
 "Enter a single URL containing a list of Port numbers and/or Port ranges. "
 "After saving we will download the URL."
 msgstr ""
 
-#: src/usr/local/www/firewall_aliases_edit.php:668
+#: src/usr/local/www/firewall_aliases_edit.php:670
 msgid "Properties"
 msgstr ""
 
-#: src/usr/local/www/firewall_aliases_edit.php:675
+#: src/usr/local/www/firewall_aliases_edit.php:677
 #: src/usr/local/www/firewall_aliases_import.php:203
 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:687
+#: src/usr/local/www/firewall_aliases_edit.php:689
 #: src/usr/local/www/firewall_nat_1to1_edit.php:472
 #: src/usr/local/www/firewall_nat_1to1_edit.php:499
-#: src/usr/local/www/firewall_nat_edit.php:758
-#: src/usr/local/www/firewall_nat_edit.php:825
+#: src/usr/local/www/firewall_nat_edit.php:752
+#: src/usr/local/www/firewall_nat_edit.php:819
 #: src/usr/local/www/firewall_nat_out_edit.php:514
 #: src/usr/local/www/firewall_nat_out_edit.php:538
-#: src/usr/local/www/firewall_rules_edit.php:432
+#: src/usr/local/www/firewall_rules_edit.php:433
 #: src/usr/local/www/firewall_virtual_ip.php:297
 #: src/usr/local/www/firewall_virtual_ip_edit.php:129
-#: src/usr/local/www/firewall_virtual_ip_edit.php:365
+#: src/usr/local/www/firewall_virtual_ip_edit.php:354
 #: src/usr/local/www/load_balancer_monitor.php:141
-#: src/usr/local/www/load_balancer_monitor_edit.php:114
-#: src/usr/local/www/load_balancer_monitor_edit.php:316
-#: src/usr/local/www/services_captiveportal.php:997
-#: src/usr/local/www/services_dhcp.php:1177
+#: src/usr/local/www/load_balancer_monitor_edit.php:118
+#: src/usr/local/www/load_balancer_monitor_edit.php:320
+#: src/usr/local/www/services_captiveportal.php:998
+#: src/usr/local/www/services_dhcp.php:1200
 #: src/usr/local/www/services_igmpproxy.php:122
 #: src/usr/local/www/services_igmpproxy_edit.php:202
 #: src/usr/local/www/status_logs_vpn.php:210
-#: src/usr/local/www/status_logs_vpn.php:448
+#: src/usr/local/www/status_logs_vpn.php:440
 #: src/usr/local/www/status_ntpd.php:202
-#: src/usr/local/www/system_authservers.php:201
-#: src/usr/local/www/system_authservers.php:224
-#: src/usr/local/www/system_authservers.php:407
-#: src/usr/local/www/system_authservers.php:464
-#: src/usr/local/www/system_certmanager.php:808
-#: src/usr/local/www/system_certmanager.php:816
-#: src/usr/local/www/vpn_ipsec_keys.php:139
+#: src/usr/local/www/system_authservers.php:198
+#: src/usr/local/www/system_authservers.php:221
+#: src/usr/local/www/system_authservers.php:410
+#: src/usr/local/www/system_authservers.php:467
+#: src/usr/local/www/system_certmanager.php:810
+#: src/usr/local/www/system_certmanager.php:818
+#: src/usr/local/www/vpn_ipsec_keys.php:134
 #: src/usr/local/www/vpn_ipsec_phase2.php:560
 #: src/usr/local/www/vpn_ipsec_phase2.php:586
 #: src/usr/local/www/vpn_ipsec_phase2.php:606
 msgid "Type"
 msgstr ""
 
-#: src/usr/local/www/firewall_aliases_edit.php:697
+#: src/usr/local/www/firewall_aliases_edit.php:699
 msgid "Hint"
 msgstr ""
 
-#: src/usr/local/www/firewall_aliases_edit.php:731
+#: src/usr/local/www/firewall_aliases_edit.php:733
 #: src/usr/local/www/firewall_nat_npt_edit.php:247
 #: src/usr/local/www/firewall_nat_npt_edit.php:261
 #: src/usr/local/www/firewall_nat_out_edit.php:569
-#: src/usr/local/www/status_lb_vs.php:102 src/usr/local/www/system.php:399
+#: src/usr/local/www/status_lb_vs.php:97 src/usr/local/www/system.php:405
 #: src/usr/local/www/vpn_ipsec_phase2.php:559
 #: src/usr/local/www/vpn_ipsec_phase2.php:566
 #: src/usr/local/www/vpn_ipsec_phase2.php:579
@@ -8645,27 +10279,28 @@ msgstr ""
 msgid "Address"
 msgstr ""
 
-#: src/usr/local/www/firewall_aliases_edit.php:744
-#: src/usr/local/www/firewall_nat.php:463
+#: src/usr/local/www/firewall_aliases_edit.php:746
+#: src/usr/local/www/firewall_nat.php:451
 #: src/usr/local/www/firewall_nat_1to1.php:278
 #: src/usr/local/www/firewall_nat_npt.php:267
-#: src/usr/local/www/firewall_nat_out.php:535
-#: src/usr/local/www/firewall_rules.php:832
+#: src/usr/local/www/firewall_nat_out.php:534
+#: src/usr/local/www/firewall_rules.php:845
 #: src/usr/local/www/firewall_schedule_edit.php:653
-#: src/usr/local/www/interfaces_assign.php:564
-#: src/usr/local/www/interfaces_vlan.php:159
-#: src/usr/local/www/pkg_edit.php:1433 src/usr/local/www/services_dhcp.php:1188
-#: src/usr/local/www/services_dhcpv6.php:850
+#: src/usr/local/www/interfaces_assign.php:568
+#: src/usr/local/www/interfaces_vlan.php:166
+#: src/usr/local/www/pkg_edit.php:1435 src/usr/local/www/services_dhcp.php:1211
+#: src/usr/local/www/services_dhcpv6.php:950
 #: src/usr/local/www/services_dnsmasq_edit.php:322
 #: src/usr/local/www/services_igmpproxy_edit.php:264
-#: src/usr/local/www/services_ntpd.php:330
+#: src/usr/local/www/services_ntpd.php:282
+#: src/usr/local/www/services_ntpd_acls.php:320
 #: src/usr/local/www/services_pppoe_edit.php:557
-#: src/usr/local/www/services_router_advertisements.php:381
-#: src/usr/local/www/services_unbound_acls.php:296
+#: src/usr/local/www/services_router_advertisements.php:361
+#: src/usr/local/www/services_unbound_acls.php:300
 #: src/usr/local/www/services_unbound_host_edit.php:323
 #: src/usr/local/www/status_ipsec_sad.php:138
-#: src/usr/local/www/system_certmanager.php:827
-#: src/usr/local/www/system_usermanager.php:545
+#: src/usr/local/www/system_certmanager.php:829
+#: src/usr/local/www/system_usermanager.php:550
 msgid "Delete"
 msgstr ""
 
@@ -8694,15 +10329,7 @@ msgid "Descriptions must be less than 200 characters long."
 msgstr ""
 
 #: src/usr/local/www/firewall_aliases_import.php:196
-#: src/usr/local/www/firewall_nat.php:338
-#: src/usr/local/www/firewall_nat.php:355
-#: src/usr/local/www/firewall_nat.php:373
-#: src/usr/local/www/firewall_nat.php:390
-#: src/usr/local/www/firewall_rules.php:706
-#: src/usr/local/www/firewall_rules.php:715
-#: src/usr/local/www/firewall_rules.php:724
-#: src/usr/local/www/firewall_rules.php:733
-msgid "Alias details"
+msgid "Alias Details"
 msgstr ""
 
 #: src/usr/local/www/firewall_aliases_import.php:200
@@ -8724,27 +10351,27 @@ msgid ""
 "li><li>10.40.1.10-10.40.1.19 Managed switches</li></ul>"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat.php:205
+#: src/usr/local/www/firewall_nat.php:198
 msgid "Firewall: NAT: Port forward, enable/disable NAT rule"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat.php:213
-#: src/usr/local/www/firewall_nat.php:226
+#: src/usr/local/www/firewall_nat.php:206
+#: src/usr/local/www/firewall_nat.php:219
 #: src/usr/local/www/firewall_nat_1to1.php:168
-#: src/usr/local/www/firewall_nat_edit.php:659
+#: src/usr/local/www/firewall_nat_edit.php:653
 #: src/usr/local/www/firewall_nat_npt.php:168
 #: src/usr/local/www/firewall_nat_out.php:252
 msgid "Port Forward"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat.php:221
+#: src/usr/local/www/firewall_nat.php:214
 #: src/usr/local/www/firewall_nat_1to1.php:163
 #: src/usr/local/www/firewall_nat_npt.php:163
 #: src/usr/local/www/firewall_nat_out.php:247
 msgid "The NAT configuration has been changed."
 msgstr ""
 
-#: src/usr/local/www/firewall_nat.php:227
+#: src/usr/local/www/firewall_nat.php:220
 #: src/usr/local/www/firewall_nat_1to1.php:155
 #: src/usr/local/www/firewall_nat_1to1.php:169
 #: src/usr/local/www/firewall_nat_1to1_edit.php:281
@@ -8753,7 +10380,7 @@ msgstr ""
 msgid "1:1"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat.php:228
+#: src/usr/local/www/firewall_nat.php:221
 #: src/usr/local/www/firewall_nat_1to1.php:170
 #: src/usr/local/www/firewall_nat_npt.php:170
 #: src/usr/local/www/firewall_nat_out.php:239
@@ -8762,7 +10389,7 @@ msgstr ""
 msgid "Outbound"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat.php:229
+#: src/usr/local/www/firewall_nat.php:222
 #: src/usr/local/www/firewall_nat_1to1.php:171
 #: src/usr/local/www/firewall_nat_npt.php:155
 #: src/usr/local/www/firewall_nat_npt.php:171
@@ -8771,127 +10398,139 @@ msgstr ""
 msgid "NPt"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat.php:237
+#: src/usr/local/www/firewall_nat.php:230
 #: src/usr/local/www/firewall_rules.php:72
-#: src/usr/local/www/firewall_rules.php:335
-#: src/usr/local/www/firewall_rules_edit.php:1028
-#: src/usr/local/www/head.inc:240
+#: src/usr/local/www/firewall_rules.php:355
+#: src/usr/local/www/firewall_rules_edit.php:1060
+#: src/usr/local/www/head.inc:277
 msgid "Rules"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat.php:249
+#: src/usr/local/www/firewall_nat.php:242
 msgid "Dest. Address"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat.php:251
+#: src/usr/local/www/firewall_nat.php:244
 msgid "NAT IP"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat.php:252
+#: src/usr/local/www/firewall_nat.php:245
 msgid "NAT Ports"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat.php:300
+#: src/usr/local/www/firewall_nat.php:294
 #: src/usr/local/www/firewall_nat_1to1.php:211
 #: src/usr/local/www/firewall_nat_npt.php:212
-#: src/usr/local/www/vpn_ipsec.php:310 src/usr/local/www/vpn_ipsec.php:460
+#: src/usr/local/www/firewall_rules.php:525 src/usr/local/www/vpn_ipsec.php:308
+#: src/usr/local/www/vpn_ipsec.php:458
 msgid "click to toggle enabled/disabled status"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat.php:307
+#: src/usr/local/www/firewall_nat.php:301
 msgid "All traffic matching this NAT entry is passed"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat.php:311
+#: src/usr/local/www/firewall_nat.php:305
 #, php-format
 msgid "Firewall rule ID %s is managed by this rule"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat.php:425
+#: src/usr/local/www/firewall_nat.php:332
+#: src/usr/local/www/firewall_nat.php:349
+#: src/usr/local/www/firewall_nat.php:367
+#: src/usr/local/www/firewall_nat.php:384
+#: src/usr/local/www/firewall_rules.php:725
+#: src/usr/local/www/firewall_rules.php:734
+#: src/usr/local/www/firewall_rules.php:743
+#: src/usr/local/www/firewall_rules.php:752
+msgid "Alias details"
+msgstr ""
+
+#: src/usr/local/www/firewall_nat.php:419
 msgid "Edit rule"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat.php:426
+#: src/usr/local/www/firewall_nat.php:420
 msgid "Add a new NAT based on this one"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat.php:427
+#: src/usr/local/www/firewall_nat.php:421
 msgid "Delete rule"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat.php:453
-#: src/usr/local/www/firewall_rules.php:822
+#: src/usr/local/www/firewall_nat.php:441
+#: src/usr/local/www/firewall_rules.php:835
 msgid "Add rule to the top of the list"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat.php:457
-#: src/usr/local/www/firewall_rules.php:826
+#: src/usr/local/www/firewall_nat.php:445
+#: src/usr/local/www/firewall_rules.php:839
 msgid "Add rule to the end of the list"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat.php:461
-#: src/usr/local/www/firewall_rules.php:830
+#: src/usr/local/www/firewall_nat.php:449
+#: src/usr/local/www/firewall_rules.php:843
 msgid "Delete selected rules"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat.php:465
-#: src/usr/local/www/firewall_rules.php:834
+#: src/usr/local/www/firewall_nat.php:453
+#: src/usr/local/www/firewall_rules.php:847
 msgid "Save rule order"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat.php:469
-#: src/usr/local/www/firewall_rules.php:838
+#: src/usr/local/www/firewall_nat.php:457
+#: src/usr/local/www/firewall_rules.php:851
 msgid "Add separator"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat.php:471
-#: src/usr/local/www/firewall_rules.php:840
+#: src/usr/local/www/firewall_nat.php:459
+#: src/usr/local/www/firewall_rules.php:853
 msgid "Separator"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat.php:480
-#: src/usr/local/www/firewall_rules.php:882
-#: src/usr/local/www/interfaces.php:1899 src/usr/local/www/interfaces.php:3199
+#: src/usr/local/www/firewall_nat.php:468
+#: src/usr/local/www/firewall_rules.php:896
+#: src/usr/local/www/interfaces.php:1889 src/usr/local/www/interfaces.php:3201
 msgid "Cancel"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat.php:482
-#: src/usr/local/www/firewall_rules.php:884
+#: src/usr/local/www/firewall_nat.php:470
+#: src/usr/local/www/firewall_rules.php:898
 msgid "Enter a description, Save, then drag to final location."
 msgstr ""
 
-#: src/usr/local/www/firewall_nat.php:518
+#: src/usr/local/www/firewall_nat.php:506
 msgid "You have moved one or more Port Forward rules but have not yet saved"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat.php:533
-#: src/usr/local/www/firewall_rules.php:849
+#: src/usr/local/www/firewall_nat.php:521
+#: src/usr/local/www/firewall_rules.php:862
 msgid "Legend"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat.php:534
-#: src/usr/local/www/firewall_nat_edit.php:932
-#: src/usr/local/www/firewall_nat_edit.php:967
-#: src/usr/local/www/firewall_rules.php:850
-#: src/usr/local/www/firewall_rules_edit.php:1077
+#: src/usr/local/www/firewall_nat.php:522
+#: src/usr/local/www/firewall_nat_edit.php:926
+#: src/usr/local/www/firewall_nat_edit.php:961
+#: src/usr/local/www/firewall_rules.php:863
+#: src/usr/local/www/firewall_rules_edit.php:1114
 #: src/usr/local/www/services_captiveportal_mac.php:94
 #: src/usr/local/www/services_captiveportal_mac_edit.php:236
-#: src/usr/local/www/status_logs_common.inc:440
-#: src/usr/local/www/widgets/widgets/log.widget.php:259
-#: src/usr/local/www/status_logs_common.inc:441
+#: src/usr/local/www/status_logs_common.inc:451
+#: src/usr/local/www/widgets/widgets/log.widget.php:258
+#: src/usr/local/www/status_logs_common.inc:452
 msgid "Pass"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat.php:535
+#: src/usr/local/www/firewall_nat.php:523
 msgid "Linked rule"
 msgstr ""
 
 #: src/usr/local/www/firewall_nat_1to1.php:147
-msgid "Firewall: NAT: 1 to 1, enable/disable NAT rule"
+msgid "Firewall: NAT: 1:1, enable/disable NAT rule"
 msgstr ""
 
 #: src/usr/local/www/firewall_nat_1to1.php:176
-msgid "NAT 1 to 1 mappings"
+msgid "NAT 1:1 Mappings"
 msgstr ""
 
 #: src/usr/local/www/firewall_nat_1to1.php:184
@@ -8914,19 +10553,19 @@ msgstr ""
 
 #: src/usr/local/www/firewall_nat_1to1.php:252
 #: src/usr/local/www/firewall_nat_npt.php:242
-#: src/usr/local/www/firewall_nat_out.php:510
+#: src/usr/local/www/firewall_nat_out.php:509
 msgid "Edit mapping"
 msgstr ""
 
 #: src/usr/local/www/firewall_nat_1to1.php:253
 #: src/usr/local/www/firewall_nat_npt.php:243
-#: src/usr/local/www/firewall_nat_out.php:511
+#: src/usr/local/www/firewall_nat_out.php:510
 msgid "Add a new mapping based on this one"
 msgstr ""
 
 #: src/usr/local/www/firewall_nat_1to1.php:254
 #: src/usr/local/www/firewall_nat_npt.php:244
-#: src/usr/local/www/firewall_nat_out.php:512
+#: src/usr/local/www/firewall_nat_out.php:511
 msgid "Delete mapping"
 msgstr ""
 
@@ -8947,7 +10586,7 @@ msgstr ""
 
 #: src/usr/local/www/firewall_nat_1to1.php:280
 #: src/usr/local/www/firewall_nat_npt.php:269
-#: src/usr/local/www/firewall_nat_out.php:537
+#: src/usr/local/www/firewall_nat_out.php:536
 msgid "Save mapping order"
 msgstr ""
 
@@ -8994,8 +10633,8 @@ msgstr ""
 
 #: src/usr/local/www/firewall_nat_1to1_edit.php:205
 #: src/usr/local/www/firewall_nat_edit.php:312
-#: src/usr/local/www/firewall_rules_edit.php:520
-#: src/usr/local/www/firewall_rules_edit.php:525
+#: src/usr/local/www/firewall_rules_edit.php:521
+#: src/usr/local/www/firewall_rules_edit.php:526
 msgid "You must specify single host or alias for alias entries."
 msgstr ""
 
@@ -9010,7 +10649,7 @@ msgstr ""
 
 #: src/usr/local/www/firewall_nat_1to1_edit.php:222
 #: src/usr/local/www/firewall_nat_edit.php:326
-#: src/usr/local/www/firewall_rules_edit.php:539
+#: src/usr/local/www/firewall_rules_edit.php:540
 #, php-format
 msgid "%s is not a valid destination IP address or alias."
 msgstr ""
@@ -9018,26 +10657,26 @@ msgstr ""
 #: src/usr/local/www/firewall_nat_1to1_edit.php:226
 #: src/usr/local/www/firewall_nat_edit.php:329
 #: src/usr/local/www/firewall_nat_out_edit.php:235
-#: src/usr/local/www/firewall_rules_edit.php:542
+#: src/usr/local/www/firewall_rules_edit.php:543
 msgid "A valid destination bit count must be specified."
 msgstr ""
 
 #: src/usr/local/www/firewall_nat_1to1_edit.php:287
 #: src/usr/local/www/firewall_nat_1to1_edit.php:329
-#: src/usr/local/www/firewall_nat_edit.php:547
-#: src/usr/local/www/firewall_nat_edit.php:593
-#: src/usr/local/www/firewall_rules_edit.php:1268
+#: src/usr/local/www/firewall_nat_edit.php:541
+#: src/usr/local/www/firewall_nat_edit.php:587
+#: src/usr/local/www/firewall_rules_edit.php:1305
 msgid "Single host or alias"
 msgstr ""
 
 #: src/usr/local/www/firewall_nat_1to1_edit.php:287
 #: src/usr/local/www/firewall_nat_1to1_edit.php:329
-#: src/usr/local/www/firewall_nat_edit.php:547
-#: src/usr/local/www/firewall_nat_edit.php:593
+#: src/usr/local/www/firewall_nat_edit.php:541
+#: src/usr/local/www/firewall_nat_edit.php:587
 #: src/usr/local/www/firewall_nat_out_edit.php:513
 #: src/usr/local/www/firewall_nat_out_edit.php:537
-#: src/usr/local/www/firewall_rules_edit.php:1269
-#: src/usr/local/www/firewall_virtual_ip_edit.php:414
+#: src/usr/local/www/firewall_rules_edit.php:1306
+#: src/usr/local/www/firewall_virtual_ip_edit.php:403
 #: src/usr/local/www/system_routes.php:276
 #: src/usr/local/www/vpn_ipsec_mobile.php:521
 #: src/usr/local/www/vpn_ipsec_phase2.php:559
@@ -9048,31 +10687,31 @@ msgstr ""
 
 #: src/usr/local/www/firewall_nat_1to1_edit.php:292
 #: src/usr/local/www/firewall_nat_1to1_edit.php:332
-#: src/usr/local/www/firewall_nat_edit.php:552
-#: src/usr/local/www/firewall_nat_edit.php:596
-#: src/usr/local/www/firewall_rules_edit.php:1280
+#: src/usr/local/www/firewall_nat_edit.php:546
+#: src/usr/local/www/firewall_nat_edit.php:590
+#: src/usr/local/www/firewall_rules_edit.php:1317
 #: src/usr/local/www/guiconfig.inc:251
 msgid "PPPoE clients"
 msgstr ""
 
 #: src/usr/local/www/firewall_nat_1to1_edit.php:296
 #: src/usr/local/www/firewall_nat_1to1_edit.php:336
-#: src/usr/local/www/firewall_nat_edit.php:556
-#: src/usr/local/www/firewall_nat_edit.php:600
-#: src/usr/local/www/firewall_rules_edit.php:1283
+#: src/usr/local/www/firewall_nat_edit.php:550
+#: src/usr/local/www/firewall_nat_edit.php:594
+#: src/usr/local/www/firewall_rules_edit.php:1320
 #: src/usr/local/www/guiconfig.inc:252
 msgid "L2TP clients"
 msgstr ""
 
 #: src/usr/local/www/firewall_nat_1to1_edit.php:329
-#: src/usr/local/www/firewall_nat_edit.php:593
+#: src/usr/local/www/firewall_nat_edit.php:587
 #: src/usr/local/www/firewall_nat_out_edit.php:513
-#: src/usr/local/www/firewall_rules_edit.php:1277
+#: src/usr/local/www/firewall_rules_edit.php:1314
 msgid "This Firewall (self)"
 msgstr ""
 
 #: src/usr/local/www/firewall_nat_1to1_edit.php:400
-msgid "Edit NAT 1 to 1 entry"
+msgid "Edit NAT 1:1 Entry"
 msgstr ""
 
 #: src/usr/local/www/firewall_nat_1to1_edit.php:404
@@ -9088,50 +10727,50 @@ msgid "No BINAT (NOT)"
 msgstr ""
 
 #: src/usr/local/www/firewall_nat_1to1_edit.php:414
-#: src/usr/local/www/firewall_nat_edit.php:685
+#: src/usr/local/www/firewall_nat_edit.php:679
 msgid ""
 "This option is rarely needed, don't use this unless you know what you're "
 "doing."
 msgstr ""
 
 #: src/usr/local/www/firewall_nat_1to1_edit.php:426
-#: src/usr/local/www/firewall_nat_edit.php:697
+#: src/usr/local/www/firewall_nat_edit.php:691
 #: src/usr/local/www/firewall_nat_npt_edit.php:189
-#: src/usr/local/www/firewall_rules.php:168
-#: src/usr/local/www/firewall_rules_edit.php:1008
+#: src/usr/local/www/firewall_rules.php:173
+#: src/usr/local/www/firewall_rules_edit.php:1040
 msgid "L2TP VPN"
 msgstr ""
 
 #: src/usr/local/www/firewall_nat_1to1_edit.php:431
-#: src/usr/local/www/firewall_nat_edit.php:702
+#: src/usr/local/www/firewall_nat_edit.php:696
 #: src/usr/local/www/firewall_nat_npt_edit.php:195
-#: src/usr/local/www/firewall_rules.php:175
-#: src/usr/local/www/firewall_rules_edit.php:1012
-#: src/usr/local/www/head.inc:263 src/usr/local/www/services_pppoe.php:116
+#: src/usr/local/www/firewall_rules.php:180
+#: src/usr/local/www/firewall_rules_edit.php:1044
+#: src/usr/local/www/head.inc:300 src/usr/local/www/services_pppoe.php:116
 #: src/usr/local/www/services_pppoe.php:130
 #: src/usr/local/www/services_pppoe_edit.php:314
 msgid "PPPoE Server"
 msgstr ""
 
 #: src/usr/local/www/firewall_nat_1to1_edit.php:436
-#: src/usr/local/www/firewall_nat_edit.php:707
+#: src/usr/local/www/firewall_nat_edit.php:701
 #: src/usr/local/www/firewall_nat_npt_edit.php:201
-#: src/usr/local/www/firewall_rules.php:182
-#: src/usr/local/www/firewall_rules_edit.php:1017
-#: src/usr/local/www/head.inc:278 src/usr/local/www/head.inc:294
+#: src/usr/local/www/firewall_rules.php:187
+#: src/usr/local/www/firewall_rules_edit.php:1049
+#: src/usr/local/www/head.inc:315 src/usr/local/www/head.inc:331
 #: src/usr/local/www/status_graph.php:87 src/usr/local/www/status_graph.php:252
 #: src/usr/local/www/status_ipsec.php:70
-#: src/usr/local/www/status_ipsec_leases.php:68
+#: src/usr/local/www/status_ipsec_leases.php:66
 #: src/usr/local/www/status_ipsec_sad.php:69
 #: src/usr/local/www/status_ipsec_spd.php:72
 #: src/usr/local/www/status_logs.php:80
-#: src/usr/local/www/status_logs_common.inc:114
+#: src/usr/local/www/status_logs_common.inc:125
 #: src/usr/local/www/status_logs_settings.php:237
 #: src/usr/local/www/vpn_ipsec.php:252 src/usr/local/www/vpn_ipsec_keys.php:105
 #: src/usr/local/www/vpn_ipsec_keys_edit.php:155
 #: src/usr/local/www/vpn_ipsec_mobile.php:339
-#: src/usr/local/www/vpn_ipsec_phase1.php:638
-#: src/usr/local/www/vpn_ipsec_phase1.php:641
+#: src/usr/local/www/vpn_ipsec_phase1.php:664
+#: src/usr/local/www/vpn_ipsec_phase1.php:667
 #: src/usr/local/www/vpn_ipsec_phase2.php:441
 #: src/usr/local/www/vpn_ipsec_phase2.php:444
 #: src/usr/local/www/vpn_ipsec_settings.php:236
@@ -9140,7 +10779,7 @@ msgid "IPsec"
 msgstr ""
 
 #: src/usr/local/www/firewall_nat_1to1_edit.php:449
-#: src/usr/local/www/firewall_nat_edit.php:720
+#: src/usr/local/www/firewall_nat_edit.php:714
 #: src/usr/local/www/firewall_nat_out_edit.php:496
 msgid ""
 "Choose which interface this rule applies to. In most cases \"WAN\" is "
@@ -9165,8 +10804,8 @@ msgstr ""
 
 #: src/usr/local/www/firewall_nat_1to1_edit.php:478
 #: src/usr/local/www/firewall_nat_1to1_edit.php:505
-#: src/usr/local/www/firewall_nat_edit.php:764
-#: src/usr/local/www/firewall_nat_edit.php:831
+#: src/usr/local/www/firewall_nat_edit.php:758
+#: src/usr/local/www/firewall_nat_edit.php:825
 msgid "Address/mask"
 msgstr ""
 
@@ -9177,13 +10816,13 @@ msgid ""
 msgstr ""
 
 #: src/usr/local/www/firewall_nat_1to1_edit.php:485
-#: src/usr/local/www/firewall_nat_edit.php:811
+#: src/usr/local/www/firewall_nat_edit.php:805
 #: src/usr/local/www/firewall_nat_out.php:314
-#: src/usr/local/www/firewall_nat_out.php:566
+#: src/usr/local/www/firewall_nat_out.php:565
 #: src/usr/local/www/firewall_nat_out_edit.php:181
 #: src/usr/local/www/firewall_nat_out_edit.php:531
-#: src/usr/local/www/firewall_rules.php:389
-#: src/usr/local/www/firewall_rules_edit.php:435
+#: src/usr/local/www/firewall_rules.php:409
+#: src/usr/local/www/firewall_rules_edit.php:436
 #: src/usr/local/www/status_ipsec_sad.php:99
 #: src/usr/local/www/status_ipsec_spd.php:92
 #: src/usr/local/www/status_logs_filter.php:195
@@ -9200,21 +10839,21 @@ msgid ""
 msgstr ""
 
 #: src/usr/local/www/firewall_nat_1to1_edit.php:523
-#: src/usr/local/www/firewall_nat_edit.php:922
+#: src/usr/local/www/firewall_nat_edit.php:916
 msgid "Use system default"
 msgstr ""
 
 #: src/usr/local/www/firewall_nat_1to1_edit.php:525
-#: src/usr/local/www/firewall_nat_edit.php:925
-#: src/usr/local/www/firewall_rules.php:780
-#: src/usr/local/www/services_dyndns_edit.php:282
-#: src/usr/local/www/vpn_ipsec_phase1.php:868
-#: src/usr/local/www/vpn_openvpn_csc.php:354
+#: src/usr/local/www/firewall_nat_edit.php:919
+#: src/usr/local/www/firewall_rules.php:799
+#: src/usr/local/www/services_dyndns_edit.php:292
+#: src/usr/local/www/vpn_ipsec_phase1.php:894
+#: src/usr/local/www/vpn_openvpn_csc.php:358
 msgid "Disable"
 msgstr ""
 
 #: src/usr/local/www/firewall_nat_1to1_edit.php:520
-#: src/usr/local/www/firewall_nat_edit.php:919
+#: src/usr/local/www/firewall_nat_edit.php:913
 msgid "NAT reflection"
 msgstr ""
 
@@ -9234,7 +10873,7 @@ msgid "Destination port to"
 msgstr ""
 
 #: src/usr/local/www/firewall_nat_edit.php:263
-#: src/usr/local/www/firewall_nat_edit.php:873
+#: src/usr/local/www/firewall_nat_edit.php:867
 msgid "Redirect target IP"
 msgstr ""
 
@@ -9244,7 +10883,7 @@ msgid "\"%s\" is not a valid redirect target IP address or host alias."
 msgstr ""
 
 #: src/usr/local/www/firewall_nat_edit.php:293
-#: src/usr/local/www/firewall_rules_edit.php:470
+#: src/usr/local/www/firewall_rules_edit.php:471
 #, php-format
 msgid ""
 "%s is not a valid start source port. It must be a port alias or integer "
@@ -9252,7 +10891,7 @@ msgid ""
 msgstr ""
 
 #: src/usr/local/www/firewall_nat_edit.php:296
-#: src/usr/local/www/firewall_rules_edit.php:473
+#: src/usr/local/www/firewall_rules_edit.php:474
 #, php-format
 msgid ""
 "%s is not a valid end source port. It must be a port alias or integer "
@@ -9260,7 +10899,7 @@ msgid ""
 msgstr ""
 
 #: src/usr/local/www/firewall_nat_edit.php:299
-#: src/usr/local/www/firewall_rules_edit.php:476
+#: src/usr/local/www/firewall_rules_edit.php:477
 #, php-format
 msgid ""
 "%s is not a valid start destination port. It must be a port alias or integer "
@@ -9268,7 +10907,7 @@ msgid ""
 msgstr ""
 
 #: src/usr/local/www/firewall_nat_edit.php:302
-#: src/usr/local/www/firewall_rules_edit.php:479
+#: src/usr/local/www/firewall_rules_edit.php:480
 #, php-format
 msgid ""
 "%s is not a valid end destination port. It must be a port alias or integer "
@@ -9283,14 +10922,14 @@ msgid ""
 msgstr ""
 
 #: src/usr/local/www/firewall_nat_edit.php:317
-#: src/usr/local/www/firewall_rules_edit.php:531
+#: src/usr/local/www/firewall_rules_edit.php:532
 #, php-format
 msgid "%s is not a valid source IP address or alias."
 msgstr ""
 
 #: src/usr/local/www/firewall_nat_edit.php:320
 #: src/usr/local/www/firewall_nat_out_edit.php:225
-#: src/usr/local/www/firewall_rules_edit.php:534
+#: src/usr/local/www/firewall_rules_edit.php:535
 msgid "A valid source bit count must be specified."
 msgstr ""
 
@@ -9306,62 +10945,59 @@ msgstr ""
 msgid "NAT Port Forward"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat_edit.php:671
-msgid "Edit Redirect entry"
+#: src/usr/local/www/firewall_nat_edit.php:665
+msgid "Edit Redirect Entry"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat_edit.php:682
+#: src/usr/local/www/firewall_nat_edit.php:676
 msgid "No RDR (NOT)"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat_edit.php:729
+#: src/usr/local/www/firewall_nat_edit.php:723
 msgid ""
 "Choose which protocol this rule should match. In most cases \"TCP\" is "
 "specified."
 msgstr ""
 
-#: src/usr/local/www/firewall_nat_edit.php:733 src/usr/local/www/head.inc:205
-#: src/usr/local/www/interfaces.php:2100
-#: src/usr/local/www/interfaces_bridge_edit.php:391
-#: src/usr/local/www/services_dhcp.php:981
-#: src/usr/local/www/services_dhcp.php:1029
-#: src/usr/local/www/services_dhcp.php:1056
-#: src/usr/local/www/services_dhcp.php:1081
-#: src/usr/local/www/services_dhcp.php:1100
-#: src/usr/local/www/services_dhcp.php:1122
-#: src/usr/local/www/services_dhcp_edit.php:589
-#: src/usr/local/www/services_dhcp_edit.php:635
-#: src/usr/local/www/services_dhcp_edit.php:669
-#: src/usr/local/www/services_dhcpv6.php:680
-#: src/usr/local/www/services_dhcpv6.php:726
+#: src/usr/local/www/firewall_nat_edit.php:727 src/usr/local/www/head.inc:242
+#: src/usr/local/www/interfaces_bridge_edit.php:436
+#: src/usr/local/www/services_dhcp.php:1004
+#: src/usr/local/www/services_dhcp.php:1052
+#: src/usr/local/www/services_dhcp.php:1079
+#: src/usr/local/www/services_dhcp.php:1104
+#: src/usr/local/www/services_dhcp.php:1123
+#: src/usr/local/www/services_dhcp.php:1145
+#: src/usr/local/www/services_dhcp_edit.php:593
+#: src/usr/local/www/services_dhcp_edit.php:639
+#: src/usr/local/www/services_dhcp_edit.php:673
 #: src/usr/local/www/services_dhcpv6.php:760
-#: src/usr/local/www/services_dhcpv6.php:779
-#: src/usr/local/www/services_dhcpv6.php:805
-#: src/usr/local/www/services_ntpd.php:382
-#: src/usr/local/www/services_ntpd.php:416
-#: src/usr/local/www/services_ntpd.php:471
-#: src/usr/local/www/services_ntpd_gps.php:376
-#: src/usr/local/www/services_unbound_advanced.php:221
+#: src/usr/local/www/services_dhcpv6.php:826
+#: src/usr/local/www/services_dhcpv6.php:860
+#: src/usr/local/www/services_dhcpv6.php:879
+#: src/usr/local/www/services_dhcpv6.php:905
+#: src/usr/local/www/services_ntpd.php:334
+#: src/usr/local/www/services_ntpd.php:368
+#: src/usr/local/www/services_ntpd_gps.php:377
 #: src/usr/local/www/system_advanced_admin.php:316
 #: src/usr/local/www/system_advanced_firewall.php:404
 #: src/usr/local/www/system_advanced_misc.php:304
 #: src/usr/local/www/system_advanced_network.php:173
 #: src/usr/local/www/system_advanced_notifications.php:216
 #: src/usr/local/www/system_advanced_sysctl.php:166
-#: src/usr/local/www/system_gateways_edit.php:790
-#: src/usr/local/www/vpn_openvpn_csc.php:586
+#: src/usr/local/www/system_gateways_edit.php:731
+#: src/usr/local/www/vpn_openvpn_csc.php:590
 #: src/usr/local/www/widgets/widgets/thermal_sensors.widget.php:277
 msgid "Advanced"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat_edit.php:739
-#: src/usr/local/www/firewall_nat_edit.php:743
+#: src/usr/local/www/firewall_nat_edit.php:733
+#: src/usr/local/www/firewall_nat_edit.php:737
 #: src/usr/local/www/firewall_nat_out.php:312
-#: src/usr/local/www/firewall_nat_out.php:564
+#: src/usr/local/www/firewall_nat_out.php:563
 #: src/usr/local/www/firewall_nat_out_edit.php:181
 #: src/usr/local/www/firewall_nat_out_edit.php:507
-#: src/usr/local/www/firewall_rules.php:387
-#: src/usr/local/www/firewall_rules_edit.php:434
+#: src/usr/local/www/firewall_rules.php:407
+#: src/usr/local/www/firewall_rules_edit.php:435
 #: src/usr/local/www/status_ipsec_sad.php:98
 #: src/usr/local/www/status_ipsec_spd.php:91
 #: src/usr/local/www/status_logs_filter.php:194
@@ -9373,46 +11009,44 @@ msgstr ""
 msgid "Source"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat_edit.php:748
+#: src/usr/local/www/firewall_nat_edit.php:742
 msgid "Source not"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat_edit.php:768
+#: src/usr/local/www/firewall_nat_edit.php:762
 #: src/usr/local/www/firewall_virtual_ip.php:267
-#: src/usr/local/www/firewall_virtual_ip_edit.php:394
+#: src/usr/local/www/firewall_virtual_ip_edit.php:383
 msgid "Other"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat_edit.php:774
+#: src/usr/local/www/firewall_nat_edit.php:768
 msgid "Source port range"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat_edit.php:782
-#: src/usr/local/www/firewall_nat_edit.php:843
+#: src/usr/local/www/firewall_nat_edit.php:776
+#: src/usr/local/www/firewall_nat_edit.php:837
 msgid "From port"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat_edit.php:789
-#: src/usr/local/www/firewall_nat_edit.php:803
-#: src/usr/local/www/firewall_nat_edit.php:850
-#: src/usr/local/www/firewall_nat_edit.php:864
-#: src/usr/local/www/firewall_nat_edit.php:897
-#: src/usr/local/www/firewall_rules_edit.php:1339
-#: src/usr/local/www/firewall_rules_edit.php:1353
-#: src/usr/local/www/interfaces.php:2595
-#: src/usr/local/www/interfaces_ppps_edit.php:729
-#: src/usr/local/www/services_ntpd_gps.php:248
-#: src/usr/local/www/status_rrd_graph.php:471
-#: src/usr/local/www/status_rrd_graph_settings.php:180
+#: src/usr/local/www/firewall_nat_edit.php:783
+#: src/usr/local/www/firewall_nat_edit.php:797
+#: src/usr/local/www/firewall_nat_edit.php:844
+#: src/usr/local/www/firewall_nat_edit.php:858
+#: src/usr/local/www/firewall_nat_edit.php:891
+#: src/usr/local/www/firewall_rules_edit.php:1376
+#: src/usr/local/www/firewall_rules_edit.php:1390
+#: src/usr/local/www/interfaces.php:2597
+#: src/usr/local/www/interfaces_ppps_edit.php:749
+#: src/usr/local/www/services_ntpd_gps.php:249
 msgid "Custom"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat_edit.php:796
-#: src/usr/local/www/firewall_nat_edit.php:857
+#: src/usr/local/www/firewall_nat_edit.php:790
+#: src/usr/local/www/firewall_nat_edit.php:851
 msgid "To port"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat_edit.php:805
+#: src/usr/local/www/firewall_nat_edit.php:799
 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 "
@@ -9420,32 +11054,32 @@ msgid ""
 "single port."
 msgstr ""
 
-#: src/usr/local/www/firewall_nat_edit.php:815
+#: src/usr/local/www/firewall_nat_edit.php:809
 msgid "Destination not"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat_edit.php:835
+#: src/usr/local/www/firewall_nat_edit.php:829
 msgid "Destination port range"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat_edit.php:866
+#: src/usr/local/www/firewall_nat_edit.php:860
 msgid ""
 "Specify the port or port range for the destination of the packet for this "
 "mapping. You can leave the 'to' field empty if you only want to map a single "
 "port "
 msgstr ""
 
-#: src/usr/local/www/firewall_nat_edit.php:875
+#: src/usr/local/www/firewall_nat_edit.php:869
 msgid ""
 "Enter the internal IP address of the server on which you want to map the "
 "ports.<br />e.g.: 192.168.1.12"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat_edit.php:878
+#: src/usr/local/www/firewall_nat_edit.php:872
 msgid "Redirect target port"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat_edit.php:888
+#: src/usr/local/www/firewall_nat_edit.php:882
 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 "
@@ -9453,83 +11087,82 @@ msgid ""
 "\" above"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat_edit.php:911
+#: src/usr/local/www/firewall_nat_edit.php:905
 #: src/usr/local/www/firewall_nat_out_edit.php:632
-#: src/usr/local/www/firewall_rules_edit.php:1532
+#: src/usr/local/www/firewall_rules_edit.php:1569
 msgid "No XMLRPC Sync"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat_edit.php:914
+#: src/usr/local/www/firewall_nat_edit.php:908
 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:923
+#: src/usr/local/www/firewall_nat_edit.php:917
 msgid "Enable (NAT + Proxy)"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat_edit.php:924
+#: src/usr/local/www/firewall_nat_edit.php:918
 msgid "Enable (Pure NAT)"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat_edit.php:939
+#: src/usr/local/www/firewall_nat_edit.php:933
 #, php-format
 msgid "Rule %s"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat_edit.php:942
+#: src/usr/local/www/firewall_nat_edit.php:936
 msgid "View the filter rule"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat_edit.php:949
+#: src/usr/local/www/firewall_nat_edit.php:943
 msgid "Create new associated filter rule"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat_edit.php:954
-#: src/usr/local/www/firewall_nat_edit.php:961
+#: src/usr/local/www/firewall_nat_edit.php:948
+#: src/usr/local/www/firewall_nat_edit.php:955
 msgid "Filter rule association"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat_edit.php:965
+#: src/usr/local/www/firewall_nat_edit.php:959
 msgid "Add associated filter rule"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat_edit.php:966
+#: src/usr/local/www/firewall_nat_edit.php:960
 msgid "Add unassociated filter rule"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat_edit.php:969
+#: src/usr/local/www/firewall_nat_edit.php:963
 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:978
+#: src/usr/local/www/firewall_nat_edit.php:972
 #: src/usr/local/www/firewall_nat_out_edit.php:668
-#: src/usr/local/www/firewall_rules_edit.php:1662
+#: src/usr/local/www/firewall_rules_edit.php:1699
 msgid "Rule Information"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat_edit.php:983
-#: src/usr/local/www/firewall_nat_edit.php:990
+#: src/usr/local/www/firewall_nat_edit.php:977
+#: src/usr/local/www/firewall_nat_edit.php:984
 #: src/usr/local/www/firewall_nat_out_edit.php:673
 #: src/usr/local/www/firewall_nat_out_edit.php:680
-#: src/usr/local/www/firewall_rules_edit.php:1667
-#: src/usr/local/www/firewall_rules_edit.php:1674
-#: src/usr/local/www/license.php:70
+#: src/usr/local/www/firewall_rules_edit.php:1704
+#: src/usr/local/www/firewall_rules_edit.php:1711
 msgid " by "
 msgstr ""
 
-#: src/usr/local/www/firewall_nat_edit.php:982
+#: src/usr/local/www/firewall_nat_edit.php:976
 #: src/usr/local/www/firewall_nat_out_edit.php:672
-#: src/usr/local/www/firewall_rules_edit.php:1666
+#: src/usr/local/www/firewall_rules_edit.php:1703
 msgid "Created"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat_edit.php:989
+#: src/usr/local/www/firewall_nat_edit.php:983
 #: src/usr/local/www/firewall_nat_out_edit.php:679
-#: src/usr/local/www/firewall_rules_edit.php:1673
+#: src/usr/local/www/firewall_rules_edit.php:1710
 msgid "Updated"
 msgstr ""
 
@@ -9562,7 +11195,7 @@ msgid "Destination prefix"
 msgstr ""
 
 #: src/usr/local/www/firewall_nat_npt_edit.php:221
-msgid "Edit NAT NPt entry"
+msgid "Edit NAT NPt Entry"
 msgstr ""
 
 #: src/usr/local/www/firewall_nat_npt_edit.php:235
@@ -9613,23 +11246,6 @@ msgstr ""
 msgid "General Logging Options"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat_out.php:262
-#: src/usr/local/www/firewall_nat_out.php:266
-#: src/usr/local/www/interfaces.php:879 src/usr/local/www/interfaces.php:2924
-#: src/usr/local/www/interfaces_wireless.php:136
-#: src/usr/local/www/interfaces_wireless_edit.php:115
-#: src/usr/local/www/interfaces_wireless_edit.php:221
-#: src/usr/local/www/load_balancer_pool.php:155
-#: src/usr/local/www/load_balancer_pool_edit.php:107
-#: src/usr/local/www/load_balancer_pool_edit.php:354
-#: src/usr/local/www/load_balancer_virtual_server_edit.php:104
-#: src/usr/local/www/load_balancer_virtual_server_edit.php:109
-#: src/usr/local/www/status_lb_pool.php:168 src/usr/local/www/vpn_ipsec.php:286
-#: src/usr/local/www/vpn_ipsec.php:428
-#: src/usr/local/www/vpn_ipsec_phase2.php:542
-msgid "Mode"
-msgstr ""
-
 #: src/usr/local/www/firewall_nat_out.php:270
 msgid ""
 "Automatic outbound NAT rule generation.<br />(IPsec passthrough included)"
@@ -9654,17 +11270,17 @@ msgid "Mappings"
 msgstr ""
 
 #: src/usr/local/www/firewall_nat_out.php:316
-#: src/usr/local/www/firewall_nat_out.php:568
+#: src/usr/local/www/firewall_nat_out.php:567
 msgid "NAT Address"
 msgstr ""
 
 #: src/usr/local/www/firewall_nat_out.php:317
-#: src/usr/local/www/firewall_nat_out.php:569
+#: src/usr/local/www/firewall_nat_out.php:568
 msgid "NAT Port"
 msgstr ""
 
 #: src/usr/local/www/firewall_nat_out.php:318
-#: src/usr/local/www/firewall_nat_out.php:570
+#: src/usr/local/www/firewall_nat_out.php:569
 msgid "Static Port"
 msgstr ""
 
@@ -9676,41 +11292,41 @@ msgstr ""
 msgid "Click to toggle enabled/disabled status"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat_out.php:497
-#: src/usr/local/www/firewall_nat_out.php:648
+#: src/usr/local/www/firewall_nat_out.php:496
+#: src/usr/local/www/firewall_nat_out.php:647
 msgid "YES"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat_out.php:499
-#: src/usr/local/www/firewall_nat_out.php:650
+#: src/usr/local/www/firewall_nat_out.php:498
+#: src/usr/local/www/firewall_nat_out.php:649
 msgid "NO"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat_out.php:525
+#: src/usr/local/www/firewall_nat_out.php:524
 msgid "Add new mapping to the top of the list"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat_out.php:529
+#: src/usr/local/www/firewall_nat_out.php:528
 msgid "Add new mapping to the end of the list"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat_out.php:533
+#: src/usr/local/www/firewall_nat_out.php:532
 msgid "Delete selected map"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat_out.php:533
+#: src/usr/local/www/firewall_nat_out.php:532
 msgid "Delete selected maps"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat_out.php:557
-msgid "Automatic rules:"
+#: src/usr/local/www/firewall_nat_out.php:556
+msgid "Automatic Rules:"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat_out.php:581
+#: src/usr/local/www/firewall_nat_out.php:580
 msgid "automatic outbound nat"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat_out.php:670
+#: src/usr/local/www/firewall_nat_out.php:669
 msgid ""
 "If automatic outbound NAT is selected, a mapping is automatically generated "
 "for each interface's subnet (except WAN-type connections) and the rules on "
@@ -9724,30 +11340,30 @@ msgid ""
 "is setup, a "
 msgstr ""
 
-#: src/usr/local/www/firewall_nat_out.php:677
+#: src/usr/local/www/firewall_nat_out.php:676
 #: src/usr/local/www/firewall_nat_out_edit.php:582
-#: src/usr/local/www/status_carp.php:211
-#: src/usr/local/www/system_gateway_groups_edit.php:298
-#: src/usr/local/www/system_gateway_groups_edit.php:301
+#: src/usr/local/www/status_carp.php:205
+#: src/usr/local/www/system_gateway_groups_edit.php:292
+#: src/usr/local/www/system_gateway_groups_edit.php:312
 #: src/usr/local/www/system_gateway_groups_edit.php:324
 msgid "Virtual IP"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat_out.php:677
+#: src/usr/local/www/firewall_nat_out.php:676
 msgid " may also be required."
 msgstr ""
 
-#: src/usr/local/www/firewall_nat_out.php:710
+#: src/usr/local/www/firewall_nat_out.php:709
 msgid "You have moved one or more NAT outbound mappings but have not yet saved"
 msgstr ""
 
 #: src/usr/local/www/firewall_nat_out_edit.php:181
-#: src/usr/local/www/firewall_rules_edit.php:450
+#: src/usr/local/www/firewall_rules_edit.php:451
 msgid "Source bit count"
 msgstr ""
 
 #: src/usr/local/www/firewall_nat_out_edit.php:181
-#: src/usr/local/www/firewall_rules_edit.php:455
+#: src/usr/local/www/firewall_rules_edit.php:456
 msgid "Destination bit count"
 msgstr ""
 
@@ -9810,7 +11426,7 @@ msgid "Other Subnet (Enter Below)"
 msgstr ""
 
 #: src/usr/local/www/firewall_nat_out_edit.php:447
-msgid "Edit Advanced Outbound NAT entry"
+msgid "Edit Advanced Outbound NAT Entry"
 msgstr ""
 
 #: src/usr/local/www/firewall_nat_out_edit.php:458
@@ -9912,348 +11528,346 @@ msgid ""
 "members. This does NOT prevent the rule from being overwritten on Slave."
 msgstr ""
 
-#: src/usr/local/www/firewall_rules.php:113
+#: src/usr/local/www/firewall_rules.php:118
 msgid "States details"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules.php:211
+#: src/usr/local/www/firewall_rules.php:216
 #, php-format
 msgid ""
 "The settings have been applied. The firewall rules are now reloading in the "
-"background.<br />You can also %s monitor %s the reload progress"
+"background.<br />You can also %s monitor %s the reload progress."
 msgstr ""
 
-#: src/usr/local/www/firewall_rules.php:322
-#: src/usr/local/www/firewall_rules_edit.php:1182
+#: src/usr/local/www/firewall_rules.php:342
+#: src/usr/local/www/firewall_rules_edit.php:1063
+#: src/usr/local/www/firewall_rules_edit.php:1219
 msgid "Floating"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules.php:346
+#: src/usr/local/www/firewall_rules.php:366
 msgid "The firewall rule configuration has been changed."
 msgstr ""
 
-#: src/usr/local/www/firewall_rules.php:378
-msgid "Rules (Drag to change order)"
+#: src/usr/local/www/firewall_rules.php:398
+msgid "Rules (Drag to Change Order)"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules.php:391
-#: src/usr/local/www/firewall_rules_edit.php:1593
-#: src/usr/local/www/interfaces.php:568 src/usr/local/www/interfaces.php:619
-#: src/usr/local/www/services_dhcp.php:913
-#: src/usr/local/www/services_dhcp_edit.php:554
-#: src/usr/local/www/status_gateways.php:99 src/usr/local/www/system.php:421
-#: src/usr/local/www/system.php:424
-#: src/usr/local/www/system_gateway_groups_edit.php:268
+#: src/usr/local/www/firewall_rules.php:411
+#: src/usr/local/www/firewall_rules_edit.php:1630
+#: src/usr/local/www/interfaces.php:551 src/usr/local/www/interfaces.php:602
+#: src/usr/local/www/services_dhcp.php:936
+#: src/usr/local/www/services_dhcp_edit.php:558
+#: src/usr/local/www/status_gateways.php:94 src/usr/local/www/system.php:427
+#: src/usr/local/www/system.php:430
+#: src/usr/local/www/system_gateway_groups_edit.php:310
 #: src/usr/local/www/system_gateways.php:278
-#: src/usr/local/www/system_gateways_edit.php:704
+#: src/usr/local/www/system_gateways_edit.php:645
 #: src/usr/local/www/system_routes.php:277
 #: src/usr/local/www/system_routes_edit.php:115
 #: src/usr/local/www/system_routes_edit.php:290
 msgid "Gateway"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules.php:392
-#: src/usr/local/www/status_queues.php:191
+#: src/usr/local/www/firewall_rules.php:412
+#: src/usr/local/www/status_queues.php:194
 msgid "Queue"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules.php:393
-#: src/usr/local/www/firewall_rules_edit.php:1562
+#: src/usr/local/www/firewall_rules.php:413
+#: src/usr/local/www/firewall_rules_edit.php:1599
 msgid "Schedule"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules.php:409
-#: src/usr/local/www/firewall_rules.php:506
+#: src/usr/local/www/firewall_rules.php:429
+#: src/usr/local/www/firewall_rules.php:520
 msgid "traffic is passed"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules.php:419
+#: src/usr/local/www/firewall_rules.php:439
 msgid "Anti-Lockout Rule"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules.php:421
-#: src/usr/local/www/firewall_rules.php:440
-#: src/usr/local/www/firewall_rules.php:459
+#: src/usr/local/www/firewall_rules.php:441
+#: src/usr/local/www/firewall_rules.php:460
+#: src/usr/local/www/firewall_rules.php:479
 #: src/usr/local/www/load_balancer_monitor.php:129
 #: src/usr/local/www/load_balancer_pool.php:143
 #: src/usr/local/www/load_balancer_setting.php:120
-#: src/usr/local/www/load_balancer_setting.php:143
+#: src/usr/local/www/load_balancer_setting.php:142
 #: src/usr/local/www/load_balancer_virtual_server.php:143
-#: src/usr/local/www/services_router_advertisements.php:417
-#: src/usr/local/www/status_logs_common.inc:120
+#: src/usr/local/www/services_ntpd.php:218
+#: src/usr/local/www/services_ntpd.php:230
+#: src/usr/local/www/services_ntpd_acls.php:207
+#: src/usr/local/www/services_ntpd_gps.php:230
+#: src/usr/local/www/services_ntpd_pps.php:149
+#: src/usr/local/www/services_router_advertisements.php:397
+#: src/usr/local/www/status_logs_common.inc:131
 #: src/usr/local/www/status_logs_settings.php:209
 #: src/usr/local/www/status_logs_settings.php:243
-#: src/usr/local/www/status_rrd_graph.php:472
-#: src/usr/local/www/status_rrd_graph_settings.php:143
-#: src/usr/local/www/status_rrd_graph_settings.php:181
-#: src/usr/local/www/system_authservers.php:393
-#: src/usr/local/www/system_groupmanager.php:274
-#: src/usr/local/www/system_groupmanager_addprivs.php:185
-#: src/usr/local/www/system_usermanager.php:480
-#: src/usr/local/www/system_usermanager_addprivs.php:173
+#: src/usr/local/www/system_authservers.php:396
+#: src/usr/local/www/system_groupmanager.php:291
+#: src/usr/local/www/system_groupmanager_addprivs.php:173
+#: src/usr/local/www/system_usermanager.php:485
+#: src/usr/local/www/system_usermanager_addprivs.php:174
 #: src/usr/local/www/system_usermanager_settings.php:75
 #: src/usr/local/www/system_usermanager_settings.php:145
 #: src/usr/local/www/system_usermanager_settings.php:156
 msgid "Settings"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules.php:428
-#: src/usr/local/www/firewall_rules.php:447
-#: src/usr/local/www/firewall_rules.php:497
+#: src/usr/local/www/firewall_rules.php:448
+#: src/usr/local/www/firewall_rules.php:467
+#: src/usr/local/www/firewall_rules.php:511
 msgid "traffic is blocked"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules.php:431
+#: src/usr/local/www/firewall_rules.php:451
 msgid "RFC 1918 networks"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules.php:438
-#: src/usr/local/www/interfaces.php:3117
+#: src/usr/local/www/firewall_rules.php:458
+#: src/usr/local/www/interfaces.php:3119
 msgid "Block private networks"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules.php:450
+#: src/usr/local/www/firewall_rules.php:470
 #, php-format
 msgid "Reserved%sNot assigned by IANA"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules.php:457
-#: src/usr/local/www/interfaces.php:3127
+#: src/usr/local/www/firewall_rules.php:477
+#: src/usr/local/www/interfaces.php:3129
 msgid "Block bogon networks"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules.php:500
+#: src/usr/local/www/firewall_rules.php:514
 msgid "traffic is rejected"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules.php:503
+#: src/usr/local/www/firewall_rules.php:517
 msgid "traffic is matched"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules.php:515
+#: src/usr/local/www/firewall_rules.php:529
+#: src/usr/local/www/firewall_rules.php:869
+msgid "&quot;Quick&quot; rule. Applied immediately on match."
+msgstr ""
+
+#: src/usr/local/www/firewall_rules.php:534
 msgid "advanced setting"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules.php:519
+#: src/usr/local/www/firewall_rules.php:538
 msgid "traffic is logged"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules.php:538
+#: src/usr/local/www/firewall_rules.php:557
 #: src/usr/local/www/firewall_schedule.php:68
 #: src/usr/local/www/firewall_schedule_edit.php:89
 #: src/usr/local/www/firewall_schedule_edit.php:293
 msgid "Mon"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules.php:538
+#: src/usr/local/www/firewall_rules.php:557
 #: src/usr/local/www/firewall_schedule.php:68
 #: src/usr/local/www/firewall_schedule_edit.php:89
 msgid "Tues"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules.php:538
+#: src/usr/local/www/firewall_rules.php:557
 #: src/usr/local/www/firewall_schedule.php:68
 #: src/usr/local/www/firewall_schedule_edit.php:89
 #: src/usr/local/www/firewall_schedule_edit.php:295
 msgid "Wed"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules.php:538
+#: src/usr/local/www/firewall_rules.php:557
 #: src/usr/local/www/firewall_schedule.php:68
 #: src/usr/local/www/firewall_schedule_edit.php:89
 msgid "Thur"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules.php:538
+#: src/usr/local/www/firewall_rules.php:557
 #: src/usr/local/www/firewall_schedule.php:68
 #: src/usr/local/www/firewall_schedule_edit.php:89
 #: src/usr/local/www/firewall_schedule_edit.php:297
 msgid "Fri"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules.php:538
+#: src/usr/local/www/firewall_rules.php:557
 #: src/usr/local/www/firewall_schedule.php:68
 #: src/usr/local/www/firewall_schedule_edit.php:89
 #: src/usr/local/www/firewall_schedule_edit.php:298
 msgid "Sat"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules.php:538
+#: src/usr/local/www/firewall_rules.php:557
 #: src/usr/local/www/firewall_schedule.php:68
 #: src/usr/local/www/firewall_schedule_edit.php:89
 #: src/usr/local/www/firewall_schedule_edit.php:299
 msgid "Sun"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules.php:539
+#: src/usr/local/www/firewall_rules.php:558
 #: src/usr/local/www/firewall_schedule.php:69
 #: src/usr/local/www/firewall_schedule_edit.php:90
 msgid "January"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules.php:539
+#: src/usr/local/www/firewall_rules.php:558
 #: src/usr/local/www/firewall_schedule.php:69
 #: src/usr/local/www/firewall_schedule_edit.php:90
 msgid "February"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules.php:539
+#: src/usr/local/www/firewall_rules.php:558
 #: src/usr/local/www/firewall_schedule.php:69
 #: src/usr/local/www/firewall_schedule_edit.php:90
 msgid "March"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules.php:539
+#: src/usr/local/www/firewall_rules.php:558
 #: src/usr/local/www/firewall_schedule.php:69
 #: src/usr/local/www/firewall_schedule_edit.php:90
 msgid "April"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules.php:539
+#: src/usr/local/www/firewall_rules.php:558
 #: src/usr/local/www/firewall_schedule.php:69
 #: src/usr/local/www/firewall_schedule_edit.php:90
 msgid "May"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules.php:539
+#: src/usr/local/www/firewall_rules.php:558
 #: src/usr/local/www/firewall_schedule.php:69
 #: src/usr/local/www/firewall_schedule_edit.php:90
 msgid "June"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules.php:539
+#: src/usr/local/www/firewall_rules.php:558
 #: src/usr/local/www/firewall_schedule.php:69
 #: src/usr/local/www/firewall_schedule_edit.php:90
 msgid "July"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules.php:539
+#: src/usr/local/www/firewall_rules.php:558
 #: src/usr/local/www/firewall_schedule.php:69
 #: src/usr/local/www/firewall_schedule_edit.php:90
 msgid "August"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules.php:539
+#: src/usr/local/www/firewall_rules.php:558
 #: src/usr/local/www/firewall_schedule.php:69
 #: src/usr/local/www/firewall_schedule_edit.php:90
 msgid "September"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules.php:539
+#: src/usr/local/www/firewall_rules.php:558
 #: src/usr/local/www/firewall_schedule.php:69
 #: src/usr/local/www/firewall_schedule_edit.php:90
 msgid "October"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules.php:539
+#: src/usr/local/www/firewall_rules.php:558
 #: src/usr/local/www/firewall_schedule.php:69
 #: src/usr/local/www/firewall_schedule_edit.php:90
 msgid "November"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules.php:539
+#: src/usr/local/www/firewall_rules.php:558
 #: src/usr/local/www/firewall_schedule.php:69
 #: src/usr/local/www/firewall_schedule_edit.php:90
 msgid "December"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules.php:652
+#: src/usr/local/www/firewall_rules.php:671
 msgid "Traffic matching this rule is currently being denied"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules.php:656
+#: src/usr/local/www/firewall_rules.php:675
 msgid "Traffic matching this rule is currently being allowed"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules.php:665
+#: src/usr/local/www/firewall_rules.php:684
 msgid "This rule is not currently active because its period has expired"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules.php:694
-#: src/usr/local/www/firewall_rules_edit.php:1224
+#: src/usr/local/www/firewall_rules.php:713
+#: src/usr/local/www/firewall_rules_edit.php:1261
 msgid "ICMP type"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules.php:758
-#: src/usr/local/www/firewall_rules_edit.php:1564
-#: src/usr/local/www/firewall_rules_edit.php:1605
-#: src/usr/local/www/firewall_rules_edit.php:1612
-#: src/usr/local/www/status_ipsec.php:379
-#: src/usr/local/www/vpn_ipsec_mobile.php:495
-#: src/usr/local/www/vpn_openvpn_client.php:523
-msgid "none"
-msgstr ""
-
-#: src/usr/local/www/firewall_rules.php:774
+#: src/usr/local/www/firewall_rules.php:793
 msgid "Copy"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules.php:783
+#: src/usr/local/www/firewall_rules.php:802
 msgid "Delete this rule"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules.php:811
+#: src/usr/local/www/firewall_rules.php:824
 msgid "No floating rules are currently defined."
 msgstr ""
 
-#: src/usr/local/www/firewall_rules.php:813
+#: src/usr/local/www/firewall_rules.php:826
 msgid "No rules are currently defined for this interface"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules.php:814
+#: src/usr/local/www/firewall_rules.php:827
 msgid ""
 "All incoming connections on this interface will be blocked until you add "
 "pass rules."
 msgstr ""
 
-#: src/usr/local/www/firewall_rules.php:816
+#: src/usr/local/www/firewall_rules.php:829
 msgid "Click the button to add a new rule."
 msgstr ""
 
-#: src/usr/local/www/firewall_rules.php:851
-#: src/usr/local/www/firewall_rules_edit.php:1083
+#: src/usr/local/www/firewall_rules.php:864
+#: src/usr/local/www/firewall_rules_edit.php:1120
 msgid "Match"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules.php:852
-#: src/usr/local/www/firewall_rules_edit.php:1078
+#: src/usr/local/www/firewall_rules.php:865
+#: src/usr/local/www/firewall_rules_edit.php:1115
 #: src/usr/local/www/services_captiveportal_mac.php:95
 #: src/usr/local/www/services_captiveportal_mac_edit.php:236
-#: src/usr/local/www/status_logs_common.inc:481
-#: src/usr/local/www/widgets/widgets/log.widget.php:263
-#: src/usr/local/www/status_logs_common.inc:482
+#: src/usr/local/www/status_logs_common.inc:492
+#: src/usr/local/www/widgets/widgets/log.widget.php:262
+#: src/usr/local/www/status_logs_common.inc:493
 msgid "Block"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules.php:853
-#: src/usr/local/www/firewall_rules_edit.php:1079
-#: src/usr/local/www/widgets/widgets/log.widget.php:267
+#: src/usr/local/www/firewall_rules.php:866
+#: src/usr/local/www/firewall_rules_edit.php:1116
+#: src/usr/local/www/widgets/widgets/log.widget.php:266
 msgid "Reject"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules.php:854
-#: src/usr/local/www/firewall_rules_edit.php:1374
-#: src/usr/local/www/status_logs_common.inc:804
+#: src/usr/local/www/firewall_rules.php:867
+#: src/usr/local/www/firewall_rules_edit.php:1411
+#: src/usr/local/www/status_logs_common.inc:816
 msgid "Log"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules.php:855
+#: src/usr/local/www/firewall_rules.php:868
 msgid "Advanced filter"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules.php:860
+#: src/usr/local/www/firewall_rules.php:874
 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:862
+#: src/usr/local/www/firewall_rules.php:876
 msgid ""
 "This means that if you use block rules, you'll have 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:866
+#: src/usr/local/www/firewall_rules.php:880
 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 "
@@ -10262,296 +11876,296 @@ msgid ""
 "matches, the per-interface or default rules are used. "
 msgstr ""
 
-#: src/usr/local/www/firewall_rules.php:918
+#: src/usr/local/www/firewall_rules.php:932
 msgid "You have moved one or more rules but have not yet saved"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:330
-#: src/usr/local/www/firewall_rules_edit.php:344
+#: src/usr/local/www/firewall_rules_edit.php:331
+#: src/usr/local/www/firewall_rules_edit.php:345
 msgid "You can not assign a gateway to a rule that applies to IPv4 and IPv6"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:333
+#: src/usr/local/www/firewall_rules_edit.php:334
 msgid "You can not assign an IPv4 gateway group on IPv6 Address Family rule"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:336
+#: src/usr/local/www/firewall_rules_edit.php:337
 msgid "You can not assign an IPv6 gateway group on IPv4 Address Family rule"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:347
+#: src/usr/local/www/firewall_rules_edit.php:348
 msgid "You can not assign an IPv4 Gateway to an IPv6 Filter rule"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:350
+#: src/usr/local/www/firewall_rules_edit.php:351
 msgid "You can not assign an IPv6 Gateway to an IPv4 Filter rule"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:355
+#: src/usr/local/www/firewall_rules_edit.php:356
 msgid "You can not assign a ICMP type to a rule that applies to IPv4 and IPv6"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:440
+#: src/usr/local/www/firewall_rules_edit.php:441
 #, php-format
 msgid "%s is only valid with protocol TCP."
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:443
+#: src/usr/local/www/firewall_rules_edit.php:444
 #, php-format
 msgid "%s is only valid if the gateway is set to 'default'."
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:547
+#: src/usr/local/www/firewall_rules_edit.php:548
 #, php-format
 msgid ""
 "The Source IP address %s Address Family differs from the destination %s."
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:550
+#: src/usr/local/www/firewall_rules_edit.php:551
 msgid "You can not use IPv6 addresses in IPv4 rules."
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:553
+#: src/usr/local/www/firewall_rules_edit.php:554
 msgid "You can not use IPv4 addresses in IPv6 rules."
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:558
+#: src/usr/local/www/firewall_rules_edit.php:559
 msgid "You can not use a IPv4 or IPv6 address in combined IPv4 + IPv6 rules."
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:575
+#: src/usr/local/www/firewall_rules_edit.php:576
 msgid "OS detection is only valid with protocol TCP."
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:578
+#: src/usr/local/www/firewall_rules_edit.php:579
 msgid "Invalid OS detection selection. Please select a valid OS."
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:584
+#: src/usr/local/www/firewall_rules_edit.php:585
 msgid "You have to select a queue when you select an acknowledge queue too."
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:586
+#: src/usr/local/www/firewall_rules_edit.php:587
 msgid "Acknowledge queue and Queue cannot be the same."
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:590
+#: src/usr/local/www/firewall_rules_edit.php:591
 msgid ""
 "You can not use limiters in Floating rules without choosing a direction."
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:593
+#: src/usr/local/www/firewall_rules_edit.php:594
 msgid ""
 "You can not use gateways in Floating rules without choosing a direction."
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:597
+#: src/usr/local/www/firewall_rules_edit.php:598
 msgid ""
 "You must select a queue for the In direction before selecting one for Out "
 "too."
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:599
+#: src/usr/local/www/firewall_rules_edit.php:600
 msgid "In and Out Queue cannot be the same."
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:601
-#: src/usr/local/www/firewall_rules_edit.php:603
+#: src/usr/local/www/firewall_rules_edit.php:602
+#: src/usr/local/www/firewall_rules_edit.php:604
 msgid ""
 "You cannot select one queue and one virtual interface for IN and Out. Both "
 "must be from the same type."
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:606
+#: src/usr/local/www/firewall_rules_edit.php:607
 msgid ""
 "Please select a gateway, normally the interface selected gateway, so the "
 "limiters work correctly"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:610
+#: src/usr/local/www/firewall_rules_edit.php:611
 msgid "ID must be an integer"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:615
+#: src/usr/local/www/firewall_rules_edit.php:616
 msgid ""
 "You can only specify the maximum number of established connections per host "
 "(advanced option) for TCP protocol."
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:618
+#: src/usr/local/www/firewall_rules_edit.php:619
 msgid ""
 "You can only specify the maximum new connections per host / per second(s) "
 "(advanced option) for TCP protocol."
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:621
+#: src/usr/local/www/firewall_rules_edit.php:622
 msgid ""
 "You can only specify the state timeout (advanced option) for TCP protocol."
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:627
+#: src/usr/local/www/firewall_rules_edit.php:628
 msgid ""
 "You can only specify the maximum state entries (advanced option) for Pass "
 "type rules."
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:630
+#: src/usr/local/www/firewall_rules_edit.php:631
 msgid ""
 "You can only specify the maximum number of unique source hosts (advanced "
 "option) for Pass type rules."
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:633
+#: src/usr/local/www/firewall_rules_edit.php:634
 msgid ""
 "You can only specify the maximum number of established connections per host "
 "(advanced option) for Pass type rules."
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:636
+#: src/usr/local/www/firewall_rules_edit.php:637
 msgid ""
 "You can only specify the maximum state entries per host (advanced option) "
 "for Pass type rules."
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:639
+#: src/usr/local/www/firewall_rules_edit.php:640
 msgid ""
 "You can only specify the maximum new connections per host / per second(s) "
 "(advanced option) for Pass type rules."
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:642
+#: src/usr/local/www/firewall_rules_edit.php:643
 msgid ""
 "You can only specify the state timeout (advanced option) for Pass type rules."
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:648
+#: src/usr/local/www/firewall_rules_edit.php:649
 msgid ""
 "You cannot specify the maximum state entries (advanced option) if statetype "
 "is none."
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:651
+#: src/usr/local/www/firewall_rules_edit.php:652
 msgid ""
 "You cannot specify the maximum number of unique source hosts (advanced "
 "option) if statetype is none."
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:654
+#: src/usr/local/www/firewall_rules_edit.php:655
 msgid ""
 "You cannot specify the maximum number of established connections per host "
 "(advanced option) if statetype is none."
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:657
+#: src/usr/local/www/firewall_rules_edit.php:658
 msgid ""
 "You cannot specify the maximum state entries per host (advanced option) if "
 "statetype is none."
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:660
+#: src/usr/local/www/firewall_rules_edit.php:661
 msgid ""
 "You cannot specify the maximum new connections per host / per second(s) "
 "(advanced option) if statetype is none."
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:663
+#: src/usr/local/www/firewall_rules_edit.php:664
 msgid ""
 "You cannot specify the state timeout (advanced option) if statetype is none."
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:668
+#: src/usr/local/www/firewall_rules_edit.php:669
 msgid "Maximum state entries (advanced option) must be a positive integer"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:672
+#: src/usr/local/www/firewall_rules_edit.php:673
 msgid ""
 "Maximum number of unique source hosts (advanced option) must be a positive "
 "integer"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:676
+#: src/usr/local/www/firewall_rules_edit.php:677
 msgid ""
 "Maximum number of established connections per host (advanced option) must be "
 "a positive integer"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:680
+#: src/usr/local/www/firewall_rules_edit.php:681
 msgid ""
 "Maximum state entries per host (advanced option) must be a positive integer"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:684
+#: src/usr/local/www/firewall_rules_edit.php:685
 msgid ""
 "Maximum new connections per host / per second(s) (advanced option) must be a "
 "positive integer"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:688
+#: src/usr/local/www/firewall_rules_edit.php:689
 msgid "State timeout (advanced option) must be a positive integer"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:693
+#: src/usr/local/www/firewall_rules_edit.php:694
 msgid ""
 "Both maximum new connections per host and the interval (per second(s)) must "
 "be specified"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:708
+#: src/usr/local/www/firewall_rules_edit.php:709
 msgid ""
 "If you specify TCP flags that should be set you should specify out of which "
 "flags as well."
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:954
+#: src/usr/local/www/firewall_rules_edit.php:986
 msgid "set"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:955
+#: src/usr/local/www/firewall_rules_edit.php:987
 msgid "out of"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:982
+#: src/usr/local/www/firewall_rules_edit.php:1014
 msgid " Any flags."
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:1039
-msgid "Edit Firewall rule"
+#: src/usr/local/www/firewall_rules_edit.php:1076
+msgid "Edit Firewall Rule"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:1044
-#: src/usr/local/www/status_ipsec_leases.php:90
+#: src/usr/local/www/firewall_rules_edit.php:1081
+#: src/usr/local/www/status_ipsec_leases.php:88
 msgid "ID"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:1053
+#: src/usr/local/www/firewall_rules_edit.php:1090
 msgid "Tracker"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:1061
+#: src/usr/local/www/firewall_rules_edit.php:1098
 msgid "After"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:1068
+#: src/usr/local/www/firewall_rules_edit.php:1105
 msgid "Ruleid"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:1088
+#: src/usr/local/www/firewall_rules_edit.php:1125
 #: src/usr/local/www/services_captiveportal_mac.php:208
 #: src/usr/local/www/services_captiveportal_mac_edit.php:131
 #: src/usr/local/www/services_captiveportal_mac_edit.php:234
 #: src/usr/local/www/services_captiveportal_vouchers.php:459
-#: src/usr/local/www/services_unbound_acls.php:259
-#: src/usr/local/www/services_unbound_acls.php:323
-#: src/usr/local/www/status_logs_common.inc:957
+#: src/usr/local/www/services_unbound_acls.php:263
+#: src/usr/local/www/services_unbound_acls.php:327
+#: src/usr/local/www/status_logs_common.inc:969
 #: src/usr/local/www/status_logs_filter.php:182
 #: src/usr/local/www/status_logs_filter_dynamic.php:422
 #: src/usr/local/www/status_logs_vpn.php:171
-#: src/usr/local/www/status_logs_vpn.php:406
-#: src/usr/local/www/widgets/widgets/services_status.widget.php:92
+#: src/usr/local/www/status_logs_vpn.php:398
+#: src/usr/local/www/widgets/widgets/services_status.widget.php:110
 msgid "Action"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:1091
+#: src/usr/local/www/firewall_rules_edit.php:1128
 msgid ""
 "Choose what to do with packets that match the criteria specified below.<br/"
 ">Hint: the difference between block and reject is that with reject, a packet "
@@ -10560,129 +12174,129 @@ msgid ""
 "original packet is discarded."
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:1102
+#: src/usr/local/www/firewall_rules_edit.php:1139
 msgid "Set this option to disable this rule without removing it from the list."
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:1108
+#: src/usr/local/www/firewall_rules_edit.php:1145
 msgid "Quick"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:1111
+#: src/usr/local/www/firewall_rules_edit.php:1148
 msgid ""
 "Set this option if you need to apply this action to traffic that matches "
 "this rule immediately."
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:1121
+#: src/usr/local/www/firewall_rules_edit.php:1158
 msgid "View the NAT rule"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:1126
+#: src/usr/local/www/firewall_rules_edit.php:1163
 msgid "Associated filter rule"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:1158
+#: src/usr/local/www/firewall_rules_edit.php:1195
 msgid "Choose the interface(s) for this rule."
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:1165
+#: src/usr/local/www/firewall_rules_edit.php:1202
 msgid "Choose the interface from which packets must come to match this rule."
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:1175
+#: src/usr/local/www/firewall_rules_edit.php:1212
 msgid "in"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:1176
+#: src/usr/local/www/firewall_rules_edit.php:1213
 msgid "out"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:1171
+#: src/usr/local/www/firewall_rules_edit.php:1208
 #: src/usr/local/www/services_captiveportal_hostname_edit.php:211
 #: src/usr/local/www/services_captiveportal_ip_edit.php:258
 #: src/usr/local/www/status_ipsec_spd.php:93
 msgid "Direction"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:1197
+#: src/usr/local/www/firewall_rules_edit.php:1234
 msgid "Select the Internet Protocol version this rule applies to"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:1220
+#: src/usr/local/www/firewall_rules_edit.php:1257
 msgid "Choose which IP protocol this rule should match."
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:1227
-#: src/usr/local/www/firewall_rules_edit.php:1234
+#: src/usr/local/www/firewall_rules_edit.php:1264
+#: src/usr/local/www/firewall_rules_edit.php:1271
 msgid ""
 "If you selected ICMP for the protocol above, you may specify an ICMP type "
 "here."
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:1231
+#: src/usr/local/www/firewall_rules_edit.php:1268
 msgid "ICMPv6 type"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:1246
+#: src/usr/local/www/firewall_rules_edit.php:1283
 msgid " not"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:1273
+#: src/usr/local/www/firewall_rules_edit.php:1310
 msgid "This firewall (self)"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:1297
+#: src/usr/local/www/firewall_rules_edit.php:1334
 msgid " Type"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:1304
+#: src/usr/local/www/firewall_rules_edit.php:1341
 msgid " Address"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:1313
+#: src/usr/local/www/firewall_rules_edit.php:1350
 msgid "Show advanced"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:1317
+#: src/usr/local/www/firewall_rules_edit.php:1354
 msgid "(other)"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:1323
+#: src/usr/local/www/firewall_rules_edit.php:1360
 msgid " port range"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:1329
+#: src/usr/local/www/firewall_rules_edit.php:1366
 msgid " port begin"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:1332
+#: src/usr/local/www/firewall_rules_edit.php:1369
 #: src/usr/local/www/services_captiveportal_hostname_edit.php:186
 #: src/usr/local/www/services_captiveportal_ip_edit.php:229
-#: src/usr/local/www/services_dhcp.php:849
-#: src/usr/local/www/services_dhcpv6.php:576
-#: src/usr/local/www/services_dhcpv6.php:601
-#: src/usr/local/www/system_gateways_edit.php:808
-#: src/usr/local/www/system_gateways_edit.php:828
+#: src/usr/local/www/services_dhcp.php:872
+#: src/usr/local/www/services_dhcpv6.php:646
+#: src/usr/local/www/services_dhcpv6.php:671
+#: src/usr/local/www/system_gateways_edit.php:757
+#: src/usr/local/www/system_gateways_edit.php:777
 msgid "From"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:1343
+#: src/usr/local/www/firewall_rules_edit.php:1380
 msgid " port end"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:1346
+#: src/usr/local/www/firewall_rules_edit.php:1383
 #: src/usr/local/www/services_captiveportal_hostname_edit.php:186
 #: src/usr/local/www/services_captiveportal_ip_edit.php:229
-#: src/usr/local/www/services_dhcp.php:855
-#: src/usr/local/www/services_dhcpv6.php:567
-#: src/usr/local/www/services_dhcpv6.php:592
-#: src/usr/local/www/system_gateways_edit.php:815
-#: src/usr/local/www/system_gateways_edit.php:835
+#: src/usr/local/www/services_dhcp.php:878
+#: src/usr/local/www/services_dhcpv6.php:655
+#: src/usr/local/www/services_dhcpv6.php:680
+#: src/usr/local/www/system_gateways_edit.php:764
+#: src/usr/local/www/system_gateways_edit.php:784
 msgid "To"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:1357
+#: src/usr/local/www/firewall_rules_edit.php:1394
 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 "
@@ -10690,207 +12304,213 @@ msgid ""
 "a single port."
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:1362
+#: src/usr/local/www/firewall_rules_edit.php:1399
 msgid ""
 "Specify the destination port or port range for this rule. You can leave the "
 "\"To\" field empty if you only want to filter a single port."
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:1371
-msgid "Extra options"
+#: src/usr/local/www/firewall_rules_edit.php:1408
+msgid "Extra Options"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:1377
+#: src/usr/local/www/firewall_rules_edit.php:1414
 msgid ""
 "Hint: the firewall has limited local log space. Don't turn on logging for "
 "everything. If you want to do a lot of logging, consider using a remote "
 "syslog server (see the <a href=\"status_logs_settings.php\">Status: System "
-"logs: Settings</a> page)."
+"Logs: Settings</a> page)."
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:1387
-#: src/usr/local/www/services_unbound_acls.php:269
+#: src/usr/local/www/firewall_rules_edit.php:1424
+#: src/usr/local/www/services_unbound_acls.php:273
 msgid "You may enter a description here for your reference."
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:1412
+#: src/usr/local/www/firewall_rules_edit.php:1430
+#: src/usr/local/www/interfaces_ppps_edit.php:828
+#: src/usr/local/www/system_gateways_edit.php:716
+msgid "Advanced options"
+msgstr ""
+
+#: src/usr/local/www/firewall_rules_edit.php:1449
 msgid "Source OS"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:1415
+#: src/usr/local/www/firewall_rules_edit.php:1452
 msgid ""
 "Note: this only works for TCP rules. General OS choice matches all subtypes."
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:1419
+#: src/usr/local/www/firewall_rules_edit.php:1456
 msgid "Diffserv Code Point"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:1426
+#: src/usr/local/www/firewall_rules_edit.php:1463
 msgid "Allow IP options"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:1434
-#: src/usr/local/www/system_advanced_firewall.php:553
+#: src/usr/local/www/firewall_rules_edit.php:1471
+#: src/usr/local/www/system_advanced_firewall.php:552
 msgid "Disable reply-to"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:1441
+#: src/usr/local/www/firewall_rules_edit.php:1478
 #: src/usr/local/www/interfaces_qinq.php:144
 msgid "Tag"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:1444
+#: src/usr/local/www/firewall_rules_edit.php:1481
 msgid ""
 "You can mark a packet matching this rule and use this mark to match on other "
 "NAT/filter rules. It is called <b>Policy filtering</b>."
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:1449
+#: src/usr/local/www/firewall_rules_edit.php:1486
 msgid "Tagged"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:1452
+#: src/usr/local/www/firewall_rules_edit.php:1489
 msgid "You can match packet on a mark placed before on another rule."
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:1456
+#: src/usr/local/www/firewall_rules_edit.php:1493
 msgid "Max. states"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:1459
+#: src/usr/local/www/firewall_rules_edit.php:1496
 msgid "Maximum state entries this rule can create."
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:1463
+#: src/usr/local/www/firewall_rules_edit.php:1500
 msgid "Max. src nodes"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:1466
+#: src/usr/local/www/firewall_rules_edit.php:1503
 msgid "Maximum number of unique source hosts."
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:1470
+#: src/usr/local/www/firewall_rules_edit.php:1507
 msgid "Max. connections"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:1473
+#: src/usr/local/www/firewall_rules_edit.php:1510
 msgid "Maximum number of established connections per host (TCP only)."
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:1477
+#: src/usr/local/www/firewall_rules_edit.php:1514
 msgid "Max. src. states"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:1480
+#: src/usr/local/www/firewall_rules_edit.php:1517
 msgid "Maximum state entries per host."
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:1484
+#: src/usr/local/www/firewall_rules_edit.php:1521
 msgid "Max. src. conn. Rate"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:1487
+#: src/usr/local/www/firewall_rules_edit.php:1524
 msgid "Maximum new connections per host (TCP only)"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:1491
+#: src/usr/local/www/firewall_rules_edit.php:1528
 msgid "Max. src. conn. Rates"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:1495
+#: src/usr/local/www/firewall_rules_edit.php:1532
 msgid "/ per how many second(s) (TCP only)"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:1499
+#: src/usr/local/www/firewall_rules_edit.php:1536
 msgid "State timeout"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:1503
+#: src/usr/local/www/firewall_rules_edit.php:1540
 msgid "State Timeout in seconds (TCP only)"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:1506
+#: src/usr/local/www/firewall_rules_edit.php:1543
 #: src/usr/local/www/status_logs_filter.php:362
-#: src/usr/local/www/status_logs_filter_dynamic.php:511
+#: src/usr/local/www/status_logs_filter_dynamic.php:510
 msgid "TCP Flags"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:1508
+#: src/usr/local/www/firewall_rules_edit.php:1545
 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:1512
+#: src/usr/local/www/firewall_rules_edit.php:1549
 msgid "No pfSync"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:1522
+#: src/usr/local/www/firewall_rules_edit.php:1559
 msgid "Keep"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:1523
+#: src/usr/local/www/firewall_rules_edit.php:1560
 msgid "Sloppy"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:1524
+#: src/usr/local/www/firewall_rules_edit.php:1561
 msgid "Synproxy"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:1519
+#: src/usr/local/www/firewall_rules_edit.php:1556
 msgid "State type"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:1527
+#: src/usr/local/www/firewall_rules_edit.php:1564
 msgid ""
 "Select which type of state tracking mechanism you would like to use.  If in "
 "doubt, use keep state<br /><span></span>"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:1535
+#: src/usr/local/www/firewall_rules_edit.php:1572
 msgid "This does NOT prevent the rule from being overwritten on Slave."
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:1541
+#: src/usr/local/www/firewall_rules_edit.php:1578
 msgid "VLAN Prio"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:1544
+#: src/usr/local/www/firewall_rules_edit.php:1581
 msgid "Choose 802.1p priority to match on"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:1548
+#: src/usr/local/www/firewall_rules_edit.php:1585
 msgid "VLAN Prio Set"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:1551
+#: src/usr/local/www/firewall_rules_edit.php:1588
 msgid "Choose 802.1p priority to apply"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:1565
+#: src/usr/local/www/firewall_rules_edit.php:1602
 msgid "Leave as 'none' to leave the rule enabled all the time"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:1596
+#: src/usr/local/www/firewall_rules_edit.php:1633
 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:1599
+#: src/usr/local/www/firewall_rules_edit.php:1636
 msgid "In / Out pipe"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:1603
+#: src/usr/local/www/firewall_rules_edit.php:1640
 msgid "DNpipe"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:1610
+#: src/usr/local/www/firewall_rules_edit.php:1647
 msgid "PDNpipe"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:1615
+#: src/usr/local/www/firewall_rules_edit.php:1652
 msgid ""
 "Choose the Out queue/Virtual interface only if you have also selected In. "
 "The Out selection is applied to traffic leaving the interface where the rule "
@@ -10900,29 +12520,29 @@ msgid ""
 "reversed, Out is for incoming and In is for outgoing."
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:1623
+#: src/usr/local/www/firewall_rules_edit.php:1660
 msgid "Ackqueue / Queue"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:1640
+#: src/usr/local/www/firewall_rules_edit.php:1677
 msgid "Ackqueue"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:1652
+#: src/usr/local/www/firewall_rules_edit.php:1689
 msgid "Choose the Acknowledge Queue only if you have selected Queue."
 msgstr ""
 
 #: src/usr/local/www/firewall_schedule.php:75
 #: src/usr/local/www/firewall_schedule.php:120
 #: src/usr/local/www/firewall_schedule_edit.php:85
-#: src/usr/local/www/head.inc:241
+#: src/usr/local/www/head.inc:278
 #: src/usr/local/www/system_advanced_misc.php:479
 msgid "Schedules"
 msgstr ""
 
 #: src/usr/local/www/firewall_schedule.php:102
 #, php-format
-msgid "Cannot delete Schedule. Currently in use by %s"
+msgid "Cannot delete schedule. Currently in use by %s."
 msgstr ""
 
 #: src/usr/local/www/firewall_schedule.php:127
@@ -10947,7 +12567,7 @@ msgstr ""
 
 #: src/usr/local/www/firewall_schedule.php:283
 msgid ""
-"Schedules act as placeholders for time ranges to be used in Firewall Rules."
+"Schedules act as placeholders for time ranges to be used in firewall rules."
 msgstr ""
 
 #: src/usr/local/www/firewall_schedule_edit.php:117
@@ -11007,7 +12627,7 @@ msgid ""
 msgstr ""
 
 #: src/usr/local/www/firewall_schedule_edit.php:389
-msgid "Schedule information"
+msgid "Schedule Information"
 msgstr ""
 
 #: src/usr/local/www/firewall_schedule_edit.php:393
@@ -11022,7 +12642,7 @@ msgstr ""
 
 #: src/usr/local/www/firewall_schedule_edit.php:412
 #: src/usr/local/www/firewall_schedule_edit.php:465
-#: src/usr/local/www/vpn_openvpn_csc.php:371
+#: src/usr/local/www/vpn_openvpn_csc.php:375
 msgid "You may enter a description here for your reference (not parsed). "
 msgstr ""
 
@@ -11031,16 +12651,16 @@ msgid "Month"
 msgstr ""
 
 #: src/usr/local/www/firewall_schedule_edit.php:426
-#: src/usr/local/www/status_logs.php:168 src/usr/local/www/status_logs.php:220
-#: src/usr/local/www/status_logs_common.inc:265
-#: src/usr/local/www/status_logs_common.inc:451
+#: src/usr/local/www/status_logs.php:172 src/usr/local/www/status_logs.php:224
+#: src/usr/local/www/status_logs_common.inc:276
+#: src/usr/local/www/status_logs_common.inc:462
 #: src/usr/local/www/status_logs_filter.php:183
 #: src/usr/local/www/status_logs_filter.php:329
 #: src/usr/local/www/status_logs_filter_dynamic.php:423
 #: src/usr/local/www/status_logs_vpn.php:170
 #: src/usr/local/www/status_logs_vpn.php:209
-#: src/usr/local/www/status_logs_vpn.php:399
-#: src/usr/local/www/status_logs_vpn.php:441
+#: src/usr/local/www/status_logs_vpn.php:391
+#: src/usr/local/www/status_logs_vpn.php:433
 #: src/usr/local/www/widgets/widgets/log.widget.php:136
 msgid "Time"
 msgstr ""
@@ -11080,7 +12700,7 @@ msgid "Clear selection"
 msgstr ""
 
 #: src/usr/local/www/firewall_schedule_edit.php:492
-msgid "Configured ranges"
+msgid "Configured Ranges"
 msgstr ""
 
 #: src/usr/local/www/firewall_schedule_edit.php:628
@@ -11095,9 +12715,17 @@ msgstr ""
 msgid "Stop time"
 msgstr ""
 
+#: src/usr/local/www/firewall_shaper.php:75
+#: src/usr/local/www/firewall_shaper.php:436
+#: src/usr/local/www/firewall_shaper_queues.php:243
+#: src/usr/local/www/firewall_shaper_vinterface.php:415
+#: src/usr/local/www/firewall_shaper_wizards.php:111
+msgid "By Interface"
+msgstr ""
+
 #: src/usr/local/www/firewall_shaper.php:169
 #: src/usr/local/www/firewall_shaper_vinterface.php:183
-msgid "Unable to write config.xml (Access Denied?)"
+msgid "Unable to write config.xml (Access Denied?)."
 msgstr ""
 
 #: src/usr/local/www/firewall_shaper.php:203
@@ -11120,7 +12748,7 @@ msgstr ""
 msgid "Could not add new queue."
 msgstr ""
 
-#: src/usr/local/www/firewall_shaper.php:433
+#: src/usr/local/www/firewall_shaper.php:432
 #: src/usr/local/www/firewall_shaper_queues.php:239
 #: src/usr/local/www/firewall_shaper_vinterface.php:411
 #: src/usr/local/www/firewall_shaper_wizards.php:122
@@ -11128,13 +12756,7 @@ msgid "The traffic shaper configuration has been changed."
 msgstr ""
 
 #: src/usr/local/www/firewall_shaper.php:437
-#: src/usr/local/www/firewall_shaper_queues.php:243
-#: src/usr/local/www/firewall_shaper_vinterface.php:415
-#: src/usr/local/www/firewall_shaper_wizards.php:111
-msgid "By Interface"
-msgstr ""
-
-#: src/usr/local/www/firewall_shaper.php:438
+#: src/usr/local/www/firewall_shaper_queues.php:221
 #: src/usr/local/www/firewall_shaper_queues.php:244
 #: src/usr/local/www/firewall_shaper_vinterface.php:416
 #: src/usr/local/www/firewall_shaper_wizards.php:112
@@ -11142,40 +12764,32 @@ msgid "By Queue"
 msgstr ""
 
 #: src/usr/local/www/firewall_shaper.php:439
-#: src/usr/local/www/firewall_shaper_queues.php:245
-#: src/usr/local/www/firewall_shaper_vinterface.php:73
-#: src/usr/local/www/firewall_shaper_vinterface.php:417
-#: src/usr/local/www/firewall_shaper_wizards.php:113
-msgid "Limiter"
-msgstr ""
-
-#: src/usr/local/www/firewall_shaper.php:440
 #: src/usr/local/www/firewall_shaper_queues.php:246
 #: src/usr/local/www/firewall_shaper_vinterface.php:418
 #: src/usr/local/www/firewall_shaper_wizards.php:96
 #: src/usr/local/www/firewall_shaper_wizards.php:114
-#: src/usr/local/www/vpn_openvpn_client.php:447
-#: src/usr/local/www/vpn_openvpn_csc.php:325
-#: src/usr/local/www/vpn_openvpn_server.php:613
+#: src/usr/local/www/vpn_openvpn_client.php:451
+#: src/usr/local/www/vpn_openvpn_csc.php:329
+#: src/usr/local/www/vpn_openvpn_server.php:617
 msgid "Wizards"
 msgstr ""
 
-#: src/usr/local/www/firewall_shaper.php:458
+#: src/usr/local/www/firewall_shaper.php:457
 msgid "Remove Shaper"
 msgstr ""
 
-#: src/usr/local/www/firewall_shaper.php:479
+#: src/usr/local/www/firewall_shaper.php:478
 #: src/usr/local/www/firewall_shaper_vinterface.php:448
 msgid "Add new Queue"
 msgstr ""
 
-#: src/usr/local/www/firewall_shaper.php:493
+#: src/usr/local/www/firewall_shaper.php:492
 #: src/usr/local/www/firewall_shaper_vinterface.php:462
 msgid "Delete this queue"
 msgstr ""
 
 #: src/usr/local/www/firewall_shaper_queues.php:74
-msgid "No queue configured/selected"
+msgid "No Queue Configured/Selected"
 msgstr ""
 
 #: src/usr/local/www/firewall_shaper_vinterface.php:131
@@ -11221,6 +12835,7 @@ msgid ""
 msgstr ""
 
 #: src/usr/local/www/firewall_virtual_ip.php:136
+#: src/usr/local/www/license.php:160
 msgid "server"
 msgstr ""
 
@@ -11255,23 +12870,25 @@ msgid ""
 msgstr ""
 
 #: src/usr/local/www/firewall_virtual_ip.php:265
-#: src/usr/local/www/firewall_virtual_ip_edit.php:386
+#: src/usr/local/www/firewall_virtual_ip_edit.php:375
 msgid "Proxy ARP"
 msgstr ""
 
 #: src/usr/local/www/firewall_virtual_ip.php:266
-#: src/usr/local/www/status_carp.php:142
-#: src/usr/local/www/firewall_virtual_ip_edit.php:378
+#: src/usr/local/www/status_carp.php:140
+#: src/usr/local/www/firewall_virtual_ip_edit.php:367
 msgid "CARP"
 msgstr ""
 
 #: src/usr/local/www/firewall_virtual_ip.php:268
-#: src/usr/local/www/firewall_virtual_ip_edit.php:370
+#: src/usr/local/www/firewall_virtual_ip_edit.php:359
 msgid "IP Alias"
 msgstr ""
 
 #: src/usr/local/www/firewall_virtual_ip.php:271
-msgid "Virtual IP Addresses"
+#: src/usr/local/www/firewall_virtual_ip_edit.php:320
+#: src/usr/local/www/head.inc:280
+msgid "Virtual IPs"
 msgstr ""
 
 #: src/usr/local/www/firewall_virtual_ip.php:279
@@ -11279,7 +12896,6 @@ msgid "The VIP configuration has been changed."
 msgstr ""
 
 #: src/usr/local/www/firewall_virtual_ip.php:290
-#: src/usr/local/www/firewall_virtual_ip_edit.php:339
 msgid "Virtual IP Address"
 msgstr ""
 
@@ -11287,25 +12903,26 @@ msgstr ""
 msgid "Virtual IP address"
 msgstr ""
 
-#: src/usr/local/www/firewall_virtual_ip.php:346
+#: src/usr/local/www/firewall_virtual_ip.php:354
 msgid "Edit virtual ip"
 msgstr ""
 
-#: src/usr/local/www/firewall_virtual_ip.php:347
+#: src/usr/local/www/firewall_virtual_ip.php:355
 msgid "Delete virtual ip"
 msgstr ""
 
-#: src/usr/local/www/firewall_virtual_ip.php:368
+#: src/usr/local/www/firewall_virtual_ip.php:376
 #, php-format
 msgid ""
 "The virtual IP addresses defined on this page may be used in %1$sNAT%2$s "
-"mappings"
+"mappings."
 msgstr ""
 
-#: src/usr/local/www/firewall_virtual_ip.php:369
+#: src/usr/local/www/firewall_virtual_ip.php:377
 #, php-format
 msgid ""
-"You can check the status of your CARP Virtual IPs and interfaces %1$shere%2$s"
+"You can check the status of your CARP Virtual IPs and interfaces %1$shere"
+"%2$s."
 msgstr ""
 
 #: src/usr/local/www/firewall_virtual_ip_edit.php:139
@@ -11315,129 +12932,122 @@ msgstr ""
 msgid "A valid IP address must be specified."
 msgstr ""
 
-#: src/usr/local/www/firewall_virtual_ip_edit.php:163
+#: src/usr/local/www/firewall_virtual_ip_edit.php:158
 msgid "This IP address is being used by another interface or VIP."
 msgstr ""
 
-#: src/usr/local/www/firewall_virtual_ip_edit.php:173
+#: src/usr/local/www/firewall_virtual_ip_edit.php:168
 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:188
+#: src/usr/local/www/firewall_virtual_ip_edit.php:183
 msgid "You cannot use the network address for this VIP"
 msgstr ""
 
-#: src/usr/local/www/firewall_virtual_ip_edit.php:190
+#: src/usr/local/www/firewall_virtual_ip_edit.php:185
 msgid "You cannot use the broadcast address for this VIP"
 msgstr ""
 
-#: src/usr/local/www/firewall_virtual_ip_edit.php:209
+#: src/usr/local/www/firewall_virtual_ip_edit.php:204
 msgid ""
 "You must specify a CARP password that is shared between the two VHID members."
 msgstr ""
 
-#: src/usr/local/www/firewall_virtual_ip_edit.php:213
+#: src/usr/local/www/firewall_virtual_ip_edit.php:208
 msgid "Password and confirm password must match"
 msgstr ""
 
-#: src/usr/local/www/firewall_virtual_ip_edit.php:217
-#: src/usr/local/www/firewall_virtual_ip_edit.php:247
+#: src/usr/local/www/firewall_virtual_ip_edit.php:212
+#: src/usr/local/www/firewall_virtual_ip_edit.php:223
 msgid "For this type of vip localhost is not allowed."
 msgstr ""
 
-#: src/usr/local/www/firewall_virtual_ip_edit.php:219
-#: src/usr/local/www/firewall_virtual_ip_edit.php:249
+#: src/usr/local/www/firewall_virtual_ip_edit.php:214
+#: src/usr/local/www/firewall_virtual_ip_edit.php:225
 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:238
-#, php-format
-msgid ""
-"Sorry, we could not locate an interface with a matching subnet for %s.  "
-"Please add an IP alias in this subnet on this interface."
-msgstr ""
-
-#: src/usr/local/www/firewall_virtual_ip_edit.php:336
+#: src/usr/local/www/firewall_virtual_ip_edit.php:317
 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:337
+#: src/usr/local/www/firewall_virtual_ip_edit.php:318
 msgid "Enter a CIDR block of proxy ARP addresses."
 msgstr ""
 
-#: src/usr/local/www/firewall_virtual_ip_edit.php:363
+#: src/usr/local/www/firewall_virtual_ip_edit.php:352
 msgid "Edit Virtual IP"
 msgstr ""
 
-#: src/usr/local/www/firewall_virtual_ip_edit.php:413
+#: src/usr/local/www/firewall_virtual_ip_edit.php:402
 msgid "Single address"
 msgstr ""
 
-#: src/usr/local/www/firewall_virtual_ip_edit.php:410
+#: src/usr/local/www/firewall_virtual_ip_edit.php:399
 msgid "Address type"
 msgstr ""
 
-#: src/usr/local/www/firewall_virtual_ip_edit.php:420
+#: src/usr/local/www/firewall_virtual_ip_edit.php:409
 msgid "Address(es)"
 msgstr ""
 
-#: src/usr/local/www/firewall_virtual_ip_edit.php:422
+#: src/usr/local/www/firewall_virtual_ip_edit.php:411
 msgid "<span id=\"address_note\"></span>"
 msgstr ""
 
-#: src/usr/local/www/firewall_virtual_ip_edit.php:426
+#: src/usr/local/www/firewall_virtual_ip_edit.php:415
 msgid "Expansion"
 msgstr ""
 
-#: src/usr/local/www/firewall_virtual_ip_edit.php:433
+#: src/usr/local/www/firewall_virtual_ip_edit.php:422
 msgid "Virtual IP Password"
 msgstr ""
 
-#: src/usr/local/www/firewall_virtual_ip_edit.php:436
+#: src/usr/local/www/firewall_virtual_ip_edit.php:425
 msgid "Enter the VHID group password."
 msgstr ""
 
-#: src/usr/local/www/firewall_virtual_ip_edit.php:440
+#: src/usr/local/www/firewall_virtual_ip_edit.php:429
 msgid "VHID Group"
 msgstr ""
 
-#: src/usr/local/www/firewall_virtual_ip_edit.php:443
+#: src/usr/local/www/firewall_virtual_ip_edit.php:432
 msgid "Enter the VHID group that the machines will share"
 msgstr ""
 
-#: src/usr/local/www/firewall_virtual_ip_edit.php:445
+#: src/usr/local/www/firewall_virtual_ip_edit.php:434
 msgid "Advertising frequency"
 msgstr ""
 
-#: src/usr/local/www/firewall_virtual_ip_edit.php:448
-#: src/usr/local/www/firewall_virtual_ip_edit.php:451
+#: src/usr/local/www/firewall_virtual_ip_edit.php:437
+#: src/usr/local/www/firewall_virtual_ip_edit.php:440
 msgid "Base"
 msgstr ""
 
-#: src/usr/local/www/firewall_virtual_ip_edit.php:455
-#: src/usr/local/www/firewall_virtual_ip_edit.php:458
+#: src/usr/local/www/firewall_virtual_ip_edit.php:444
+#: src/usr/local/www/firewall_virtual_ip_edit.php:447
 msgid "Skew"
 msgstr ""
 
-#: src/usr/local/www/firewall_virtual_ip_edit.php:460
+#: src/usr/local/www/firewall_virtual_ip_edit.php:449
 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:493
+#: src/usr/local/www/firewall_virtual_ip_edit.php:482
 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:494
+#: src/usr/local/www/firewall_virtual_ip_edit.php:483
 #, php-format
 msgid "For more information on CARP and the above values, visit the OpenBSD %s"
 msgstr ""
@@ -11537,7 +13147,7 @@ msgid "Authentication and Accounting"
 msgstr ""
 
 #: src/usr/local/www/guiconfig.inc:190
-#: src/usr/local/www/services_captiveportal.php:900
+#: src/usr/local/www/services_captiveportal.php:901
 #: src/usr/local/www/vpn_l2tp.php:338
 msgid "Accounting"
 msgstr ""
@@ -11566,17 +13176,17 @@ msgstr ""
 msgid "10BASE-T half-duplex"
 msgstr ""
 
-#: src/usr/local/www/guiconfig.inc:268 src/usr/local/www/interfaces.php:2926
+#: src/usr/local/www/guiconfig.inc:268 src/usr/local/www/interfaces.php:2928
 #: src/usr/local/www/interfaces_wireless_edit.php:224
 msgid "Infrastructure (BSS)"
 msgstr ""
 
-#: src/usr/local/www/guiconfig.inc:269 src/usr/local/www/interfaces.php:2926
+#: src/usr/local/www/guiconfig.inc:269 src/usr/local/www/interfaces.php:2928
 #: src/usr/local/www/interfaces_wireless_edit.php:225
 msgid "Ad-hoc (IBSS)"
 msgstr ""
 
-#: src/usr/local/www/guiconfig.inc:270 src/usr/local/www/interfaces.php:2926
+#: src/usr/local/www/guiconfig.inc:270 src/usr/local/www/interfaces.php:2928
 #: src/usr/local/www/interfaces_wireless_edit.php:226
 msgid "Access Point"
 msgstr ""
@@ -11596,210 +13206,191 @@ msgid "The following input errors were detected:"
 msgstr ""
 
 #: src/usr/local/www/guiconfig.inc:344
-msgid "Apply changes"
+msgid "Apply Changes"
 msgstr ""
 
-#: src/usr/local/www/guiconfig.inc:350
-#: src/usr/local/www/status_logs_common.inc:736
+#: src/usr/local/www/guiconfig.inc:377
+#: src/usr/local/www/status_logs_common.inc:753
 msgid "The changes have been applied successfully."
 msgstr ""
 
-#: src/usr/local/www/guiconfig.inc:357
+#: src/usr/local/www/guiconfig.inc:384
 msgid ""
 "You can also <a href=\"status_filter_reload.php\">monitor</a> the filter "
 "reload progress."
 msgstr ""
 
-#: src/usr/local/www/guiconfig.inc:543 src/usr/local/www/guiconfig.inc:594
+#: src/usr/local/www/guiconfig.inc:565 src/usr/local/www/guiconfig.inc:616
 #, php-format
 msgid "File %s is a directory."
 msgstr ""
 
-#: src/usr/local/www/guiconfig.inc:545 src/usr/local/www/guiconfig.inc:596
+#: src/usr/local/www/guiconfig.inc:567 src/usr/local/www/guiconfig.inc:618
 msgid "Log file started."
 msgstr ""
 
-#: src/usr/local/www/guiconfig.inc:983
+#: src/usr/local/www/guiconfig.inc:1005
 msgid "Currently viewing: "
 msgstr ""
 
-#: src/usr/local/www/guiconfig.inc:1070
+#: src/usr/local/www/guiconfig.inc:1092
 msgid "listing only first 10k items"
 msgstr ""
 
-#: src/usr/local/www/guiconfig.inc:1080
-#: src/usr/local/www/services_dhcp.php:1184
-#: src/usr/local/www/services_dhcpv6.php:846
-#: src/usr/local/www/system_advanced_sysctl.php:203
-#: src/usr/local/www/system_advanced_sysctl.php:252
-#: src/usr/local/www/system_certmanager.php:823
+#: src/usr/local/www/guiconfig.inc:1102
+#: src/usr/local/www/services_dhcp.php:1207
+#: src/usr/local/www/services_dhcpv6.php:946
+#: src/usr/local/www/system_advanced_sysctl.php:207
+#: src/usr/local/www/system_advanced_sysctl.php:256
+#: src/usr/local/www/system_certmanager.php:825
 msgid "Value"
 msgstr ""
 
-#: src/usr/local/www/head.inc:204
-msgid "Logout"
-msgstr ""
-
-#: src/usr/local/www/head.inc:207 src/usr/local/www/system.php:352
+#: src/usr/local/www/head.inc:244 src/usr/local/www/system.php:358
 msgid "General Setup"
 msgstr ""
 
-#: src/usr/local/www/head.inc:208
+#: src/usr/local/www/head.inc:245
 msgid "High Avail. Sync"
 msgstr ""
 
-#: src/usr/local/www/head.inc:210 src/usr/local/www/pkg_mgr.php:207
-#: src/usr/local/www/widgets/widgets/installed_packages.widget.php:183
-msgid "Packages"
-msgstr ""
-
-#: src/usr/local/www/head.inc:212
+#: src/usr/local/www/head.inc:249
 msgid "Setup Wizard"
 msgstr ""
 
-#: src/usr/local/www/head.inc:213 src/usr/local/www/status_logs.php:92
-#: src/usr/local/www/status_logs_common.inc:127
+#: src/usr/local/www/head.inc:250 src/usr/local/www/status_logs.php:92
+#: src/usr/local/www/status_logs_common.inc:138
 #: src/usr/local/www/system_gateway_groups.php:124
 #: src/usr/local/www/system_gateway_groups_edit.php:180
 #: src/usr/local/www/system_gateways.php:245
-#: src/usr/local/www/system_gateways_edit.php:631
+#: src/usr/local/www/system_gateways_edit.php:572
 #: src/usr/local/www/system_routes.php:246
 #: src/usr/local/www/system_routes_edit.php:257
 msgid "Routing"
 msgstr ""
 
-#: src/usr/local/www/head.inc:214
-msgid "Cert Manager"
+#: src/usr/local/www/head.inc:251
+msgid "Cert. Manager"
 msgstr ""
 
-#: src/usr/local/www/head.inc:216 src/usr/local/www/head.inc:218
-#: src/usr/local/www/system_authservers.php:67
-#: src/usr/local/www/system_groupmanager.php:70
-#: src/usr/local/www/system_groupmanager_addprivs.php:83
-#: src/usr/local/www/system_usermanager.php:72
+#: src/usr/local/www/head.inc:253 src/usr/local/www/head.inc:255
+#: src/usr/local/www/system_authservers.php:377
+#: src/usr/local/www/system_groupmanager.php:274
+#: src/usr/local/www/system_groupmanager_addprivs.php:69
+#: src/usr/local/www/system_usermanager.php:467
 #: src/usr/local/www/system_usermanager_addprivs.php:70
 #: src/usr/local/www/system_usermanager_settings.php:75
 msgid "User Manager"
 msgstr ""
 
-#: src/usr/local/www/head.inc:226
+#: src/usr/local/www/head.inc:263
 msgid "(assign)"
 msgstr ""
 
-#: src/usr/local/www/head.inc:243
-msgid "Virtual IPs"
-msgstr ""
-
-#: src/usr/local/www/head.inc:256
-msgid "DHCPv6 Server/RA"
+#: src/usr/local/www/head.inc:293 src/usr/local/www/services_dhcpv6.php:505
+#: src/usr/local/www/services_dhcpv6_edit.php:234
+#: src/usr/local/www/services_router_advertisements.php:242
+msgid "DHCPv6 Server & RA"
 msgstr ""
 
-#: src/usr/local/www/head.inc:260 src/usr/local/www/services_igmpproxy.php:101
+#: src/usr/local/www/head.inc:297 src/usr/local/www/services_igmpproxy.php:101
 #: src/usr/local/www/services_igmpproxy.php:115
 #: src/usr/local/www/services_igmpproxy_edit.php:66
 msgid "IGMP Proxy"
 msgstr ""
 
-#: src/usr/local/www/head.inc:261 src/usr/local/www/head.inc:295
+#: src/usr/local/www/head.inc:298 src/usr/local/www/head.inc:332
 #: src/usr/local/www/load_balancer_monitor.php:107
-#: src/usr/local/www/load_balancer_monitor_edit.php:230
+#: src/usr/local/www/load_balancer_monitor_edit.php:234
 #: src/usr/local/www/load_balancer_pool.php:121
 #: src/usr/local/www/load_balancer_pool_edit.php:219
 #: src/usr/local/www/load_balancer_setting.php:120
 #: src/usr/local/www/load_balancer_virtual_server.php:121
 #: src/usr/local/www/load_balancer_virtual_server_edit.php:193
-#: src/usr/local/www/status_lb_pool.php:97
-#: src/usr/local/www/status_lb_vs.php:84 src/usr/local/www/status_logs.php:84
-#: src/usr/local/www/status_logs_common.inc:117
+#: src/usr/local/www/status_lb_pool.php:92
+#: src/usr/local/www/status_lb_vs.php:79 src/usr/local/www/status_logs.php:84
+#: src/usr/local/www/status_logs_common.inc:128
 #: src/usr/local/www/status_logs_settings.php:240
 msgid "Load Balancer"
 msgstr ""
 
-#: src/usr/local/www/head.inc:262 src/usr/local/www/head.inc:296
-#: src/usr/local/www/services_dhcp.php:1062
-#: src/usr/local/www/services_ntpd.php:267
-#: src/usr/local/www/services_ntpd.php:279
+#: src/usr/local/www/head.inc:299 src/usr/local/www/head.inc:333
+#: src/usr/local/www/services_dhcp.php:1085
+#: src/usr/local/www/services_ntpd.php:218
+#: src/usr/local/www/services_ntpd_acls.php:195
 #: src/usr/local/www/services_ntpd_gps.php:225
-#: src/usr/local/www/services_ntpd_gps.php:230
 #: src/usr/local/www/services_ntpd_pps.php:136
-#: src/usr/local/www/services_ntpd_pps.php:149
-#: src/usr/local/www/status_logs_common.inc:119
+#: src/usr/local/www/status_logs.php:88
+#: src/usr/local/www/status_logs_common.inc:130
 #: src/usr/local/www/status_logs_settings.php:242
 #: src/usr/local/www/status_ntpd.php:186
-#: src/usr/local/www/status_rrd_graph_settings.php:83
 msgid "NTP"
 msgstr ""
 
-#: src/usr/local/www/head.inc:264 src/usr/local/www/services_snmp.php:210
+#: src/usr/local/www/head.inc:301 src/usr/local/www/services_snmp.php:210
 msgid "SNMP"
 msgstr ""
 
-#: src/usr/local/www/head.inc:270 src/usr/local/www/head.inc:310
+#: src/usr/local/www/head.inc:307 src/usr/local/www/head.inc:346
 #: src/usr/local/www/status_upnp.php:76
 msgid "UPnP &amp; NAT-PMP"
 msgstr ""
 
-#: src/usr/local/www/head.inc:281 src/usr/local/www/interfaces.php:1651
-#: src/usr/local/www/interfaces_ppps_edit.php:455
+#: src/usr/local/www/head.inc:318 src/usr/local/www/interfaces.php:1640
+#: src/usr/local/www/interfaces_ppps_edit.php:466
 #: src/usr/local/www/vpn_l2tp.php:219 src/usr/local/www/vpn_l2tp_users.php:63
 #: src/usr/local/www/vpn_l2tp_users_edit.php:63
 msgid "L2TP"
 msgstr ""
 
-#: src/usr/local/www/head.inc:287
+#: src/usr/local/www/head.inc:324
 msgid "CARP (failover)"
 msgstr ""
 
-#: src/usr/local/www/head.inc:288 src/usr/local/www/index.php:315
+#: src/usr/local/www/head.inc:325 src/usr/local/www/index.php:315
 msgid "Dashboard"
 msgstr ""
 
-#: src/usr/local/www/head.inc:289
-#: src/usr/local/www/status_gateway_groups.php:91
-#: src/usr/local/www/status_gateway_groups.php:103
-#: src/usr/local/www/status_gateways.php:80
+#: src/usr/local/www/head.inc:326
+#: src/usr/local/www/status_gateway_groups.php:80
+#: src/usr/local/www/status_gateway_groups.php:85
+#: src/usr/local/www/status_gateway_groups.php:97
+#: src/usr/local/www/status_gateways.php:75
+#: src/usr/local/www/status_gateways.php:81
 #: src/usr/local/www/status_gateways.php:86
-#: src/usr/local/www/status_gateways.php:91
 #: src/usr/local/www/status_logs.php:90
-#: src/usr/local/www/status_logs_common.inc:126
+#: src/usr/local/www/status_logs_common.inc:137
 #: src/usr/local/www/system_gateway_groups.php:138
 #: src/usr/local/www/system_gateway_groups.php:151
 #: src/usr/local/www/system_gateways.php:245
 #: src/usr/local/www/system_gateways.php:262
 #: src/usr/local/www/system_gateways.php:269
-#: src/usr/local/www/system_gateways_edit.php:631
+#: src/usr/local/www/system_gateways_edit.php:572
 #: src/usr/local/www/system_routes.php:262
 #: src/usr/local/www/widgets/include/gateways.inc:3
 msgid "Gateways"
 msgstr ""
 
-#: src/usr/local/www/head.inc:290
+#: src/usr/local/www/head.inc:327 src/usr/local/www/status_dhcp_leases.php:69
 msgid "DHCP Leases"
 msgstr ""
 
-#: src/usr/local/www/head.inc:291
+#: src/usr/local/www/head.inc:328 src/usr/local/www/status_dhcpv6_leases.php:70
 msgid "DHCPv6 Leases"
 msgstr ""
 
-#: src/usr/local/www/head.inc:292 src/usr/local/www/status_filter_reload.php:67
+#: src/usr/local/www/head.inc:329 src/usr/local/www/status_filter_reload.php:67
 #: src/usr/local/www/status_filter_reload.php:94
 msgid "Filter Reload"
 msgstr ""
 
-#: src/usr/local/www/head.inc:300
+#: src/usr/local/www/head.inc:337 src/usr/local/www/status_pkglogs.php:104
 msgid "Package Logs"
 msgstr ""
 
-#: src/usr/local/www/head.inc:304 src/usr/local/www/status_rrd_graph.php:309
-#: src/usr/local/www/status_rrd_graph_img.php:66
-#: src/usr/local/www/status_rrd_graph_settings.php:143
-#: src/usr/local/www/status_rrd_graph_settings.php:199
-msgid "RRD Graphs"
-msgstr ""
-
-#: src/usr/local/www/head.inc:305
+#: src/usr/local/www/head.inc:341
 #: src/usr/local/www/load_balancer_monitor.php:107
-#: src/usr/local/www/load_balancer_monitor_edit.php:230
+#: src/usr/local/www/load_balancer_monitor_edit.php:234
 #: src/usr/local/www/load_balancer_pool.php:121
 #: src/usr/local/www/load_balancer_pool_edit.php:219
 #: src/usr/local/www/load_balancer_setting.php:120
@@ -11808,38 +13399,39 @@ msgstr ""
 #: src/usr/local/www/services_captiveportal.php:96
 #: src/usr/local/www/services_captiveportal_filemanager.php:99
 #: src/usr/local/www/services_captiveportal_hostname.php:95
-#: src/usr/local/www/services_captiveportal_hostname_edit.php:80
+#: src/usr/local/www/services_captiveportal_hostname_edit.php:96
 #: src/usr/local/www/services_captiveportal_ip.php:94
-#: src/usr/local/www/services_captiveportal_ip_edit.php:83
+#: src/usr/local/www/services_captiveportal_ip_edit.php:98
 #: src/usr/local/www/services_captiveportal_mac.php:91
-#: src/usr/local/www/services_captiveportal_mac_edit.php:86
+#: src/usr/local/www/services_captiveportal_mac_edit.php:101
 #: src/usr/local/www/services_captiveportal_vouchers.php:111
-#: src/usr/local/www/services_captiveportal_vouchers_edit.php:71
+#: src/usr/local/www/services_captiveportal_vouchers_edit.php:86
 #: src/usr/local/www/services_captiveportal_zones.php:93
 #: src/usr/local/www/services_captiveportal_zones_edit.php:69
-#: src/usr/local/www/services_dhcp.php:698
-#: src/usr/local/www/services_dhcp_edit.php:410
+#: src/usr/local/www/services_dhcp.php:726
+#: src/usr/local/www/services_dhcp_edit.php:414
 #: src/usr/local/www/services_dhcp_relay.php:154
-#: src/usr/local/www/services_dhcpv6.php:439
-#: src/usr/local/www/services_dhcpv6_edit.php:217
+#: src/usr/local/www/services_dhcpv6.php:505
+#: src/usr/local/www/services_dhcpv6_edit.php:234
 #: src/usr/local/www/services_dhcpv6_relay.php:152
 #: src/usr/local/www/services_dnsmasq.php:215
 #: src/usr/local/www/services_dnsmasq_domainoverride_edit.php:153
 #: src/usr/local/www/services_dnsmasq_edit.php:232
 #: src/usr/local/www/services_dyndns.php:100
-#: src/usr/local/www/services_dyndns_edit.php:263
+#: src/usr/local/www/services_dyndns_edit.php:273
 #: src/usr/local/www/services_igmpproxy.php:101
 #: src/usr/local/www/services_igmpproxy_edit.php:66
-#: src/usr/local/www/services_ntpd.php:267
+#: src/usr/local/www/services_ntpd.php:218
+#: src/usr/local/www/services_ntpd_acls.php:195
 #: src/usr/local/www/services_ntpd_gps.php:225
 #: src/usr/local/www/services_ntpd_pps.php:136
 #: src/usr/local/www/services_pppoe.php:116
 #: src/usr/local/www/services_pppoe_edit.php:314
 #: src/usr/local/www/services_rfc2136.php:92
-#: src/usr/local/www/services_rfc2136_edit.php:160
-#: src/usr/local/www/services_router_advertisements.php:240
+#: src/usr/local/www/services_rfc2136_edit.php:182
+#: src/usr/local/www/services_router_advertisements.php:242
 #: src/usr/local/www/services_snmp.php:210
-#: src/usr/local/www/services_unbound.php:241
+#: src/usr/local/www/services_unbound.php:266
 #: src/usr/local/www/services_unbound_acls.php:208
 #: src/usr/local/www/services_unbound_advanced.php:221
 #: src/usr/local/www/services_unbound_domainoverride_edit.php:145
@@ -11848,15 +13440,16 @@ msgstr ""
 #: src/usr/local/www/services_wol_edit.php:137
 #: src/usr/local/www/status_services.php:100
 #: src/usr/local/www/status_services.php:122
-#: src/usr/local/www/system_authservers.php:226
+#: src/usr/local/www/system_authservers.php:223
 msgid "Services"
 msgstr ""
 
-#: src/usr/local/www/head.inc:307 src/usr/local/www/status_graph.php:150
+#: src/usr/local/www/head.inc:343 src/usr/local/www/status_graph.php:150
+#: src/usr/local/www/status_graph.php:258
 msgid "Traffic Graph"
 msgstr ""
 
-#: src/usr/local/www/head.inc:322 src/usr/local/www/interfaces_assign.php:520
+#: src/usr/local/www/head.inc:358 src/usr/local/www/interfaces_assign.php:524
 #: src/usr/local/www/interfaces_bridge.php:119
 #: src/usr/local/www/interfaces_gif.php:114
 #: src/usr/local/www/interfaces_gre.php:114
@@ -11867,154 +13460,120 @@ msgstr ""
 #: src/usr/local/www/interfaces_qinq.php:125
 #: src/usr/local/www/interfaces_vlan.php:118
 #: src/usr/local/www/interfaces_wireless.php:105
-#: src/usr/local/www/interfaces_wireless.php:118
+#: src/usr/local/www/interfaces_wireless.php:116
 #: src/usr/local/www/interfaces_wireless_edit.php:201
 #: src/usr/local/www/status_logs.php:96
-#: src/usr/local/www/status_logs_common.inc:129
-#: src/usr/local/www/status_rrd_graph.php:448
-#: src/usr/local/www/status_rrd_graph_settings.php:157
+#: src/usr/local/www/status_logs_common.inc:140
 #: src/usr/local/www/status_wireless.php:65
 msgid "Wireless"
 msgstr ""
 
-#: src/usr/local/www/head.inc:332
-msgid "Command Prompt"
-msgstr ""
-
-#: src/usr/local/www/head.inc:334
-msgid "Edit File"
-msgstr ""
-
-#: src/usr/local/www/head.inc:335
-msgid "Factory Defaults"
-msgstr ""
-
-#: src/usr/local/www/head.inc:341
-msgid "Halt System"
-msgstr ""
-
-#: src/usr/local/www/head.inc:350
-msgid "Routes"
-msgstr ""
-
-#: src/usr/local/www/head.inc:351
-#: src/usr/local/www/widgets/include/smart_status.inc:3
-#: src/usr/local/www/widgets/widgets/smart_status.widget.php:72
-msgid "SMART Status"
-msgstr ""
-
-#: src/usr/local/www/head.inc:354
-msgid "States Summary"
-msgstr ""
-
-#: src/usr/local/www/head.inc:364
+#: src/usr/local/www/head.inc:400
 msgid "Restart HTTPD"
 msgstr ""
 
-#: src/usr/local/www/head.inc:370
+#: src/usr/local/www/head.inc:406
 msgid "pfSense Gold"
 msgstr ""
 
-#: src/usr/local/www/head.inc:375
+#: src/usr/local/www/head.inc:411
 msgid "About this Page"
 msgstr ""
 
-#: src/usr/local/www/head.inc:377
+#: src/usr/local/www/head.inc:413
 msgid "Bug Database"
 msgstr ""
 
-#: src/usr/local/www/head.inc:380
+#: src/usr/local/www/head.inc:416
 msgid "User Forum"
 msgstr ""
 
-#: src/usr/local/www/head.inc:381
+#: src/usr/local/www/head.inc:417
 msgid "Documentation"
 msgstr ""
 
-#: src/usr/local/www/head.inc:382
+#: src/usr/local/www/head.inc:418
 msgid "Developers Wiki"
 msgstr ""
 
-#: src/usr/local/www/head.inc:383
+#: src/usr/local/www/head.inc:419
 msgid "Paid Support"
 msgstr ""
 
-#: src/usr/local/www/head.inc:384
+#: src/usr/local/www/head.inc:420
 msgid "pfSense Book"
 msgstr ""
 
-#: src/usr/local/www/head.inc:385
-msgid "Search Portal"
-msgstr ""
-
-#: src/usr/local/www/head.inc:386
+#: src/usr/local/www/head.inc:421
 msgid "FreeBSD Handbook"
 msgstr ""
 
-#: src/usr/local/www/head.inc:442 src/usr/local/www/head.inc:569
+#: src/usr/local/www/head.inc:479 src/usr/local/www/head.inc:625
 msgid "Notices"
 msgstr ""
 
-#: src/usr/local/www/head.inc:451
+#: src/usr/local/www/head.inc:488
 msgid "Log out"
 msgstr ""
 
-#: src/usr/local/www/head.inc:475 src/usr/local/www/index.php:328
-#: src/usr/local/www/system.php:526
-msgid "Available Widgets"
+#: src/usr/local/www/head.inc:512
+msgid "Available widgets"
 msgstr ""
 
-#: src/usr/local/www/head.inc:483 src/usr/local/www/status_logs_common.inc:310
-#: src/usr/local/www/status_logs_common.inc:518
-#: src/usr/local/www/status_logs_vpn.php:487 src/usr/local/www/system.php:533
-msgid "Log Filter"
+#: src/usr/local/www/head.inc:520
+msgid "Save dashboard layout"
 msgstr ""
 
-#: src/usr/local/www/head.inc:491 src/usr/local/www/system.php:540
-msgid "Manage Log"
+#: src/usr/local/www/head.inc:528
+msgid "Log filter"
+msgstr ""
+
+#: src/usr/local/www/head.inc:539
+msgid "Manage log"
 msgstr ""
 
-#: src/usr/local/www/head.inc:523
+#: src/usr/local/www/head.inc:581
 msgid "Help for items on this page"
 msgstr ""
 
-#: src/usr/local/www/head.inc:534
+#: src/usr/local/www/head.inc:592
 #, php-format
 msgid ""
-"%s is booting then packages will be reinstalled in the background.<p>Do not "
-"make changes in the GUI until this is complete."
+"<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:537
+#: src/usr/local/www/head.inc:595
 msgid ""
-"Packages are currently being reinstalled in the background.<p>Do not make "
-"changes in the GUI until this is complete."
+"<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:538
+#: src/usr/local/www/head.inc:596
+#, php-format
 msgid ""
 "<p>If the above message is still displayed after a couple of hours, use the "
-"'Clear Package Lock' button on the <a href='diag_backup.php' title='Backup/"
-"Restore'>Backup/Restore page</a> and reinstall packages manually."
+"'Clear Package Lock' button on the <a href=\"diag_backup.php\" title=\"%1$s "
+"&gt; %2$s\">%1$s &gt; %2$s</a> page and reinstall packages manually.</p>"
 msgstr ""
 
-#: src/usr/local/www/head.inc:550
+#: src/usr/local/www/head.inc:606
 msgid "This page is currently being managed by a remote machine."
 msgstr ""
 
-#: src/usr/local/www/head.inc:608
+#: src/usr/local/www/head.inc:664
 #: src/usr/local/www/system_usermanager_settings_ldapacpicker.php:132
 msgid "Close"
 msgstr ""
 
-#: src/usr/local/www/head.inc:609
-msgid "Mark all as read"
+#: src/usr/local/www/head.inc:665
+msgid "Mark All as Read"
 msgstr ""
 
 #: src/usr/local/www/index.php:110
 #, php-format
 msgid ""
-"%s has detected a crash report or programming bug.  Click <a "
+"%s has detected a crash report or programming bug. Click <a "
 "href='crash_reporter.php'>here</a> for more information."
 msgstr ""
 
@@ -12042,539 +13601,530 @@ msgstr ""
 msgid "To bypass the wizard, click on the %s logo on the initial page."
 msgstr ""
 
-#: src/usr/local/www/index.php:492
-msgid "Save dashboard layout"
+#: src/usr/local/www/index.php:328 src/usr/local/www/system.php:532
+msgid "Available Widgets"
 msgstr ""
 
-#: src/usr/local/www/index.php:503
+#: src/usr/local/www/index.php:501
 msgid "You have moved one or more widgets but have not yet saved"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:443
+#: src/usr/local/www/interfaces.php:444
 msgid "You have already applied your settings!"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:487
-#, php-format
-msgid "Interface %1$s (%2$s) is now disabled."
-msgstr ""
-
-#: src/usr/local/www/interfaces.php:531
+#: src/usr/local/www/interfaces.php:514
 msgid "An interface with the specified description already exists."
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:540
+#: src/usr/local/www/interfaces.php:523
 #, php-format
 msgid "Sorry, an alias with the name %s already exists."
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:549
+#: src/usr/local/www/interfaces.php:532
 #, php-format
 msgid "Sorry, an interface group with the name %s already exists."
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:555
+#: src/usr/local/www/interfaces.php:538
 msgid "The interface description cannot contain only numbers."
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:559
+#: src/usr/local/www/interfaces.php:542
 msgid ""
 "The DHCP Server is active on this interface and it can be used only with a "
 "static IP configuration. Please disable the DHCP Server service on this "
 "interface first, then change the interface configuration."
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:562
+#: src/usr/local/www/interfaces.php:545
 msgid ""
 "The DHCP6 Server is active on this interface and it can be used only with a "
 "static IPv6 configuration. Please disable the DHCPv6 Server service on this "
 "interface first, then change the interface configuration."
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:568
+#: src/usr/local/www/interfaces.php:551
 msgid "IPv4 address"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:568 src/usr/local/www/interfaces.php:619
+#: src/usr/local/www/interfaces.php:551 src/usr/local/www/interfaces.php:602
 msgid "Subnet bit count"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:575
+#: src/usr/local/www/interfaces.php:558
 msgid ""
 "This interface is referenced by IPv4 VIPs. Please delete those before "
 "setting the interface to 'none' configuration."
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:582
+#: src/usr/local/www/interfaces.php:565
 msgid "Modem Port"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:582
-#: src/usr/local/www/interfaces_ppps_edit.php:232
+#: src/usr/local/www/interfaces.php:565
+#: src/usr/local/www/interfaces_ppps_edit.php:221
 msgid "Phone Number"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:588 src/usr/local/www/interfaces.php:591
+#: src/usr/local/www/interfaces.php:571 src/usr/local/www/interfaces.php:574
 msgid "PPPoE username"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:588 src/usr/local/www/interfaces.php:591
+#: src/usr/local/www/interfaces.php:571 src/usr/local/www/interfaces.php:574
 msgid "PPPoE password"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:588 src/usr/local/www/interfaces.php:598
-#: src/usr/local/www/interfaces.php:608 src/usr/local/www/interfaces.php:2576
-#: src/usr/local/www/interfaces.php:2712
+#: src/usr/local/www/interfaces.php:571 src/usr/local/www/interfaces.php:581
+#: src/usr/local/www/interfaces.php:591 src/usr/local/www/interfaces.php:2578
+#: src/usr/local/www/interfaces.php:2714
+#: src/usr/local/www/interfaces_ppps_edit.php:227
 #: src/usr/local/www/interfaces_ppps_edit.php:238
-#: src/usr/local/www/interfaces_ppps_edit.php:249
 msgid "Dial on demand"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:588 src/usr/local/www/interfaces.php:598
-#: src/usr/local/www/interfaces.php:608
+#: src/usr/local/www/interfaces.php:571 src/usr/local/www/interfaces.php:581
+#: src/usr/local/www/interfaces.php:591
+#: src/usr/local/www/interfaces_ppps_edit.php:227
 #: src/usr/local/www/interfaces_ppps_edit.php:238
-#: src/usr/local/www/interfaces_ppps_edit.php:249
 msgid "Idle timeout value"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:598 src/usr/local/www/interfaces.php:601
+#: src/usr/local/www/interfaces.php:581 src/usr/local/www/interfaces.php:584
 msgid "PPTP username"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:598 src/usr/local/www/interfaces.php:601
+#: src/usr/local/www/interfaces.php:581 src/usr/local/www/interfaces.php:584
 msgid "PPTP password"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:598 src/usr/local/www/interfaces.php:601
+#: src/usr/local/www/interfaces.php:581 src/usr/local/www/interfaces.php:584
 msgid "PPTP local IP address"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:598 src/usr/local/www/interfaces.php:601
+#: src/usr/local/www/interfaces.php:581 src/usr/local/www/interfaces.php:584
 msgid "PPTP subnet"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:598 src/usr/local/www/interfaces.php:601
+#: src/usr/local/www/interfaces.php:581 src/usr/local/www/interfaces.php:584
 msgid "PPTP remote IP address"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:608 src/usr/local/www/interfaces.php:611
+#: src/usr/local/www/interfaces.php:591 src/usr/local/www/interfaces.php:594
 msgid "L2TP username"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:608 src/usr/local/www/interfaces.php:611
+#: src/usr/local/www/interfaces.php:591 src/usr/local/www/interfaces.php:594
 msgid "L2TP password"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:608 src/usr/local/www/interfaces.php:611
+#: src/usr/local/www/interfaces.php:591 src/usr/local/www/interfaces.php:594
 msgid "L2TP remote IP address"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:626
+#: src/usr/local/www/interfaces.php:609
 msgid ""
 "This interface is referenced by IPv6 VIPs. Please delete those before "
 "setting the interface to 'none' configuration."
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:633 src/usr/local/www/interfaces.php:652
-#: src/usr/local/www/interfaces.php:663 src/usr/local/www/interfaces.php:669
+#: src/usr/local/www/interfaces.php:616 src/usr/local/www/interfaces.php:635
+#: src/usr/local/www/interfaces.php:646 src/usr/local/www/interfaces.php:652
 #, php-format
 msgid "You have to reassign the interface to be able to configure as %s."
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:636
+#: src/usr/local/www/interfaces.php:619
 msgid ""
 "DHCPv6 Prefix Delegation size must be provided when Send IPv6 prefix hint "
 "flag is checked"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:643
+#: src/usr/local/www/interfaces.php:626
 msgid "You can only have one interface configured in 6rd with same prefix."
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:649
+#: src/usr/local/www/interfaces.php:632
 msgid "6RD Border Gateway must be an IPv4 address."
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:658
+#: src/usr/local/www/interfaces.php:641
 #, php-format
 msgid "You can only have one interface configured as 6to4."
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:673
+#: src/usr/local/www/interfaces.php:656
 msgid "You have to select a valid interface to track."
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:677
+#: src/usr/local/www/interfaces.php:660
 msgid "You must enter a valid hexadecimal number for the IPv6 prefix ID."
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:681
+#: src/usr/local/www/interfaces.php:664
 msgid "You specified an IPv6 prefix ID that is out of range."
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:691
+#: src/usr/local/www/interfaces.php:674
 #, php-format
 msgid "This track6 prefix ID is already being used in %s."
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:704
+#: src/usr/local/www/interfaces.php:687
 msgid "A valid IPv4 address must be specified."
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:708
+#: src/usr/local/www/interfaces.php:691
 #, php-format
 msgid "IPv4 address %s is being used by or overlaps with:"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:718
+#: src/usr/local/www/interfaces.php:701
 msgid "This IPv4 address is the network address and cannot be used"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:720
+#: src/usr/local/www/interfaces.php:703
 msgid "This IPv4 address is the broadcast address and cannot be used"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:727
+#: src/usr/local/www/interfaces.php:710
 msgid "This IPv4 address conflicts with a Static Route."
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:736
-#: src/usr/local/www/services_dhcpv6_edit.php:159
+#: src/usr/local/www/interfaces.php:719
+#: src/usr/local/www/services_dhcpv6_edit.php:160
 msgid "A valid IPv6 address must be specified."
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:739
+#: src/usr/local/www/interfaces.php:722
 msgid "IPv6 link local addresses cannot be configured as an interface IP."
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:743
+#: src/usr/local/www/interfaces.php:726
 #, php-format
 msgid "IPv6 address %s is being used by or overlaps with:"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:753
+#: src/usr/local/www/interfaces.php:736
 msgid "This IPv6 address conflicts with a Static Route."
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:761 src/usr/local/www/interfaces.php:764
+#: src/usr/local/www/interfaces.php:744 src/usr/local/www/interfaces.php:747
 msgid "A valid subnet bit count must be specified."
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:767
+#: src/usr/local/www/interfaces.php:750
 msgid "A valid alias IP address must be specified."
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:770
+#: src/usr/local/www/interfaces.php:753
 msgid "A valid alias subnet bit count must be specified."
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:773
+#: src/usr/local/www/interfaces.php:756
 msgid "A valid alias IP address must be specified to reject DHCP Leases from."
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:788
+#: src/usr/local/www/interfaces.php:771
 #: src/usr/local/www/system_routes_edit.php:127
 msgid "A valid gateway must be specified."
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:792
+#: src/usr/local/www/interfaces.php:775
 msgid "The service name contains invalid characters."
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:795 src/usr/local/www/interfaces.php:818
-#: src/usr/local/www/interfaces_ppps_edit.php:273
+#: src/usr/local/www/interfaces.php:778 src/usr/local/www/interfaces.php:801
+#: src/usr/local/www/interfaces_ppps_edit.php:268
 msgid "The idle timeout value must be an integer."
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:799
-#: src/usr/local/www/interfaces_ppps_edit.php:277
+#: src/usr/local/www/interfaces.php:782
+#: src/usr/local/www/interfaces_ppps_edit.php:272
 msgid "A valid PPPoE reset hour must be specified (0-23)."
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:803
-#: src/usr/local/www/interfaces_ppps_edit.php:281
+#: src/usr/local/www/interfaces.php:786
+#: src/usr/local/www/interfaces_ppps_edit.php:276
 msgid "A valid PPPoE reset minute must be specified (0-59)."
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:806
-#: src/usr/local/www/interfaces_ppps_edit.php:284
+#: src/usr/local/www/interfaces.php:789
+#: src/usr/local/www/interfaces_ppps_edit.php:279
 msgid "A valid PPPoE reset date must be specified (mm/dd/yyyy)."
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:809
+#: src/usr/local/www/interfaces.php:792
 msgid "A valid PPTP local IP address must be specified."
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:812
+#: src/usr/local/www/interfaces.php:795
 msgid "A valid PPTP subnet bit count must be specified."
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:815
+#: src/usr/local/www/interfaces.php:798
 msgid "A valid PPTP remote IP address must be specified."
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:821
+#: src/usr/local/www/interfaces.php:804
 #: src/usr/local/www/services_dhcp_edit.php:214
 #: src/usr/local/www/services_wol.php:112
 #: src/usr/local/www/services_wol_edit.php:114
 msgid "A valid MAC address must be specified."
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:836
+#: src/usr/local/www/interfaces.php:819
 #, php-format
 msgid "The MTU must be between %d and %d bytes."
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:848
+#: src/usr/local/www/interfaces.php:835
 msgid "The MTU of a VLAN cannot be greater than that of its parent interface."
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:866
+#: src/usr/local/www/interfaces.php:851
 #, php-format
-msgid "Interface %s (VLAN) has MTU set to a larger value"
+msgid "Interface %s (VLAN) has MTU set to a larger value."
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:873
+#: src/usr/local/www/interfaces.php:858
 msgid "The MSS must be an integer between 576 and 65535 bytes."
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:882 src/usr/local/www/interfaces.php:2931
+#: src/usr/local/www/interfaces.php:867 src/usr/local/www/interfaces.php:2933
 #: src/usr/local/www/status_interfaces.php:172
 msgid "SSID"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:885
+#: src/usr/local/www/interfaces.php:870
 msgid "A specific channel, not auto, must be selected for Access Point mode."
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:890
+#: src/usr/local/www/interfaces.php:875
 msgid "802.11n standards require enabling WME."
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:896
+#: src/usr/local/www/interfaces.php:881
 msgid "Key Rotation must be an integer between 1 and 9999."
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:899
+#: src/usr/local/www/interfaces.php:884
 msgid "Master Key Regeneration must be an integer between 1 and 9999."
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:903
+#: src/usr/local/www/interfaces.php:888
 msgid "Master Key Regeneration must be greater than Key Rotation."
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:908
+#: src/usr/local/www/interfaces.php:893
 msgid "802.1X Authentication Server must be an IP or hostname."
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:913
+#: src/usr/local/www/interfaces.php:898
 msgid "Secondary 802.1X Authentication Server must be an IP or hostname."
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:918
+#: src/usr/local/www/interfaces.php:903
 msgid ""
 "802.1X Authentication Server Port must be a valid port number (1-65535)."
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:923
+#: src/usr/local/www/interfaces.php:908
 msgid ""
 "Secondary 802.1X Authentication Server Port must be a valid port number "
 "(1-65535)."
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:928
+#: src/usr/local/www/interfaces.php:913
 msgid "Invalid channel specified."
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:931
+#: src/usr/local/www/interfaces.php:916
 msgid "Channel must be between 0-255."
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:936
+#: src/usr/local/www/interfaces.php:921
 msgid "Distance must be an integer."
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:940
+#: src/usr/local/www/interfaces.php:925
 msgid "Channel selected is not valid for 802.11a or 802.11na."
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:945
+#: src/usr/local/www/interfaces.php:930
 msgid "Channel selected is not valid for 802.11b or 802.11g."
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:949
+#: src/usr/local/www/interfaces.php:934
 msgid "Invalid option chosen for OFDM Protection Mode"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:955
+#: src/usr/local/www/interfaces.php:940
 msgid "The WPA passphrase must be between 8 and 63 characters long."
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:961
+#: src/usr/local/www/interfaces.php:946
 msgid "A WPA Passphrase must be specified when WPA PSK is enabled."
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:967
+#: src/usr/local/www/interfaces.php:952
 msgid "PPP Password and confirmed password must match!"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:971
+#: src/usr/local/www/interfaces.php:956
 msgid "PPPoE Password and confirmed password must match!"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:975
+#: src/usr/local/www/interfaces.php:960
 msgid "PTPP Password and confirmed password must match!"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:1625
+#: src/usr/local/www/interfaces.php:1614
 #, php-format
 msgid ""
 "Unable to change mode to %s.\t You may already have the maximum number of "
 "wireless clones supported in this mode."
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:1651
+#: src/usr/local/www/interfaces.php:1640
 msgid "Static IPv4"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:1651
-#: src/usr/local/www/services_dhcp_edit.php:410
-#: src/usr/local/www/status_logs.php:76
-#: src/usr/local/www/status_logs_common.inc:112
+#: src/usr/local/www/interfaces.php:1640 src/usr/local/www/status_logs.php:76
+#: src/usr/local/www/status_logs_common.inc:123
 #: src/usr/local/www/status_logs_settings.php:235
 msgid "DHCP"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:1651
-#: src/usr/local/www/interfaces_ppps_edit.php:455
+#: src/usr/local/www/interfaces.php:1640
+#: src/usr/local/www/interfaces_ppps_edit.php:466
 #: src/usr/local/www/status_logs.php:82
-#: src/usr/local/www/status_logs_common.inc:115
+#: src/usr/local/www/status_logs_common.inc:126
 #: src/usr/local/www/status_logs_settings.php:238
 msgid "PPP"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:1651
-#: src/usr/local/www/interfaces_ppps_edit.php:455
+#: src/usr/local/www/interfaces.php:1640
+#: src/usr/local/www/interfaces_ppps_edit.php:466
 msgid "PPPoE"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:1651
-#: src/usr/local/www/interfaces_ppps_edit.php:455
+#: src/usr/local/www/interfaces.php:1640
+#: src/usr/local/www/interfaces_ppps_edit.php:466
 msgid "PPTP"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:1652
+#: src/usr/local/www/interfaces.php:1641
 msgid "Static IPv6"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:1652
+#: src/usr/local/www/interfaces.php:1641
 msgid "DHCP6"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:1652
+#: src/usr/local/www/interfaces.php:1641
 msgid "SLAAC"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:1652
+#: src/usr/local/www/interfaces.php:1641
 msgid "6rd Tunnel"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:1652
+#: src/usr/local/www/interfaces.php:1641
 msgid "6to4 Tunnel"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:1652
+#: src/usr/local/www/interfaces.php:1641
 msgid "Track Interface"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:1662
+#: src/usr/local/www/interfaces.php:1651
 msgid "Default (no preference, typically autoselect)"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:1663
+#: src/usr/local/www/interfaces.php:1652
 msgid "------- Media Supported by this interface -------"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:1706
+#: src/usr/local/www/interfaces.php:1695
 #, php-format
 msgid "The %s configuration has been changed."
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:1707
-msgid ""
-"You must apply the changes in order for them to take effect. Don't forget to "
-"adjust the DHCP Server range if needed after applying."
+#: src/usr/local/www/interfaces.php:1697
+msgid "Don't forget to adjust the DHCP Server range if needed after applying."
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:1720
-msgid "General configuration"
+#: src/usr/local/www/interfaces.php:1710
+msgid "General Configuration"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:1735
+#: src/usr/local/www/interfaces.php:1725
 msgid "Enter a description (name) for the interface here."
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:1739
+#: src/usr/local/www/interfaces.php:1729
 msgid "IPv4 Configuration Type"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:1746
+#: src/usr/local/www/interfaces.php:1736
 msgid "IPv6 Configuration Type"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:1753
+#: src/usr/local/www/interfaces.php:1743
 #: src/usr/local/www/services_captiveportal_mac_edit.php:241
 #: src/usr/local/www/services_captiveportal_mac_edit.php:254
-#: src/usr/local/www/services_dhcp_edit.php:425
+#: src/usr/local/www/services_dhcp_edit.php:429
 #: src/usr/local/www/status_interfaces.php:144
 msgid "MAC Address"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:1761
+#: src/usr/local/www/interfaces.php:1751
 #: src/usr/local/www/services_captiveportal_mac_edit.php:249
-#: src/usr/local/www/services_dhcp_edit.php:433
+#: src/usr/local/www/services_dhcp_edit.php:437
 msgid "Copy My MAC"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:1766
-#: src/usr/local/www/services_dhcp_edit.php:438
+#: src/usr/local/www/interfaces.php:1756
+#: src/usr/local/www/services_dhcp_edit.php:442
 msgid "MAC controls"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:1769
+#: src/usr/local/www/interfaces.php:1759
 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:1775
-#: src/usr/local/www/interfaces_ppps_edit.php:896
+#: src/usr/local/www/interfaces.php:1765
+#: src/usr/local/www/interfaces_ppps_edit.php:915
 #: src/usr/local/www/status_interfaces.php:167
 msgid "MTU"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:1778
+#: src/usr/local/www/interfaces.php:1768
 msgid ""
 "If you leave this field 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:1783
+#: src/usr/local/www/interfaces.php:1773
 msgid "MSS"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:1786
+#: src/usr/local/www/interfaces.php:1776
 msgid ""
 "If you enter a value 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:1792
+#: src/usr/local/www/interfaces.php:1782
 msgid "Speed and Duplex"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:1795
+#: src/usr/local/www/interfaces.php:1785
 msgid ""
 "Here you can explicitly set speed and duplex mode for this interface.<br /"
 ">WARNING: You MUST leave this set to autoselect (automatically negotiate "
@@ -12582,106 +14132,113 @@ msgid ""
 "forced."
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:1801
-msgid "Static IPv4 configuration"
+#: src/usr/local/www/interfaces.php:1791
+msgid "Static IPv4 Configuration"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:1806
+#: src/usr/local/www/interfaces.php:1796
 #: src/usr/local/www/status_interfaces.php:149
 msgid "IPv4 Address"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:1810
+#: src/usr/local/www/interfaces.php:1800
 msgid "IPv4 Upstream gateway"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:1814
+#: src/usr/local/www/interfaces.php:1804
 msgid "IPv4 Upstream Gateway"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:1821 src/usr/local/www/interfaces.php:1852
+#: src/usr/local/www/interfaces.php:1811 src/usr/local/www/interfaces.php:1842
 msgid "Add a new gateway"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:1826
+#: src/usr/local/www/interfaces.php:1816
 msgid "You can manage gateways by "
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:1826
+#: src/usr/local/www/interfaces.php:1816
 msgid " clicking here"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:1824
+#: src/usr/local/www/interfaces.php:1814
 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:1832
-msgid "Static IPv6 configuration"
+#: src/usr/local/www/interfaces.php:1822
+msgid "Static IPv6 Configuration"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:1841
+#: src/usr/local/www/interfaces.php:1831
 msgid "IPv6 Upstream gateway"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:1845
+#: src/usr/local/www/interfaces.php:1835
 msgid "IPv6 Upstream Gateway"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:1855
+#: src/usr/local/www/interfaces.php:1845
 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:1862
-msgid "New IPv6 gateway"
+#: src/usr/local/www/interfaces.php:1852
+msgid "New IPv6 Gateway"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:1873 src/usr/local/www/interfaces.php:3173
-#: src/usr/local/www/system_gateways_edit.php:700
+#: src/usr/local/www/interfaces.php:1863 src/usr/local/www/interfaces.php:3175
+#: src/usr/local/www/system_gateways_edit.php:641
 msgid "Gateway name"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:1880
+#: src/usr/local/www/interfaces.php:1870
 #: src/usr/local/www/status_interfaces.php:155
 msgid "Gateway IPv6"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:1913
-msgid "DHCP client configuration"
+#: src/usr/local/www/interfaces.php:1903
+msgid "DHCP Client Configuration"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:1916
-#: src/usr/local/www/status_rrd_graph.php:551
+#: src/usr/local/www/interfaces.php:1906 src/usr/local/www/interfaces.php:2089
 msgid "Options"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:1939
+#: src/usr/local/www/interfaces.php:1913
+msgid "Use advanced DHCP configuration options."
+msgstr ""
+
+#: src/usr/local/www/interfaces.php:1920 src/usr/local/www/interfaces.php:2103
+msgid "Override the configuration from this file."
+msgstr ""
+
+#: src/usr/local/www/interfaces.php:1929
 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:1943
+#: src/usr/local/www/interfaces.php:1933
 msgid "Alias IPv4 address"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:1945
+#: src/usr/local/www/interfaces.php:1935
 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:1949
+#: src/usr/local/www/interfaces.php:1939
 msgid "Reject leases from"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:1952
+#: src/usr/local/www/interfaces.php:1942
 msgid ""
 "If there is a certain upstream DHCP server that should be ignored, place the "
 "IP address or subnet of the DHCP server to be ignored here. This is useful "
@@ -12689,96 +14246,99 @@ msgid ""
 "upstream sync."
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:1955
+#: src/usr/local/www/interfaces.php:1945
 msgid "Protocol timing"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:1963
-#: src/usr/local/www/load_balancer_setting.php:152
+#: src/usr/local/www/interfaces.php:1953
+#: src/usr/local/www/load_balancer_setting.php:151
 msgid "Timeout"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:1970
+#: src/usr/local/www/interfaces.php:1960
 #: src/usr/local/www/load_balancer_pool_edit.php:378
 msgid "Retry"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:1978
+#: src/usr/local/www/interfaces.php:1968
 msgid "Select timeout"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:1992
+#: src/usr/local/www/interfaces.php:1982
 msgid "Backoff cutoff"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:1999
+#: src/usr/local/www/interfaces.php:1989
 msgid "Initial interval"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2003
+#: src/usr/local/www/interfaces.php:1993
 msgid "Presets"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2038
+#: src/usr/local/www/interfaces.php:2028
 msgid ""
 "The values in these fields are DHCP protocol timings used when requesting a "
-"lease.<br /><a href=\"http://www.freebsd.org/cgi/man.cgi?query=dhclient."
-"conf&sektion=5#PROTOCOL_TIMING\">See here more information</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:2045 src/usr/local/www/interfaces.php:2108
-#: src/usr/local/www/interfaces.php:1928
-msgid "Config file override"
+#: src/usr/local/www/interfaces.php:2035 src/usr/local/www/interfaces.php:2144
+msgid "Configuration File Override"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2055
+#: src/usr/local/www/interfaces.php:2045
 msgid "Lease Requirements and Requests"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2060 src/usr/local/www/interfaces.php:2169
+#: src/usr/local/www/interfaces.php:2050 src/usr/local/www/interfaces.php:2169
 msgid "Send options"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2070
+#: src/usr/local/www/interfaces.php:2060
 msgid "Request options"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2078
+#: src/usr/local/www/interfaces.php:2068
 msgid "Require options"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2085
+#: src/usr/local/www/interfaces.php:2075
 msgid "Option modifiers"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2095
-msgid "DHCP6 client configuration"
+#: src/usr/local/www/interfaces.php:2086
+msgid "DHCP6 Client Configuration"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2116
+#: src/usr/local/www/interfaces.php:2096
+msgid "Use advanced DHCPv6 configuration options."
+msgstr ""
+
+#: src/usr/local/www/interfaces.php:2109
 msgid "Use IPv4 connectivity as parent interface"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2123
+#: src/usr/local/www/interfaces.php:2116
 msgid "Request only an IPv6 prefix"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2130
+#: src/usr/local/www/interfaces.php:2123
 msgid "DHCPv6 Prefix Delegation size"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2133
+#: src/usr/local/www/interfaces.php:2126
 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:2137
+#: src/usr/local/www/interfaces.php:2130
 msgid "Send IPv6 prefix hint"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2144
-msgid "Configuration File Override"
+#: src/usr/local/www/interfaces.php:2137
+msgid "Debug"
 msgstr ""
 
 #: src/usr/local/www/interfaces.php:2147
@@ -12786,19 +14346,23 @@ msgid ""
 "The value in this field is the full absolute path to a DHCP client "
 "configuration file.\t [/[dirname/[.../]]filename[.ext]]<br />Value "
 "Substitutions in Config File: {interface}, {hostname}, {mac_addr_asciiCD}, "
-"{mac_addr_hexCD}<br />Where C is U(pper) or L(ower) Case, and D is \\\" :-.\\"
-"\" Delimiter (space, colon, hyphen, or period) (omitted for none).<br />Some "
+"{mac_addr_hexCD}<br />Where C is U(pper) or L(ower) Case, and D is \" :-.\" "
+"Delimiter (space, colon, hyphen, or period) (omitted for none).<br />Some "
 "ISPs may require certain options be or not be sent."
 msgstr ""
 
 #: src/usr/local/www/interfaces.php:2156
-msgid "Advanced DHCP6 client configuration"
+msgid "Advanced DHCP6 Client Configuration"
 msgstr ""
 
 #: src/usr/local/www/interfaces.php:2161
 msgid "Information only"
 msgstr ""
 
+#: src/usr/local/www/interfaces.php:2165
+msgid "Only exchange informational configuration parameters with servers."
+msgstr ""
+
 #: src/usr/local/www/interfaces.php:2179
 msgid "Request Options"
 msgstr ""
@@ -12823,188 +14387,195 @@ msgstr ""
 msgid "Keyinfo statement"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2367
+#: src/usr/local/www/interfaces.php:2363
+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:2369
 msgid "6RD Configuration"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2372
+#: src/usr/local/www/interfaces.php:2374
 msgid "6RD Prefix"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2379
+#: src/usr/local/www/interfaces.php:2381
 msgid "6RD Border relay"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2386
+#: src/usr/local/www/interfaces.php:2388
 msgid "6RD IPv4 Prefix length"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2389
+#: src/usr/local/www/interfaces.php:2391
 msgid ""
 "6RD IPv4 prefix length. Normally specified by the ISP. A value of 0 means we "
 "embed the entire IPv4 address in the 6RD prefix."
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2394
+#: src/usr/local/www/interfaces.php:2396
 msgid "Track IPv6 Interface"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2436
+#: src/usr/local/www/interfaces.php:2438
 msgid "IPv6 Interface"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2439
+#: src/usr/local/www/interfaces.php:2441
 msgid "selects the dynamic IPv6 WAN interface to track for configuration"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2447
+#: src/usr/local/www/interfaces.php:2449
 msgid "IPv6 Prefix ID"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2450
+#: src/usr/local/www/interfaces.php:2452
 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:2463
-#: src/usr/local/www/interfaces_ppps_edit.php:554
+#: src/usr/local/www/interfaces.php:2465
+#: src/usr/local/www/interfaces_ppps_edit.php:574
 msgid "PPP Configuration"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2468 src/usr/local/www/interfaces.php:2902
-#: src/usr/local/www/interfaces_ppps_edit.php:582
+#: src/usr/local/www/interfaces.php:2470 src/usr/local/www/interfaces.php:2904
+#: src/usr/local/www/interfaces_ppps_edit.php:602
 msgid "Country"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2475
-#: src/usr/local/www/interfaces_ppps_edit.php:589
+#: src/usr/local/www/interfaces.php:2477
+#: src/usr/local/www/interfaces_ppps_edit.php:609
 msgid "Provider"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2482
-#: src/usr/local/www/interfaces_ppps_edit.php:596
+#: src/usr/local/www/interfaces.php:2484
+#: src/usr/local/www/interfaces_ppps_edit.php:616
 msgid "Plan"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2485
-#: src/usr/local/www/interfaces_ppps_edit.php:599
+#: src/usr/local/www/interfaces.php:2487
+#: src/usr/local/www/interfaces_ppps_edit.php:619
 msgid "Select to fill in data for your service provider."
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2503
-#: src/usr/local/www/interfaces_ppps_edit.php:645
+#: src/usr/local/www/interfaces.php:2505
+#: src/usr/local/www/interfaces_ppps_edit.php:665
 msgid "Phone number"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2506
-#: src/usr/local/www/interfaces_ppps_edit.php:648
+#: src/usr/local/www/interfaces.php:2508
+#: src/usr/local/www/interfaces_ppps_edit.php:668
 msgid "Typically *99# for GSM networks and #777 for CDMA networks"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2510
+#: src/usr/local/www/interfaces.php:2512
 msgid "Access Point Name"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2536
+#: src/usr/local/www/interfaces.php:2538
 msgid "Modem port"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2543
+#: src/usr/local/www/interfaces.php:2545
 msgid "Advanced PPP"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2545
+#: src/usr/local/www/interfaces.php:2547
 msgid "Create a new PPP configuration"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2550
+#: src/usr/local/www/interfaces.php:2552
 msgid "PPPoE Configuration"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2569
-#: src/usr/local/www/interfaces_ppps_edit.php:701
+#: src/usr/local/www/interfaces.php:2571
+#: src/usr/local/www/interfaces_ppps_edit.php:721
 msgid "Service name"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2572
+#: src/usr/local/www/interfaces.php:2574
 msgid "This field can usually be left empty"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2584
+#: src/usr/local/www/interfaces.php:2586
 msgid "Idle timeout"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2588 src/usr/local/www/interfaces.php:2725
+#: src/usr/local/www/interfaces.php:2590 src/usr/local/www/interfaces.php:2727
 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:2595
-#: src/usr/local/www/interfaces_ppps_edit.php:730
+#: 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:2593
+#: src/usr/local/www/interfaces.php:2595
 msgid "Periodic reset"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2596
-#: src/usr/local/www/interfaces_ppps_edit.php:732
+#: src/usr/local/www/interfaces.php:2598
+#: src/usr/local/www/interfaces_ppps_edit.php:752
 msgid "Select a reset timing type"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2598
+#: src/usr/local/www/interfaces.php:2600
 msgid "Custom reset"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2607
+#: src/usr/local/www/interfaces.php:2609
 msgid "Hour (0-23)"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2615
+#: src/usr/local/www/interfaces.php:2617
 msgid "Minutes (0-59)"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2623
+#: src/usr/local/www/interfaces.php:2625
 msgid "Specific date (mm/dd/yyyy)"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2625
+#: src/usr/local/www/interfaces.php:2627
 msgid ""
 "If you leave the date field empty, the reset will be executed each day at "
 "the time you specified using the minutes and hour field"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2629
+#: src/usr/local/www/interfaces.php:2631
 msgid "cron based reset"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2668 src/usr/local/www/interfaces.php:2673
-#: src/usr/local/www/interfaces.php:2736 src/usr/local/www/interfaces.php:2741
+#: src/usr/local/www/interfaces.php:2670 src/usr/local/www/interfaces.php:2675
+#: src/usr/local/www/interfaces.php:2738 src/usr/local/www/interfaces.php:2743
 msgid "Advanced and MLPPP"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2681
+#: src/usr/local/www/interfaces.php:2683
 msgid "PPTP/L2TP Configuration"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2700
-#: src/usr/local/www/interfaces_ppps_edit.php:249
-#: src/usr/local/www/interfaces_ppps_edit.php:252
+#: src/usr/local/www/interfaces.php:2702
+#: src/usr/local/www/interfaces_ppps_edit.php:238
+#: src/usr/local/www/interfaces_ppps_edit.php:241
 msgid "Local IP address"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2706
-#: src/usr/local/www/interfaces_ppps_edit.php:249
-#: src/usr/local/www/interfaces_ppps_edit.php:252
+#: src/usr/local/www/interfaces.php:2708
+#: src/usr/local/www/interfaces_ppps_edit.php:238
+#: src/usr/local/www/interfaces_ppps_edit.php:241
 msgid "Remote IP address"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2716
+#: src/usr/local/www/interfaces.php:2718
 msgid ""
 "This option causes the interface to operate in dial-on-demand mode, allowing "
 "you to have a virtual full time connection. The interface is configured, but "
@@ -13012,150 +14583,150 @@ msgid ""
 "traffic is detected."
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2721
+#: src/usr/local/www/interfaces.php:2723
 msgid "Idle timeout (seconds)"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2730
+#: src/usr/local/www/interfaces.php:2732
 msgid "There are additional Local and Remote IP addresses defined for MLPPP."
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2751
+#: src/usr/local/www/interfaces.php:2753
 msgid ""
-"Common wireless configuration - Settings apply to all wireless networks on "
+"Common Wireless Configuration - Settings apply to all wireless networks on "
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2755
+#: src/usr/local/www/interfaces.php:2757
 msgid "Persist common settings"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2775
+#: src/usr/local/www/interfaces.php:2777
 msgid "Standard"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2785 src/usr/local/www/interfaces.php:2835
+#: src/usr/local/www/interfaces.php:2787 src/usr/local/www/interfaces.php:2837
 msgid "Off"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2785
+#: src/usr/local/www/interfaces.php:2787
 msgid "CTS to self"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2785
+#: src/usr/local/www/interfaces.php:2787
 msgid "RTS and CTS"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2783
+#: src/usr/local/www/interfaces.php:2785
 msgid "802.11g OFDM Protection Mode"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2786
+#: src/usr/local/www/interfaces.php:2788
 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:2796 src/usr/local/www/interfaces.php:2844
-#: src/usr/local/www/interfaces.php:2853
-#: src/usr/local/www/vpn_ipsec_phase1.php:675
-#: src/usr/local/www/vpn_ipsec_phase1.php:860
-#: src/usr/local/www/vpn_ipsec_phase2.php:663
+#: src/usr/local/www/interfaces.php:2798 src/usr/local/www/interfaces.php:2846
+#: src/usr/local/www/interfaces.php:2855
+#: src/usr/local/www/vpn_ipsec_phase1.php:701
+#: src/usr/local/www/vpn_ipsec_phase1.php:886
+#: src/usr/local/www/vpn_ipsec_phase2.php:664
 msgid "Auto"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2820
+#: src/usr/local/www/interfaces.php:2822
 #: src/usr/local/www/status_interfaces.php:171
 msgid "Channel"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2823
+#: src/usr/local/www/interfaces.php:2825
 msgid ""
 "Legend: wireless standards - channel # (frequency @ max TX power / TX power "
 "allowed in reg. domain)<br />Not all channels may be supported by your "
 "card.  Auto may override the wireless standard selected above."
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2828
+#: src/usr/local/www/interfaces.php:2830
 msgid "Antenna Settings"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2835
+#: src/usr/local/www/interfaces.php:2837
 msgid "On"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2836
+#: src/usr/local/www/interfaces.php:2838
 msgid "Diversity"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2844 src/usr/local/www/interfaces.php:2853
+#: src/usr/local/www/interfaces.php:2846 src/usr/local/www/interfaces.php:2855
 msgid "#1"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2844 src/usr/local/www/interfaces.php:2853
+#: src/usr/local/www/interfaces.php:2846 src/usr/local/www/interfaces.php:2855
 msgid "#2"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2845
+#: src/usr/local/www/interfaces.php:2847
 msgid "Transmit antenna"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2854
+#: src/usr/local/www/interfaces.php:2856
 msgid "Receive antenna"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2857
+#: src/usr/local/www/interfaces.php:2859
 msgid ""
 "Note: The antenna numbers do not always match up with the labels on the card."
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2866
+#: src/usr/local/www/interfaces.php:2868
 msgid "Distance setting (meters)"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2869
+#: src/usr/local/www/interfaces.php:2871
 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:2875
-msgid "Regulatory settings"
+#: src/usr/local/www/interfaces.php:2877
+msgid "Regulatory Settings"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2887
+#: src/usr/local/www/interfaces.php:2889
 msgid "Regulatory domain"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2890
+#: src/usr/local/www/interfaces.php:2892
 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:2905
+#: src/usr/local/www/interfaces.php:2907
 msgid ""
 "Any country setting other than \"Default\" will override the regulatory "
 "domain setting"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2911
+#: src/usr/local/www/interfaces.php:2913
 msgid "Indoor"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2911
+#: src/usr/local/www/interfaces.php:2913
 msgid "Outdoor"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2911
+#: src/usr/local/www/interfaces.php:2913
 msgid "Anywhere"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2909
+#: src/usr/local/www/interfaces.php:2911
 msgid "Location"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2912
+#: src/usr/local/www/interfaces.php:2914
 msgid ""
 "These settings may affect which channels are available and the maximum "
 "transmit power allowed on those channels. Using the correct settings to "
@@ -13166,180 +14737,186 @@ msgid ""
 "additional channels that are not already supported."
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2920
-msgid "Network-specific wireless configuration"
+#: src/usr/local/www/interfaces.php:2922
+msgid "Network-Specific Wireless Configuration"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2941
+#: src/usr/local/www/interfaces.php:2943
 msgid "802.11g"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2941
+#: src/usr/local/www/interfaces.php:2943
 msgid "802.11n"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2939
+#: src/usr/local/www/interfaces.php:2941
 msgid "Minimum wireless standard"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2942
+#: src/usr/local/www/interfaces.php:2944
 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:2946
+#: src/usr/local/www/interfaces.php:2948
 msgid "802.11g only"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2950
+#: src/usr/local/www/interfaces.php:2952
 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:2955
+#: src/usr/local/www/interfaces.php:2957
 msgid "Allow intra-BSS communication"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2959
+#: src/usr/local/www/interfaces.php:2961
 msgid ""
-"Disabling the internal bridging is useful when traffic is to be processed "
-"with packet filtering"
+"Provides extra security by isolating clients so they cannot directly "
+"communicate with one another"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2963
+#: src/usr/local/www/interfaces.php:2965
 msgid "Enable WME"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2971
+#: src/usr/local/www/interfaces.php:2973
 msgid "Hide SSID"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2980 src/usr/local/www/interfaces.php:3001
+#: src/usr/local/www/interfaces.php:2982 src/usr/local/www/interfaces.php:3003
 msgid "WPA"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2992 src/usr/local/www/interfaces.php:3020
+#: src/usr/local/www/interfaces.php:2994
 msgid "WPA Pre-Shared Key"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2995
+#: src/usr/local/www/interfaces.php:2997
 msgid "WPA Passphrase must be between 8 and 63 characters long"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:3001
+#: src/usr/local/www/interfaces.php:3003
 msgid "WPA2"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:3001 src/usr/local/www/interfaces.php:3008
-#: src/usr/local/www/interfaces.php:3015 src/usr/local/www/pkg_mgr.php:192
+#: src/usr/local/www/interfaces.php:3003 src/usr/local/www/interfaces.php:3010
+#: src/usr/local/www/interfaces.php:3017 src/usr/local/www/pkg_mgr.php:192
 #: src/usr/local/www/services_captiveportal_hostname_edit.php:186
 #: src/usr/local/www/services_captiveportal_ip_edit.php:229
 #: src/usr/local/www/widgets/widgets/gateways.widget.php:135
-#: src/usr/local/www/services_rfc2136_edit.php:294
+#: src/usr/local/www/services_rfc2136_edit.php:313
 msgid "Both"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2999
+#: src/usr/local/www/interfaces.php:3001
 msgid "WPA mode"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:3008
-#: src/usr/local/www/vpn_ipsec_keys.php:140
+#: src/usr/local/www/interfaces.php:3010
+#: src/usr/local/www/vpn_ipsec_keys.php:135
 #: src/usr/local/www/vpn_ipsec_keys_edit.php:101
-#: src/usr/local/www/vpn_ipsec_keys_edit.php:155
-#: src/usr/local/www/vpn_ipsec_keys_edit.php:186
-#: src/usr/local/www/vpn_ipsec_phase1.php:234
-#: src/usr/local/www/vpn_ipsec_phase1.php:769
+#: src/usr/local/www/vpn_ipsec_keys_edit.php:183
+#: src/usr/local/www/vpn_ipsec_phase1.php:246
+#: src/usr/local/www/vpn_ipsec_phase1.php:795
 msgid "Pre-Shared Key"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:3008
+#: src/usr/local/www/interfaces.php:3010
 msgid "Extensible Authentication Protocol"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:3006
+#: src/usr/local/www/interfaces.php:3008
 msgid "WPA Key Management Mode"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:3015
+#: src/usr/local/www/interfaces.php:3017
 msgid "AES (recommended)"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:3015
+#: src/usr/local/www/interfaces.php:3017
 msgid "TKIP"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:3013
+#: src/usr/local/www/interfaces.php:3015
 msgid "WPA Pairwise"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:3024
+#: src/usr/local/www/interfaces.php:3022
+msgid "Group Key Rotation"
+msgstr ""
+
+#: src/usr/local/www/interfaces.php:3026
 msgid ""
-"Specified in seconds. Allowed values are 1-9999. Must be shorter than Master "
-"Key Regeneration time"
+"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:3028
-msgid "Master Key Regeneration"
+#: src/usr/local/www/interfaces.php:3030
+msgid "Group Master Key Regeneration"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:3032
+#: src/usr/local/www/interfaces.php:3034
 msgid ""
-"Specified in seconds. Allowed values are 1-9999. Must be longer than Key "
-"Rotation time"
+"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:3036
+#: src/usr/local/www/interfaces.php:3038
 msgid "Strict Key Regeneration"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:3044
-msgid "802.1x RADIUS options"
+#: src/usr/local/www/interfaces.php:3046
+msgid "802.1x RADIUS Options"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:3048
+#: src/usr/local/www/interfaces.php:3050
 msgid "IEEE802.1X"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:3052
+#: src/usr/local/www/interfaces.php:3054
 msgid "This option requires that the \"Enable WPA box\" is checked"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:3054
+#: src/usr/local/www/interfaces.php:3056
 msgid "Primary 802.1X server"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:3060 src/usr/local/www/interfaces.php:3084
-msgid ""
-"IP address.  (Commonly a Radius server (FreeRadius, Internet Authentication "
-"Services, etc.)"
+#: src/usr/local/www/interfaces.php:3062 src/usr/local/www/interfaces.php:3086
+msgid "IP address of the RADIUS server"
+msgstr ""
+
+#: src/usr/local/www/interfaces.php:3069 src/usr/local/www/interfaces.php:3093
+msgid "Server auth port. Default is 1812"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:3067 src/usr/local/www/interfaces.php:3091
-msgid "Server port. Leave blank for the default port 1812"
+#: src/usr/local/www/interfaces.php:3073 src/usr/local/www/interfaces.php:3097
+#: src/usr/local/www/system_authservers.php:239
+#: src/usr/local/www/system_authservers.php:707
+msgid "Shared Secret"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:3071 src/usr/local/www/interfaces.php:3074
-#: src/usr/local/www/interfaces.php:3095 src/usr/local/www/interfaces.php:3098
-msgid "Shared secret"
+#: src/usr/local/www/interfaces.php:3076 src/usr/local/www/interfaces.php:3100
+msgid "RADIUS Shared secret for this firewall"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:3078
+#: src/usr/local/www/interfaces.php:3080
 msgid "Secondary 802.1X server"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:3104
+#: src/usr/local/www/interfaces.php:3106
 msgid "Authentication Roaming Preauth"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:3113
-msgid "Private networks"
+#: src/usr/local/www/interfaces.php:3115
+msgid "Private Networks"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:3121
+#: src/usr/local/www/interfaces.php:3123
 msgid ""
 "Blocks traffic from IP addresses that are reserved for private networks per "
 "RFC 1918 (10/8, 172.16/12, 192.168/16)  as well as loopback addresses "
@@ -13347,7 +14924,7 @@ msgid ""
 "network lies in such a private address space, too."
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:3131
+#: src/usr/local/www/interfaces.php:3133
 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 "
@@ -13356,17 +14933,28 @@ msgid ""
 "under System->Advanced Firewall/NAT settings"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:3162
-msgid "New gateway"
+#: src/usr/local/www/interfaces.php:3164
+msgid "New Gateway"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:3180
+#: src/usr/local/www/interfaces.php:3182
 #: src/usr/local/www/status_interfaces.php:151
 msgid "Gateway IPv4"
 msgstr ""
 
 #: src/usr/local/www/interfaces_assign.php:67
-msgid "Assign network ports"
+#: src/usr/local/www/interfaces_assign.php:522
+#: src/usr/local/www/interfaces_bridge.php:117
+#: src/usr/local/www/interfaces_gif.php:112
+#: src/usr/local/www/interfaces_gre.php:112
+#: src/usr/local/www/interfaces_groups.php:94
+#: src/usr/local/www/interfaces_groups_edit.php:210
+#: src/usr/local/www/interfaces_lagg.php:119
+#: src/usr/local/www/interfaces_ppps.php:111
+#: src/usr/local/www/interfaces_qinq.php:123
+#: src/usr/local/www/interfaces_vlan.php:116
+#: src/usr/local/www/interfaces_wireless.php:114
+msgid "Interface Assignments"
 msgstr ""
 
 #: src/usr/local/www/interfaces_assign.php:82
@@ -13374,110 +14962,98 @@ msgstr ""
 msgid "VLAN %1$s on %2$s"
 msgstr ""
 
-#: src/usr/local/www/interfaces_assign.php:249
+#: src/usr/local/www/interfaces_assign.php:253
 msgid "lan"
 msgstr ""
 
-#: src/usr/local/www/interfaces_assign.php:250
+#: src/usr/local/www/interfaces_assign.php:254
 msgid "LAN"
 msgstr ""
 
-#: src/usr/local/www/interfaces_assign.php:276
+#: src/usr/local/www/interfaces_assign.php:280
 msgid "Interface has been added."
 msgstr ""
 
-#: src/usr/local/www/interfaces_assign.php:321
+#: src/usr/local/www/interfaces_assign.php:325
 #, php-format
 msgid "Port %1$s  was assigned to %2$s interfaces:"
 msgstr ""
 
-#: src/usr/local/www/interfaces_assign.php:339
+#: src/usr/local/www/interfaces_assign.php:343
 #, php-format
 msgid ""
 "You cannot set port %1$s to interface %2$s because this interface is a "
 "member of %3$s."
 msgstr ""
 
-#: src/usr/local/www/interfaces_assign.php:350
+#: src/usr/local/www/interfaces_assign.php:354
 #, php-format
 msgid ""
 "Vlan parent interface %1$s does not exist anymore so vlan id %2$s cannot be "
 "created please fix the issue before continuing."
 msgstr ""
 
-#: src/usr/local/www/interfaces_assign.php:419
+#: src/usr/local/www/interfaces_assign.php:423
 msgid ""
 "The interface is part of a group. Please remove it from the group to continue"
 msgstr ""
 
-#: src/usr/local/www/interfaces_assign.php:421
+#: src/usr/local/www/interfaces_assign.php:425
 msgid ""
 "The interface is part of a bridge. Please remove it from the bridge to "
 "continue"
 msgstr ""
 
-#: src/usr/local/www/interfaces_assign.php:423
+#: src/usr/local/www/interfaces_assign.php:427
 msgid ""
 "The interface is part of a gre tunnel. Please delete the tunnel to continue"
 msgstr ""
 
-#: src/usr/local/www/interfaces_assign.php:425
+#: src/usr/local/www/interfaces_assign.php:429
 msgid ""
 "The interface is part of a gif tunnel. Please delete the tunnel to continue"
 msgstr ""
 
-#: src/usr/local/www/interfaces_assign.php:465
+#: src/usr/local/www/interfaces_assign.php:469
 msgid "Interface has been deleted."
 msgstr ""
 
-#: src/usr/local/www/interfaces_assign.php:491
-msgid "The system is now rebooting.  Please wait."
+#: src/usr/local/www/interfaces_assign.php:495
+msgid "The system is now rebooting. Please wait."
 msgstr ""
 
-#: src/usr/local/www/interfaces_assign.php:494
+#: src/usr/local/www/interfaces_assign.php:498
 msgid "Reboot is needed. Please apply the settings in order to reboot."
 msgstr ""
 
-#: src/usr/local/www/interfaces_assign.php:498
+#: src/usr/local/www/interfaces_assign.php:502
 msgid ""
-"Interface mismatch detected.  Please resolve the mismatch and click 'Apply "
-"changes'.  The firewall will reboot afterwards."
+"Interface mismatch detected. Please resolve the mismatch and click 'Apply "
+"Changes'. The firewall will reboot afterwards."
 msgstr ""
 
-#: src/usr/local/www/interfaces_assign.php:505
+#: src/usr/local/www/interfaces_assign.php:509
 msgid "The interface configuration has been changed."
 msgstr ""
 
-#: src/usr/local/www/interfaces_assign.php:518
-#: src/usr/local/www/interfaces_bridge.php:117
-#: src/usr/local/www/interfaces_gif.php:112
-#: src/usr/local/www/interfaces_gre.php:112
-#: src/usr/local/www/interfaces_groups.php:94
-#: src/usr/local/www/interfaces_groups_edit.php:210
-#: src/usr/local/www/interfaces_lagg.php:119
-#: src/usr/local/www/interfaces_ppps.php:111
-#: src/usr/local/www/interfaces_qinq.php:123
-#: src/usr/local/www/interfaces_vlan.php:116
-#: src/usr/local/www/interfaces_wireless.php:116
-msgid "Interface assignments"
-msgstr ""
-
-#: src/usr/local/www/interfaces_assign.php:519
+#: src/usr/local/www/interfaces_assign.php:523
 #: src/usr/local/www/interfaces_bridge.php:118
 #: src/usr/local/www/interfaces_gif.php:113
 #: src/usr/local/www/interfaces_gre.php:113
+#: src/usr/local/www/interfaces_groups.php:88
 #: src/usr/local/www/interfaces_groups.php:95
 #: src/usr/local/www/interfaces_groups.php:107
+#: src/usr/local/www/interfaces_groups_edit.php:67
 #: src/usr/local/www/interfaces_groups_edit.php:211
 #: src/usr/local/www/interfaces_lagg.php:120
 #: src/usr/local/www/interfaces_ppps.php:112
 #: src/usr/local/www/interfaces_qinq.php:124
 #: src/usr/local/www/interfaces_vlan.php:117
-#: src/usr/local/www/interfaces_wireless.php:117
+#: src/usr/local/www/interfaces_wireless.php:115
 msgid "Interface Groups"
 msgstr ""
 
-#: src/usr/local/www/interfaces_assign.php:521
+#: src/usr/local/www/interfaces_assign.php:525
 #: src/usr/local/www/interfaces_bridge.php:120
 #: src/usr/local/www/interfaces_gif.php:115
 #: src/usr/local/www/interfaces_gre.php:115
@@ -13486,12 +15062,14 @@ msgstr ""
 #: src/usr/local/www/interfaces_lagg.php:122
 #: src/usr/local/www/interfaces_ppps.php:114
 #: src/usr/local/www/interfaces_qinq.php:126
+#: src/usr/local/www/interfaces_vlan.php:109
 #: src/usr/local/www/interfaces_vlan.php:119
-#: src/usr/local/www/interfaces_wireless.php:119
+#: src/usr/local/www/interfaces_vlan_edit.php:205
+#: src/usr/local/www/interfaces_wireless.php:117
 msgid "VLANs"
 msgstr ""
 
-#: src/usr/local/www/interfaces_assign.php:522
+#: src/usr/local/www/interfaces_assign.php:526
 #: src/usr/local/www/interfaces_bridge.php:121
 #: src/usr/local/www/interfaces_gif.php:116
 #: src/usr/local/www/interfaces_gre.php:116
@@ -13499,13 +15077,15 @@ msgstr ""
 #: src/usr/local/www/interfaces_groups_edit.php:214
 #: src/usr/local/www/interfaces_lagg.php:123
 #: src/usr/local/www/interfaces_ppps.php:115
+#: src/usr/local/www/interfaces_qinq.php:114
 #: src/usr/local/www/interfaces_qinq.php:127
+#: src/usr/local/www/interfaces_qinq_edit.php:63
 #: src/usr/local/www/interfaces_vlan.php:120
-#: src/usr/local/www/interfaces_wireless.php:120
+#: src/usr/local/www/interfaces_wireless.php:118
 msgid "QinQs"
 msgstr ""
 
-#: src/usr/local/www/interfaces_assign.php:523
+#: src/usr/local/www/interfaces_assign.php:527
 #: src/usr/local/www/interfaces_bridge.php:122
 #: src/usr/local/www/interfaces_gif.php:117
 #: src/usr/local/www/interfaces_gre.php:117
@@ -13514,47 +15094,47 @@ msgstr ""
 #: src/usr/local/www/interfaces_lagg.php:124
 #: src/usr/local/www/interfaces_ppps.php:106
 #: src/usr/local/www/interfaces_ppps.php:116
-#: src/usr/local/www/interfaces_ppps_edit.php:451
+#: src/usr/local/www/interfaces_ppps_edit.php:462
 #: src/usr/local/www/interfaces_qinq.php:128
 #: src/usr/local/www/interfaces_vlan.php:121
-#: src/usr/local/www/interfaces_wireless.php:121
+#: src/usr/local/www/interfaces_wireless.php:119
 msgid "PPPs"
 msgstr ""
 
-#: src/usr/local/www/interfaces_assign.php:524
+#: src/usr/local/www/interfaces_assign.php:528
 #: src/usr/local/www/interfaces_bridge.php:123
 #: src/usr/local/www/interfaces_gif.php:118
 #: src/usr/local/www/interfaces_gre.php:104
 #: src/usr/local/www/interfaces_gre.php:118
 #: src/usr/local/www/interfaces_gre_edit.php:189
 #: src/usr/local/www/interfaces_groups.php:100
-#: src/usr/local/www/interfaces_groups_edit.php:216
 #: src/usr/local/www/interfaces_lagg.php:125
 #: src/usr/local/www/interfaces_ppps.php:117
 #: src/usr/local/www/interfaces_qinq.php:129
 #: src/usr/local/www/interfaces_vlan.php:122
-#: src/usr/local/www/interfaces_wireless.php:122
-msgid "GRE"
+#: src/usr/local/www/interfaces_wireless.php:120
+msgid "GREs"
 msgstr ""
 
-#: src/usr/local/www/interfaces_assign.php:525
+#: src/usr/local/www/interfaces_assign.php:529
 #: src/usr/local/www/interfaces_bridge.php:124
 #: src/usr/local/www/interfaces_gif.php:103
 #: src/usr/local/www/interfaces_gif.php:119
 #: src/usr/local/www/interfaces_gif_edit.php:195
 #: src/usr/local/www/interfaces_gre.php:119
 #: src/usr/local/www/interfaces_groups.php:101
-#: src/usr/local/www/interfaces_groups_edit.php:217
 #: src/usr/local/www/interfaces_lagg.php:126
 #: src/usr/local/www/interfaces_ppps.php:118
 #: src/usr/local/www/interfaces_qinq.php:130
 #: src/usr/local/www/interfaces_vlan.php:123
-#: src/usr/local/www/interfaces_wireless.php:123
-msgid "GIF"
+#: src/usr/local/www/interfaces_wireless.php:121
+msgid "GIFs"
 msgstr ""
 
-#: src/usr/local/www/interfaces_assign.php:526
+#: src/usr/local/www/interfaces_assign.php:530
+#: src/usr/local/www/interfaces_bridge.php:109
 #: src/usr/local/www/interfaces_bridge.php:125
+#: src/usr/local/www/interfaces_bridge_edit.php:403
 #: src/usr/local/www/interfaces_gif.php:120
 #: src/usr/local/www/interfaces_gre.php:120
 #: src/usr/local/www/interfaces_groups.php:102
@@ -13563,43 +15143,42 @@ msgstr ""
 #: src/usr/local/www/interfaces_ppps.php:119
 #: src/usr/local/www/interfaces_qinq.php:131
 #: src/usr/local/www/interfaces_vlan.php:124
-#: src/usr/local/www/interfaces_wireless.php:124
+#: src/usr/local/www/interfaces_wireless.php:122
 msgid "Bridges"
 msgstr ""
 
-#: src/usr/local/www/interfaces_assign.php:527
+#: src/usr/local/www/interfaces_assign.php:531
 #: src/usr/local/www/interfaces_bridge.php:126
 #: src/usr/local/www/interfaces_gif.php:121
 #: src/usr/local/www/interfaces_gre.php:121
 #: src/usr/local/www/interfaces_groups.php:103
-#: src/usr/local/www/interfaces_groups_edit.php:219
 #: src/usr/local/www/interfaces_lagg.php:110
 #: src/usr/local/www/interfaces_lagg.php:128
 #: src/usr/local/www/interfaces_lagg_edit.php:241
 #: src/usr/local/www/interfaces_ppps.php:120
 #: src/usr/local/www/interfaces_qinq.php:132
 #: src/usr/local/www/interfaces_vlan.php:125
-#: src/usr/local/www/interfaces_wireless.php:125
-msgid "LAGG"
+#: src/usr/local/www/interfaces_wireless.php:123
+msgid "LAGGs"
 msgstr ""
 
-#: src/usr/local/www/interfaces_assign.php:536
+#: src/usr/local/www/interfaces_assign.php:540
 msgid "Network port"
 msgstr ""
 
-#: src/usr/local/www/interfaces_assign.php:562
+#: src/usr/local/www/interfaces_assign.php:566
 msgid "Delete interface"
 msgstr ""
 
-#: src/usr/local/www/interfaces_assign.php:574
+#: src/usr/local/www/interfaces_assign.php:578
 msgid "Available network ports:"
 msgstr ""
 
-#: src/usr/local/www/interfaces_assign.php:586
+#: src/usr/local/www/interfaces_assign.php:590
 msgid "Add selected interface"
 msgstr ""
 
-#: src/usr/local/www/interfaces_assign.php:600
+#: src/usr/local/www/interfaces_assign.php:606
 msgid ""
 "Interfaces that are configured as members of a lagg(4) interface will not be "
 "shown."
@@ -13625,11 +15204,6 @@ msgstr ""
 msgid "This bridge cannot be deleted because it is assigned as an interface."
 msgstr ""
 
-#: src/usr/local/www/interfaces_bridge.php:109
-#: src/usr/local/www/interfaces_bridge_edit.php:360
-msgid "Bridge"
-msgstr ""
-
 #: src/usr/local/www/interfaces_bridge.php:130
 msgid "Bridge Interfaces"
 msgstr ""
@@ -13638,7 +15212,7 @@ msgstr ""
 #: src/usr/local/www/interfaces_groups.php:114
 #: src/usr/local/www/interfaces_lagg.php:139
 #: src/usr/local/www/load_balancer_pool_edit.php:427
-#: src/usr/local/www/system_groupmanager.php:424
+#: src/usr/local/www/system_groupmanager.php:441
 msgid "Members"
 msgstr ""
 
@@ -13650,77 +15224,75 @@ msgstr ""
 msgid "Delete interface bridge"
 msgstr ""
 
-#: src/usr/local/www/interfaces_bridge_edit.php:156
-#: src/usr/local/www/interfaces_bridge_edit.php:376
+#: src/usr/local/www/interfaces_bridge_edit.php:166
+#: src/usr/local/www/interfaces_bridge_edit.php:419
 msgid "Member Interfaces"
 msgstr ""
 
-#: src/usr/local/www/interfaces_bridge_edit.php:161
+#: src/usr/local/www/interfaces_bridge_edit.php:171
 msgid "Maxage needs to be an integer between 6 and 40."
 msgstr ""
 
-#: src/usr/local/www/interfaces_bridge_edit.php:164
+#: src/usr/local/www/interfaces_bridge_edit.php:174
 msgid "Maxaddr needs to be an integer."
 msgstr ""
 
-#: src/usr/local/www/interfaces_bridge_edit.php:167
+#: src/usr/local/www/interfaces_bridge_edit.php:177
 msgid "Timeout needs to be an integer."
 msgstr ""
 
-#: src/usr/local/www/interfaces_bridge_edit.php:170
+#: src/usr/local/www/interfaces_bridge_edit.php:180
 msgid "Forward Delay needs to be an integer between 4 and 30."
 msgstr ""
 
-#: src/usr/local/www/interfaces_bridge_edit.php:173
+#: src/usr/local/www/interfaces_bridge_edit.php:183
 msgid "Hello time for STP needs to be an integer between 1 and 2."
 msgstr ""
 
-#: src/usr/local/www/interfaces_bridge_edit.php:176
+#: src/usr/local/www/interfaces_bridge_edit.php:186
 msgid "Priority for STP needs to be an integer between 0 and 61440."
 msgstr ""
 
-#: src/usr/local/www/interfaces_bridge_edit.php:179
+#: src/usr/local/www/interfaces_bridge_edit.php:189
 msgid "Transmit Hold Count for STP needs to be an integer between 1 and 10."
 msgstr ""
 
-#: src/usr/local/www/interfaces_bridge_edit.php:183
+#: src/usr/local/www/interfaces_bridge_edit.php:193
 #, php-format
 msgid "%s interface priority for STP needs to be an integer between 0 and 240."
 msgstr ""
 
-#: src/usr/local/www/interfaces_bridge_edit.php:191
+#: src/usr/local/www/interfaces_bridge_edit.php:201
 #, php-format
 msgid ""
 "%s interface path cost for STP needs to be an integer between 1 and "
 "200000000."
 msgstr ""
 
-#: src/usr/local/www/interfaces_bridge_edit.php:197
+#: src/usr/local/www/interfaces_bridge_edit.php:207
 msgid "You must select at least one member interface for a bridge."
 msgstr ""
 
-#: src/usr/local/www/interfaces_bridge_edit.php:203
+#: src/usr/local/www/interfaces_bridge_edit.php:272
 msgid "A member interface passed does not exist in configuration"
 msgstr ""
 
-#: src/usr/local/www/interfaces_bridge_edit.php:207
-msgid "Bridging a wireless interface is only possible in hostap mode."
+#: src/usr/local/www/interfaces_bridge_edit.php:275
+msgid "A bridge interface cannot be a member of a bridge."
 msgstr ""
 
-#: src/usr/local/www/interfaces_bridge_edit.php:210
-msgid ""
-"Span interface cannot be part of the bridge. Remove the span interface from "
-"bridge members to continue."
+#: src/usr/local/www/interfaces_bridge_edit.php:279
+msgid "Bridging a wireless interface is only possible in hostap mode."
 msgstr ""
 
-#: src/usr/local/www/interfaces_bridge_edit.php:219
+#: src/usr/local/www/interfaces_bridge_edit.php:291
 #, php-format
 msgid ""
 "%s is part of another bridge. Remove the interface from bridge members to "
 "continue."
 msgstr ""
 
-#: src/usr/local/www/interfaces_bridge_edit.php:294
+#: src/usr/local/www/interfaces_bridge_edit.php:363
 #: src/usr/local/www/interfaces_gif_edit.php:163
 #: src/usr/local/www/interfaces_gre_edit.php:157
 #: src/usr/local/www/interfaces_lagg_edit.php:200
@@ -13728,46 +15300,47 @@ msgstr ""
 msgid "Error occurred creating interface, please retry."
 msgstr ""
 
-#: src/usr/local/www/interfaces_bridge_edit.php:370
+#: src/usr/local/www/interfaces_bridge_edit.php:413
 msgid "Bridge Configuration"
 msgstr ""
 
-#: src/usr/local/www/interfaces_bridge_edit.php:380
+#: src/usr/local/www/interfaces_bridge_edit.php:423
 msgid "Interfaces participating in the bridge"
 msgstr ""
 
-#: src/usr/local/www/interfaces_bridge_edit.php:398
-#: src/usr/local/www/interfaces_ppps_edit.php:814
-#: src/usr/local/www/vpn_ipsec_phase2.php:708
-#: src/usr/local/www/vpn_openvpn_client.php:767
-#: src/usr/local/www/vpn_openvpn_server.php:1149
+#: src/usr/local/www/interfaces_bridge_edit.php:443
+#: src/usr/local/www/interfaces_ppps_edit.php:834
+#: src/usr/local/www/vpn_ipsec_phase2.php:710
+#: src/usr/local/www/vpn_openvpn_client.php:772
+#: src/usr/local/www/vpn_openvpn_server.php:1154
+#: src/usr/local/www/interfaces.php:1911 src/usr/local/www/interfaces.php:2094
 msgid "Advanced Configuration"
 msgstr ""
 
-#: src/usr/local/www/interfaces_bridge_edit.php:409
+#: src/usr/local/www/interfaces_bridge_edit.php:454
 msgid "Cache Size"
 msgstr ""
 
-#: src/usr/local/www/interfaces_bridge_edit.php:412
-msgid "Set the size of the bridge address cache. The default is 100 entries"
+#: src/usr/local/www/interfaces_bridge_edit.php:457
+msgid "Set the size of the bridge address cache. The default is 2000 entries"
 msgstr ""
 
-#: src/usr/local/www/interfaces_bridge_edit.php:416
+#: src/usr/local/www/interfaces_bridge_edit.php:461
 msgid "Cache expire time"
 msgstr ""
 
-#: src/usr/local/www/interfaces_bridge_edit.php:419
+#: src/usr/local/www/interfaces_bridge_edit.php:464
 msgid ""
 "Set the timeout of address cache entries to this number of seconds. If "
 "seconds is zero, then address cache entries will not be expired. The default "
-"is 240 seconds"
+"is 1200 seconds"
 msgstr ""
 
-#: src/usr/local/www/interfaces_bridge_edit.php:423
+#: src/usr/local/www/interfaces_bridge_edit.php:470
 msgid "Span Port"
 msgstr ""
 
-#: src/usr/local/www/interfaces_bridge_edit.php:426
+#: src/usr/local/www/interfaces_bridge_edit.php:474
 #, php-format
 msgid ""
 "Add the interface named by interface as a span port on the bridge. Span "
@@ -13777,22 +15350,22 @@ msgid ""
 "part of the bridge member interfaces.%s"
 msgstr ""
 
-#: src/usr/local/www/interfaces_bridge_edit.php:434
+#: src/usr/local/www/interfaces_bridge_edit.php:482
 msgid "Edge Ports"
 msgstr ""
 
-#: src/usr/local/www/interfaces_bridge_edit.php:438
+#: src/usr/local/www/interfaces_bridge_edit.php:486
 msgid ""
 "Set interface as an edge port. An edge port connects directly to end "
 "stations and cannot create bridging loops in the network; this allows it to "
 "transition straight to forwarding."
 msgstr ""
 
-#: src/usr/local/www/interfaces_bridge_edit.php:444
+#: src/usr/local/www/interfaces_bridge_edit.php:492
 msgid "Auto Edge Ports"
 msgstr ""
 
-#: src/usr/local/www/interfaces_bridge_edit.php:448
+#: src/usr/local/www/interfaces_bridge_edit.php:496
 #, php-format
 msgid ""
 "Allow interface to automatically detect edge status. This is the default for "
@@ -13800,22 +15373,22 @@ msgid ""
 "interfaces. %s"
 msgstr ""
 
-#: src/usr/local/www/interfaces_bridge_edit.php:455
+#: src/usr/local/www/interfaces_bridge_edit.php:503
 msgid "PTP Ports"
 msgstr ""
 
-#: src/usr/local/www/interfaces_bridge_edit.php:459
+#: src/usr/local/www/interfaces_bridge_edit.php:507
 msgid ""
 "Set the interface as a point-to-point link. This is required for straight "
 "transitions to forwarding and should be enabled on a direct link to another "
 "RSTP-capable switch."
 msgstr ""
 
-#: src/usr/local/www/interfaces_bridge_edit.php:465
+#: src/usr/local/www/interfaces_bridge_edit.php:513
 msgid "Auto PTP Ports"
 msgstr ""
 
-#: src/usr/local/www/interfaces_bridge_edit.php:469
+#: src/usr/local/www/interfaces_bridge_edit.php:517
 #, php-format
 msgid ""
 "Automatically detect the point-to-point status on interface by checking the "
@@ -13824,11 +15397,11 @@ msgid ""
 "status. %s"
 msgstr ""
 
-#: src/usr/local/www/interfaces_bridge_edit.php:476
+#: src/usr/local/www/interfaces_bridge_edit.php:524
 msgid "Sticky Ports"
 msgstr ""
 
-#: src/usr/local/www/interfaces_bridge_edit.php:480
+#: src/usr/local/www/interfaces_bridge_edit.php:528
 msgid ""
 "Mark an interface as a \"sticky\" interface. Dynamically learned address "
 "entries are treated as static once entered into the cache. Sticky entries "
@@ -13836,66 +15409,66 @@ msgid ""
 "a different interface."
 msgstr ""
 
-#: src/usr/local/www/interfaces_bridge_edit.php:487
+#: src/usr/local/www/interfaces_bridge_edit.php:535
 msgid "Private Ports"
 msgstr ""
 
-#: src/usr/local/www/interfaces_bridge_edit.php:491
+#: src/usr/local/www/interfaces_bridge_edit.php:539
 msgid ""
 "Mark an interface as a \"private\" interface. A private interface does not "
 "forward any traffic to any other port that is also a private interface. "
 msgstr ""
 
-#: src/usr/local/www/interfaces_bridge_edit.php:497
+#: src/usr/local/www/interfaces_bridge_edit.php:545
 msgid "Enable RSTP/STP"
 msgstr ""
 
-#: src/usr/local/www/interfaces_bridge_edit.php:504
+#: src/usr/local/www/interfaces_bridge_edit.php:552
 msgid "RSTP/STP"
 msgstr ""
 
-#: src/usr/local/www/interfaces_bridge_edit.php:517
+#: src/usr/local/www/interfaces_bridge_edit.php:565
 msgid "Protocol used for spanning tree."
 msgstr ""
 
-#: src/usr/local/www/interfaces_bridge_edit.php:523
+#: src/usr/local/www/interfaces_bridge_edit.php:571
 msgid "STP Interfaces"
 msgstr ""
 
-#: src/usr/local/www/interfaces_bridge_edit.php:527
+#: src/usr/local/www/interfaces_bridge_edit.php:575
 msgid ""
 "Enable Spanning Tree Protocol on interface. The if_bridge(4) driver has "
 "support for the IEEE 802.1D Spanning Tree Protocol (STP).STP is used to "
 "detect and remove loops in a network topology."
 msgstr ""
 
-#: src/usr/local/www/interfaces_bridge_edit.php:532
+#: src/usr/local/www/interfaces_bridge_edit.php:580
 msgid "Valid time"
 msgstr ""
 
-#: src/usr/local/www/interfaces_bridge_edit.php:536
+#: src/usr/local/www/interfaces_bridge_edit.php:584
 msgid ""
 "Set the time that a Spanning Tree Protocol configuration is valid. The "
 "default is 20 seconds. The minimum is 6 seconds and the maximum is 40 "
 "seconds."
 msgstr ""
 
-#: src/usr/local/www/interfaces_bridge_edit.php:540
+#: src/usr/local/www/interfaces_bridge_edit.php:588
 msgid "Forward time"
 msgstr ""
 
-#: src/usr/local/www/interfaces_bridge_edit.php:544
+#: src/usr/local/www/interfaces_bridge_edit.php:592
 msgid ""
 "Set the time that must pass before an interface begins forwarding packets "
 "when Spanning Tree is enabled. The default is 15 seconds. The minimum is 4 "
 "seconds and the maximum is 30 seconds. "
 msgstr ""
 
-#: src/usr/local/www/interfaces_bridge_edit.php:548
+#: src/usr/local/www/interfaces_bridge_edit.php:596
 msgid "Hello time"
 msgstr ""
 
-#: src/usr/local/www/interfaces_bridge_edit.php:552
+#: src/usr/local/www/interfaces_bridge_edit.php:600
 msgid ""
 "Set the time in seconds between broadcasting of Spanning Tree Protocol "
 "configuration messages. The hello time may only be changed when operating in "
@@ -13903,38 +15476,38 @@ msgid ""
 "maximum is 2 seconds."
 msgstr ""
 
-#: src/usr/local/www/interfaces_bridge_edit.php:561
+#: src/usr/local/www/interfaces_bridge_edit.php:609
 msgid ""
 "Set the bridge priority for Spanning Tree. The default is 32768. The minimum "
 "is 0 and the maximum is 61440. "
 msgstr ""
 
-#: src/usr/local/www/interfaces_bridge_edit.php:565
+#: src/usr/local/www/interfaces_bridge_edit.php:613
 msgid "Hold Count"
 msgstr ""
 
-#: src/usr/local/www/interfaces_bridge_edit.php:569
+#: src/usr/local/www/interfaces_bridge_edit.php:617
 msgid ""
 "Set the transmit hold count for Spanning Tree. This is the number of packets "
 "transmitted before being rate limited. The default is 6. The minimum is 1 "
 "and the maximum is 10."
 msgstr ""
 
-#: src/usr/local/www/interfaces_bridge_edit.php:574
+#: src/usr/local/www/interfaces_bridge_edit.php:622
 msgid " Priority"
 msgstr ""
 
-#: src/usr/local/www/interfaces_bridge_edit.php:578
+#: src/usr/local/www/interfaces_bridge_edit.php:626
 msgid ""
 "Set the Spanning Tree priority of interface to value. The default is 128. "
 "The minimum is 0 and the maximum is 240. Increments of 16."
 msgstr ""
 
-#: src/usr/local/www/interfaces_bridge_edit.php:585
+#: src/usr/local/www/interfaces_bridge_edit.php:633
 msgid " Path cost"
 msgstr ""
 
-#: src/usr/local/www/interfaces_bridge_edit.php:589
+#: src/usr/local/www/interfaces_bridge_edit.php:637
 msgid ""
 "Set the Spanning Tree path cost of interface to value. The default is "
 "calculated from the link speed. To change a previously selected path cost "
@@ -14035,7 +15608,7 @@ msgstr ""
 
 #: src/usr/local/www/interfaces_gif_edit.php:209
 #: src/usr/local/www/interfaces_gre_edit.php:203
-#: src/usr/local/www/interfaces_vlan_edit.php:215
+#: src/usr/local/www/interfaces_vlan_edit.php:218
 #: src/usr/local/www/interfaces_wireless_edit.php:214
 msgid "Parent Interface"
 msgstr ""
@@ -14098,11 +15671,11 @@ msgstr ""
 msgid "GRE Interfaces"
 msgstr ""
 
-#: src/usr/local/www/interfaces_gre.php:150
+#: src/usr/local/www/interfaces_gre.php:156
 msgid "Edit GRE interface"
 msgstr ""
 
-#: src/usr/local/www/interfaces_gre.php:151
+#: src/usr/local/www/interfaces_gre.php:157
 msgid "Delete GRE interface"
 msgstr ""
 
@@ -14192,28 +15765,13 @@ msgstr ""
 msgid "WCCP Version"
 msgstr ""
 
-#: src/usr/local/www/interfaces_groups.php:88
-#: src/usr/local/www/interfaces_groups_edit.php:67
-#: src/usr/local/www/system_authservers.php:392
-#: src/usr/local/www/system_groupmanager.php:70
-#: src/usr/local/www/system_groupmanager.php:273
-#: src/usr/local/www/system_groupmanager.php:281
-#: src/usr/local/www/system_groupmanager_addprivs.php:83
-#: src/usr/local/www/system_groupmanager_addprivs.php:184
-#: src/usr/local/www/system_usermanager.php:479
-#: src/usr/local/www/system_usermanager.php:498
-#: src/usr/local/www/system_usermanager_addprivs.php:172
-#: src/usr/local/www/system_usermanager_settings.php:144
-msgid "Groups"
-msgstr ""
-
 #: src/usr/local/www/interfaces_groups.php:146
-#: src/usr/local/www/system_groupmanager.php:313
+#: src/usr/local/www/system_groupmanager.php:330
 msgid "Edit group"
 msgstr ""
 
 #: src/usr/local/www/interfaces_groups.php:147
-#: src/usr/local/www/system_groupmanager.php:315
+#: src/usr/local/www/system_groupmanager.php:332
 msgid "Delete group"
 msgstr ""
 
@@ -14232,17 +15790,29 @@ msgstr ""
 msgid "Only letters A-Z are allowed as the group name."
 msgstr ""
 
+#: src/usr/local/www/interfaces_groups_edit.php:216
+msgid "GRE"
+msgstr ""
+
+#: src/usr/local/www/interfaces_groups_edit.php:217
+msgid "GIF"
+msgstr ""
+
+#: src/usr/local/www/interfaces_groups_edit.php:219
+msgid "LAGG"
+msgstr ""
+
 #: src/usr/local/www/interfaces_groups_edit.php:223
 msgid "Interface Group Configuration"
 msgstr ""
 
 #: src/usr/local/www/interfaces_groups_edit.php:227
-#: src/usr/local/www/status_gateway_groups.php:102
+#: src/usr/local/www/status_gateway_groups.php:96
 #: src/usr/local/www/system_gateway_groups.php:150
-#: src/usr/local/www/system_gateway_groups_edit.php:228
-#: src/usr/local/www/system_gateway_groups_edit.php:265
-#: src/usr/local/www/system_gateway_groups_edit.php:305
-#: src/usr/local/www/system_groupmanager.php:166
+#: src/usr/local/www/system_gateway_groups_edit.php:227
+#: src/usr/local/www/system_gateway_groups_edit.php:270
+#: src/usr/local/www/system_gateway_groups_edit.php:299
+#: src/usr/local/www/system_groupmanager.php:176
 msgid "Group Name"
 msgstr ""
 
@@ -14270,8 +15840,8 @@ msgid ""
 msgstr ""
 
 #: src/usr/local/www/interfaces_groups_edit.php:257
-#: src/usr/local/www/interfaces_vlan_edit.php:255
-#: src/usr/local/www/system_advanced_sysctl.php:267
+#: src/usr/local/www/interfaces_vlan_edit.php:258
+#: src/usr/local/www/system_advanced_sysctl.php:271
 msgid "id"
 msgstr ""
 
@@ -14423,93 +15993,99 @@ msgstr ""
 msgid "Delete PPP interface"
 msgstr ""
 
-#: src/usr/local/www/interfaces_ppps_edit.php:232
+#: src/usr/local/www/interfaces_ppps_edit.php:221
+#: src/usr/local/www/interfaces_ppps_edit.php:227
+#: src/usr/local/www/interfaces_ppps_edit.php:230
 #: src/usr/local/www/interfaces_ppps_edit.php:238
 #: src/usr/local/www/interfaces_ppps_edit.php:241
-#: src/usr/local/www/interfaces_ppps_edit.php:249
-#: src/usr/local/www/interfaces_ppps_edit.php:252
-#: src/usr/local/www/interfaces_ppps_edit.php:567
+#: src/usr/local/www/interfaces_ppps_edit.php:587
 msgid "Link Interface(s)"
 msgstr ""
 
-#: src/usr/local/www/interfaces_ppps_edit.php:249
-#: src/usr/local/www/interfaces_ppps_edit.php:252
-#: src/usr/local/www/services_dhcp.php:798
-#: src/usr/local/www/services_dhcpv6.php:536
+#: src/usr/local/www/interfaces_ppps_edit.php:238
+#: src/usr/local/www/interfaces_ppps_edit.php:241
+#: src/usr/local/www/services_dhcp.php:827
+#: src/usr/local/www/services_dhcpv6.php:615
 msgid "Subnet"
 msgstr ""
 
-#: src/usr/local/www/interfaces_ppps_edit.php:257
+#: src/usr/local/www/interfaces_ppps_edit.php:246
 msgid "Please choose a Link Type."
 msgstr ""
 
-#: src/usr/local/www/interfaces_ppps_edit.php:261
+#: src/usr/local/www/interfaces_ppps_edit.php:256
 #: src/usr/local/www/services_captiveportal_vouchers.php:282
 #: src/usr/local/www/services_dyndns_edit.php:145
 msgid "Password and confirmed password must match."
 msgstr ""
 
-#: src/usr/local/www/interfaces_ppps_edit.php:264
+#: src/usr/local/www/interfaces_ppps_edit.php:259
 msgid ""
 "Multilink connections (MLPPP) using the PPP link type is not currently "
 "supported. Please select only one Link Interface."
 msgstr ""
 
-#: src/usr/local/www/interfaces_ppps_edit.php:267
+#: src/usr/local/www/interfaces_ppps_edit.php:262
 msgid "The Service name contains invalid characters."
 msgstr ""
 
-#: src/usr/local/www/interfaces_ppps_edit.php:270
+#: src/usr/local/www/interfaces_ppps_edit.php:265
 msgid "Do not specify both a Service name and a NULL Service name."
 msgstr ""
 
-#: src/usr/local/www/interfaces_ppps_edit.php:289
+#: src/usr/local/www/interfaces_ppps_edit.php:284
 msgid ""
 "A valid PPPoE reset month must be specified (1-12) in the Custom PPPoE "
 "Periodic reset fields."
 msgstr ""
 
-#: src/usr/local/www/interfaces_ppps_edit.php:292
+#: src/usr/local/www/interfaces_ppps_edit.php:287
 msgid ""
 "A valid PPPoE reset day of month must be specified (1-31) in the Custom "
 "PPPoE Periodic reset fields. No checks are done on valid # of days per month"
 msgstr ""
 
-#: src/usr/local/www/interfaces_ppps_edit.php:295
+#: src/usr/local/www/interfaces_ppps_edit.php:290
 msgid ""
 "A valid PPPoE reset year must be specified. Don't select a year in the past!"
 msgstr ""
 
-#: src/usr/local/www/interfaces_ppps_edit.php:302
+#: src/usr/local/www/interfaces_ppps_edit.php:298
 #, php-format
 msgid "A valid local IP address must be specified for %s."
 msgstr ""
 
-#: src/usr/local/www/interfaces_ppps_edit.php:305
+#: src/usr/local/www/interfaces_ppps_edit.php:301
 #, php-format
 msgid "A valid gateway IP address OR hostname must be specified for %s."
 msgstr ""
 
-#: src/usr/local/www/interfaces_ppps_edit.php:308
+#: src/usr/local/www/interfaces_ppps_edit.php:304
 #, php-format
 msgid "The bandwidth value for %s must be an integer."
 msgstr ""
 
-#: src/usr/local/www/interfaces_ppps_edit.php:311
+#: src/usr/local/www/interfaces_ppps_edit.php:307
 #, php-format
 msgid "The MTU for %s must be greater than 576 bytes."
 msgstr ""
 
-#: src/usr/local/www/interfaces_ppps_edit.php:314
+#: src/usr/local/www/interfaces_ppps_edit.php:310
 #, php-format
 msgid "The MRU for %s must be greater than 576 bytes."
 msgstr ""
 
-#: src/usr/local/www/interfaces_ppps_edit.php:455
+#: src/usr/local/www/interfaces_ppps_edit.php:327
+#, php-format
+msgid ""
+"The MTU (%d) is too big for %s (maximum allowed with current settings: %d)."
+msgstr ""
+
+#: src/usr/local/www/interfaces_ppps_edit.php:466
 msgid "Select"
 msgstr ""
 
-#: src/usr/local/www/interfaces_ppps_edit.php:547
+#: src/usr/local/www/interfaces_ppps_edit.php:567
 msgid ""
 "Bandwidth is set only for MLPPP connections and when links have different "
 "bandwidths<br />MTU defaults to 1492<br />MRU will be auto-negotiated by "
@@ -14517,124 +16093,124 @@ msgid ""
 "default."
 msgstr ""
 
-#: src/usr/local/www/interfaces_ppps_edit.php:558
+#: src/usr/local/www/interfaces_ppps_edit.php:578
 msgid "Link Type"
 msgstr ""
 
-#: src/usr/local/www/interfaces_ppps_edit.php:571
+#: src/usr/local/www/interfaces_ppps_edit.php:591
 msgid "Select at least two interfaces for Multilink (MLPPP) connections."
 msgstr ""
 
-#: src/usr/local/www/interfaces_ppps_edit.php:578
+#: src/usr/local/www/interfaces_ppps_edit.php:598
 msgid ""
 "You may enter a description here for your reference. Description will appear "
 "in the \"Interfaces Assign\" select lists."
 msgstr ""
 
-#: src/usr/local/www/interfaces_ppps_edit.php:620
+#: src/usr/local/www/interfaces_ppps_edit.php:640
 msgid "IP/Gateway ("
 msgstr ""
 
-#: src/usr/local/www/interfaces_ppps_edit.php:633
+#: src/usr/local/www/interfaces_ppps_edit.php:653
 msgid "IP or Hostname"
 msgstr ""
 
-#: src/usr/local/www/interfaces_ppps_edit.php:653
+#: src/usr/local/www/interfaces_ppps_edit.php:673
 msgid "Access Point Name (APN)"
 msgstr ""
 
-#: src/usr/local/www/interfaces_ppps_edit.php:660
+#: src/usr/local/www/interfaces_ppps_edit.php:680
 msgid "APN number (optional)"
 msgstr ""
 
-#: src/usr/local/www/interfaces_ppps_edit.php:663
+#: src/usr/local/www/interfaces_ppps_edit.php:683
 msgid "Defaults to 1 if APN is set. Ignored if no APN is set."
 msgstr ""
 
-#: src/usr/local/www/interfaces_ppps_edit.php:667
+#: src/usr/local/www/interfaces_ppps_edit.php:687
 msgid "SIM PIN"
 msgstr ""
 
-#: src/usr/local/www/interfaces_ppps_edit.php:674
+#: src/usr/local/www/interfaces_ppps_edit.php:694
 msgid "SIM PIN wait"
 msgstr ""
 
-#: src/usr/local/www/interfaces_ppps_edit.php:677
+#: src/usr/local/www/interfaces_ppps_edit.php:697
 msgid ""
 "Time to wait for SIM to discover network after PIN is sent to SIM (seconds)."
 msgstr ""
 
-#: src/usr/local/www/interfaces_ppps_edit.php:681
+#: src/usr/local/www/interfaces_ppps_edit.php:701
 msgid "Init string"
 msgstr ""
 
-#: src/usr/local/www/interfaces_ppps_edit.php:684
+#: src/usr/local/www/interfaces_ppps_edit.php:704
 msgid ""
 "Enter the modem initialization string here. Do NOT include the \"AT\" string "
 "at the beginning of the command. Many modern USB 3G modems don't need an "
 "initialization string."
 msgstr ""
 
-#: src/usr/local/www/interfaces_ppps_edit.php:689
+#: src/usr/local/www/interfaces_ppps_edit.php:709
 msgid "Connection Timeout"
 msgstr ""
 
-#: src/usr/local/www/interfaces_ppps_edit.php:692
+#: src/usr/local/www/interfaces_ppps_edit.php:712
 msgid ""
 "Enter timeout in seconds for connection to be established (sec.) Default is "
 "45 sec."
 msgstr ""
 
-#: src/usr/local/www/interfaces_ppps_edit.php:696
+#: src/usr/local/www/interfaces_ppps_edit.php:716
 msgid "Uptime logging"
 msgstr ""
 
-#: src/usr/local/www/interfaces_ppps_edit.php:718
+#: src/usr/local/www/interfaces_ppps_edit.php:738
 msgid ""
 "This field can usually be left empty. Service name will not be configured if "
 "this field is empty. Check the \"Configure NULL\" box to configure a blank "
 "Service name."
 msgstr ""
 
-#: src/usr/local/www/interfaces_ppps_edit.php:725
+#: src/usr/local/www/interfaces_ppps_edit.php:745
 msgid "Periodic Reset"
 msgstr ""
 
-#: src/usr/local/www/interfaces_ppps_edit.php:734
+#: src/usr/local/www/interfaces_ppps_edit.php:754
 msgid "Reset Date/Time"
 msgstr ""
 
-#: src/usr/local/www/interfaces_ppps_edit.php:742
+#: src/usr/local/www/interfaces_ppps_edit.php:762
 msgid "Hour"
 msgstr ""
 
-#: src/usr/local/www/interfaces_ppps_edit.php:749
+#: src/usr/local/www/interfaces_ppps_edit.php:769
 msgid "Minute"
 msgstr ""
 
-#: src/usr/local/www/interfaces_ppps_edit.php:757
+#: src/usr/local/www/interfaces_ppps_edit.php:777
 msgid "Specific date"
 msgstr ""
 
-#: src/usr/local/www/interfaces_ppps_edit.php:759
+#: src/usr/local/www/interfaces_ppps_edit.php:779
 msgid ""
 "Leaving the date field empty will cause the reset to be executed each day at "
 "the time you specified in the minutes and hour fields. "
 msgstr ""
 
-#: src/usr/local/www/interfaces_ppps_edit.php:763
+#: src/usr/local/www/interfaces_ppps_edit.php:783
 msgid "Reset frequency"
 msgstr ""
 
-#: src/usr/local/www/interfaces_ppps_edit.php:802
+#: src/usr/local/www/interfaces_ppps_edit.php:822
 msgid "Show"
 msgstr ""
 
-#: src/usr/local/www/interfaces_ppps_edit.php:819
+#: src/usr/local/www/interfaces_ppps_edit.php:839
 msgid "Dial On Demand"
 msgstr ""
 
-#: src/usr/local/www/interfaces_ppps_edit.php:822
+#: src/usr/local/www/interfaces_ppps_edit.php:842
 msgid ""
 "Causes the interface to operate in dial-on-demand mode. Do NOT enable if you "
 "want your link to be always up. The interface is configured, but the actual "
@@ -14642,11 +16218,11 @@ msgid ""
 "detected."
 msgstr ""
 
-#: src/usr/local/www/interfaces_ppps_edit.php:827
+#: src/usr/local/www/interfaces_ppps_edit.php:847
 msgid "Idle Timeout"
 msgstr ""
 
-#: src/usr/local/www/interfaces_ppps_edit.php:830
+#: src/usr/local/www/interfaces_ppps_edit.php:850
 msgid ""
 "If no incoming or outgoing packets are transmitted for the entered number of "
 "seconds the connection is brought down.When the idle timeout occurs, if the "
@@ -14654,13 +16230,13 @@ msgid ""
 "Otherwise, the interface is brought down and all associated routes removed."
 msgstr ""
 
-#: src/usr/local/www/interfaces_ppps_edit.php:836
-#: src/usr/local/www/vpn_openvpn_client.php:725
-#: src/usr/local/www/vpn_openvpn_server.php:947
+#: src/usr/local/www/interfaces_ppps_edit.php:856
+#: src/usr/local/www/vpn_openvpn_client.php:730
+#: src/usr/local/www/vpn_openvpn_server.php:952
 msgid "Compression"
 msgstr ""
 
-#: src/usr/local/www/interfaces_ppps_edit.php:839
+#: src/usr/local/www/interfaces_ppps_edit.php:859
 msgid ""
 "Disable vjcomp(compression) (auto-negotiated by default).<br />This option "
 "enables Van Jacobson TCP header compression, which saves several bytes per "
@@ -14669,11 +16245,11 @@ msgid ""
 "stamping or SACK, which modify TCP options between sequential packets."
 msgstr ""
 
-#: src/usr/local/www/interfaces_ppps_edit.php:846
+#: src/usr/local/www/interfaces_ppps_edit.php:866
 msgid "TCPmssFix"
 msgstr ""
 
-#: src/usr/local/www/interfaces_ppps_edit.php:849
+#: src/usr/local/www/interfaces_ppps_edit.php:869
 msgid ""
 "Causes mpd to adjust incoming and outgoing TCP SYN segments so that the "
 "requested maximum segment size is not greater than the amount allowed by the "
@@ -14688,11 +16264,11 @@ msgid ""
 "outgoing data."
 msgstr ""
 
-#: src/usr/local/www/interfaces_ppps_edit.php:857
+#: src/usr/local/www/interfaces_ppps_edit.php:877
 msgid "ShortSeq"
 msgstr ""
 
-#: src/usr/local/www/interfaces_ppps_edit.php:860
+#: src/usr/local/www/interfaces_ppps_edit.php:880
 msgid ""
 "This option is only meaningful if multi-link PPP is negotiated. It "
 "proscribes shorter multi-link fragment headers, saving two bytes on every "
@@ -14700,35 +16276,35 @@ msgid ""
 "multi-link."
 msgstr ""
 
-#: src/usr/local/www/interfaces_ppps_edit.php:865
+#: src/usr/local/www/interfaces_ppps_edit.php:885
 msgid "ACFComp"
 msgstr ""
 
-#: src/usr/local/www/interfaces_ppps_edit.php:868
+#: src/usr/local/www/interfaces_ppps_edit.php:888
 msgid ""
 "Address and control field compression. This option only applies to "
 "asynchronous link types. It saves two bytes per frame."
 msgstr ""
 
-#: src/usr/local/www/interfaces_ppps_edit.php:872
+#: src/usr/local/www/interfaces_ppps_edit.php:892
 msgid "ProtoComp"
 msgstr ""
 
-#: src/usr/local/www/interfaces_ppps_edit.php:875
+#: src/usr/local/www/interfaces_ppps_edit.php:895
 msgid ""
 "Protocol field compression. This option saves one byte per frame for most "
 "frames."
 msgstr ""
 
-#: src/usr/local/www/interfaces_ppps_edit.php:882
+#: src/usr/local/www/interfaces_ppps_edit.php:901
 msgid "Link Parameters ("
 msgstr ""
 
-#: src/usr/local/www/interfaces_ppps_edit.php:903
+#: src/usr/local/www/interfaces_ppps_edit.php:922
 msgid "MRU"
 msgstr ""
 
-#: src/usr/local/www/interfaces_ppps_edit.php:910
+#: src/usr/local/www/interfaces_ppps_edit.php:929
 msgid "MRRU"
 msgstr ""
 
@@ -14741,11 +16317,6 @@ msgstr ""
 msgid "QinQ interface does not exist"
 msgstr ""
 
-#: src/usr/local/www/interfaces_qinq.php:114
-#: src/usr/local/www/interfaces_qinq_edit.php:63
-msgid "QinQ"
-msgstr ""
-
 #: src/usr/local/www/interfaces_qinq.php:137
 msgid "QinQ Interfaces"
 msgstr ""
@@ -14844,11 +16415,6 @@ msgid ""
 "This VLAN cannot be deleted because it is still being used as an interface."
 msgstr ""
 
-#: src/usr/local/www/interfaces_vlan.php:109
-#: src/usr/local/www/interfaces_vlan_edit.php:202
-msgid "VLAN"
-msgstr ""
-
 #: src/usr/local/www/interfaces_vlan.php:134
 msgid "VLAN Interfaces"
 msgstr ""
@@ -14858,21 +16424,21 @@ msgstr ""
 msgid "VLAN tag"
 msgstr ""
 
-#: src/usr/local/www/interfaces_vlan.php:158
+#: src/usr/local/www/interfaces_vlan.php:165
 msgid "Edit VLAN"
 msgstr ""
 
-#: src/usr/local/www/interfaces_vlan.php:160
+#: src/usr/local/www/interfaces_vlan.php:167
 msgid "Delete VLAN"
 msgstr ""
 
-#: src/usr/local/www/interfaces_vlan.php:183
+#: src/usr/local/www/interfaces_vlan.php:190
 #, php-format
 msgid ""
-"NOTE: Not all drivers/NICs support 802.1Q VLAN tagging properly. <br />On "
-"cards that do not explicitly support it, VLAN tagging will still work, but "
-"the reduced MTU may cause problems.<br />See the %s handbook for information "
-"on supported cards."
+"Not all drivers/NICs support 802.1Q VLAN tagging properly. <br />On cards "
+"that do not explicitly support it, VLAN tagging will still work, but the "
+"reduced MTU may cause problems.<br />See the %s handbook for information on "
+"supported cards."
 msgstr ""
 
 #: src/usr/local/www/interfaces_vlan_edit.php:110
@@ -14904,35 +16470,35 @@ msgid ""
 "a normal VLAN."
 msgstr ""
 
-#: src/usr/local/www/interfaces_vlan_edit.php:211
+#: src/usr/local/www/interfaces_vlan_edit.php:214
 msgid "VLAN Configuration"
 msgstr ""
 
-#: src/usr/local/www/interfaces_vlan_edit.php:218
+#: src/usr/local/www/interfaces_vlan_edit.php:221
 msgid "Only VLAN capable interfaces will be shown."
 msgstr ""
 
-#: src/usr/local/www/interfaces_vlan_edit.php:222
+#: src/usr/local/www/interfaces_vlan_edit.php:225
 msgid "VLAN Tag"
 msgstr ""
 
-#: src/usr/local/www/interfaces_vlan_edit.php:226
+#: src/usr/local/www/interfaces_vlan_edit.php:229
 msgid "802.1Q VLAN tag (between 1 and 4094)."
 msgstr ""
 
-#: src/usr/local/www/interfaces_vlan_edit.php:230
+#: src/usr/local/www/interfaces_vlan_edit.php:233
 msgid "VLAN Priority"
 msgstr ""
 
-#: src/usr/local/www/interfaces_vlan_edit.php:234
+#: src/usr/local/www/interfaces_vlan_edit.php:237
 msgid "802.1Q VLAN Priority (between 0 and 7)."
 msgstr ""
 
-#: src/usr/local/www/interfaces_vlan_edit.php:242
+#: src/usr/local/www/interfaces_vlan_edit.php:245
 msgid "You may enter a group description here for your reference (not parsed)."
 msgstr ""
 
-#: src/usr/local/www/interfaces_vlan_edit.php:247
+#: src/usr/local/www/interfaces_vlan_edit.php:250
 msgid "vlanif"
 msgstr ""
 
@@ -14941,15 +16507,15 @@ msgid ""
 "This wireless clone cannot be deleted because it is assigned as an interface."
 msgstr ""
 
-#: src/usr/local/www/interfaces_wireless.php:129
+#: src/usr/local/www/interfaces_wireless.php:127
 msgid "Wireless Interfaces"
 msgstr ""
 
-#: src/usr/local/www/interfaces_wireless.php:159
+#: src/usr/local/www/interfaces_wireless.php:157
 msgid "Edit WiFi interface"
 msgstr ""
 
-#: src/usr/local/www/interfaces_wireless.php:160
+#: src/usr/local/www/interfaces_wireless.php:158
 msgid "Delete WiFi interface"
 msgstr ""
 
@@ -14992,241 +16558,173 @@ msgstr ""
 msgid "License"
 msgstr ""
 
-#: src/usr/local/www/license.php:70
-msgid " is Copyright"
-msgstr ""
-
-#: src/usr/local/www/license.php:71 src/usr/local/www/license.php:76
-msgid "All rights reserved"
-msgstr ""
-
-#: src/usr/local/www/license.php:74
-msgid "m0n0wall is Copyright "
-msgstr ""
-
-#: src/usr/local/www/license.php:74
-msgid "2002-2015 by Manuel Kasper"
-msgstr ""
-
-#: src/usr/local/www/license.php:79
-msgid "Redistribution and use in source and binary forms, with or without"
+#: src/usr/local/www/license.php:69
+#, php-format
+msgid "%s is Copyright &copy; %s %s. All rights reserved."
 msgstr ""
 
-#: src/usr/local/www/license.php:80
+#: src/usr/local/www/license.php:70
 msgid ""
-"modification, are permitted provided that the following conditions are met"
+"m0n0wall is Copyright &copy; 2002-2015 by Manuel Kasper (mk@neon1.net). All "
+"rights reserved."
 msgstr ""
 
-#: src/usr/local/www/license.php:83
+#: src/usr/local/www/license.php:71
 msgid ""
-"1. Redistributions of source code must retain the above copyright notice,"
-msgstr ""
-
-#: src/usr/local/www/license.php:85
-msgid "this list of conditions and the following disclaimer"
-msgstr ""
-
-#: src/usr/local/www/license.php:87
-msgid "2. Redistributions in binary form must reproduce the above copyright"
-msgstr ""
-
-#: src/usr/local/www/license.php:88
-msgid "notice, this list of conditions and the following disclaimer in the"
-msgstr ""
-
-#: src/usr/local/www/license.php:90
-msgid "documentation and/or other materials provided with the distribution."
-msgstr ""
-
-#: src/usr/local/www/license.php:92
-msgid "THIS SOFTWARE IS PROVIDED "
+"Redistribution and use in source and binary forms, with or without "
+"modification, are permitted provided that the following conditions are met:"
 msgstr ""
 
-#: src/usr/local/www/license.php:92
-msgid "AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,"
-msgstr ""
-
-#: src/usr/local/www/license.php:94
+#: src/usr/local/www/license.php:73
 msgid ""
-"INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY"
+"Redistributions of source code must retain the above copyright notice, this "
+"list of conditions and the following disclaimer."
 msgstr ""
 
-#: src/usr/local/www/license.php:95
+#: src/usr/local/www/license.php:74
 msgid ""
-"AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE"
+"Redistributions in binary form must reproduce the above copyright notice, "
+"this list of conditions and the following disclaimer in the documentation "
+"and/or other materials provided with the distribution."
 msgstr ""
 
-#: src/usr/local/www/license.php:97
+#: src/usr/local/www/license.php:75
 msgid ""
-"AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,"
+"All advertising materials mentioning features or use of this software must "
+"display the following acknowledgment:"
 msgstr ""
 
-#: src/usr/local/www/license.php:99
-msgid "OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF"
+#: src/usr/local/www/license.php:76
+#, php-format
+msgid ""
+"\"This product includes software developed by the %s Project for use in the "
+"%s&reg; software distribution."
 msgstr ""
 
-#: src/usr/local/www/license.php:101
+#: src/usr/local/www/license.php:78
+#, php-format
 msgid ""
-"SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS"
+"The names \"%s\" and \"%s Project\" must not be used to endorse or promote "
+"products derived from this software without prior written permission. For "
+"written permission, please contact"
 msgstr ""
 
-#: src/usr/local/www/license.php:103
-msgid "INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN"
+#: src/usr/local/www/license.php:79
+#, php-format
+msgid ""
+"Products derived from this software may not be called \"%s\" nor may \"%s\" "
+"appear in their names without prior written permission of the %s."
 msgstr ""
 
-#: src/usr/local/www/license.php:105
-msgid "CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)"
+#: src/usr/local/www/license.php:80
+msgid ""
+"Redistributions of any form whatsoever must retain the following "
+"acknowledgment:"
 msgstr ""
 
-#: src/usr/local/www/license.php:106
+#: src/usr/local/www/license.php:81
+#, php-format
 msgid ""
-"ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE"
+"\"This product includes software developed by the %s Project for use in the "
+"%s software distribution"
 msgstr ""
 
-#: src/usr/local/www/license.php:108
-msgid "POSSIBILITY OF SUCH DAMAGE"
+#: src/usr/local/www/license.php:84
+#, php-format
+msgid ""
+"THIS SOFTWARE IS PROVIDED BY THE %s PROJECT ``AS IS'' AND ANY EXPRESSED OR "
+"IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF "
+"MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO "
+"EVENT SHALL THE %s PROJECT OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, "
+"INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES "
+"(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; "
+"LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND "
+"ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT "
+"(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF "
+"THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 msgstr ""
 
-#: src/usr/local/www/license.php:112
-msgid "is based upon/includes various free software packages, listed below."
+#: src/usr/local/www/license.php:92
+msgid "Third Party Credits"
 msgstr ""
 
-#: src/usr/local/www/license.php:114
+#: src/usr/local/www/license.php:95
 #, php-format
 msgid ""
-"The authors of %s would like to thank the authors of these software packages "
-"for their efforts"
-msgstr ""
-
-#: src/usr/local/www/license.php:119 src/usr/local/www/license.php:122
-#: src/usr/local/www/license.php:125 src/usr/local/www/license.php:129
-#: src/usr/local/www/license.php:130 src/usr/local/www/license.php:135
-#: src/usr/local/www/license.php:139 src/usr/local/www/license.php:142
-#: src/usr/local/www/license.php:145 src/usr/local/www/license.php:148
-#: src/usr/local/www/license.php:152 src/usr/local/www/license.php:153
-#: src/usr/local/www/license.php:155 src/usr/local/www/license.php:161
-#: src/usr/local/www/license.php:162 src/usr/local/www/license.php:169
+"%s is based upon/includes various free software packages, listed below. The "
+"authors of %s would like to thank the authors of these software packages for "
+"their efforts."
+msgstr ""
+
+#: src/usr/local/www/license.php:100 src/usr/local/www/license.php:104
+#: src/usr/local/www/license.php:111 src/usr/local/www/license.php:115
+#: src/usr/local/www/license.php:123 src/usr/local/www/license.php:124
+#: src/usr/local/www/license.php:128 src/usr/local/www/license.php:132
+#: src/usr/local/www/license.php:136 src/usr/local/www/license.php:140
+#: src/usr/local/www/license.php:144 src/usr/local/www/license.php:149
+#: src/usr/local/www/license.php:153 src/usr/local/www/license.php:157
+#: src/usr/local/www/license.php:161 src/usr/local/www/license.php:162
+#: src/usr/local/www/license.php:166 src/usr/local/www/license.php:170
+#: src/usr/local/www/license.php:175 src/usr/local/www/license.php:185
+#: src/usr/local/www/license.php:189 src/usr/local/www/license.php:193
+#: src/usr/local/www/license.php:201 src/usr/local/www/license.php:202
+#: src/usr/local/www/license.php:206 src/usr/local/www/license.php:210
+#: src/usr/local/www/license.php:214 src/usr/local/www/license.php:218
+#: src/usr/local/www/license.php:222 src/usr/local/www/license.php:226
+#: src/usr/local/www/license.php:230 src/usr/local/www/license.php:238
 msgid "Copyright"
 msgstr ""
 
-#: src/usr/local/www/license.php:119
-msgid "1992-2015 The FreeBSD Project. All rights reserved"
-msgstr ""
-
-#: src/usr/local/www/license.php:121
-msgid "This product includes PHP, freely available from"
-msgstr ""
-
-#: src/usr/local/www/license.php:122
-msgid "1999-2015 The PHP Group. All rights reserved."
-msgstr ""
-
-#: src/usr/local/www/license.php:124
-msgid "nginx"
+#: src/usr/local/www/license.php:100
+msgid "1992-2016 The FreeBSD Project. All rights reserved."
 msgstr ""
 
-#: src/usr/local/www/license.php:125
-msgid "2011-2015 Nginx, Inc."
+#: src/usr/local/www/license.php:103
+msgid "This product includes"
 msgstr ""
 
-#: src/usr/local/www/license.php:126 src/usr/local/www/license.php:136
-msgid "All rights reserved."
+#: src/usr/local/www/license.php:103
+msgid "freely available from"
 msgstr ""
 
-#: src/usr/local/www/license.php:128
-msgid "ISC DHCP server "
+#: src/usr/local/www/license.php:104
+msgid "1999-2016 The PHP Group. All rights reserved."
 msgstr ""
 
-#: src/usr/local/www/license.php:129
-msgid "2004-2012 Internet Software Consortium, Inc."
+#: src/usr/local/www/license.php:161
+msgid "2004-2013 Internet Software Consortium, Inc."
 msgstr ""
 
-#: src/usr/local/www/license.php:130
+#: src/usr/local/www/license.php:162
 msgid "1995-2003 Internet Software Consortium"
 msgstr ""
 
-#: src/usr/local/www/license.php:132 src/usr/local/www/services_snmp.php:331
-msgid "PF"
-msgstr ""
-
-#: src/usr/local/www/license.php:134
-msgid "MPD - Multi-link PPP daemon for FreeBSD"
-msgstr ""
-
-#: src/usr/local/www/license.php:138
-msgid "Circular log support for FreeBSD syslogd "
-msgstr ""
-
-#: src/usr/local/www/license.php:141
-msgid "Dnsmasq - a DNS forwarder for NAT firewalls"
-msgstr ""
-
-#: src/usr/local/www/license.php:144
-msgid "IPsec-Tools"
-msgstr ""
-
-#: src/usr/local/www/license.php:145
-msgid "1995-2002 WIDE Project. All rights reserved."
-msgstr ""
-
-#: src/usr/local/www/license.php:147
-msgid "msntp"
-msgstr ""
-
-#: src/usr/local/www/license.php:148
-msgid ""
-" 1996, 1997, 2000 N.M. Maclaren, University of Cambridge. All rights "
-"reserved."
-msgstr ""
-
-#: src/usr/local/www/license.php:151
-msgid "UCD-SNMP"
-msgstr ""
-
-#: src/usr/local/www/license.php:152
-msgid "1989, 1991, 1992 by Carnegie Mellon University."
-msgstr ""
-
-#: src/usr/local/www/license.php:153
-msgid ""
-"1996, 1998-2000 The Regents of the University of California. All rights "
-"reserved"
-msgstr ""
-
-#: src/usr/local/www/license.php:155
-msgid "2001-2002, Network Associates Technology, Inc. All rights reserved."
-msgstr ""
-
-#: src/usr/local/www/license.php:157
-msgid "Portions of this code are copyright"
-msgstr ""
-
-#: src/usr/local/www/license.php:157
-msgid "2001-2002, Cambridge Broadband Ltd. All rights reserved."
-msgstr ""
-
-#: src/usr/local/www/license.php:160
-msgid "choparp"
+#: src/usr/local/www/license.php:171 src/usr/local/www/license.php:176
+msgid "All rights reserved."
 msgstr ""
 
-#: src/usr/local/www/license.php:164
-msgid "php-radius"
+#: src/usr/local/www/license.php:175
+msgid "2011-2016 Nginx, Inc."
 msgstr ""
 
-#: src/usr/local/www/license.php:165
+#: src/usr/local/www/license.php:180
 msgid "Copyright 2000, 2001, 2002 by Edwin Groothuis. All rights reserved."
 msgstr ""
 
-#: src/usr/local/www/license.php:166
+#: src/usr/local/www/license.php:181
 msgid "This product includes software developed by Edwin Groothuis."
 msgstr ""
 
-#: src/usr/local/www/license.php:168
-msgid "wol"
+#: src/usr/local/www/license.php:185
+msgid "2005-2016 University of Applied Sciences Rapperswil"
+msgstr ""
+
+#: src/usr/local/www/license.php:197
+msgid "Copyright (C) 2002-2016 OpenVPN Solutions LLC "
 msgstr ""
 
-#: src/usr/local/www/license.php:172
-msgid "Copyright (C) 2002-2005 OpenVPN Solutions LLC "
+#: src/usr/local/www/license.php:234
+msgid "Public Domain"
 msgstr ""
 
 #: src/usr/local/www/load_balancer_monitor.php:91
@@ -15236,50 +16734,53 @@ msgid ""
 msgstr ""
 
 #: src/usr/local/www/load_balancer_monitor.php:107
-#: src/usr/local/www/load_balancer_monitor.php:135
-#: src/usr/local/www/load_balancer_monitor_edit.php:230
-#: src/usr/local/www/load_balancer_pool.php:158
-#: src/usr/local/www/load_balancer_pool_edit.php:107
-#: src/usr/local/www/load_balancer_pool_edit.php:397
-#: src/usr/local/www/load_balancer_pool_edit.php:403
-#: src/usr/local/www/status_gateways.php:100
-#: src/usr/local/www/status_lb_pool.php:170
-msgid "Monitor"
+#: src/usr/local/www/load_balancer_monitor.php:128
+#: src/usr/local/www/load_balancer_monitor_edit.php:234
+#: src/usr/local/www/load_balancer_pool.php:142
+#: src/usr/local/www/load_balancer_setting.php:141
+#: src/usr/local/www/load_balancer_virtual_server.php:142
+msgid "Monitors"
 msgstr ""
 
 #: src/usr/local/www/load_balancer_monitor.php:121
 #: src/usr/local/www/load_balancer_pool.php:135
 #: src/usr/local/www/load_balancer_setting.php:134
-#: src/usr/local/www/status_lb_pool.php:148
+#: src/usr/local/www/status_lb_pool.php:143
 msgid "The load balancer configuration has been changed."
 msgstr ""
 
 #: src/usr/local/www/load_balancer_monitor.php:126
+#: src/usr/local/www/load_balancer_pool.php:121
 #: src/usr/local/www/load_balancer_pool.php:140
-#: src/usr/local/www/load_balancer_setting.php:140
+#: src/usr/local/www/load_balancer_pool_edit.php:219
+#: src/usr/local/www/load_balancer_setting.php:139
 #: src/usr/local/www/load_balancer_virtual_server.php:140
-#: src/usr/local/www/status_lb_pool.php:97
-#: src/usr/local/www/status_lb_pool.php:153
-#: src/usr/local/www/status_lb_vs.php:89
+#: src/usr/local/www/status_lb_pool.php:92
+#: src/usr/local/www/status_lb_pool.php:148
+#: src/usr/local/www/status_lb_vs.php:84
 msgid "Pools"
 msgstr ""
 
 #: src/usr/local/www/load_balancer_monitor.php:127
 #: src/usr/local/www/load_balancer_pool.php:141
-#: src/usr/local/www/load_balancer_setting.php:141
+#: src/usr/local/www/load_balancer_setting.php:140
 #: src/usr/local/www/load_balancer_virtual_server.php:121
 #: src/usr/local/www/load_balancer_virtual_server.php:141
 #: src/usr/local/www/load_balancer_virtual_server.php:149
-#: src/usr/local/www/status_lb_pool.php:154
-#: src/usr/local/www/status_lb_vs.php:84 src/usr/local/www/status_lb_vs.php:90
+#: src/usr/local/www/load_balancer_virtual_server_edit.php:193
+#: src/usr/local/www/status_lb_pool.php:149
+#: src/usr/local/www/status_lb_vs.php:79 src/usr/local/www/status_lb_vs.php:85
 msgid "Virtual Servers"
 msgstr ""
 
-#: src/usr/local/www/load_balancer_monitor.php:128
-#: src/usr/local/www/load_balancer_pool.php:142
-#: src/usr/local/www/load_balancer_setting.php:142
-#: src/usr/local/www/load_balancer_virtual_server.php:142
-msgid "Monitors"
+#: src/usr/local/www/load_balancer_monitor.php:135
+#: src/usr/local/www/load_balancer_pool.php:158
+#: src/usr/local/www/load_balancer_pool_edit.php:107
+#: src/usr/local/www/load_balancer_pool_edit.php:397
+#: src/usr/local/www/load_balancer_pool_edit.php:403
+#: src/usr/local/www/status_gateways.php:95
+#: src/usr/local/www/status_lb_pool.php:165
+msgid "Monitor"
 msgstr ""
 
 #: src/usr/local/www/load_balancer_monitor.php:162
@@ -15294,105 +16795,106 @@ msgstr ""
 msgid "Delete monitor"
 msgstr ""
 
-#: src/usr/local/www/load_balancer_monitor_edit.php:92
+#: src/usr/local/www/load_balancer_monitor_edit.php:96
 msgid "Load Balancer: Monitor:"
 msgstr ""
 
-#: src/usr/local/www/load_balancer_monitor_edit.php:121
+#: src/usr/local/www/load_balancer_monitor_edit.php:125
 msgid "This monitor name has already been used.  Monitor names must be unique."
 msgstr ""
 
-#: src/usr/local/www/load_balancer_monitor_edit.php:126
+#: src/usr/local/www/load_balancer_monitor_edit.php:130
 #: src/usr/local/www/load_balancer_pool_edit.php:119
 #: src/usr/local/www/load_balancer_virtual_server_edit.php:123
 msgid "You cannot use spaces or slashes in the 'name' field."
 msgstr ""
 
-#: src/usr/local/www/load_balancer_monitor_edit.php:130
+#: src/usr/local/www/load_balancer_monitor_edit.php:134
 #: src/usr/local/www/load_balancer_pool_edit.php:123
 msgid "The 'name' field must be 16 characters or less."
 msgstr ""
 
-#: src/usr/local/www/load_balancer_monitor_edit.php:145
+#: src/usr/local/www/load_balancer_monitor_edit.php:149
 #: src/usr/local/www/services_dhcp_edit.php:201
 #: src/usr/local/www/services_dhcpv6_edit.php:151
 msgid "The hostname can only contain the characters A-Z, 0-9 and '-'."
 msgstr ""
 
-#: src/usr/local/www/load_balancer_monitor_edit.php:151
+#: src/usr/local/www/load_balancer_monitor_edit.php:155
 msgid "HTTP(s) codes must be from RFC2616."
 msgstr ""
 
-#: src/usr/local/www/load_balancer_monitor_edit.php:155
+#: src/usr/local/www/load_balancer_monitor_edit.php:159
 msgid "The path to monitor must be set."
 msgstr ""
 
-#: src/usr/local/www/load_balancer_monitor_edit.php:179
+#: src/usr/local/www/load_balancer_monitor_edit.php:183
 #, php-format
 msgid "modified '%s' monitor:"
 msgstr ""
 
-#: src/usr/local/www/load_balancer_monitor_edit.php:234
+#: src/usr/local/www/load_balancer_monitor_edit.php:238
 msgid "ICMP"
 msgstr ""
 
-#: src/usr/local/www/load_balancer_monitor_edit.php:234
+#: src/usr/local/www/load_balancer_monitor_edit.php:238
 msgid "TCP"
 msgstr ""
 
-#: src/usr/local/www/load_balancer_monitor_edit.php:234
+#: src/usr/local/www/load_balancer_monitor_edit.php:238
 #: src/usr/local/www/system_advanced_admin.php:345
 msgid "HTTP"
 msgstr ""
 
-#: src/usr/local/www/load_balancer_monitor_edit.php:234
+#: src/usr/local/www/load_balancer_monitor_edit.php:238
 #: src/usr/local/www/system_advanced_admin.php:353
 msgid "HTTPS"
 msgstr ""
 
-#: src/usr/local/www/load_balancer_monitor_edit.php:234
+#: src/usr/local/www/load_balancer_monitor_edit.php:238
 msgid "Send/Expect"
 msgstr ""
 
-#: src/usr/local/www/load_balancer_monitor_edit.php:298
-msgid "Edit Load Balancer - Monitor entry"
+#: src/usr/local/www/load_balancer_monitor_edit.php:302
+msgid "Edit Load Balancer - Monitor Entry"
 msgstr ""
 
-#: src/usr/local/www/load_balancer_monitor_edit.php:323
+#: src/usr/local/www/load_balancer_monitor_edit.php:327
 msgid "HTTP Options"
 msgstr ""
 
-#: src/usr/local/www/load_balancer_monitor_edit.php:328
-#: src/usr/local/www/load_balancer_monitor_edit.php:354
+#: src/usr/local/www/load_balancer_monitor_edit.php:332
+#: src/usr/local/www/load_balancer_monitor_edit.php:358
 msgid "Path"
 msgstr ""
 
-#: src/usr/local/www/load_balancer_monitor_edit.php:338
-#: src/usr/local/www/load_balancer_monitor_edit.php:364
+#: src/usr/local/www/load_balancer_monitor_edit.php:342
+#: src/usr/local/www/load_balancer_monitor_edit.php:368
 msgid "Hostname for Host: header if needed."
 msgstr ""
 
-#: src/usr/local/www/load_balancer_monitor_edit.php:342
+#: src/usr/local/www/load_balancer_monitor_edit.php:346
 msgid "HTTP Code"
 msgstr ""
 
-#: src/usr/local/www/load_balancer_monitor_edit.php:349
+#: src/usr/local/www/load_balancer_monitor_edit.php:353
+#: src/usr/local/www/services_captiveportal.php:1035
 msgid "HTTPS Options"
 msgstr ""
 
-#: src/usr/local/www/load_balancer_monitor_edit.php:368
+#: src/usr/local/www/load_balancer_monitor_edit.php:372
 msgid "HTTPS Code"
 msgstr ""
 
-#: src/usr/local/www/load_balancer_monitor_edit.php:375
+#: src/usr/local/www/load_balancer_monitor_edit.php:379
 msgid "Send/Expect Options"
 msgstr ""
 
-#: src/usr/local/www/load_balancer_monitor_edit.php:380
+#: src/usr/local/www/load_balancer_monitor_edit.php:384
 msgid "Send"
 msgstr ""
 
-#: src/usr/local/www/load_balancer_monitor_edit.php:387
+#: src/usr/local/www/load_balancer_monitor_edit.php:391
 msgid "Expect"
 msgstr ""
 
@@ -15402,30 +16904,26 @@ msgid ""
 "virtual server."
 msgstr ""
 
-#: src/usr/local/www/load_balancer_pool.php:121
 #: src/usr/local/www/load_balancer_pool.php:149
-#: src/usr/local/www/load_balancer_pool_edit.php:219
 #: src/usr/local/www/load_balancer_virtual_server.php:158
-#: src/usr/local/www/status_ipsec_leases.php:87
+#: src/usr/local/www/status_ipsec_leases.php:85
 #: src/usr/local/www/widgets/widgets/load_balancer_status.widget.php:94
 msgid "Pool"
 msgstr ""
 
 #: src/usr/local/www/load_balancer_pool.php:156
-#: src/usr/local/www/services_dhcp.php:885
-#: src/usr/local/www/status_lb_pool.php:169
-#: src/usr/local/www/status_lb_vs.php:103
-#: src/usr/local/www/system_authservers.php:394
-#: src/usr/local/www/system_groupmanager.php:275
-#: src/usr/local/www/system_groupmanager_addprivs.php:186
-#: src/usr/local/www/system_usermanager.php:481
-#: src/usr/local/www/system_usermanager_addprivs.php:174
-#: src/usr/local/www/system_usermanager_settings.php:146
+#: src/usr/local/www/services_dhcp.php:908
+#: src/usr/local/www/status_lb_pool.php:164
+#: src/usr/local/www/status_lb_vs.php:98
+#: src/usr/local/www/vpn_openvpn_client.php:448
+#: src/usr/local/www/vpn_openvpn_csc.php:326
+#: src/usr/local/www/vpn_openvpn_server.php:592
+#: src/usr/local/www/vpn_openvpn_server.php:614
 msgid "Servers"
 msgstr ""
 
 #: src/usr/local/www/load_balancer_pool.php:197
-#: src/usr/local/www/services_dhcp.php:682
+#: src/usr/local/www/services_dhcp.php:710
 msgid "Edit pool"
 msgstr ""
 
@@ -15434,7 +16932,7 @@ msgid "Copy pool"
 msgstr ""
 
 #: src/usr/local/www/load_balancer_pool.php:199
-#: src/usr/local/www/services_dhcp.php:684
+#: src/usr/local/www/services_dhcp.php:712
 msgid "Delete pool"
 msgstr ""
 
@@ -15443,7 +16941,7 @@ msgid "Load Balancer: Pool:"
 msgstr ""
 
 #: src/usr/local/www/load_balancer_pool_edit.php:107
-#: src/usr/local/www/vpn_openvpn_csc.php:345
+#: src/usr/local/www/vpn_openvpn_csc.php:349
 msgid "Server List"
 msgstr ""
 
@@ -15505,7 +17003,7 @@ msgid " modified '%s' pool:"
 msgstr ""
 
 #: src/usr/local/www/load_balancer_pool_edit.php:343
-msgid "Add/edit Load Balancer - Pool entry"
+msgid "Add/Edit Load Balancer - Pool Entry"
 msgstr ""
 
 #: src/usr/local/www/load_balancer_pool_edit.php:357
@@ -15529,7 +17027,7 @@ msgid ""
 msgstr ""
 
 #: src/usr/local/www/load_balancer_pool_edit.php:386
-msgid "Add item to the pool"
+msgid "Add Item to the Pool"
 msgstr ""
 
 #: src/usr/local/www/load_balancer_pool_edit.php:408
@@ -15541,7 +17039,7 @@ msgid "Add to pool"
 msgstr ""
 
 #: src/usr/local/www/load_balancer_pool_edit.php:425
-msgid "Current pool members"
+msgid "Current Pool Members"
 msgstr ""
 
 #: src/usr/local/www/load_balancer_pool_edit.php:453
@@ -15572,31 +17070,31 @@ msgstr ""
 msgid "Prefork value must be between 1 and 32"
 msgstr ""
 
-#: src/usr/local/www/load_balancer_setting.php:148
+#: src/usr/local/www/load_balancer_setting.php:147
 msgid "Relayd Global Settings"
 msgstr ""
 
-#: src/usr/local/www/load_balancer_setting.php:155
+#: src/usr/local/www/load_balancer_setting.php:154
 msgid ""
 "Set the global timeout in milliseconds for checks. Leave blank to use the "
 "default value of 1000 ms"
 msgstr ""
 
-#: src/usr/local/www/load_balancer_setting.php:159
+#: src/usr/local/www/load_balancer_setting.php:158
 msgid "Interval"
 msgstr ""
 
-#: src/usr/local/www/load_balancer_setting.php:162
+#: src/usr/local/www/load_balancer_setting.php:161
 msgid ""
 "Set the interval in seconds at which the member of a pool will be checked. "
 "Leave blank to use the default interval of 10 seconds"
 msgstr ""
 
-#: src/usr/local/www/load_balancer_setting.php:166
+#: src/usr/local/www/load_balancer_setting.php:165
 msgid "Prefork"
 msgstr ""
 
-#: src/usr/local/www/load_balancer_setting.php:169
+#: src/usr/local/www/load_balancer_setting.php:168
 msgid ""
 "Number of processes forked in advance by relayd. Leave blank to use the "
 "default value of 5 processes"
@@ -15623,7 +17121,7 @@ msgid "Delete virtual server"
 msgstr ""
 
 #: src/usr/local/www/load_balancer_virtual_server.php:190
-msgid "No virtual servers have been configured"
+msgid "No virtual servers have been configured."
 msgstr ""
 
 #: src/usr/local/www/load_balancer_virtual_server_edit.php:91
@@ -15674,16 +17172,12 @@ msgid "modified '%s' vs:"
 msgstr ""
 
 #: src/usr/local/www/load_balancer_virtual_server_edit.php:156
-#, php-format
-msgid "created '%s' vs:"
-msgstr ""
-
-#: src/usr/local/www/load_balancer_virtual_server_edit.php:193
-msgid "Virtual Server"
+#, php-format
+msgid "created '%s' vs:"
 msgstr ""
 
 #: src/usr/local/www/load_balancer_virtual_server_edit.php:204
-msgid "Edit Load Balancer - Virtual Server entry"
+msgid "Edit Load Balancer - Virtual Server Entry"
 msgstr ""
 
 #: src/usr/local/www/load_balancer_virtual_server_edit.php:225
@@ -15718,105 +17212,107 @@ msgid ""
 "have finished setting it up."
 msgstr ""
 
-#: src/usr/local/www/pkg.php:74 src/usr/local/www/pkg_edit.php:85
-msgid "ERROR: No valid package defined."
+#: src/usr/local/www/pkg.php:73 src/usr/local/www/pkg.php:202
+#: src/usr/local/www/pkg.php:205 src/usr/local/www/pkg_edit.php:84
+#: src/usr/local/www/pkg_edit.php:544 src/usr/local/www/pkg_edit.php:547
+msgid "Package"
 msgstr ""
 
-#: src/usr/local/www/pkg.php:82
-#, php-format
-msgid "ERROR: Package path %s not found."
+#: src/usr/local/www/pkg.php:73 src/usr/local/www/pkg.php:205
+#: src/usr/local/www/pkg_edit.php:84 src/usr/local/www/pkg_edit.php:547
+msgid "Editor"
 msgstr ""
 
-#: src/usr/local/www/pkg.php:84
-#, php-format
-msgid "ERROR: Invalid path %s specified."
+#: src/usr/local/www/pkg.php:75 src/usr/local/www/pkg_edit.php:86
+msgid "No valid package defined."
 msgstr ""
 
-#: src/usr/local/www/pkg.php:89
-msgid "Try reinstalling the package."
+#: src/usr/local/www/pkg.php:83
+#, php-format
+msgid "Package path %s not found."
 msgstr ""
 
-#: src/usr/local/www/pkg.php:98
+#: src/usr/local/www/pkg.php:85
 #, php-format
-msgid "File not found %s"
+msgid "Invalid path %s specified."
 msgstr ""
 
-#: src/usr/local/www/pkg.php:201 src/usr/local/www/pkg.php:204
-#: src/usr/local/www/pkg_edit.php:543 src/usr/local/www/pkg_edit.php:546
-msgid "Package"
+#: src/usr/local/www/pkg.php:90
+msgid "Try reinstalling the package."
 msgstr ""
 
-#: src/usr/local/www/pkg.php:204 src/usr/local/www/pkg_edit.php:546
-msgid "Editor"
+#: src/usr/local/www/pkg.php:99
+#, php-format
+msgid "File not found %s."
 msgstr ""
 
-#: src/usr/local/www/pkg.php:293
+#: src/usr/local/www/pkg.php:294
 msgid "Saving changes..."
 msgstr ""
 
-#: src/usr/local/www/pkg.php:294
+#: src/usr/local/www/pkg.php:295
 msgid "Do you really want to save changes?"
 msgstr ""
 
-#: src/usr/local/www/pkg.php:353
+#: src/usr/local/www/pkg.php:354
 msgid "Filter by: "
 msgstr ""
 
-#: src/usr/local/www/pkg.php:365
+#: src/usr/local/www/pkg.php:366
 msgid "Filter field: "
 msgstr ""
 
-#: src/usr/local/www/pkg.php:377
+#: src/usr/local/www/pkg.php:378
 msgid "Filter text: "
 msgstr ""
 
-#: src/usr/local/www/pkg.php:408
+#: src/usr/local/www/pkg.php:409
 #, php-format
 msgid "Displaying page %1$s of %2$s"
 msgstr ""
 
-#: src/usr/local/www/pkg.php:409
+#: src/usr/local/www/pkg.php:410
 msgid "Rows per page: "
 msgstr ""
 
-#: src/usr/local/www/pkg.php:537
+#: src/usr/local/www/pkg.php:538
 msgid "Edit this item"
 msgstr ""
 
-#: src/usr/local/www/pkg.php:542
+#: src/usr/local/www/pkg.php:543
 msgid "Delete this item"
 msgstr ""
 
-#: src/usr/local/www/pkg.php:566
+#: src/usr/local/www/pkg.php:567
 msgid "Previous page"
 msgstr ""
 
-#: src/usr/local/www/pkg.php:579
+#: src/usr/local/www/pkg.php:580
 msgid "Next page"
 msgstr ""
 
-#: src/usr/local/www/pkg.php:597
+#: src/usr/local/www/pkg.php:598
 msgid "Add a new item"
 msgstr ""
 
-#: src/usr/local/www/pkg_edit.php:660
-msgid "Advanced features"
+#: src/usr/local/www/pkg_edit.php:661
+msgid "Advanced Features"
 msgstr ""
 
-#: src/usr/local/www/pkg_edit.php:738
-msgid "General options"
+#: src/usr/local/www/pkg_edit.php:739 src/usr/local/www/services_dhcp.php:789
+msgid "General Options"
 msgstr ""
 
-#: src/usr/local/www/pkg_edit.php:1196
+#: src/usr/local/www/pkg_edit.php:1198
 msgid "Listen on All interfaces/ip addresses "
 msgstr ""
 
-#: src/usr/local/www/pkg_edit.php:1200
+#: src/usr/local/www/pkg_edit.php:1202
 msgid "loopback"
 msgstr ""
 
-#: src/usr/local/www/pkg_edit.php:1484
-#: src/usr/local/www/interfaces_bridge_edit.php:392
+#: src/usr/local/www/pkg_edit.php:1486
+#: src/usr/local/www/interfaces_bridge_edit.php:437
 msgid "Show advanced options"
 msgstr ""
 
@@ -15825,13 +17321,13 @@ msgid "Visit official website"
 msgstr ""
 
 #: src/usr/local/www/pkg_mgr.php:125
-#: src/usr/local/www/pkg_mgr_installed.php:171
-#: src/usr/local/www/widgets/widgets/installed_packages.widget.php:143
+#: src/usr/local/www/pkg_mgr_installed.php:169
+#: src/usr/local/www/widgets/widgets/installed_packages.widget.php:140
 msgid "View changelog"
 msgstr ""
 
 #: src/usr/local/www/pkg_mgr.php:136
-#: src/usr/local/www/pkg_mgr_installed.php:180
+#: src/usr/local/www/pkg_mgr_installed.php:178
 msgid "Package Dependencies"
 msgstr ""
 
@@ -15840,21 +17336,21 @@ msgid "Click to install"
 msgstr ""
 
 #: src/usr/local/www/pkg_mgr.php:150
-#: src/usr/local/www/pkg_mgr_installed.php:196
-#: src/usr/local/www/widgets/widgets/installed_packages.widget.php:163
+#: src/usr/local/www/pkg_mgr_installed.php:194
+#: src/usr/local/www/widgets/widgets/installed_packages.widget.php:160
 msgid "View more information"
 msgstr ""
 
-#: src/usr/local/www/pkg_mgr.php:163 src/usr/local/www/pkg_mgr.php:167
-#: src/usr/local/www/pkg_mgr_install.php:267
-#: src/usr/local/www/pkg_mgr_installed.php:79
+#: src/usr/local/www/pkg_mgr.php:163 src/usr/local/www/pkg_mgr.php:168
+#: src/usr/local/www/pkg_mgr_install.php:246
+#: src/usr/local/www/pkg_mgr_installed.php:80
 msgid "Available Packages"
 msgstr ""
 
-#: src/usr/local/www/pkg_mgr.php:168 src/usr/local/www/pkg_mgr_install.php:268
+#: src/usr/local/www/pkg_mgr.php:167 src/usr/local/www/pkg_mgr_install.php:245
 #: src/usr/local/www/pkg_mgr_installed.php:75
-#: src/usr/local/www/pkg_mgr_installed.php:80
-#: src/usr/local/www/pkg_mgr_installed.php:98
+#: src/usr/local/www/pkg_mgr_installed.php:79
+#: src/usr/local/www/pkg_mgr_installed.php:96
 #: src/usr/local/www/widgets/include/installed_packages.inc:4
 msgid "Installed Packages"
 msgstr ""
@@ -15873,251 +17369,234 @@ msgid ""
 "descriptions."
 msgstr ""
 
-#: src/usr/local/www/pkg_mgr.php:210
-msgid "Please wait while the list of packages is retrieved and formatted"
+#: src/usr/local/www/pkg_mgr.php:207
+#: src/usr/local/www/widgets/widgets/installed_packages.widget.php:180
+msgid "Packages"
 msgstr ""
 
-#: src/usr/local/www/pkg_mgr.php:214
-msgid "Error: Unable to retrieve package information."
+#: src/usr/local/www/pkg_mgr.php:210
+msgid "Please wait while the list of packages is retrieved and formatted."
 msgstr ""
 
-#: src/usr/local/www/pkg_mgr_install.php:144
-msgid "Success"
+#: src/usr/local/www/pkg_mgr.php:214
+msgid "Unable to retrieve package information."
 msgstr ""
 
 #: src/usr/local/www/pkg_mgr_install.php:146
 msgid "Failed"
 msgstr ""
 
-#: src/usr/local/www/pkg_mgr_install.php:235
-msgid "Reinstall all packages"
-msgstr ""
-
-#: src/usr/local/www/pkg_mgr_install.php:238
-msgid "Upgrade package"
-msgstr ""
-
 #: src/usr/local/www/pkg_mgr_install.php:240
-msgid "Reinstall package"
-msgstr ""
-
-#: src/usr/local/www/pkg_mgr_install.php:245
-msgid "Remove package"
-msgstr ""
-
-#: src/usr/local/www/pkg_mgr_install.php:248
-msgid "Install package"
-msgstr ""
-
-#: src/usr/local/www/pkg_mgr_install.php:256
-#: src/usr/local/www/pkg_mgr_install.php:263
+#: src/usr/local/www/pkg_mgr_install.php:241
 #: src/usr/local/www/system_update_settings.php:117
 msgid "System Update"
 msgstr ""
 
-#: src/usr/local/www/pkg_mgr_install.php:264
+#: src/usr/local/www/pkg_mgr_install.php:242
 #: src/usr/local/www/system_update_settings.php:99
 #: src/usr/local/www/system_update_settings.php:118
 msgid "Update Settings"
 msgstr ""
 
-#: src/usr/local/www/pkg_mgr_install.php:269
+#: src/usr/local/www/pkg_mgr_install.php:244
+#: src/usr/local/www/pkg_mgr_install.php:247
 msgid "Package Installer"
 msgstr ""
 
-#: src/usr/local/www/pkg_mgr_install.php:295
+#: src/usr/local/www/pkg_mgr_install.php:278
 #, php-format
-msgid "Package <b>%s</b> will be reinstalled"
+msgid "Are you sure you want to reinstall package %s?"
 msgstr ""
 
-#: src/usr/local/www/pkg_mgr_install.php:298
+#: src/usr/local/www/pkg_mgr_install.php:281
 #, php-format
-msgid "Package <b>%s</b> will be removed"
+msgid "Are you sure you want to remove package %s?"
 msgstr ""
 
-#: src/usr/local/www/pkg_mgr_install.php:302
+#: src/usr/local/www/pkg_mgr_install.php:285
 #, php-format
-msgid "Package <b>%s</b> will be installed"
+msgid "Are you sure you want to install package %s?"
 msgstr ""
 
-#: src/usr/local/www/pkg_mgr_install.php:313
-msgid "All packages will be reinstalled."
+#: src/usr/local/www/pkg_mgr_install.php:295
+msgid "Are you sure you want to reinstall all packages?"
 msgstr ""
 
-#: src/usr/local/www/pkg_mgr_install.php:317
+#: src/usr/local/www/pkg_mgr_install.php:299
 #, php-format
-msgid "Package: %1$s will be upgraded from %2$s to %3$s."
+msgid "Are you sure you want to upgrade package %1$s from %2$s to %3$s?"
 msgstr ""
 
-#: src/usr/local/www/pkg_mgr_install.php:321
-msgid " System Update"
+#: src/usr/local/www/pkg_mgr_install.php:303
+#, php-format
+msgid "Are you sure you want to update %s system?"
 msgstr ""
 
-#: src/usr/local/www/pkg_mgr_install.php:339
-msgid "Current base system"
+#: src/usr/local/www/pkg_mgr_install.php:321
+msgid "Current Base System"
 msgstr ""
 
-#: src/usr/local/www/pkg_mgr_install.php:348
-msgid "Latest base system"
+#: src/usr/local/www/pkg_mgr_install.php:330
+msgid "Latest Base System"
 msgstr ""
 
-#: src/usr/local/www/pkg_mgr_install.php:359
+#: src/usr/local/www/pkg_mgr_install.php:341
 msgid "Confirm Update"
 msgstr ""
 
-#: src/usr/local/www/pkg_mgr_install.php:373
+#: src/usr/local/www/pkg_mgr_install.php:355
 msgid "System is up to date"
 msgstr ""
 
-#: src/usr/local/www/pkg_mgr_install.php:390
-msgid "Unable to retrieve system versions"
+#: src/usr/local/www/pkg_mgr_install.php:373
+msgid "Unable to retrieve system versions."
 msgstr ""
 
-#: src/usr/local/www/pkg_mgr_install.php:403
-msgid "Package removal"
+#: src/usr/local/www/pkg_mgr_install.php:386
+msgid "Package Removal"
 msgstr ""
 
-#: src/usr/local/www/pkg_mgr_install.php:404
+#: src/usr/local/www/pkg_mgr_install.php:387
 #, php-format
-msgid "<b>%1$s</b> removal successfully completed"
+msgid "<b>%1$s</b> removal successfully completed."
 msgstr ""
 
-#: src/usr/local/www/pkg_mgr_install.php:405
+#: src/usr/local/www/pkg_mgr_install.php:388
 #, php-format
 msgid "<b>%1$s</b> removal failed!"
 msgstr ""
 
-#: src/usr/local/www/pkg_mgr_install.php:406
+#: src/usr/local/www/pkg_mgr_install.php:389
 #, php-format
 msgid "Please wait while the removal of <b>%1$s</b> completes."
 msgstr ""
 
-#: src/usr/local/www/pkg_mgr_install.php:408
-msgid "Package reinstallation"
+#: src/usr/local/www/pkg_mgr_install.php:391
+msgid "Package Reinstallation"
 msgstr ""
 
-#: src/usr/local/www/pkg_mgr_install.php:409
+#: src/usr/local/www/pkg_mgr_install.php:392
 #, php-format
-msgid "<b>%1$s</b> reinstallation successfully completed"
+msgid "<b>%1$s</b> reinstallation successfully completed."
 msgstr ""
 
-#: src/usr/local/www/pkg_mgr_install.php:410
+#: src/usr/local/www/pkg_mgr_install.php:393
 #, php-format
 msgid "<b>%1$s</b> reinstallation failed!"
 msgstr ""
 
-#: src/usr/local/www/pkg_mgr_install.php:411
+#: src/usr/local/www/pkg_mgr_install.php:394
 #, php-format
 msgid "Please wait while the reinstallation of <b>%1$s</b> completes."
 msgstr ""
 
-#: src/usr/local/www/pkg_mgr_install.php:413
-msgid "Package installation"
+#: src/usr/local/www/pkg_mgr_install.php:396
+msgid "Package Installation"
 msgstr ""
 
-#: src/usr/local/www/pkg_mgr_install.php:414
+#: src/usr/local/www/pkg_mgr_install.php:397
 #, php-format
-msgid "<b>%1$s</b> installation successfully completed"
+msgid "<b>%1$s</b> installation successfully completed."
 msgstr ""
 
-#: src/usr/local/www/pkg_mgr_install.php:415
+#: src/usr/local/www/pkg_mgr_install.php:398
 #, php-format
 msgid "<b>%1$s</b> installation failed!"
 msgstr ""
 
-#: src/usr/local/www/pkg_mgr_install.php:416
+#: src/usr/local/www/pkg_mgr_install.php:399
 #, php-format
 msgid "Please wait while the installation of <b>%1$s</b> completes."
 msgstr ""
 
-#: src/usr/local/www/pkg_mgr_install.php:442
-msgid "Updating system"
+#: src/usr/local/www/pkg_mgr_install.php:425
+msgid "Updating System"
 msgstr ""
 
-#: src/usr/local/www/pkg_mgr_install.php:465
+#: src/usr/local/www/pkg_mgr_install.php:445
 msgid "Creating restore point before package installation."
 msgstr ""
 
-#: src/usr/local/www/pkg_mgr_install.php:539
-msgid "System update successfully completed"
+#: src/usr/local/www/pkg_mgr_install.php:519
+msgid "System update successfully completed."
 msgstr ""
 
-#: src/usr/local/www/pkg_mgr_install.php:544
-msgid "Reinstallation of all packages successfully completed"
+#: src/usr/local/www/pkg_mgr_install.php:524
+msgid "Reinstallation of all packages successfully completed."
 msgstr ""
 
-#: src/usr/local/www/pkg_mgr_install.php:557
-msgid "Reinstallation of all packages failed"
+#: src/usr/local/www/pkg_mgr_install.php:537
+msgid "Reinstallation of all packages failed."
 msgstr ""
 
-#: src/usr/local/www/pkg_mgr_install.php:567
-#: src/usr/local/www/pkg_mgr_install.php:570
-msgid "(Some packages may take several minutes!)"
+#: src/usr/local/www/pkg_mgr_install.php:547
+#: src/usr/local/www/pkg_mgr_install.php:550
+msgid "This may take several minutes!"
 msgstr ""
 
-#: src/usr/local/www/pkg_mgr_install.php:569
+#: src/usr/local/www/pkg_mgr_install.php:549
 msgid "Please wait while the reinstallation of all packages completes."
 msgstr ""
 
-#: src/usr/local/www/pkg_mgr_installed.php:94
+#: src/usr/local/www/pkg_mgr_installed.php:93
 msgid "There are no packages currently installed."
 msgstr ""
 
-#: src/usr/local/www/pkg_mgr_installed.php:105
-#: src/usr/local/www/widgets/widgets/installed_packages.widget.php:86
+#: src/usr/local/www/pkg_mgr_installed.php:103
+#: src/usr/local/www/widgets/widgets/installed_packages.widget.php:83
 msgid "Category"
 msgstr ""
 
-#: src/usr/local/www/pkg_mgr_installed.php:128
-#: src/usr/local/www/widgets/widgets/installed_packages.widget.php:106
+#: src/usr/local/www/pkg_mgr_installed.php:126
+#: src/usr/local/www/widgets/widgets/installed_packages.widget.php:103
 msgid "Package is configured, but not installed!"
 msgstr ""
 
-#: src/usr/local/www/pkg_mgr_installed.php:134
-#: src/usr/local/www/widgets/widgets/installed_packages.widget.php:112
+#: src/usr/local/www/pkg_mgr_installed.php:132
+#: src/usr/local/www/widgets/widgets/installed_packages.widget.php:109
 #, php-format
 msgid "Newer than available (%s)"
 msgstr ""
 
-#: src/usr/local/www/pkg_mgr_installed.php:137
-#: src/usr/local/www/widgets/widgets/installed_packages.widget.php:116
+#: src/usr/local/www/pkg_mgr_installed.php:135
+#: src/usr/local/www/widgets/widgets/installed_packages.widget.php:113
 #, php-format
 msgid "Upgrade available to %s"
 msgstr ""
 
-#: src/usr/local/www/pkg_mgr_installed.php:143
+#: src/usr/local/www/pkg_mgr_installed.php:141
 msgid "Up-to-date"
 msgstr ""
 
-#: src/usr/local/www/pkg_mgr_installed.php:145
-#: src/usr/local/www/widgets/widgets/installed_packages.widget.php:127
+#: src/usr/local/www/pkg_mgr_installed.php:143
+#: src/usr/local/www/widgets/widgets/installed_packages.widget.php:124
 msgid "Error comparing version"
 msgstr ""
 
-#: src/usr/local/www/pkg_mgr_installed.php:188
+#: src/usr/local/www/pkg_mgr_installed.php:186
 #, php-format
 msgid "Remove package %s"
 msgstr ""
 
-#: src/usr/local/www/pkg_mgr_installed.php:190
+#: src/usr/local/www/pkg_mgr_installed.php:188
 #, php-format
 msgid "Update package %s"
 msgstr ""
 
-#: src/usr/local/www/pkg_mgr_installed.php:192
+#: src/usr/local/www/pkg_mgr_installed.php:190
 #, php-format
 msgid "Reinstall package %s"
 msgstr ""
 
-#: src/usr/local/www/pkg_mgr_installed.php:210
+#: src/usr/local/www/pkg_mgr_installed.php:208
 msgid "Current"
 msgstr ""
 
-#: src/usr/local/www/pkg_mgr_installed.php:217
+#: src/usr/local/www/pkg_mgr_installed.php:215
 msgid "Newer version available"
 msgstr ""
 
-#: src/usr/local/www/pkg_mgr_installed.php:218
+#: src/usr/local/www/pkg_mgr_installed.php:216
 msgid "Package is configured but not (fully) installed"
 msgstr ""
 
@@ -16141,16 +17620,6 @@ msgstr ""
 msgid "Restarting mini_httpd"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:96
-#: src/usr/local/www/services_captiveportal_filemanager.php:99
-#: src/usr/local/www/services_captiveportal_hostname.php:95
-#: src/usr/local/www/services_captiveportal_ip.php:94
-#: src/usr/local/www/services_captiveportal_mac.php:91
-#: src/usr/local/www/services_captiveportal_vouchers.php:111
-#, php-format
-msgid "Zone %s"
-msgstr ""
-
 #: src/usr/local/www/services_captiveportal.php:116
 #, php-format
 msgid "Captive Portal: zone %s: Restore default portal page"
@@ -16255,50 +17724,53 @@ msgid ""
 "ASCII characters."
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:562
+#: src/usr/local/www/services_captiveportal.php:563
 #: src/usr/local/www/services_captiveportal_filemanager.php:173
 #: src/usr/local/www/services_captiveportal_hostname.php:139
 #: src/usr/local/www/services_captiveportal_ip.php:132
 #: src/usr/local/www/services_captiveportal_mac.php:91
 #: src/usr/local/www/services_captiveportal_mac.php:197
+#: src/usr/local/www/services_captiveportal_mac_edit.php:101
 #: src/usr/local/www/services_captiveportal_vouchers.php:439
-msgid "MAC"
+msgid "MACs"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:563
+#: src/usr/local/www/services_captiveportal.php:564
 #: src/usr/local/www/services_captiveportal_filemanager.php:174
 #: src/usr/local/www/services_captiveportal_hostname.php:140
 #: src/usr/local/www/services_captiveportal_ip.php:94
 #: src/usr/local/www/services_captiveportal_ip.php:133
+#: src/usr/local/www/services_captiveportal_ip_edit.php:98
 #: src/usr/local/www/services_captiveportal_mac.php:198
 #: src/usr/local/www/services_captiveportal_vouchers.php:440
 msgid "Allowed IP Addresses"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:564
+#: src/usr/local/www/services_captiveportal.php:565
 #: src/usr/local/www/services_captiveportal_filemanager.php:175
 #: src/usr/local/www/services_captiveportal_hostname.php:95
 #: src/usr/local/www/services_captiveportal_hostname.php:141
+#: src/usr/local/www/services_captiveportal_hostname_edit.php:96
 #: src/usr/local/www/services_captiveportal_ip.php:134
 #: src/usr/local/www/services_captiveportal_mac.php:199
 #: src/usr/local/www/services_captiveportal_vouchers.php:441
 msgid "Allowed Hostnames"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:565
+#: src/usr/local/www/services_captiveportal.php:566
 #: src/usr/local/www/services_captiveportal_filemanager.php:176
 #: src/usr/local/www/services_captiveportal_hostname.php:142
 #: src/usr/local/www/services_captiveportal_ip.php:135
 #: src/usr/local/www/services_captiveportal_mac.php:200
 #: src/usr/local/www/services_captiveportal_vouchers.php:111
 #: src/usr/local/www/services_captiveportal_vouchers.php:442
-#: src/usr/local/www/status_captiveportal_expire.php:104
-#: src/usr/local/www/status_captiveportal_test.php:105
-#: src/usr/local/www/status_captiveportal_vouchers.php:85
+#: src/usr/local/www/services_captiveportal_vouchers_edit.php:86
+#: src/usr/local/www/status_captiveportal_expire.php:114
+#: src/usr/local/www/status_captiveportal_test.php:122
 msgid "Vouchers"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:566
+#: src/usr/local/www/services_captiveportal.php:567
 #: src/usr/local/www/services_captiveportal_filemanager.php:99
 #: src/usr/local/www/services_captiveportal_filemanager.php:177
 #: src/usr/local/www/services_captiveportal_hostname.php:143
@@ -16308,19 +17780,19 @@ msgstr ""
 msgid "File Manager"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:572
+#: src/usr/local/www/services_captiveportal.php:573
 msgid "Captive Portal Configuration"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:587
+#: src/usr/local/www/services_captiveportal.php:588
 msgid "Select the interface(s) to enable for captive portal."
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:591
+#: src/usr/local/www/services_captiveportal.php:592
 msgid "Maximum concurrent connections"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:595
+#: src/usr/local/www/services_captiveportal.php:596
 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 "
@@ -16328,32 +17800,32 @@ msgid ""
 "portal web server."
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:600
+#: src/usr/local/www/services_captiveportal.php:601
 msgid "Idle timeout (Minutes)"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:603
+#: src/usr/local/www/services_captiveportal.php:604
 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:607
+#: src/usr/local/www/services_captiveportal.php:608
 msgid "Hard timeout (Minutes)"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:610
+#: src/usr/local/www/services_captiveportal.php:611
 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:615
+#: src/usr/local/www/services_captiveportal.php:616
 msgid "Pass-through credits per MAC address."
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:618
+#: src/usr/local/www/services_captiveportal.php:619
 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 "
@@ -16362,72 +17834,72 @@ msgid ""
 "to be effective."
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:624
+#: src/usr/local/www/services_captiveportal.php:625
 msgid "Reset waiting period"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:627
+#: src/usr/local/www/services_captiveportal.php:628
 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:631
+#: src/usr/local/www/services_captiveportal.php:632
 msgid "Logout popup window"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:634
+#: src/usr/local/www/services_captiveportal.php:635
 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:639
+#: src/usr/local/www/services_captiveportal.php:640
 msgid "Pre-authentication redirect URL"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:642
+#: src/usr/local/www/services_captiveportal.php:643
 msgid ""
 "Use this field to set $PORTAL_REDIRURL$ variable which can be accessed using "
 "your custom captive portal index.php page or error pages."
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:646
+#: src/usr/local/www/services_captiveportal.php:647
 msgid "After authentication Redirection URL"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:649
+#: src/usr/local/www/services_captiveportal.php:650
 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:653
+#: src/usr/local/www/services_captiveportal.php:654
 msgid "Blocked MAC address redirect URL"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:656
+#: src/usr/local/www/services_captiveportal.php:657
 msgid ""
 "Blocked MAC addresses will be redirected to this URL when attempting access."
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:660
+#: src/usr/local/www/services_captiveportal.php:661
 msgid "Concurrent user logins"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:663
+#: src/usr/local/www/services_captiveportal.php:664
 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:668
+#: src/usr/local/www/services_captiveportal.php:669
 msgid "MAC filtering"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:671
+#: src/usr/local/www/services_captiveportal.php:672
 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 "
@@ -16436,99 +17908,99 @@ msgid ""
 "authentication cannot be used."
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:677
+#: src/usr/local/www/services_captiveportal.php:678
 msgid "Pass-through MAC Auto Entry"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:696
+#: src/usr/local/www/services_captiveportal.php:697
 msgid "Per-user bandwidth restriction"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:703
+#: src/usr/local/www/services_captiveportal.php:704
 msgid "Default download (Kbit/s)"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:710
+#: src/usr/local/www/services_captiveportal.php:711
 msgid "Default upload (Kbit/s)"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:713
+#: src/usr/local/www/services_captiveportal.php:714
 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."
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:721
+#: src/usr/local/www/services_captiveportal.php:722
 msgid "Authentication method"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:756
+#: src/usr/local/www/services_captiveportal.php:757
 msgid "RADIUS protocol"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:795
+#: src/usr/local/www/services_captiveportal.php:796
 msgid "Primary Authentication Source"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:798
-#: src/usr/local/www/services_captiveportal.php:851
+#: src/usr/local/www/services_captiveportal.php:799
+#: src/usr/local/www/services_captiveportal.php:852
 msgid "Primary RADIUS server"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:822
-#: src/usr/local/www/services_captiveportal.php:875
+#: src/usr/local/www/services_captiveportal.php:823
+#: src/usr/local/www/services_captiveportal.php:876
 msgid "Secondary RADIUS server"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:828
-#: src/usr/local/www/services_captiveportal.php:881
+#: src/usr/local/www/services_captiveportal.php:829
+#: src/usr/local/www/services_captiveportal.php:882
 msgid "IP address of the RADIUS server to authenticate against."
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:835
-#: src/usr/local/www/services_captiveportal.php:888
+#: src/usr/local/www/services_captiveportal.php:836
+#: src/usr/local/www/services_captiveportal.php:889
 msgid "RADIUS port. Leave blank for default (1812)"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:842
-#: src/usr/local/www/services_captiveportal.php:895
+#: src/usr/local/www/services_captiveportal.php:843
+#: src/usr/local/www/services_captiveportal.php:896
 msgid ""
 "RADIUS shared secret. Leave blank to not use a shared secret (not "
 "recommended)"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:848
+#: src/usr/local/www/services_captiveportal.php:849
 msgid "Secondary Authentication Source"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:905
+#: src/usr/local/www/services_captiveportal.php:906
 #: src/usr/local/www/services_pppoe_edit.php:403
 #: src/usr/local/www/vpn_l2tp.php:326
 msgid "RADIUS"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:912
+#: src/usr/local/www/services_captiveportal.php:913
 msgid "Accounting Port"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:915
+#: src/usr/local/www/services_captiveportal.php:916
 msgid "Leave blank to use the default port (1813)."
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:917
+#: src/usr/local/www/services_captiveportal.php:918
 msgid "Accounting updates"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:955
-msgid "RADIUS options"
+#: src/usr/local/www/services_captiveportal.php:956
+msgid "RADIUS Options"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:960
+#: src/usr/local/www/services_captiveportal.php:961
 msgid "Reathentication"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:963
+#: src/usr/local/www/services_captiveportal.php:964
 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 "
@@ -16536,41 +18008,41 @@ msgid ""
 "immediately."
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:968
+#: src/usr/local/www/services_captiveportal.php:969
 msgid "RADIUS MAC Authentication"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:971
+#: src/usr/local/www/services_captiveportal.php:972
 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:976
+#: src/usr/local/www/services_captiveportal.php:977
 msgid "MAC authentication secret"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:983
+#: src/usr/local/www/services_captiveportal.php:984
 msgid "RADIUS NAS IP Attribute"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:986
+#: src/usr/local/www/services_captiveportal.php:987
 msgid "Choose the IP to use for calling station attribute."
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:990
+#: src/usr/local/www/services_captiveportal.php:991
 #: src/usr/local/www/system_usermanager_settings.php:160
 msgid "Session timeout"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:993
+#: src/usr/local/www/services_captiveportal.php:994
 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:1000
+#: src/usr/local/www/services_captiveportal.php:1001
 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 "
@@ -16578,39 +18050,39 @@ msgid ""
 "client's MAC address and Called-Station-ID = pfSense's WAN IP address."
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:1006
+#: src/usr/local/www/services_captiveportal.php:1007
 msgid "Accounting style"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:1009
+#: src/usr/local/www/services_captiveportal.php:1010
 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:1014
+#: src/usr/local/www/services_captiveportal.php:1015
 msgid "NAS Identifier"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:1017
+#: src/usr/local/www/services_captiveportal.php:1018
 msgid ""
 "Specify a NAS identifier to override the default value (pfSense.localdomain)"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:1023
+#: src/usr/local/www/services_captiveportal.php:1024
 msgid "Single dash"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:1023
+#: src/usr/local/www/services_captiveportal.php:1024
 msgid "Unformatted"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:1021
+#: src/usr/local/www/services_captiveportal.php:1022
 msgid "MAC address format"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:1024
+#: src/usr/local/www/services_captiveportal.php:1025
 msgid ""
 "This option changes the MAC address format used in the whole RADIUS system. "
 "Change this if you also need to change the username format for RADIUS MAC "
@@ -16619,22 +18091,18 @@ msgid ""
 ">Unformatted: 001122334455"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:1034
-msgid "HTTPS options"
-msgstr ""
-
-#: src/usr/local/www/services_captiveportal.php:1042
+#: src/usr/local/www/services_captiveportal.php:1043
 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:1047
+#: src/usr/local/www/services_captiveportal.php:1048
 msgid "HTTPS server name"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:1050
+#: src/usr/local/www/services_captiveportal.php:1051
 msgid ""
 "This name will be used in the form action for the HTTPS POST and should "
 "match the Common Name (CN) in your certificate (otherwise, the client "
@@ -16643,22 +18111,22 @@ msgid ""
 "the IP resolves to the correct interface IP on pfSense."
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:1056
+#: src/usr/local/www/services_captiveportal.php:1057
 #: src/usr/local/www/system_advanced_admin.php:371
 msgid "SSL Certificate"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:1059
+#: src/usr/local/www/services_captiveportal.php:1060
 msgid ""
 "If no certificates are defined, you may define one here: <a href="
-"\"system_certmanager.php\">System &gt; Cert Manager</a>"
+"\"system_certmanager.php\">System &gt; Cert. Manager</a>"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:1063
+#: src/usr/local/www/services_captiveportal.php:1064
 msgid "HTTPS Forwards"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:1066
+#: src/usr/local/www/services_captiveportal.php:1067
 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 "
@@ -16668,15 +18136,15 @@ msgid ""
 "the HTTPS login page."
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:1073
-msgid "HTML page contents"
+#: src/usr/local/www/services_captiveportal.php:1074
+msgid "HTML Page Contents"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:1078
+#: src/usr/local/www/services_captiveportal.php:1079
 msgid "Portal page contents"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:1081
+#: src/usr/local/www/services_captiveportal.php:1082
 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 "
@@ -16698,27 +18166,27 @@ msgid ""
 "\t\t\t &lt;/form&gt;"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:1106
-#: src/usr/local/www/services_captiveportal.php:1135
-#: src/usr/local/www/services_captiveportal.php:1162
+#: src/usr/local/www/services_captiveportal.php:1107
+#: src/usr/local/www/services_captiveportal.php:1136
+#: src/usr/local/www/services_captiveportal.php:1163
 msgid "View current page"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:1112
-#: src/usr/local/www/services_captiveportal.php:1141
-#: src/usr/local/www/services_captiveportal.php:1168
+#: src/usr/local/www/services_captiveportal.php:1113
+#: src/usr/local/www/services_captiveportal.php:1142
+#: src/usr/local/www/services_captiveportal.php:1169
 msgid "Download current page"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:1118
+#: src/usr/local/www/services_captiveportal.php:1119
 msgid "Restore default portal page"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:1125
+#: src/usr/local/www/services_captiveportal.php:1126
 msgid "Auth error page contents"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:1128
+#: src/usr/local/www/services_captiveportal.php:1129
 msgid ""
 "The contents of the HTML/PHP file that you upload here are displayed when an "
 "authentication error occurs. You may include \"$PORTAL_MESSAGE$\", which "
@@ -16726,30 +18194,30 @@ msgid ""
 "any."
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:1147
+#: src/usr/local/www/services_captiveportal.php:1148
 msgid "Restore default error page"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:1154
+#: src/usr/local/www/services_captiveportal.php:1155
 msgid "Logout page contents"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:1157
+#: src/usr/local/www/services_captiveportal.php:1158
 msgid ""
 "The contents of the HTML/PHP file that you upload here are displayed on "
 "authentication success when the logout popup is enabled."
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:1174
+#: src/usr/local/www/services_captiveportal.php:1175
 msgid "Restore default logout page"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:1188
+#: src/usr/local/www/services_captiveportal.php:1189
 msgid ""
-"Warning:<br />Don't forget to enable the DHCP server on your captive portal "
-"interface! Make sure that the default/maximum DHCP lease time is higher than "
-"the hard timeout entered on this page. Also, the DNS Forwarder or Resolver "
-"must be enabled for DNS lookups by unauthenticated clients to work."
+"Don't forget to enable the DHCP server on your captive portal interface! "
+"Make sure that the default/maximum DHCP lease time is higher than the hard "
+"timeout entered on this page. Also, the DNS Forwarder or Resolver must be "
+"enabled for DNS lookups by unauthenticated clients to work."
 msgstr ""
 
 #: src/usr/local/www/services_captiveportal_filemanager.php:128
@@ -16763,7 +18231,7 @@ msgid "The total size of all files uploaded may not exceed %s."
 msgstr ""
 
 #: src/usr/local/www/services_captiveportal_filemanager.php:189
-msgid "Upload a new file"
+msgid "Upload a New File"
 msgstr ""
 
 #: src/usr/local/www/services_captiveportal_filemanager.php:200
@@ -16783,8 +18251,8 @@ msgid "Total"
 msgstr ""
 
 #: src/usr/local/www/services_captiveportal_filemanager.php:275
-#: src/usr/local/www/services_ntpd_gps.php:240
-#: src/usr/local/www/services_ntpd_pps.php:159
+#: src/usr/local/www/services_ntpd_gps.php:241
+#: src/usr/local/www/services_ntpd_pps.php:160
 msgid "Notes"
 msgstr ""
 
@@ -16846,10 +18314,6 @@ msgstr ""
 msgid "All connections %sto or from%s are allowed"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal_hostname_edit.php:80
-msgid "Edit allowed Hostname"
-msgstr ""
-
 #: src/usr/local/www/services_captiveportal_hostname_edit.php:127
 msgid "Allowed Hostname"
 msgstr ""
@@ -16877,7 +18341,7 @@ msgid "Hostname [%s] already allowed."
 msgstr ""
 
 #: src/usr/local/www/services_captiveportal_hostname_edit.php:207
-msgid "Captive Portal Hostname settings"
+msgid "Captive Portal Hostname Settings"
 msgstr ""
 
 #: src/usr/local/www/services_captiveportal_hostname_edit.php:214
@@ -16937,17 +18401,13 @@ msgid ""
 "on another network, for example."
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal_ip_edit.php:83
-msgid "Edit allowed IP address"
-msgstr ""
-
 #: src/usr/local/www/services_captiveportal_ip_edit.php:127
 msgid "Allowed IP address"
 msgstr ""
 
 #: src/usr/local/www/services_captiveportal_ip_edit.php:127
-#: src/usr/local/www/services_dhcp.php:803
-#: src/usr/local/www/services_dhcp.php:837
+#: src/usr/local/www/services_dhcp.php:832
+#: src/usr/local/www/services_dhcp.php:860
 #: src/usr/local/www/services_pppoe_edit.php:376
 msgid "Subnet mask"
 msgstr ""
@@ -16971,7 +18431,7 @@ msgid "already allowed"
 msgstr ""
 
 #: src/usr/local/www/services_captiveportal_ip_edit.php:247
-msgid "Edit Captive Portal IP rule"
+msgid "Edit Captive Portal IP Rule"
 msgstr ""
 
 #: src/usr/local/www/services_captiveportal_ip_edit.php:261
@@ -17010,7 +18470,7 @@ msgid "No entry exists for this mac address:"
 msgstr ""
 
 #: src/usr/local/www/services_captiveportal_mac.php:192
-msgid "The captive portal MAC address configuration has been changed."
+msgid "The Captive Portal MAC address configuration has been changed."
 msgstr ""
 
 #: src/usr/local/www/services_captiveportal_mac.php:232
@@ -17027,11 +18487,6 @@ msgid ""
 "portal automatically without being taken to the portal page."
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal_mac_edit.php:86
-#: src/usr/local/www/services_captiveportal_mac_edit.php:230
-msgid "Edit MAC address rules"
-msgstr ""
-
 #: src/usr/local/www/services_captiveportal_mac_edit.php:142
 #, php-format
 msgid ""
@@ -17046,6 +18501,10 @@ msgstr ""
 msgid "already exists"
 msgstr ""
 
+#: src/usr/local/www/services_captiveportal_mac_edit.php:230
+msgid "Edit MAC Address Rules"
+msgstr ""
+
 #: src/usr/local/www/services_captiveportal_mac_edit.php:237
 msgid "Choose what to do with packets coming from this MAC address."
 msgstr ""
@@ -17208,9 +18667,10 @@ msgid "Voucher database has been synchronized from %1$s:%2$s"
 msgstr ""
 
 #: src/usr/local/www/services_captiveportal_vouchers.php:449
-#: src/usr/local/www/status_captiveportal.php:135
-#: src/usr/local/www/status_captiveportal_expire.php:93
-#: src/usr/local/www/status_captiveportal_test.php:94
+#: src/usr/local/www/services_captiveportal_vouchers_edit.php:217
+#: src/usr/local/www/status_captiveportal.php:142
+#: src/usr/local/www/status_captiveportal_expire.php:103
+#: src/usr/local/www/status_captiveportal_test.php:111
 #: src/usr/local/www/status_captiveportal_voucher_rolls.php:85
 #: src/usr/local/www/status_captiveportal_voucher_rolls.php:99
 #: src/usr/local/www/status_captiveportal_vouchers.php:135
@@ -17252,7 +18712,7 @@ msgstr ""
 
 #: src/usr/local/www/services_captiveportal_vouchers.php:510
 #: src/usr/local/www/services_captiveportal_vouchers.php:521
-msgid "Create, generate and activate Rolls with Vouchers"
+msgid "Create, Generate and Activate Rolls with Vouchers"
 msgstr ""
 
 #: src/usr/local/www/services_captiveportal_vouchers.php:526
@@ -17352,7 +18812,7 @@ msgid ""
 msgstr ""
 
 #: src/usr/local/www/services_captiveportal_vouchers.php:591
-msgid "Voucher database synchronization"
+msgid "Voucher Database Synchronization"
 msgstr ""
 
 #: src/usr/local/www/services_captiveportal_vouchers.php:598
@@ -17399,13 +18859,9 @@ msgstr ""
 msgid "Generate new keys"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal_vouchers_edit.php:71
-msgid "Edit Voucher Rolls"
-msgstr ""
-
 #: src/usr/local/www/services_captiveportal_vouchers_edit.php:124
-#: src/usr/local/www/services_dhcp.php:1169
-#: src/usr/local/www/services_dhcpv6.php:839
+#: src/usr/local/www/services_dhcp.php:1192
+#: src/usr/local/www/services_dhcpv6.php:939
 msgid "Number"
 msgstr ""
 
@@ -17438,10 +18894,6 @@ msgstr ""
 msgid "All %1$s vouchers from Roll %2$s marked unused"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal_vouchers_edit.php:217
-msgid "Voucher rolls"
-msgstr ""
-
 #: src/usr/local/www/services_captiveportal_vouchers_edit.php:224
 #, php-format
 msgid "Enter the Roll# (0..%d) found on top of the generated/printed vouchers"
@@ -17469,10 +18921,6 @@ msgstr ""
 msgid "Can be used to further identify this roll. Ignored by the system."
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal_zones.php:93
-msgid "Zones"
-msgstr ""
-
 #: src/usr/local/www/services_captiveportal_zones.php:102
 msgid "The Captive Portal entry list has been changed."
 msgstr ""
@@ -17482,7 +18930,7 @@ msgid "Captive Portal Zones"
 msgstr ""
 
 #: src/usr/local/www/services_captiveportal_zones.php:112
-#: src/usr/local/www/services_rfc2136_edit.php:222
+#: src/usr/local/www/services_rfc2136_edit.php:241
 msgid "Zone"
 msgstr ""
 
@@ -17524,382 +18972,394 @@ msgstr ""
 msgid "Zone description"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:245
-#: src/usr/local/www/services_dhcpv6.php:193
+#: src/usr/local/www/services_dhcp.php:268
+#: src/usr/local/www/services_dhcpv6.php:249
 msgid "Range begin"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:245
-#: src/usr/local/www/services_dhcpv6.php:193
+#: src/usr/local/www/services_dhcp.php:268
+#: src/usr/local/www/services_dhcpv6.php:249
 msgid "Range end"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:250
-#: src/usr/local/www/services_dhcp.php:253
-#: src/usr/local/www/services_dhcpv6.php:204
-#: src/usr/local/www/services_dhcpv6.php:207
+#: src/usr/local/www/services_dhcp.php:273
+msgid ""
+"Ignore Denied Clients may not be used when a Failover Peer IP is defined."
+msgstr ""
+
+#: src/usr/local/www/services_dhcp.php:277
+#: src/usr/local/www/services_dhcp.php:280
+#: src/usr/local/www/services_dhcpv6.php:287
+#: src/usr/local/www/services_dhcpv6.php:297
 msgid "A valid range must be specified."
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:256
-#: src/usr/local/www/services_dhcp_edit.php:270
+#: src/usr/local/www/services_dhcp.php:283
+#: src/usr/local/www/services_dhcp_edit.php:268
 msgid "A valid IP address must be specified for the gateway."
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:259
-#: src/usr/local/www/services_dhcp_edit.php:273
+#: src/usr/local/www/services_dhcp.php:286
+#: src/usr/local/www/services_dhcp_edit.php:271
 msgid ""
 "A valid IP address must be specified for the primary/secondary WINS servers."
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:265
-#: src/usr/local/www/services_dhcp_edit.php:280
+#: src/usr/local/www/services_dhcp.php:292
+#: src/usr/local/www/services_dhcp_edit.php:278
 #, php-format
 msgid ""
 "The gateway address %s does not lie within the chosen interface's subnet."
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:270
-#: src/usr/local/www/services_dhcp_edit.php:287
+#: src/usr/local/www/services_dhcp.php:297
+#: src/usr/local/www/services_dhcp_edit.php:285
 msgid "A valid IP address must be specified for each of the DNS servers."
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:274
-#: src/usr/local/www/services_dhcp_edit.php:291
-#: src/usr/local/www/services_dhcpv6.php:220
+#: src/usr/local/www/services_dhcp.php:301
+#: src/usr/local/www/services_dhcp_edit.php:289
+#: src/usr/local/www/services_dhcpv6.php:316
 msgid "The default lease time must be at least 60 seconds."
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:296
+#: src/usr/local/www/services_dhcp.php:323
 #, 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:302
-#: src/usr/local/www/services_dhcp_edit.php:294
-#: src/usr/local/www/services_dhcpv6.php:223
+#: src/usr/local/www/services_dhcp.php:329
+#: src/usr/local/www/services_dhcp_edit.php:292
+#: src/usr/local/www/services_dhcpv6.php:319
 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:305
-#: src/usr/local/www/services_dhcp_edit.php:297
-#: src/usr/local/www/services_dhcpv6.php:226
+#: src/usr/local/www/services_dhcp.php:332
+#: src/usr/local/www/services_dhcp_edit.php:295
+#: src/usr/local/www/services_dhcpv6.php:322
 msgid "A valid domain name must be specified for the dynamic DNS registration."
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:308
-#: src/usr/local/www/services_dhcp_edit.php:300
+#: src/usr/local/www/services_dhcp.php:335
+#: src/usr/local/www/services_dhcp_edit.php:298
 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:312
-#: src/usr/local/www/services_dhcp_edit.php:304
-#: src/usr/local/www/services_dhcpv6.php:233
+#: src/usr/local/www/services_dhcp.php:339
+#: src/usr/local/www/services_dhcp_edit.php:302
+#: src/usr/local/www/services_dhcpv6.php:329
 msgid "You must specify both a valid domain key and key name."
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:318
-#: src/usr/local/www/services_dhcp_edit.php:310
-#: src/usr/local/www/services_dhcpv6.php:239
-#: src/usr/local/www/services_router_advertisements.php:192
+#: src/usr/local/www/services_dhcp.php:345
+#: src/usr/local/www/services_dhcp_edit.php:308
+#: src/usr/local/www/services_dhcpv6.php:335
+#: src/usr/local/www/services_router_advertisements.php:195
 msgid "A valid domain search list must be specified."
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:326
+#: src/usr/local/www/services_dhcp.php:353
 msgid ""
 "If you specify a mac allow list, it must contain only valid partial MAC "
 "addresses."
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:329
+#: src/usr/local/www/services_dhcp.php:356
 msgid ""
 "If you specify a mac deny list, it must contain only valid partial MAC "
 "addresses."
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:333
-#: src/usr/local/www/services_dhcp_edit.php:317
+#: src/usr/local/www/services_dhcp.php:360
+#: src/usr/local/www/services_dhcp_edit.php:315
 msgid ""
 "A valid IP address must be specified for the primary/secondary NTP servers."
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:336
-#: src/usr/local/www/services_dhcpv6.php:249
+#: src/usr/local/www/services_dhcp.php:363
+#: src/usr/local/www/services_dhcpv6.php:345
 msgid "A valid domain name must be specified for the DNS domain."
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:339
-#: src/usr/local/www/services_dhcp_edit.php:320
+#: src/usr/local/www/services_dhcp.php:366
+#: src/usr/local/www/services_dhcp_edit.php:318
 msgid "A valid IP address or hostname must be specified for the TFTP server."
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:342
-#: src/usr/local/www/services_dhcp_edit.php:323
+#: src/usr/local/www/services_dhcp.php:369
+#: src/usr/local/www/services_dhcp_edit.php:321
 msgid "A valid IP address must be specified for the network boot server."
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:346
+#: src/usr/local/www/services_dhcp.php:373
 msgid "You cannot use the network address in the starting subnet range."
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:349
+#: src/usr/local/www/services_dhcp.php:376
 msgid "You cannot use the broadcast address in the ending subnet range."
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:357
+#: src/usr/local/www/services_dhcp.php:384
 #, php-format
 msgid "The subnet range cannot overlap with virtual IP address %s."
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:373
+#: src/usr/local/www/services_dhcp.php:400
 msgid ""
 "Cannot enable static ARP when you have static map entries without IP "
 "addresses. Ensure all static maps have IP addresses and try again."
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:380
+#: src/usr/local/www/services_dhcp.php:407
 msgid "Text type cannot include quotation marks."
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:382
+#: src/usr/local/www/services_dhcp.php:409
 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:384
+#: src/usr/local/www/services_dhcp.php:411
 msgid "Boolean type must be true, false, on, or off."
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:386
+#: src/usr/local/www/services_dhcp.php:413
 msgid "Unsigned 8-bit integer type must be a number in the range 0 to 255."
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:388
+#: src/usr/local/www/services_dhcp.php:415
 msgid "Unsigned 16-bit integer type must be a number in the range 0 to 65535."
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:390
+#: src/usr/local/www/services_dhcp.php:417
 msgid ""
 "Unsigned 32-bit integer type must be a number in the range 0 to 4294967295."
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:392
+#: src/usr/local/www/services_dhcp.php:419
 msgid "Signed 8-bit integer type must be a number in the range -128 to 127."
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:394
+#: src/usr/local/www/services_dhcp.php:421
 msgid ""
 "Signed 16-bit integer type must be a number in the range -32768 to 32767."
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:396
+#: src/usr/local/www/services_dhcp.php:423
 msgid ""
 "Signed 32-bit integer type must be a number in the range -2147483648 to "
 "2147483647."
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:398
+#: src/usr/local/www/services_dhcp.php:425
 msgid "IP address or host type must be an IP address or host name."
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:409
-#: src/usr/local/www/services_dhcpv6.php:290
+#: src/usr/local/www/services_dhcp.php:433
+#: src/usr/local/www/services_dhcpv6.php:386
 msgid "The range is invalid (first element higher than second element)."
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:413
-#: src/usr/local/www/services_dhcpv6.php:285
+#: src/usr/local/www/services_dhcp.php:438
+#: src/usr/local/www/services_dhcpv6.php:381
 msgid "The specified range lies outside of the current subnet."
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:419
+#: src/usr/local/www/services_dhcp.php:448
 msgid ""
 "The specified range must not be within the DHCP range for this interface."
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:430
+#: src/usr/local/www/services_dhcp.php:461
 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:437
-#: src/usr/local/www/services_dhcpv6.php:295
+#: src/usr/local/www/services_dhcp.php:468
+#: src/usr/local/www/services_dhcpv6.php:391
 #, php-format
 msgid ""
 "You must disable the DHCP relay on the %s interface before enabling the DHCP "
 "server."
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:449
-#: src/usr/local/www/services_dhcpv6.php:312
+#: src/usr/local/www/services_dhcp.php:477
+#: src/usr/local/www/services_dhcpv6.php:408
 #, php-format
 msgid "The DHCP range cannot overlap any static DHCP mappings."
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:660
-#: src/usr/local/www/status_dhcp_leases.php:477
+#: src/usr/local/www/services_dhcp.php:688
+#: src/usr/local/www/status_dhcp_leases.php:495
 msgid "Pool Start"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:661
-#: src/usr/local/www/status_dhcp_leases.php:478
+#: src/usr/local/www/services_dhcp.php:689
+#: src/usr/local/www/status_dhcp_leases.php:496
 msgid "Pool End"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:712
-#: src/usr/local/www/services_dhcpv6.php:453
+#: src/usr/local/www/services_dhcp.php:744
 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:718
-#: src/usr/local/www/services_dhcpv6.php:459
+#: src/usr/local/www/services_dhcp.php:750
+#: src/usr/local/www/services_dhcpv6.php:530
 msgid "The static mapping configuration has been changed."
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:744
+#: src/usr/local/www/services_dhcp.php:776
 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:757
-msgid "General Options"
-msgstr ""
-
-#: src/usr/local/www/services_dhcp.php:763
+#: src/usr/local/www/services_dhcp.php:795
 #, php-format
 msgid "Enable DHCP server on %s interface"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:775
+#: src/usr/local/www/services_dhcp.php:799
+msgid ""
+"Editing pool-specific options. To return to the Interface, click its tab "
+"above."
+msgstr ""
+
+#: src/usr/local/www/services_dhcp.php:804
 msgid "Deny unknown clients"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:782
+#: src/usr/local/www/services_dhcp.php:811
 msgid "Ignore denied clients"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:791
+#: src/usr/local/www/services_dhcp.php:814
+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:820
 msgid "Pool Description"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:817
+#: src/usr/local/www/services_dhcp.php:840
 msgid "In-use DHCP Pool Ranges:"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:830
+#: src/usr/local/www/services_dhcp.php:853
 msgid "Available range"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:843
-#: src/usr/local/www/services_dhcpv6.php:578
+#: src/usr/local/www/services_dhcp.php:866
+#: src/usr/local/www/services_dhcpv6.php:657
 msgid "Range"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:862
-msgid "Additional pools"
+#: src/usr/local/www/services_dhcp.php:885
+msgid "Additional Pools"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:866
+#: src/usr/local/www/services_dhcp.php:889
 msgid "Add pool"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:873
+#: src/usr/local/www/services_dhcp.php:896
 msgid ""
 "If you need additional pools of addresses inside of this subnet outside the "
 "above Range, they may be specified here"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:889
-#: src/usr/local/www/vpn_openvpn_csc.php:559
+#: src/usr/local/www/services_dhcp.php:912
+#: src/usr/local/www/vpn_openvpn_csc.php:563
 msgid "WINS servers"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:902
+#: src/usr/local/www/services_dhcp.php:925
 msgid "DNS servers"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:904
+#: src/usr/local/www/services_dhcp.php:927
 msgid ""
 "Leave blank to use the system default DNS servers, use this interface's IP "
 "if DNS Forwarder or Resolver is enabled, otherwise use the servers "
 "configured on the General page"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:909
-msgid "Other options"
+#: src/usr/local/www/services_dhcp.php:932
+msgid "Other Options"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:916
+#: src/usr/local/www/services_dhcp.php:939
 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 your network. Type \"none\" for no gateway assignment"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:920
-#: src/usr/local/www/services_dhcp_edit.php:561
+#: src/usr/local/www/services_dhcp.php:943
+#: src/usr/local/www/services_dhcp_edit.php:565
 msgid "Domain name"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:923
+#: src/usr/local/www/services_dhcp.php:946
 msgid ""
 "The default is to use the domain name of this system as the default domain "
 "name provided by DHCP. You may specify an alternate domain name here"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:927
-#: src/usr/local/www/services_dhcp_edit.php:568
-#: src/usr/local/www/services_dhcpv6.php:648
-#: src/usr/local/www/services_router_advertisements.php:410
+#: src/usr/local/www/services_dhcp.php:950
+#: src/usr/local/www/services_dhcp_edit.php:572
+#: src/usr/local/www/services_dhcpv6.php:728
+#: src/usr/local/www/services_router_advertisements.php:390
 msgid "Domain search list"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:930
-#: src/usr/local/www/services_dhcp_edit.php:571
-#: src/usr/local/www/services_dhcpv6.php:651
+#: src/usr/local/www/services_dhcp.php:953
+#: src/usr/local/www/services_dhcp_edit.php:575
+#: src/usr/local/www/services_dhcpv6.php:731
 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:934
-#: src/usr/local/www/services_dhcpv6.php:655
+#: src/usr/local/www/services_dhcp.php:957
+#: src/usr/local/www/services_dhcpv6.php:735
 msgid "Default lease time"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:937
+#: src/usr/local/www/services_dhcp.php:960
 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:941
+#: src/usr/local/www/services_dhcp.php:964
 msgid "Maximum lease time"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:944
+#: src/usr/local/www/services_dhcp.php:967
 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:949
+#: src/usr/local/www/services_dhcp.php:972
 msgid "Failover peer IP"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:951
+#: src/usr/local/www/services_dhcp.php:974
 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 "
@@ -17907,262 +19367,258 @@ msgid ""
 "(and the other is &gt; 20)."
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:958
-#: src/usr/local/www/services_dhcp.php:1292
+#: src/usr/local/www/services_dhcp.php:981
+#: src/usr/local/www/services_dhcp.php:1315
 #: src/usr/local/www/widgets/widgets/wake_on_lan.widget.php:93
 msgid "Static ARP"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:961
+#: src/usr/local/www/services_dhcp.php:984
 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:965
+#: src/usr/local/www/services_dhcp.php:988
 msgid "Time format change"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:968
+#: src/usr/local/www/services_dhcp.php:991
 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:972
+#: src/usr/local/www/services_dhcp.php:995
 msgid "Statistics graphs"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:975
+#: src/usr/local/www/services_dhcp.php:998
 msgid ""
 "Enable this to add DHCP leases statistics to the RRD graphs. Disabled by "
 "default."
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:1000
-#: src/usr/local/www/services_dhcp_edit.php:608
-#: src/usr/local/www/services_dhcpv6.php:699
+#: src/usr/local/www/services_dhcp.php:1023
+#: src/usr/local/www/services_dhcp_edit.php:612
+#: src/usr/local/www/services_dhcpv6.php:779
 msgid "DDNS Domain"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:1003
+#: src/usr/local/www/services_dhcp.php:1026
 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:1008
+#: src/usr/local/www/services_dhcp.php:1031
 msgid "Primary DDNS address"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:1010
+#: src/usr/local/www/services_dhcp.php:1033
 msgid "Primary domain name server IP address for the dynamic domain name"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:1014
+#: src/usr/local/www/services_dhcp.php:1037
 msgid "DNS Domain key"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:1017
+#: src/usr/local/www/services_dhcp.php:1040
 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:1021
+#: src/usr/local/www/services_dhcp.php:1044
 msgid "DNS Domain key secret"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:1024
+#: src/usr/local/www/services_dhcp.php:1047
 msgid ""
 "Dynamic DNS domain key secret which will be used to register client names in "
 "the DNS server"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:1035
+#: src/usr/local/www/services_dhcp.php:1058
 msgid "MAC address control"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:1041
+#: src/usr/local/www/services_dhcp.php:1064
 msgid "MAC Allow"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:1044
+#: src/usr/local/www/services_dhcp.php:1067
 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:1048
+#: src/usr/local/www/services_dhcp.php:1071
 msgid "MAC Deny"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:1051
+#: src/usr/local/www/services_dhcp.php:1074
 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:1068
-#: src/usr/local/www/services_dhcp_edit.php:649
-#: src/usr/local/www/services_dhcpv6.php:740
-#: src/usr/local/www/vpn_openvpn_server.php:1075
+#: src/usr/local/www/services_dhcp.php:1091
+#: src/usr/local/www/services_dhcp_edit.php:653
+#: src/usr/local/www/services_dhcpv6.php:840
+#: src/usr/local/www/vpn_openvpn_server.php:1080
 msgid "NTP Server 1"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:1074
-#: src/usr/local/www/services_dhcp_edit.php:657
-#: src/usr/local/www/services_dhcpv6.php:748
-#: src/usr/local/www/vpn_openvpn_server.php:1082
+#: src/usr/local/www/services_dhcp.php:1097
+#: src/usr/local/www/services_dhcp_edit.php:661
+#: src/usr/local/www/services_dhcpv6.php:848
+#: src/usr/local/www/vpn_openvpn_server.php:1087
 msgid "NTP Server 2"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:1087
+#: src/usr/local/www/services_dhcp.php:1110
 msgid "TFTP"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:1093
-#: src/usr/local/www/services_dhcp_edit.php:681
+#: src/usr/local/www/services_dhcp.php:1116
+#: src/usr/local/www/services_dhcp_edit.php:685
 msgid "TFTP Server"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:1095
+#: src/usr/local/www/services_dhcp.php:1118
 msgid ""
 "Leave blank to disable.  Enter a full hostname or IP for the TFTP server"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:1106
-#: src/usr/local/www/services_dhcpv6.php:766
+#: src/usr/local/www/services_dhcp.php:1129
+#: src/usr/local/www/services_dhcpv6.php:866
 msgid "LDAP"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:1112
+#: src/usr/local/www/services_dhcp.php:1135
 msgid "LDAP Server URI"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:1115
+#: src/usr/local/www/services_dhcp.php:1138
 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:1128
-#: src/usr/local/www/services_dhcp.php:1132
-#: src/usr/local/www/services_dhcpv6.php:811
+#: src/usr/local/www/services_dhcp.php:1151
+#: src/usr/local/www/services_dhcp.php:1155
+#: src/usr/local/www/services_dhcpv6.php:911
 msgid "Additional BOOTP/DHCP Options"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:1137
+#: src/usr/local/www/services_dhcp.php:1160
 msgid ""
 "Enter the DHCP option number and the value for each item you would like to "
 "include in the DHCP lease information."
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:1138
+#: src/usr/local/www/services_dhcp.php:1161
 #, 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:1146
+#: src/usr/local/www/services_dhcp.php:1169
 msgid "Text"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:1146
+#: src/usr/local/www/services_dhcp.php:1169
 msgid "String"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:1146
+#: src/usr/local/www/services_dhcp.php:1169
 msgid "Boolean"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:1147
+#: src/usr/local/www/services_dhcp.php:1170
 msgid "Unsigned 8-bit integer"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:1147
+#: src/usr/local/www/services_dhcp.php:1170
 msgid "Unsigned 16-bit integer"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:1147
+#: src/usr/local/www/services_dhcp.php:1170
 msgid "Unsigned 32-bit integer"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:1148
+#: src/usr/local/www/services_dhcp.php:1171
 msgid "Signed 8-bit integer"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:1148
+#: src/usr/local/www/services_dhcp.php:1171
 msgid "Signed 16-bit integer"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:1148
+#: src/usr/local/www/services_dhcp.php:1171
 msgid "Signed 32-bit integer"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:1148
+#: src/usr/local/www/services_dhcp.php:1171
 msgid "IP address or host"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:1161
+#: src/usr/local/www/services_dhcp.php:1184
 msgid "Option"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:1208
-#: src/usr/local/www/services_dhcpv6.php:785
-#: src/usr/local/www/services_dhcpv6.php:791
-msgid "Network booting"
+#: src/usr/local/www/services_dhcp.php:1231
+msgid "Network Booting"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:1219
+#: src/usr/local/www/services_dhcp.php:1242
 msgid "Next Server"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:1221
+#: src/usr/local/www/services_dhcp.php:1244
 msgid "Enter the IP address of the next server"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:1225
+#: src/usr/local/www/services_dhcp.php:1248
 msgid "Default BIOS file name"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:1232
+#: src/usr/local/www/services_dhcp.php:1255
 msgid "UEFI 32 bit file name"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:1239
+#: src/usr/local/www/services_dhcp.php:1262
 msgid "UEFI 64 bit file name"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:1242
+#: src/usr/local/www/services_dhcp.php:1265
 msgid ""
 "You need both a filename and a boot server configured for this to work! You "
 "will need all three filenames and a boot server configured for UEFI to work! "
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:1247
-#: src/usr/local/www/services_dhcpv6_edit.php:272
+#: src/usr/local/www/services_dhcp.php:1270
+#: src/usr/local/www/services_dhcpv6_edit.php:289
 msgid "Root path"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:1250
+#: src/usr/local/www/services_dhcp.php:1273
 msgid "string-format: iscsi:(servername):(protocol):(port):(LUN):targetname "
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:1287
-msgid "DHCP Static Mappings for this interface"
+#: src/usr/local/www/services_dhcp.php:1310
+msgid "DHCP Static Mappings for this Interface"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:1327
-#: src/usr/local/www/services_dhcp_edit.php:410
-#: src/usr/local/www/services_dhcpv6.php:930
-#: src/usr/local/www/services_dhcpv6_edit.php:217
-#: src/usr/local/www/status_dhcp_leases.php:452
+#: src/usr/local/www/services_dhcp.php:1350
+#: src/usr/local/www/services_dhcpv6.php:1030
+#: src/usr/local/www/status_dhcp_leases.php:470
 msgid "Edit static mapping"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:1328
-#: src/usr/local/www/services_dhcpv6.php:931
+#: src/usr/local/www/services_dhcp.php:1351
+#: src/usr/local/www/services_dhcpv6.php:1031
 msgid "Delete static mapping"
 msgstr ""
 
@@ -18205,184 +19661,189 @@ msgid ""
 "this interface."
 msgstr ""
 
-#: src/usr/local/www/services_dhcp_edit.php:257
+#: src/usr/local/www/services_dhcp_edit.php:255
 #, php-format
 msgid "The IP address must lie in the %s subnet."
 msgstr ""
 
-#: src/usr/local/www/services_dhcp_edit.php:261
+#: src/usr/local/www/services_dhcp_edit.php:259
 #, php-format
 msgid "The IP address cannot be the %s network address."
 msgstr ""
 
-#: src/usr/local/www/services_dhcp_edit.php:265
+#: src/usr/local/www/services_dhcp_edit.php:263
 #, php-format
 msgid "The IP address cannot be the %s broadcast address."
 msgstr ""
 
-#: src/usr/local/www/services_dhcp_edit.php:441
+#: src/usr/local/www/services_dhcp_edit.php:414
+#: src/usr/local/www/services_dhcpv6_edit.php:234
+msgid "Edit Static Mapping"
+msgstr ""
+
+#: src/usr/local/www/services_dhcp_edit.php:445
 msgid "MAC address (6 hex octets separated by colons)"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp_edit.php:446
+#: src/usr/local/www/services_dhcp_edit.php:450
 msgid "Client Identifier"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp_edit.php:455
+#: src/usr/local/www/services_dhcp_edit.php:459
 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:463
-#: src/usr/local/www/services_dhcpv6_edit.php:253
+#: src/usr/local/www/services_dhcp_edit.php:467
+#: src/usr/local/www/services_dhcpv6_edit.php:270
 msgid "Name of the host, without domain part."
 msgstr ""
 
-#: src/usr/local/www/services_dhcp_edit.php:468
-#: src/usr/local/www/services_dhcpv6_edit.php:265
+#: src/usr/local/www/services_dhcp_edit.php:472
+#: src/usr/local/www/services_dhcpv6_edit.php:282
 msgid "Netboot filename"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp_edit.php:471
-#: src/usr/local/www/services_dhcpv6_edit.php:268
+#: src/usr/local/www/services_dhcp_edit.php:475
+#: src/usr/local/www/services_dhcpv6_edit.php:285
 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:475
+#: src/usr/local/www/services_dhcp_edit.php:479
 msgid "Root Path"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp_edit.php:478
+#: src/usr/local/www/services_dhcp_edit.php:482
 msgid "Enter the root-path-string, overrides setting on main page."
 msgstr ""
 
-#: src/usr/local/www/services_dhcp_edit.php:490
+#: src/usr/local/www/services_dhcp_edit.php:494
 msgid "ARP Table Static Entry"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp_edit.php:495
+#: src/usr/local/www/services_dhcp_edit.php:499
 #: src/usr/local/www/vpn_ipsec_mobile.php:665
 msgid "WINS Servers"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp_edit.php:514
-#: src/usr/local/www/services_dhcpv6.php:624
+#: src/usr/local/www/services_dhcp_edit.php:518
+#: src/usr/local/www/services_dhcpv6.php:704
 #: src/usr/local/www/services_pppoe_edit.php:390
 #: src/usr/local/www/vpn_ipsec_mobile.php:640
-#: src/usr/local/www/vpn_openvpn_csc.php:467
+#: src/usr/local/www/vpn_openvpn_csc.php:471
 msgid "DNS Servers"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp_edit.php:548
+#: src/usr/local/www/services_dhcp_edit.php:552
 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:557
+#: src/usr/local/www/services_dhcp_edit.php:561
 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 your network."
 msgstr ""
 
-#: src/usr/local/www/services_dhcp_edit.php:564
-#: src/usr/local/www/services_dhcpv6.php:644
+#: src/usr/local/www/services_dhcp_edit.php:568
+#: src/usr/local/www/services_dhcpv6.php:724
 msgid ""
 "The default is to use the domain name of this system as the default domain "
 "name provided by DHCP. You may specify an alternate domain name here. "
 msgstr ""
 
-#: src/usr/local/www/services_dhcp_edit.php:575
+#: src/usr/local/www/services_dhcp_edit.php:579
 msgid "Default lease time (Seconds)"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp_edit.php:578
+#: src/usr/local/www/services_dhcp_edit.php:582
 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:582
+#: src/usr/local/www/services_dhcp_edit.php:586
 msgid "Maximum lease time (Seconds)"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp_edit.php:585
+#: src/usr/local/www/services_dhcp_edit.php:589
 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_edit.php:601
-#: src/usr/local/www/services_dhcpv6.php:692
+#: src/usr/local/www/services_dhcp_edit.php:605
+#: src/usr/local/www/services_dhcpv6.php:772
 #: src/usr/local/www/services_dnsmasq.php:244
-#: src/usr/local/www/services_unbound.php:327
+#: src/usr/local/www/services_unbound.php:352
 msgid "DHCP Registration"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp_edit.php:611
-#: src/usr/local/www/services_dhcpv6.php:702
+#: src/usr/local/www/services_dhcp_edit.php:615
+#: src/usr/local/www/services_dhcpv6.php:782
 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:615
-#: src/usr/local/www/services_dhcpv6.php:706
+#: src/usr/local/www/services_dhcp_edit.php:619
+#: src/usr/local/www/services_dhcpv6.php:786
 msgid "DDNS Server IP"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp_edit.php:617
-#: src/usr/local/www/services_dhcpv6.php:708
+#: src/usr/local/www/services_dhcp_edit.php:621
+#: src/usr/local/www/services_dhcpv6.php:788
 msgid ""
 "Enter the primary domain name server IP address for the dynamic domain name."
 msgstr ""
 
-#: src/usr/local/www/services_dhcp_edit.php:621
-#: src/usr/local/www/services_dhcpv6.php:712
+#: src/usr/local/www/services_dhcp_edit.php:625
+#: src/usr/local/www/services_dhcpv6.php:792
 msgid "DDNS Domain Key name"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp_edit.php:624
-#: src/usr/local/www/services_dhcpv6.php:715
+#: src/usr/local/www/services_dhcp_edit.php:628
+#: src/usr/local/www/services_dhcpv6.php:795
 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:628
-#: src/usr/local/www/services_dhcpv6.php:719
+#: src/usr/local/www/services_dhcp_edit.php:632
+#: src/usr/local/www/services_dhcpv6.php:799
 msgid "DDNS Domain Key secret"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp_edit.php:631
-#: src/usr/local/www/services_dhcpv6.php:722
+#: src/usr/local/www/services_dhcp_edit.php:635
+#: src/usr/local/www/services_dhcpv6.php:802
 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:641
-#: src/usr/local/www/services_dhcpv6.php:732
+#: src/usr/local/www/services_dhcp_edit.php:645
+#: src/usr/local/www/services_dhcpv6.php:832
 msgid "NTP servers"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp_edit.php:645
-#: src/usr/local/www/services_dhcpv6.php:736
-#: src/usr/local/www/vpn_openvpn_csc.php:508
+#: src/usr/local/www/services_dhcp_edit.php:649
+#: src/usr/local/www/services_dhcpv6.php:836
+#: src/usr/local/www/vpn_openvpn_csc.php:512
 msgid "NTP Servers"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp_edit.php:675
+#: src/usr/local/www/services_dhcp_edit.php:679
 msgid "TFTP servers"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp_edit.php:684
+#: 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 ""
@@ -18403,7 +19864,7 @@ msgid ""
 msgstr ""
 
 #: src/usr/local/www/services_dhcp_relay.php:174
-msgid "DHCP Relay configuration"
+msgid "DHCP Relay Configuration"
 msgstr ""
 
 #: src/usr/local/www/services_dhcp_relay.php:185
@@ -18434,194 +19895,250 @@ msgid ""
 "This is the IP address of the server to which DHCP requests are relayed."
 msgstr ""
 
-#: src/usr/local/www/services_dhcpv6.php:198
-#: src/usr/local/www/services_dhcpv6.php:201
+#: src/usr/local/www/services_dhcpv6.php:254
+#: src/usr/local/www/services_dhcpv6.php:257
 msgid "A valid prefix range must be specified."
 msgstr ""
 
-#: src/usr/local/www/services_dhcpv6.php:210
+#: src/usr/local/www/services_dhcpv6.php:269
+#, php-format
+msgid "Prefix Delegation From address is not a valid IPv6 Netmask for %s"
+msgstr ""
+
+#: src/usr/local/www/services_dhcpv6.php:280
+#, php-format
+msgid "Prefix Delegation To address is not a valid IPv6 Netmask for %s"
+msgstr ""
+
+#: src/usr/local/www/services_dhcpv6.php:291
+#: src/usr/local/www/services_dhcpv6.php:301
+#: src/usr/local/www/services_dhcpv6_edit.php:167
+#, php-format
+msgid "The prefix (upper %s bits) must be zero.  Use the form %s"
+msgstr ""
+
+#: src/usr/local/www/services_dhcpv6.php:306
 msgid "A valid IPv6 address must be specified for the gateway."
 msgstr ""
 
-#: src/usr/local/www/services_dhcpv6.php:216
-#: src/usr/local/www/services_router_advertisements.php:186
+#: src/usr/local/www/services_dhcpv6.php:312
+#: src/usr/local/www/services_router_advertisements.php:189
 msgid "A valid IPv6 address must be specified for each of the DNS servers."
 msgstr ""
 
-#: src/usr/local/www/services_dhcpv6.php:229
+#: src/usr/local/www/services_dhcpv6.php:325
 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:246
+#: src/usr/local/www/services_dhcpv6.php:342
 msgid ""
 "A valid IPv6 address must be specified for the primary/secondary NTP servers."
 msgstr ""
 
-#: src/usr/local/www/services_dhcpv6.php:252
+#: src/usr/local/www/services_dhcpv6.php:348
 msgid "A valid IPv6 address or hostname must be specified for the TFTP server."
 msgstr ""
 
-#: src/usr/local/www/services_dhcpv6.php:255
+#: src/usr/local/www/services_dhcpv6.php:351
 msgid "A valid URL must be specified for the network bootfile."
 msgstr ""
 
-#: src/usr/local/www/services_dhcpv6.php:263
+#: src/usr/local/www/services_dhcpv6.php:359
 #, php-format
 msgid "The subnet range cannot overlap with virtual IPv6 address %s."
 msgstr ""
 
-#: src/usr/local/www/services_dhcpv6.php:507
+#: src/usr/local/www/services_dhcpv6.php:524
+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:581
 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:516
-#: src/usr/local/www/services_router_advertisements.php:240
-#: src/usr/local/www/services_router_advertisements.php:283
+#: src/usr/local/www/services_dhcpv6.php:590
+#: src/usr/local/www/services_router_advertisements.php:247
+#: src/usr/local/www/services_router_advertisements.php:289
 msgid "Router Advertisements"
 msgstr ""
 
-#: src/usr/local/www/services_dhcpv6.php:524
+#: src/usr/local/www/services_dhcpv6.php:598
 msgid "DHCPv6 Options"
 msgstr ""
 
-#: src/usr/local/www/services_dhcpv6.php:541
-#: src/usr/local/www/services_dhcpv6.php:554
+#: src/usr/local/www/services_dhcpv6.php:620
+#: src/usr/local/www/services_dhcpv6.php:633
 msgid "Subnet Mask"
 msgstr ""
 
-#: src/usr/local/www/services_dhcpv6.php:546
+#: src/usr/local/www/services_dhcpv6.php:625
 msgid "Available Range"
 msgstr ""
 
-#: src/usr/local/www/services_dhcpv6.php:602
+#: src/usr/local/www/services_dhcpv6.php:627
+msgid ""
+"Prefix Delegation subnet will be appended to the beginning of the defined "
+"range"
+msgstr ""
+
+#: src/usr/local/www/services_dhcpv6.php:682
 msgid "Prefix Delegation Range"
 msgstr ""
 
-#: src/usr/local/www/services_dhcpv6.php:611
+#: src/usr/local/www/services_dhcpv6.php:691
 msgid "Prefix Delegation Size"
 msgstr ""
 
-#: src/usr/local/www/services_dhcpv6.php:622
+#: src/usr/local/www/services_dhcpv6.php:702
 msgid ""
 "You can define a Prefix range 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:636
+#: src/usr/local/www/services_dhcpv6.php:716
 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:641
+#: src/usr/local/www/services_dhcpv6.php:721
 #: src/usr/local/www/services_dyndns_edit.php:135
-#: src/usr/local/www/services_dyndns_edit.php:320
+#: src/usr/local/www/services_dyndns_edit.php:330
 msgid "Domain Name"
 msgstr ""
 
-#: src/usr/local/www/services_dhcpv6.php:658
-msgid ""
-"Seconds . Used for clients that do not ask for a specific expiration time.  "
-"<br />The default is 7200 seconds."
+#: src/usr/local/www/services_dhcpv6.php:738
+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:743
+msgid "Max lease time"
+msgstr ""
+
+#: src/usr/local/www/services_dhcpv6.php:746
+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:751
+msgid "Time Format Change"
+msgstr ""
+
+#: src/usr/local/www/services_dhcpv6.php:754
+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:809
+#: src/usr/local/www/services_unbound_acls.php:265
+msgid "Allow"
+msgstr ""
+
+#: src/usr/local/www/services_dhcpv6.php:811
+msgid "Ignore"
 msgstr ""
 
-#: src/usr/local/www/services_dhcpv6.php:663
-msgid "Max lease time"
+#: src/usr/local/www/services_dhcpv6.php:806
+msgid "DDNS Client Updates"
 msgstr ""
 
-#: src/usr/local/www/services_dhcpv6.php:666
+#: src/usr/local/www/services_dhcpv6.php:812
 msgid ""
-"Maximum lease time for clients that ask for a specific expiration time. <br /"
-">The default is 86400 seconds."
+"How Forward entries are handled when client indicates they wish to update "
+"DNS.  Allow prevents DHCP from updating Forward entries, Deny indicates that "
+"DHCP will do the updates and the client should not, Ignore specifies that "
+"DHCP will do the update and the client can also attempt the update usually "
+"using a different domain name."
 msgstr ""
 
-#: src/usr/local/www/services_dhcpv6.php:671
-msgid "Time Format Change"
+#: src/usr/local/www/services_dhcpv6.php:819
+msgid "DDNS Reverse"
 msgstr ""
 
-#: src/usr/local/www/services_dhcpv6.php:674
-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."
+#: src/usr/local/www/services_dhcpv6.php:872
+msgid "LDAP URI"
 msgstr ""
 
-#: src/usr/local/www/services_dhcpv6.php:772
-msgid "LDAP URI"
+#: src/usr/local/www/services_dhcpv6.php:885
+#: src/usr/local/www/services_dhcpv6.php:891
+msgid "Network booting"
 msgstr ""
 
-#: src/usr/local/www/services_dhcpv6.php:798
+#: src/usr/local/www/services_dhcpv6.php:898
 msgid "Bootfile URL"
 msgstr ""
 
-#: src/usr/local/www/services_dhcpv6.php:862
+#: src/usr/local/www/services_dhcpv6.php:962
 msgid "Add Option"
 msgstr ""
 
-#: src/usr/local/www/services_dhcpv6.php:883
+#: src/usr/local/www/services_dhcpv6.php:983
 #, 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:889
+#: src/usr/local/www/services_dhcpv6.php:989
 #, 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:897
-msgid "DHCPv6 Static Mappings for this interface."
+#: src/usr/local/www/services_dhcpv6.php:997
+msgid "DHCPv6 Static Mappings for this Interface"
 msgstr ""
 
-#: src/usr/local/www/services_dhcpv6.php:902
+#: src/usr/local/www/services_dhcpv6.php:1002
 #: src/usr/local/www/services_dhcpv6_edit.php:141
-#: src/usr/local/www/services_dhcpv6_edit.php:232
-#: src/usr/local/www/status_dhcpv6_leases.php:455
-#: src/usr/local/www/status_dhcpv6_leases.php:548
+#: src/usr/local/www/services_dhcpv6_edit.php:249
+#: src/usr/local/www/status_dhcpv6_leases.php:459
+#: src/usr/local/www/status_dhcpv6_leases.php:553
 msgid "DUID"
 msgstr ""
 
-#: src/usr/local/www/services_dhcpv6_edit.php:163
+#: src/usr/local/www/services_dhcpv6_edit.php:174
 msgid "A valid DUID must be specified."
 msgstr ""
 
-#: src/usr/local/www/services_dhcpv6_edit.php:173
+#: src/usr/local/www/services_dhcpv6_edit.php:184
 msgid "This Hostname, IP or DUID already exists."
 msgstr ""
 
-#: src/usr/local/www/services_dhcpv6_edit.php:217
-msgid "DHCPv6"
-msgstr ""
-
-#: src/usr/local/www/services_dhcpv6_edit.php:228
+#: src/usr/local/www/services_dhcpv6_edit.php:245
 msgid "Static DHCPv6 Mapping"
 msgstr ""
 
-#: src/usr/local/www/services_dhcpv6_edit.php:236
+#: src/usr/local/www/services_dhcpv6_edit.php:253
 msgid "Enter a DUID in the following format: "
 msgstr ""
 
-#: src/usr/local/www/services_dhcpv6_edit.php:236
-#: src/usr/local/www/pkg_edit.php:1303 src/usr/local/www/pkg_edit.php:1309
-#: src/usr/local/www/pkg_edit.php:1314
+#: src/usr/local/www/services_dhcpv6_edit.php:253
+#: src/usr/local/www/pkg_edit.php:1305 src/usr/local/www/pkg_edit.php:1311
+#: src/usr/local/www/pkg_edit.php:1316
 msgid "<br />"
 msgstr ""
 
-#: src/usr/local/www/services_dhcpv6_edit.php:245
+#: src/usr/local/www/services_dhcpv6_edit.php:262
 msgid ""
 "If an IPv6 address is entered, the address must be outside of the pool.<br /"
 ">If no IPv6 address is given, one will be dynamically allocated from the "
 "pool."
 msgstr ""
 
-#: src/usr/local/www/services_dhcpv6_edit.php:275
+#: src/usr/local/www/services_dhcpv6_edit.php:292
 msgid "Enter the root-path string. This overrides setting on main page."
 msgstr ""
 
@@ -18636,7 +20153,7 @@ msgid ""
 msgstr ""
 
 #: src/usr/local/www/services_dhcpv6_relay.php:172
-msgid "DHCPv6 Relay configuration"
+msgid "DHCPv6 Relay Configuration"
 msgstr ""
 
 #: src/usr/local/www/services_dhcpv6_relay.php:187
@@ -18679,7 +20196,7 @@ msgid "General DNS Forwarder Options"
 msgstr ""
 
 #: src/usr/local/www/services_dnsmasq.php:256
-#: src/usr/local/www/services_unbound.php:336
+#: src/usr/local/www/services_unbound.php:361
 msgid "Static DHCP"
 msgstr ""
 
@@ -18689,17 +20206,17 @@ msgstr ""
 
 #: src/usr/local/www/services_dnsmasq.php:275
 #: src/usr/local/www/services_dnsmasq.php:279
-#: src/usr/local/www/services_unbound.php:320
+#: src/usr/local/www/services_unbound.php:345
 msgid "DNS Query Forwarding"
 msgstr ""
 
 #: src/usr/local/www/services_dnsmasq.php:309
-#: src/usr/local/www/services_unbound.php:277
+#: src/usr/local/www/services_unbound.php:302
 msgid "Listen Port"
 msgstr ""
 
 #: src/usr/local/www/services_dnsmasq.php:313
-#: src/usr/local/www/services_unbound.php:281
+#: src/usr/local/www/services_unbound.php:306
 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."
@@ -18726,11 +20243,11 @@ msgid ""
 msgstr ""
 
 #: src/usr/local/www/services_dnsmasq.php:337
-#: src/usr/local/www/services_unbound.php:345
-#: src/usr/local/www/services_unbound.php:351
-#: src/usr/local/www/services_unbound.php:357
-#: src/usr/local/www/vpn_openvpn_client.php:772
-#: src/usr/local/www/vpn_openvpn_server.php:1153
+#: src/usr/local/www/services_unbound.php:370
+#: src/usr/local/www/services_unbound.php:376
+#: src/usr/local/www/services_unbound.php:382
+#: src/usr/local/www/vpn_openvpn_client.php:777
+#: src/usr/local/www/vpn_openvpn_server.php:1158
 msgid "Custom options"
 msgstr ""
 
@@ -18741,88 +20258,92 @@ msgid ""
 msgstr ""
 
 #: src/usr/local/www/services_dnsmasq.php:349
-#, php-format
 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. The DNS forwarder will use the DNS servers "
-"entered in %1$sSystem: General setup%3$s or those obtained via DHCP or PPP "
-"on WAN if &quot;Allow DNS server list to be overridden by DHCP/PPP on "
-"WAN&quot; is checked. If you don't use that option (or if you use a static "
-"IP address on WAN), you must manually specify at least one DNS server on the "
-"%2$sSystem:General setup%3$s page."
+"they will use the forwarder."
+msgstr ""
+
+#: src/usr/local/www/services_dnsmasq.php:351
+#, php-format
+msgid ""
+"The DNS forwarder will use the DNS servers entered in %1$sSystem > General "
+"Setup%2$s or those obtained via DHCP or PPP on WAN if &quot;Allow DNS server "
+"list to be overridden by DHCP/PPP on WAN&quot; is checked. If you don't use "
+"that option (or if you use a static IP address on WAN), you must manually "
+"specify at least one DNS server on the %1$sSystem > General Setup%2$s page."
 msgstr ""
 
 #: src/usr/local/www/services_dnsmasq.php:363
-#: src/usr/local/www/services_unbound.php:408
-msgid "Host Overrides"
+msgid ""
+"Entries in this section override individual results from the forwarders."
+msgstr ""
+
+#: src/usr/local/www/services_dnsmasq.php:364
+msgid "Use these for changing DNS results or for adding custom DNS records."
 msgstr ""
 
 #: src/usr/local/www/services_dnsmasq.php:369
-#: src/usr/local/www/services_dnsmasq.php:450
+#: src/usr/local/www/services_unbound.php:433
+msgid "Host Overrides"
+msgstr ""
+
+#: src/usr/local/www/services_dnsmasq.php:375
+#: src/usr/local/www/services_dnsmasq.php:455
 #: src/usr/local/www/services_dnsmasq_domainoverride_edit.php:100
 #: src/usr/local/www/services_dnsmasq_domainoverride_edit.php:167
 #: src/usr/local/www/services_dnsmasq_edit.php:110
 #: src/usr/local/www/services_dnsmasq_edit.php:254
 #: src/usr/local/www/services_dnsmasq_edit.php:311
-#: src/usr/local/www/services_unbound.php:414
-#: src/usr/local/www/services_unbound.php:490
+#: src/usr/local/www/services_unbound.php:439
+#: src/usr/local/www/services_unbound.php:515
 #: src/usr/local/www/services_unbound_domainoverride_edit.php:96
 #: src/usr/local/www/services_unbound_domainoverride_edit.php:155
 #: src/usr/local/www/services_unbound_host_edit.php:111
 #: src/usr/local/www/services_unbound_host_edit.php:255
 #: src/usr/local/www/services_unbound_host_edit.php:312
-#: src/usr/local/www/system.php:143 src/usr/local/www/system.php:377
+#: src/usr/local/www/system.php:143 src/usr/local/www/system.php:383
 msgid "Domain"
 msgstr ""
 
-#: src/usr/local/www/services_dnsmasq.php:393
-#: src/usr/local/www/services_dnsmasq.php:417
-#: src/usr/local/www/services_unbound.php:439
-#: src/usr/local/www/services_unbound.php:463
+#: src/usr/local/www/services_dnsmasq.php:399
+#: src/usr/local/www/services_dnsmasq.php:423
+#: src/usr/local/www/services_unbound.php:464
+#: src/usr/local/www/services_unbound.php:488
 msgid "Edit host override"
 msgstr ""
 
-#: src/usr/local/www/services_dnsmasq.php:394
-#: src/usr/local/www/services_unbound.php:440
+#: src/usr/local/www/services_dnsmasq.php:400
+#: src/usr/local/www/services_unbound.php:465
 msgid "Delete host override"
 msgstr ""
 
-#: src/usr/local/www/services_dnsmasq.php:410
-#: src/usr/local/www/services_unbound.php:456
+#: src/usr/local/www/services_dnsmasq.php:416
+#: src/usr/local/www/services_unbound.php:481
 msgid "Alias for "
 msgstr ""
 
-#: src/usr/local/www/services_dnsmasq.php:439
+#: src/usr/local/www/services_dnsmasq.php:444
 msgid ""
-"Entries in this section override individual results from the forwarders."
-msgstr ""
-
-#: src/usr/local/www/services_dnsmasq.php:440
-msgid "Use these for changing DNS results or for adding custom DNS records."
+"Entries in this area override an entire domain, and subdomains, by "
+"specifying an authoritative DNS server to be queried for that domain."
 msgstr ""
 
-#: src/usr/local/www/services_dnsmasq.php:445
-#: src/usr/local/www/services_unbound.php:485
+#: src/usr/local/www/services_dnsmasq.php:450
+#: src/usr/local/www/services_unbound.php:510
 msgid "Domain Overrides"
 msgstr ""
 
-#: src/usr/local/www/services_dnsmasq.php:472
-#: src/usr/local/www/services_unbound.php:513
+#: src/usr/local/www/services_dnsmasq.php:477
+#: src/usr/local/www/services_unbound.php:538
 msgid "Edit domain override"
 msgstr ""
 
-#: src/usr/local/www/services_dnsmasq.php:473
-#: src/usr/local/www/services_unbound.php:514
+#: src/usr/local/www/services_dnsmasq.php:478
+#: src/usr/local/www/services_unbound.php:539
 msgid "Delete domain override"
 msgstr ""
 
-#: src/usr/local/www/services_dnsmasq.php:493
-msgid ""
-"Entries in this area override an entire domain, and subdomains, by "
-"specifying an authoritative DNS server to be queried for that domain."
-msgstr ""
-
 #: src/usr/local/www/services_dnsmasq_domainoverride_edit.php:112
 #: src/usr/local/www/services_unbound_domainoverride_edit.php:107
 msgid "A valid domain must be specified after _msdcs."
@@ -18851,7 +20372,7 @@ msgid "Edit Domain Override"
 msgstr ""
 
 #: src/usr/local/www/services_dnsmasq_domainoverride_edit.php:163
-msgid "Domain override options"
+msgid "Domain Override Options"
 msgstr ""
 
 #: src/usr/local/www/services_dnsmasq_domainoverride_edit.php:170
@@ -18921,7 +20442,7 @@ msgstr ""
 
 #: src/usr/local/www/services_dnsmasq_edit.php:242
 #: src/usr/local/www/services_unbound_host_edit.php:243
-msgid "Host override options"
+msgid "Host Override Options"
 msgstr ""
 
 #: src/usr/local/www/services_dnsmasq_edit.php:249
@@ -18941,7 +20462,7 @@ msgstr ""
 
 #: src/usr/local/www/services_dnsmasq_edit.php:285
 #: src/usr/local/www/services_unbound_host_edit.php:286
-msgid "Additional names for this host"
+msgid "Additional Names for this Host"
 msgstr ""
 
 #: src/usr/local/www/services_dnsmasq_edit.php:304
@@ -18955,30 +20476,33 @@ msgid "Add host name"
 msgstr ""
 
 #: src/usr/local/www/services_dyndns.php:100
-msgid "Clients"
+#: src/usr/local/www/services_dyndns.php:108
+#: src/usr/local/www/services_dyndns.php:114
+#: src/usr/local/www/services_dyndns_edit.php:273
+#: src/usr/local/www/services_rfc2136.php:96
+msgid "Dynamic DNS Clients"
 msgstr ""
 
 #: src/usr/local/www/services_dyndns.php:109
+#: src/usr/local/www/services_rfc2136.php:92
 #: src/usr/local/www/services_rfc2136.php:97
-msgid "RFC 2136"
-msgstr ""
-
-#: src/usr/local/www/services_dyndns.php:114
-msgid "Dynamic DNS Clients"
+#: src/usr/local/www/services_rfc2136_edit.php:182
+msgid "RFC 2136 Clients"
 msgstr ""
 
 #: src/usr/local/www/services_dyndns.php:121
-#: src/usr/local/www/status_openvpn.php:260
-#: src/usr/local/www/status_openvpn.php:316
+#: src/usr/local/www/services_ntpd_acls.php:240
+#: src/usr/local/www/status_openvpn.php:259
+#: src/usr/local/www/status_openvpn.php:315
 #: src/usr/local/www/status_services.php:130
-#: src/usr/local/www/widgets/widgets/dyn_dns_status.widget.php:111
-#: src/usr/local/www/widgets/widgets/services_status.widget.php:90
+#: src/usr/local/www/widgets/widgets/dyn_dns_status.widget.php:129
+#: src/usr/local/www/widgets/widgets/services_status.widget.php:108
 msgid "Service"
 msgstr ""
 
 #: src/usr/local/www/services_dyndns.php:123
 #: src/usr/local/www/services_rfc2136.php:116
-#: src/usr/local/www/widgets/widgets/dyn_dns_status.widget.php:113
+#: src/usr/local/www/widgets/widgets/dyn_dns_status.widget.php:131
 msgid "Cached IP"
 msgstr ""
 
@@ -19014,46 +20538,45 @@ msgid "Service type"
 msgstr ""
 
 #: src/usr/local/www/services_dyndns_edit.php:139
-#: src/usr/local/www/services_dyndns_edit.php:399
+#: src/usr/local/www/services_dyndns_edit.php:409
 msgid "Update URL"
 msgstr ""
 
-#: src/usr/local/www/services_dyndns_edit.php:158
+#: src/usr/local/www/services_dyndns_edit.php:168
 msgid "The hostname contains invalid characters."
 msgstr ""
 
-#: src/usr/local/www/services_dyndns_edit.php:165
+#: src/usr/local/www/services_dyndns_edit.php:175
 msgid "The MX contains invalid characters."
 msgstr ""
 
-#: src/usr/local/www/services_dyndns_edit.php:168
-#: src/usr/local/www/system_usermanager.php:204
+#: src/usr/local/www/services_dyndns_edit.php:178
+#: src/usr/local/www/system_usermanager.php:201
 #: src/usr/local/www/vpn_l2tp_users_edit.php:117
 msgid "The username contains invalid characters."
 msgstr ""
 
-#: src/usr/local/www/services_dyndns_edit.php:263
-#: src/usr/local/www/services_dyndns_edit.php:276
+#: src/usr/local/www/services_dyndns_edit.php:286
 msgid "Dynamic DNS Client"
 msgstr ""
 
-#: src/usr/local/www/services_dyndns_edit.php:289
+#: src/usr/local/www/services_dyndns_edit.php:299
 msgid "Service Type"
 msgstr ""
 
-#: src/usr/local/www/services_dyndns_edit.php:298
+#: src/usr/local/www/services_dyndns_edit.php:308
 msgid "Interface to monitor"
 msgstr ""
 
-#: src/usr/local/www/services_dyndns_edit.php:305
+#: src/usr/local/www/services_dyndns_edit.php:315
 msgid "Interface to send update from"
 msgstr ""
 
-#: src/usr/local/www/services_dyndns_edit.php:308
+#: src/usr/local/www/services_dyndns_edit.php:318
 msgid "This is almost always the same as the Interface to Monitor. "
 msgstr ""
 
-#: src/usr/local/www/services_dyndns_edit.php:325
+#: src/usr/local/www/services_dyndns_edit.php:335
 msgid ""
 "Enter the complete fully qualified domain name. Example: myhost.dyndns."
 "org<br />he.net tunnelbroker: Enter your tunnel ID<br />GleSYS: Enter your "
@@ -19062,30 +20585,30 @@ msgid ""
 "subdomain zone being handled by Namecheap."
 msgstr ""
 
-#: src/usr/local/www/services_dyndns_edit.php:335
+#: src/usr/local/www/services_dyndns_edit.php:345
 msgid "MX"
 msgstr ""
 
-#: src/usr/local/www/services_dyndns_edit.php:338
+#: src/usr/local/www/services_dyndns_edit.php:348
 msgid ""
 "Note: With DynDNS service you can only use a hostname, not an IP address. "
 "Set this option only if you need a special MX record. Not all services "
 "support this."
 msgstr ""
 
-#: src/usr/local/www/services_dyndns_edit.php:343
+#: src/usr/local/www/services_dyndns_edit.php:353
 msgid "Wildcards"
 msgstr ""
 
-#: src/usr/local/www/services_dyndns_edit.php:350
+#: src/usr/local/www/services_dyndns_edit.php:360
 msgid "Verbose logging"
 msgstr ""
 
-#: src/usr/local/www/services_dyndns_edit.php:357
+#: src/usr/local/www/services_dyndns_edit.php:367
 msgid "CURL options"
 msgstr ""
 
-#: src/usr/local/www/services_dyndns_edit.php:374
+#: src/usr/local/www/services_dyndns_edit.php:384
 msgid ""
 "Username is required for all types except Namecheap, FreeDNS and Custom "
 "Entries.<br />Route 53: Enter your Access Key ID.<br />GleSYS: Enter your "
@@ -19093,44 +20616,45 @@ msgid ""
 "Authentication username and passwords."
 msgstr ""
 
-#: src/usr/local/www/services_dyndns_edit.php:384
+#: src/usr/local/www/services_dyndns_edit.php:394
 msgid ""
 "FreeDNS (freedns.afraid.org): Enter your \"Authentication Token\" provided "
 "by FreeDNS.<br />Route 53: Enter your Secret Access Key.<br />GleSYS: Enter "
 "your API key.<br />DNSimple: Enter your API token."
 msgstr ""
 
-#: src/usr/local/www/services_dyndns_edit.php:391
+#: src/usr/local/www/services_dyndns_edit.php:401
 msgid "Zone ID"
 msgstr ""
 
-#: src/usr/local/www/services_dyndns_edit.php:394
+#: src/usr/local/www/services_dyndns_edit.php:404
 msgid ""
 "Enter Zone ID that you received when you created your domain in Route 53."
 "<br />DNSimple: Enter the Record ID of record to update."
 msgstr ""
 
-#: src/usr/local/www/services_dyndns_edit.php:402
+#: src/usr/local/www/services_dyndns_edit.php:412
 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:406
+#: src/usr/local/www/services_dyndns_edit.php:416
 msgid "Result Match"
 msgstr ""
 
-#: src/usr/local/www/services_dyndns_edit.php:415
+#: src/usr/local/www/services_dyndns_edit.php:425
 #: src/usr/local/www/services_rfc2136_edit.php:112
 msgid "TTL"
 msgstr ""
 
-#: src/usr/local/www/services_dyndns_edit.php:418
+#: src/usr/local/www/services_dyndns_edit.php:428
 msgid "Choose TTL for your dns record."
 msgstr ""
 
-#: src/usr/local/www/services_dyndns_edit.php:437
+#: src/usr/local/www/services_dyndns_edit.php:447
 #: src/usr/local/www/services_rfc2136_edit.php:149
+#: src/usr/local/www/services_rfc2136_edit.php:337
 msgid "Save & Force Update"
 msgstr ""
 
@@ -19191,7 +20715,7 @@ msgid ""
 msgstr ""
 
 #: src/usr/local/www/services_igmpproxy_edit.php:273
-#: src/usr/local/www/services_unbound_acls.php:307
+#: src/usr/local/www/services_unbound_acls.php:311
 msgid "Add network"
 msgstr ""
 
@@ -19199,38 +20723,48 @@ msgstr ""
 msgid "Upgraded settings from openttpd"
 msgstr ""
 
-#: src/usr/local/www/services_ntpd.php:280
-#: src/usr/local/www/services_ntpd_gps.php:225
+#: src/usr/local/www/services_ntpd.php:231
+#: src/usr/local/www/services_ntpd_acls.php:195
+#: src/usr/local/www/services_ntpd_acls.php:208
 #: src/usr/local/www/services_ntpd_gps.php:231
 #: src/usr/local/www/services_ntpd_pps.php:150
-msgid "Serial GPS"
+msgid "ACLs"
 msgstr ""
 
-#: src/usr/local/www/services_ntpd.php:281
+#: src/usr/local/www/services_ntpd.php:232
+#: src/usr/local/www/services_ntpd_acls.php:209
+#: src/usr/local/www/services_ntpd_gps.php:225
 #: src/usr/local/www/services_ntpd_gps.php:232
-#: src/usr/local/www/services_ntpd_pps.php:136
 #: src/usr/local/www/services_ntpd_pps.php:151
-#: src/usr/local/www/status_queues.php:194
-#: src/usr/local/www/status_queues.php:198
+msgid "Serial GPS"
+msgstr ""
+
+#: src/usr/local/www/services_ntpd.php:233
+#: src/usr/local/www/services_ntpd_acls.php:210
+#: src/usr/local/www/services_ntpd_gps.php:233
+#: src/usr/local/www/services_ntpd_pps.php:136
+#: src/usr/local/www/services_ntpd_pps.php:152
+#: src/usr/local/www/status_queues.php:197
+#: src/usr/local/www/status_queues.php:201
 msgid "PPS"
 msgstr ""
 
-#: src/usr/local/www/services_ntpd.php:286
+#: src/usr/local/www/services_ntpd.php:238
 msgid "NTP Server Configuration"
 msgstr ""
 
-#: src/usr/local/www/services_ntpd.php:296
+#: src/usr/local/www/services_ntpd.php:248
 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:303
+#: src/usr/local/www/services_ntpd.php:255
 msgid "Time Servers"
 msgstr ""
 
-#: src/usr/local/www/services_ntpd.php:344
+#: src/usr/local/www/services_ntpd.php:296
 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 "
@@ -19239,11 +20773,11 @@ msgid ""
 "displayed."
 msgstr ""
 
-#: src/usr/local/www/services_ntpd.php:350
+#: src/usr/local/www/services_ntpd.php:302
 msgid "Orphan Mode"
 msgstr ""
 
-#: src/usr/local/www/services_ntpd.php:353
+#: src/usr/local/www/services_ntpd.php:305
 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 "
@@ -19251,54 +20785,125 @@ msgid ""
 "servers available to clients are preferred over this server. (default: 12)."
 msgstr ""
 
-#: src/usr/local/www/services_ntpd.php:359
+#: src/usr/local/www/services_ntpd.php:311
 msgid "NTP Graphs"
 msgstr ""
 
-#: src/usr/local/www/services_ntpd.php:366
+#: src/usr/local/www/services_ntpd.php:318
 msgid "Logging"
 msgstr ""
 
-#: src/usr/local/www/services_ntpd.php:376
+#: src/usr/local/www/services_ntpd.php:328
 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:388
+#: src/usr/local/www/services_ntpd.php:340
 msgid "Statistics Logging"
 msgstr ""
 
-#: src/usr/local/www/services_ntpd.php:390
+#: src/usr/local/www/services_ntpd.php:342
 msgid ""
 "Warning: These options will create persistent daily log files in /var/log/"
 "ntp."
 msgstr ""
 
-#: src/usr/local/www/services_ntpd.php:422
-msgid "Access Restrictions"
-msgstr ""
-
-#: src/usr/local/www/services_ntpd.php:424
-msgid "These options control access to NTP from the WAN."
-msgstr ""
-
-#: src/usr/local/www/services_ntpd.php:477
+#: src/usr/local/www/services_ntpd.php:374
 msgid "Leap seconds"
 msgstr ""
 
-#: src/usr/local/www/services_ntpd.php:479
+#: src/usr/local/www/services_ntpd.php:376
 msgid ""
 "A leap second file allows NTP to advertize 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:486
+#: src/usr/local/www/services_ntpd.php:383
 msgid "Enter Leap second configuration as text OR select a file to upload"
 msgstr ""
 
+#: src/usr/local/www/services_ntpd_acls.php:122
+#: src/usr/local/www/services_ntpd_acls.php:135
+#: src/usr/local/www/services_unbound_acls.php:151
+#: src/usr/local/www/services_unbound_acls.php:165
+msgid "You must enter a valid IP address for each row under Networks."
+msgstr ""
+
+#: src/usr/local/www/services_ntpd_acls.php:126
+#: src/usr/local/www/services_unbound_acls.php:156
+msgid "You must enter a valid IPv4 netmask for each IPv4 row under Networks."
+msgstr ""
+
+#: src/usr/local/www/services_ntpd_acls.php:132
+#: src/usr/local/www/services_unbound_acls.php:162
+msgid "You must enter a valid IPv6 netmask for each IPv6 row under Networks."
+msgstr ""
+
+#: src/usr/local/www/services_ntpd_acls.php:215
+msgid "Default Access Restrictions"
+msgstr ""
+
+#: src/usr/local/www/services_ntpd_acls.php:219
+msgid "Kiss-o'-death"
+msgstr ""
+
+#: src/usr/local/www/services_ntpd_acls.php:226
+msgid "Modifications"
+msgstr ""
+
+#: src/usr/local/www/services_ntpd_acls.php:233
+msgid "Queries"
+msgstr ""
+
+#: src/usr/local/www/services_ntpd_acls.php:247
+msgid "Peer Association"
+msgstr ""
+
+#: src/usr/local/www/services_ntpd_acls.php:254
+msgid "Trap Service"
+msgstr ""
+
+#: src/usr/local/www/services_ntpd_acls.php:262
+msgid "Custom Access Restrictions"
+msgstr ""
+
+#: src/usr/local/www/services_ntpd_acls.php:268
+#: src/usr/local/www/services_unbound_acls.php:283
+msgid "Networks"
+msgstr ""
+
+#: src/usr/local/www/services_ntpd_acls.php:274
+#: src/usr/local/www/services_unbound_acls.php:289
+msgid "Network/mask"
+msgstr ""
+
+#: src/usr/local/www/services_ntpd_acls.php:281
+msgid "KOD"
+msgstr ""
+
+#: src/usr/local/www/services_ntpd_acls.php:288
+msgid "nomodify"
+msgstr ""
+
+#: src/usr/local/www/services_ntpd_acls.php:295
+msgid "noquery"
+msgstr ""
+
+#: src/usr/local/www/services_ntpd_acls.php:302
+msgid "noserve"
+msgstr ""
+
+#: src/usr/local/www/services_ntpd_acls.php:309
+msgid "nopeer"
+msgstr ""
+
+#: src/usr/local/www/services_ntpd_acls.php:316
+msgid "notrap"
+msgstr ""
+
 #: src/usr/local/www/services_ntpd_gps.php:86
 msgid "Setting default NTPd settings"
 msgstr ""
@@ -19323,15 +20928,15 @@ msgstr ""
 msgid "ZDA or ZDG"
 msgstr ""
 
-#: src/usr/local/www/services_ntpd_gps.php:237
+#: src/usr/local/www/services_ntpd_gps.php:238
 msgid "NTP Serial GPS Configuration"
 msgstr ""
 
-#: src/usr/local/www/services_ntpd_gps.php:252
+#: src/usr/local/www/services_ntpd_gps.php:253
 msgid "GPS Type"
 msgstr ""
 
-#: src/usr/local/www/services_ntpd_gps.php:255
+#: src/usr/local/www/services_ntpd_gps.php:256
 msgid ""
 "This option allows you to select a predefined configuration. Default is the "
 "configuration of pfSense 2.1 and earlier (not recommended). Select Generic "
@@ -19339,138 +20944,138 @@ msgid ""
 "your GPS has already been set to NMEA mode."
 msgstr ""
 
-#: src/usr/local/www/services_ntpd_gps.php:271
-#: src/usr/local/www/services_ntpd_pps.php:179
+#: src/usr/local/www/services_ntpd_gps.php:272
+#: src/usr/local/www/services_ntpd_pps.php:180
 msgid "Serial Port"
 msgstr ""
 
-#: src/usr/local/www/services_ntpd_gps.php:274
+#: src/usr/local/www/services_ntpd_gps.php:275
 msgid ""
 "All serial ports are listed, be sure to pick the port with the GPS attached. "
 msgstr ""
 
-#: src/usr/local/www/services_ntpd_gps.php:282
+#: src/usr/local/www/services_ntpd_gps.php:283
 msgid ""
 "A higher baud rate is generally only helpful if the GPS is sending too many "
 "sentences. It is recommended to configure the GPS to send only one sentence "
 "at a baud rate of 4800 or 9600."
 msgstr ""
 
-#: src/usr/local/www/services_ntpd_gps.php:289
+#: src/usr/local/www/services_ntpd_gps.php:290
 msgid "NMEA Sentences"
 msgstr ""
 
-#: src/usr/local/www/services_ntpd_gps.php:293
+#: src/usr/local/www/services_ntpd_gps.php:294
 msgid ""
 "By default NTP will listen for all supported NMEA sentences. One or more "
 "sentences to listen for may be specified."
 msgstr ""
 
-#: src/usr/local/www/services_ntpd_gps.php:297
+#: src/usr/local/www/services_ntpd_gps.php:298
 msgid "Fudge Time 1"
 msgstr ""
 
-#: src/usr/local/www/services_ntpd_gps.php:300
+#: src/usr/local/www/services_ntpd_gps.php:301
 msgid ""
 "Fudge time 1 is used to specify the GPS PPS signal offset (default: 0.0)."
 msgstr ""
 
-#: src/usr/local/www/services_ntpd_gps.php:304
+#: src/usr/local/www/services_ntpd_gps.php:305
 msgid "Fudge Time 2"
 msgstr ""
 
-#: src/usr/local/www/services_ntpd_gps.php:307
+#: src/usr/local/www/services_ntpd_gps.php:308
 msgid "Fudge time 2 is used to specify the GPS time offset (default: 0.0)."
 msgstr ""
 
-#: src/usr/local/www/services_ntpd_gps.php:311
+#: src/usr/local/www/services_ntpd_gps.php:312
 msgid "Stratum (0-16)"
 msgstr ""
 
-#: src/usr/local/www/services_ntpd_gps.php:314
+#: src/usr/local/www/services_ntpd_gps.php:315
 msgid ""
 "This may be used to change the GPS Clock stratum (default: 0). This may be "
 "useful if, for some reason, you want ntpd to prefer a different clock"
 msgstr ""
 
-#: src/usr/local/www/services_ntpd_gps.php:318
-#: src/usr/local/www/services_ntpd_pps.php:201
+#: src/usr/local/www/services_ntpd_gps.php:319
+#: src/usr/local/www/services_ntpd_pps.php:202
 msgid "Flags"
 msgstr ""
 
-#: src/usr/local/www/services_ntpd_gps.php:363
+#: src/usr/local/www/services_ntpd_gps.php:364
 msgid ""
 "Enabling this will rapidly fill the log, but is useful for tuning Fudge time "
 "2."
 msgstr ""
 
-#: src/usr/local/www/services_ntpd_gps.php:367
-#: src/usr/local/www/services_ntpd_pps.php:222
+#: src/usr/local/www/services_ntpd_gps.php:368
+#: src/usr/local/www/services_ntpd_pps.php:223
 msgid "Clock ID"
 msgstr ""
 
-#: src/usr/local/www/services_ntpd_gps.php:371
+#: src/usr/local/www/services_ntpd_gps.php:372
 msgid "This may be used to change the GPS Clock ID (default: GPS)."
 msgstr ""
 
-#: src/usr/local/www/services_ntpd_gps.php:382
+#: src/usr/local/www/services_ntpd_gps.php:383
 msgid "GPS Initialization"
 msgstr ""
 
-#: src/usr/local/www/services_ntpd_gps.php:390
+#: src/usr/local/www/services_ntpd_gps.php:391
 msgid ""
 "Commands entered here will be sent to the GPS during initialization. Please "
 "read and understand your GPS documentation before making any changes here"
 msgstr ""
 
-#: src/usr/local/www/services_ntpd_gps.php:392
+#: src/usr/local/www/services_ntpd_gps.php:393
 msgid "NMEA Checksum Calculator"
 msgstr ""
 
-#: src/usr/local/www/services_ntpd_gps.php:401
+#: src/usr/local/www/services_ntpd_gps.php:402
 msgid "Calculate"
 msgstr ""
 
-#: src/usr/local/www/services_ntpd_gps.php:416
+#: src/usr/local/www/services_ntpd_gps.php:417
 msgid ""
 "Enter the text between &quot;$&quot; and &quot;*&quot; of a NMEA command "
 "string:"
 msgstr ""
 
-#: src/usr/local/www/services_ntpd_pps.php:156
+#: src/usr/local/www/services_ntpd_pps.php:157
 msgid "NTP Serial PPS Configuration"
 msgstr ""
 
-#: src/usr/local/www/services_ntpd_pps.php:182
+#: src/usr/local/www/services_ntpd_pps.php:183
 msgid ""
 "All serial ports are listed, be sure to pick the port with the PPS source "
 "attached. "
 msgstr ""
 
-#: src/usr/local/www/services_ntpd_pps.php:187
+#: src/usr/local/www/services_ntpd_pps.php:188
 msgid "Fudge Time"
 msgstr ""
 
-#: src/usr/local/www/services_ntpd_pps.php:190
+#: src/usr/local/www/services_ntpd_pps.php:191
 msgid ""
 "Fudge time is used to specify the PPS signal offset from the actual second "
 "such as the transmission delay between the transmitter and the receiver. "
 "(default: 0.0)."
 msgstr ""
 
-#: src/usr/local/www/services_ntpd_pps.php:194
+#: src/usr/local/www/services_ntpd_pps.php:195
 #: src/usr/local/www/status_ntpd.php:201
 msgid "Stratum"
 msgstr ""
 
-#: src/usr/local/www/services_ntpd_pps.php:197
+#: src/usr/local/www/services_ntpd_pps.php:198
 msgid ""
 "This may be used to change the PPS Clock stratum (default: 0). This may be "
 "useful if, for some reason, you want ntpd to prefer a different clock and "
 "just monitor this source."
 msgstr ""
 
-#: src/usr/local/www/services_ntpd_pps.php:226
+#: src/usr/local/www/services_ntpd_pps.php:227
 msgid "This may be used to change the PPS Clock ID (default: PPS)."
 msgstr ""
 
@@ -19643,7 +21248,7 @@ msgid "RADIUS accounting update period in seconds"
 msgstr ""
 
 #: src/usr/local/www/services_pppoe_edit.php:438
-msgid "Radius Issued IP Addresses"
+msgid "RADIUS Issued IP Addresses"
 msgstr ""
 
 #: src/usr/local/www/services_pppoe_edit.php:443
@@ -19652,8 +21257,8 @@ msgstr ""
 
 #: src/usr/local/www/services_pppoe_edit.php:456
 #: src/usr/local/www/services_pppoe_edit.php:489
-#: src/usr/local/www/system_authservers.php:231
-#: src/usr/local/www/system_authservers.php:718
+#: src/usr/local/www/system_authservers.php:228
+#: src/usr/local/www/system_authservers.php:721
 msgid "Authentication port"
 msgstr ""
 
@@ -19702,44 +21307,40 @@ msgstr ""
 
 #: src/usr/local/www/services_pppoe_edit.php:601
 msgid ""
-"Don't forget to add a firewall rule to permit traffic from PPPoE clients"
-msgstr ""
-
-#: src/usr/local/www/services_rfc2136.php:92
-msgid "RFC 2136 Clients"
+"Don't forget to add a firewall rule to permit traffic from PPPoE clients."
 msgstr ""
 
 #: src/usr/local/www/services_rfc2136.php:107
 msgid "RFC2136 Clients"
 msgstr ""
 
-#: src/usr/local/www/services_rfc2136.php:200
-#: src/usr/local/www/vpn_openvpn_client.php:838
+#: src/usr/local/www/services_rfc2136.php:208
+#: src/usr/local/www/vpn_openvpn_client.php:843
 msgid "Edit client"
 msgstr ""
 
-#: src/usr/local/www/services_rfc2136.php:203
+#: src/usr/local/www/services_rfc2136.php:211
 msgid "Disable client"
 msgstr ""
 
-#: src/usr/local/www/services_rfc2136.php:206
+#: src/usr/local/www/services_rfc2136.php:214
 msgid "Enable client"
 msgstr ""
 
-#: src/usr/local/www/services_rfc2136.php:209
-#: src/usr/local/www/vpn_openvpn_client.php:839
+#: src/usr/local/www/services_rfc2136.php:217
+#: src/usr/local/www/vpn_openvpn_client.php:844
 msgid "Delete client"
 msgstr ""
 
 #: src/usr/local/www/services_rfc2136_edit.php:112
-#: src/usr/local/www/services_rfc2136_edit.php:212
+#: src/usr/local/www/services_rfc2136_edit.php:231
 msgid "Key name"
 msgstr ""
 
 #: src/usr/local/www/services_rfc2136_edit.php:112
-#: src/usr/local/www/services_rfc2136_edit.php:247
-#: src/usr/local/www/vpn_openvpn_client.php:595
-#: src/usr/local/www/vpn_openvpn_server.php:717
+#: src/usr/local/www/services_rfc2136_edit.php:266
+#: src/usr/local/www/vpn_openvpn_client.php:600
+#: src/usr/local/www/vpn_openvpn_server.php:722
 msgid "Key"
 msgstr ""
 
@@ -19759,49 +21360,45 @@ msgstr ""
 msgid "New/Edited RFC2136 dnsupdate entry was posted."
 msgstr ""
 
-#: src/usr/local/www/services_rfc2136_edit.php:160
+#: src/usr/local/www/services_rfc2136_edit.php:195
 msgid "RFC 2136 Client"
 msgstr ""
 
-#: src/usr/local/www/services_rfc2136_edit.php:173
-msgid "RFC 2136 client"
-msgstr ""
-
-#: src/usr/local/www/services_rfc2136_edit.php:201
+#: src/usr/local/www/services_rfc2136_edit.php:220
 msgid "Fully qualified hostname of the host to be updated"
 msgstr ""
 
-#: src/usr/local/www/services_rfc2136_edit.php:205
+#: src/usr/local/www/services_rfc2136_edit.php:224
 msgid "TTL (seconds)"
 msgstr ""
 
-#: src/usr/local/www/services_rfc2136_edit.php:215
+#: src/usr/local/www/services_rfc2136_edit.php:234
 msgid "This must match the setting on the DNS server."
 msgstr ""
 
-#: src/usr/local/www/services_rfc2136_edit.php:217
-#: src/usr/local/www/services_rfc2136_edit.php:221
-#: src/usr/local/www/services_rfc2136_edit.php:229
-#: src/usr/local/www/services_rfc2136_edit.php:237
+#: src/usr/local/www/services_rfc2136_edit.php:236
+#: src/usr/local/www/services_rfc2136_edit.php:240
+#: src/usr/local/www/services_rfc2136_edit.php:248
+#: src/usr/local/www/services_rfc2136_edit.php:256
 msgid "Key Type"
 msgstr ""
 
-#: src/usr/local/www/services_rfc2136_edit.php:250
+#: src/usr/local/www/services_rfc2136_edit.php:269
 msgid "Paste an HMAC-MD5 key here."
 msgstr ""
 
-#: src/usr/local/www/services_rfc2136_edit.php:268
+#: src/usr/local/www/services_rfc2136_edit.php:287
 msgid "Use public IP"
 msgstr ""
 
-#: src/usr/local/www/services_rfc2136_edit.php:273
-#: src/usr/local/www/services_rfc2136_edit.php:277
-#: src/usr/local/www/services_rfc2136_edit.php:285
-#: src/usr/local/www/services_rfc2136_edit.php:293
+#: src/usr/local/www/services_rfc2136_edit.php:292
+#: src/usr/local/www/services_rfc2136_edit.php:296
+#: src/usr/local/www/services_rfc2136_edit.php:304
+#: src/usr/local/www/services_rfc2136_edit.php:312
 msgid "Record Type"
 msgstr ""
 
-#: src/usr/local/www/services_rfc2136_edit.php:320
+#: src/usr/local/www/services_rfc2136_edit.php:344
 #, php-format
 msgid ""
 "You must configure a DNS server in %1$sSystem: General setup %2$sor allow "
@@ -19819,31 +21416,31 @@ msgstr ""
 msgid "Only interfaces configured with a static IP will be shown."
 msgstr ""
 
-#: src/usr/local/www/services_router_advertisements.php:138
+#: src/usr/local/www/services_router_advertisements.php:142
 msgid "Router Only"
 msgstr ""
 
-#: src/usr/local/www/services_router_advertisements.php:139
+#: src/usr/local/www/services_router_advertisements.php:143
 msgid "Unmanaged"
 msgstr ""
 
-#: src/usr/local/www/services_router_advertisements.php:140
+#: src/usr/local/www/services_router_advertisements.php:144
 msgid "Managed"
 msgstr ""
 
-#: src/usr/local/www/services_router_advertisements.php:141
+#: src/usr/local/www/services_router_advertisements.php:145
 msgid "Assisted"
 msgstr ""
 
-#: src/usr/local/www/services_router_advertisements.php:142
+#: src/usr/local/www/services_router_advertisements.php:146
 msgid "Stateless DHCP"
 msgstr ""
 
-#: src/usr/local/www/services_router_advertisements.php:144
+#: src/usr/local/www/services_router_advertisements.php:148
 msgid "Low"
 msgstr ""
 
-#: src/usr/local/www/services_router_advertisements.php:150
+#: src/usr/local/www/services_router_advertisements.php:153
 msgid ""
 "Subnets are specified in CIDR format.  Select the CIDR mask that pertains to "
 "each entry.\t/128 specifies a single IPv6 host; /64 specifies a normal IPv6 "
@@ -19852,26 +21449,26 @@ msgid ""
 "assigned."
 msgstr ""
 
-#: src/usr/local/www/services_router_advertisements.php:180
+#: src/usr/local/www/services_router_advertisements.php:183
 #, php-format
 msgid "An invalid subnet or alias was specified. [%s/%s]"
 msgstr ""
 
-#: src/usr/local/www/services_router_advertisements.php:199
+#: src/usr/local/www/services_router_advertisements.php:202
 msgid ""
 "A valid lifetime below 2 hrs will be ignored by clients (RFC 4862 Section "
 "5.5.3 point e)"
 msgstr ""
 
-#: src/usr/local/www/services_router_advertisements.php:291
+#: src/usr/local/www/services_router_advertisements.php:297
 msgid "Advertisements"
 msgstr ""
 
-#: src/usr/local/www/services_router_advertisements.php:295
+#: src/usr/local/www/services_router_advertisements.php:301
 msgid "Router mode"
 msgstr ""
 
-#: src/usr/local/www/services_router_advertisements.php:298
+#: src/usr/local/www/services_router_advertisements.php:304
 msgid ""
 "Select the Operating Mode for the Router Advertisement (RA) Daemon. Use:<br /"
 ">&nbsp;<strong>Router Only</strong> to only advertise this router<br />&nbsp;"
@@ -19883,61 +21480,53 @@ msgid ""
 "network"
 msgstr ""
 
-#: src/usr/local/www/services_router_advertisements.php:307
+#: src/usr/local/www/services_router_advertisements.php:313
 msgid "Router priority"
 msgstr ""
 
-#: src/usr/local/www/services_router_advertisements.php:310
+#: src/usr/local/www/services_router_advertisements.php:316
 msgid "Select the Priority for the Router Advertisement (RA) Daemon."
 msgstr ""
 
-#: src/usr/local/www/services_router_advertisements.php:314
+#: src/usr/local/www/services_router_advertisements.php:320
 msgid "Default valid lifetime"
 msgstr ""
 
-#: src/usr/local/www/services_router_advertisements.php:317
+#: src/usr/local/www/services_router_advertisements.php:323
 msgid ""
 "Seconds. The length of time in seconds (relative to the time the packet is "
 "sent) that the prefix is valid for the purpose of on-link determination. "
 "<br />The default is 86400 seconds."
 msgstr ""
 
-#: src/usr/local/www/services_router_advertisements.php:322
+#: src/usr/local/www/services_router_advertisements.php:328
 msgid "Default preferred lifetime"
 msgstr ""
 
-#: src/usr/local/www/services_router_advertisements.php:325
+#: src/usr/local/www/services_router_advertisements.php:331
 msgid ""
 "Seconds. The length of time in seconds (relative to the time the packet is "
 "sent) that addresses generated from the prefix via stateless address "
 "autoconfiguration remain preferred. <br />The default is 14400 seconds."
 msgstr ""
 
-#: src/usr/local/www/services_router_advertisements.php:347
-msgid "RA Interface"
-msgstr ""
-
-#: src/usr/local/www/services_router_advertisements.php:350
-msgid "Select the Interface for the Router Advertisement (RA) Daemon."
-msgstr ""
-
-#: src/usr/local/www/services_router_advertisements.php:354
+#: src/usr/local/www/services_router_advertisements.php:335
 msgid "RA Subnets"
 msgstr ""
 
-#: src/usr/local/www/services_router_advertisements.php:371
+#: src/usr/local/www/services_router_advertisements.php:351
 msgid "Subnets"
 msgstr ""
 
-#: src/usr/local/www/services_router_advertisements.php:398
+#: src/usr/local/www/services_router_advertisements.php:378
 msgid "DNS Configuration"
 msgstr ""
 
-#: src/usr/local/www/services_router_advertisements.php:403
+#: src/usr/local/www/services_router_advertisements.php:383
 msgid "Server "
 msgstr ""
 
-#: src/usr/local/www/services_router_advertisements.php:413
+#: src/usr/local/www/services_router_advertisements.php:393
 msgid ""
 "The RA server can optionally provide a domain search list. Use the semicolon "
 "character as separator "
@@ -19986,7 +21575,7 @@ msgid "SNMP Daemon"
 msgstr ""
 
 #: src/usr/local/www/services_snmp.php:236
-msgid "SNMP Daemon settings"
+msgid "SNMP Daemon Settings"
 msgstr ""
 
 #: src/usr/local/www/services_snmp.php:243
@@ -20017,7 +21606,7 @@ msgid "SNMP Traps Enable"
 msgstr ""
 
 #: src/usr/local/www/services_snmp.php:279
-msgid "SNMP Trap settings"
+msgid "SNMP Trap Settings"
 msgstr ""
 
 #: src/usr/local/www/services_snmp.php:292
@@ -20058,76 +21647,86 @@ msgid ""
 "or disable the DNS Forwarder."
 msgstr ""
 
-#: src/usr/local/www/services_unbound.php:145
+#: src/usr/local/www/services_unbound.php:165
+msgid ""
+"At least one DNS server must be specified under System>General Setup to "
+"enable Forwarding mode."
+msgstr ""
+
+#: src/usr/local/www/services_unbound.php:170
 msgid "One or more Network Interfaces must be selected for binding."
 msgstr ""
 
-#: src/usr/local/www/services_unbound.php:147
+#: src/usr/local/www/services_unbound.php:172
 msgid ""
 "This system is configured to use the DNS Resolver as its DNS server, so "
 "Localhost or All must be selected in Network Interfaces."
 msgstr ""
 
-#: src/usr/local/www/services_unbound.php:151
+#: src/usr/local/www/services_unbound.php:176
 msgid "One or more Outgoing Network Interfaces must be selected."
 msgstr ""
 
-#: src/usr/local/www/services_unbound.php:155
+#: src/usr/local/www/services_unbound.php:180
 msgid "You must specify a valid port number."
 msgstr ""
 
-#: src/usr/local/www/services_unbound.php:173
+#: src/usr/local/www/services_unbound.php:198
 msgid ""
 "The generated config file cannot be parsed by unbound. Please correct the "
 "following errors:"
 msgstr ""
 
-#: src/usr/local/www/services_unbound.php:189
+#: src/usr/local/www/services_unbound.php:214
 #: src/usr/local/www/services_unbound_advanced.php:214
 msgid "DNS Resolver configured."
 msgstr ""
 
-#: src/usr/local/www/services_unbound.php:241
-#: src/usr/local/www/status_logs.php:74
-#: src/usr/local/www/status_logs_common.inc:125
-msgid "General"
-msgstr ""
-
-#: src/usr/local/www/services_unbound.php:255
-#: src/usr/local/www/services_unbound_acls.php:221
-#: src/usr/local/www/services_unbound_advanced.php:234
-msgid "The DNS Resolver configuration has been changed."
+#: src/usr/local/www/services_unbound.php:266
+#: src/usr/local/www/services_unbound.php:284
+#: src/usr/local/www/services_unbound_acls.php:229
+#: src/usr/local/www/services_unbound_advanced.php:238
+#: src/usr/local/www/services_unbound_domainoverride_edit.php:145
+#: src/usr/local/www/services_unbound_host_edit.php:233
+msgid "General Settings"
 msgstr ""
 
-#: src/usr/local/www/services_unbound.php:259
+#: src/usr/local/www/services_unbound.php:280
 #: src/usr/local/www/services_unbound_acls.php:225
-#: src/usr/local/www/services_unbound_advanced.php:238
-msgid "General settings"
+#: src/usr/local/www/services_unbound_advanced.php:234
+msgid "The DNS resolver configuration has been changed."
 msgstr ""
 
-#: src/usr/local/www/services_unbound.php:260
-#: src/usr/local/www/services_unbound_acls.php:226
+#: src/usr/local/www/services_unbound.php:285
+#: src/usr/local/www/services_unbound_acls.php:230
+#: src/usr/local/www/services_unbound_advanced.php:221
 #: src/usr/local/www/services_unbound_advanced.php:239
-msgid "Advanced settings"
+#: src/usr/local/www/vpn_ipsec.php:261 src/usr/local/www/vpn_ipsec_keys.php:122
+#: src/usr/local/www/vpn_ipsec_mobile.php:459
+#: src/usr/local/www/vpn_ipsec_phase1.php:683
+#: src/usr/local/www/vpn_ipsec_phase2.php:526
+#: src/usr/local/www/vpn_ipsec_settings.php:236
+#: src/usr/local/www/vpn_ipsec_settings.php:269
+msgid "Advanced Settings"
 msgstr ""
 
-#: src/usr/local/www/services_unbound.php:261
+#: src/usr/local/www/services_unbound.php:286
 #: src/usr/local/www/services_unbound_acls.php:208
-#: src/usr/local/www/services_unbound_acls.php:227
+#: src/usr/local/www/services_unbound_acls.php:231
 #: src/usr/local/www/services_unbound_advanced.php:240
 msgid "Access Lists"
 msgstr ""
 
-#: src/usr/local/www/services_unbound.php:266
+#: src/usr/local/www/services_unbound.php:291
 msgid "General DNS Resolver Options"
 msgstr ""
 
-#: src/usr/local/www/services_unbound.php:287
+#: src/usr/local/www/services_unbound.php:312
 #: src/usr/local/www/system_advanced_network.php:233
 msgid "Network Interfaces"
 msgstr ""
 
-#: src/usr/local/www/services_unbound.php:291
+#: src/usr/local/www/services_unbound.php:316
 msgid ""
 "Interface IPs used by the DNS Resolver for responding to queries from "
 "clients. If an interface has both IPv4 and IPv6 IPs, both are used. Queries "
@@ -20135,39 +21734,39 @@ msgid ""
 "behavior is to respond to queries on every available IPv4 and IPv6 address."
 msgstr ""
 
-#: src/usr/local/www/services_unbound.php:298
+#: src/usr/local/www/services_unbound.php:323
 msgid "Outgoing Network Interfaces"
 msgstr ""
 
-#: src/usr/local/www/services_unbound.php:302
+#: src/usr/local/www/services_unbound.php:327
 msgid ""
 "Utilize different network interface(s) that the DNS Resolver will use to "
 "send queries to authoritative servers and receive their replies. By default "
 "all interfaces are used."
 msgstr ""
 
-#: src/usr/local/www/services_unbound.php:306
+#: src/usr/local/www/services_unbound.php:331
 msgid "System Domain Local Zone Type"
 msgstr ""
 
-#: src/usr/local/www/services_unbound.php:309
+#: src/usr/local/www/services_unbound.php:334
 msgid ""
 "The local-zone type used for the pfSense system domain (System | General "
 "Setup | Domain).  Transparent is the default.  Local-Zone type descriptions "
 "are available in the unbound.conf(5) manual pages."
 msgstr ""
 
-#: src/usr/local/www/services_unbound.php:313
+#: src/usr/local/www/services_unbound.php:338
 msgid "DNSSEC"
 msgstr ""
 
-#: src/usr/local/www/services_unbound.php:359
+#: src/usr/local/www/services_unbound.php:384
 msgid ""
 "Enter any additional configuration parameters to add to the DNS Resolver "
 "configuration here, separated by a newline"
 msgstr ""
 
-#: src/usr/local/www/services_unbound.php:534
+#: src/usr/local/www/services_unbound.php:559
 #, php-format
 msgid ""
 "If the DNS Resolver is enabled, the DHCP service (if enabled) will "
@@ -20178,19 +21777,6 @@ msgid ""
 "overridden by DHCP/PPP on WAN&quot; is checked."
 msgstr ""
 
-#: src/usr/local/www/services_unbound_acls.php:151
-#: src/usr/local/www/services_unbound_acls.php:165
-msgid "You must enter a valid IP address for each row under Networks."
-msgstr ""
-
-#: src/usr/local/www/services_unbound_acls.php:156
-msgid "You must enter a valid IPv4 netmask for each IPv4 row under Networks."
-msgstr ""
-
-#: src/usr/local/www/services_unbound_acls.php:162
-msgid "You must enter a valid IPv6 netmask for each IPv6 row under Networks."
-msgstr ""
-
 #: src/usr/local/www/services_unbound_acls.php:173
 msgid "save"
 msgstr ""
@@ -20221,47 +21807,35 @@ msgid ""
 "be configured for your administrative host."
 msgstr ""
 
-#: src/usr/local/www/services_unbound_acls.php:234
+#: src/usr/local/www/services_unbound_acls.php:238
 msgid "New Access List"
 msgstr ""
 
-#: src/usr/local/www/services_unbound_acls.php:252
+#: src/usr/local/www/services_unbound_acls.php:256
 msgid "Access List name"
 msgstr ""
 
-#: src/usr/local/www/services_unbound_acls.php:255
+#: src/usr/local/www/services_unbound_acls.php:259
 msgid "Provide an Access List name."
 msgstr ""
 
-#: src/usr/local/www/services_unbound_acls.php:261
-msgid "Allow"
-msgstr ""
-
-#: src/usr/local/www/services_unbound_acls.php:261
+#: src/usr/local/www/services_unbound_acls.php:265
 msgid "Allow Snoop"
 msgstr ""
 
-#: src/usr/local/www/services_unbound_acls.php:279
-msgid "Networks"
-msgstr ""
-
-#: src/usr/local/www/services_unbound_acls.php:285
-msgid "Network/mask"
-msgstr ""
-
-#: src/usr/local/www/services_unbound_acls.php:316
-msgid "Access Lists to control access to the DNS Resolver"
+#: src/usr/local/www/services_unbound_acls.php:320
+msgid "Access Lists to Control Access to the DNS Resolver"
 msgstr ""
 
-#: src/usr/local/www/services_unbound_acls.php:322
+#: src/usr/local/www/services_unbound_acls.php:326
 msgid "Access List Name"
 msgstr ""
 
-#: src/usr/local/www/services_unbound_acls.php:344
+#: src/usr/local/www/services_unbound_acls.php:348
 msgid "Edit ACL"
 msgstr ""
 
-#: src/usr/local/www/services_unbound_acls.php:345
+#: src/usr/local/www/services_unbound_acls.php:349
 msgid "Delete ACL"
 msgstr ""
 
@@ -20601,7 +22175,7 @@ msgstr ""
 
 #: src/usr/local/www/services_wol.php:152
 msgid ""
-"The NIC in the computer that is to be woken up must support Wake on LAN and "
+"The NIC in the computer that is to be woken up must support Wake-on-LAN and "
 "must be properly configured (WOL cable, BIOS settings)."
 msgstr ""
 
@@ -20615,7 +22189,7 @@ msgid "Enter a MAC address in the following format: xx:xx:xx:xx:xx:xx"
 msgstr ""
 
 #: src/usr/local/www/services_wol.php:191
-msgid "Wake on LAN devices"
+msgid "Wake-on-LAN Devices"
 msgstr ""
 
 #: src/usr/local/www/services_wol.php:195
@@ -20635,7 +22209,7 @@ msgid "Wake all devices"
 msgstr ""
 
 #: src/usr/local/www/services_wol_edit.php:155
-msgid "Edit WOL entry"
+msgid "Edit WOL Entry"
 msgstr ""
 
 #: src/usr/local/www/services_wol_edit.php:162
@@ -20646,11 +22220,11 @@ msgstr ""
 msgid "Related settings"
 msgstr ""
 
-#: src/usr/local/www/shortcuts.inc:152
+#: src/usr/local/www/shortcuts.inc:153
 msgid "Related status"
 msgstr ""
 
-#: src/usr/local/www/shortcuts.inc:160
+#: src/usr/local/www/shortcuts.inc:162
 msgid "Related log entries"
 msgstr ""
 
@@ -20665,7 +22239,7 @@ msgstr ""
 #: src/usr/local/www/status.php:286
 msgid ""
 "Make sure all sensitive information is removed! (Passwords, etc.) before "
-"posting information from this page in public places (like mailing lists)"
+"posting information from this page in public places (like mailing lists)."
 msgstr ""
 
 #: src/usr/local/www/status.php:288
@@ -20673,7 +22247,7 @@ msgid "Common password fields in config.xml have been automatically redacted."
 msgstr ""
 
 #: src/usr/local/www/status.php:290
-msgid "Diagnostics > Command Prompt"
+msgid "Diagnostics > Command Prompt."
 msgstr ""
 
 #: src/usr/local/www/status.php:295
@@ -20684,73 +22258,68 @@ msgstr ""
 msgid "Done."
 msgstr ""
 
-#: src/usr/local/www/status_captiveportal.php:126
-#: src/usr/local/www/status_captiveportal_expire.php:86
-#: src/usr/local/www/status_captiveportal_test.php:86
-#: src/usr/local/www/status_captiveportal_voucher_rolls.php:85
-#: src/usr/local/www/status_captiveportal_vouchers.php:85
-msgid "Captive portal"
-msgstr ""
-
-#: src/usr/local/www/status_captiveportal.php:133
-#: src/usr/local/www/status_captiveportal_expire.php:91
-#: src/usr/local/www/status_captiveportal_test.php:92
+#: src/usr/local/www/status_captiveportal.php:131
+#: src/usr/local/www/status_captiveportal.php:140
+#: src/usr/local/www/status_captiveportal_expire.php:101
+#: src/usr/local/www/status_captiveportal_test.php:109
 #: src/usr/local/www/status_captiveportal_voucher_rolls.php:97
 #: src/usr/local/www/status_captiveportal_vouchers.php:133
 msgid "Active Users"
 msgstr ""
 
-#: src/usr/local/www/status_captiveportal.php:134
-#: src/usr/local/www/status_captiveportal_expire.php:92
-#: src/usr/local/www/status_captiveportal_test.php:93
+#: src/usr/local/www/status_captiveportal.php:141
+#: src/usr/local/www/status_captiveportal_expire.php:102
+#: src/usr/local/www/status_captiveportal_test.php:110
 #: src/usr/local/www/status_captiveportal_voucher_rolls.php:98
+#: src/usr/local/www/status_captiveportal_vouchers.php:85
 #: src/usr/local/www/status_captiveportal_vouchers.php:134
 msgid "Active Vouchers"
 msgstr ""
 
-#: src/usr/local/www/status_captiveportal.php:136
-#: src/usr/local/www/status_captiveportal_expire.php:94
+#: src/usr/local/www/status_captiveportal.php:143
+#: src/usr/local/www/status_captiveportal_expire.php:104
 #: src/usr/local/www/status_captiveportal_test.php:86
-#: src/usr/local/www/status_captiveportal_test.php:95
-#: src/usr/local/www/status_captiveportal_test.php:101
+#: src/usr/local/www/status_captiveportal_test.php:112
+#: src/usr/local/www/status_captiveportal_test.php:118
 #: src/usr/local/www/status_captiveportal_voucher_rolls.php:100
 #: src/usr/local/www/status_captiveportal_vouchers.php:136
 msgid "Test Vouchers"
 msgstr ""
 
-#: src/usr/local/www/status_captiveportal.php:137
+#: src/usr/local/www/status_captiveportal.php:144
 #: src/usr/local/www/status_captiveportal_expire.php:86
-#: src/usr/local/www/status_captiveportal_expire.php:95
-#: src/usr/local/www/status_captiveportal_expire.php:100
-#: src/usr/local/www/status_captiveportal_test.php:96
+#: src/usr/local/www/status_captiveportal_expire.php:105
+#: src/usr/local/www/status_captiveportal_expire.php:110
+#: src/usr/local/www/status_captiveportal_test.php:113
 #: src/usr/local/www/status_captiveportal_voucher_rolls.php:101
 #: src/usr/local/www/status_captiveportal_vouchers.php:137
 msgid "Expire Vouchers"
 msgstr ""
 
-#: src/usr/local/www/status_captiveportal.php:147
+#: src/usr/local/www/status_captiveportal.php:154
 msgid "Captive Portal Zone"
 msgstr ""
 
-#: src/usr/local/www/status_captiveportal.php:157
+#: src/usr/local/www/status_captiveportal.php:164
 msgid "Display Zone"
 msgstr ""
 
-#: src/usr/local/www/status_captiveportal.php:170
-msgid "Captive Portal Status ("
+#: src/usr/local/www/status_captiveportal.php:177
+#: src/usr/local/www/widgets/include/captiveportal.inc:2
+msgid "Captive Portal Status"
 msgstr ""
 
-#: src/usr/local/www/status_captiveportal.php:185
-#: src/usr/local/www/widgets/widgets/captive_portal_status.widget.php:137
+#: src/usr/local/www/status_captiveportal.php:192
+#: src/usr/local/www/widgets/widgets/captive_portal_status.widget.php:133
 msgid "Session start"
 msgstr ""
 
-#: src/usr/local/www/status_captiveportal.php:192
-#: src/usr/local/www/widgets/widgets/captive_portal_status.widget.php:138
+#: src/usr/local/www/status_captiveportal.php:199
+#: src/usr/local/www/widgets/widgets/captive_portal_status.widget.php:134
 msgid "Last activity"
 msgstr ""
 
-#: src/usr/local/www/status_captiveportal.php:245
+#: src/usr/local/www/status_captiveportal.php:252
 #: src/usr/local/www/status_interfaces.php:127
 #: src/usr/local/www/status_interfaces.php:128
 #: src/usr/local/www/status_interfaces.php:129
@@ -20760,16 +22329,11 @@ msgstr ""
 msgid "Disconnect"
 msgstr ""
 
-#: src/usr/local/www/status_captiveportal.php:259
-#: src/usr/local/www/widgets/include/captiveportal.inc:2
-msgid "Captive Portal Status"
-msgstr ""
-
-#: src/usr/local/www/status_captiveportal.php:262
+#: src/usr/local/www/status_captiveportal.php:265
 #, php-format
 msgid ""
-"No captive portal zones have been configured. You may add new zones here: "
-"%1$sServices->Captive portal%2$s"
+"No Captive Portal zones have been configured. You may add new zones here: "
+"%1$sServices > Captive Portal%2$s."
 msgstr ""
 
 #: src/usr/local/www/status_captiveportal.php:278
@@ -20780,21 +22344,21 @@ msgstr ""
 msgid "Show last activity"
 msgstr ""
 
-#: src/usr/local/www/status_captiveportal_expire.php:106
-msgid ""
-"Enter multiple vouchers separated by space or newline. All valid vouchers "
-"will be marked as expired."
+#: src/usr/local/www/status_captiveportal_expire.php:93
+msgid "Voucher(s) successfully marked."
 msgstr ""
 
-#: src/usr/local/www/status_captiveportal_expire.php:121
-msgid "Voucher successfully marked"
+#: src/usr/local/www/status_captiveportal_expire.php:95
+msgid "Voucher(s) could not be processed."
 msgstr ""
 
-#: src/usr/local/www/status_captiveportal_expire.php:123
-msgid "Error: Voucher could not be processed"
+#: src/usr/local/www/status_captiveportal_expire.php:116
+msgid ""
+"Enter multiple vouchers separated by space or newline. All valid vouchers "
+"will be marked as expired."
 msgstr ""
 
-#: src/usr/local/www/status_captiveportal_test.php:107
+#: src/usr/local/www/status_captiveportal_test.php:124
 msgid ""
 "Enter multiple vouchers separated by space or newline. The remaining time, "
 "if valid, will be shown for each voucher."
@@ -20810,7 +22374,7 @@ msgstr ""
 
 #: src/usr/local/www/status_captiveportal_voucher_rolls.php:114
 #: src/usr/local/www/status_dhcp_leases.php:176
-#: src/usr/local/www/status_dhcpv6_leases.php:212
+#: src/usr/local/www/status_dhcpv6_leases.php:216
 msgid "active"
 msgstr ""
 
@@ -20842,229 +22406,224 @@ msgstr ""
 msgid "min"
 msgstr ""
 
-#: src/usr/local/www/status_carp.php:108
+#: src/usr/local/www/status_carp.php:107
 #, php-format
 msgid ""
 "%s IPs have been disabled. Please note that disabling does not survive a "
 "reboot and some configuration changes will re-enable."
 msgstr ""
 
-#: src/usr/local/www/status_carp.php:111
+#: src/usr/local/www/status_carp.php:110
 msgid "CARP has been enabled."
 msgstr ""
 
-#: src/usr/local/www/status_carp.php:168
+#: src/usr/local/www/status_carp.php:162
 msgid "No CARP interfaces have been defined."
 msgstr ""
 
-#: src/usr/local/www/status_carp.php:170
-msgid "You can configure high availability sync settings here"
+#: src/usr/local/www/status_carp.php:164
+msgid "You can configure high availability sync settings here."
 msgstr ""
 
-#: src/usr/local/www/status_carp.php:185
+#: src/usr/local/www/status_carp.php:179
 msgid ""
 "CARP has detected a problem and this unit has been demoted to BACKUP status."
 msgstr ""
 
-#: src/usr/local/www/status_carp.php:187
+#: src/usr/local/www/status_carp.php:181
 msgid "Check the link status on all interfaces with configured CARP VIPs."
 msgstr ""
 
-#: src/usr/local/www/status_carp.php:189
+#: src/usr/local/www/status_carp.php:183
 #, php-format
 msgid "Search the %1$sSystem Log%2$s for CARP demotion-related events."
 msgstr ""
 
-#: src/usr/local/www/status_carp.php:192
-msgid "Reset CARP Demotion Status"
+#: src/usr/local/www/status_carp.php:186
+msgid "Reset CARP Demotion Status."
 msgstr ""
 
-#: src/usr/local/www/status_carp.php:199
+#: src/usr/local/www/status_carp.php:193
 msgid "Temporarily Disable CARP"
 msgstr ""
 
-#: src/usr/local/www/status_carp.php:199
+#: src/usr/local/www/status_carp.php:193
 msgid "Enable CARP"
 msgstr ""
 
-#: src/usr/local/www/status_carp.php:200
+#: src/usr/local/www/status_carp.php:194
 msgid "Leave Persistent CARP Maintenance Mode"
 msgstr ""
 
-#: src/usr/local/www/status_carp.php:200
+#: src/usr/local/www/status_carp.php:194
 msgid "Enter Persistent CARP Maintenance Mode"
 msgstr ""
 
-#: src/usr/local/www/status_carp.php:205
+#: src/usr/local/www/status_carp.php:199
 msgid "CARP Interfaces"
 msgstr ""
 
-#: src/usr/local/www/status_carp.php:210
+#: src/usr/local/www/status_carp.php:204
 msgid "CARP Interface"
 msgstr ""
 
-#: src/usr/local/www/status_carp.php:252
-msgid "pfSync nodes"
-msgstr ""
-
-#: src/usr/local/www/status_dhcp_leases.php:69
-msgid "DHCP leases"
+#: src/usr/local/www/status_carp.php:253
+msgid "pfSync Nodes"
 msgstr ""
 
 #: src/usr/local/www/status_dhcp_leases.php:174
-#: src/usr/local/www/status_dhcpv6_leases.php:210
+#: src/usr/local/www/status_dhcpv6_leases.php:214
 msgid "online"
 msgstr ""
 
 #: src/usr/local/www/status_dhcp_leases.php:175
-#: src/usr/local/www/status_dhcpv6_leases.php:211
+#: src/usr/local/www/status_dhcpv6_leases.php:215
 msgid "offline"
 msgstr ""
 
 #: src/usr/local/www/status_dhcp_leases.php:177
-#: src/usr/local/www/status_dhcpv6_leases.php:213
+#: src/usr/local/www/status_dhcpv6_leases.php:217
 msgid "expired"
 msgstr ""
 
 #: src/usr/local/www/status_dhcp_leases.php:178
-#: src/usr/local/www/status_dhcpv6_leases.php:214
+#: src/usr/local/www/status_dhcpv6_leases.php:218
 msgid "reserved"
 msgstr ""
 
 #: src/usr/local/www/status_dhcp_leases.php:179
-#: src/usr/local/www/status_dhcpv6_leases.php:216
+#: src/usr/local/www/status_dhcpv6_leases.php:220
 msgid "dynamic"
 msgstr ""
 
 #: src/usr/local/www/status_dhcp_leases.php:180
-#: src/usr/local/www/status_dhcpv6_leases.php:217
+#: src/usr/local/www/status_dhcpv6_leases.php:221
 msgid "static"
 msgstr ""
 
 #: src/usr/local/www/status_dhcp_leases.php:342
-#: src/usr/local/www/status_dhcpv6_leases.php:411
-msgid "Pool status"
+#: src/usr/local/www/status_dhcpv6_leases.php:415
+msgid "Pool Status"
 msgstr ""
 
 #: src/usr/local/www/status_dhcp_leases.php:347
-#: src/usr/local/www/status_dhcpv6_leases.php:416
+#: src/usr/local/www/status_dhcpv6_leases.php:420
 msgid "Failover Group"
 msgstr ""
 
 #: src/usr/local/www/status_dhcp_leases.php:348
-#: src/usr/local/www/status_dhcpv6_leases.php:417
+#: src/usr/local/www/status_dhcpv6_leases.php:421
 msgid "My State"
 msgstr ""
 
 #: src/usr/local/www/status_dhcp_leases.php:349
 #: src/usr/local/www/status_dhcp_leases.php:351
-#: src/usr/local/www/status_dhcpv6_leases.php:418
-#: src/usr/local/www/status_dhcpv6_leases.php:420
+#: src/usr/local/www/status_dhcpv6_leases.php:422
+#: src/usr/local/www/status_dhcpv6_leases.php:424
 msgid "Since"
 msgstr ""
 
 #: src/usr/local/www/status_dhcp_leases.php:350
-#: src/usr/local/www/status_dhcpv6_leases.php:419
+#: src/usr/local/www/status_dhcpv6_leases.php:423
 msgid "Peer State"
 msgstr ""
 
 #: src/usr/local/www/status_dhcp_leases.php:373
-#: src/usr/local/www/status_dhcpv6_leases.php:447
+#: src/usr/local/www/status_dhcpv6_leases.php:451
 #: src/usr/local/www/status_ipsec.php:120
-#: src/usr/local/www/status_ipsec_leases.php:68
-#: src/usr/local/www/status_ipsec_leases.php:76
+#: src/usr/local/www/status_ipsec_leases.php:66
+#: src/usr/local/www/status_ipsec_leases.php:74
 #: src/usr/local/www/status_ipsec_sad.php:87
 #: src/usr/local/www/status_ipsec_spd.php:80
 msgid "Leases"
 msgstr ""
 
-#: src/usr/local/www/status_dhcp_leases.php:383
-#: src/usr/local/www/status_dhcpv6_leases.php:459
-#: src/usr/local/www/status_dhcpv6_leases.php:550
-#: src/usr/local/www/status_rrd_graph.php:604
-#: src/usr/local/www/status_rrd_graph.php:607
+#: src/usr/local/www/status_dhcp_leases.php:384
+#: src/usr/local/www/status_dhcpv6_leases.php:463
+#: src/usr/local/www/status_dhcpv6_leases.php:555
 msgid "End"
 msgstr ""
 
-#: src/usr/local/www/status_dhcp_leases.php:384
-#: src/usr/local/www/status_dhcpv6_leases.php:460
-#: src/usr/local/www/status_gateway_groups.php:167
-#: src/usr/local/www/status_gateways.php:176
-#: src/usr/local/www/status_gateways.php:180
-#: src/usr/local/www/status_ipsec_leases.php:89
-#: src/usr/local/www/widgets/widgets/gateways.widget.php:247
+#: src/usr/local/www/status_dhcp_leases.php:385
+#: src/usr/local/www/status_dhcpv6_leases.php:464
+#: src/usr/local/www/status_gateway_groups.php:161
+#: src/usr/local/www/status_gateways.php:171
+#: src/usr/local/www/status_gateways.php:175
+#: src/usr/local/www/status_ipsec_leases.php:87
+#: src/usr/local/www/widgets/widgets/gateways.widget.php:250
 #: src/usr/local/www/widgets/widgets/wake_on_lan.widget.php:90
 msgid "Online"
 msgstr ""
 
-#: src/usr/local/www/status_dhcp_leases.php:385
-#: src/usr/local/www/status_dhcpv6_leases.php:461
+#: src/usr/local/www/status_dhcp_leases.php:386
+#: src/usr/local/www/status_dhcpv6_leases.php:465
 msgid "Lease Type"
 msgstr ""
 
-#: src/usr/local/www/status_dhcp_leases.php:450
-#: src/usr/local/www/status_dhcpv6_leases.php:526
+#: src/usr/local/www/status_dhcp_leases.php:461
+#: src/usr/local/www/status_dhcp_leases.php:462
+msgid "n/a"
+msgstr ""
+
+#: src/usr/local/www/status_dhcp_leases.php:468
+#: src/usr/local/www/status_dhcpv6_leases.php:530
 msgid "Add static mapping"
 msgstr ""
 
-#: src/usr/local/www/status_dhcp_leases.php:454
-#: src/usr/local/www/status_dhcpv6_leases.php:528
+#: src/usr/local/www/status_dhcp_leases.php:472
+#: src/usr/local/www/status_dhcpv6_leases.php:532
 msgid "Add WOL mapping"
 msgstr ""
 
-#: src/usr/local/www/status_dhcp_leases.php:456
+#: src/usr/local/www/status_dhcp_leases.php:474
 msgid "Send WOL packet"
 msgstr ""
 
-#: src/usr/local/www/status_dhcp_leases.php:460
-#: src/usr/local/www/status_dhcpv6_leases.php:530
+#: src/usr/local/www/status_dhcp_leases.php:478
+#: src/usr/local/www/status_dhcpv6_leases.php:534
 msgid "Delete lease"
 msgstr ""
 
-#: src/usr/local/www/status_dhcp_leases.php:471
-msgid "Leases in use"
+#: src/usr/local/www/status_dhcp_leases.php:489
+msgid "Leases in Use"
 msgstr ""
 
-#: src/usr/local/www/status_dhcp_leases.php:479
+#: src/usr/local/www/status_dhcp_leases.php:497
 msgid "# of leases in use"
 msgstr ""
 
-#: src/usr/local/www/status_dhcp_leases.php:497
-#: src/usr/local/www/status_dhcpv6_leases.php:619
+#: src/usr/local/www/status_dhcp_leases.php:518
+#: src/usr/local/www/status_dhcpv6_leases.php:624
 msgid "Show active and static leases only"
 msgstr ""
 
-#: src/usr/local/www/status_dhcp_leases.php:499
-#: src/usr/local/www/status_dhcpv6_leases.php:621
+#: src/usr/local/www/status_dhcp_leases.php:520
+#: src/usr/local/www/status_dhcpv6_leases.php:626
 msgid "Show all configured leases"
 msgstr ""
 
-#: src/usr/local/www/status_dhcpv6_leases.php:70
-msgid "DHCPv6 leases"
-msgstr ""
-
-#: src/usr/local/www/status_dhcpv6_leases.php:215
+#: src/usr/local/www/status_dhcpv6_leases.php:219
 msgid "released"
 msgstr ""
 
-#: src/usr/local/www/status_dhcpv6_leases.php:442
-msgid "No leases file found. Is the DHCP server active?"
+#: src/usr/local/www/status_dhcpv6_leases.php:446
+msgid "No leases file found. Is the DHCPv6 server active?"
 msgstr ""
 
-#: src/usr/local/www/status_dhcpv6_leases.php:454
-#: src/usr/local/www/status_dhcpv6_leases.php:547
+#: src/usr/local/www/status_dhcpv6_leases.php:458
+#: src/usr/local/www/status_dhcpv6_leases.php:552
 msgid "IAID"
 msgstr ""
 
-#: src/usr/local/www/status_dhcpv6_leases.php:541
+#: src/usr/local/www/status_dhcpv6_leases.php:545
 msgid "Delegated Prefixes"
 msgstr ""
 
-#: src/usr/local/www/status_dhcpv6_leases.php:546
+#: src/usr/local/www/status_dhcpv6_leases.php:551
 msgid "IPv6 Prefix"
 msgstr ""
 
-#: src/usr/local/www/status_dhcpv6_leases.php:598
+#: src/usr/local/www/status_dhcpv6_leases.php:603
 msgid "Routed To"
 msgstr ""
 
@@ -21098,11 +22657,11 @@ msgstr ""
 msgid "Queue Status"
 msgstr ""
 
-#: src/usr/local/www/status_gateway_groups.php:82
+#: src/usr/local/www/status_gateway_groups.php:76
+#: src/usr/local/www/status_gateway_groups.php:80
 #: src/usr/local/www/status_gateway_groups.php:86
-#: src/usr/local/www/status_gateway_groups.php:92
-#: src/usr/local/www/status_gateway_groups.php:96
-#: src/usr/local/www/status_gateways.php:87
+#: src/usr/local/www/status_gateway_groups.php:90
+#: src/usr/local/www/status_gateways.php:82
 #: src/usr/local/www/system_gateway_groups.php:76
 #: src/usr/local/www/system_gateway_groups.php:124
 #: src/usr/local/www/system_gateway_groups.php:140
@@ -21113,70 +22672,68 @@ msgstr ""
 msgid "Gateway Groups"
 msgstr ""
 
-#: src/usr/local/www/status_gateway_groups.php:130
+#: src/usr/local/www/status_gateway_groups.php:124
 #, php-format
 msgid "Tier %s"
 msgstr ""
 
-#: src/usr/local/www/status_gateway_groups.php:158
-#: src/usr/local/www/status_gateways.php:167
+#: src/usr/local/www/status_gateway_groups.php:152
+#: src/usr/local/www/status_gateways.php:162
 #: src/usr/local/www/widgets/widgets/gateways.widget.php:238
 #: src/usr/local/www/widgets/widgets/wake_on_lan.widget.php:96
-#: src/usr/local/www/diag_smart.php:390
+#: src/usr/local/www/diag_smart.php:400
 msgid "Offline"
 msgstr ""
 
-#: src/usr/local/www/status_gateway_groups.php:161
-#: src/usr/local/www/status_gateways.php:170
+#: src/usr/local/www/status_gateway_groups.php:155
+#: src/usr/local/www/status_gateways.php:165
 msgid "Warning, Packetloss"
 msgstr ""
 
-#: src/usr/local/www/status_gateway_groups.php:164
-#: src/usr/local/www/status_gateways.php:173
+#: src/usr/local/www/status_gateway_groups.php:158
+#: src/usr/local/www/status_gateways.php:168
 msgid "Warning, Latency"
 msgstr ""
 
-#: src/usr/local/www/status_gateway_groups.php:170
+#: src/usr/local/www/status_gateway_groups.php:164
 msgid "Gathering data"
 msgstr ""
 
-#: src/usr/local/www/status_gateways.php:101
+#: src/usr/local/www/status_gateways.php:96
 msgid "RTT"
 msgstr ""
 
-#: src/usr/local/www/status_gateways.php:102
+#: src/usr/local/www/status_gateways.php:97
 msgid "RTTsd"
 msgstr ""
 
-#: src/usr/local/www/status_gateways.php:103
+#: src/usr/local/www/status_gateways.php:98
 #: src/usr/local/www/widgets/widgets/gateways.widget.php:92
 msgid "Loss"
 msgstr ""
 
-#: src/usr/local/www/status_gateways.php:134
-#: src/usr/local/www/status_gateways.php:145
-#: src/usr/local/www/status_gateways.php:156
-#: src/usr/local/www/status_gateways.php:183
-#: src/usr/local/www/widgets/widgets/gateways.widget.php:250
-#: src/usr/local/www/widgets/widgets/gateways.widget.php:258
-#: src/usr/local/www/widgets/widgets/gateways.widget.php:259
-#: src/usr/local/www/widgets/widgets/gateways.widget.php:260
+#: src/usr/local/www/status_gateways.php:129
+#: src/usr/local/www/status_gateways.php:140
+#: src/usr/local/www/status_gateways.php:151
+#: src/usr/local/www/status_gateways.php:178
+#: src/usr/local/www/widgets/widgets/gateways.widget.php:254
+#: src/usr/local/www/widgets/widgets/gateways.widget.php:262
+#: src/usr/local/www/widgets/widgets/gateways.widget.php:263
+#: src/usr/local/www/widgets/widgets/gateways.widget.php:264
 msgid "Pending"
 msgstr ""
 
-#: src/usr/local/www/status_gateways.php:164
+#: src/usr/local/www/status_gateways.php:159
 #: src/usr/local/www/widgets/widgets/gateways.widget.php:235
 msgid "Offline (forced)"
 msgstr ""
 
-#: src/usr/local/www/status_gateways.php:197
+#: src/usr/local/www/status_gateways.php:192
 msgid "Last checked"
 msgstr ""
 
 #: src/usr/local/www/status_graph.php:157
-#: src/usr/local/www/status_rrd_graph.php:549
-#: src/usr/local/www/status_rrd_graph_settings.php:195
-msgid "Graph settings"
+msgid "Graph Settings"
 msgstr ""
 
 #: src/usr/local/www/status_graph.php:173
@@ -21210,10 +22767,6 @@ msgstr ""
 msgid "Bits/sec"
 msgstr ""
 
-#: src/usr/local/www/status_graph.php:258
-msgid "Traffic graph"
-msgstr ""
-
 #: src/usr/local/www/status_graph.php:274
 msgid "Host IP"
 msgstr ""
@@ -21228,8 +22781,6 @@ msgid "CPU Load Graph"
 msgstr ""
 
 #: src/usr/local/www/status_graph_cpu.php:79
-#: src/usr/local/www/vpn_ipsec_keys.php:211
-#: src/usr/local/www/vpn_ipsec_keys_edit.php:207
 msgid "Note"
 msgstr ""
 
@@ -21241,7 +22792,7 @@ msgid ""
 msgstr ""
 
 #: src/usr/local/www/status_interfaces.php:120
-msgid " interface "
+msgid " Interface "
 msgstr ""
 
 #: src/usr/local/www/status_interfaces.php:125
@@ -21362,7 +22913,7 @@ msgstr ""
 msgid "Total interrupts"
 msgstr ""
 
-#: src/usr/local/www/status_interfaces.php:213
+#: src/usr/local/www/status_interfaces.php:211
 msgid ""
 "Using dial-on-demand will bring the connection up again if any packet "
 "triggers it. To substantiate this point: disconnecting manually will "
@@ -21372,7 +22923,7 @@ msgid ""
 msgstr ""
 
 #: src/usr/local/www/status_ipsec.php:70 src/usr/local/www/status_ipsec.php:119
-#: src/usr/local/www/status_ipsec_leases.php:75
+#: src/usr/local/www/status_ipsec_leases.php:73
 #: src/usr/local/www/status_ipsec_sad.php:86
 #: src/usr/local/www/status_ipsec_spd.php:79
 #: src/usr/local/www/widgets/widgets/ipsec.widget.php:205
@@ -21380,23 +22931,23 @@ msgid "Overview"
 msgstr ""
 
 #: src/usr/local/www/status_ipsec.php:121
-#: src/usr/local/www/status_ipsec_leases.php:77
+#: src/usr/local/www/status_ipsec_leases.php:75
 #: src/usr/local/www/status_ipsec_sad.php:69
 #: src/usr/local/www/status_ipsec_sad.php:88
 #: src/usr/local/www/status_ipsec_spd.php:81
-msgid "SAD"
+msgid "SADs"
 msgstr ""
 
 #: src/usr/local/www/status_ipsec.php:122
-#: src/usr/local/www/status_ipsec_leases.php:78
+#: src/usr/local/www/status_ipsec_leases.php:76
 #: src/usr/local/www/status_ipsec_sad.php:89
 #: src/usr/local/www/status_ipsec_spd.php:72
 #: src/usr/local/www/status_ipsec_spd.php:82
-msgid "SPD"
+msgid "SPDs"
 msgstr ""
 
 #: src/usr/local/www/status_ipsec.php:127
-msgid "IPsec status"
+msgid "IPsec Status"
 msgstr ""
 
 #: src/usr/local/www/status_ipsec.php:133
@@ -21524,22 +23075,22 @@ msgid "Disconnected"
 msgstr ""
 
 #: src/usr/local/www/status_ipsec.php:531
-#: src/usr/local/www/status_ipsec_leases.php:164
+#: src/usr/local/www/status_ipsec_leases.php:162
 #: src/usr/local/www/status_ipsec_sad.php:161
 #: src/usr/local/www/status_ipsec_spd.php:145
 #, php-format
-msgid "You can configure IPsec %1$shere%2$s"
+msgid "You can configure IPsec %1$shere%2$s."
 msgstr ""
 
-#: src/usr/local/www/status_ipsec_leases.php:88
+#: src/usr/local/www/status_ipsec_leases.php:86
 msgid "Usage"
 msgstr ""
 
-#: src/usr/local/www/status_ipsec_leases.php:141
+#: src/usr/local/www/status_ipsec_leases.php:139
 msgid "No leases from this pool yet."
 msgstr ""
 
-#: src/usr/local/www/status_ipsec_leases.php:152
+#: src/usr/local/www/status_ipsec_leases.php:150
 msgid "No IPsec pools."
 msgstr ""
 
@@ -21579,340 +23130,320 @@ msgstr ""
 msgid "No IPsec security policies configured."
 msgstr ""
 
-#: src/usr/local/www/status_lb_pool.php:143
+#: src/usr/local/www/status_lb_pool.php:138
 msgid "Updated load balancer pools via status screen."
 msgstr ""
 
-#: src/usr/local/www/status_lb_pool.php:162
+#: src/usr/local/www/status_lb_pool.php:157
 msgid "Load Balancer Pools"
 msgstr ""
 
-#: src/usr/local/www/status_lb_pool.php:187
+#: src/usr/local/www/status_lb_pool.php:182
 msgid "Load balancing"
 msgstr ""
 
-#: src/usr/local/www/status_lb_pool.php:190
+#: src/usr/local/www/status_lb_pool.php:185
 msgid "Manual failover"
 msgstr ""
 
-#: src/usr/local/www/status_lb_pool.php:193
+#: src/usr/local/www/status_lb_pool.php:188
 msgid "(default)"
 msgstr ""
 
-#: src/usr/local/www/status_lb_vs.php:94
-msgid "No load balancers have been configured!"
+#: src/usr/local/www/status_lb_vs.php:89
+msgid "No load balancers have been configured."
 msgstr ""
 
-#: src/usr/local/www/status_lb_vs.php:136
+#: src/usr/local/www/status_lb_vs.php:131
 #: src/usr/local/www/widgets/widgets/load_balancer_status.widget.php:105
-#: src/usr/local/www/system.php:552
+#: src/usr/local/www/system.php:558
 msgid "Active"
 msgstr ""
 
-#: src/usr/local/www/status_lb_vs.php:140
+#: src/usr/local/www/status_lb_vs.php:135
 #: src/usr/local/www/widgets/widgets/load_balancer_status.widget.php:109
 msgid "Down"
 msgstr ""
 
-#: src/usr/local/www/status_lb_vs.php:144
+#: src/usr/local/www/status_lb_vs.php:139
 #: src/usr/local/www/widgets/widgets/load_balancer_status.widget.php:113
 msgid "Unknown - relayd not running?"
 msgstr ""
 
-#: src/usr/local/www/status_lb_vs.php:156
+#: src/usr/local/www/status_lb_vs.php:151
 #, php-format
 msgid "Total Sessions: %s"
 msgstr ""
 
-#: src/usr/local/www/status_lb_vs.php:159
+#: src/usr/local/www/status_lb_vs.php:154
 #, php-format
 msgid "Last: %s"
 msgstr ""
 
-#: src/usr/local/www/status_lb_vs.php:162
+#: src/usr/local/www/status_lb_vs.php:157
 #, php-format
 msgid "Average: %s"
 msgstr ""
 
-#: src/usr/local/www/status_logs.php:78
-msgid "Captive Portal Authentication"
-msgstr ""
-
-#: src/usr/local/www/status_logs.php:88
-msgid "NTPd"
+#: src/usr/local/www/status_logs.php:74
+#: src/usr/local/www/status_logs_common.inc:136
+msgid "General"
 msgstr ""
 
-#: src/usr/local/www/status_logs.php:128
-#: src/usr/local/www/status_logs_filter.php:135
-#: src/usr/local/www/status_logs_filter_dynamic.php:115
-#: src/usr/local/www/status_logs_filter_summary.php:101
-#: src/usr/local/www/status_logs_settings.php:209
-#: src/usr/local/www/status_logs_vpn.php:117
-msgid "System logs"
+#: src/usr/local/www/status_logs.php:78
+#: src/usr/local/www/status_logs_common.inc:124
+#: src/usr/local/www/status_logs_settings.php:236
+msgid "Captive Portal Auth"
 msgstr ""
 
-#: src/usr/local/www/status_logs.php:169
-#: src/usr/local/www/status_logs_common.inc:272
+#: src/usr/local/www/status_logs.php:173
+#: src/usr/local/www/status_logs_common.inc:283
 msgid "Process"
 msgstr ""
 
-#: src/usr/local/www/status_logs.php:170
-#: src/usr/local/www/status_logs_common.inc:279
+#: src/usr/local/www/status_logs.php:174
+#: src/usr/local/www/status_logs_common.inc:290
 #: src/usr/local/www/status_logs_vpn.php:211
-#: src/usr/local/www/status_logs_vpn.php:455
+#: src/usr/local/www/status_logs_vpn.php:447
 msgid "PID"
 msgstr ""
 
-#: src/usr/local/www/status_logs.php:199 src/usr/local/www/status_logs.php:247
+#: src/usr/local/www/status_logs.php:203 src/usr/local/www/status_logs.php:251
 #: src/usr/local/www/status_logs_filter.php:307
 #: src/usr/local/www/status_logs_filter.php:350
-#: src/usr/local/www/status_logs_filter_dynamic.php:486
+#: src/usr/local/www/status_logs_filter_dynamic.php:485
 #: src/usr/local/www/status_logs_vpn.php:243
 #: src/usr/local/www/status_logs_vpn.php:275
-#: src/usr/local/www/widgets/widgets/log.widget.php:195
-msgid "No logs to display"
-msgstr ""
-
-#: src/usr/local/www/status_logs_common.inc:113
-#: src/usr/local/www/status_logs_settings.php:236
-msgid "Portal Auth"
+msgid "No logs to display."
 msgstr ""
 
-#: src/usr/local/www/status_logs_common.inc:116
+#: src/usr/local/www/status_logs_common.inc:127
 #: src/usr/local/www/status_logs_settings.php:239
 #: src/usr/local/www/status_logs_vpn.php:117
-#: src/usr/local/www/status_rrd_graph.php:456
-#: src/usr/local/www/status_rrd_graph_settings.php:165
 #: src/usr/local/www/vpn_ipsec.php:252 src/usr/local/www/vpn_ipsec_keys.php:105
 #: src/usr/local/www/vpn_ipsec_keys_edit.php:155
 #: src/usr/local/www/vpn_ipsec_mobile.php:339
-#: src/usr/local/www/vpn_ipsec_phase1.php:638
-#: src/usr/local/www/vpn_ipsec_phase1.php:641
+#: src/usr/local/www/vpn_ipsec_phase1.php:664
+#: src/usr/local/www/vpn_ipsec_phase1.php:667
 #: src/usr/local/www/vpn_ipsec_phase2.php:441
 #: src/usr/local/www/vpn_ipsec_phase2.php:444
 #: src/usr/local/www/vpn_ipsec_settings.php:236
 #: src/usr/local/www/vpn_l2tp.php:219 src/usr/local/www/vpn_l2tp_users.php:63
 #: src/usr/local/www/vpn_l2tp_users_edit.php:63
-#: src/usr/local/www/vpn_openvpn_client.php:70
-#: src/usr/local/www/vpn_openvpn_csc.php:70
+#: src/usr/local/www/vpn_openvpn_client.php:426
+#: src/usr/local/www/vpn_openvpn_csc.php:308
 #: src/usr/local/www/vpn_openvpn_server.php:592
 msgid "VPN"
 msgstr ""
 
-#: src/usr/local/www/status_logs_common.inc:128
-msgid "Resolver"
-msgstr ""
-
-#: src/usr/local/www/status_logs_common.inc:132
+#: src/usr/local/www/status_logs_common.inc:143
 #: src/usr/local/www/status_logs_filter.php:109
 #: src/usr/local/www/status_logs_filter_dynamic.php:98
 #: src/usr/local/www/status_logs_filter_summary.php:92
 msgid "Normal View"
 msgstr ""
 
-#: src/usr/local/www/status_logs_common.inc:133
+#: src/usr/local/www/status_logs_common.inc:144
 #: src/usr/local/www/status_logs_filter.php:110
 #: src/usr/local/www/status_logs_filter_dynamic.php:99
 #: src/usr/local/www/status_logs_filter_summary.php:93
 msgid "Dynamic View"
 msgstr ""
 
-#: src/usr/local/www/status_logs_common.inc:134
+#: src/usr/local/www/status_logs_common.inc:145
 #: src/usr/local/www/status_logs_filter.php:111
 #: src/usr/local/www/status_logs_filter_dynamic.php:100
 #: src/usr/local/www/status_logs_filter_summary.php:94
 msgid "Summary View"
 msgstr ""
 
-#: src/usr/local/www/status_logs_common.inc:137
+#: src/usr/local/www/status_logs_common.inc:148
 #: src/usr/local/www/status_logs_vpn.php:97
 msgid "PPPoE Logins"
 msgstr ""
 
-#: src/usr/local/www/status_logs_common.inc:140
+#: src/usr/local/www/status_logs_common.inc:151
 #: src/usr/local/www/status_logs_vpn.php:77
 msgid "PPPoE Service"
 msgstr ""
 
-#: src/usr/local/www/status_logs_common.inc:143
+#: src/usr/local/www/status_logs_common.inc:154
 #: src/usr/local/www/status_logs_vpn.php:98
 msgid "L2TP Logins"
 msgstr ""
 
-#: src/usr/local/www/status_logs_common.inc:146
+#: src/usr/local/www/status_logs_common.inc:157
 #: src/usr/local/www/status_logs_vpn.php:79
 msgid "L2TP Service"
 msgstr ""
 
-#: src/usr/local/www/status_logs_common.inc:165
+#: src/usr/local/www/status_logs_common.inc:176
 #, php-format
-msgid "%s matched %s log entries."
+msgid "%s Matched %s Log Entries."
 msgstr ""
 
-#: src/usr/local/www/status_logs_common.inc:167
+#: src/usr/local/www/status_logs_common.inc:178
 #, php-format
-msgid "Last %s %s log entries."
+msgid "Last %s %s Log Entries."
 msgstr ""
 
-#: src/usr/local/www/status_logs_common.inc:171
+#: src/usr/local/www/status_logs_common.inc:182
 #, php-format
-msgid "%d matched %s log entries."
+msgid "%d Matched %s Log Entries."
 msgstr ""
 
-#: src/usr/local/www/status_logs_common.inc:173
+#: src/usr/local/www/status_logs_common.inc:184
 #, php-format
-msgid "Last %d %s log entries."
+msgid "Last %d %s Log Entries."
 msgstr ""
 
-#: src/usr/local/www/status_logs_common.inc:177
+#: src/usr/local/www/status_logs_common.inc:188
 #, php-format
 msgid "Maximum %d"
 msgstr ""
 
-#: src/usr/local/www/status_logs_common.inc:256
-#: src/usr/local/www/status_logs_common.inc:417
-#: src/usr/local/www/status_logs_vpn.php:389
+#: src/usr/local/www/status_logs_common.inc:267
+#: src/usr/local/www/status_logs_common.inc:428
+#: src/usr/local/www/status_logs_vpn.php:381
 msgid "Advanced Log Filter"
 msgstr ""
 
-#: src/usr/local/www/status_logs_common.inc:287
-#: src/usr/local/www/status_logs_common.inc:327
-#: src/usr/local/www/status_logs_common.inc:473
-#: src/usr/local/www/status_logs_common.inc:535
-#: src/usr/local/www/status_logs_vpn.php:414
-#: src/usr/local/www/status_logs_vpn.php:463
-#: src/usr/local/www/status_logs_vpn.php:504
+#: src/usr/local/www/status_logs_common.inc:298
+#: src/usr/local/www/status_logs_common.inc:338
+#: src/usr/local/www/status_logs_common.inc:484
+#: src/usr/local/www/status_logs_common.inc:546
+#: src/usr/local/www/status_logs_vpn.php:406
+#: src/usr/local/www/status_logs_vpn.php:455
+#: src/usr/local/www/status_logs_vpn.php:496
 msgid "Quantity"
 msgstr ""
 
-#: src/usr/local/www/status_logs_common.inc:302
-#: src/usr/local/www/status_logs_common.inc:331
-#: src/usr/local/www/status_logs_common.inc:510
-#: src/usr/local/www/status_logs_common.inc:550
-#: src/usr/local/www/status_logs_vpn.php:479
-#: src/usr/local/www/status_logs_vpn.php:508
+#: src/usr/local/www/status_logs_common.inc:313
+#: src/usr/local/www/status_logs_common.inc:342
+#: src/usr/local/www/status_logs_common.inc:521
+#: src/usr/local/www/status_logs_common.inc:561
+#: src/usr/local/www/status_logs_vpn.php:471
+#: src/usr/local/www/status_logs_vpn.php:500
 msgid "Apply Filter"
 msgstr ""
 
-#: src/usr/local/www/status_logs_common.inc:302
-#: src/usr/local/www/status_logs_common.inc:331
-#: src/usr/local/www/status_logs_common.inc:510
-#: src/usr/local/www/status_logs_common.inc:550
-#: src/usr/local/www/status_logs_common.inc:804
-#: src/usr/local/www/status_logs_common.inc:961
-#: src/usr/local/www/status_logs_common.inc:976
-#: src/usr/local/www/status_logs_vpn.php:479
-#: src/usr/local/www/status_logs_vpn.php:508
-#: src/usr/local/www/diag_nanobsd.php:162
-msgid " "
+#: src/usr/local/www/status_logs_common.inc:321
+#: src/usr/local/www/status_logs_common.inc:529
+#: src/usr/local/www/status_logs_vpn.php:479 src/usr/local/www/system.php:539
+msgid "Log Filter"
 msgstr ""
 
-#: src/usr/local/www/status_logs_common.inc:319
-#: src/usr/local/www/status_logs_common.inc:546
-#: src/usr/local/www/status_logs_vpn.php:496
+#: src/usr/local/www/status_logs_common.inc:330
+#: src/usr/local/www/status_logs_common.inc:557
+#: src/usr/local/www/status_logs_vpn.php:488
 msgid "Filter Expression"
 msgstr ""
 
-#: src/usr/local/www/status_logs_common.inc:344
-#: src/usr/local/www/status_logs_common.inc:563
-#: src/usr/local/www/status_logs_vpn.php:521
+#: src/usr/local/www/status_logs_common.inc:355
+#: src/usr/local/www/status_logs_common.inc:574
+#: src/usr/local/www/status_logs_vpn.php:513
 msgid "Regular expression reference"
 msgstr ""
 
-#: src/usr/local/www/status_logs_common.inc:344
-#: src/usr/local/www/status_logs_common.inc:563
-#: src/usr/local/www/status_logs_vpn.php:521
+#: src/usr/local/www/status_logs_common.inc:355
+#: src/usr/local/www/status_logs_common.inc:574
+#: src/usr/local/www/status_logs_vpn.php:513
 msgid "Precede with exclamation (!) to exclude match."
 msgstr ""
 
-#: src/usr/local/www/status_logs_common.inc:344
-#: src/usr/local/www/status_logs_common.inc:563
-#: src/usr/local/www/status_logs_vpn.php:521
+#: src/usr/local/www/status_logs_common.inc:355
+#: src/usr/local/www/status_logs_common.inc:574
+#: src/usr/local/www/status_logs_vpn.php:513
 msgid ""
 "<a target=\"_blank\" href=\"http://www.php.net/manual/en/book.pcre.php\">"
 msgstr ""
 
-#: src/usr/local/www/status_logs_common.inc:426
+#: src/usr/local/www/status_logs_common.inc:437
 msgid "Source IP Address"
 msgstr ""
 
-#: src/usr/local/www/status_logs_common.inc:433
+#: src/usr/local/www/status_logs_common.inc:444
 msgid "Destination IP Address"
 msgstr ""
 
-#: src/usr/local/www/status_logs_common.inc:506
+#: src/usr/local/www/status_logs_common.inc:517
 msgid "Protocol Flags"
 msgstr ""
 
-#: src/usr/local/www/status_logs_common.inc:659
+#: src/usr/local/www/status_logs_common.inc:676
 #: src/usr/local/www/status_logs_settings.php:128
 msgid "Number of log entries to show must be between 5 and 2000."
 msgstr ""
 
-#: src/usr/local/www/status_logs_common.inc:665
+#: src/usr/local/www/status_logs_common.inc:682
 #: src/usr/local/www/status_logs_settings.php:133
 msgid "Log file size must be numeric and greater than or equal to 100000."
 msgstr ""
 
-#: src/usr/local/www/status_logs_common.inc:733
+#: src/usr/local/www/status_logs_common.inc:750
 msgid "Log Display Settings Saved: "
 msgstr ""
 
-#: src/usr/local/www/status_logs_common.inc:738
+#: src/usr/local/www/status_logs_common.inc:755
 msgid "Log Display Settings Saved (no backup, no sync): "
 msgstr ""
 
-#: src/usr/local/www/status_logs_common.inc:747
+#: src/usr/local/www/status_logs_common.inc:764
 #: src/usr/local/www/status_logs_settings.php:200
 #: src/usr/local/www/system_advanced_admin.php:599
 msgid "webConfigurator configuration has changed. Restarting webConfigurator."
 msgstr ""
 
-#: src/usr/local/www/status_logs_common.inc:749
+#: src/usr/local/www/status_logs_common.inc:766
 #: src/usr/local/www/status_logs_settings.php:202
 msgid "WebGUI process is restarting."
 msgstr ""
 
-#: src/usr/local/www/status_logs_common.inc:804
+#: src/usr/local/www/status_logs_common.inc:816
 msgid "Manage"
 msgstr ""
 
-#: src/usr/local/www/status_logs_common.inc:813
+#: src/usr/local/www/status_logs_common.inc:816
+#: src/usr/local/www/diag_nanobsd.php:162
+msgid " "
+msgstr ""
+
+#: src/usr/local/www/status_logs_common.inc:825
 #: src/usr/local/www/status_logs_settings.php:255
 msgid "Forward/Reverse Display"
 msgstr ""
 
-#: src/usr/local/www/status_logs_common.inc:821
+#: src/usr/local/www/status_logs_common.inc:833
 msgid "(newest at bottom)"
 msgstr ""
 
-#: src/usr/local/www/status_logs_common.inc:829
+#: src/usr/local/www/status_logs_common.inc:841
 msgid "(newest at top)"
 msgstr ""
 
-#: src/usr/local/www/status_logs_common.inc:839
+#: src/usr/local/www/status_logs_common.inc:851
 msgid "Show log entries in forward or reverse order."
 msgstr ""
 
-#: src/usr/local/www/status_logs_common.inc:842
-#: src/usr/local/www/status_logs_common.inc:847
+#: src/usr/local/www/status_logs_common.inc:854
+#: src/usr/local/www/status_logs_common.inc:859
 #: src/usr/local/www/status_logs_settings.php:262
 msgid "GUI Log Entries"
 msgstr ""
 
-#: src/usr/local/www/status_logs_common.inc:853
+#: src/usr/local/www/status_logs_common.inc:865
 msgid ""
 "This is the number of log entries displayed in the GUI. It does not affect "
 "how many entries are contained in the log."
 msgstr ""
 
-#: src/usr/local/www/status_logs_common.inc:856
-#: src/usr/local/www/status_logs_common.inc:861
+#: src/usr/local/www/status_logs_common.inc:868
+#: src/usr/local/www/status_logs_common.inc:873
 #: src/usr/local/www/status_logs_settings.php:270
 msgid "Log file size (Bytes)"
 msgstr ""
 
-#: src/usr/local/www/status_logs_common.inc:866
+#: src/usr/local/www/status_logs_common.inc:878
 msgid ""
 "The log is held in a constant-size circular log file. This field controls "
 "how large the log file is, and thus how many entries may exist inside the "
@@ -21922,67 +23453,67 @@ msgid ""
 "Log\" action below. "
 msgstr ""
 
-#: src/usr/local/www/status_logs_common.inc:871
+#: src/usr/local/www/status_logs_common.inc:883
 msgid "Formatted/Raw Display"
 msgstr ""
 
-#: src/usr/local/www/status_logs_common.inc:897
+#: src/usr/local/www/status_logs_common.inc:909
 msgid ""
 "Show the log entries as formatted or raw output as generated by the service. "
 "The raw output will reveal more detailed information, but it is more "
 "difficult to read."
 msgstr ""
 
-#: src/usr/local/www/status_logs_common.inc:905
+#: src/usr/local/www/status_logs_common.inc:917
 #: src/usr/local/www/status_logs_settings.php:306
 msgid "Web Server Log"
 msgstr ""
 
-#: src/usr/local/www/status_logs_common.inc:908
+#: src/usr/local/www/status_logs_common.inc:920
 msgid ""
 "If this is checked, errors from the nginx web server process for the GUI or "
 "Captive Portal will appear in the system log."
 msgstr ""
 
-#: src/usr/local/www/status_logs_common.inc:916
+#: src/usr/local/www/status_logs_common.inc:928
 #: src/usr/local/www/status_logs_settings.php:278
 msgid "Log firewall default blocks"
 msgstr ""
 
-#: src/usr/local/www/status_logs_common.inc:919
+#: src/usr/local/www/status_logs_common.inc:931
 msgid ""
 "Packets that are blocked by the implicit default block rule will not be "
 "logged if this option is unchecked. Per-rule logging options are still "
 "respected."
 msgstr ""
 
-#: src/usr/local/www/status_logs_common.inc:926
+#: src/usr/local/www/status_logs_common.inc:938
 msgid ""
 "Packets that are allowed by the implicit default pass rule will be logged if "
 "this option is checked. Per-rule logging options are still respected. "
 msgstr ""
 
-#: src/usr/local/www/status_logs_common.inc:947
+#: src/usr/local/www/status_logs_common.inc:959
 #: src/usr/local/www/status_logs_settings.php:323
 msgid "Dont load descriptions"
 msgstr ""
 
-#: src/usr/local/www/status_logs_common.inc:948
+#: src/usr/local/www/status_logs_common.inc:960
 #: src/usr/local/www/status_logs_settings.php:324
 msgid "Display as column"
 msgstr ""
 
-#: src/usr/local/www/status_logs_common.inc:949
+#: src/usr/local/www/status_logs_common.inc:961
 #: src/usr/local/www/status_logs_settings.php:325
 msgid "Display as second row"
 msgstr ""
 
-#: src/usr/local/www/status_logs_common.inc:944
+#: src/usr/local/www/status_logs_common.inc:956
 #: src/usr/local/www/status_logs_settings.php:320
 msgid "Where to show rule descriptions"
 msgstr ""
 
-#: src/usr/local/www/status_logs_common.inc:951
+#: src/usr/local/www/status_logs_common.inc:963
 #: src/usr/local/www/status_logs_settings.php:327
 msgid ""
 "Show the applied rule description below or in the firewall log rows<br /"
@@ -21990,15 +23521,15 @@ msgid ""
 "performance with large rule sets"
 msgstr ""
 
-#: src/usr/local/www/status_logs_common.inc:971
+#: src/usr/local/www/status_logs_common.inc:983
 msgid "Saves changed settings."
 msgstr ""
 
-#: src/usr/local/www/status_logs_common.inc:976
+#: src/usr/local/www/status_logs_common.inc:988
 msgid "Clear log"
 msgstr ""
 
-#: src/usr/local/www/status_logs_common.inc:986
+#: src/usr/local/www/status_logs_common.inc:998
 msgid ""
 "Clears local log file and reinitializes it as an empty log. Save any "
 "settings changes first."
@@ -22063,17 +23594,17 @@ msgid ""
 "This is a summary of the last %1$s lines of the firewall log (Max %2$s)."
 msgstr ""
 
-#: src/usr/local/www/status_logs_filter_summary.php:202
+#: src/usr/local/www/status_logs_filter_summary.php:200
 msgid "Data points"
 msgstr ""
 
-#: src/usr/local/www/status_logs_filter_summary.php:212
+#: src/usr/local/www/status_logs_filter_summary.php:210
 #: src/usr/local/www/widgets/widgets/log.widget.php:179
 #: src/usr/local/www/widgets/widgets/log.widget.php:182
 msgid "Reverse Resolve with DNS"
 msgstr ""
 
-#: src/usr/local/www/status_logs_filter_summary.php:212
+#: src/usr/local/www/status_logs_filter_summary.php:210
 msgid "Lookup"
 msgstr ""
 
@@ -22224,21 +23755,21 @@ msgid "Remote log servers"
 msgstr ""
 
 #: src/usr/local/www/status_logs_settings.php:374
-#: src/usr/local/www/vpn_openvpn_csc.php:480
-#: src/usr/local/www/vpn_openvpn_csc.php:521
-#: src/usr/local/www/vpn_openvpn_csc.php:571
+#: src/usr/local/www/vpn_openvpn_csc.php:484
+#: src/usr/local/www/vpn_openvpn_csc.php:525
+#: src/usr/local/www/vpn_openvpn_csc.php:575
 msgid "Server 1"
 msgstr ""
 
 #: src/usr/local/www/status_logs_settings.php:382
-#: src/usr/local/www/vpn_openvpn_csc.php:487
-#: src/usr/local/www/vpn_openvpn_csc.php:528
-#: src/usr/local/www/vpn_openvpn_csc.php:578
+#: src/usr/local/www/vpn_openvpn_csc.php:491
+#: src/usr/local/www/vpn_openvpn_csc.php:532
+#: src/usr/local/www/vpn_openvpn_csc.php:582
 msgid "Server 2"
 msgstr ""
 
 #: src/usr/local/www/status_logs_settings.php:390
-#: src/usr/local/www/vpn_openvpn_csc.php:494
+#: src/usr/local/www/vpn_openvpn_csc.php:498
 msgid "Server 3"
 msgstr ""
 
@@ -22258,7 +23789,7 @@ msgid "VPN Logins"
 msgstr ""
 
 #: src/usr/local/www/status_logs_vpn.php:212
-#: src/usr/local/www/status_logs_vpn.php:474
+#: src/usr/local/www/status_logs_vpn.php:466
 msgid "Log Message"
 msgstr ""
 
@@ -22315,7 +23846,7 @@ msgid "Reach"
 msgstr ""
 
 #: src/usr/local/www/status_ntpd.php:206
-#: src/usr/local/www/vpn_ipsec_phase1.php:880
+#: src/usr/local/www/vpn_ipsec_phase1.php:932
 msgid "Delay"
 msgstr ""
 
@@ -22340,376 +23871,208 @@ msgid "No peers found, %sis the ntp service running?%s"
 msgstr ""
 
 #: src/usr/local/www/status_ntpd.php:266
-msgid "GPS information"
+msgid "GPS Information"
 msgstr ""
 
 #: src/usr/local/www/status_ntpd.php:272
 msgid "Clock Latitude"
 msgstr ""
 
-#: src/usr/local/www/status_ntpd.php:275
-msgid "Clock Longitude"
-msgstr ""
-
-#: src/usr/local/www/status_ntpd.php:281
-msgid "Clock Altitude"
-msgstr ""
-
-#: src/usr/local/www/status_ntpd.php:290
-#: src/usr/local/www/widgets/widgets/ntp_status.widget.php:209
-msgid "Satellites"
-msgstr ""
-
-#: src/usr/local/www/status_ntpd.php:322
-msgid "in view "
-msgstr ""
-
-#: src/usr/local/www/status_ntpd.php:329
-msgid "in use "
-msgstr ""
-
-#: src/usr/local/www/status_ntpd.php:338
-msgid "Google Maps Link"
-msgstr ""
-
-#: src/usr/local/www/status_openvpn.php:116
-#: src/usr/local/www/widgets/widgets/openvpn.widget.php:96
-msgid "An error occurred."
-msgstr ""
-
-#: src/usr/local/www/status_openvpn.php:133
-msgid "Client connections"
-msgstr ""
-
-#: src/usr/local/www/status_openvpn.php:138
-#: src/usr/local/www/status_openvpn.php:205
-#: src/usr/local/www/system_camanager.php:624
-#: src/usr/local/www/system_certmanager.php:787
-#: src/usr/local/www/system_certmanager.php:902
-#: src/usr/local/www/vpn_openvpn_csc.php:666
-msgid "Common Name"
-msgstr ""
-
-#: src/usr/local/www/status_openvpn.php:139
-#: src/usr/local/www/status_openvpn.php:206
-msgid "Real Address"
-msgstr ""
-
-#: src/usr/local/www/status_openvpn.php:140
-#: src/usr/local/www/status_openvpn.php:256
-#: src/usr/local/www/status_openvpn.php:312
-msgid "Virtual Address"
-msgstr ""
-
-#: src/usr/local/www/status_openvpn.php:141
-#: src/usr/local/www/status_openvpn.php:255
-#: src/usr/local/www/status_openvpn.php:311
-msgid "Connected Since"
-msgstr ""
-
-#: src/usr/local/www/status_openvpn.php:142
-#: src/usr/local/www/status_openvpn.php:258
-#: src/usr/local/www/status_openvpn.php:314
-msgid "Bytes Sent"
-msgstr ""
-
-#: src/usr/local/www/status_openvpn.php:143
-#: src/usr/local/www/status_openvpn.php:259
-#: src/usr/local/www/status_openvpn.php:315
-msgid "Bytes Received"
-msgstr ""
-
-#: src/usr/local/www/status_openvpn.php:163
-#: src/usr/local/www/widgets/widgets/openvpn.widget.php:136
-#, php-format
-msgid "Kill client connection from %s"
-msgstr ""
-
-#: src/usr/local/www/status_openvpn.php:196
-msgid "Show Routing Table"
-msgstr ""
-
-#: src/usr/local/www/status_openvpn.php:196
-msgid "Display OpenVPN's internal routing table for this server."
-msgstr ""
-
-#: src/usr/local/www/status_openvpn.php:200
-msgid "Routing Table"
-msgstr ""
-
-#: src/usr/local/www/status_openvpn.php:207
-msgid "Target Network"
-msgstr ""
-
-#: src/usr/local/www/status_openvpn.php:208
-msgid "Last Used"
-msgstr ""
-
-#: src/usr/local/www/status_openvpn.php:228
-msgid ""
-"An IP address followed by C indicates a host currently connected through the "
-"VPN."
-msgstr ""
-
-#: src/usr/local/www/status_openvpn.php:248
-#: src/usr/local/www/widgets/widgets/openvpn.widget.php:158
-msgid "Peer to Peer Server Instance Statistics"
-msgstr ""
-
-#: src/usr/local/www/status_openvpn.php:257
-#: src/usr/local/www/status_openvpn.php:313
-msgid "Remote Host"
-msgstr ""
-
-#: src/usr/local/www/status_openvpn.php:304
-#: src/usr/local/www/widgets/widgets/openvpn.widget.php:208
-msgid "Client Instance Statistics"
-msgstr ""
-
-#: src/usr/local/www/status_openvpn.php:356
-msgid ""
-"If you have custom options that override the management features of OpenVPN "
-"on a client or server, they will cause that OpenVPN instance to not work "
-"correctly with this status page."
-msgstr ""
-
-#: src/usr/local/www/status_openvpn.php:360
-#: src/usr/local/www/widgets/widgets/openvpn.widget.php:263
-msgid "No OpenVPN instances defined"
-msgstr ""
-
-#: src/usr/local/www/status_pkglogs.php:104
-msgid "Package logs"
-msgstr ""
-
-#: src/usr/local/www/status_pkglogs.php:108
-msgid "No packages with logging facilities are currently installed."
-msgstr ""
-
-#: src/usr/local/www/status_pkglogs.php:119
-#: src/usr/local/www/status_pkglogs.php:121
-#, php-format
-msgid "%s"
-msgstr ""
-
-#: src/usr/local/www/status_pkglogs.php:129
-#, php-format
-msgid "Last %1$s %2$s log entries"
-msgstr ""
-
-#: src/usr/local/www/status_queues.php:87
-msgid "Something wrong happened during communication with stat gathering"
-msgstr ""
-
-#: src/usr/local/www/status_queues.php:97
-msgid "No queue statistics could be read."
-msgstr ""
-
-#: src/usr/local/www/status_queues.php:145
-msgid "Traffic shaper"
-msgstr ""
-
-#: src/usr/local/www/status_queues.php:152
-msgid "Traffic shaping is not configured."
-msgstr ""
-
-#: src/usr/local/www/status_queues.php:186
-msgid "Status Queues"
-msgstr ""
-
-#: src/usr/local/www/status_queues.php:192
-msgid "Statistics"
-msgstr ""
-
-#: src/usr/local/www/status_queues.php:200
-msgid "Borrows"
+#: src/usr/local/www/status_ntpd.php:275
+msgid "Clock Longitude"
 msgstr ""
 
-#: src/usr/local/www/status_queues.php:201
-msgid "Suspends"
+#: src/usr/local/www/status_ntpd.php:281
+msgid "Clock Altitude"
 msgstr ""
 
-#: src/usr/local/www/status_queues.php:202
-msgid "Drops"
+#: src/usr/local/www/status_ntpd.php:290
+#: src/usr/local/www/widgets/widgets/ntp_status.widget.php:209
+msgid "Satellites"
 msgstr ""
 
-#: src/usr/local/www/status_queues.php:203
-msgid "Length"
+#: src/usr/local/www/status_ntpd.php:322
+msgid "in view "
 msgstr ""
 
-#: src/usr/local/www/status_queues.php:217
-msgid "Queue graphs take 5 seconds to sample data"
+#: src/usr/local/www/status_ntpd.php:329
+msgid "in use "
 msgstr ""
 
-#: src/usr/local/www/status_queues.php:280
-msgid "Loading"
+#: src/usr/local/www/status_ntpd.php:338
+msgid "Google Maps Link"
 msgstr ""
 
-#: src/usr/local/www/status_rrd_graph.php:209
-msgid "Invalid start date/time:"
+#: src/usr/local/www/status_openvpn.php:115
+#: src/usr/local/www/widgets/widgets/openvpn.widget.php:96
+msgid "An error occurred."
 msgstr ""
 
-#: src/usr/local/www/status_rrd_graph.php:223
-msgid "Invalid end date/time:"
+#: src/usr/local/www/status_openvpn.php:132
+msgid "Client Connections"
 msgstr ""
 
-#: src/usr/local/www/status_rrd_graph.php:233
-#: src/usr/local/www/status_rrd_graph_img.php:104
-#, php-format
-msgid "start %d is smaller than end %d"
+#: src/usr/local/www/status_openvpn.php:137
+#: src/usr/local/www/status_openvpn.php:204
+#: src/usr/local/www/system_camanager.php:627
+#: src/usr/local/www/system_certmanager.php:789
+#: src/usr/local/www/system_certmanager.php:904
+#: src/usr/local/www/vpn_openvpn_csc.php:670
+msgid "Common Name"
 msgstr ""
 
-#: src/usr/local/www/status_rrd_graph.php:239
-#: src/usr/local/www/status_rrd_graph_settings.php:86
-msgid "Inverse"
+#: src/usr/local/www/status_openvpn.php:138
+#: src/usr/local/www/status_openvpn.php:205
+msgid "Real Address"
 msgstr ""
 
-#: src/usr/local/www/status_rrd_graph.php:240
-#: src/usr/local/www/status_rrd_graph_settings.php:87
-msgid "Absolute"
+#: src/usr/local/www/status_openvpn.php:139
+#: src/usr/local/www/status_openvpn.php:255
+#: src/usr/local/www/status_openvpn.php:311
+msgid "Virtual Address"
 msgstr ""
 
-#: src/usr/local/www/status_rrd_graph.php:290
-#: src/usr/local/www/status_rrd_graph_settings.php:88
-msgid "Absolute Timespans"
+#: src/usr/local/www/status_openvpn.php:140
+#: src/usr/local/www/status_openvpn.php:254
+#: src/usr/local/www/status_openvpn.php:310
+msgid "Connected Since"
 msgstr ""
 
-#: src/usr/local/www/status_rrd_graph.php:290
-#: src/usr/local/www/status_rrd_graph_settings.php:89
-msgid "Current Period"
+#: src/usr/local/www/status_openvpn.php:141
+#: src/usr/local/www/status_openvpn.php:257
+#: src/usr/local/www/status_openvpn.php:313
+msgid "Bytes Sent"
 msgstr ""
 
-#: src/usr/local/www/status_rrd_graph.php:290
-#: src/usr/local/www/status_rrd_graph_settings.php:90
-msgid "Previous Period"
+#: src/usr/local/www/status_openvpn.php:142
+#: src/usr/local/www/status_openvpn.php:258
+#: src/usr/local/www/status_openvpn.php:314
+msgid "Bytes Received"
 msgstr ""
 
-#: src/usr/local/www/status_rrd_graph.php:302
-msgid "VPN Users"
+#: src/usr/local/www/status_openvpn.php:162
+#: src/usr/local/www/widgets/widgets/openvpn.widget.php:136
+#, php-format
+msgid "Kill client connection from %s"
 msgstr ""
 
-#: src/usr/local/www/status_rrd_graph.php:309
-msgid " Graphs"
+#: src/usr/local/www/status_openvpn.php:195
+msgid "Show Routing Table"
 msgstr ""
 
-#: src/usr/local/www/status_rrd_graph.php:437
-#: src/usr/local/www/status_rrd_graph_settings.php:76
-#: src/usr/local/www/status_rrd_graph_settings.php:147
-msgid "Traffic"
+#: src/usr/local/www/status_openvpn.php:195
+msgid "Display OpenVPN's internal routing table for this server."
 msgstr ""
 
-#: src/usr/local/www/status_rrd_graph.php:439
-#: src/usr/local/www/status_rrd_graph_settings.php:78
-#: src/usr/local/www/status_rrd_graph_settings.php:149
-msgid "Quality"
+#: src/usr/local/www/status_openvpn.php:199
+msgid "Routing Table"
 msgstr ""
 
-#: src/usr/local/www/status_rrd_graph.php:444
-#: src/usr/local/www/status_rrd_graph_settings.php:153
-msgid "QueueDrops"
+#: src/usr/local/www/status_openvpn.php:206
+msgid "Target Network"
 msgstr ""
 
-#: src/usr/local/www/status_rrd_graph.php:452
-#: src/usr/local/www/status_rrd_graph_settings.php:161
-msgid "Cellular"
+#: src/usr/local/www/status_openvpn.php:207
+msgid "Last Used"
 msgstr ""
 
-#: src/usr/local/www/status_rrd_graph.php:555
-msgid "Graphs"
+#: src/usr/local/www/status_openvpn.php:227
+msgid ""
+"An IP address followed by C indicates a host currently connected through the "
+"VPN."
 msgstr ""
 
-#: src/usr/local/www/status_rrd_graph.php:558
-#: src/usr/local/www/status_rrd_graph.php:625
-msgid "Graph"
+#: src/usr/local/www/status_openvpn.php:247
+#: src/usr/local/www/widgets/widgets/openvpn.widget.php:158
+msgid "Peer to Peer Server Instance Statistics"
 msgstr ""
 
-#: src/usr/local/www/status_rrd_graph.php:562
-#: src/usr/local/www/status_rrd_graph.php:565
-msgid "Style"
+#: src/usr/local/www/status_openvpn.php:256
+#: src/usr/local/www/status_openvpn.php:312
+msgid "Remote Host"
 msgstr ""
 
-#: src/usr/local/www/status_rrd_graph.php:569
-#: src/usr/local/www/status_rrd_graph.php:572
-msgid "Period"
+#: src/usr/local/www/status_openvpn.php:303
+#: src/usr/local/www/widgets/widgets/openvpn.widget.php:208
+msgid "Client Instance Statistics"
 msgstr ""
 
-#: src/usr/local/www/status_rrd_graph.php:575
+#: src/usr/local/www/status_openvpn.php:355
 msgid ""
-"Any changes to these options may not take affect until the next auto-refresh."
+"If you have custom options that override the management features of OpenVPN "
+"on a client or server, they will cause that OpenVPN instance to not work "
+"correctly with this status page."
 msgstr ""
 
-#: src/usr/local/www/status_rrd_graph.php:589
-msgid "Enter date and/or time. Current timezone:"
+#: src/usr/local/www/status_openvpn.php:359
+msgid "No OpenVPN instances defined."
 msgstr ""
 
-#: src/usr/local/www/status_rrd_graph.php:610
-msgid ""
-"Any changes to these options may not take affect until the next auto-refresh"
+#: src/usr/local/www/status_pkglogs.php:112
+msgid "No packages with logging facilities are currently installed."
 msgstr ""
 
-#: src/usr/local/www/status_rrd_graph_img.php:66
-msgid "Image viewer"
+#: src/usr/local/www/status_pkglogs.php:123
+#: src/usr/local/www/status_pkglogs.php:125
+#, php-format
+msgid "%s"
 msgstr ""
 
-#: src/usr/local/www/status_rrd_graph_img.php:1269
+#: src/usr/local/www/status_pkglogs.php:133
 #, php-format
-msgid "Sorry we do not have data to graph for %s"
+msgid "Last %1$s %2$s Log Entries"
 msgstr ""
 
-#: src/usr/local/www/status_rrd_graph_img.php:1291
-#, php-format
-msgid "Failed to create graph with error code %1$s, the error is: %2$s"
+#: src/usr/local/www/status_queues.php:87
+msgid "Something wrong happened during communication with stat gathering."
 msgstr ""
 
-#: src/usr/local/www/status_rrd_graph_img.php:1293
-#: src/usr/local/www/status_rrd_graph_img.php:1300
-#, php-format
-msgid "failed to create graph from %s%s, removing database"
+#: src/usr/local/www/status_queues.php:97
+msgid "No queue statistics could be read."
 msgstr ""
 
-#: src/usr/local/www/status_rrd_graph_img.php:1311
-msgid ""
-"There has been an error in rendering the graph. Please check your system "
-"logs."
+#: src/usr/local/www/status_queues.php:150
+msgid "Traffic shaping is not configured."
+msgstr ""
+
+#: src/usr/local/www/status_queues.php:189
+msgid "Status Queues"
 msgstr ""
 
-#: src/usr/local/www/status_rrd_graph_settings.php:95
-msgid "RRD data has been cleared. New RRD files have been generated."
+#: src/usr/local/www/status_queues.php:195
+msgid "Statistics"
 msgstr ""
 
-#: src/usr/local/www/status_rrd_graph_settings.php:173
-msgid "NTPD"
+#: src/usr/local/www/status_queues.php:203
+msgid "Borrows"
 msgstr ""
 
-#: src/usr/local/www/status_rrd_graph_settings.php:206
-msgid "Default category"
+#: src/usr/local/www/status_queues.php:204
+msgid "Suspends"
 msgstr ""
 
-#: src/usr/local/www/status_rrd_graph_settings.php:213
-msgid "Default style"
+#: src/usr/local/www/status_queues.php:205
+msgid "Drops"
 msgstr ""
 
-#: src/usr/local/www/status_rrd_graph_settings.php:220
-msgid "Default period"
+#: src/usr/local/www/status_queues.php:206
+msgid "Length"
 msgstr ""
 
-#: src/usr/local/www/status_rrd_graph_settings.php:223
-msgid ""
-"Graphs will not be allowed to be recreated within a 1 minute interval, "
-"please take this into account after changing the style."
+#: src/usr/local/www/status_queues.php:220
+msgid "Queue graphs take 5 seconds to sample data."
 msgstr ""
 
-#: src/usr/local/www/status_rrd_graph_settings.php:228
-msgid "Reset RRD Data"
+#: src/usr/local/www/status_queues.php:283
+msgid "Loading"
 msgstr ""
 
 #: src/usr/local/www/status_services.php:198
-#: src/usr/local/www/widgets/widgets/services_status.widget.php:119
-msgid "No services found"
+msgid "No services found."
 msgstr ""
 
 #: src/usr/local/www/status_upnp.php:69
-msgid "Rules have been cleared and the daemon restarted"
+msgid "Rules have been cleared and the daemon restarted."
 msgstr ""
 
 #: src/usr/local/www/status_upnp.php:97
@@ -22731,11 +24094,11 @@ msgid ""
 msgstr ""
 
 #: src/usr/local/www/status_wireless.php:115
-msgid "Nearby access points or ad-hoc peers"
+msgid "Nearby Access Points or Ad-Hoc Peers"
 msgstr ""
 
 #: src/usr/local/www/status_wireless.php:184
-msgid "Associated or ad-hoc peers"
+msgid "Associated or Ad-Hoc Peers"
 msgstr ""
 
 #: src/usr/local/www/status_wireless.php:241
@@ -22745,69 +24108,75 @@ msgstr ""
 #: src/usr/local/www/status_wireless.php:247
 msgid ""
 "<b>Flags:</b> A = authorized, E = Extended Rate (802.11g), P = Power saving "
-"mode<br /><b>Capabilities:</b> E = ESS (infrastructure mode), I = IBSS (ad-"
+"mode.<br /><b>Capabilities:</b> E = ESS (infrastructure mode), I = IBSS (ad-"
 "hoc mode), P = privacy (WEP/TKIP/AES), S = Short preamble, s = Short slot "
-"time"
+"time."
 msgstr ""
 
 #: src/usr/local/www/system.php:175
 msgid "The domain may only contain the characters a-z, 0-9, '-' and '.'."
 msgstr ""
 
-#: src/usr/local/www/system.php:184
+#: src/usr/local/www/system.php:186
 #, php-format
 msgid "A valid IP address must be specified for DNS server %s."
 msgstr ""
 
-#: src/usr/local/www/system.php:190
+#: src/usr/local/www/system.php:192
 #, php-format
 msgid "You can not specify IPv6 gateway \"%1$s\" for IPv4 DNS server \"%2$s\"."
 msgstr ""
 
-#: src/usr/local/www/system.php:193
+#: src/usr/local/www/system.php:195
 #, php-format
 msgid "You can not specify IPv4 gateway \"%1$s\" for IPv6 DNS server \"%2$s\"."
 msgstr ""
 
-#: src/usr/local/www/system.php:211
+#: src/usr/local/www/system.php:206
+msgid ""
+"Each configured DNS server must have a unique IP address. Remove the "
+"duplicated IP."
+msgstr ""
+
+#: src/usr/local/www/system.php:217
 #, php-format
 msgid ""
 "You can not assign a gateway to DNS '%s' server which is on a directly "
 "connected network."
 msgstr ""
 
-#: src/usr/local/www/system.php:223
+#: src/usr/local/www/system.php:229
 msgid ""
 "A NTP Time Server name may only contain the characters a-z, 0-9, '-' and '.'."
 msgstr ""
 
-#: src/usr/local/www/system.php:374
+#: src/usr/local/www/system.php:380
 msgid "Name of the firewall host, without domain part"
 msgstr ""
 
-#: src/usr/local/www/system.php:381
+#: src/usr/local/www/system.php:387
 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:386
+#: src/usr/local/www/system.php:392
 msgid "DNS Server Settings"
 msgstr ""
 
-#: src/usr/local/www/system.php:392
+#: src/usr/local/www/system.php:398
 msgid "DNS Server "
 msgstr ""
 
-#: src/usr/local/www/system.php:396
+#: src/usr/local/www/system.php:402
 msgid "DNS Server"
 msgstr ""
 
-#: src/usr/local/www/system.php:439
+#: src/usr/local/www/system.php:445
 msgid "DNS Server Override"
 msgstr ""
 
-#: src/usr/local/www/system.php:442
+#: src/usr/local/www/system.php:448
 #, php-format
 msgid ""
 "If this option is set, %s will use DNS servers assigned by a DHCP/PPP server "
@@ -22815,11 +24184,11 @@ msgid ""
 "will not be assigned to DHCP and PPTP VPN clients."
 msgstr ""
 
-#: src/usr/local/www/system.php:449
+#: src/usr/local/www/system.php:455
 msgid "Disable DNS Forwarder"
 msgstr ""
 
-#: src/usr/local/www/system.php:452
+#: src/usr/local/www/system.php:458
 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, "
@@ -22827,102 +24196,104 @@ msgid ""
 "box omits localhost from the list of DNS servers."
 msgstr ""
 
-#: src/usr/local/www/system.php:459
+#: src/usr/local/www/system.php:465
 msgid "Localization"
 msgstr ""
 
-#: src/usr/local/www/system.php:462
+#: src/usr/local/www/system.php:468
 msgid "Timezone"
 msgstr ""
 
-#: src/usr/local/www/system.php:465
+#: src/usr/local/www/system.php:471
 msgid "Select the location closest to you"
 msgstr ""
 
-#: src/usr/local/www/system.php:468
+#: src/usr/local/www/system.php:474
 msgid "Timeservers"
 msgstr ""
 
-#: src/usr/local/www/system.php:471
+#: src/usr/local/www/system.php:477
 msgid ""
 "Use a space to separate multiple hosts (only one required). Remember to set "
 "up at least one DNS server if you enter a host name here!"
 msgstr ""
 
-#: src/usr/local/www/system.php:475
+#: src/usr/local/www/system.php:481
 msgid "Language"
 msgstr ""
 
-#: src/usr/local/www/system.php:478
+#: src/usr/local/www/system.php:484
 msgid "Choose a language for the webConfigurator"
 msgstr ""
 
-#: src/usr/local/www/system.php:497
-msgid "Web Configurator"
+#: src/usr/local/www/system.php:503
+#: src/usr/local/www/system_advanced_admin.php:339
+#: src/usr/local/www/system_certmanager.php:1075
+msgid "webConfigurator"
 msgstr ""
 
-#: src/usr/local/www/system.php:501
+#: src/usr/local/www/system.php:507
 msgid "Theme"
 msgstr ""
 
-#: src/usr/local/www/system.php:504
+#: src/usr/local/www/system.php:510
 msgid ""
 "Choose an alternative css file (if installed) to change the appearance of "
-"the Web configurator. css files are located in /usr/local/www/bootstrap/css"
+"the webConfigurator. css files are located in /usr/local/www/bootstrap/css"
 msgstr ""
 
-#: src/usr/local/www/system.php:510
+#: src/usr/local/www/system.php:516
 msgid "Scrolls with page"
 msgstr ""
 
-#: src/usr/local/www/system.php:510
+#: src/usr/local/www/system.php:516
 msgid "Fixed (Remains visible at top of page)"
 msgstr ""
 
-#: src/usr/local/www/system.php:508
+#: src/usr/local/www/system.php:514
 msgid "Top Navigation"
 msgstr ""
 
-#: src/usr/local/www/system.php:511
+#: src/usr/local/www/system.php:517
 msgid "The fixed option is intended for large screens only."
 msgstr ""
 
-#: src/usr/local/www/system.php:515
+#: src/usr/local/www/system.php:521
 msgid "Dashboard Columns"
 msgstr ""
 
-#: src/usr/local/www/system.php:519
+#: src/usr/local/www/system.php:525
 msgid "<span class=\"badge\" title=\"This feature is in BETA\">BETA</span>"
 msgstr ""
 
-#: src/usr/local/www/system.php:521
+#: src/usr/local/www/system.php:527
 msgid "Associated Panels Show/Hide"
 msgstr ""
 
-#: src/usr/local/www/system.php:528
+#: src/usr/local/www/system.php:534
 msgid "Show the Available Widgets panel on the Dashboard."
 msgstr ""
 
-#: src/usr/local/www/system.php:535
+#: src/usr/local/www/system.php:541
 msgid "Show the Log Filter panel in System Logs."
 msgstr ""
 
-#: src/usr/local/www/system.php:542
+#: src/usr/local/www/system.php:548
 msgid "Show the Manage Log panel in System Logs."
 msgstr ""
 
-#: src/usr/local/www/system.php:544
+#: src/usr/local/www/system.php:550
 msgid ""
 "These options allow certain panels to be automatically hidden on page load. "
 "A control is provided in the title bar to un-hide the panel.\n"
 "<br /><span class=\"badge\" title=\"This feature is in BETA\">BETA</span>"
 msgstr ""
 
-#: src/usr/local/www/system.php:551
+#: src/usr/local/www/system.php:557
 msgid "Left Column Labels"
 msgstr ""
 
-#: src/usr/local/www/system.php:554
+#: src/usr/local/www/system.php:560
 msgid ""
 "If selected, clicking a label in the left column will select/toggle the "
 "first item of the group.<br /><span class=\"badge\" title=\"This feature is "
@@ -22953,27 +24324,18 @@ msgstr ""
 #: src/usr/local/www/system_advanced_misc.php:316
 #: src/usr/local/www/system_advanced_network.php:184
 #: src/usr/local/www/system_advanced_notifications.php:228
-#: src/usr/local/www/system_advanced_sysctl.php:182
+#: src/usr/local/www/system_advanced_sysctl.php:186
 msgid "Admin Access"
 msgstr ""
 
 #: src/usr/local/www/system_advanced_admin.php:329
+#: src/usr/local/www/system_advanced_firewall.php:404
 #: src/usr/local/www/system_advanced_firewall.php:416
 #: src/usr/local/www/system_advanced_misc.php:317
 #: src/usr/local/www/system_advanced_network.php:185
 #: src/usr/local/www/system_advanced_notifications.php:229
-#: src/usr/local/www/system_advanced_sysctl.php:183
-msgid "Firewall / NAT"
-msgstr ""
-
-#: src/usr/local/www/system_advanced_admin.php:330
-#: src/usr/local/www/system_advanced_firewall.php:417
-#: src/usr/local/www/system_advanced_misc.php:318
-#: src/usr/local/www/system_advanced_network.php:173
-#: src/usr/local/www/system_advanced_network.php:186
-#: src/usr/local/www/system_advanced_notifications.php:230
-#: src/usr/local/www/system_advanced_sysctl.php:184
-msgid "Networking"
+#: src/usr/local/www/system_advanced_sysctl.php:187
+msgid "Firewall & NAT"
 msgstr ""
 
 #: src/usr/local/www/system_advanced_admin.php:331
@@ -22982,7 +24344,7 @@ msgstr ""
 #: src/usr/local/www/system_advanced_misc.php:319
 #: src/usr/local/www/system_advanced_network.php:187
 #: src/usr/local/www/system_advanced_notifications.php:231
-#: src/usr/local/www/system_advanced_sysctl.php:185
+#: src/usr/local/www/system_advanced_sysctl.php:189
 #: src/usr/local/www/widgets/widgets/thermal_sensors.widget.php:277
 msgid "Miscellaneous"
 msgstr ""
@@ -22993,8 +24355,8 @@ msgstr ""
 #: src/usr/local/www/system_advanced_network.php:188
 #: src/usr/local/www/system_advanced_notifications.php:232
 #: src/usr/local/www/system_advanced_sysctl.php:166
-#: src/usr/local/www/system_advanced_sysctl.php:186
-#: src/usr/local/www/system_advanced_sysctl.php:193
+#: src/usr/local/www/system_advanced_sysctl.php:190
+#: src/usr/local/www/system_advanced_sysctl.php:197
 msgid "System Tunables"
 msgstr ""
 
@@ -23004,14 +24366,10 @@ msgstr ""
 #: src/usr/local/www/system_advanced_network.php:189
 #: src/usr/local/www/system_advanced_notifications.php:216
 #: src/usr/local/www/system_advanced_notifications.php:233
-#: src/usr/local/www/system_advanced_sysctl.php:187
+#: src/usr/local/www/system_advanced_sysctl.php:191
 msgid "Notifications"
 msgstr ""
 
-#: src/usr/local/www/system_advanced_admin.php:339
-msgid "WebConfigurator"
-msgstr ""
-
 #: src/usr/local/www/system_advanced_admin.php:359
 msgid "Create or Import"
 msgstr ""
@@ -23146,7 +24504,7 @@ msgid "Secure Shell Server"
 msgstr ""
 
 #: src/usr/local/www/system_advanced_admin.php:495
-#: src/usr/local/www/vpn_ipsec_phase1.php:714
+#: src/usr/local/www/vpn_ipsec_phase1.php:740
 msgid "Authentication Method"
 msgstr ""
 
@@ -23316,10 +24674,6 @@ msgstr ""
 msgid "The Other multiple timeout value must be an integer."
 msgstr ""
 
-#: src/usr/local/www/system_advanced_firewall.php:404
-msgid "Firewall and NAT"
-msgstr ""
-
 #: src/usr/local/www/system_advanced_firewall.php:426
 msgid "Firewall Advanced"
 msgstr ""
@@ -23353,7 +24707,7 @@ msgid "High-latency"
 msgstr ""
 
 #: src/usr/local/www/system_advanced_firewall.php:455
-#: src/usr/local/www/vpn_ipsec_phase1.php:723
+#: src/usr/local/www/vpn_ipsec_phase1.php:749
 msgid "Aggressive"
 msgstr ""
 
@@ -23469,11 +24823,10 @@ msgid "Disable Auto-added VPN rules"
 msgstr ""
 
 #: src/usr/local/www/system_advanced_firewall.php:548
-msgid ""
-"<span>Note: This disables automatically added rules for IPsec, PPTP.</span>"
+msgid "Note: This disables automatically added rules for IPsec."
 msgstr ""
 
-#: src/usr/local/www/system_advanced_firewall.php:556
+#: src/usr/local/www/system_advanced_firewall.php:555
 msgid ""
 "With Multi-WAN you generally want to ensure traffic leaves the same "
 "interface it arrives on, hence reply-to is added automatically by default. "
@@ -23481,11 +24834,11 @@ msgid ""
 "different from the gateway IP of the hosts behind the bridged interface."
 msgstr ""
 
-#: src/usr/local/www/system_advanced_firewall.php:563
+#: src/usr/local/www/system_advanced_firewall.php:562
 msgid "Disable Negate rules"
 msgstr ""
 
-#: src/usr/local/www/system_advanced_firewall.php:566
+#: src/usr/local/www/system_advanced_firewall.php:565
 msgid ""
 "With Multi-WAN you generally want to ensure traffic reaches directly "
 "connected networks and VPN networks when using policy routing. You can "
@@ -23493,73 +24846,73 @@ msgid ""
 "for these networks"
 msgstr ""
 
-#: src/usr/local/www/system_advanced_firewall.php:573
+#: src/usr/local/www/system_advanced_firewall.php:572
 msgid "Aliases Hostnames Resolve Interval"
 msgstr ""
 
-#: src/usr/local/www/system_advanced_firewall.php:577
+#: src/usr/local/www/system_advanced_firewall.php:576
 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:583
+#: src/usr/local/www/system_advanced_firewall.php:582
 msgid "Check certificate of aliases URLs"
 msgstr ""
 
-#: src/usr/local/www/system_advanced_firewall.php:586
+#: src/usr/local/www/system_advanced_firewall.php:585
 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:590
+#: src/usr/local/www/system_advanced_firewall.php:589
 msgid "Bogon Networks"
 msgstr ""
 
-#: src/usr/local/www/system_advanced_firewall.php:597
+#: src/usr/local/www/system_advanced_firewall.php:596
 msgid "Monthly"
 msgstr ""
 
-#: src/usr/local/www/system_advanced_firewall.php:598
+#: src/usr/local/www/system_advanced_firewall.php:597
 msgid "Weekly"
 msgstr ""
 
-#: src/usr/local/www/system_advanced_firewall.php:599
+#: src/usr/local/www/system_advanced_firewall.php:598
 msgid "Daily"
 msgstr ""
 
-#: src/usr/local/www/system_advanced_firewall.php:594
+#: src/usr/local/www/system_advanced_firewall.php:593
 msgid "Update Frequency"
 msgstr ""
 
-#: src/usr/local/www/system_advanced_firewall.php:601
+#: src/usr/local/www/system_advanced_firewall.php:600
 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:607
+#: src/usr/local/www/system_advanced_firewall.php:606
 msgid "Network Address Translation"
 msgstr ""
 
-#: src/usr/local/www/system_advanced_firewall.php:622
+#: src/usr/local/www/system_advanced_firewall.php:621
 msgid "disabled"
 msgstr ""
 
-#: src/usr/local/www/system_advanced_firewall.php:623
+#: src/usr/local/www/system_advanced_firewall.php:622
 msgid "NAT + proxy"
 msgstr ""
 
-#: src/usr/local/www/system_advanced_firewall.php:624
+#: src/usr/local/www/system_advanced_firewall.php:623
 msgid "Pure NAT"
 msgstr ""
 
-#: src/usr/local/www/system_advanced_firewall.php:619
+#: src/usr/local/www/system_advanced_firewall.php:618
 msgid "NAT Reflection mode for port forwards"
 msgstr ""
 
-#: src/usr/local/www/system_advanced_firewall.php:626
+#: src/usr/local/www/system_advanced_firewall.php:625
 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 "
@@ -23577,21 +24930,21 @@ msgid ""
 "configured to override this system setting on a per-rule basis."
 msgstr ""
 
-#: src/usr/local/www/system_advanced_firewall.php:644
+#: src/usr/local/www/system_advanced_firewall.php:643
 msgid "Reflection Timeout"
 msgstr ""
 
-#: src/usr/local/www/system_advanced_firewall.php:648
+#: src/usr/local/www/system_advanced_firewall.php:647
 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:653
+#: src/usr/local/www/system_advanced_firewall.php:652
 msgid "Enable NAT Reflection for 1:1 NAT"
 msgstr ""
 
-#: src/usr/local/www/system_advanced_firewall.php:656
+#: src/usr/local/www/system_advanced_firewall.php:655
 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 "
@@ -23600,11 +24953,11 @@ msgid ""
 "rule basis."
 msgstr ""
 
-#: src/usr/local/www/system_advanced_firewall.php:664
+#: src/usr/local/www/system_advanced_firewall.php:663
 msgid "Enable automatic outbound NAT for Reflection"
 msgstr ""
 
-#: src/usr/local/www/system_advanced_firewall.php:667
+#: src/usr/local/www/system_advanced_firewall.php:666
 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 "
@@ -23612,50 +24965,50 @@ msgid ""
 "outbound NAT rules that direct the reply packets back through the router."
 msgstr ""
 
-#: src/usr/local/www/system_advanced_firewall.php:674
+#: src/usr/local/www/system_advanced_firewall.php:673
 msgid "TFTP Proxy"
 msgstr ""
 
-#: src/usr/local/www/system_advanced_firewall.php:678
+#: src/usr/local/www/system_advanced_firewall.php:677
 msgid "Choose the interfaces where you want TFTP proxy helper to be enabled."
 msgstr ""
 
-#: src/usr/local/www/system_advanced_firewall.php:683
-msgid "State Timeouts in seconds. (Leave blank for default)"
+#: src/usr/local/www/system_advanced_firewall.php:682
+msgid "State Timeouts in Seconds. (Leave blank for default)"
 msgstr ""
 
-#: src/usr/local/www/system_advanced_firewall.php:690
+#: src/usr/local/www/system_advanced_firewall.php:689
 msgid "TCP "
 msgstr ""
 
-#: src/usr/local/www/system_advanced_firewall.php:701
+#: src/usr/local/www/system_advanced_firewall.php:700
 msgid "UDP "
 msgstr ""
 
-#: src/usr/local/www/system_advanced_firewall.php:712
+#: src/usr/local/www/system_advanced_firewall.php:711
 msgid "ICMP "
 msgstr ""
 
-#: src/usr/local/www/system_advanced_firewall.php:723
+#: src/usr/local/www/system_advanced_firewall.php:722
 msgid "Other "
 msgstr ""
 
-#: src/usr/local/www/system_advanced_firewall.php:746
+#: src/usr/local/www/system_advanced_firewall.php:745
 msgid "The default optimization algorithm"
 msgstr ""
 
-#: src/usr/local/www/system_advanced_firewall.php:748
+#: src/usr/local/www/system_advanced_firewall.php:747
 msgid ""
 "Used for eg. satellite links. Expires idle connections later than default"
 msgstr ""
 
-#: src/usr/local/www/system_advanced_firewall.php:750
+#: src/usr/local/www/system_advanced_firewall.php:749
 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:752
+#: src/usr/local/www/system_advanced_firewall.php:751
 msgid ""
 "Tries to avoid dropping any legitimate idle connections at the expense of "
 "increased memory usage and CPU utilization"
@@ -23686,11 +25039,11 @@ msgid "Please select a valid Thermal Hardware Sensor."
 msgstr ""
 
 #: src/usr/local/www/system_advanced_misc.php:133
-msgid "/tmp Size must be numeric and should not be less than 40MB."
+msgid "/tmp Size must be numeric and should not be less than 40MiB."
 msgstr ""
 
 #: src/usr/local/www/system_advanced_misc.php:137
-msgid "/var Size must be numeric and should not be less than 60MB."
+msgid "/var Size must be numeric and should not be less than 60MiB."
 msgstr ""
 
 #: src/usr/local/www/system_advanced_misc.php:141
@@ -23710,7 +25063,7 @@ msgid "Proxy password and confirmation must match."
 msgstr ""
 
 #: src/usr/local/www/system_advanced_misc.php:325
-msgid "Proxy support"
+msgid "Proxy Support"
 msgstr ""
 
 #: src/usr/local/www/system_advanced_misc.php:329
@@ -23794,7 +25147,7 @@ msgid ""
 msgstr ""
 
 #: src/usr/local/www/system_advanced_misc.php:398
-msgid "Power savings"
+msgid "Power Savings"
 msgstr ""
 
 #: src/usr/local/www/system_advanced_misc.php:402
@@ -23895,7 +25248,7 @@ msgid ""
 msgstr ""
 
 #: src/usr/local/www/system_advanced_misc.php:491
-#: src/usr/local/www/system_gateways_edit.php:726
+#: src/usr/local/www/system_gateways_edit.php:667
 msgid "Gateway Monitoring"
 msgstr ""
 
@@ -23942,8 +25295,8 @@ msgstr ""
 
 #: src/usr/local/www/system_advanced_misc.php:529
 msgid ""
-"Set the size, in MB, for the /tmp RAM disk. Leave blank for 40MB. Do not set "
-"lower than 40."
+"Set the size, in MiB, for the /tmp RAM disk. Leave blank for 40MiB. Do not "
+"set lower than 40."
 msgstr ""
 
 #: src/usr/local/www/system_advanced_misc.php:534
@@ -23952,8 +25305,8 @@ msgstr ""
 
 #: src/usr/local/www/system_advanced_misc.php:538
 msgid ""
-"Set the size, in MB, for the /var RAM disk. Leave blank for 60MB. Do not set "
-"lower than 60."
+"Set the size, in MiB, for the /var RAM disk. Leave blank for 60MiB. Do not "
+"set lower than 60."
 msgstr ""
 
 #: src/usr/local/www/system_advanced_misc.php:543
@@ -23979,7 +25332,7 @@ msgid ""
 msgstr ""
 
 #: src/usr/local/www/system_advanced_misc.php:564
-msgid "Hardware settings"
+msgid "Hardware Settings"
 msgstr ""
 
 #: src/usr/local/www/system_advanced_misc.php:573
@@ -24140,7 +25493,7 @@ msgstr ""
 
 #: src/usr/local/www/system_advanced_notifications.php:212
 #, php-format
-msgid "This is a test message from %s.\t It is safe to ignore this message."
+msgid "This is a test message from %s. It is safe to ignore this message."
 msgstr ""
 
 #: src/usr/local/www/system_advanced_notifications.php:238
@@ -24311,335 +25664,345 @@ msgstr ""
 msgid "The value may contain alphanumeric characters only."
 msgstr ""
 
-#: src/usr/local/www/system_advanced_sysctl.php:178
+#: src/usr/local/www/system_advanced_sysctl.php:182
 msgid "The firewall tunables have changed."
 msgstr ""
 
-#: src/usr/local/www/system_advanced_sysctl.php:198
+#: src/usr/local/www/system_advanced_sysctl.php:202
 msgid "NOTE: "
 msgstr ""
 
-#: src/usr/local/www/system_advanced_sysctl.php:201
+#: src/usr/local/www/system_advanced_sysctl.php:205
 msgid "Tunable Name"
 msgstr ""
 
-#: src/usr/local/www/system_advanced_sysctl.php:204
+#: src/usr/local/www/system_advanced_sysctl.php:208
 msgid "New"
 msgstr ""
 
-#: src/usr/local/www/system_advanced_sysctl.php:224
+#: src/usr/local/www/system_advanced_sysctl.php:228
 msgid "Edit tunable"
 msgstr ""
 
-#: src/usr/local/www/system_advanced_sysctl.php:226
+#: src/usr/local/www/system_advanced_sysctl.php:230
 msgid "Delete/Reset tunable"
 msgstr ""
 
-#: src/usr/local/www/system_advanced_sysctl.php:241
+#: src/usr/local/www/system_advanced_sysctl.php:245
 msgid "Edit Tunable"
 msgstr ""
 
-#: src/usr/local/www/system_advanced_sysctl.php:245
+#: src/usr/local/www/system_advanced_sysctl.php:249
 msgid "Tunable"
 msgstr ""
 
-#: src/usr/local/www/system_authservers.php:67
-#: src/usr/local/www/system_authservers.php:400
-msgid "Authentication Servers"
-msgstr ""
-
-#: src/usr/local/www/system_authservers.php:114
-#, php-format
-msgid "Authentication Server %s deleted"
-msgstr ""
-
-#: src/usr/local/www/system_authservers.php:200
-#: src/usr/local/www/system_authservers.php:223
-#: src/usr/local/www/system_authservers.php:457
-#: src/usr/local/www/system_camanager.php:204
-#: src/usr/local/www/system_camanager.php:218
-#: src/usr/local/www/system_camanager.php:233
-#: src/usr/local/www/system_camanager.php:496
-#: src/usr/local/www/system_certmanager.php:265
-#: src/usr/local/www/system_certmanager.php:278
-#: src/usr/local/www/system_certmanager.php:296
-#: src/usr/local/www/system_certmanager.php:509
-#: src/usr/local/www/system_certmanager.php:608
-#: src/usr/local/www/system_certmanager.php:666
-#: src/usr/local/www/system_certmanager.php:957
-#: src/usr/local/www/system_crlmanager.php:234
-#: src/usr/local/www/system_crlmanager.php:240
-#: src/usr/local/www/system_crlmanager.php:393
-#: src/usr/local/www/system_crlmanager.php:458
-#: src/usr/local/www/system_usermanager.php:194
-#: src/usr/local/www/system_usermanager.php:781
+#: src/usr/local/www/system_authservers.php:111
+#, php-format
+msgid "Authentication Server %s deleted."
+msgstr ""
+
+#: src/usr/local/www/system_authservers.php:197
+#: src/usr/local/www/system_authservers.php:220
+#: src/usr/local/www/system_authservers.php:460
+#: src/usr/local/www/system_camanager.php:202
+#: src/usr/local/www/system_camanager.php:216
+#: src/usr/local/www/system_camanager.php:231
+#: src/usr/local/www/system_camanager.php:499
+#: src/usr/local/www/system_certmanager.php:262
+#: src/usr/local/www/system_certmanager.php:275
+#: src/usr/local/www/system_certmanager.php:293
+#: src/usr/local/www/system_certmanager.php:506
+#: src/usr/local/www/system_certmanager.php:610
+#: src/usr/local/www/system_certmanager.php:668
+#: src/usr/local/www/system_certmanager.php:959
+#: src/usr/local/www/system_crlmanager.php:232
+#: src/usr/local/www/system_crlmanager.php:238
+#: src/usr/local/www/system_crlmanager.php:396
+#: src/usr/local/www/system_crlmanager.php:461
+#: src/usr/local/www/system_usermanager.php:191
+#: src/usr/local/www/system_usermanager.php:783
 msgid "Descriptive name"
 msgstr ""
 
-#: src/usr/local/www/system_authservers.php:202
-#: src/usr/local/www/system_authservers.php:225
+#: src/usr/local/www/system_authservers.php:199
+#: src/usr/local/www/system_authservers.php:222
 msgid "Hostname or IP"
 msgstr ""
 
-#: src/usr/local/www/system_authservers.php:203
-#: src/usr/local/www/system_authservers.php:488
+#: src/usr/local/www/system_authservers.php:200
+#: src/usr/local/www/system_authservers.php:491
 msgid "Port value"
 msgstr ""
 
-#: src/usr/local/www/system_authservers.php:204
-#: src/usr/local/www/system_authservers.php:495
-msgid "Transport"
-msgstr ""
-
-#: src/usr/local/www/system_authservers.php:205
-#: src/usr/local/www/system_authservers.php:524
+#: src/usr/local/www/system_authservers.php:202
+#: src/usr/local/www/system_authservers.php:527
 msgid "Protocol version"
 msgstr ""
 
-#: src/usr/local/www/system_authservers.php:206
+#: src/usr/local/www/system_authservers.php:203
 msgid "Search level"
 msgstr ""
 
-#: src/usr/local/www/system_authservers.php:207
+#: src/usr/local/www/system_authservers.php:204
 msgid "User naming Attribute"
 msgstr ""
 
-#: src/usr/local/www/system_authservers.php:208
+#: src/usr/local/www/system_authservers.php:205
 msgid "Group naming Attribute"
 msgstr ""
 
-#: src/usr/local/www/system_authservers.php:209
-#: src/usr/local/www/system_authservers.php:651
+#: src/usr/local/www/system_authservers.php:206
+#: src/usr/local/www/system_authservers.php:654
 msgid "Group member attribute"
 msgstr ""
 
-#: src/usr/local/www/system_authservers.php:210
+#: src/usr/local/www/system_authservers.php:207
 msgid "Authentication container"
 msgstr ""
 
-#: src/usr/local/www/system_authservers.php:215
+#: src/usr/local/www/system_authservers.php:212
 msgid "Bind user DN"
 msgstr ""
 
-#: src/usr/local/www/system_authservers.php:216
+#: src/usr/local/www/system_authservers.php:213
 msgid "Bind Password"
 msgstr ""
 
-#: src/usr/local/www/system_authservers.php:237
-#: src/usr/local/www/system_authservers.php:725
+#: src/usr/local/www/system_authservers.php:234
+#: src/usr/local/www/system_authservers.php:728
 msgid "Accounting port"
 msgstr ""
 
-#: src/usr/local/www/system_authservers.php:242
-#: src/usr/local/www/system_authservers.php:704
-msgid "Shared Secret"
-msgstr ""
-
-#: src/usr/local/www/system_authservers.php:249
+#: src/usr/local/www/system_authservers.php:246
 msgid "The host name contains invalid characters."
 msgstr ""
 
-#: src/usr/local/www/system_authservers.php:253
+#: src/usr/local/www/system_authservers.php:250
 msgid "An authentication server with the same name already exists."
 msgstr ""
 
-#: src/usr/local/www/system_authservers.php:259
+#: src/usr/local/www/system_authservers.php:256
 #, php-format
 msgid "%s Timeout value must be numeric and positive."
 msgstr ""
 
-#: src/usr/local/www/system_authservers.php:391
-#: src/usr/local/www/system_groupmanager.php:272
-#: src/usr/local/www/system_groupmanager_addprivs.php:183
-#: src/usr/local/www/system_usermanager.php:72
-#: src/usr/local/www/system_usermanager.php:478
-#: src/usr/local/www/system_usermanager.php:488
+#: src/usr/local/www/system_authservers.php:377
+#: src/usr/local/www/system_authservers.php:397
+#: src/usr/local/www/system_authservers.php:403
+#: src/usr/local/www/system_groupmanager.php:292
+#: src/usr/local/www/system_groupmanager_addprivs.php:174
+#: src/usr/local/www/system_usermanager.php:486
+#: src/usr/local/www/system_usermanager_addprivs.php:175
+#: src/usr/local/www/system_usermanager_settings.php:146
+msgid "Authentication Servers"
+msgstr ""
+
+#: src/usr/local/www/system_authservers.php:394
+#: src/usr/local/www/system_groupmanager.php:289
+#: src/usr/local/www/system_groupmanager_addprivs.php:171
+#: src/usr/local/www/system_usermanager.php:467
+#: src/usr/local/www/system_usermanager.php:483
+#: src/usr/local/www/system_usermanager.php:493
 #: src/usr/local/www/system_usermanager_addprivs.php:70
-#: src/usr/local/www/system_usermanager_addprivs.php:171
+#: src/usr/local/www/system_usermanager_addprivs.php:172
 #: src/usr/local/www/system_usermanager_settings.php:143
 #: src/usr/local/www/vpn_l2tp.php:233 src/usr/local/www/vpn_l2tp_users.php:63
 #: src/usr/local/www/vpn_l2tp_users.php:119
+#: src/usr/local/www/vpn_l2tp_users_edit.php:63
 msgid "Users"
 msgstr ""
 
-#: src/usr/local/www/system_authservers.php:406
+#: src/usr/local/www/system_authservers.php:395
+#: src/usr/local/www/system_groupmanager.php:274
+#: src/usr/local/www/system_groupmanager.php:290
+#: src/usr/local/www/system_groupmanager.php:298
+#: src/usr/local/www/system_groupmanager_addprivs.php:69
+#: src/usr/local/www/system_groupmanager_addprivs.php:172
+#: src/usr/local/www/system_usermanager.php:484
+#: src/usr/local/www/system_usermanager.php:503
+#: src/usr/local/www/system_usermanager_addprivs.php:173
+#: src/usr/local/www/system_usermanager_settings.php:144
+msgid "Groups"
+msgstr ""
+
+#: src/usr/local/www/system_authservers.php:409
 msgid "Server Name"
 msgstr ""
 
-#: src/usr/local/www/system_authservers.php:420
-#: src/usr/local/www/vpn_openvpn_server.php:1220
+#: src/usr/local/www/system_authservers.php:423
+#: src/usr/local/www/vpn_openvpn_server.php:1225
 msgid "Edit server"
 msgstr ""
 
-#: src/usr/local/www/system_authservers.php:421
-#: src/usr/local/www/vpn_openvpn_server.php:1221
+#: src/usr/local/www/system_authservers.php:424
+#: src/usr/local/www/vpn_openvpn_server.php:1226
 msgid "Delete server"
 msgstr ""
 
-#: src/usr/local/www/system_authservers.php:453
-msgid "Server settings"
+#: src/usr/local/www/system_authservers.php:456
+msgid "Server Settings"
 msgstr ""
 
-#: src/usr/local/www/system_authservers.php:472
+#: src/usr/local/www/system_authservers.php:475
 msgid "LDAP Server Settings"
 msgstr ""
 
-#: src/usr/local/www/system_authservers.php:480
-#: src/usr/local/www/system_authservers.php:697
+#: src/usr/local/www/system_authservers.php:483
+#: src/usr/local/www/system_authservers.php:700
 msgid "Hostname or IP address"
 msgstr ""
 
-#: src/usr/local/www/system_authservers.php:483
+#: src/usr/local/www/system_authservers.php:486
 msgid ""
 "NOTE: When using SSL, this hostname MUST match the Common Name (CN) of the "
 "LDAP server's SSL Certificate."
 msgstr ""
 
-#: src/usr/local/www/system_authservers.php:503
-#: src/usr/local/www/system_authservers.php:515
-#: src/usr/local/www/vpn_ipsec_phase1.php:783
-#: src/usr/local/www/vpn_openvpn_client.php:607
-#: src/usr/local/www/vpn_openvpn_client.php:613
-#: src/usr/local/www/vpn_openvpn_server.php:730
-#: src/usr/local/www/vpn_openvpn_server.php:736
+#: src/usr/local/www/system_authservers.php:506
+#: src/usr/local/www/system_authservers.php:518
+#: src/usr/local/www/vpn_ipsec_phase1.php:809
+#: src/usr/local/www/vpn_openvpn_client.php:612
+#: src/usr/local/www/vpn_openvpn_client.php:618
+#: src/usr/local/www/vpn_openvpn_server.php:735
+#: src/usr/local/www/vpn_openvpn_server.php:741
 msgid "Peer Certificate Authority"
 msgstr ""
 
-#: src/usr/local/www/system_authservers.php:518
+#: src/usr/local/www/system_authservers.php:521
 msgid ""
 "This option is used if 'SSL Encrypted' option is choosen. It must match with "
 "the CA in the AD otherwise problems will arise."
 msgstr ""
 
-#: src/usr/local/www/system_authservers.php:531
+#: src/usr/local/www/system_authservers.php:534
 msgid "Server Timeout"
 msgstr ""
 
-#: src/usr/local/www/system_authservers.php:535
+#: src/usr/local/www/system_authservers.php:538
 msgid "Timeout for LDAP operations (seconds)"
 msgstr ""
 
-#: src/usr/local/www/system_authservers.php:537
-#: src/usr/local/www/system_authservers.php:555
+#: src/usr/local/www/system_authservers.php:540
+#: src/usr/local/www/system_authservers.php:558
 msgid "Search scope"
 msgstr ""
 
-#: src/usr/local/www/system_authservers.php:541
+#: src/usr/local/www/system_authservers.php:544
 msgid "Level"
 msgstr ""
 
-#: src/usr/local/www/system_authservers.php:548
+#: src/usr/local/www/system_authservers.php:551
 msgid "Base DN"
 msgstr ""
 
-#: src/usr/local/www/system_authservers.php:559
+#: src/usr/local/www/system_authservers.php:562
 msgid "Authentication containers"
 msgstr ""
 
-#: src/usr/local/www/system_authservers.php:562
+#: src/usr/local/www/system_authservers.php:565
 msgid "Containers"
 msgstr ""
 
-#: src/usr/local/www/system_authservers.php:565
+#: src/usr/local/www/system_authservers.php:568
 msgid ""
 "Note: Semi-Colon separated. This will be prepended to the search base dn "
 "above or you can specify full container path 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:571
+#: src/usr/local/www/system_authservers.php:574
 msgid "Select a container"
 msgstr ""
 
-#: src/usr/local/www/system_authservers.php:578
+#: src/usr/local/www/system_authservers.php:581
 msgid "Extended query"
 msgstr ""
 
-#: src/usr/local/www/system_authservers.php:583
-#: src/usr/local/www/system_authservers.php:588
+#: src/usr/local/www/system_authservers.php:586
+#: src/usr/local/www/system_authservers.php:591
 msgid "Query"
 msgstr ""
 
-#: src/usr/local/www/system_authservers.php:591
+#: src/usr/local/www/system_authservers.php:594
 msgid "Example: &amp;(objectClass=inetOrgPerson)(mail=*@example.com)"
 msgstr ""
 
-#: src/usr/local/www/system_authservers.php:597
+#: src/usr/local/www/system_authservers.php:600
 msgid "Bind anonymous"
 msgstr ""
 
-#: src/usr/local/www/system_authservers.php:602
+#: src/usr/local/www/system_authservers.php:605
 msgid "Bind credentials"
 msgstr ""
 
-#: src/usr/local/www/system_authservers.php:607
+#: src/usr/local/www/system_authservers.php:610
 msgid "User DN:"
 msgstr ""
 
-#: src/usr/local/www/system_authservers.php:629
+#: src/usr/local/www/system_authservers.php:632
 msgid "Initial Template"
 msgstr ""
 
-#: src/usr/local/www/system_authservers.php:637
+#: src/usr/local/www/system_authservers.php:640
 msgid "User naming attribute"
 msgstr ""
 
-#: src/usr/local/www/system_authservers.php:644
+#: src/usr/local/www/system_authservers.php:647
 msgid "Group naming attribute"
 msgstr ""
 
-#: src/usr/local/www/system_authservers.php:658
+#: src/usr/local/www/system_authservers.php:661
 msgid "RFC 2307 Groups"
 msgstr ""
 
-#: src/usr/local/www/system_authservers.php:661
+#: src/usr/local/www/system_authservers.php:664
 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:667
+#: src/usr/local/www/system_authservers.php:670
 msgid "Group Object Class"
 msgstr ""
 
-#: src/usr/local/www/system_authservers.php:671
+#: src/usr/local/www/system_authservers.php:674
 msgid ""
 "Object class used for groups in RFC2307 mode. Typically \"posixGroup\" or "
 "\"group\"."
 msgstr ""
 
-#: src/usr/local/www/system_authservers.php:676
+#: src/usr/local/www/system_authservers.php:679
 msgid "UTF8 Encode"
 msgstr ""
 
-#: src/usr/local/www/system_authservers.php:679
+#: src/usr/local/www/system_authservers.php:682
 msgid ""
 "Required to support international characters, but may not be supported by "
 "every LDAP server."
 msgstr ""
 
-#: src/usr/local/www/system_authservers.php:684
+#: src/usr/local/www/system_authservers.php:687
 msgid "Username Alterations"
 msgstr ""
 
-#: src/usr/local/www/system_authservers.php:687
+#: src/usr/local/www/system_authservers.php:690
 msgid "e.g. user@host becomes user when unchecked."
 msgstr ""
 
-#: src/usr/local/www/system_authservers.php:692
-msgid "Radius Server Settings"
+#: src/usr/local/www/system_authservers.php:695
+msgid "RADIUS Server Settings"
 msgstr ""
 
-#: src/usr/local/www/system_authservers.php:711
+#: src/usr/local/www/system_authservers.php:714
 msgid "Services offered"
 msgstr ""
 
-#: src/usr/local/www/system_authservers.php:732
+#: src/usr/local/www/system_authservers.php:735
 msgid "Authentication Timeout"
 msgstr ""
 
-#: src/usr/local/www/system_authservers.php:735
+#: src/usr/local/www/system_authservers.php:738
 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 "
@@ -24648,15 +26011,15 @@ msgid ""
 "to receive and enter a token."
 msgstr ""
 
-#: src/usr/local/www/system_authservers.php:763
+#: src/usr/local/www/system_authservers.php:766
 msgid "Please fill the required values."
 msgstr ""
 
-#: src/usr/local/www/system_authservers.php:770
+#: src/usr/local/www/system_authservers.php:773
 msgid "Please fill the bind username/password."
 msgstr ""
 
-#: src/usr/local/www/system_authservers.php:792
+#: src/usr/local/www/system_authservers.php:795
 msgid "Popup blocker detected.\tAction aborted."
 msgstr ""
 
@@ -24672,291 +26035,292 @@ msgstr ""
 msgid "Create an intermediate Certificate Authority"
 msgstr ""
 
-#: src/usr/local/www/system_camanager.php:75
-#: src/usr/local/www/system_certmanager.php:82
-#: src/usr/local/www/system_crlmanager.php:70
-msgid "Certificate Manager"
-msgstr ""
-
-#: src/usr/local/www/system_camanager.php:75
-#: src/usr/local/www/system_camanager.php:375
-#: src/usr/local/www/system_certmanager.php:573
-#: src/usr/local/www/system_crlmanager.php:371
-msgid "CAs"
-msgstr ""
-
-#: src/usr/local/www/system_camanager.php:131
+#: src/usr/local/www/system_camanager.php:129
 #, php-format
-msgid "Certificate Authority %s and its CRLs (if any) successfully deleted"
+msgid "Certificate Authority %s and its CRLs (if any) successfully deleted."
 msgstr ""
 
-#: src/usr/local/www/system_camanager.php:205
-#: src/usr/local/www/system_camanager.php:517
-#: src/usr/local/www/system_certmanager.php:266
-#: src/usr/local/www/system_certmanager.php:677
+#: src/usr/local/www/system_camanager.php:203
+#: src/usr/local/www/system_camanager.php:520
+#: src/usr/local/www/system_certmanager.php:263
+#: src/usr/local/www/system_certmanager.php:679
 msgid "Certificate data"
 msgstr ""
 
-#: src/usr/local/www/system_camanager.php:207
-#: src/usr/local/www/system_certmanager.php:269
+#: src/usr/local/www/system_camanager.php:205
+#: src/usr/local/www/system_certmanager.php:266
 msgid "This certificate does not appear to be valid."
 msgstr ""
 
-#: src/usr/local/www/system_camanager.php:210
+#: src/usr/local/www/system_camanager.php:208
 msgid "Encrypted private keys are not yet supported."
 msgstr ""
 
+#: src/usr/local/www/system_camanager.php:217
+#: src/usr/local/www/system_camanager.php:233
+#: src/usr/local/www/system_certmanager.php:277
+#: src/usr/local/www/system_certmanager.php:294
+#: src/usr/local/www/system_certmanager.php:720
+#: src/usr/local/www/system_certmanager.php:850
+#: src/usr/local/www/system_usermanager.php:193
+#: src/usr/local/www/system_usermanager.php:797
+msgid "Key length"
+msgstr ""
+
+#: src/usr/local/www/system_camanager.php:218
+#: src/usr/local/www/system_camanager.php:234
+#: src/usr/local/www/system_certmanager.php:279
+#: src/usr/local/www/system_usermanager.php:194
+#: src/usr/local/www/system_usermanager.php:809
+#: src/usr/local/www/vpn_ipsec_phase2.php:703
+msgid "Lifetime"
+msgstr ""
+
 #: src/usr/local/www/system_camanager.php:219
 #: src/usr/local/www/system_camanager.php:235
 #: src/usr/local/www/system_certmanager.php:280
-#: src/usr/local/www/system_certmanager.php:297
-#: src/usr/local/www/system_certmanager.php:718
-#: src/usr/local/www/system_certmanager.php:848
-#: src/usr/local/www/system_usermanager.php:196
-#: src/usr/local/www/system_usermanager.php:795
-msgid "Key length"
+#: src/usr/local/www/system_certmanager.php:295
+msgid "Distinguished name Country Code"
 msgstr ""
 
 #: src/usr/local/www/system_camanager.php:220
 #: src/usr/local/www/system_camanager.php:236
-#: src/usr/local/www/system_certmanager.php:282
-#: src/usr/local/www/system_usermanager.php:197
-#: src/usr/local/www/system_usermanager.php:807
-#: src/usr/local/www/vpn_ipsec_phase2.php:701
-msgid "Lifetime"
+#: src/usr/local/www/system_certmanager.php:281
+#: src/usr/local/www/system_certmanager.php:296
+msgid "Distinguished name State or Province"
 msgstr ""
 
 #: src/usr/local/www/system_camanager.php:221
 #: src/usr/local/www/system_camanager.php:237
-#: src/usr/local/www/system_certmanager.php:283
-#: src/usr/local/www/system_certmanager.php:298
-msgid "Distinguished name Country Code"
+#: src/usr/local/www/system_certmanager.php:282
+#: src/usr/local/www/system_certmanager.php:297
+msgid "Distinguished name City"
 msgstr ""
 
 #: src/usr/local/www/system_camanager.php:222
 #: src/usr/local/www/system_camanager.php:238
-#: src/usr/local/www/system_certmanager.php:284
-#: src/usr/local/www/system_certmanager.php:299
-msgid "Distinguished name State or Province"
+#: src/usr/local/www/system_certmanager.php:283
+#: src/usr/local/www/system_certmanager.php:298
+msgid "Distinguished name Organization"
 msgstr ""
 
 #: src/usr/local/www/system_camanager.php:223
 #: src/usr/local/www/system_camanager.php:239
-#: src/usr/local/www/system_certmanager.php:285
-#: src/usr/local/www/system_certmanager.php:300
-msgid "Distinguished name City"
+#: src/usr/local/www/system_certmanager.php:284
+#: src/usr/local/www/system_certmanager.php:299
+msgid "Distinguished name Email Address"
 msgstr ""
 
 #: src/usr/local/www/system_camanager.php:224
 #: src/usr/local/www/system_camanager.php:240
-#: src/usr/local/www/system_certmanager.php:286
-#: src/usr/local/www/system_certmanager.php:301
-msgid "Distinguished name Organization"
-msgstr ""
-
-#: src/usr/local/www/system_camanager.php:225
-#: src/usr/local/www/system_camanager.php:241
-#: src/usr/local/www/system_certmanager.php:287
-#: src/usr/local/www/system_certmanager.php:302
-msgid "Distinguished name Email Address"
-msgstr ""
-
-#: src/usr/local/www/system_camanager.php:226
-#: src/usr/local/www/system_camanager.php:242
-#: src/usr/local/www/system_certmanager.php:288
-#: src/usr/local/www/system_certmanager.php:303
+#: src/usr/local/www/system_certmanager.php:285
+#: src/usr/local/www/system_certmanager.php:300
 msgid "Distinguished name Common Name"
 msgstr ""
 
-#: src/usr/local/www/system_camanager.php:234
-#: src/usr/local/www/system_camanager.php:551
+#: src/usr/local/www/system_camanager.php:232
+#: src/usr/local/www/system_camanager.php:554
 msgid "Signing Certificate Authority"
 msgstr ""
 
-#: src/usr/local/www/system_camanager.php:249
+#: src/usr/local/www/system_camanager.php:247
 msgid "The field 'Descriptive Name' contains invalid characters."
 msgstr ""
 
-#: src/usr/local/www/system_camanager.php:255
-#: src/usr/local/www/system_certmanager.php:374
+#: src/usr/local/www/system_camanager.php:253
+#: src/usr/local/www/system_certmanager.php:371
 msgid ""
 "The field 'Distinguished name Email Address' contains invalid characters."
 msgstr ""
 
-#: src/usr/local/www/system_camanager.php:259
-#: src/usr/local/www/system_certmanager.php:378
+#: src/usr/local/www/system_camanager.php:257
+#: src/usr/local/www/system_certmanager.php:375
 msgid "The field 'Distinguished name Common Name' contains invalid characters."
 msgstr ""
 
-#: src/usr/local/www/system_camanager.php:266
-#: src/usr/local/www/system_certmanager.php:386
-#: src/usr/local/www/system_certmanager.php:393
+#: src/usr/local/www/system_camanager.php:264
+#: src/usr/local/www/system_certmanager.php:383
+#: src/usr/local/www/system_certmanager.php:390
 msgid "Please select a valid Key Length."
 msgstr ""
 
-#: src/usr/local/www/system_camanager.php:269
-#: src/usr/local/www/system_certmanager.php:389
-#: src/usr/local/www/system_certmanager.php:396
+#: src/usr/local/www/system_camanager.php:267
+#: src/usr/local/www/system_certmanager.php:386
+#: src/usr/local/www/system_certmanager.php:393
 msgid "Please select a valid Digest Algorithm."
 msgstr ""
 
-#: src/usr/local/www/system_camanager.php:376
-#: src/usr/local/www/system_camanager.php:392
-#: src/usr/local/www/system_certmanager.php:82
-#: src/usr/local/www/system_certmanager.php:574
-#: src/usr/local/www/system_certmanager.php:998
-#: src/usr/local/www/system_crlmanager.php:372
-#: src/usr/local/www/system_crlmanager.php:613
-msgid "Certificates"
+#: src/usr/local/www/system_camanager.php:351
+#: src/usr/local/www/system_certmanager.php:559
+#: src/usr/local/www/system_crlmanager.php:293
+msgid "Certificate Manager"
 msgstr ""
 
-#: src/usr/local/www/system_camanager.php:377
+#: src/usr/local/www/system_camanager.php:351
+#: src/usr/local/www/system_camanager.php:378
 #: src/usr/local/www/system_certmanager.php:575
-#: src/usr/local/www/system_crlmanager.php:373
+#: src/usr/local/www/system_crlmanager.php:374
+msgid "CAs"
+msgstr ""
+
+#: src/usr/local/www/system_camanager.php:379
+#: src/usr/local/www/system_camanager.php:395
+#: src/usr/local/www/system_certmanager.php:559
+#: src/usr/local/www/system_certmanager.php:576
+#: src/usr/local/www/system_certmanager.php:1000
+#: src/usr/local/www/system_crlmanager.php:375
+#: src/usr/local/www/system_crlmanager.php:616
+msgid "Certificates"
+msgstr ""
+
+#: src/usr/local/www/system_camanager.php:380
+#: src/usr/local/www/system_certmanager.php:577
+#: src/usr/local/www/system_crlmanager.php:293
+#: src/usr/local/www/system_crlmanager.php:376
 msgid "Certificate Revocation"
 msgstr ""
 
-#: src/usr/local/www/system_camanager.php:383
+#: src/usr/local/www/system_camanager.php:386
 msgid "Certificate Authorities"
 msgstr ""
 
-#: src/usr/local/www/system_camanager.php:390
-#: src/usr/local/www/system_crlmanager.php:612
+#: src/usr/local/www/system_camanager.php:393
+#: src/usr/local/www/system_crlmanager.php:615
 msgid "Internal"
 msgstr ""
 
-#: src/usr/local/www/system_camanager.php:391
-#: src/usr/local/www/system_certmanager.php:1005
+#: src/usr/local/www/system_camanager.php:394
+#: src/usr/local/www/system_certmanager.php:1007
 msgid "Issuer"
 msgstr ""
 
-#: src/usr/local/www/system_camanager.php:393
-#: src/usr/local/www/system_certmanager.php:1006
+#: src/usr/local/www/system_camanager.php:396
+#: src/usr/local/www/system_certmanager.php:1008
 msgid "Distinguished Name"
 msgstr ""
 
-#: src/usr/local/www/system_camanager.php:405
-#: src/usr/local/www/system_certmanager.php:1030
+#: src/usr/local/www/system_camanager.php:408
+#: src/usr/local/www/system_certmanager.php:1032
 msgid "self-signed"
 msgstr ""
 
-#: src/usr/local/www/system_camanager.php:407
-#: src/usr/local/www/system_certmanager.php:1032
+#: src/usr/local/www/system_camanager.php:410
+#: src/usr/local/www/system_certmanager.php:1034
 msgid "external"
 msgstr ""
 
-#: src/usr/local/www/system_camanager.php:442
-#: src/usr/local/www/system_certmanager.php:1064
+#: src/usr/local/www/system_camanager.php:445
+#: src/usr/local/www/system_certmanager.php:1066
 msgid "Valid From"
 msgstr ""
 
-#: src/usr/local/www/system_camanager.php:442
-#: src/usr/local/www/system_certmanager.php:1064
+#: src/usr/local/www/system_camanager.php:445
+#: src/usr/local/www/system_certmanager.php:1066
 msgid "Valid Until"
 msgstr ""
 
-#: src/usr/local/www/system_camanager.php:446
+#: src/usr/local/www/system_camanager.php:449
 msgid "Edit CA"
 msgstr ""
 
-#: src/usr/local/www/system_camanager.php:447
+#: src/usr/local/www/system_camanager.php:450
 msgid "Export CA"
 msgstr ""
 
-#: src/usr/local/www/system_camanager.php:449
+#: src/usr/local/www/system_camanager.php:452
 msgid "Export key"
 msgstr ""
 
-#: src/usr/local/www/system_camanager.php:451
+#: src/usr/local/www/system_camanager.php:454
 msgid "Delete CA"
 msgstr ""
 
-#: src/usr/local/www/system_camanager.php:492
-msgid "Create / edit CA"
+#: src/usr/local/www/system_camanager.php:495
+msgid "Create / Edit CA"
 msgstr ""
 
-#: src/usr/local/www/system_camanager.php:504
-#: src/usr/local/www/system_certmanager.php:658
-#: src/usr/local/www/system_crlmanager.php:384
+#: src/usr/local/www/system_camanager.php:507
+#: src/usr/local/www/system_certmanager.php:660
+#: src/usr/local/www/system_crlmanager.php:387
 msgid "Method"
 msgstr ""
 
-#: src/usr/local/www/system_camanager.php:512
+#: src/usr/local/www/system_camanager.php:515
 msgid "Existing Certificate Authority"
 msgstr ""
 
-#: src/usr/local/www/system_camanager.php:519
-#: src/usr/local/www/system_certmanager.php:679
+#: src/usr/local/www/system_camanager.php:522
+#: src/usr/local/www/system_certmanager.php:681
 msgid "Paste a certificate in X.509 PEM format here."
 msgstr ""
 
-#: src/usr/local/www/system_camanager.php:523
+#: src/usr/local/www/system_camanager.php:526
 msgid "Certificate Private Key (optional)"
 msgstr ""
 
-#: src/usr/local/www/system_camanager.php:525
+#: src/usr/local/www/system_camanager.php:528
 msgid ""
 "Paste the private key for the above certificate here. This is optional in "
 "most cases, but required if you need to generate a Certificate Revocation "
 "List (CRL)."
 msgstr ""
 
-#: src/usr/local/www/system_camanager.php:531
+#: src/usr/local/www/system_camanager.php:534
 msgid "Serial for next certificate"
 msgstr ""
 
-#: src/usr/local/www/system_camanager.php:534
+#: src/usr/local/www/system_camanager.php:537
 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:539
+#: src/usr/local/www/system_camanager.php:542
 msgid "Internal Certificate Authority"
 msgstr ""
 
-#: src/usr/local/www/system_camanager.php:563
+#: src/usr/local/www/system_camanager.php:566
 msgid "Key length (bits)"
 msgstr ""
 
-#: src/usr/local/www/system_camanager.php:570
-#: src/usr/local/www/system_certmanager.php:725
-#: src/usr/local/www/system_certmanager.php:855
+#: src/usr/local/www/system_camanager.php:573
+#: src/usr/local/www/system_certmanager.php:727
+#: src/usr/local/www/system_certmanager.php:857
 msgid "Digest Algorithm"
 msgstr ""
 
-#: src/usr/local/www/system_camanager.php:573
-#: src/usr/local/www/system_certmanager.php:728
+#: src/usr/local/www/system_camanager.php:576
+#: src/usr/local/www/system_certmanager.php:730
 msgid ""
 "NOTE: It is recommended to use an algorithm stronger than SHA1 when possible."
 msgstr ""
 
-#: src/usr/local/www/system_camanager.php:578
-#: src/usr/local/www/system_certmanager.php:741
+#: src/usr/local/www/system_camanager.php:581
+#: src/usr/local/www/system_certmanager.php:743
 msgid "Lifetime (days)"
 msgstr ""
 
-#: src/usr/local/www/system_camanager.php:585
-#: src/usr/local/www/system_certmanager.php:748
-#: src/usr/local/www/system_certmanager.php:863
+#: src/usr/local/www/system_camanager.php:588
+#: src/usr/local/www/system_certmanager.php:750
+#: src/usr/local/www/system_certmanager.php:865
 msgid "Country Code"
 msgstr ""
 
-#: src/usr/local/www/system_camanager.php:592
-#: src/usr/local/www/system_certmanager.php:755
-#: src/usr/local/www/system_certmanager.php:870
+#: src/usr/local/www/system_camanager.php:595
+#: src/usr/local/www/system_certmanager.php:757
+#: src/usr/local/www/system_certmanager.php:872
 msgid "State or Province"
 msgstr ""
 
-#: src/usr/local/www/system_camanager.php:600
-#: src/usr/local/www/system_certmanager.php:763
-#: src/usr/local/www/system_certmanager.php:878
+#: src/usr/local/www/system_camanager.php:603
+#: src/usr/local/www/system_certmanager.php:765
+#: src/usr/local/www/system_certmanager.php:880
 msgid "City"
 msgstr ""
 
-#: src/usr/local/www/system_camanager.php:608
-#: src/usr/local/www/system_certmanager.php:771
-#: src/usr/local/www/system_certmanager.php:886
+#: src/usr/local/www/system_camanager.php:611
+#: src/usr/local/www/system_certmanager.php:773
+#: src/usr/local/www/system_certmanager.php:888
 msgid "Organization"
 msgstr ""
 
@@ -24972,365 +26336,347 @@ msgstr ""
 msgid "Create a Certificate Signing Request"
 msgstr ""
 
-#: src/usr/local/www/system_certmanager.php:92
+#: src/usr/local/www/system_certmanager.php:89
 msgid "Choose an existing certificate"
 msgstr ""
 
-#: src/usr/local/www/system_certmanager.php:140
+#: src/usr/local/www/system_certmanager.php:137
 #, php-format
-msgid "Certificate %s successfully deleted"
+msgid "Certificate %s successfully deleted."
 msgstr ""
 
-#: src/usr/local/www/system_certmanager.php:267
+#: src/usr/local/www/system_certmanager.php:264
 msgid "Key data"
 msgstr ""
 
-#: src/usr/local/www/system_certmanager.php:279
-#: src/usr/local/www/system_certmanager.php:693
-#: src/usr/local/www/system_certmanager.php:710
-#: src/usr/local/www/system_usermanager.php:195
-#: src/usr/local/www/system_usermanager.php:788
+#: src/usr/local/www/system_certmanager.php:276
+#: src/usr/local/www/system_certmanager.php:695
+#: src/usr/local/www/system_certmanager.php:712
+#: src/usr/local/www/system_usermanager.php:192
+#: src/usr/local/www/system_usermanager.php:790
 msgid "Certificate authority"
 msgstr ""
 
-#: src/usr/local/www/system_certmanager.php:281
-#: src/usr/local/www/system_certmanager.php:733
+#: src/usr/local/www/system_certmanager.php:278
+#: src/usr/local/www/system_certmanager.php:735
 msgid "Certificate Type"
 msgstr ""
 
-#: src/usr/local/www/system_certmanager.php:308
+#: src/usr/local/www/system_certmanager.php:305
 msgid "Existing Certificate Choice"
 msgstr ""
 
-#: src/usr/local/www/system_certmanager.php:510
+#: src/usr/local/www/system_certmanager.php:507
 msgid "Final Certificate data"
 msgstr ""
 
-#: src/usr/local/www/system_certmanager.php:534
+#: src/usr/local/www/system_certmanager.php:531
 #, php-format
 msgid "The certificate modulus does not match the signing request modulus."
 msgstr ""
 
-#: src/usr/local/www/system_certmanager.php:595
+#: src/usr/local/www/system_certmanager.php:597
 msgid "Complete Signing Request"
 msgstr ""
 
-#: src/usr/local/www/system_certmanager.php:615
-#: src/usr/local/www/system_certmanager.php:964
+#: src/usr/local/www/system_certmanager.php:617
+#: src/usr/local/www/system_certmanager.php:966
 msgid "Signing request data"
 msgstr ""
 
-#: src/usr/local/www/system_certmanager.php:617
-#: src/usr/local/www/system_certmanager.php:968
+#: src/usr/local/www/system_certmanager.php:619
+#: src/usr/local/www/system_certmanager.php:970
 msgid ""
 "Copy the certificate signing data from here and forward it to your "
 "certificate authority for signing."
 msgstr ""
 
-#: src/usr/local/www/system_certmanager.php:622
-#: src/usr/local/www/system_certmanager.php:972
+#: src/usr/local/www/system_certmanager.php:624
+#: src/usr/local/www/system_certmanager.php:974
 msgid "Final certificate data"
 msgstr ""
 
-#: src/usr/local/www/system_certmanager.php:624
-#: src/usr/local/www/system_certmanager.php:975
+#: src/usr/local/www/system_certmanager.php:626
+#: src/usr/local/www/system_certmanager.php:977
 msgid "Paste the certificate received from your certificate authority here."
 msgstr ""
 
-#: src/usr/local/www/system_certmanager.php:653
-msgid "Add a new certificate"
+#: src/usr/local/www/system_certmanager.php:655
+msgid "Add a New Certificate"
 msgstr ""
 
-#: src/usr/local/www/system_certmanager.php:672
+#: src/usr/local/www/system_certmanager.php:674
 msgid "Import Certificate"
 msgstr ""
 
-#: src/usr/local/www/system_certmanager.php:683
+#: src/usr/local/www/system_certmanager.php:685
 msgid "Private key data"
 msgstr ""
 
-#: src/usr/local/www/system_certmanager.php:685
+#: src/usr/local/www/system_certmanager.php:687
 msgid "Paste a private key in X.509 PEM format here."
 msgstr ""
 
-#: src/usr/local/www/system_certmanager.php:688
+#: src/usr/local/www/system_certmanager.php:690
 msgid "Internal Certificate"
 msgstr ""
 
-#: src/usr/local/www/system_certmanager.php:694
+#: src/usr/local/www/system_certmanager.php:696
 msgid "No internal Certificate Authorities have been defined. You must "
 msgstr ""
 
-#: src/usr/local/www/system_certmanager.php:695
+#: src/usr/local/www/system_certmanager.php:697
 msgid " create"
 msgstr ""
 
-#: src/usr/local/www/system_certmanager.php:696
+#: src/usr/local/www/system_certmanager.php:698
 msgid " an internal CA before creating an internal certificate."
 msgstr ""
 
-#: src/usr/local/www/system_certmanager.php:736
+#: src/usr/local/www/system_certmanager.php:738
 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:804
+#: src/usr/local/www/system_certmanager.php:806
 msgid "Alternative Names"
 msgstr ""
 
-#: src/usr/local/www/system_certmanager.php:811
+#: src/usr/local/www/system_certmanager.php:813
 msgid "FQDN or Hostname"
 msgstr ""
 
-#: src/usr/local/www/system_certmanager.php:813
+#: src/usr/local/www/system_certmanager.php:815
 msgid "URI"
 msgstr ""
 
-#: src/usr/local/www/system_certmanager.php:814
+#: src/usr/local/www/system_certmanager.php:816
 msgid "email address"
 msgstr ""
 
-#: src/usr/local/www/system_certmanager.php:843
+#: src/usr/local/www/system_certmanager.php:845
 msgid "External Signing Request"
 msgstr ""
 
-#: src/usr/local/www/system_certmanager.php:858
+#: src/usr/local/www/system_certmanager.php:860
 msgid ""
 "NOTE: It is recommended to use an algorithm stronger than SHA1 when possible"
 msgstr ""
 
-#: src/usr/local/www/system_certmanager.php:909
+#: src/usr/local/www/system_certmanager.php:911
 msgid "Choose an Existing Certificate"
 msgstr ""
 
-#: src/usr/local/www/system_certmanager.php:939
+#: src/usr/local/www/system_certmanager.php:941
 msgid "Existing Certificates"
 msgstr ""
 
-#: src/usr/local/www/system_certmanager.php:953
-msgid "Complete signing request for "
-msgstr ""
-
-#: src/usr/local/www/system_certmanager.php:1007
-#: src/usr/local/www/system_crlmanager.php:614
-msgid "In Use"
+#: src/usr/local/www/system_certmanager.php:955
+msgid "Complete Signing Request for "
 msgstr ""
 
-#: src/usr/local/www/system_certmanager.php:1040
+#: src/usr/local/www/system_certmanager.php:1042
 msgid "external - signature pending"
 msgstr ""
 
-#: src/usr/local/www/system_certmanager.php:1070
-msgid "Revoked"
-msgstr ""
-
-#: src/usr/local/www/system_certmanager.php:1073
-msgid "webConfigurator"
-msgstr ""
-
-#: src/usr/local/www/system_certmanager.php:1076
+#: src/usr/local/www/system_certmanager.php:1078
 msgid "User Cert"
 msgstr ""
 
-#: src/usr/local/www/system_certmanager.php:1079
+#: src/usr/local/www/system_certmanager.php:1081
 msgid "OpenVPN Server"
 msgstr ""
 
-#: src/usr/local/www/system_certmanager.php:1082
+#: src/usr/local/www/system_certmanager.php:1084
 msgid "OpenVPN Client"
 msgstr ""
 
-#: src/usr/local/www/system_certmanager.php:1085
+#: src/usr/local/www/system_certmanager.php:1087
 msgid "IPsec Tunnel"
 msgstr ""
 
-#: src/usr/local/www/system_certmanager.php:1112
+#: src/usr/local/www/system_certmanager.php:1114
 msgid "Export Certificate"
 msgstr ""
 
-#: src/usr/local/www/system_certmanager.php:1113
-#: src/usr/local/www/system_certmanager.php:1118
+#: src/usr/local/www/system_certmanager.php:1115
+#: src/usr/local/www/system_certmanager.php:1120
 msgid "Export Key"
 msgstr ""
 
-#: src/usr/local/www/system_certmanager.php:1114
+#: src/usr/local/www/system_certmanager.php:1116
 msgid "Export P12"
 msgstr ""
 
-#: src/usr/local/www/system_certmanager.php:1116
+#: src/usr/local/www/system_certmanager.php:1118
 msgid "Update CSR"
 msgstr ""
 
-#: src/usr/local/www/system_certmanager.php:1117
+#: src/usr/local/www/system_certmanager.php:1119
 msgid "Export Request"
 msgstr ""
 
-#: src/usr/local/www/system_certmanager.php:1121
+#: src/usr/local/www/system_certmanager.php:1123
 msgid "Delete Certificate"
 msgstr ""
 
-#: src/usr/local/www/system_crlmanager.php:70
-msgid "Certificate Revocation Lists"
-msgstr ""
-
-#: src/usr/local/www/system_crlmanager.php:73
+#: src/usr/local/www/system_crlmanager.php:71
 msgid "Create an internal Certificate Revocation List"
 msgstr ""
 
-#: src/usr/local/www/system_crlmanager.php:74
+#: src/usr/local/www/system_crlmanager.php:72
 msgid "Import an existing Certificate Revocation List"
 msgstr ""
 
-#: src/usr/local/www/system_crlmanager.php:120
+#: src/usr/local/www/system_crlmanager.php:118
 msgid "Invalid CRL reference."
 msgstr ""
 
-#: src/usr/local/www/system_crlmanager.php:126
+#: src/usr/local/www/system_crlmanager.php:124
 #, php-format
-msgid "Certificate Revocation List %s is in use and cannot be deleted"
+msgid "Certificate Revocation List %s is in use and cannot be deleted."
 msgstr ""
 
-#: src/usr/local/www/system_crlmanager.php:134
+#: src/usr/local/www/system_crlmanager.php:132
 #, php-format
-msgid "Certificate Revocation List %s successfully deleted"
+msgid "Certificate Revocation List %s successfully deleted."
 msgstr ""
 
-#: src/usr/local/www/system_crlmanager.php:173
+#: src/usr/local/www/system_crlmanager.php:171
 msgid "Both the Certificate and CRL must be specified."
 msgstr ""
 
-#: src/usr/local/www/system_crlmanager.php:177
+#: src/usr/local/www/system_crlmanager.php:175
 msgid "CA mismatch between the Certificate and CRL. Unable to Revoke."
 msgstr ""
 
-#: src/usr/local/www/system_crlmanager.php:180
+#: src/usr/local/www/system_crlmanager.php:178
 msgid "Cannot revoke certificates for an imported/external CRL."
 msgstr ""
 
-#: src/usr/local/www/system_crlmanager.php:215
+#: src/usr/local/www/system_crlmanager.php:213
 #, php-format
-msgid "Deleted Certificate %s from CRL %s"
+msgid "Deleted Certificate %s from CRL %s."
 msgstr ""
 
-#: src/usr/local/www/system_crlmanager.php:221
+#: src/usr/local/www/system_crlmanager.php:219
 #, php-format
-msgid "Failed to delete Certificate %s from CRL %s"
+msgid "Failed to delete Certificate %s from CRL %s."
 msgstr ""
 
-#: src/usr/local/www/system_crlmanager.php:235
+#: src/usr/local/www/system_crlmanager.php:233
 msgid "Certificate Revocation List data"
 msgstr ""
 
-#: src/usr/local/www/system_crlmanager.php:241
-#: src/usr/local/www/system_crlmanager.php:400
-#: src/usr/local/www/vpn_ipsec_phase1.php:241
-#: src/usr/local/www/vpn_openvpn_client.php:329
+#: src/usr/local/www/system_crlmanager.php:239
+#: src/usr/local/www/system_crlmanager.php:403
+#: src/usr/local/www/vpn_ipsec_phase1.php:253
+#: src/usr/local/www/vpn_openvpn_client.php:326
 #: src/usr/local/www/vpn_openvpn_server.php:426
 msgid "Certificate Authority"
 msgstr ""
 
-#: src/usr/local/www/system_crlmanager.php:380
-msgid "Create new revocation list"
+#: src/usr/local/www/system_crlmanager.php:383
+msgid "Create new Revocation List"
 msgstr ""
 
-#: src/usr/local/www/system_crlmanager.php:407
+#: src/usr/local/www/system_crlmanager.php:410
 msgid "Existing Certificate Revocation List"
 msgstr ""
 
-#: src/usr/local/www/system_crlmanager.php:412
-#: src/usr/local/www/system_crlmanager.php:465
+#: src/usr/local/www/system_crlmanager.php:415
+#: src/usr/local/www/system_crlmanager.php:468
 msgid "CRL data"
 msgstr ""
 
-#: src/usr/local/www/system_crlmanager.php:414
-#: src/usr/local/www/system_crlmanager.php:467
+#: src/usr/local/www/system_crlmanager.php:417
+#: src/usr/local/www/system_crlmanager.php:470
 msgid "Paste a Certificate Revocation List in X.509 CRL format here."
 msgstr ""
 
-#: src/usr/local/www/system_crlmanager.php:418
+#: src/usr/local/www/system_crlmanager.php:421
 msgid "Internal Certificate Revocation List"
 msgstr ""
 
-#: src/usr/local/www/system_crlmanager.php:423
+#: src/usr/local/www/system_crlmanager.php:426
 msgid "Lifetime (Days)"
 msgstr ""
 
-#: src/usr/local/www/system_crlmanager.php:431
+#: src/usr/local/www/system_crlmanager.php:434
 msgid "Serial"
 msgstr ""
 
-#: src/usr/local/www/system_crlmanager.php:454
+#: src/usr/local/www/system_crlmanager.php:457
 msgid "Edit Imported Certificate Revocation List"
 msgstr ""
 
-#: src/usr/local/www/system_crlmanager.php:494
+#: src/usr/local/www/system_crlmanager.php:497
 msgid "Currently Revoked Certificates for CRL"
 msgstr ""
 
-#: src/usr/local/www/system_crlmanager.php:498
-msgid "No Certificates Found for this CRL."
+#: src/usr/local/www/system_crlmanager.php:501
+msgid "No certificates found for this CRL."
 msgstr ""
 
-#: src/usr/local/www/system_crlmanager.php:504
+#: src/usr/local/www/system_crlmanager.php:507
 msgid "Certificate Name"
 msgstr ""
 
-#: src/usr/local/www/system_crlmanager.php:505
+#: src/usr/local/www/system_crlmanager.php:508
 msgid "Revocation Reason"
 msgstr ""
 
-#: src/usr/local/www/system_crlmanager.php:506
+#: src/usr/local/www/system_crlmanager.php:509
 msgid "Revoked At"
 msgstr ""
 
-#: src/usr/local/www/system_crlmanager.php:526
+#: src/usr/local/www/system_crlmanager.php:529
 msgid "Do you really want to delete this Certificate from the CRL?"
 msgstr ""
 
-#: src/usr/local/www/system_crlmanager.php:527
+#: src/usr/local/www/system_crlmanager.php:530
 msgid "Delete this certificate from the CRL "
 msgstr ""
 
-#: src/usr/local/www/system_crlmanager.php:551
-msgid "No Certificates Found for this CA."
+#: src/usr/local/www/system_crlmanager.php:554
+msgid "No certificates found for this CA."
 msgstr ""
 
-#: src/usr/local/www/system_crlmanager.php:553
-msgid "Choose a certificate to revoke"
+#: src/usr/local/www/system_crlmanager.php:556
+msgid "Choose a Certificate to Revoke"
 msgstr ""
 
-#: src/usr/local/www/system_crlmanager.php:561
-#: src/usr/local/www/system_usermanager.php:163
-#: src/usr/local/www/system_usermanager.php:731
-#: src/usr/local/www/vpn_ipsec_phase1.php:241
+#: src/usr/local/www/system_crlmanager.php:564
+#: src/usr/local/www/system_usermanager.php:733
+#: src/usr/local/www/vpn_ipsec_phase1.php:253
 #: src/usr/local/www/vpn_openvpn_server.php:426
 msgid "Certificate"
 msgstr ""
 
-#: src/usr/local/www/system_crlmanager.php:568
+#: src/usr/local/www/system_crlmanager.php:571
 msgid "Reason"
 msgstr ""
 
-#: src/usr/local/www/system_crlmanager.php:606
+#: src/usr/local/www/system_crlmanager.php:609
 msgid "Additional Certificate Revocation Lists"
 msgstr ""
 
-#: src/usr/local/www/system_crlmanager.php:645
-#: src/usr/local/www/system_crlmanager.php:651
+#: src/usr/local/www/system_crlmanager.php:648
+#: src/usr/local/www/system_crlmanager.php:654
 msgid "Add or Import CRL"
 msgstr ""
 
-#: src/usr/local/www/system_crlmanager.php:672
+#: src/usr/local/www/system_crlmanager.php:675
 msgid "Export CRL"
 msgstr ""
 
-#: src/usr/local/www/system_crlmanager.php:677
-#: src/usr/local/www/system_crlmanager.php:683
+#: src/usr/local/www/system_crlmanager.php:680
+#: src/usr/local/www/system_crlmanager.php:686
 msgid "Edit CRL"
 msgstr ""
 
-#: src/usr/local/www/system_crlmanager.php:689
+#: src/usr/local/www/system_crlmanager.php:692
 msgid "Delete CRL"
 msgstr ""
 
@@ -25396,7 +26742,7 @@ msgid "A valid gateway group name must be specified."
 msgstr ""
 
 #: src/usr/local/www/system_gateway_groups_edit.php:117
-#: src/usr/local/www/system_gateways_edit.php:149
+#: src/usr/local/www/system_gateways_edit.php:150
 msgid "The gateway name must not contain invalid characters."
 msgstr ""
 
@@ -25420,17 +26766,17 @@ msgstr ""
 msgid "No gateway(s) have been selected to be used in this group"
 msgstr ""
 
-#: src/usr/local/www/system_gateway_groups_edit.php:224
-msgid "Edit gateway group entry"
+#: src/usr/local/www/system_gateway_groups_edit.php:223
+msgid "Edit Gateway Group Entry"
 msgstr ""
 
-#: src/usr/local/www/system_gateway_groups_edit.php:260
+#: src/usr/local/www/system_gateway_groups_edit.php:235
 msgid "Gateway Priority"
 msgstr ""
 
-#: src/usr/local/www/system_gateway_groups_edit.php:271
-#: src/usr/local/www/system_gateway_groups_edit.php:274
-#: src/usr/local/www/system_gateway_groups_edit.php:284
+#: src/usr/local/www/system_gateway_groups_edit.php:275
+#: src/usr/local/www/system_gateway_groups_edit.php:278
+#: src/usr/local/www/system_gateway_groups_edit.php:311
 msgid "Tier"
 msgstr ""
 
@@ -25462,7 +26808,7 @@ msgid ""
 msgstr ""
 
 #: src/usr/local/www/system_gateways.php:120
-#: src/usr/local/www/system_gateways_edit.php:158
+#: src/usr/local/www/system_gateways_edit.php:159
 #, php-format
 msgid ""
 "Gateway \"%1$s\" cannot be disabled because it is in use on Gateway Group "
@@ -25477,7 +26823,7 @@ msgid ""
 msgstr ""
 
 #: src/usr/local/www/system_gateways.php:136
-#: src/usr/local/www/system_gateways_edit.php:170
+#: src/usr/local/www/system_gateways_edit.php:171
 #, php-format
 msgid ""
 "Gateway \"%1$s\" cannot be disabled because it is in use on Static Route "
@@ -25490,7 +26836,7 @@ msgid "Gateways: removed gateways %s"
 msgstr ""
 
 #: src/usr/local/www/system_gateways.php:279
-#: src/usr/local/www/system_gateways_edit.php:731
+#: src/usr/local/www/system_gateways_edit.php:672
 #: src/usr/local/www/widgets/widgets/gateways.widget.php:134
 msgid "Monitor IP"
 msgstr ""
@@ -25500,7 +26846,6 @@ msgid "This gateway is inactive because interface is missing"
 msgstr ""
 
 #: src/usr/local/www/system_gateways.php:324
-#: src/usr/local/www/system_gateways_edit.php:668
 msgid "Edit gateway"
 msgstr ""
 
@@ -25520,510 +26865,535 @@ msgstr ""
 msgid "Delete gateway"
 msgstr ""
 
-#: src/usr/local/www/system_gateways_edit.php:178
+#: src/usr/local/www/system_gateways_edit.php:179
 msgid "A valid gateway IP address must be specified."
 msgstr ""
 
-#: src/usr/local/www/system_gateways_edit.php:186
+#: src/usr/local/www/system_gateways_edit.php:187
 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:208
-#: src/usr/local/www/system_gateways_edit.php:239
+#: src/usr/local/www/system_gateways_edit.php:209
+#: src/usr/local/www/system_gateways_edit.php:240
 #, 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:217
+#: src/usr/local/www/system_gateways_edit.php:218
 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:247
+#: src/usr/local/www/system_gateways_edit.php:248
 msgid ""
 "Dynamic gateway values cannot be specified for interfaces with a static IPv4 "
 "configuration."
 msgstr ""
 
-#: src/usr/local/www/system_gateways_edit.php:252
+#: src/usr/local/www/system_gateways_edit.php:253
 msgid ""
 "Dynamic gateway values cannot be specified for interfaces with a static IPv6 "
 "configuration."
 msgstr ""
 
-#: src/usr/local/www/system_gateways_edit.php:257
+#: src/usr/local/www/system_gateways_edit.php:258
 msgid "A valid monitor IP address must be specified."
 msgstr ""
 
-#: src/usr/local/www/system_gateways_edit.php:262
+#: src/usr/local/www/system_gateways_edit.php:261
+msgid "A valid data payload must be specified."
+msgstr ""
+
+#: src/usr/local/www/system_gateways_edit.php:266
 #, 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:265
+#: src/usr/local/www/system_gateways_edit.php:269
 #, 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:271
+#: src/usr/local/www/system_gateways_edit.php:275
 #, 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:274
+#: src/usr/local/www/system_gateways_edit.php:278
 #, 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:283
+#: src/usr/local/www/system_gateways_edit.php:287
 msgid "Changing name on a gateway is not allowed."
 msgstr ""
 
-#: src/usr/local/www/system_gateways_edit.php:289
+#: src/usr/local/www/system_gateways_edit.php:293
 #, php-format
 msgid "The gateway name \"%s\" already exists."
 msgstr ""
 
-#: src/usr/local/www/system_gateways_edit.php:295
+#: src/usr/local/www/system_gateways_edit.php:299
 #, php-format
 msgid "The gateway IP address \"%s\" already exists."
 msgstr ""
 
-#: src/usr/local/www/system_gateways_edit.php:301
+#: src/usr/local/www/system_gateways_edit.php:305
 #, php-format
 msgid ""
 "The monitor IP address \"%s\" is already in use. You must choose a different "
 "monitor IP."
 msgstr ""
 
-#: src/usr/local/www/system_gateways_edit.php:311
+#: src/usr/local/www/system_gateways_edit.php:317
 msgid "The low latency threshold needs to be a numeric value."
 msgstr ""
 
-#: src/usr/local/www/system_gateways_edit.php:313
+#: src/usr/local/www/system_gateways_edit.php:319
 msgid "The low latency threshold needs to be positive."
 msgstr ""
 
-#: src/usr/local/www/system_gateways_edit.php:319
+#: src/usr/local/www/system_gateways_edit.php:328
 msgid "The high latency threshold needs to be a numeric value."
 msgstr ""
 
-#: src/usr/local/www/system_gateways_edit.php:321
+#: src/usr/local/www/system_gateways_edit.php:330
 msgid "The high latency threshold needs to be positive."
 msgstr ""
 
-#: src/usr/local/www/system_gateways_edit.php:327
+#: src/usr/local/www/system_gateways_edit.php:339
 msgid "The low Packet Loss threshold needs to be a numeric value."
 msgstr ""
 
-#: src/usr/local/www/system_gateways_edit.php:329
+#: src/usr/local/www/system_gateways_edit.php:341
 msgid "The low Packet Loss threshold needs to be positive."
 msgstr ""
 
-#: src/usr/local/www/system_gateways_edit.php:331
+#: src/usr/local/www/system_gateways_edit.php:343
 msgid "The low Packet Loss threshold needs to be less than 100."
 msgstr ""
 
-#: src/usr/local/www/system_gateways_edit.php:337
+#: src/usr/local/www/system_gateways_edit.php:352
 msgid "The high Packet Loss threshold needs to be a numeric value."
 msgstr ""
 
-#: src/usr/local/www/system_gateways_edit.php:339
+#: src/usr/local/www/system_gateways_edit.php:354
 msgid "The high Packet Loss threshold needs to be positive."
 msgstr ""
 
-#: src/usr/local/www/system_gateways_edit.php:341
+#: src/usr/local/www/system_gateways_edit.php:356
 msgid "The high Packet Loss threshold needs to be 100 or less."
 msgstr ""
 
-#: src/usr/local/www/system_gateways_edit.php:350
+#: src/usr/local/www/system_gateways_edit.php:365
 msgid ""
-"The high latency threshold needs to be higher than the low latency threshold"
+"The time period over which results are averaged needs to be a numeric value."
 msgstr ""
 
-#: src/usr/local/www/system_gateways_edit.php:373
-msgid ""
-"The high Packet Loss threshold needs to be higher than the low Packet Loss "
-"threshold"
+#: src/usr/local/www/system_gateways_edit.php:367
+msgid "The time period over which results are averaged needs to be positive."
 msgstr ""
 
-#: src/usr/local/www/system_gateways_edit.php:393
+#: src/usr/local/www/system_gateways_edit.php:376
 msgid "The probe interval needs to be a numeric value."
 msgstr ""
 
-#: src/usr/local/www/system_gateways_edit.php:395
+#: src/usr/local/www/system_gateways_edit.php:378
 msgid "The probe interval needs to be positive."
 msgstr ""
 
-#: src/usr/local/www/system_gateways_edit.php:401
+#: src/usr/local/www/system_gateways_edit.php:387
 msgid "The loss interval needs to be a numeric value."
 msgstr ""
 
-#: src/usr/local/www/system_gateways_edit.php:403
+#: src/usr/local/www/system_gateways_edit.php:389
 msgid "The loss interval setting needs to be positive."
 msgstr ""
 
-#: src/usr/local/www/system_gateways_edit.php:413
-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:419
-#, php-format
-msgid ""
-"The high latency threshold needs to be less than or equal to the default "
-"loss interval (%d)"
+#: src/usr/local/www/system_gateways_edit.php:398
+msgid "The alert interval needs to be a numeric value."
 msgstr ""
 
-#: src/usr/local/www/system_gateways_edit.php:426
-#, php-format
-msgid ""
-"The loss interval needs to be greater than or equal to the default high "
-"latency threshold (%d)"
+#: src/usr/local/www/system_gateways_edit.php:400
+msgid "The alert interval setting needs to be positive."
 msgstr ""
 
-#: src/usr/local/www/system_gateways_edit.php:433
+#: src/usr/local/www/system_gateways_edit.php:408
 msgid ""
-"The time period over which results are averaged needs to be a numeric value."
-msgstr ""
-
-#: src/usr/local/www/system_gateways_edit.php:435
-msgid "The time period over which results are averaged needs to be positive."
+"The high latency threshold needs to be greater than the low latency threshold"
 msgstr ""
 
-#: src/usr/local/www/system_gateways_edit.php:445
+#: src/usr/local/www/system_gateways_edit.php:413
 msgid ""
-"The time period over which results are averaged needs to be at least twice "
-"the probe interval."
+"The high packet loss threshold needs to be higher than the low packet loss "
+"threshold"
 msgstr ""
 
-#: src/usr/local/www/system_gateways_edit.php:451
-#, php-format
+#: src/usr/local/www/system_gateways_edit.php:419
 msgid ""
-"The probe interval needs to be half or less than the default time period "
-"over which results are averaged (%d)"
+"The loss interval needs to be greater than or equal to the high latency "
+"threshold."
 msgstr ""
 
-#: src/usr/local/www/system_gateways_edit.php:458
-#, php-format
+#: src/usr/local/www/system_gateways_edit.php:424
 msgid ""
-"The time period over which results are averaged needs to be at least twice "
-"the default probe interval (%d)"
-msgstr ""
-
-#: src/usr/local/www/system_gateways_edit.php:465
-msgid "The alert interval needs to be a numeric value."
+"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:467
-msgid "The alert interval needs to be positive."
-msgstr ""
-
-#: src/usr/local/www/system_gateways_edit.php:477
+#: src/usr/local/www/system_gateways_edit.php:430
 msgid ""
 "The alert interval needs to be greater than or equal to the probe interval."
 msgstr ""
 
-#: src/usr/local/www/system_gateways_edit.php:483
-#, php-format
-msgid ""
-"The probe interval needs to be less than or equal to the default alert "
-"interval (%d)"
-msgstr ""
-
-#: src/usr/local/www/system_gateways_edit.php:490
-#, php-format
-msgid ""
-"The alert interval needs to be greater than or equal to the default probe "
-"interval (%d)"
+#: src/usr/local/www/system_gateways_edit.php:609
+msgid "Edit Gateway"
 msgstr ""
 
-#: src/usr/local/www/system_gateways_edit.php:675
+#: src/usr/local/www/system_gateways_edit.php:616
 msgid ""
 "Set this option to disable this gateway without removing it from the list."
 msgstr ""
 
-#: src/usr/local/www/system_gateways_edit.php:683
+#: src/usr/local/www/system_gateways_edit.php:624
 msgid "Choose which interface this gateway applies to."
 msgstr ""
 
-#: src/usr/local/www/system_gateways_edit.php:693
+#: src/usr/local/www/system_gateways_edit.php:634
 msgid "Choose the Internet Protocol this gateway uses."
 msgstr ""
 
-#: src/usr/local/www/system_gateways_edit.php:709
+#: src/usr/local/www/system_gateways_edit.php:650
 msgid "Gateway IP address"
 msgstr ""
 
-#: src/usr/local/www/system_gateways_edit.php:719
+#: src/usr/local/www/system_gateways_edit.php:660
 msgid "Default Gateway"
 msgstr ""
 
-#: src/usr/local/www/system_gateways_edit.php:729
+#: src/usr/local/www/system_gateways_edit.php:670
 msgid "This will consider this gateway as always being up"
 msgstr ""
 
-#: src/usr/local/www/system_gateways_edit.php:742
+#: src/usr/local/www/system_gateways_edit.php:683
 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:750
+#: src/usr/local/www/system_gateways_edit.php:691
 msgid "Force state"
 msgstr ""
 
-#: src/usr/local/www/system_gateways_edit.php:753
+#: src/usr/local/www/system_gateways_edit.php:694
 msgid "This will force this gateway to be considered Down"
 msgstr ""
 
-#: src/usr/local/www/system_gateways_edit.php:803
+#: src/usr/local/www/system_gateways_edit.php:744
 msgid "Weight for this gateway when used in a Gateway Group."
 msgstr ""
 
-#: src/usr/local/www/system_gateways_edit.php:805
+#: src/usr/local/www/system_gateways_edit.php:748
+msgid "Data Payload"
+msgstr ""
+
+#: src/usr/local/www/system_gateways_edit.php:752
+msgid "Define data payload to send on ICMP packets to gateway monitor IP."
+msgstr ""
+
+#: src/usr/local/www/system_gateways_edit.php:754
 msgid "Latency thresholds"
 msgstr ""
 
-#: src/usr/local/www/system_gateways_edit.php:820
+#: src/usr/local/www/system_gateways_edit.php:769
 #, 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:825
+#: src/usr/local/www/system_gateways_edit.php:774
 msgid "Packet Loss thresholds"
 msgstr ""
 
-#: src/usr/local/www/system_gateways_edit.php:840
+#: src/usr/local/www/system_gateways_edit.php:789
 #, 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:846
+#: src/usr/local/www/system_gateways_edit.php:795
 msgid "Probe Interval"
 msgstr ""
 
-#: src/usr/local/www/system_gateways_edit.php:853
+#: src/usr/local/www/system_gateways_edit.php:802
 #, php-format
-msgid ""
-"How often an ICMP probe will be sent in milliseconds. Default is %d. NOTE: "
-"The quality graph is averaged over seconds, not intervals, so as the probe "
-"interval is increased the accuracy of the quality graph is decreased."
+msgid "How often an ICMP probe will be sent in milliseconds. Default is %d."
 msgstr ""
 
-#: src/usr/local/www/system_gateways_edit.php:860
+#: src/usr/local/www/system_gateways_edit.php:806
 msgid "Loss Interval"
 msgstr ""
 
-#: src/usr/local/www/system_gateways_edit.php:864
+#: src/usr/local/www/system_gateways_edit.php:810
 #, 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:867
+#: src/usr/local/www/system_gateways_edit.php:813
 msgid "Time Period"
 msgstr ""
 
-#: src/usr/local/www/system_gateways_edit.php:877
+#: src/usr/local/www/system_gateways_edit.php:823
 #, php-format
 msgid ""
 "Time period in milliseconds over which results are averaged. Default is %d."
 msgstr ""
 
-#: src/usr/local/www/system_gateways_edit.php:881
+#: src/usr/local/www/system_gateways_edit.php:827
 msgid "Alert interval"
 msgstr ""
 
-#: src/usr/local/www/system_gateways_edit.php:891
+#: src/usr/local/www/system_gateways_edit.php:837
 #, 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:896
+#: src/usr/local/www/system_gateways_edit.php:842
 msgid "Additional information"
 msgstr ""
 
-#: src/usr/local/www/system_gateways_edit.php:898
+#: src/usr/local/www/system_gateways_edit.php:844
 msgid ""
-"The time period over which results are averaged must be at least twice the "
-"probe interval, otherwise the averaging would only \"average\" over a single "
-"probe."
+"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:901
+#: src/usr/local/www/system_gateways_edit.php:848
 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."
+"A longer time period will 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:851
+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:855
+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:859
+msgid "&nbsp &nbsp 100 * probe interval / (time period - loss interval)"
+msgstr ""
+
+#: src/usr/local/www/system_gateways_edit.php:861
+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:864
+msgid ""
+"The default settings are recommended for most use cases. However if you "
+"change the settings, please observe the following restrictions:"
+msgstr ""
+
+#: src/usr/local/www/system_gateways_edit.php:867
+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:904
+#: src/usr/local/www/system_gateways_edit.php:870
 msgid ""
-"The loss interval must be greater than or equal to the high latency "
-"threshold. Otherwise high latency packets would always be considered as lost."
+"- 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:907
+#: src/usr/local/www/system_gateways_edit.php:873
 msgid ""
-"Choose a combination of parameters to suit your needs. For example, a short "
-"probe interval will give more probes and (hopefully) a statistically more "
-"stable average. A higher loss interval will allow the system to wait longer "
-"for probes on high-latency links, and thus allow a better estimate of high-"
-"latency versus loss."
+"- The loss interval must be greater than or equal to the high latency "
+"threshold."
 msgstr ""
 
-#: src/usr/local/www/system_gateways_edit.php:917
+#: src/usr/local/www/system_gateways_edit.php:879
 msgid "Use non-local gateway"
 msgstr ""
 
-#: src/usr/local/www/system_gateways_edit.php:920
+#: src/usr/local/www/system_gateways_edit.php:882
 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 "
 "scenarios."
 msgstr ""
 
-#: src/usr/local/www/system_groupmanager.php:102
-#: src/usr/local/www/vpn_ipsec_mobile.php:696
-#: src/usr/local/www/vpn_ipsec_mobile.php:705
-msgid "Group"
-msgstr ""
-
-#: src/usr/local/www/system_groupmanager.php:103
-#: src/usr/local/www/system_groupmanager.php:128
-#: src/usr/local/www/system_usermanager.php:122
-msgid "successfully deleted"
+#: src/usr/local/www/system_groupmanager.php:114
+#, php-format
+msgid "Group %s successfully deleted."
 msgstr ""
 
-#: src/usr/local/www/system_groupmanager.php:127
-msgid "Privilege"
+#: src/usr/local/www/system_groupmanager.php:138
+#, php-format
+msgid "Privilege %s successfully deleted."
 msgstr ""
 
-#: src/usr/local/www/system_groupmanager.php:155
-msgid "Selected groups removed successfully!"
+#: src/usr/local/www/system_groupmanager.php:165
+msgid "Selected groups removed successfully."
 msgstr ""
 
-#: src/usr/local/www/system_groupmanager.php:171
+#: src/usr/local/www/system_groupmanager.php:181
 msgid "The group name contains invalid characters."
 msgstr ""
 
-#: src/usr/local/www/system_groupmanager.php:175
+#: src/usr/local/www/system_groupmanager.php:185
 msgid "The group name is longer than 16 characters."
 msgstr ""
 
-#: src/usr/local/www/system_groupmanager.php:182
+#: src/usr/local/www/system_groupmanager.php:192
 msgid "Another entry with the same group name already exists."
 msgstr ""
 
-#: src/usr/local/www/system_groupmanager.php:246
+#: src/usr/local/www/system_groupmanager.php:258
 #: src/usr/local/www/system_usermanager.php:399
 msgid "Delete Privilege"
 msgstr ""
 
-#: src/usr/local/www/system_groupmanager.php:287
-#: src/usr/local/www/system_groupmanager.php:375
+#: src/usr/local/www/system_groupmanager.php:304
+#: src/usr/local/www/system_groupmanager.php:392
 msgid "Group name"
 msgstr ""
 
-#: src/usr/local/www/system_groupmanager.php:289
+#: src/usr/local/www/system_groupmanager.php:306
 msgid "Member Count"
 msgstr ""
 
-#: src/usr/local/www/system_groupmanager.php:364
-msgid "Group properties"
+#: src/usr/local/www/system_groupmanager.php:381
+msgid "Group Properties"
 msgstr ""
 
-#: src/usr/local/www/system_groupmanager.php:368
-#: src/usr/local/www/system_usermanager.php:605
+#: src/usr/local/www/system_groupmanager.php:385
+#: src/usr/local/www/system_usermanager.php:607
 msgid "Defined by"
 msgstr ""
 
-#: src/usr/local/www/system_groupmanager.php:389
+#: src/usr/local/www/system_groupmanager.php:406
 msgid "Group description, for your own information only"
 msgstr ""
 
-#: src/usr/local/www/system_groupmanager.php:395
-#: src/usr/local/www/system_usermanager.php:675
+#: src/usr/local/www/system_groupmanager.php:412
+#: src/usr/local/www/system_usermanager.php:677
 msgid "Group membership"
 msgstr ""
 
-#: src/usr/local/www/system_groupmanager.php:416
+#: src/usr/local/www/system_groupmanager.php:433
 msgid "Not members"
 msgstr ""
 
-#: src/usr/local/www/system_groupmanager.php:432
+#: src/usr/local/www/system_groupmanager.php:449
 msgid "Move to \"Members\" >"
 msgstr ""
 
-#: src/usr/local/www/system_groupmanager.php:437
+#: src/usr/local/www/system_groupmanager.php:454
 msgid "< Move to \"Not members"
 msgstr ""
 
-#: src/usr/local/www/system_groupmanager.php:440
-#: src/usr/local/www/system_usermanager.php:724
+#: src/usr/local/www/system_groupmanager.php:457
+#: src/usr/local/www/system_usermanager.php:726
 msgid "Hold down CTRL (pc)/COMMAND (mac) key to select multiple items"
 msgstr ""
 
-#: src/usr/local/www/system_groupmanager.php:446
+#: src/usr/local/www/system_groupmanager.php:463
 msgid "Assigned Privileges"
 msgstr ""
 
-#: src/usr/local/www/system_groupmanager_addprivs.php:83
+#: src/usr/local/www/system_groupmanager_addprivs.php:69
 #: src/usr/local/www/system_usermanager_addprivs.php:70
 msgid "Add Privileges"
 msgstr ""
 
-#: src/usr/local/www/system_groupmanager_addprivs.php:110
-#: src/usr/local/www/system_usermanager_addprivs.php:103
+#: src/usr/local/www/system_groupmanager_addprivs.php:100
+#: src/usr/local/www/system_usermanager_addprivs.php:104
 msgid "Selected privileges"
 msgstr ""
 
-#: src/usr/local/www/system_groupmanager_addprivs.php:199
-msgid "Add privileges for "
+#: src/usr/local/www/system_groupmanager_addprivs.php:187
+msgid "Add Privileges for "
 msgstr ""
 
-#: src/usr/local/www/system_groupmanager_addprivs.php:206
-#: src/usr/local/www/system_usermanager_addprivs.php:183
+#: src/usr/local/www/system_groupmanager_addprivs.php:191
+#: src/usr/local/www/system_usermanager_addprivs.php:184
 msgid "Assigned privileges"
 msgstr ""
 
-#: src/usr/local/www/system_groupmanager_addprivs.php:210
+#: src/usr/local/www/system_groupmanager_addprivs.php:196
 msgid "Hold down CTRL (PC)/COMMAND (Mac) key to select multiple items."
 msgstr ""
 
+#: src/usr/local/www/system_groupmanager_addprivs.php:200
+#: src/usr/local/www/system_usermanager_addprivs.php:193
+msgid "Shadow"
+msgstr ""
+
+#: src/usr/local/www/system_groupmanager_addprivs.php:205
+#: src/usr/local/www/system_usermanager_addprivs.php:189
+#: src/usr/local/www/system_usermanager_addprivs.php:198
+msgid "Hold down CTRL (PC)/COMMAND (Mac) key to select multiple items"
+msgstr ""
+
+#: src/usr/local/www/system_groupmanager_addprivs.php:212
+#: src/usr/local/www/system_usermanager_addprivs.php:205
+msgid "Show only the choices containing this term"
+msgstr ""
+
+#: src/usr/local/www/system_groupmanager_addprivs.php:240
+#: src/usr/local/www/system_usermanager_addprivs.php:243
+msgid "Select a privilege from the list above for a description"
+msgstr ""
+
 #: src/usr/local/www/system_hasync.php:108
-#: src/usr/local/www/vpn_openvpn_client.php:279
-#: src/usr/local/www/vpn_openvpn_client.php:343
+#: src/usr/local/www/vpn_openvpn_client.php:276
+#: src/usr/local/www/vpn_openvpn_client.php:340
 msgid "Password and confirmation must match."
 msgstr ""
 
-#: src/usr/local/www/system_hasync.php:131
+#: src/usr/local/www/system_hasync.php:113
+msgid "pfsync Synchronize Peer IP must be an IPv4 IP."
+msgstr ""
+
+#: src/usr/local/www/system_hasync.php:137
 msgid "High Availability Sync"
 msgstr ""
 
-#: src/usr/local/www/system_hasync.php:148
+#: src/usr/local/www/system_hasync.php:154
 msgid "State Synchronization Settings (pfsync)"
 msgstr ""
 
-#: src/usr/local/www/system_hasync.php:152
+#: src/usr/local/www/system_hasync.php:158
 msgid "Synchronize states"
 msgstr ""
 
-#: src/usr/local/www/system_hasync.php:156
+#: src/usr/local/www/system_hasync.php:162
 msgid ""
 "Each firewall sends these messages out via multicast on a specified "
 "interface, using the PFSYNC protocol (IP Protocol 240). It also listens on "
@@ -26034,11 +27404,11 @@ msgid ""
 "Settings below)"
 msgstr ""
 
-#: src/usr/local/www/system_hasync.php:163
+#: src/usr/local/www/system_hasync.php:169
 msgid "Synchronize Interface"
 msgstr ""
 
-#: src/usr/local/www/system_hasync.php:166
+#: src/usr/local/www/system_hasync.php:172
 msgid ""
 "If Synchronize States is enabled this interface will be used for "
 "communication.<br />We recommend setting this to an interface other than "
@@ -26047,25 +27417,25 @@ msgid ""
 "assigned to the interface on any participating sync nodes."
 msgstr ""
 
-#: src/usr/local/www/system_hasync.php:173
+#: src/usr/local/www/system_hasync.php:179
 msgid "pfsync Synchronize Peer IP"
 msgstr ""
 
-#: src/usr/local/www/system_hasync.php:177
+#: src/usr/local/www/system_hasync.php:183
 msgid ""
 "Setting this option will force pfsync to synchronize its state table to this "
 "IP address. The default is directed multicast."
 msgstr ""
 
-#: src/usr/local/www/system_hasync.php:181
+#: src/usr/local/www/system_hasync.php:187
 msgid "Configuration Synchronization Settings (XMLRPC Sync)"
 msgstr ""
 
-#: src/usr/local/www/system_hasync.php:185
+#: src/usr/local/www/system_hasync.php:191
 msgid "Synchronize Config to IP"
 msgstr ""
 
-#: src/usr/local/www/system_hasync.php:189
+#: src/usr/local/www/system_hasync.php:195
 msgid ""
 "Enter the IP address of the firewall to which the selected configuration "
 "sections should be synchronized.<br /><br />XMLRPC sync is currently only "
@@ -26075,101 +27445,101 @@ msgid ""
 "members!"
 msgstr ""
 
-#: src/usr/local/www/system_hasync.php:195
+#: src/usr/local/www/system_hasync.php:201
 msgid "Remote System Username"
 msgstr ""
 
-#: src/usr/local/www/system_hasync.php:198
+#: src/usr/local/www/system_hasync.php:204
 msgid ""
 "Enter the webConfigurator username of the system entered above for "
 "synchronizing your configuration.<br />Do not use the Synchronize Config to "
 "IP and username option on backup cluster members!"
 msgstr ""
 
-#: src/usr/local/www/system_hasync.php:203
+#: src/usr/local/www/system_hasync.php:209
 msgid "Remote System Password"
 msgstr ""
 
-#: src/usr/local/www/system_hasync.php:206
+#: src/usr/local/www/system_hasync.php:212
 msgid ""
 "Enter the webConfigurator password of the system entered above for "
 "synchronizing your configuration.<br />Do not use the Synchronize Config to "
 "IP and password option on backup cluster members!"
 msgstr ""
 
-#: src/usr/local/www/system_hasync.php:209
+#: src/usr/local/www/system_hasync.php:215
 msgid "Select options to sync"
 msgstr ""
 
-#: src/usr/local/www/system_hasync.php:213
+#: src/usr/local/www/system_hasync.php:219
 msgid "Synchronize Users and Groups"
 msgstr ""
 
-#: src/usr/local/www/system_hasync.php:221
+#: src/usr/local/www/system_hasync.php:227
 msgid "Synchronize Auth Servers"
 msgstr ""
 
-#: src/usr/local/www/system_hasync.php:229
+#: src/usr/local/www/system_hasync.php:235
 msgid "Synchronize Certificates"
 msgstr ""
 
-#: src/usr/local/www/system_hasync.php:237
+#: src/usr/local/www/system_hasync.php:243
 msgid "Synchronize Rules"
 msgstr ""
 
-#: src/usr/local/www/system_hasync.php:245
+#: src/usr/local/www/system_hasync.php:251
 msgid "Synchronize Firewall schedules"
 msgstr ""
 
-#: src/usr/local/www/system_hasync.php:253
+#: src/usr/local/www/system_hasync.php:259
 msgid "Synchronize Firewall aliases"
 msgstr ""
 
-#: src/usr/local/www/system_hasync.php:261
+#: src/usr/local/www/system_hasync.php:267
 msgid "Synchronize NAT"
 msgstr ""
 
-#: src/usr/local/www/system_hasync.php:269
+#: src/usr/local/www/system_hasync.php:275
 msgid "Synchronize IPsec"
 msgstr ""
 
-#: src/usr/local/www/system_hasync.php:277
+#: src/usr/local/www/system_hasync.php:283
 msgid "Synchronize OpenVPN"
 msgstr ""
 
-#: src/usr/local/www/system_hasync.php:285
+#: src/usr/local/www/system_hasync.php:291
 msgid "Synchronize DHCPD"
 msgstr ""
 
-#: src/usr/local/www/system_hasync.php:293
-msgid "Synchronize Wake on LAN"
+#: src/usr/local/www/system_hasync.php:299
+msgid "Synchronize Wake-on-LAN"
 msgstr ""
 
-#: src/usr/local/www/system_hasync.php:301
+#: src/usr/local/www/system_hasync.php:307
 msgid "Synchronize Static Routes"
 msgstr ""
 
-#: src/usr/local/www/system_hasync.php:309
+#: src/usr/local/www/system_hasync.php:315
 msgid "Synchronize Load Balancer"
 msgstr ""
 
-#: src/usr/local/www/system_hasync.php:317
+#: src/usr/local/www/system_hasync.php:323
 msgid "Synchronize Virtual IPs"
 msgstr ""
 
-#: src/usr/local/www/system_hasync.php:325
+#: src/usr/local/www/system_hasync.php:331
 msgid "Synchronize traffic shaper (queues)"
 msgstr ""
 
-#: src/usr/local/www/system_hasync.php:333
+#: src/usr/local/www/system_hasync.php:339
 msgid "Synchronize traffic shaper (limiter)"
 msgstr ""
 
-#: src/usr/local/www/system_hasync.php:341
+#: src/usr/local/www/system_hasync.php:347
 msgid "Synchronize DNS (Forwarder/Resolver)"
 msgstr ""
 
-#: src/usr/local/www/system_hasync.php:349
+#: src/usr/local/www/system_hasync.php:355
 msgid "Synchronize Captive Portal)"
 msgstr ""
 
@@ -26266,7 +27636,7 @@ msgid "This network conflicts with address configured on interface %s."
 msgstr ""
 
 #: src/usr/local/www/system_routes_edit.php:276
-msgid "Edit route entry"
+msgid "Edit Route Entry"
 msgstr ""
 
 #: src/usr/local/www/system_routes_edit.php:282
@@ -26350,50 +27720,53 @@ msgid ""
 "master)<br />Note: Sync will not be performed if a branch is not specified"
 msgstr ""
 
-#: src/usr/local/www/system_usermanager.php:146
-msgid "Selected users removed successfully!"
+#: src/usr/local/www/system_usermanager.php:119
+#, php-format
+msgid "User %s successfully deleted."
 msgstr ""
 
-#: src/usr/local/www/system_usermanager.php:163
-msgid "association removed."
+#: src/usr/local/www/system_usermanager.php:143
+msgid "Selected users removed successfully."
 msgstr ""
 
-#: src/usr/local/www/system_usermanager.php:172
-msgid "Privilege "
+#: src/usr/local/www/system_usermanager.php:160
+#, php-format
+msgid "Certificate %s association removed."
 msgstr ""
 
-#: src/usr/local/www/system_usermanager.php:172
-msgid " removed"
+#: src/usr/local/www/system_usermanager.php:169
+#, php-format
+msgid "Privilege %s removed."
 msgstr ""
 
-#: src/usr/local/www/system_usermanager.php:208
+#: src/usr/local/www/system_usermanager.php:205
 msgid "The username is longer than 16 characters."
 msgstr ""
 
-#: src/usr/local/www/system_usermanager.php:212
+#: src/usr/local/www/system_usermanager.php:209
 #: src/usr/local/www/system_usermanager_passwordmg.php:78
 #: src/usr/local/www/vpn_l2tp_users_edit.php:125
 msgid "The passwords do not match."
 msgstr ""
 
-#: src/usr/local/www/system_usermanager.php:216
+#: src/usr/local/www/system_usermanager.php:213
 msgid "IPsec Pre-Shared Key contains invalid characters."
 msgstr ""
 
-#: src/usr/local/www/system_usermanager.php:228
+#: src/usr/local/www/system_usermanager.php:225
 #: src/usr/local/www/vpn_l2tp_users_edit.php:135
 msgid "Another entry with the same username already exists."
 msgstr ""
 
-#: src/usr/local/www/system_usermanager.php:239
+#: src/usr/local/www/system_usermanager.php:236
 msgid "That username is reserved by the system."
 msgstr ""
 
-#: src/usr/local/www/system_usermanager.php:259
+#: src/usr/local/www/system_usermanager.php:256
 msgid "Invalid expiration date format; use MM/DD/YYYY instead."
 msgstr ""
 
-#: src/usr/local/www/system_usermanager.php:266
+#: src/usr/local/www/system_usermanager.php:263
 msgid "Invalid internal Certificate Authority"
 msgstr ""
 
@@ -26409,117 +27782,112 @@ msgstr ""
 msgid "Remove this certificate association? (Certificate will not be deleted)"
 msgstr ""
 
-#: src/usr/local/www/system_usermanager.php:496
-#: src/usr/local/www/system_usermanager.php:657
+#: src/usr/local/www/system_usermanager.php:501
+#: src/usr/local/www/system_usermanager.php:659
 msgid "Full name"
 msgstr ""
 
-#: src/usr/local/www/system_usermanager.php:525
-#: src/usr/local/www/vpn_ipsec_keys.php:169
+#: src/usr/local/www/system_usermanager.php:530
+#: src/usr/local/www/vpn_ipsec_keys.php:164
 #: src/usr/local/www/vpn_l2tp_users.php:145
 msgid "Edit user"
 msgstr ""
 
-#: src/usr/local/www/system_usermanager.php:527
+#: src/usr/local/www/system_usermanager.php:532
 #: src/usr/local/www/vpn_l2tp_users.php:146
 msgid "Delete user"
 msgstr ""
 
-#: src/usr/local/www/system_usermanager.php:543
+#: src/usr/local/www/system_usermanager.php:548
 msgid "Delete selected users"
 msgstr ""
 
-#: src/usr/local/www/system_usermanager.php:551
+#: src/usr/local/www/system_usermanager.php:556
 msgid ""
 "Additional users can be added here. User permissions for accessing the "
 "webConfigurator can be assigned directly or inherited from group "
-"memberships. An icon that appears grey indicates that it is a system defined "
-"object. Some system object properties can be modified but they cannot be "
-"deleted."
+"memberships. Some system object properties can be modified but they cannot "
+"be deleted."
 msgstr ""
 
-#: src/usr/local/www/system_usermanager.php:556
+#: src/usr/local/www/system_usermanager.php:559
 msgid ""
 "Accounts added here are also used for other parts of the system such as "
 "OpenVPN, IPsec, and Captive Portal."
 msgstr ""
 
-#: src/usr/local/www/system_usermanager.php:602
+#: src/usr/local/www/system_usermanager.php:604
 msgid "User Properties"
 msgstr ""
 
-#: src/usr/local/www/system_usermanager.php:649
+#: src/usr/local/www/system_usermanager.php:651
 msgid "Confirm Password"
 msgstr ""
 
-#: src/usr/local/www/system_usermanager.php:660
+#: src/usr/local/www/system_usermanager.php:662
 msgid "User's full name, for your own information only"
 msgstr ""
 
-#: src/usr/local/www/system_usermanager.php:668
+#: src/usr/local/www/system_usermanager.php:670
 msgid "Expiration date"
 msgstr ""
 
-#: src/usr/local/www/system_usermanager.php:671
+#: src/usr/local/www/system_usermanager.php:673
 msgid ""
 "Leave blank if the account shouldn't expire, otherwise enter the expiration "
 "date"
 msgstr ""
 
-#: src/usr/local/www/system_usermanager.php:700
+#: src/usr/local/www/system_usermanager.php:702
 msgid "Not member of"
 msgstr ""
 
-#: src/usr/local/www/system_usermanager.php:708
+#: src/usr/local/www/system_usermanager.php:710
 msgid "Member of"
 msgstr ""
 
-#: src/usr/local/www/system_usermanager.php:716
+#: src/usr/local/www/system_usermanager.php:718
 msgid "Move to \"Member of\" list >"
 msgstr ""
 
-#: src/usr/local/www/system_usermanager.php:721
+#: src/usr/local/www/system_usermanager.php:723
 msgid "< Move to \"Not member of\" list"
 msgstr ""
 
-#: src/usr/local/www/system_usermanager.php:744
+#: src/usr/local/www/system_usermanager.php:746
 msgid "Effective Privileges"
 msgstr ""
 
-#: src/usr/local/www/system_usermanager.php:754
-msgid "User certificates"
+#: src/usr/local/www/system_usermanager.php:756
+msgid "User Certificates"
 msgstr ""
 
-#: src/usr/local/www/system_usermanager.php:766
-msgid "Create certificate for user"
+#: src/usr/local/www/system_usermanager.php:768
+msgid "Create Certificate for User"
 msgstr ""
 
-#: src/usr/local/www/system_usermanager.php:818
+#: src/usr/local/www/system_usermanager.php:820
 msgid "Keys"
 msgstr ""
 
-#: src/usr/local/www/system_usermanager.php:822
+#: src/usr/local/www/system_usermanager.php:824
 msgid "Authorized keys"
 msgstr ""
 
-#: src/usr/local/www/system_usermanager.php:829
+#: src/usr/local/www/system_usermanager.php:831
 msgid "Authorized SSH Keys"
 msgstr ""
 
-#: src/usr/local/www/system_usermanager.php:831
+#: src/usr/local/www/system_usermanager.php:833
 msgid "Enter authorized SSH keys for this user"
 msgstr ""
 
-#: src/usr/local/www/system_usermanager.php:835
+#: src/usr/local/www/system_usermanager.php:837
 msgid "IPsec Pre-Shared Key"
 msgstr ""
 
-#: src/usr/local/www/system_usermanager_addprivs.php:179
-msgid "User privileges"
-msgstr ""
-
-#: src/usr/local/www/system_usermanager_addprivs.php:188
-msgid "Hold down CTRL (PC)/COMMAND (Mac) key to select multiple items"
+#: src/usr/local/www/system_usermanager_addprivs.php:180
+msgid "User Privileges"
 msgstr ""
 
 #: src/usr/local/www/system_usermanager_passwordmg.php:67
@@ -26527,7 +27895,7 @@ msgid "User Password"
 msgstr ""
 
 #: src/usr/local/www/system_usermanager_passwordmg.php:95
-msgid "Password successfully changed"
+msgid "Password successfully changed."
 msgstr ""
 
 #: src/usr/local/www/system_usermanager_passwordmg.php:124
@@ -26559,7 +27927,7 @@ msgstr ""
 #: src/usr/local/www/system_usermanager_settings.php:101
 msgid ""
 "Settings have been saved, but the test was not performed because it is "
-"supported only for ldap based backends."
+"supported only for LDAP based backends."
 msgstr ""
 
 #: src/usr/local/www/system_usermanager_settings.php:137
@@ -26601,15 +27969,25 @@ msgid "Testing %s LDAP settings... One moment please..."
 msgstr ""
 
 #: src/usr/local/www/system_usermanager_settings_test.php:93
-msgid "Attempting connection to"
+#, php-format
+msgid "Attempting connection to %s%s%s"
+msgstr ""
+
+#: src/usr/local/www/system_usermanager_settings_test.php:95
+#: src/usr/local/www/system_usermanager_settings_test.php:99
+#: src/usr/local/www/system_usermanager_settings_test.php:104
+#: src/usr/local/www/uploadconfig.php:82
+msgid "OK"
 msgstr ""
 
 #: src/usr/local/www/system_usermanager_settings_test.php:97
-msgid "Attempting bind to"
+#, php-format
+msgid "Attempting bind to %s%s%s"
 msgstr ""
 
 #: src/usr/local/www/system_usermanager_settings_test.php:101
-msgid "Attempting to fetch Organizational Units from"
+#, php-format
+msgid "Attempting to fetch Organizational Units from %s%s%s"
 msgstr ""
 
 #: src/usr/local/www/system_usermanager_settings_test.php:108
@@ -26622,12 +28000,12 @@ msgstr ""
 msgid "failed"
 msgstr ""
 
-#: src/usr/local/www/uploadconfig.php:76
-msgid "ERR Could not save configuration."
+#: src/usr/local/www/system_usermanager_settings_test.php:133
+msgid "Return"
 msgstr ""
 
-#: src/usr/local/www/uploadconfig.php:82
-msgid "OK"
+#: src/usr/local/www/uploadconfig.php:76
+msgid "ERR Could not save configuration."
 msgstr ""
 
 #: src/usr/local/www/uploadconfig.php:85
@@ -26639,192 +28017,187 @@ msgid "ERR Invalid configuration received."
 msgstr ""
 
 #: src/usr/local/www/vpn_ipsec.php:252 src/usr/local/www/vpn_ipsec.php:258
-#: src/usr/local/www/vpn_ipsec_keys.php:124
+#: src/usr/local/www/vpn_ipsec_keys.php:119
 #: src/usr/local/www/vpn_ipsec_mobile.php:456
-#: src/usr/local/www/vpn_ipsec_phase1.php:654
+#: src/usr/local/www/vpn_ipsec_phase1.php:667
+#: src/usr/local/www/vpn_ipsec_phase1.php:680
+#: src/usr/local/www/vpn_ipsec_phase2.php:444
 #: src/usr/local/www/vpn_ipsec_phase2.php:523
 #: src/usr/local/www/vpn_ipsec_settings.php:266
 #: src/usr/local/www/widgets/widgets/ipsec.widget.php:206
 msgid "Tunnels"
 msgstr ""
 
-#: src/usr/local/www/vpn_ipsec.php:259 src/usr/local/www/vpn_ipsec_keys.php:125
+#: src/usr/local/www/vpn_ipsec.php:259 src/usr/local/www/vpn_ipsec_keys.php:120
 #: src/usr/local/www/vpn_ipsec_mobile.php:339
 #: src/usr/local/www/vpn_ipsec_mobile.php:457
-#: src/usr/local/www/vpn_ipsec_phase1.php:655
+#: src/usr/local/www/vpn_ipsec_phase1.php:664
+#: src/usr/local/www/vpn_ipsec_phase1.php:681
+#: src/usr/local/www/vpn_ipsec_phase2.php:441
 #: src/usr/local/www/vpn_ipsec_phase2.php:524
 #: src/usr/local/www/vpn_ipsec_settings.php:267
 msgid "Mobile Clients"
 msgstr ""
 
 #: src/usr/local/www/vpn_ipsec.php:260 src/usr/local/www/vpn_ipsec_keys.php:105
-#: src/usr/local/www/vpn_ipsec_keys.php:126
-#: src/usr/local/www/vpn_ipsec_keys.php:132
+#: src/usr/local/www/vpn_ipsec_keys.php:121
+#: src/usr/local/www/vpn_ipsec_keys.php:127
+#: src/usr/local/www/vpn_ipsec_keys_edit.php:155
 #: src/usr/local/www/vpn_ipsec_mobile.php:458
-#: src/usr/local/www/vpn_ipsec_phase1.php:656
+#: src/usr/local/www/vpn_ipsec_phase1.php:682
 #: src/usr/local/www/vpn_ipsec_phase2.php:525
 #: src/usr/local/www/vpn_ipsec_settings.php:268
 msgid "Pre-Shared Keys"
 msgstr ""
 
-#: src/usr/local/www/vpn_ipsec.php:261 src/usr/local/www/vpn_ipsec_keys.php:127
-#: src/usr/local/www/vpn_ipsec_mobile.php:459
-#: src/usr/local/www/vpn_ipsec_phase1.php:657
-#: src/usr/local/www/vpn_ipsec_phase2.php:526
-#: src/usr/local/www/vpn_ipsec_settings.php:236
-#: src/usr/local/www/vpn_ipsec_settings.php:269
-msgid "Advanced Settings"
-msgstr ""
-
-#: src/usr/local/www/vpn_ipsec.php:271 src/usr/local/www/vpn_ipsec_keys.php:118
+#: src/usr/local/www/vpn_ipsec.php:269 src/usr/local/www/vpn_ipsec_keys.php:115
 #: src/usr/local/www/vpn_ipsec_mobile.php:440
 msgid "The IPsec tunnel configuration has been changed."
 msgstr ""
 
-#: src/usr/local/www/vpn_ipsec.php:277
-msgid "IPsec tunnels"
+#: src/usr/local/www/vpn_ipsec.php:275
+msgid "IPsec Tunnels"
 msgstr ""
 
-#: src/usr/local/www/vpn_ipsec.php:284
+#: src/usr/local/www/vpn_ipsec.php:282
 msgid "IKE"
 msgstr ""
 
-#: src/usr/local/www/vpn_ipsec.php:285
-#: src/usr/local/www/vpn_ipsec_phase1.php:695
+#: src/usr/local/www/vpn_ipsec.php:283
+#: src/usr/local/www/vpn_ipsec_phase1.php:721
 msgid "Remote Gateway"
 msgstr ""
 
-#: src/usr/local/www/vpn_ipsec.php:287
+#: src/usr/local/www/vpn_ipsec.php:285
 msgid "P1 Protocol"
 msgstr ""
 
-#: src/usr/local/www/vpn_ipsec.php:288
+#: src/usr/local/www/vpn_ipsec.php:286
 msgid "P1 Transforms"
 msgstr ""
 
-#: src/usr/local/www/vpn_ipsec.php:289
+#: src/usr/local/www/vpn_ipsec.php:287
 msgid "P1 Description"
 msgstr ""
 
-#: src/usr/local/www/vpn_ipsec.php:307 src/usr/local/www/vpn_ipsec.php:385
-#: src/usr/local/www/vpn_ipsec.php:386
+#: src/usr/local/www/vpn_ipsec.php:305 src/usr/local/www/vpn_ipsec.php:383
+#: src/usr/local/www/vpn_ipsec.php:384
 msgid "Move checked entries to here"
 msgstr ""
 
-#: src/usr/local/www/vpn_ipsec.php:371 src/usr/local/www/vpn_ipsec.php:487
+#: src/usr/local/www/vpn_ipsec.php:369 src/usr/local/www/vpn_ipsec.php:485
 msgid "auto"
 msgstr ""
 
-#: src/usr/local/www/vpn_ipsec.php:373 src/usr/local/www/vpn_ipsec.php:489
+#: src/usr/local/www/vpn_ipsec.php:371 src/usr/local/www/vpn_ipsec.php:487
 msgid "bits"
 msgstr ""
 
-#: src/usr/local/www/vpn_ipsec.php:387
+#: src/usr/local/www/vpn_ipsec.php:385
 msgid "Edit phase1 entry"
 msgstr ""
 
-#: src/usr/local/www/vpn_ipsec.php:389
+#: src/usr/local/www/vpn_ipsec.php:387
 msgid "Copy phase1 entry"
 msgstr ""
 
-#: src/usr/local/www/vpn_ipsec.php:391 src/usr/local/www/vpn_ipsec.php:392
+#: src/usr/local/www/vpn_ipsec.php:389 src/usr/local/www/vpn_ipsec.php:390
 msgid "Delete phase1 entry"
 msgstr ""
 
-#: src/usr/local/www/vpn_ipsec.php:420
+#: src/usr/local/www/vpn_ipsec.php:418
 #, php-format
 msgid "Show %s Phase-2 entries"
 msgstr ""
 
-#: src/usr/local/www/vpn_ipsec.php:429
+#: src/usr/local/www/vpn_ipsec.php:427
 msgid "Local Subnet"
 msgstr ""
 
-#: src/usr/local/www/vpn_ipsec.php:430
+#: src/usr/local/www/vpn_ipsec.php:428
 msgid "Remote Subnet"
 msgstr ""
 
-#: src/usr/local/www/vpn_ipsec.php:431
+#: src/usr/local/www/vpn_ipsec.php:429
 msgid "P2 Protocol"
 msgstr ""
 
-#: src/usr/local/www/vpn_ipsec.php:432
+#: src/usr/local/www/vpn_ipsec.php:430
 msgid "P2 Transforms"
 msgstr ""
 
-#: src/usr/local/www/vpn_ipsec.php:433
+#: src/usr/local/www/vpn_ipsec.php:431
 msgid "P2 Auth Methods"
 msgstr ""
 
-#: src/usr/local/www/vpn_ipsec.php:434
+#: src/usr/local/www/vpn_ipsec.php:432
 msgid "P2 actions"
 msgstr ""
 
-#: src/usr/local/www/vpn_ipsec.php:457 src/usr/local/www/vpn_ipsec.php:508
+#: src/usr/local/www/vpn_ipsec.php:455 src/usr/local/www/vpn_ipsec.php:506
 msgid "Move checked P2s here"
 msgstr ""
 
-#: src/usr/local/www/vpn_ipsec.php:509
+#: src/usr/local/www/vpn_ipsec.php:507
 msgid "Edit phase2 entry"
 msgstr ""
 
-#: src/usr/local/www/vpn_ipsec.php:510
+#: src/usr/local/www/vpn_ipsec.php:508
 msgid "Add a new Phase 2 based on this one"
 msgstr ""
 
-#: src/usr/local/www/vpn_ipsec.php:511
+#: src/usr/local/www/vpn_ipsec.php:509
 msgid "Delete phase2 entry"
 msgstr ""
 
-#: src/usr/local/www/vpn_ipsec.php:512
+#: src/usr/local/www/vpn_ipsec.php:510
 msgid "delete phase2 entry"
 msgstr ""
 
-#: src/usr/local/www/vpn_ipsec.php:521
+#: src/usr/local/www/vpn_ipsec.php:519
 msgid "Add P2"
 msgstr ""
 
-#: src/usr/local/www/vpn_ipsec.php:550
+#: src/usr/local/www/vpn_ipsec.php:548
 msgid "Add P1"
 msgstr ""
 
-#: src/usr/local/www/vpn_ipsec.php:553
+#: src/usr/local/www/vpn_ipsec.php:551
 msgid "Delete selected P1s"
 msgstr ""
 
-#: src/usr/local/www/vpn_ipsec.php:555
-msgid "Delete P1s"
-msgstr ""
-
-#: src/usr/local/www/vpn_ipsec.php:562
-msgid "Note:"
+#: src/usr/local/www/vpn_ipsec.php:553
+msgid "Delete P1s"
 msgstr ""
 
-#: src/usr/local/www/vpn_ipsec.php:563
-msgid "You can check your IPsec status at "
+#: src/usr/local/www/vpn_ipsec.php:560
+#, php-format
+msgid "You can check your IPsec status at %s%s%s."
 msgstr ""
 
-#: src/usr/local/www/vpn_ipsec.php:563
+#: src/usr/local/www/vpn_ipsec.php:560
 msgid "Status:IPsec"
 msgstr ""
 
-#: src/usr/local/www/vpn_ipsec.php:564
-msgid "IPsec Debug Mode can be enabled at "
+#: src/usr/local/www/vpn_ipsec.php:561
+#, php-format
+msgid "IPsec debug mode can be enabled at %s%s%s."
 msgstr ""
 
-#: src/usr/local/www/vpn_ipsec.php:564 src/usr/local/www/vpn_ipsec.php:565
+#: src/usr/local/www/vpn_ipsec.php:561 src/usr/local/www/vpn_ipsec.php:562
 msgid "VPN:IPsec:Advanced Settings"
 msgstr ""
 
-#: src/usr/local/www/vpn_ipsec.php:565
-msgid "IPsec can be set to prefer older SAs at "
+#: src/usr/local/www/vpn_ipsec.php:562
+#, php-format
+msgid "IPsec can be set to prefer older SAs at %s%s%s."
 msgstr ""
 
-#: src/usr/local/www/vpn_ipsec.php:583
+#: src/usr/local/www/vpn_ipsec.php:580
 msgid "Are you sure you wish to delete this P1 entry?"
 msgstr ""
 
-#: src/usr/local/www/vpn_ipsec.php:589
+#: src/usr/local/www/vpn_ipsec.php:586
 msgid "Are you sure you wish to delete this P2 entry?"
 msgstr ""
 
@@ -26832,26 +28205,27 @@ msgstr ""
 msgid "Deleted IPsec Pre-Shared Key"
 msgstr ""
 
-#: src/usr/local/www/vpn_ipsec_keys.php:138
+#: src/usr/local/www/vpn_ipsec_keys.php:133
 #: src/usr/local/www/vpn_ipsec_keys_edit.php:101
-#: src/usr/local/www/vpn_ipsec_keys_edit.php:172
+#: src/usr/local/www/vpn_ipsec_keys_edit.php:169
 msgid "Identifier"
 msgstr ""
 
-#: src/usr/local/www/vpn_ipsec_keys.php:150
+#: src/usr/local/www/vpn_ipsec_keys.php:145
 msgid "ANY USER"
 msgstr ""
 
-#: src/usr/local/www/vpn_ipsec_keys.php:192
+#: src/usr/local/www/vpn_ipsec_keys.php:187
 msgid "Edit key"
 msgstr ""
 
-#: src/usr/local/www/vpn_ipsec_keys.php:193
+#: src/usr/local/www/vpn_ipsec_keys.php:188
 msgid "Delete key"
 msgstr ""
 
-#: src/usr/local/www/vpn_ipsec_keys.php:212
-msgid " PSK for any user can be set by using an identifier of any"
+#: src/usr/local/www/vpn_ipsec_keys.php:206
+#: src/usr/local/www/vpn_ipsec_keys_edit.php:201
+msgid "PSK for any user can be set by using an identifier of any."
 msgstr ""
 
 #: src/usr/local/www/vpn_ipsec_keys_edit.php:106
@@ -26863,7 +28237,7 @@ msgid "A user with this name already exists. Add the key to the user instead."
 msgstr ""
 
 #: src/usr/local/www/vpn_ipsec_keys_edit.php:115
-#: src/usr/local/www/vpn_ipsec_phase1.php:253
+#: src/usr/local/www/vpn_ipsec_phase1.php:265
 msgid "Pre-Shared Key contains invalid characters."
 msgstr ""
 
@@ -26872,35 +28246,27 @@ msgid "Another entry with the same identifier already exists."
 msgstr ""
 
 #: src/usr/local/www/vpn_ipsec_keys_edit.php:141
-msgid "Edited"
+msgid "Edited IPsec Pre-Shared Keys"
 msgstr ""
 
 #: src/usr/local/www/vpn_ipsec_keys_edit.php:144
-msgid "Added"
-msgstr ""
-
-#: src/usr/local/www/vpn_ipsec_keys_edit.php:147
-msgid "IPsec Pre-Shared Keys"
+msgid "Added IPsec Pre-Shared Keys"
 msgstr ""
 
-#: src/usr/local/www/vpn_ipsec_keys_edit.php:168
-msgid "Edit pre-shared-secret"
+#: src/usr/local/www/vpn_ipsec_keys_edit.php:165
+msgid "Edit Pre-Shared-Secret"
 msgstr ""
 
-#: src/usr/local/www/vpn_ipsec_keys_edit.php:175
+#: src/usr/local/www/vpn_ipsec_keys_edit.php:172
 msgid ""
 "This can be either an IP address, fully qualified domain name or an e-mail "
 "address"
 msgstr ""
 
-#: src/usr/local/www/vpn_ipsec_keys_edit.php:179
+#: src/usr/local/www/vpn_ipsec_keys_edit.php:176
 msgid "Secret type"
 msgstr ""
 
-#: src/usr/local/www/vpn_ipsec_keys_edit.php:208
-msgid "PSK for any user can be set by using an identifier of any"
-msgstr ""
-
 #: src/usr/local/www/vpn_ipsec_mobile.php:189
 msgid "User Authentication Source"
 msgstr ""
@@ -26974,7 +28340,7 @@ msgstr ""
 
 #: src/usr/local/www/vpn_ipsec_mobile.php:448
 msgid ""
-"Support for IPsec Mobile clients is enabled but a Phase1 definition was not "
+"Support for IPsec Mobile Clients is enabled but a Phase 1 definition was not "
 "found"
 msgstr ""
 
@@ -26983,7 +28349,7 @@ msgid "Please click Create to define one."
 msgstr ""
 
 #: src/usr/local/www/vpn_ipsec_mobile.php:448
-msgid "Create Phase1"
+msgid "Create Phase 1"
 msgstr ""
 
 #: src/usr/local/www/vpn_ipsec_mobile.php:464
@@ -27050,9 +28416,9 @@ msgid ""
 msgstr ""
 
 #: src/usr/local/www/vpn_ipsec_mobile.php:594
-#: src/usr/local/www/vpn_openvpn_csc.php:447
-#: src/usr/local/www/vpn_openvpn_server.php:1012
-#: src/usr/local/www/vpn_openvpn_server.php:1019
+#: src/usr/local/www/vpn_openvpn_csc.php:451
+#: src/usr/local/www/vpn_openvpn_server.php:1017
+#: src/usr/local/www/vpn_openvpn_server.php:1024
 msgid "DNS Default Domain"
 msgstr ""
 
@@ -27081,335 +28447,340 @@ msgstr ""
 msgid "Phase2 PFS Group"
 msgstr ""
 
+#: src/usr/local/www/vpn_ipsec_mobile.php:696
+#: src/usr/local/www/vpn_ipsec_mobile.php:705
+msgid "Group"
+msgstr ""
+
 #: src/usr/local/www/vpn_ipsec_mobile.php:714
 msgid "Login Banner"
 msgstr ""
 
-#: src/usr/local/www/vpn_ipsec_phase1.php:213
+#: src/usr/local/www/vpn_ipsec_phase1.php:225
 msgid "EAP-MSChapv2 can only be used with IKEv2 type VPNs."
 msgstr ""
 
-#: src/usr/local/www/vpn_ipsec_phase1.php:218
+#: src/usr/local/www/vpn_ipsec_phase1.php:230
 msgid "EAP-TLS can only be used with IKEv2 type VPNs."
 msgstr ""
 
-#: src/usr/local/www/vpn_ipsec_phase1.php:223
+#: src/usr/local/www/vpn_ipsec_phase1.php:235
 msgid "EAP-RADIUS can only be used with IKEv2 type VPNs."
 msgstr ""
 
-#: src/usr/local/www/vpn_ipsec_phase1.php:246
+#: src/usr/local/www/vpn_ipsec_phase1.php:258
 msgid "Remote gateway"
 msgstr ""
 
-#: src/usr/local/www/vpn_ipsec_phase1.php:257
+#: src/usr/local/www/vpn_ipsec_phase1.php:269
 msgid "The P1 lifetime must be an integer."
 msgstr ""
 
-#: src/usr/local/www/vpn_ipsec_phase1.php:262
+#: src/usr/local/www/vpn_ipsec_phase1.php:274
 msgid "A valid remote gateway address or host name must be specified."
 msgstr ""
 
-#: src/usr/local/www/vpn_ipsec_phase1.php:264
+#: src/usr/local/www/vpn_ipsec_phase1.php:276
 msgid ""
 "A valid remote gateway IPv4 address must be specified or you need to change "
 "protocol to IPv6"
 msgstr ""
 
-#: src/usr/local/www/vpn_ipsec_phase1.php:266
+#: src/usr/local/www/vpn_ipsec_phase1.php:278
 msgid ""
 "A valid remote gateway IPv6 address must be specified or you need to change "
 "protocol to IPv4"
 msgstr ""
 
-#: src/usr/local/www/vpn_ipsec_phase1.php:276
+#: src/usr/local/www/vpn_ipsec_phase1.php:288
 #, php-format
 msgid "The remote gateway \"%1$s\" is already used by phase1 \"%2$s\"."
 msgstr ""
 
-#: src/usr/local/www/vpn_ipsec_phase1.php:287
+#: src/usr/local/www/vpn_ipsec_phase1.php:299
 msgid "There is a Phase 2 using IPv6, you cannot use IPv4."
 msgstr ""
 
-#: src/usr/local/www/vpn_ipsec_phase1.php:291
+#: src/usr/local/www/vpn_ipsec_phase1.php:303
 msgid "There is a Phase 2 using IPv4, you cannot use IPv6."
 msgstr ""
 
-#: src/usr/local/www/vpn_ipsec_phase1.php:305
+#: src/usr/local/www/vpn_ipsec_phase1.php:317
 msgid "Please enter an address for 'My Identifier'"
 msgstr ""
 
-#: src/usr/local/www/vpn_ipsec_phase1.php:309
+#: src/usr/local/www/vpn_ipsec_phase1.php:321
 msgid "Please enter a keyid tag for 'My Identifier'"
 msgstr ""
 
-#: src/usr/local/www/vpn_ipsec_phase1.php:313
+#: src/usr/local/www/vpn_ipsec_phase1.php:325
 msgid "Please enter a fully qualified domain name for 'My Identifier'"
 msgstr ""
 
-#: src/usr/local/www/vpn_ipsec_phase1.php:317
+#: src/usr/local/www/vpn_ipsec_phase1.php:329
 msgid "Please enter a user and fully qualified domain name for 'My Identifier'"
 msgstr ""
 
-#: src/usr/local/www/vpn_ipsec_phase1.php:321
+#: src/usr/local/www/vpn_ipsec_phase1.php:333
 msgid "Please enter a dynamic domain name for 'My Identifier'"
 msgstr ""
 
-#: src/usr/local/www/vpn_ipsec_phase1.php:325
+#: src/usr/local/www/vpn_ipsec_phase1.php:337
 msgid "A valid IP address for 'My identifier' must be specified."
 msgstr ""
 
-#: src/usr/local/www/vpn_ipsec_phase1.php:329
+#: src/usr/local/www/vpn_ipsec_phase1.php:341
 msgid "A valid domain name for 'My identifier' must be specified."
 msgstr ""
 
-#: src/usr/local/www/vpn_ipsec_phase1.php:334
+#: src/usr/local/www/vpn_ipsec_phase1.php:346
 msgid "A valid FQDN for 'My identifier' must be specified."
 msgstr ""
 
-#: src/usr/local/www/vpn_ipsec_phase1.php:341
+#: src/usr/local/www/vpn_ipsec_phase1.php:353
 msgid ""
 "A valid User FQDN in the form of user@my.domain.com for 'My identifier' must "
 "be specified."
 msgstr ""
 
-#: src/usr/local/www/vpn_ipsec_phase1.php:347
+#: src/usr/local/www/vpn_ipsec_phase1.php:359
 msgid "A valid Dynamic DNS address for 'My identifier' must be specified."
 msgstr ""
 
-#: src/usr/local/www/vpn_ipsec_phase1.php:360
+#: src/usr/local/www/vpn_ipsec_phase1.php:372
 msgid "Please enter an address for 'Peer Identifier'"
 msgstr ""
 
-#: src/usr/local/www/vpn_ipsec_phase1.php:364
+#: src/usr/local/www/vpn_ipsec_phase1.php:376
 msgid "Please enter a keyid tag for 'Peer Identifier'"
 msgstr ""
 
-#: src/usr/local/www/vpn_ipsec_phase1.php:368
+#: src/usr/local/www/vpn_ipsec_phase1.php:380
 msgid "Please enter a fully qualified domain name for 'Peer Identifier'"
 msgstr ""
 
-#: src/usr/local/www/vpn_ipsec_phase1.php:372
+#: src/usr/local/www/vpn_ipsec_phase1.php:384
 msgid ""
 "Please enter a user and fully qualified domain name for 'Peer Identifier'"
 msgstr ""
 
-#: src/usr/local/www/vpn_ipsec_phase1.php:376
+#: src/usr/local/www/vpn_ipsec_phase1.php:388
 msgid "A valid IP address for 'Peer identifier' must be specified."
 msgstr ""
 
-#: src/usr/local/www/vpn_ipsec_phase1.php:380
+#: src/usr/local/www/vpn_ipsec_phase1.php:392
 msgid "A valid domain name for 'Peer identifier' must be specified."
 msgstr ""
 
-#: src/usr/local/www/vpn_ipsec_phase1.php:385
+#: src/usr/local/www/vpn_ipsec_phase1.php:397
 msgid "A valid FQDN for 'Peer identifier' must be specified."
 msgstr ""
 
-#: src/usr/local/www/vpn_ipsec_phase1.php:392
+#: src/usr/local/www/vpn_ipsec_phase1.php:404
 msgid ""
 "A valid User FQDN in the form of user@my.domain.com for 'Peer identifier' "
 "must be specified."
 msgstr ""
 
-#: src/usr/local/www/vpn_ipsec_phase1.php:399
+#: src/usr/local/www/vpn_ipsec_phase1.php:411
 msgid "A numeric value must be specified for DPD delay."
 msgstr ""
 
-#: src/usr/local/www/vpn_ipsec_phase1.php:403
+#: src/usr/local/www/vpn_ipsec_phase1.php:415
 msgid "A numeric value must be specified for DPD retries."
 msgstr ""
 
-#: src/usr/local/www/vpn_ipsec_phase1.php:408
-msgid "Valid arguments for IKE type is v1 or v2"
+#: src/usr/local/www/vpn_ipsec_phase1.php:420
+msgid "A numeric value must be specified for TFC bytes."
 msgstr ""
 
-#: src/usr/local/www/vpn_ipsec_phase1.php:414
+#: src/usr/local/www/vpn_ipsec_phase1.php:424
+msgid "Valid arguments for IKE type are v1, v2 or auto"
+msgstr ""
+
+#: src/usr/local/www/vpn_ipsec_phase1.php:430
 #: src/usr/local/www/vpn_ipsec_phase2.php:372
 msgid ""
 "Only 128 bit AES can be used where the glxsb crypto accelerator is enabled."
 msgstr ""
 
-#: src/usr/local/www/vpn_ipsec_phase1.php:426
+#: src/usr/local/www/vpn_ipsec_phase1.php:442
 msgid ""
 "A valid RADIUS server must be selected for user authentication on the Mobile "
 "Clients tab in order to set EAP-RADIUS as the authentication method."
 msgstr ""
 
-#: src/usr/local/www/vpn_ipsec_phase1.php:548
+#: src/usr/local/www/vpn_ipsec_phase1.php:574
 #, php-format
 msgid "GW Group %s"
 msgstr ""
 
-#: src/usr/local/www/vpn_ipsec_phase1.php:638
-#: src/usr/local/www/vpn_ipsec_phase1.php:641
+#: src/usr/local/www/vpn_ipsec_phase1.php:664
+#: src/usr/local/www/vpn_ipsec_phase1.php:667
 msgid "Edit Phase 1"
 msgstr ""
 
-#: src/usr/local/www/vpn_ipsec_phase1.php:641
-#: src/usr/local/www/vpn_ipsec_phase2.php:444
-msgid "Tunnel"
-msgstr ""
-
-#: src/usr/local/www/vpn_ipsec_phase1.php:662
+#: src/usr/local/www/vpn_ipsec_phase1.php:688
 #: src/usr/local/www/vpn_ipsec_phase2.php:531
-#: src/usr/local/www/vpn_openvpn_client.php:454
-#: src/usr/local/www/vpn_openvpn_csc.php:332
-#: src/usr/local/www/vpn_openvpn_server.php:622
+#: src/usr/local/www/vpn_openvpn_client.php:458
+#: src/usr/local/www/vpn_openvpn_csc.php:336
+#: src/usr/local/www/vpn_openvpn_server.php:626
 msgid "General Information"
 msgstr ""
 
-#: src/usr/local/www/vpn_ipsec_phase1.php:673
+#: src/usr/local/www/vpn_ipsec_phase1.php:699
 msgid "Key Exchange version"
 msgstr ""
 
-#: src/usr/local/www/vpn_ipsec_phase1.php:676
+#: src/usr/local/www/vpn_ipsec_phase1.php:702
 msgid ""
-"Select the Internet Key Exchange protocol version to be used, IKEv1 or IKEv2."
+"Select the Internet Key Exchange protocol version to be used. Auto uses "
+"IKEv2 when initiator, and accepts either IKEv1 or IKEv2 as responder."
 msgstr ""
 
-#: src/usr/local/www/vpn_ipsec_phase1.php:680
+#: src/usr/local/www/vpn_ipsec_phase1.php:706
 msgid "Internet Protocol"
 msgstr ""
 
-#: src/usr/local/www/vpn_ipsec_phase1.php:683
+#: src/usr/local/www/vpn_ipsec_phase1.php:709
 msgid "Select the Internet Protocol family."
 msgstr ""
 
-#: src/usr/local/www/vpn_ipsec_phase1.php:690
+#: src/usr/local/www/vpn_ipsec_phase1.php:716
 msgid "Select the interface for the local endpoint of this phase1 entry."
 msgstr ""
 
-#: src/usr/local/www/vpn_ipsec_phase1.php:698
+#: src/usr/local/www/vpn_ipsec_phase1.php:724
 msgid "Enter the public IP address or host name of the remote gateway"
 msgstr ""
 
-#: src/usr/local/www/vpn_ipsec_phase1.php:710
-msgid "Phase 1 proposal (Authentication)"
+#: src/usr/local/www/vpn_ipsec_phase1.php:736
+msgid "Phase 1 Proposal (Authentication)"
 msgstr ""
 
-#: src/usr/local/www/vpn_ipsec_phase1.php:717
-#: src/usr/local/www/vpn_ipsec_phase1.php:815
-#: src/usr/local/www/vpn_ipsec_phase1.php:822
+#: src/usr/local/www/vpn_ipsec_phase1.php:743
+#: src/usr/local/www/vpn_ipsec_phase1.php:841
+#: src/usr/local/www/vpn_ipsec_phase1.php:848
 msgid "Must match the setting chosen on the remote side."
 msgstr ""
 
-#: src/usr/local/www/vpn_ipsec_phase1.php:723
+#: src/usr/local/www/vpn_ipsec_phase1.php:749
 msgid "Main"
 msgstr ""
 
-#: src/usr/local/www/vpn_ipsec_phase1.php:721
+#: src/usr/local/www/vpn_ipsec_phase1.php:747
 msgid "Negotiation mode"
 msgstr ""
 
-#: src/usr/local/www/vpn_ipsec_phase1.php:724
+#: src/usr/local/www/vpn_ipsec_phase1.php:750
 msgid "Aggressive is more flexible, but less secure."
 msgstr ""
 
-#: src/usr/local/www/vpn_ipsec_phase1.php:726
+#: src/usr/local/www/vpn_ipsec_phase1.php:752
 msgid "My identifier"
 msgstr ""
 
-#: src/usr/local/www/vpn_ipsec_phase1.php:744
+#: src/usr/local/www/vpn_ipsec_phase1.php:770
 msgid "Peer identifier"
 msgstr ""
 
-#: src/usr/local/www/vpn_ipsec_phase1.php:762
+#: src/usr/local/www/vpn_ipsec_phase1.php:788
 msgid ""
 "This is known as the \"group\" setting on some VPN client implementations"
 msgstr ""
 
-#: src/usr/local/www/vpn_ipsec_phase1.php:772
+#: src/usr/local/www/vpn_ipsec_phase1.php:798
 msgid "Enter your Pre-Shared Key string."
 msgstr ""
 
-#: src/usr/local/www/vpn_ipsec_phase1.php:776
+#: src/usr/local/www/vpn_ipsec_phase1.php:802
 msgid "My Certificate"
 msgstr ""
 
-#: src/usr/local/www/vpn_ipsec_phase1.php:779
+#: src/usr/local/www/vpn_ipsec_phase1.php:805
 msgid "Select a certificate previously configured in the Certificate Manager."
 msgstr ""
 
-#: src/usr/local/www/vpn_ipsec_phase1.php:786
+#: src/usr/local/www/vpn_ipsec_phase1.php:812
 msgid ""
 "Select a certificate authority previously configured in the Certificate "
 "Manager."
 msgstr ""
 
-#: src/usr/local/www/vpn_ipsec_phase1.php:790
-msgid "Phase 1 proposal (Algorithms)"
+#: src/usr/local/www/vpn_ipsec_phase1.php:816
+msgid "Phase 1 Proposal (Algorithms)"
 msgstr ""
 
-#: src/usr/local/www/vpn_ipsec_phase1.php:792
-#: src/usr/local/www/vpn_openvpn_client.php:656
-#: src/usr/local/www/vpn_openvpn_server.php:804
+#: src/usr/local/www/vpn_ipsec_phase1.php:818
+#: src/usr/local/www/vpn_openvpn_client.php:661
+#: src/usr/local/www/vpn_openvpn_server.php:809
 msgid "Encryption Algorithm"
 msgstr ""
 
-#: src/usr/local/www/vpn_ipsec_phase1.php:812
+#: src/usr/local/www/vpn_ipsec_phase1.php:838
 msgid "Hash Algorithm"
 msgstr ""
 
-#: src/usr/local/www/vpn_ipsec_phase1.php:819
+#: src/usr/local/www/vpn_ipsec_phase1.php:845
 msgid "DH Group"
 msgstr ""
 
-#: src/usr/local/www/vpn_ipsec_phase1.php:826
+#: src/usr/local/www/vpn_ipsec_phase1.php:852
 msgid "Lifetime (Seconds)"
 msgstr ""
 
-#: src/usr/local/www/vpn_ipsec_phase1.php:833
-msgid "Advanced Options"
-msgstr ""
-
-#: src/usr/local/www/vpn_ipsec_phase1.php:837
+#: src/usr/local/www/vpn_ipsec_phase1.php:863
 msgid "Disable rekey"
 msgstr ""
 
-#: src/usr/local/www/vpn_ipsec_phase1.php:844
+#: src/usr/local/www/vpn_ipsec_phase1.php:870
 msgid "Disable Reauth"
 msgstr ""
 
-#: src/usr/local/www/vpn_ipsec_phase1.php:851
+#: src/usr/local/www/vpn_ipsec_phase1.php:877
 msgid "Responder Only"
 msgstr ""
 
-#: src/usr/local/www/vpn_ipsec_phase1.php:860
+#: src/usr/local/www/vpn_ipsec_phase1.php:886
 msgid "Force"
 msgstr ""
 
-#: src/usr/local/www/vpn_ipsec_phase1.php:858
+#: src/usr/local/www/vpn_ipsec_phase1.php:884
 msgid "NAT Traversal"
 msgstr ""
 
-#: src/usr/local/www/vpn_ipsec_phase1.php:861
+#: src/usr/local/www/vpn_ipsec_phase1.php:887
 msgid ""
 "Set this option to enable the use of NAT-T (i.e. the encapsulation of ESP in "
 "UDP packets) if needed, which can help with clients that are behind "
 "restrictive firewalls."
 msgstr ""
 
-#: src/usr/local/www/vpn_ipsec_phase1.php:866
+#: src/usr/local/www/vpn_ipsec_phase1.php:892
 msgid "MOBIKE"
 msgstr ""
 
-#: src/usr/local/www/vpn_ipsec_phase1.php:869
+#: src/usr/local/www/vpn_ipsec_phase1.php:895
 msgid "Set this option to control the use of MOBIKE"
 msgstr ""
 
-#: src/usr/local/www/vpn_ipsec_phase1.php:873
+#: src/usr/local/www/vpn_ipsec_phase1.php:899
+msgid "Split connections"
+msgstr ""
+
+#: src/usr/local/www/vpn_ipsec_phase1.php:925
 msgid "Dead Peer Detection"
 msgstr ""
 
-#: src/usr/local/www/vpn_ipsec_phase1.php:883
+#: src/usr/local/www/vpn_ipsec_phase1.php:935
 msgid "Delay between requesting peer acknowledgement."
 msgstr ""
 
-#: src/usr/local/www/vpn_ipsec_phase1.php:887
+#: src/usr/local/www/vpn_ipsec_phase1.php:939
 msgid "Max failures"
 msgstr ""
 
-#: src/usr/local/www/vpn_ipsec_phase1.php:890
+#: src/usr/local/www/vpn_ipsec_phase1.php:942
 msgid "Number of consecutive failures allowed before disconnect. "
 msgstr ""
 
@@ -27456,7 +28827,8 @@ msgstr ""
 
 #: src/usr/local/www/vpn_ipsec_phase2.php:203
 #: src/usr/local/www/vpn_ipsec_phase2.php:233
-msgid "has no subnet."
+#, php-format
+msgid "%s has no subnet."
 msgstr ""
 
 #: src/usr/local/www/vpn_ipsec_phase2.php:211
@@ -27557,7 +28929,7 @@ msgid "Remote Network"
 msgstr ""
 
 #: src/usr/local/www/vpn_ipsec_phase2.php:626
-msgid "Phase 2 proposal (SA/Key Exchange)"
+msgid "Phase 2 Proposal (SA/Key Exchange)"
 msgstr ""
 
 #: src/usr/local/www/vpn_ipsec_phase2.php:633
@@ -27568,26 +28940,26 @@ msgstr ""
 msgid "Encryption Algorithms"
 msgstr ""
 
-#: src/usr/local/www/vpn_ipsec_phase2.php:669
+#: src/usr/local/www/vpn_ipsec_phase2.php:670
 msgid ""
 "Use 3DES for best compatibility or if you have a hardware crypto accelerator "
 "card. Blowfish is usually the fastest in software encryption."
 msgstr ""
 
-#: src/usr/local/www/vpn_ipsec_phase2.php:676
+#: src/usr/local/www/vpn_ipsec_phase2.php:677
 msgid "Hash Algorithms"
 msgstr ""
 
-#: src/usr/local/www/vpn_ipsec_phase2.php:694
+#: src/usr/local/www/vpn_ipsec_phase2.php:696
 msgid "PFS key group"
 msgstr ""
 
-#: src/usr/local/www/vpn_ipsec_phase2.php:704
-#: src/usr/local/www/widgets/widgets/log.widget.php:292
+#: src/usr/local/www/vpn_ipsec_phase2.php:706
+#: src/usr/local/www/widgets/widgets/log.widget.php:291
 msgid "Seconds"
 msgstr ""
 
-#: src/usr/local/www/vpn_ipsec_phase2.php:712
+#: src/usr/local/www/vpn_ipsec_phase2.php:714
 msgid "Automatically ping host"
 msgstr ""
 
@@ -27605,7 +28977,7 @@ msgid "An integer between 576 and 65535 must be specified for Maximum MSS"
 msgstr ""
 
 #: src/usr/local/www/vpn_ipsec_settings.php:274
-msgid "Start IPsec in debug mode based on sections selected"
+msgid "Start IPsec in Debug Mode Based on Sections Selected"
 msgstr ""
 
 #: src/usr/local/www/vpn_ipsec_settings.php:286
@@ -27732,10 +29104,14 @@ msgid ""
 "use on this firewall."
 msgstr ""
 
-#: src/usr/local/www/vpn_l2tp.php:119 src/usr/local/www/vpn_l2tp.php:123
+#: src/usr/local/www/vpn_l2tp.php:119
 msgid "Secret and confirmation must match"
 msgstr ""
 
+#: src/usr/local/www/vpn_l2tp.php:123
+msgid "RADIUS secret and confirmation must match"
+msgstr ""
+
 #: src/usr/local/www/vpn_l2tp.php:127
 msgid "Number of L2TP users must be between 1 and 255"
 msgstr ""
@@ -27814,15 +29190,15 @@ msgstr ""
 
 #: src/usr/local/www/vpn_l2tp.php:369
 msgid ""
-"Don't forget to add a firewall rule to permit traffic from L2TP clients!"
+"Don't forget to add a firewall rule to permit traffic from L2TP clients."
 msgstr ""
 
 #: src/usr/local/www/vpn_l2tp_users.php:109
-msgid "Warning: RADIUS is enabled. The local user database will not be used."
+msgid "RADIUS is enabled. The local user database will not be used."
 msgstr ""
 
 #: src/usr/local/www/vpn_l2tp_users.php:113
-msgid "The l2tp user list has been modified."
+msgid "The L2TP user list has been modified."
 msgstr ""
 
 #: src/usr/local/www/vpn_l2tp_users.php:113
@@ -27830,7 +29206,7 @@ msgid "You must apply the changes in order for them to take effect"
 msgstr ""
 
 #: src/usr/local/www/vpn_l2tp_users.php:113
-msgid "Warning: this will terminate all current l2tp sessions!"
+msgid "Warning: this will terminate all current L2TP sessions!"
 msgstr ""
 
 #: src/usr/local/www/vpn_l2tp_users.php:123
@@ -27854,256 +29230,256 @@ msgid ""
 "If you want the user to be assigned a specific IP address, enter it here."
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_client.php:70
-#: src/usr/local/www/vpn_openvpn_client.php:445
-#: src/usr/local/www/vpn_openvpn_csc.php:323
-#: src/usr/local/www/vpn_openvpn_server.php:611
-msgid "Client"
-msgstr ""
-
-#: src/usr/local/www/vpn_openvpn_client.php:126
-msgid "Client successfully deleted"
+#: src/usr/local/www/vpn_openvpn_client.php:123
+msgid "Client successfully deleted."
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_client.php:223
+#: src/usr/local/www/vpn_openvpn_client.php:220
 #: src/usr/local/www/vpn_openvpn_server.php:289
 msgid ""
 "Protocol and IP address families do not match. You cannot select an IPv6 "
 "protocol and an IPv4 IP address."
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_client.php:225
+#: src/usr/local/www/vpn_openvpn_client.php:222
 #: src/usr/local/www/vpn_openvpn_server.php:291
 msgid ""
 "Protocol and IP address families do not match. You cannot select an IPv4 "
 "protocol and an IPv6 IP address."
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_client.php:227
+#: src/usr/local/www/vpn_openvpn_client.php:224
 #: src/usr/local/www/vpn_openvpn_server.php:293
 msgid ""
 "An IPv4 protocol was selected, but the selected interface has no IPv4 "
 "address."
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_client.php:229
+#: src/usr/local/www/vpn_openvpn_client.php:226
 #: src/usr/local/www/vpn_openvpn_server.php:295
 msgid ""
 "An IPv6 protocol was selected, but the selected interface has no IPv6 "
 "address."
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_client.php:247
+#: src/usr/local/www/vpn_openvpn_client.php:244
 #: src/usr/local/www/vpn_openvpn_server.php:339
 msgid "The specified 'Local port' is in use. Please select another value"
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_client.php:260
+#: src/usr/local/www/vpn_openvpn_client.php:257
 #: src/usr/local/www/vpn_openvpn_server.php:417
 msgid "The field 'Topology' contains an invalid selection"
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_client.php:275
+#: src/usr/local/www/vpn_openvpn_client.php:272
 msgid "User name and password are required for proxy with authentication."
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_client.php:305
+#: src/usr/local/www/vpn_openvpn_client.php:302
 msgid "The bandwidth limit must be a positive numeric value."
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_client.php:315
+#: src/usr/local/www/vpn_openvpn_client.php:312
 #: src/usr/local/www/vpn_openvpn_server.php:349
 msgid "The field 'Shared Key' does not appear to be valid"
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_client.php:322
+#: src/usr/local/www/vpn_openvpn_client.php:319
 #: src/usr/local/www/vpn_openvpn_server.php:356
 msgid "The field 'TLS Authentication Key' does not appear to be valid"
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_client.php:333
+#: src/usr/local/www/vpn_openvpn_client.php:330
 #: src/usr/local/www/vpn_openvpn_server.php:430
-#: src/usr/local/www/vpn_openvpn_server.php:790
+#: src/usr/local/www/vpn_openvpn_server.php:795
 msgid "Shared key"
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_client.php:339
+#: src/usr/local/www/vpn_openvpn_client.php:336
 msgid ""
 "If no Client Certificate is selected, a username and/or password must be "
 "entered."
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_client.php:446
-#: src/usr/local/www/vpn_openvpn_csc.php:70
-#: src/usr/local/www/vpn_openvpn_csc.php:324
-#: src/usr/local/www/vpn_openvpn_server.php:612
+#: src/usr/local/www/vpn_openvpn_client.php:426
+#: src/usr/local/www/vpn_openvpn_client.php:449
+#: src/usr/local/www/vpn_openvpn_csc.php:327
+#: src/usr/local/www/vpn_openvpn_server.php:615
+msgid "Clients"
+msgstr ""
+
+#: src/usr/local/www/vpn_openvpn_client.php:450
+#: src/usr/local/www/vpn_openvpn_csc.php:308
+#: src/usr/local/www/vpn_openvpn_csc.php:328
+#: src/usr/local/www/vpn_openvpn_server.php:616
 msgid "Client Specific Overrides"
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_client.php:461
+#: src/usr/local/www/vpn_openvpn_client.php:465
 msgid ""
 "Set this option to disable this client without removing it from the list"
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_client.php:465
-#: src/usr/local/www/vpn_openvpn_server.php:633
+#: src/usr/local/www/vpn_openvpn_client.php:469
+#: src/usr/local/www/vpn_openvpn_server.php:637
 msgid "Server mode"
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_client.php:479
-#: src/usr/local/www/vpn_openvpn_server.php:669
+#: src/usr/local/www/vpn_openvpn_client.php:483
+#: src/usr/local/www/vpn_openvpn_server.php:673
 msgid "Device mode"
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_client.php:493
-#: src/usr/local/www/vpn_openvpn_server.php:683
+#: src/usr/local/www/vpn_openvpn_client.php:497
+#: src/usr/local/www/vpn_openvpn_server.php:687
 msgid "Local port"
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_client.php:496
+#: src/usr/local/www/vpn_openvpn_client.php:501
 msgid ""
 "Set this option if you would like to bind to a specific port. Leave this "
 "blank or enter 0 for a random dynamic port."
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_client.php:500
+#: src/usr/local/www/vpn_openvpn_client.php:505
 msgid "Server host or address"
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_client.php:507
+#: src/usr/local/www/vpn_openvpn_client.php:512
 msgid "Server port"
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_client.php:514
+#: src/usr/local/www/vpn_openvpn_client.php:519
 msgid "Proxy host or address"
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_client.php:523
+#: src/usr/local/www/vpn_openvpn_client.php:528
 msgid "basic"
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_client.php:523
+#: src/usr/local/www/vpn_openvpn_client.php:528
 msgid "ntlm"
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_client.php:521
+#: src/usr/local/www/vpn_openvpn_client.php:526
 msgid "Proxy Auth. - Extra options"
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_client.php:542
+#: src/usr/local/www/vpn_openvpn_client.php:547
 msgid "Server hostname resolution"
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_client.php:545
+#: src/usr/local/www/vpn_openvpn_client.php:550
 msgid ""
 "Continuously attempt to resolve the server host name. Useful when "
 "communicating with a server that is not permanently connected to the "
 "Internet."
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_client.php:556
-msgid "User Authentication settings"
+#: src/usr/local/www/vpn_openvpn_client.php:561
+msgid "User Authentication Settings"
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_client.php:564
+#: src/usr/local/www/vpn_openvpn_client.php:569
 msgid "Leave empty when no user name is needed"
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_client.php:571
+#: src/usr/local/www/vpn_openvpn_client.php:576
 msgid "Leave empty when no password is needed"
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_client.php:575
-#: src/usr/local/www/vpn_openvpn_server.php:697
-msgid "Cryptographic settings"
+#: src/usr/local/www/vpn_openvpn_client.php:580
+#: src/usr/local/www/vpn_openvpn_server.php:702
+msgid "Cryptographic Settings"
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_client.php:579
-#: src/usr/local/www/vpn_openvpn_server.php:701
+#: src/usr/local/www/vpn_openvpn_client.php:584
+#: src/usr/local/www/vpn_openvpn_server.php:706
 msgid "TLS authentication"
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_client.php:597
-#: src/usr/local/www/vpn_openvpn_client.php:643
-#: src/usr/local/www/vpn_openvpn_server.php:719
-#: src/usr/local/www/vpn_openvpn_server.php:800
+#: src/usr/local/www/vpn_openvpn_client.php:602
+#: src/usr/local/www/vpn_openvpn_client.php:648
+#: src/usr/local/www/vpn_openvpn_server.php:724
+#: src/usr/local/www/vpn_openvpn_server.php:805
 msgid "Paste your shared key here"
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_client.php:621
-#: src/usr/local/www/vpn_openvpn_client.php:627
-#: src/usr/local/www/vpn_openvpn_server.php:744
-#: src/usr/local/www/vpn_openvpn_server.php:750
+#: src/usr/local/www/vpn_openvpn_client.php:626
+#: src/usr/local/www/vpn_openvpn_client.php:632
+#: src/usr/local/www/vpn_openvpn_server.php:749
+#: src/usr/local/www/vpn_openvpn_server.php:755
 msgid "Peer Certificate Revocation list"
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_client.php:634
+#: src/usr/local/www/vpn_openvpn_client.php:639
 msgid "Auto generate"
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_client.php:641
-#: src/usr/local/www/vpn_openvpn_server.php:798
+#: src/usr/local/www/vpn_openvpn_client.php:646
+#: src/usr/local/www/vpn_openvpn_server.php:803
 msgid "Shared Key"
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_client.php:649
+#: src/usr/local/www/vpn_openvpn_client.php:654
 msgid "Client Certificate"
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_client.php:663
-#: src/usr/local/www/vpn_openvpn_server.php:811
+#: src/usr/local/www/vpn_openvpn_client.php:668
+#: src/usr/local/www/vpn_openvpn_server.php:816
 msgid "Auth digest algorithm"
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_client.php:666
-#: src/usr/local/www/vpn_openvpn_server.php:814
+#: src/usr/local/www/vpn_openvpn_client.php:671
+#: src/usr/local/www/vpn_openvpn_server.php:819
 msgid ""
 "Leave this set to SHA1 unless all clients are set to match. SHA1 is the "
 "default for OpenVPN. "
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_client.php:670
-#: src/usr/local/www/vpn_openvpn_server.php:818
+#: src/usr/local/www/vpn_openvpn_client.php:675
+#: src/usr/local/www/vpn_openvpn_server.php:823
 msgid "Hardware Crypto"
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_client.php:677
-#: src/usr/local/www/vpn_openvpn_csc.php:382
-#: src/usr/local/www/vpn_openvpn_server.php:840
-msgid "Tunnel settings"
+#: src/usr/local/www/vpn_openvpn_client.php:682
+#: src/usr/local/www/vpn_openvpn_csc.php:386
+#: src/usr/local/www/vpn_openvpn_server.php:845
+msgid "Tunnel Settings"
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_client.php:681
-#: src/usr/local/www/vpn_openvpn_server.php:844
+#: src/usr/local/www/vpn_openvpn_client.php:686
+#: src/usr/local/www/vpn_openvpn_server.php:849
 msgid "IPv4 Tunnel Network"
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_client.php:684
+#: src/usr/local/www/vpn_openvpn_client.php:689
 msgid ""
 "This is the IPv4 virtual network used for private communications between "
-"this client and the server expressed using CIDR (eg. 10.0.8.0/24). The first "
-"network address will be assigned to the client virtual interface."
+"this client and the server expressed using CIDR (eg. 10.0.8.0/24). The "
+"second network address will be assigned to the client virtual interface."
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_client.php:690
-#: src/usr/local/www/vpn_openvpn_server.php:854
+#: src/usr/local/www/vpn_openvpn_client.php:695
+#: src/usr/local/www/vpn_openvpn_server.php:859
 msgid "IPv6 Tunnel Network"
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_client.php:693
+#: src/usr/local/www/vpn_openvpn_client.php:698
 msgid ""
 "This is the IPv6 virtual network used for private communications between "
-"this client and the server\texpressed using CIDR (eg. fe80::/64). The first "
-"network address will be assigned to the server virtual interface."
+"this client and the server expressed using CIDR (eg. fe80::/64). The second "
+"network address will be assigned to the client virtual interface."
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_client.php:699
-#: src/usr/local/www/vpn_openvpn_server.php:922
+#: src/usr/local/www/vpn_openvpn_client.php:704
+#: src/usr/local/www/vpn_openvpn_server.php:927
 msgid "IPv4 Remote network(s)"
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_client.php:702
-#: src/usr/local/www/vpn_openvpn_server.php:925
+#: src/usr/local/www/vpn_openvpn_client.php:707
+#: src/usr/local/www/vpn_openvpn_server.php:930
 msgid ""
 "IPv4 networks that will be routed through the tunnel, so that a site-to-site "
 "VPN can be established without manually changing the routing tables. "
@@ -28112,13 +29488,13 @@ msgid ""
 "you don't want a site-to-site VPN."
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_client.php:708
-#: src/usr/local/www/vpn_openvpn_server.php:931
+#: src/usr/local/www/vpn_openvpn_client.php:713
+#: src/usr/local/www/vpn_openvpn_server.php:936
 msgid "IPv6 Remote network(s)"
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_client.php:711
-#: src/usr/local/www/vpn_openvpn_server.php:934
+#: src/usr/local/www/vpn_openvpn_client.php:716
+#: src/usr/local/www/vpn_openvpn_server.php:939
 msgid ""
 "These are the IPv6 networks that will be routed through the tunnel, so that "
 "a site-to-site VPN can be established without manually changing the routing "
@@ -28127,76 +29503,76 @@ msgid ""
 "blank if you don't want a site-to-site VPN."
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_client.php:717
+#: src/usr/local/www/vpn_openvpn_client.php:722
 msgid "Limit outgoing bandwidth"
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_client.php:721
+#: src/usr/local/www/vpn_openvpn_client.php:726
 msgid ""
 "Maximum outgoing bandwidth for this tunnel. Leave empty for no limit. The "
 "input value has to be something between 100 bytes/sec and 100 Mbytes/sec "
 "(entered as bytes per second)."
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_client.php:728
+#: src/usr/local/www/vpn_openvpn_client.php:733
 msgid ""
 "Compress tunnel packets using the LZO algorithm. Adaptive compression will "
 "dynamically disable compression for a period of time if OpenVPN detects that "
 "the data in the packets is not being compressed efficiently."
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_client.php:732
-#: src/usr/local/www/vpn_openvpn_server.php:1003
+#: src/usr/local/www/vpn_openvpn_client.php:737
+#: src/usr/local/www/vpn_openvpn_server.php:1008
 msgid "Topology"
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_client.php:735
+#: src/usr/local/www/vpn_openvpn_client.php:740
 msgid "Specifies the method used to configure a virtual adapter IP address."
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_client.php:739
-#: src/usr/local/www/vpn_openvpn_server.php:956
+#: src/usr/local/www/vpn_openvpn_client.php:744
+#: src/usr/local/www/vpn_openvpn_server.php:961
 msgid "Type-of-Service"
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_client.php:746
-#: src/usr/local/www/vpn_openvpn_server.php:977
+#: src/usr/local/www/vpn_openvpn_client.php:751
+#: src/usr/local/www/vpn_openvpn_server.php:982
 msgid "Disable IPv6"
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_client.php:753
+#: src/usr/local/www/vpn_openvpn_client.php:758
 msgid "Don't pull routes"
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_client.php:756
+#: src/usr/local/www/vpn_openvpn_client.php:761
 msgid ""
 "This option still allows the server to set the TCP/IP properties of the "
 "client's TUN/TAP interface. "
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_client.php:760
+#: src/usr/local/www/vpn_openvpn_client.php:765
 msgid "Don't add/remove routes"
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_client.php:763
+#: src/usr/local/www/vpn_openvpn_client.php:768
 msgid "Pass routes to --route-upscript using environmental variables"
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_client.php:774
-#: src/usr/local/www/vpn_openvpn_server.php:1155
+#: src/usr/local/www/vpn_openvpn_client.php:779
+#: src/usr/local/www/vpn_openvpn_server.php:1160
 msgid ""
 "Enter any additional options you would like to add to the OpenVPN server "
 "configuration here, separated by semicolon<br />EXAMPLE: push \"route "
 "10.0.0.0 255.255.255.0\""
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_client.php:779
-#: src/usr/local/www/vpn_openvpn_server.php:1160
+#: src/usr/local/www/vpn_openvpn_client.php:784
+#: src/usr/local/www/vpn_openvpn_server.php:1165
 msgid "Verbosity level"
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_client.php:782
-#: src/usr/local/www/vpn_openvpn_server.php:1163
+#: src/usr/local/www/vpn_openvpn_client.php:787
+#: src/usr/local/www/vpn_openvpn_server.php:1168
 msgid ""
 "Each level shows all info from the previous levels. Level 3 is recommended "
 "if you want a good summary of what's happening without being swamped by "
@@ -28206,112 +29582,112 @@ msgid ""
 "TUN/TAP packets<br />6: Debug info range"
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_client.php:809
+#: src/usr/local/www/vpn_openvpn_client.php:814
 msgid "OpenVPN Clients"
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_csc.php:100
-msgid "Client Specific Override successfully deleted"
+#: src/usr/local/www/vpn_openvpn_csc.php:97
+msgid "Client specific override successfully deleted."
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_csc.php:194
+#: src/usr/local/www/vpn_openvpn_csc.php:191
 #: src/usr/local/www/vpn_openvpn_server.php:362
 msgid "The field 'DNS Server #1' must contain a valid IP address"
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_csc.php:197
+#: src/usr/local/www/vpn_openvpn_csc.php:194
 #: src/usr/local/www/vpn_openvpn_server.php:365
 msgid "The field 'DNS Server #2' must contain a valid IP address"
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_csc.php:200
+#: src/usr/local/www/vpn_openvpn_csc.php:197
 #: src/usr/local/www/vpn_openvpn_server.php:368
 msgid "The field 'DNS Server #3' must contain a valid IP address"
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_csc.php:203
+#: src/usr/local/www/vpn_openvpn_csc.php:200
 #: src/usr/local/www/vpn_openvpn_server.php:371
 msgid "The field 'DNS Server #4' must contain a valid IP address"
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_csc.php:209
+#: src/usr/local/www/vpn_openvpn_csc.php:206
 #: src/usr/local/www/vpn_openvpn_server.php:377
 msgid "The field 'NTP Server #1' must contain a valid IP address"
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_csc.php:212
+#: src/usr/local/www/vpn_openvpn_csc.php:209
 #: src/usr/local/www/vpn_openvpn_server.php:380
 msgid "The field 'NTP Server #2' must contain a valid IP address"
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_csc.php:215
+#: src/usr/local/www/vpn_openvpn_csc.php:212
 #: src/usr/local/www/vpn_openvpn_server.php:383
 msgid "The field 'NTP Server #3' must contain a valid IP address"
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_csc.php:218
+#: src/usr/local/www/vpn_openvpn_csc.php:215
 #: src/usr/local/www/vpn_openvpn_server.php:386
 msgid "The field 'NTP Server #4' must contain a valid IP address"
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_csc.php:225
+#: src/usr/local/www/vpn_openvpn_csc.php:222
 #: src/usr/local/www/vpn_openvpn_server.php:393
 msgid "The field 'WINS Server #1' must contain a valid IP address"
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_csc.php:228
+#: src/usr/local/www/vpn_openvpn_csc.php:225
 #: src/usr/local/www/vpn_openvpn_server.php:396
 msgid "The field 'WINS Server #2' must contain a valid IP address"
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_csc.php:233
+#: src/usr/local/www/vpn_openvpn_csc.php:230
 #: src/usr/local/www/vpn_openvpn_server.php:401
 msgid ""
 "The field 'NetBIOS Data Distribution Server #1' must contain a valid IP "
 "address"
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_csc.php:338
+#: src/usr/local/www/vpn_openvpn_csc.php:342
 #, php-format
 msgid "OpenVPN Server %d: %s"
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_csc.php:349
+#: src/usr/local/www/vpn_openvpn_csc.php:353
 msgid ""
 "Select the servers for which the override will apply. Selecting no servers "
 "will also apply the override to all servers."
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_csc.php:357
+#: src/usr/local/www/vpn_openvpn_csc.php:361
 msgid ""
 "Set this option to disable this client-specific override without removing it "
 "from the list."
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_csc.php:361
+#: src/usr/local/www/vpn_openvpn_csc.php:365
 msgid "Common name"
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_csc.php:364
+#: src/usr/local/www/vpn_openvpn_csc.php:368
 msgid "Enter the client's X.509 common name."
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_csc.php:375
+#: src/usr/local/www/vpn_openvpn_csc.php:379
 msgid "Connection blocking"
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_csc.php:378
+#: src/usr/local/www/vpn_openvpn_csc.php:382
 msgid ""
 "Don't use this option to permanently disable a client due to a compromised "
 "key or password. Use a CRL (certificate revocation list) instead. "
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_csc.php:386
-#: src/usr/local/www/vpn_openvpn_server.php:1197
+#: src/usr/local/www/vpn_openvpn_csc.php:390
+#: src/usr/local/www/vpn_openvpn_server.php:1202
 msgid "Tunnel Network"
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_csc.php:389
+#: src/usr/local/www/vpn_openvpn_csc.php:393
 msgid ""
 "This is the virtual network used for private communications between this "
 "client and the server expressed using CIDR (eg. 10.0.8.0/24). The first "
@@ -28319,11 +29695,11 @@ msgid ""
 "address will be assigned to the client virtual interface. "
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_csc.php:394
+#: src/usr/local/www/vpn_openvpn_csc.php:398
 msgid "IPv4 Local Network/s"
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_csc.php:397
+#: src/usr/local/www/vpn_openvpn_csc.php:401
 msgid ""
 "These are the IPv4 networks that will be accessible from this particular "
 "client. Expressed as a comma-separated list of one or more CIDR ranges. <br /"
@@ -28331,11 +29707,11 @@ msgid ""
 "defined on the main server configuration."
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_csc.php:402
+#: src/usr/local/www/vpn_openvpn_csc.php:406
 msgid "IPv6 Local Network/s"
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_csc.php:405
+#: src/usr/local/www/vpn_openvpn_csc.php:409
 msgid ""
 "These are the IPv4 networks that will be accessible from this particular "
 "client. Expressed as a comma-separated list of one or more IP/PREFIX "
@@ -28343,11 +29719,11 @@ msgid ""
 "already been defined on the main server configuration."
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_csc.php:410
+#: src/usr/local/www/vpn_openvpn_csc.php:414
 msgid "IPv4 Remote Network/s"
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_csc.php:413
+#: src/usr/local/www/vpn_openvpn_csc.php:417
 msgid ""
 "These are the IPv4 networks that will be routed to this client specifically "
 "using iroute, so that a site-to-site VPN can be established. Expressed as a "
@@ -28357,11 +29733,11 @@ msgid ""
 "server settings."
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_csc.php:419
+#: src/usr/local/www/vpn_openvpn_csc.php:423
 msgid "IPv6 Remote Network/s"
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_csc.php:422
+#: src/usr/local/www/vpn_openvpn_csc.php:426
 msgid ""
 "These are the IPv4 networks that will be routed to this client specifically "
 "using iroute, so that a site-to-site VPN can be established. Expressed as a "
@@ -28371,78 +29747,79 @@ msgid ""
 "OpenVPN server settings."
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_csc.php:428
-#: src/usr/local/www/vpn_openvpn_server.php:896
+#: src/usr/local/www/vpn_openvpn_csc.php:432
+#: src/usr/local/www/vpn_openvpn_server.php:901
 msgid "Redirect Gateway"
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_csc.php:435
-msgid "Client settings"
+#: src/usr/local/www/vpn_openvpn_csc.php:439
+#: src/usr/local/www/vpn_openvpn_server.php:989
+msgid "Client Settings"
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_csc.php:440
+#: src/usr/local/www/vpn_openvpn_csc.php:444
 msgid "Server Definitions"
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_csc.php:452
-#: src/usr/local/www/vpn_openvpn_csc.php:457
+#: src/usr/local/www/vpn_openvpn_csc.php:456
+#: src/usr/local/www/vpn_openvpn_csc.php:461
 msgid "DNS Domain"
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_csc.php:501
+#: src/usr/local/www/vpn_openvpn_csc.php:505
 msgid "Server 4"
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_csc.php:536
+#: src/usr/local/www/vpn_openvpn_csc.php:540
 msgid "NetBIOS Options"
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_csc.php:539
+#: src/usr/local/www/vpn_openvpn_csc.php:543
 msgid ""
 "If this option is not set, all NetBIOS-over-TCP/IP options (including WINS) "
 "will be disabled. "
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_csc.php:543
-#: src/usr/local/www/vpn_openvpn_server.php:1096
+#: src/usr/local/www/vpn_openvpn_csc.php:547
+#: src/usr/local/www/vpn_openvpn_server.php:1101
 msgid "Node Type"
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_csc.php:546
+#: src/usr/local/www/vpn_openvpn_csc.php:550
 msgid ""
 "Possible options: b-node (broadcasts), p-node (point-to-point name queries "
 "to a WINS server), m-node (broadcast then query name server), and h-node "
 "(query name server, then broadcast). "
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_csc.php:554
+#: src/usr/local/www/vpn_openvpn_csc.php:558
 msgid ""
 "A NetBIOS Scope ID provides an extended naming service for NetBIOS over TCP/"
 "IP. The NetBIOS scope ID isolates NetBIOS traffic on a single network to "
 "only those nodes with the same NetBIOS scope ID. "
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_csc.php:588
+#: src/usr/local/www/vpn_openvpn_csc.php:592
 msgid ""
 "Enter any additional options you would like to add for this client specific "
 "override, separated by a semicolon. <br />EXAMPLE: push \"route 10.0.0.0 "
 "255.255.255.0\"; "
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_csc.php:660
+#: src/usr/local/www/vpn_openvpn_csc.php:664
 msgid "CSC Overrides"
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_csc.php:688
+#: src/usr/local/www/vpn_openvpn_csc.php:692
 msgid "Edit CSC Override"
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_csc.php:689
+#: src/usr/local/www/vpn_openvpn_csc.php:693
 msgid "Delete CSC Override"
 msgstr ""
 
 #: src/usr/local/www/vpn_openvpn_server.php:129
-msgid "Server successfully deleted"
+msgid "Server successfully deleted."
 msgstr ""
 
 #: src/usr/local/www/vpn_openvpn_server.php:305
@@ -28484,64 +29861,64 @@ msgstr ""
 msgid "The Server Bridge DHCP range is invalid (start higher than end)."
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_server.php:629
+#: src/usr/local/www/vpn_openvpn_server.php:633
 msgid ""
 "Set this option to disable this server without removing it from the list"
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_server.php:654
+#: src/usr/local/www/vpn_openvpn_server.php:658
 msgid "Backend for authentication"
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_server.php:761
-#: src/usr/local/www/vpn_openvpn_server.php:1584
+#: src/usr/local/www/vpn_openvpn_server.php:766
+#: src/usr/local/www/vpn_openvpn_server.php:1589
 msgid ""
 "Warning: The selected server certificate was not created as an SSL Server "
 "certificate and may not work as expected"
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_server.php:765
+#: src/usr/local/www/vpn_openvpn_server.php:770
 msgid "No Certificates defined. You may create one here: "
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_server.php:765
-msgid "System &gt; Cert Manager"
+#: src/usr/local/www/vpn_openvpn_server.php:770
+msgid "System &gt; Cert. Manager"
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_server.php:775
+#: src/usr/local/www/vpn_openvpn_server.php:780
 msgid "Server certificate"
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_server.php:782
+#: src/usr/local/www/vpn_openvpn_server.php:787
 msgid "DH Parameter length (bits)"
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_server.php:827
+#: src/usr/local/www/vpn_openvpn_server.php:832
 msgid "Do Not Check"
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_server.php:825
+#: src/usr/local/www/vpn_openvpn_server.php:830
 msgid "Certificate Depth"
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_server.php:828
+#: src/usr/local/www/vpn_openvpn_server.php:833
 msgid ""
 "When a certificate-based client logs in, do not accept certificates below "
 "this depth. Useful for denying certificates made with intermediate CAs "
 "generated from the same CA as the server."
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_server.php:833
+#: src/usr/local/www/vpn_openvpn_server.php:838
 msgid "Strict User-CN Matching"
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_server.php:836
+#: src/usr/local/www/vpn_openvpn_server.php:841
 msgid ""
 "When authenticating users, enforce a match between the common name of the "
 "client certificate and the username given at login."
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_server.php:847
+#: src/usr/local/www/vpn_openvpn_server.php:852
 msgid ""
 "This is the IPv4 virtual network used for private communications between "
 "this server and client hosts expressed using CIDR (eg. 10.0.8.0/24). The "
@@ -28550,7 +29927,7 @@ msgid ""
 "clients. (see Address Pool)"
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_server.php:857
+#: src/usr/local/www/vpn_openvpn_server.php:862
 msgid ""
 "This is the IPv6 virtual network used for private communications between "
 "this server and client hosts expressed using CIDR (eg. fe80::/64). The first "
@@ -28559,15 +29936,15 @@ msgid ""
 "clients. (see Address Pool)"
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_server.php:864
+#: src/usr/local/www/vpn_openvpn_server.php:869
 msgid "Bridge DHCP"
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_server.php:871
+#: src/usr/local/www/vpn_openvpn_server.php:876
 msgid "Bridge Interface"
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_server.php:874
+#: src/usr/local/www/vpn_openvpn_server.php:879
 msgid ""
 "The interface to which this tap instance will be bridged. This is not done "
 "automatically. You must assign this interface and create the bridge "
@@ -28576,11 +29953,11 @@ msgid ""
 "Server Bridge DHCP settings below to be ignored."
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_server.php:880
+#: src/usr/local/www/vpn_openvpn_server.php:885
 msgid "Server Bridge DHCP Start"
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_server.php:883
+#: src/usr/local/www/vpn_openvpn_server.php:888
 msgid ""
 "When using tap mode as a multi-point server, you may optionally supply a "
 "DHCP range to use on the interface to which this tap instance is bridged. If "
@@ -28588,15 +29965,15 @@ msgid ""
 "the interface setting above will be ignored."
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_server.php:889
+#: src/usr/local/www/vpn_openvpn_server.php:894
 msgid "Server Bridge DHCP End"
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_server.php:903
+#: src/usr/local/www/vpn_openvpn_server.php:908
 msgid "IPv4 Local network(s)"
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_server.php:906
+#: src/usr/local/www/vpn_openvpn_server.php:911
 msgid ""
 "IPv4 networks that will be accessible from the remote endpoint. Expressed as "
 "a comma-separated list of one or more CIDR ranges. You may leave this blank "
@@ -28604,11 +29981,11 @@ msgid ""
 "the remote machine. This is generally set to your LAN network."
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_server.php:913
+#: src/usr/local/www/vpn_openvpn_server.php:918
 msgid "IPv6 Local network(s)"
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_server.php:916
+#: src/usr/local/www/vpn_openvpn_server.php:921
 msgid ""
 "IPv6 networks that will be accessible from the remote endpoint. Expressed as "
 "a comma-separated list of one or more IP/PREFIX. You may leave this blank if "
@@ -28616,49 +29993,45 @@ msgid ""
 "the remote machine. This is generally set to your LAN network."
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_server.php:940
+#: src/usr/local/www/vpn_openvpn_server.php:945
 msgid "Concurrent connections"
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_server.php:943
+#: src/usr/local/www/vpn_openvpn_server.php:948
 msgid ""
 "Specify the maximum number of clients allowed to concurrently connect to "
 "this server."
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_server.php:950
+#: src/usr/local/www/vpn_openvpn_server.php:955
 msgid ""
 "Compress tunnel packets using the LZO algorithm. Adaptive compression will "
 "dynamically disable compression for a period of time if OpenVPN detects that "
 "the data in the packets is not being compressed efficiently\""
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_server.php:963
+#: src/usr/local/www/vpn_openvpn_server.php:968
 msgid "Inter-client communication"
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_server.php:970
+#: src/usr/local/www/vpn_openvpn_server.php:975
 msgid "Duplicate Connection"
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_server.php:973
+#: src/usr/local/www/vpn_openvpn_server.php:978
 msgid ""
 "(This is not generally recommended, but may be needed for some scenarios.)"
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_server.php:984
-msgid "Client Settings"
-msgstr ""
-
-#: src/usr/local/www/vpn_openvpn_server.php:989
+#: src/usr/local/www/vpn_openvpn_server.php:994
 msgid "Dynamic IP"
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_server.php:996
+#: src/usr/local/www/vpn_openvpn_server.php:1001
 msgid "Address Pool"
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_server.php:1006
+#: src/usr/local/www/vpn_openvpn_server.php:1011
 msgid ""
 "Specifies the method used to supply a virtual adapter IP address to clients "
 "when using tun mode on IPv4.\").<br />Some clients may require this be set "
@@ -28667,97 +30040,97 @@ msgid ""
 "require \"net30\"."
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_server.php:1026
+#: src/usr/local/www/vpn_openvpn_server.php:1031
 msgid "DNS Server enable"
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_server.php:1033
+#: src/usr/local/www/vpn_openvpn_server.php:1038
 msgid "DNS Server 1"
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_server.php:1040
+#: src/usr/local/www/vpn_openvpn_server.php:1045
 msgid "DNS Server 2"
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_server.php:1047
+#: src/usr/local/www/vpn_openvpn_server.php:1052
 msgid "DNS Server 3"
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_server.php:1054
+#: src/usr/local/www/vpn_openvpn_server.php:1059
 msgid "DNS Server 4"
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_server.php:1061
+#: src/usr/local/www/vpn_openvpn_server.php:1066
 msgid "Force DNS cache update"
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_server.php:1064
+#: src/usr/local/www/vpn_openvpn_server.php:1069
 msgid "This is known to kick Windows into recognizing pushed DNS servers."
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_server.php:1068
+#: src/usr/local/www/vpn_openvpn_server.php:1073
 msgid "NTP Server enable"
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_server.php:1089
+#: src/usr/local/www/vpn_openvpn_server.php:1094
 msgid "NetBIOS enable"
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_server.php:1092
+#: src/usr/local/www/vpn_openvpn_server.php:1097
 msgid ""
 "If this option is not set, all NetBIOS-over-TCP/IP options (including WINS) "
 "will be disabled"
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_server.php:1099
+#: src/usr/local/www/vpn_openvpn_server.php:1104
 msgid ""
 "Possible options: b-node (broadcasts), p-node (point-to-point name queries "
 "to a WINS server), m-node (broadcast then query name server), and h-node "
 "(query name server, then broadcast)"
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_server.php:1104
+#: src/usr/local/www/vpn_openvpn_server.php:1109
 msgid "Scope ID"
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_server.php:1107
+#: src/usr/local/www/vpn_openvpn_server.php:1112
 msgid ""
 "A NetBIOS Scope ID provides an extended naming service for NetBIOS over TCP/"
 "IP. The NetBIOS scope ID isolates NetBIOS traffic on a single network to "
 "only those nodes with the same NetBIOS scope ID"
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_server.php:1113
+#: src/usr/local/www/vpn_openvpn_server.php:1118
 msgid "WINS server enable"
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_server.php:1120
+#: src/usr/local/www/vpn_openvpn_server.php:1125
 msgid "WINS Server 1"
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_server.php:1127
+#: src/usr/local/www/vpn_openvpn_server.php:1132
 msgid "WINS Server 2"
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_server.php:1134
+#: src/usr/local/www/vpn_openvpn_server.php:1139
 msgid "Enable custom port "
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_server.php:1141
+#: src/usr/local/www/vpn_openvpn_server.php:1146
 msgid "Management port"
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_server.php:1144
+#: src/usr/local/www/vpn_openvpn_server.php:1149
 msgid ""
 "The default port is 166. Specify a different port if the client machines "
 "need to select from multiple OpenVPN links."
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_server.php:1191
+#: src/usr/local/www/vpn_openvpn_server.php:1196
 msgid "OpenVPN Servers"
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_server.php:1196
+#: src/usr/local/www/vpn_openvpn_server.php:1201
 msgid "Protocol / Port"
 msgstr ""
 
@@ -28798,10 +30171,10 @@ msgid "Traffic Graphs"
 msgstr ""
 
 #: src/usr/local/www/widgets/include/wake_on_lan.inc:4
-msgid "Wake On Lan"
+msgid "Wake-on-Lan"
 msgstr ""
 
-#: src/usr/local/www/widgets/widgets/captive_portal_status.widget.php:154
+#: src/usr/local/www/widgets/widgets/captive_portal_status.widget.php:150
 msgid "delete"
 msgstr ""
 
@@ -28814,11 +30187,11 @@ msgstr ""
 msgid "Click %1$shere%2$s to configure CARP."
 msgstr ""
 
-#: src/usr/local/www/widgets/widgets/dyn_dns_status.widget.php:110
+#: src/usr/local/www/widgets/widgets/dyn_dns_status.widget.php:128
 msgid "Int."
 msgstr ""
 
-#: src/usr/local/www/widgets/widgets/dyn_dns_status.widget.php:159
+#: src/usr/local/www/widgets/widgets/dyn_dns_status.widget.php:183
 msgid "Checking ..."
 msgstr ""
 
@@ -28842,25 +30215,29 @@ msgstr ""
 msgid "Latency"
 msgstr ""
 
-#: src/usr/local/www/widgets/widgets/installed_packages.widget.php:77
+#: src/usr/local/www/widgets/widgets/gateways.widget.php:248
+msgid "Online <br/>(unmonitored)"
+msgstr ""
+
+#: src/usr/local/www/widgets/widgets/installed_packages.widget.php:76
 msgid "No packages installed."
 msgstr ""
 
-#: src/usr/local/www/widgets/widgets/installed_packages.widget.php:78
+#: src/usr/local/www/widgets/widgets/installed_packages.widget.php:76
 msgid ""
 "You can install packages <a href=\"pkg_mgr.php\" class=\"alert-link\">here</"
 "a>."
 msgstr ""
 
-#: src/usr/local/www/widgets/widgets/installed_packages.widget.php:124
+#: src/usr/local/www/widgets/widgets/installed_packages.widget.php:121
 msgid "ok"
 msgstr ""
 
-#: src/usr/local/www/widgets/widgets/installed_packages.widget.php:178
+#: src/usr/local/www/widgets/widgets/installed_packages.widget.php:175
 msgid "Retrieving package data"
 msgstr ""
 
-#: src/usr/local/www/widgets/widgets/installed_packages.widget.php:183
+#: src/usr/local/www/widgets/widgets/installed_packages.widget.php:180
 msgid "Packages may be added/managed here: "
 msgstr ""
 
@@ -28944,19 +30321,23 @@ msgstr ""
 msgid "Rule that triggered this action"
 msgstr ""
 
-#: src/usr/local/www/widgets/widgets/log.widget.php:246
+#: src/usr/local/www/widgets/widgets/log.widget.php:194
+msgid "No logs to display"
+msgstr ""
+
+#: src/usr/local/www/widgets/widgets/log.widget.php:245
 msgid "Number of entries"
 msgstr ""
 
-#: src/usr/local/www/widgets/widgets/log.widget.php:254
+#: src/usr/local/www/widgets/widgets/log.widget.php:253
 msgid "Filter actions"
 msgstr ""
 
-#: src/usr/local/www/widgets/widgets/log.widget.php:274
+#: src/usr/local/www/widgets/widgets/log.widget.php:273
 msgid "Filter interface"
 msgstr ""
 
-#: src/usr/local/www/widgets/widgets/log.widget.php:287
+#: src/usr/local/www/widgets/widgets/log.widget.php:286
 msgid "Update interval"
 msgstr ""
 
@@ -29017,6 +30398,10 @@ msgid ""
 "'Local port' setting in the OpenVPN client screen"
 msgstr ""
 
+#: src/usr/local/www/widgets/widgets/openvpn.widget.php:263
+msgid "No OpenVPN instances defined"
+msgstr ""
+
 #: src/usr/local/www/widgets/widgets/picture.widget.php:81
 msgid "New picture:"
 msgstr ""
@@ -29041,11 +30426,15 @@ msgstr ""
 msgid "Content limit"
 msgstr ""
 
-#: src/usr/local/www/widgets/widgets/services_status.widget.php:81
+#: src/usr/local/www/widgets/widgets/services_status.widget.php:99
 msgid "Saved Service Status Filter via Dashboard"
 msgstr ""
 
-#: src/usr/local/www/widgets/widgets/services_status.widget.php:130
+#: src/usr/local/www/widgets/widgets/services_status.widget.php:137
+msgid "No services found"
+msgstr ""
+
+#: src/usr/local/www/widgets/widgets/services_status.widget.php:148
 msgid "Hidden services"
 msgstr ""
 
@@ -29279,16 +30668,16 @@ msgstr ""
 
 #: src/usr/local/www/wizard.php:92 src/usr/local/www/wizard.php:104
 #, php-format
-msgid "ERROR:  Could not open %s."
+msgid "Could not open %s."
 msgstr ""
 
 #: src/usr/local/www/wizard.php:98
-msgid "ERROR: Invalid path specified."
+msgid "Invalid path specified."
 msgstr ""
 
 #: src/usr/local/www/wizard.php:110
 #, php-format
-msgid "ERROR: Could not parse %s/wizards/%s file."
+msgid "Could not parse %s/wizards/%s file."
 msgstr ""
 
 #: src/usr/local/www/wizard.php:217
@@ -29443,13 +30832,13 @@ msgid ""
 "completion."
 msgstr ""
 
-#: src/usr/local/www/xmlrpc.php:276 src/usr/local/www/xmlrpc.php:371
-#: src/usr/local/www/xmlrpc.php:402
+#: src/usr/local/www/xmlrpc.php:264 src/usr/local/www/xmlrpc.php:359
+#: src/usr/local/www/xmlrpc.php:390
 #, php-format
 msgid "Merged in config (%s sections) from XMLRPC client."
 msgstr ""
 
-#: src/usr/local/www/xmlrpc.php:347
+#: src/usr/local/www/xmlrpc.php:335
 msgid ""
 "XMLRPC wrapper for merging package sections. This method must be called with "
 "two parameters: a string containing the local system\\'s password and an "
@@ -29457,7 +30846,7 @@ msgid ""
 "completion."
 msgstr ""
 
-#: src/usr/local/www/xmlrpc.php:377
+#: src/usr/local/www/xmlrpc.php:365
 msgid ""
 "XMLRPC wrapper for merge_config_section. This method must be called with two "
 "parameters: a string containing the local system\\'s password and an array "
@@ -29465,24 +30854,24 @@ msgid ""
 "completion."
 msgstr ""
 
-#: src/usr/local/www/xmlrpc.php:407
+#: src/usr/local/www/xmlrpc.php:395
 msgid ""
 "Basic XMLRPC wrapper for filter_configure. This method must be called with "
 "one parameter: a string containing the local system\\'s password. This "
 "function returns true upon completion."
 msgstr ""
 
-#: src/usr/local/www/xmlrpc.php:445
+#: src/usr/local/www/xmlrpc.php:452
 msgid "Basic XMLRPC wrapper for configuring CARP interfaces."
 msgstr ""
 
-#: src/usr/local/www/xmlrpc.php:472
+#: src/usr/local/www/xmlrpc.php:479
 msgid ""
 "Basic XMLRPC wrapper for host_firmware_version. This function will return "
 "the output of host_firmware_version upon completion."
 msgstr ""
 
-#: src/usr/local/www/xmlrpc.php:493
+#: src/usr/local/www/xmlrpc.php:500
 msgid "Basic XMLRPC wrapper for rc.reboot."
 msgstr ""
 
@@ -29528,7 +30917,7 @@ msgstr ""
 msgid "Encrypt this configuration file."
 msgstr ""
 
-#: src/usr/local/www/diag_backup.php:696
+#: src/usr/local/www/diag_backup.php:697
 msgid "Configuration file is encrypted."
 msgstr ""
 
@@ -29542,11 +30931,11 @@ msgid ""
 "\">System > Advanced, Miscellaneous</a> tab."
 msgstr ""
 
-#: src/usr/local/www/diag_packet_capture.php:305
+#: src/usr/local/www/diag_packet_capture.php:309
 msgid "Packet capture will be performed using promiscuous mode"
 msgstr ""
 
-#: src/usr/local/www/diag_packet_capture.php:377
+#: src/usr/local/www/diag_packet_capture.php:381
 msgid "Do reverse DNS lookup"
 msgstr ""
 
@@ -29562,47 +30951,43 @@ msgstr ""
 msgid "Reset firewall source tracking"
 msgstr ""
 
-#: src/usr/local/www/diag_smart.php:314
+#: src/usr/local/www/diag_smart.php:322
 msgid "Info"
 msgstr ""
 
-#: src/usr/local/www/diag_smart.php:322
+#: src/usr/local/www/diag_smart.php:330
 msgid "Health"
 msgstr ""
 
-#: src/usr/local/www/diag_smart.php:330
-msgid "SMART Capabilities"
+#: src/usr/local/www/diag_smart.php:338
+msgid "S.M.A.R.T. Capabilities"
 msgstr ""
 
-#: src/usr/local/www/diag_smart.php:338
+#: src/usr/local/www/diag_smart.php:346
 msgid "Attributes"
 msgstr ""
 
-#: src/usr/local/www/diag_smart.php:398
+#: src/usr/local/www/diag_smart.php:408
 msgid "Short"
 msgstr ""
 
-#: src/usr/local/www/diag_smart.php:406
+#: src/usr/local/www/diag_smart.php:416
 msgid "Long"
 msgstr ""
 
-#: src/usr/local/www/diag_smart.php:414
+#: src/usr/local/www/diag_smart.php:424
 msgid "Conveyance"
 msgstr ""
 
-#: src/usr/local/www/diag_smart.php:459
-msgid "Error"
-msgstr ""
-
-#: src/usr/local/www/diag_smart.php:467
+#: src/usr/local/www/diag_smart.php:479
 msgid "Self-test"
 msgstr ""
 
-#: src/usr/local/www/diag_testport.php:280
+#: src/usr/local/www/diag_testport.php:279
 msgid "Show remote text"
 msgstr ""
 
-#: src/usr/local/www/firewall_aliases_edit.php:698
+#: src/usr/local/www/firewall_aliases_edit.php:700
 msgid "<span class=\"helptext\">"
 msgstr ""
 
@@ -29611,7 +30996,7 @@ msgid "This rule will be excluded from the NAT"
 msgstr ""
 
 #: src/usr/local/www/firewall_nat_1to1_edit.php:412
-#: src/usr/local/www/firewall_nat_edit.php:683
+#: src/usr/local/www/firewall_nat_edit.php:677
 msgid "Disable redirection for traffic matching this rule"
 msgstr ""
 
@@ -29623,20 +31008,20 @@ msgstr ""
 msgid "Not"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat_edit.php:676
+#: src/usr/local/www/firewall_nat_edit.php:670
 #: src/usr/local/www/firewall_nat_npt_edit.php:226
 #: src/usr/local/www/firewall_nat_out_edit.php:452
-#: src/usr/local/www/firewall_rules_edit.php:1100
+#: src/usr/local/www/firewall_rules_edit.php:1137
 msgid "Disable this rule"
 msgstr ""
 
-#: src/usr/local/www/firewall_nat_edit.php:749
-#: src/usr/local/www/firewall_nat_edit.php:816
-#: src/usr/local/www/firewall_rules_edit.php:1247
+#: src/usr/local/www/firewall_nat_edit.php:743
+#: src/usr/local/www/firewall_nat_edit.php:810
+#: src/usr/local/www/firewall_rules_edit.php:1284
 msgid "Invert match."
 msgstr ""
 
-#: src/usr/local/www/firewall_nat_edit.php:912
+#: src/usr/local/www/firewall_nat_edit.php:906
 msgid "Do not automatically sync to other CARP members"
 msgstr ""
 
@@ -29650,96 +31035,96 @@ msgstr ""
 msgid "Static port"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:1109
+#: src/usr/local/www/firewall_rules_edit.php:1146
 msgid "Apply the action immediately on match."
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:1127
+#: src/usr/local/www/firewall_rules_edit.php:1164
 msgid ""
 "<span class=\"help-block\">This is associated with a NAT rule.<br/>You "
 "cannot edit the interface, protocol, source, or destination of associated "
 "filter rules."
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:1375
+#: src/usr/local/www/firewall_rules_edit.php:1412
 msgid "Log packets that are handled by this rule"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:1427
+#: src/usr/local/www/firewall_rules_edit.php:1464
 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:1435
+#: src/usr/local/www/firewall_rules_edit.php:1472
 msgid "Disable auto generated reply-to for this rule."
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:1513
+#: src/usr/local/www/firewall_rules_edit.php:1550
 msgid "Prevent states created by this rule to be sync'ed over pfsync."
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:1533
+#: src/usr/local/www/firewall_rules_edit.php:1570
 msgid ""
 "Prevent the rule on Master from automatically syncing to other CARP members"
 msgstr ""
 
-#: src/usr/local/www/firewall_rules_edit.php:1667
-#: src/usr/local/www/firewall_rules_edit.php:1674
+#: src/usr/local/www/firewall_rules_edit.php:1704
+#: src/usr/local/www/firewall_rules_edit.php:1711
 msgid "<b>"
 msgstr ""
 
-#: src/usr/local/www/firewall_virtual_ip_edit.php:427
+#: src/usr/local/www/firewall_virtual_ip_edit.php:416
 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:1725
+#: src/usr/local/www/interfaces.php:1715
 msgid "Enable interface"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:1867 src/usr/local/www/interfaces.php:3167
+#: src/usr/local/www/interfaces.php:1857 src/usr/local/www/interfaces.php:3169
 msgid "Default gateway"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:1921
-msgid "Show DHCP advanced options"
+#: src/usr/local/www/interfaces.php:1918 src/usr/local/www/interfaces.php:2101
+msgid "Configuration Override"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2009
+#: src/usr/local/www/interfaces.php:1999
 msgid "FreeBSD default"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2025
+#: src/usr/local/www/interfaces.php:2015
 msgid "pfSense Default"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2033
+#: src/usr/local/www/interfaces.php:2023
 msgid "Saved Cfg"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2101
-msgid "Show DHCPv6 advanced options"
-msgstr ""
-
-#: src/usr/local/www/interfaces.php:2109
-msgid "Override the configuration from this file"
-msgstr ""
-
-#: src/usr/local/www/interfaces.php:2117
+#: src/usr/local/www/interfaces.php:2110
 msgid "Request a IPv6 prefix/information through the IPv4 connectivity link"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2124
+#: src/usr/local/www/interfaces.php:2117
 msgid "Only request an IPv6 prefix, do not request an IPv6 address"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2138
+#: src/usr/local/www/interfaces.php:2131
 msgid ""
 "Send an IPv6 prefix hint to indicate the desired prefix size for delegation"
 msgstr ""
 
+#: src/usr/local/www/interfaces.php:2138
+msgid "Start DHCP6 client in debug mode"
+msgstr ""
+
+#: src/usr/local/www/interfaces.php:2162
+msgid "Exchange Information Only"
+msgstr ""
+
 #: src/usr/local/www/interfaces.php:2198
 msgid "Non-Temporary Address Allocation"
 msgstr ""
@@ -29748,73 +31133,73 @@ msgstr ""
 msgid "Prefix Delegation "
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2577 src/usr/local/www/interfaces.php:2713
+#: src/usr/local/www/interfaces.php:2579 src/usr/local/www/interfaces.php:2715
 msgid "Enable Dial-On-Demand mode "
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2635
+#: src/usr/local/www/interfaces.php:2637
 msgid "Reset at each month (\"0 0 1 * *\")"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2643
+#: src/usr/local/www/interfaces.php:2645
 msgid "Reset at each week (\"0 0 * * 0\")"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2651
+#: src/usr/local/www/interfaces.php:2653
 msgid "Reset at each day (\"0 0 * * *\")"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2659
+#: src/usr/local/www/interfaces.php:2661
 msgid "Reset at each hour (\"0 * * * *\")"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2669 src/usr/local/www/interfaces.php:2737
+#: src/usr/local/www/interfaces.php:2671 src/usr/local/www/interfaces.php:2739
 msgid "<a href=\"/interfaces_ppps_edit.php?id="
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2674
+#: src/usr/local/www/interfaces.php:2676
 msgid ""
 "<a href=\"/interfaces_ppps_edit.php\" class=\"navlnk\">Click here for "
 "additional PPPoE configuration options and for MLPPP configuration.</a>"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2742
+#: src/usr/local/www/interfaces.php:2744
 msgid ""
 "<a href=\"/interfaces_ppps_edit.php\" class=\"navlnk\">Click here for "
 "additional PPTP and L2TP configuration options.</a>"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2756
+#: src/usr/local/www/interfaces.php:2758
 msgid ""
 "Preserve common wireless configuration through interface deletions and "
 "reassignments."
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2956
+#: src/usr/local/www/interfaces.php:2958
 msgid ""
 "Allow packets to pass between wireless clients directly when operating as an "
 "access point"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2964
+#: src/usr/local/www/interfaces.php:2966
 msgid "Force the card to use WME (wireless QoS)"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:2972
+#: src/usr/local/www/interfaces.php:2974
 msgid ""
-"Force the card to NOT broadcast its SSID (This may cause problems for some "
-"clients)"
+"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:2985
+#: src/usr/local/www/interfaces.php:2987
 msgid "Enable WPA"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:3037
+#: src/usr/local/www/interfaces.php:3039
 msgid "Force the AP to rekey whenever a client disassociates"
 msgstr ""
 
-#: src/usr/local/www/interfaces.php:3049
+#: src/usr/local/www/interfaces.php:3051
 msgid "Enable 802.1X authentication"
 msgstr ""
 
@@ -29838,55 +31223,55 @@ msgid ""
 "version 1."
 msgstr ""
 
-#: src/usr/local/www/interfaces_ppps_edit.php:697
+#: src/usr/local/www/interfaces_ppps_edit.php:717
 msgid "Enable persistent logging of connection uptime. "
 msgstr ""
 
-#: src/usr/local/www/interfaces_ppps_edit.php:714
+#: src/usr/local/www/interfaces_ppps_edit.php:734
 msgid "Configure NULL service name"
 msgstr ""
 
-#: src/usr/local/www/interfaces_ppps_edit.php:769
+#: src/usr/local/www/interfaces_ppps_edit.php:789
 msgid "Monthly (0 0 1 * *)"
 msgstr ""
 
-#: src/usr/local/www/interfaces_ppps_edit.php:777
+#: src/usr/local/www/interfaces_ppps_edit.php:797
 msgid "Weekly (0 0 * * 0)"
 msgstr ""
 
-#: src/usr/local/www/interfaces_ppps_edit.php:785
+#: src/usr/local/www/interfaces_ppps_edit.php:805
 msgid "Daily (0 0 * * *)"
 msgstr ""
 
-#: src/usr/local/www/interfaces_ppps_edit.php:793
+#: src/usr/local/www/interfaces_ppps_edit.php:813
 msgid "Hourly (0 * * * *)"
 msgstr ""
 
-#: src/usr/local/www/interfaces_ppps_edit.php:820
+#: src/usr/local/www/interfaces_ppps_edit.php:840
 msgid "Enable Dial-on-Demand mode. "
 msgstr ""
 
-#: src/usr/local/www/interfaces_ppps_edit.php:837
+#: src/usr/local/www/interfaces_ppps_edit.php:857
 msgid "Disable vjcomp (compression, auto-negotiated by default)."
 msgstr ""
 
-#: src/usr/local/www/interfaces_ppps_edit.php:847
+#: src/usr/local/www/interfaces_ppps_edit.php:867
 msgid "Disable tcpmssfix (enabled by default)."
 msgstr ""
 
-#: src/usr/local/www/interfaces_ppps_edit.php:858
+#: src/usr/local/www/interfaces_ppps_edit.php:878
 msgid "Disable shortseq (auto-negotiated by default)."
 msgstr ""
 
-#: src/usr/local/www/interfaces_ppps_edit.php:866
+#: src/usr/local/www/interfaces_ppps_edit.php:886
 msgid "Disable ACF compression (auto-negotiated by default)"
 msgstr ""
 
-#: src/usr/local/www/interfaces_ppps_edit.php:873
+#: src/usr/local/www/interfaces_ppps_edit.php:893
 msgid "Disable Protocol compression (auto-negotiated by default)"
 msgstr ""
 
-#: src/usr/local/www/interfaces_ppps_edit.php:921
+#: src/usr/local/www/interfaces_ppps_edit.php:939
 msgid "<span id=\"linkparamhelp\">"
 msgstr ""
 
@@ -29912,111 +31297,111 @@ msgstr ""
 msgid "Please add a pool on the \"Pools\" tab to use this feature. "
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:577
+#: src/usr/local/www/services_captiveportal.php:578
 msgid "Enable Captive Portal"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:625
+#: src/usr/local/www/services_captiveportal.php:626
 msgid "Enable waiting period reset on attempted access"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:632
+#: src/usr/local/www/services_captiveportal.php:633
 msgid "Enable logout popup window"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:661
+#: src/usr/local/www/services_captiveportal.php:662
 msgid "Disable Concurrent user logins"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:669
+#: src/usr/local/www/services_captiveportal.php:670
 msgid "Disable MAC filtering"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:678
+#: src/usr/local/www/services_captiveportal.php:679
 msgid "Enable Pass-through MAC automatic additions"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:688
+#: src/usr/local/www/services_captiveportal.php:689
 msgid "Enable Pass-through MAC automatic addition with username"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:697
+#: src/usr/local/www/services_captiveportal.php:698
 msgid "Enable per-user bandwidth restriction"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:726
+#: src/usr/local/www/services_captiveportal.php:727
 msgid "No Authentication"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:734
+#: src/usr/local/www/services_captiveportal.php:735
 msgid "Local User Manager / Vouchers"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:742
+#: src/usr/local/www/services_captiveportal.php:743
 msgid "RADIUS Authentication"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:752
+#: src/usr/local/www/services_captiveportal.php:753
 msgid "Allow only users/groups with \"Captive portal login\" privilege set"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:762
+#: src/usr/local/www/services_captiveportal.php:763
 msgid "PAP"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:770
+#: src/usr/local/www/services_captiveportal.php:771
 msgid "CHAP-MD5"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:778
+#: src/usr/local/www/services_captiveportal.php:779
 msgid "MSCHAPv1"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:786
+#: src/usr/local/www/services_captiveportal.php:787
 msgid "MSCHAPv2"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:906
+#: src/usr/local/www/services_captiveportal.php:907
 msgid "Send RADIUS accounting packets to the primary RADIUS server."
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:922
+#: src/usr/local/www/services_captiveportal.php:923
 msgid "No updates"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:930
+#: src/usr/local/www/services_captiveportal.php:931
 msgid "Stop/Start"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:938
+#: src/usr/local/www/services_captiveportal.php:939
 msgid "Stop/Start (FreeRADIUS)"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:946
+#: src/usr/local/www/services_captiveportal.php:947
 msgid "Interim"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:961
+#: src/usr/local/www/services_captiveportal.php:962
 msgid "Reauthenticate connected users every minute"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:969
+#: src/usr/local/www/services_captiveportal.php:970
 msgid "Enable RADIUS MAC authentication"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:991
+#: src/usr/local/www/services_captiveportal.php:992
 msgid "Use RADIUS Session-Timeout attributes"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:1007
+#: src/usr/local/www/services_captiveportal.php:1008
 msgid "Invert Acct-Input-Octets and Acct-Output-Octets"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:1040
+#: src/usr/local/www/services_captiveportal.php:1041
 msgid "Enable HTTPS login"
 msgstr ""
 
-#: src/usr/local/www/services_captiveportal.php:1064
+#: src/usr/local/www/services_captiveportal.php:1065
 msgid "Disable HTTPS Forwards"
 msgstr ""
 
@@ -30024,64 +31409,58 @@ msgstr ""
 msgid "Enable the creation, generation and activation of rolls with vouchers"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:769
-msgid ""
-"<div class=\"alert alert-info\"> Editing Pool-Specific Options. To return to "
-"the Interface, click its tab above. </div>"
-msgstr ""
-
-#: src/usr/local/www/services_dhcp.php:776
+#: src/usr/local/www/services_dhcp.php:805
 msgid "Only the clients defined below will get DHCP leases from this server."
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:783
+#: src/usr/local/www/services_dhcp.php:812
 msgid "Denied clients will be ignored rather than rejected."
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:959
+#: src/usr/local/www/services_dhcp.php:982
 msgid "Enable Static ARP entries"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:966
+#: src/usr/local/www/services_dhcp.php:989
 msgid "Change DHCP display lease time from UTC to local time"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:973
+#: src/usr/local/www/services_dhcp.php:996
 msgid "Enable RRD statistics graphs"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:994
+#: src/usr/local/www/services_dhcp.php:1017
 msgid "Enable registration of DHCP client names in DNS"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:1137
+#: src/usr/local/www/services_dhcp.php:1160
 msgid "<div class=\"alert alert-info\"> "
 msgstr ""
 
-#: src/usr/local/www/services_dhcp.php:1213
+#: src/usr/local/www/services_dhcp.php:1236
 msgid "Enables network booting"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp_edit.php:491
+#: src/usr/local/www/services_dhcp_edit.php:495
 msgid "Create an ARP Table Static Entry for this MAC & IP Address pair."
 msgstr ""
 
-#: src/usr/local/www/services_dhcp_edit.php:596
-#: src/usr/local/www/services_dhcp_edit.php:642
-#: src/usr/local/www/services_dhcp_edit.php:676
-#: src/usr/local/www/services_dhcpv6.php:687
-#: src/usr/local/www/services_dhcpv6.php:733
+#: src/usr/local/www/services_dhcp_edit.php:600
+#: src/usr/local/www/services_dhcp_edit.php:646
+#: src/usr/local/www/services_dhcp_edit.php:680
 #: src/usr/local/www/services_dhcpv6.php:767
-#: src/usr/local/www/services_dhcpv6.php:786
-#: src/usr/local/www/services_dhcpv6.php:812
-#: src/usr/local/www/services_ntpd_gps.php:383
+#: src/usr/local/www/services_dhcpv6.php:833
+#: src/usr/local/www/services_dhcpv6.php:867
+#: src/usr/local/www/services_dhcpv6.php:886
+#: src/usr/local/www/services_dhcpv6.php:912
+#: src/usr/local/www/services_ntpd_gps.php:384
 #: src/usr/local/www/services_pppoe_edit.php:575
-#: src/usr/local/www/services_unbound.php:352
+#: src/usr/local/www/services_unbound.php:377
 msgid "&nbsp;"
 msgstr ""
 
-#: src/usr/local/www/services_dhcp_edit.php:602
-#: src/usr/local/www/services_dhcpv6.php:693
+#: src/usr/local/www/services_dhcp_edit.php:606
+#: src/usr/local/www/services_dhcpv6.php:773
 msgid "Enable registration of DHCP client names in DNS."
 msgstr ""
 
@@ -30094,23 +31473,27 @@ msgstr ""
 msgid "Append circuit ID and agent ID to requests"
 msgstr ""
 
-#: src/usr/local/www/services_dhcpv6.php:529
+#: src/usr/local/www/services_dhcpv6.php:603
 msgid "Enable DHCPv6 server on interface "
 msgstr ""
 
-#: src/usr/local/www/services_dhcpv6.php:542
+#: src/usr/local/www/services_dhcpv6.php:621
 msgid " bits"
 msgstr ""
 
-#: src/usr/local/www/services_dhcpv6.php:547
+#: src/usr/local/www/services_dhcpv6.php:626
 msgid " to "
 msgstr ""
 
-#: src/usr/local/www/services_dhcpv6.php:672
+#: src/usr/local/www/services_dhcpv6.php:752
 msgid "Change DHCPv6 display lease time from UTC to local time"
 msgstr ""
 
-#: src/usr/local/www/services_dhcpv6.php:792
+#: src/usr/local/www/services_dhcpv6.php:820
+msgid "Add reverse dynamic DNS entries."
+msgstr ""
+
+#: src/usr/local/www/services_dhcpv6.php:892
 msgid "Enable Network Booting"
 msgstr ""
 
@@ -30146,78 +31529,76 @@ msgstr ""
 msgid "Do not forward private reverse lookups"
 msgstr ""
 
-#: src/usr/local/www/services_dyndns_edit.php:283
-#: src/usr/local/www/vpn_openvpn_client.php:459
+#: src/usr/local/www/services_dyndns_edit.php:293
+#: src/usr/local/www/vpn_openvpn_client.php:463
 msgid "Disable this client"
 msgstr ""
 
-#: src/usr/local/www/services_dyndns_edit.php:344
+#: src/usr/local/www/services_dyndns_edit.php:354
 msgid "Enable Wildcard"
 msgstr ""
 
-#: src/usr/local/www/services_dyndns_edit.php:351
+#: src/usr/local/www/services_dyndns_edit.php:361
 msgid "Enable verbose logging"
 msgstr ""
 
-#: src/usr/local/www/services_dyndns_edit.php:358
+#: src/usr/local/www/services_dyndns_edit.php:368
 msgid "Force IPv4 resolving"
 msgstr ""
 
-#: src/usr/local/www/services_dyndns_edit.php:365
+#: src/usr/local/www/services_dyndns_edit.php:375
 msgid "Verify SSL peer"
 msgstr ""
 
-#: src/usr/local/www/services_ntpd.php:360
+#: src/usr/local/www/services_ntpd.php:312
 msgid "Enable RRD graphs of NTP statistics (default: disabled)."
 msgstr ""
 
-#: src/usr/local/www/services_ntpd.php:367
+#: src/usr/local/www/services_ntpd.php:319
 msgid "Log peer messages (default: disabled)."
 msgstr ""
 
-#: src/usr/local/www/services_ntpd.php:374
+#: src/usr/local/www/services_ntpd.php:326
 msgid "Log system messages (default: disabled)."
 msgstr ""
 
-#: src/usr/local/www/services_ntpd.php:395
+#: src/usr/local/www/services_ntpd.php:347
 msgid "Log reference clock statistics (default: disabled)."
 msgstr ""
 
-#: src/usr/local/www/services_ntpd.php:402
+#: src/usr/local/www/services_ntpd.php:354
 msgid "Log clock discipline statistics (default: disabled)."
 msgstr ""
 
-#: src/usr/local/www/services_ntpd.php:409
+#: src/usr/local/www/services_ntpd.php:361
 msgid "Log NTP peer statistics (default: disabled)."
 msgstr ""
 
-#: src/usr/local/www/services_ntpd.php:429
-msgid "Enable Kiss-o'-death packets (default: checked)."
+#: src/usr/local/www/services_ntpd_acls.php:220
+msgid "Enable KOD packets."
 msgstr ""
 
-#: src/usr/local/www/services_ntpd.php:436
-msgid ""
-"Deny state modifications (i.e. run time configuration) by ntpq and ntpdc "
-"(default: checked)."
+#: src/usr/local/www/services_ntpd_acls.php:227
+msgid "Deny run-time Configuration (nomodify) by ntpq and ntpdc."
 msgstr ""
 
-#: src/usr/local/www/services_ntpd.php:443
-msgid "Disable ntpq and ntpdc queries (default: unchecked)."
+#: src/usr/local/www/services_ntpd_acls.php:234
+msgid "Disable ntpq and ntpdc queries (noquery)."
 msgstr ""
 
-#: src/usr/local/www/services_ntpd.php:450
-msgid "Disable all except ntpq and ntpdc queries (default: unchecked)."
+#: src/usr/local/www/services_ntpd_acls.php:241
+msgid "Disable all except ntpq and ntpdc queries (noserve)."
 msgstr ""
 
-#: src/usr/local/www/services_ntpd.php:457
-msgid "Deny packets that attempt a peer association (default: checked)."
+#: src/usr/local/www/services_ntpd_acls.php:248
+msgid "Deny packets that attempt a peer association (nopeer)."
 msgstr ""
 
-#: src/usr/local/www/services_ntpd.php:464
-msgid "Deny mode 6 control message trap service (default: checked)."
+#: src/usr/local/www/services_ntpd_acls.php:255
+msgid "Deny mode 6 control message trap service (notrap)."
 msgstr ""
 
-#: src/usr/local/www/services_ntpd_gps.php:241
+#: src/usr/local/www/services_ntpd_gps.php:242
 msgid ""
 "A GPS connected via a serial port may be used as a reference clock for NTP. "
 "If the GPS also supports PPS and is properly configured, and connected, that "
@@ -30225,44 +31606,44 @@ msgid ""
 "may work, but is not recommended due to USB bus timing issues.<br />For the "
 "best results, NTP should have at least three sources of time. So it is best "
 "to configure at least 2 servers under <a href=\"services_ntpd.php\">Services "
-"> NTP</a> to minimize clock drift if the GPS data is not valid over time. "
-"Otherwise ntpd may only use values from the unsynchronized local clock when "
-"providing time to clients."
+"> NTP > Settings</a> to minimize clock drift if the GPS data is not valid "
+"over time. Otherwise ntpd may only use values from the unsynchronized local "
+"clock when providing time to clients."
 msgstr ""
 
-#: src/usr/local/www/services_ntpd_gps.php:319
+#: src/usr/local/www/services_ntpd_gps.php:320
 msgid "Prefer this clock (default: checked)."
 msgstr ""
 
-#: src/usr/local/www/services_ntpd_gps.php:326
+#: src/usr/local/www/services_ntpd_gps.php:327
 msgid "Do not use this clock, display for reference only (default: unchecked)."
 msgstr ""
 
-#: src/usr/local/www/services_ntpd_gps.php:333
+#: src/usr/local/www/services_ntpd_gps.php:334
 msgid "Enable PPS signal processing (default: checked)."
 msgstr ""
 
-#: src/usr/local/www/services_ntpd_gps.php:340
-#: src/usr/local/www/services_ntpd_pps.php:202
+#: src/usr/local/www/services_ntpd_gps.php:341
+#: src/usr/local/www/services_ntpd_pps.php:203
 msgid ""
 "Enable falling edge PPS signal processing (default: unchecked, rising edge)."
 msgstr ""
 
-#: src/usr/local/www/services_ntpd_gps.php:347
+#: src/usr/local/www/services_ntpd_gps.php:348
 msgid "Enable kernel PPS clock discipline (default: checked)."
 msgstr ""
 
-#: src/usr/local/www/services_ntpd_gps.php:354
+#: src/usr/local/www/services_ntpd_gps.php:355
 msgid "Obscure location in timestamp (default: unchecked, unobscured)."
 msgstr ""
 
-#: src/usr/local/www/services_ntpd_gps.php:361
+#: src/usr/local/www/services_ntpd_gps.php:362
 msgid ""
 "Log the sub-second fraction of the received time stamp (default: unchecked, "
 "not logged)."
 msgstr ""
 
-#: src/usr/local/www/services_ntpd_pps.php:160
+#: src/usr/local/www/services_ntpd_pps.php:161
 msgid ""
 "Devices with a Pulse Per Second output such as radios that receive a time "
 "signal from DCF77 (DE), JJY (JP), MSF (GB) or WWVB (US) may be used as a PPS "
@@ -30270,15 +31651,15 @@ msgid ""
 "would usually be the better option. A PPS signal only provides a reference "
 "to the change of a second, so at least one other source to number the "
 "seconds is required.<br /><br />At least 3 additional time sources should be "
-"configured under <a href=\"services_ntpd.php\">Services > NTP</a> to "
-"reliably supply the time of each PPS pulse."
+"configured under <a href=\"services_ntpd.php\">Services > NTP > Settings</a> "
+"to reliably supply the time of each PPS pulse."
 msgstr ""
 
-#: src/usr/local/www/services_ntpd_pps.php:209
+#: src/usr/local/www/services_ntpd_pps.php:210
 msgid "Enable kernel PPS clock discipline (default: unchecked)."
 msgstr ""
 
-#: src/usr/local/www/services_ntpd_pps.php:216
+#: src/usr/local/www/services_ntpd_pps.php:217
 msgid ""
 "Record a timestamp once for each second, useful for constructing Allan "
 "deviation plots (default: unchecked)."
@@ -30304,25 +31685,25 @@ msgstr ""
 msgid "Assign IP Addresses to users via RADIUS server reply attributes"
 msgstr ""
 
-#: src/usr/local/www/services_rfc2136_edit.php:262
+#: src/usr/local/www/services_rfc2136_edit.php:281
 msgid "Use TCP instead of UDP"
 msgstr ""
 
-#: src/usr/local/www/services_rfc2136_edit.php:269
+#: src/usr/local/www/services_rfc2136_edit.php:288
 msgid ""
 "If the interface IP is private, attempt to fetch and use the public IP "
 "instead."
 msgstr ""
 
-#: src/usr/local/www/services_rfc2136_edit.php:278
+#: src/usr/local/www/services_rfc2136_edit.php:297
 msgid "A (IPv4)"
 msgstr ""
 
-#: src/usr/local/www/services_rfc2136_edit.php:286
+#: src/usr/local/www/services_rfc2136_edit.php:305
 msgid "AAAA (IPv6)"
 msgstr ""
 
-#: src/usr/local/www/services_router_advertisements.php:418
+#: src/usr/local/www/services_router_advertisements.php:398
 msgid "Use same settings as DHCPv6 server"
 msgstr ""
 
@@ -30342,6 +31723,10 @@ msgstr ""
 msgid "Netgraph"
 msgstr ""
 
+#: src/usr/local/www/services_snmp.php:331
+msgid "PF"
+msgstr ""
+
 #: src/usr/local/www/services_snmp.php:338
 msgid "Host Resources"
 msgstr ""
@@ -30354,23 +31739,23 @@ msgstr ""
 msgid "Regex"
 msgstr ""
 
-#: src/usr/local/www/services_unbound.php:271
+#: src/usr/local/www/services_unbound.php:296
 msgid "Enable DNS resolver"
 msgstr ""
 
-#: src/usr/local/www/services_unbound.php:314
+#: src/usr/local/www/services_unbound.php:339
 msgid "Enable DNSSEC Support"
 msgstr ""
 
-#: src/usr/local/www/services_unbound.php:321
+#: src/usr/local/www/services_unbound.php:346
 msgid "Enable Forwarding Mode"
 msgstr ""
 
-#: src/usr/local/www/services_unbound.php:328
+#: src/usr/local/www/services_unbound.php:353
 msgid "Register DHCP leases in the DNS Resolver"
 msgstr ""
 
-#: src/usr/local/www/services_unbound.php:337
+#: src/usr/local/www/services_unbound.php:362
 msgid "Register DHCP static mappings in the DNS Resolver"
 msgstr ""
 
@@ -30407,52 +31792,48 @@ msgid ""
 "Use 0x-20 encoded random bits in the DNS query to foil spoofing attempts."
 msgstr ""
 
-#: src/usr/local/www/status_logs_common.inc:808
+#: src/usr/local/www/status_logs_common.inc:820
 msgid "These settings override the \"General Logging Options\" settings."
 msgstr ""
 
-#: src/usr/local/www/status_logs_common.inc:818
+#: src/usr/local/www/status_logs_common.inc:830
 msgid "Forward"
 msgstr ""
 
-#: src/usr/local/www/status_logs_common.inc:826
+#: src/usr/local/www/status_logs_common.inc:838
 msgid "Reverse"
 msgstr ""
 
-#: src/usr/local/www/status_logs_common.inc:834
-#: src/usr/local/www/status_logs_common.inc:892
+#: src/usr/local/www/status_logs_common.inc:846
+#: src/usr/local/www/status_logs_common.inc:904
 msgid "General Logging Options Setting"
 msgstr ""
 
-#: src/usr/local/www/status_logs_common.inc:876
+#: src/usr/local/www/status_logs_common.inc:888
 msgid "Formatted"
 msgstr ""
 
-#: src/usr/local/www/status_logs_common.inc:884
-msgid "Raw"
-msgstr ""
-
-#: src/usr/local/www/status_logs_common.inc:906
+#: src/usr/local/www/status_logs_common.inc:918
 #: src/usr/local/www/status_logs_settings.php:307
 msgid "Log errors from the web server process"
 msgstr ""
 
-#: src/usr/local/www/status_logs_common.inc:917
+#: src/usr/local/www/status_logs_common.inc:929
 #: src/usr/local/www/status_logs_settings.php:279
 msgid "Log packets matched from the default block rules in the ruleset"
 msgstr ""
 
-#: src/usr/local/www/status_logs_common.inc:924
+#: src/usr/local/www/status_logs_common.inc:936
 #: src/usr/local/www/status_logs_settings.php:286
 msgid "Log packets matched from the default pass rules put in the ruleset"
 msgstr ""
 
-#: src/usr/local/www/status_logs_common.inc:931
+#: src/usr/local/www/status_logs_common.inc:943
 #: src/usr/local/www/status_logs_settings.php:293
 msgid "Log packets blocked by 'Block Bogon Networks' rules"
 msgstr ""
 
-#: src/usr/local/www/status_logs_common.inc:938
+#: src/usr/local/www/status_logs_common.inc:950
 #: src/usr/local/www/status_logs_settings.php:300
 msgid "Log packets blocked by 'Block Private Networks' rules"
 msgstr ""
@@ -30509,18 +31890,18 @@ msgstr ""
 msgid "Wireless events"
 msgstr ""
 
-#: src/usr/local/www/status_rrd_graph_settings.php:200
-msgid "Enable the RRD Graphing backend"
-msgstr ""
-
-#: src/usr/local/www/system.php:440
+#: src/usr/local/www/system.php:446
 msgid "Allow DNS server list to be overridden by DHCP/PPP on WAN"
 msgstr ""
 
-#: src/usr/local/www/system.php:450
+#: src/usr/local/www/system.php:456
 msgid "Do not use the DNS Forwarder as a DNS server for the firewall"
 msgstr ""
 
+#: src/usr/local/www/system.php:546
+msgid "Manage Log"
+msgstr ""
+
 #: src/usr/local/www/system_advanced_admin.php:398
 msgid "Disable webConfigurator redirect rule"
 msgstr ""
@@ -30582,8 +31963,8 @@ msgstr ""
 
 #: src/usr/local/www/system_advanced_firewall.php:473
 msgid ""
-"Disables the PF scrubbing option which can sometimes interfere with NFS and "
-"PPTP traffic."
+"Disables the PF scrubbing option which can sometimes interfere with NFS "
+"traffic."
 msgstr ""
 
 #: src/usr/local/www/system_advanced_firewall.php:536
@@ -30594,25 +31975,25 @@ msgstr ""
 msgid "Disable all auto-added VPN rules."
 msgstr ""
 
-#: src/usr/local/www/system_advanced_firewall.php:554
+#: src/usr/local/www/system_advanced_firewall.php:553
 msgid "Disable reply-to on WAN rules"
 msgstr ""
 
-#: src/usr/local/www/system_advanced_firewall.php:564
+#: src/usr/local/www/system_advanced_firewall.php:563
 msgid "Disable Negate rule on policy routing rules"
 msgstr ""
 
-#: src/usr/local/www/system_advanced_firewall.php:584
+#: src/usr/local/www/system_advanced_firewall.php:583
 msgid "Verify HTTPS certificates when downloading alias URLs"
 msgstr ""
 
-#: src/usr/local/www/system_advanced_firewall.php:654
+#: src/usr/local/www/system_advanced_firewall.php:653
 msgid ""
 "Automatic creation of additional NAT redirect rules from within your "
 "internal networks."
 msgstr ""
 
-#: src/usr/local/www/system_advanced_firewall.php:665
+#: src/usr/local/www/system_advanced_firewall.php:664
 msgid ""
 "Automatic create outbound NAT rules that direct traffic back out to the same "
 "subnet it originated from."
@@ -30699,37 +32080,37 @@ msgstr ""
 msgid "Disable the startup/shutdown beep"
 msgstr ""
 
-#: src/usr/local/www/system_authservers.php:504
+#: src/usr/local/www/system_authservers.php:507
 msgid ""
 "No Certificate Authorities defined.<br/>Create one under <a href="
-"\"system_camanager.php\">System &gt; Cert Manager</a>."
+"\"system_camanager.php\">System &gt; Cert. Manager</a>."
 msgstr ""
 
-#: src/usr/local/www/system_authservers.php:556
+#: src/usr/local/www/system_authservers.php:559
 msgid "Level "
 msgstr ""
 
-#: src/usr/local/www/system_authservers.php:579
+#: src/usr/local/www/system_authservers.php:582
 msgid "Enable extended query"
 msgstr ""
 
-#: src/usr/local/www/system_authservers.php:598
+#: src/usr/local/www/system_authservers.php:601
 msgid "Use anonymous binds to resolve distinguished names"
 msgstr ""
 
-#: src/usr/local/www/system_authservers.php:659
+#: src/usr/local/www/system_authservers.php:662
 msgid "LDAP Server uses RFC 2307 style group membership"
 msgstr ""
 
-#: src/usr/local/www/system_authservers.php:677
+#: src/usr/local/www/system_authservers.php:680
 msgid "UTF8 encode LDAP parameters before sending them to the server."
 msgstr ""
 
-#: src/usr/local/www/system_authservers.php:685
+#: src/usr/local/www/system_authservers.php:688
 msgid "Do not strip away parts of the username after the @ symbol"
 msgstr ""
 
-#: src/usr/local/www/system_certmanager.php:695
+#: src/usr/local/www/system_certmanager.php:697
 msgid "<a href=\"system_camanager.php?act=new&amp;method=internal\"> "
 msgstr ""
 
@@ -30748,105 +32129,105 @@ msgid ""
 "group applies to a local Dynamic DNS, IPsec or OpenVPN endpoint."
 msgstr ""
 
-#: src/usr/local/www/system_gateways_edit.php:673
+#: src/usr/local/www/system_gateways_edit.php:614
 msgid "Disable this gateway"
 msgstr ""
 
-#: src/usr/local/www/system_gateways_edit.php:720
+#: src/usr/local/www/system_gateways_edit.php:661
 msgid "This will select the above gateway as the default gateway"
 msgstr ""
 
-#: src/usr/local/www/system_gateways_edit.php:727
+#: src/usr/local/www/system_gateways_edit.php:668
 msgid "Disable Gateway Monitoring"
 msgstr ""
 
-#: src/usr/local/www/system_gateways_edit.php:751
+#: src/usr/local/www/system_gateways_edit.php:692
 msgid "Mark Gateway as Down"
 msgstr ""
 
-#: src/usr/local/www/system_gateways_edit.php:897
+#: src/usr/local/www/system_gateways_edit.php:843
 msgid "<span class=\"help-block\">"
 msgstr ""
 
-#: src/usr/local/www/system_gateways_edit.php:918
+#: src/usr/local/www/system_gateways_edit.php:880
 msgid "Use non-local gateway through interface specific route."
 msgstr ""
 
-#: src/usr/local/www/system_hasync.php:153
+#: src/usr/local/www/system_hasync.php:159
 msgid ""
 "pfsync transfers state insertion, update, and deletion messages between "
 "firewalls."
 msgstr ""
 
-#: src/usr/local/www/system_hasync.php:214
+#: src/usr/local/www/system_hasync.php:220
 msgid "User manager users and groups"
 msgstr ""
 
-#: src/usr/local/www/system_hasync.php:222
+#: src/usr/local/www/system_hasync.php:228
 msgid "Authentication servers (e.g. LDAP, RADIUS)"
 msgstr ""
 
-#: src/usr/local/www/system_hasync.php:230
+#: src/usr/local/www/system_hasync.php:236
 msgid "Certificate Authorities, Certificates, and Certificate Revocation Lists"
 msgstr ""
 
-#: src/usr/local/www/system_hasync.php:238
+#: src/usr/local/www/system_hasync.php:244
 msgid "Firewall rules "
 msgstr ""
 
-#: src/usr/local/www/system_hasync.php:246
+#: src/usr/local/www/system_hasync.php:252
 msgid "Firewall schedules "
 msgstr ""
 
-#: src/usr/local/www/system_hasync.php:254
+#: src/usr/local/www/system_hasync.php:260
 msgid "Firewall aliases "
 msgstr ""
 
-#: src/usr/local/www/system_hasync.php:262
+#: src/usr/local/www/system_hasync.php:268
 msgid "NAT configuration "
 msgstr ""
 
-#: src/usr/local/www/system_hasync.php:270
+#: src/usr/local/www/system_hasync.php:276
 msgid "IPsec configuration "
 msgstr ""
 
-#: src/usr/local/www/system_hasync.php:278
+#: src/usr/local/www/system_hasync.php:284
 msgid "OpenVPN configuration "
 msgstr ""
 
-#: src/usr/local/www/system_hasync.php:286
+#: src/usr/local/www/system_hasync.php:292
 msgid "DHCP Server settings "
 msgstr ""
 
-#: src/usr/local/www/system_hasync.php:294
+#: src/usr/local/www/system_hasync.php:300
 msgid "WoL Server settings "
 msgstr ""
 
-#: src/usr/local/www/system_hasync.php:302
+#: src/usr/local/www/system_hasync.php:308
 msgid "Static Route configuration "
 msgstr ""
 
-#: src/usr/local/www/system_hasync.php:310
+#: src/usr/local/www/system_hasync.php:316
 msgid "Load Balancer configuration "
 msgstr ""
 
-#: src/usr/local/www/system_hasync.php:318
+#: src/usr/local/www/system_hasync.php:324
 msgid "Virtual IPs "
 msgstr ""
 
-#: src/usr/local/www/system_hasync.php:326
+#: src/usr/local/www/system_hasync.php:332
 msgid "Traffic Shaper configuration "
 msgstr ""
 
-#: src/usr/local/www/system_hasync.php:334
+#: src/usr/local/www/system_hasync.php:340
 msgid "Traffic Shaper Limiters configuration "
 msgstr ""
 
-#: src/usr/local/www/system_hasync.php:342
+#: src/usr/local/www/system_hasync.php:348
 msgid "DNS Forwarder and DNS Resolver configurations "
 msgstr ""
 
-#: src/usr/local/www/system_hasync.php:350
+#: src/usr/local/www/system_hasync.php:356
 msgid "Captive Portal "
 msgstr ""
 
@@ -30858,15 +32239,15 @@ msgstr ""
 msgid "Disable the automatic dashboard auto-update check"
 msgstr ""
 
-#: src/usr/local/www/system_usermanager.php:619
+#: src/usr/local/www/system_usermanager.php:621
 msgid "This user cannot login"
 msgstr ""
 
-#: src/usr/local/www/system_usermanager.php:732
+#: src/usr/local/www/system_usermanager.php:734
 msgid "Click to create a user certificate"
 msgstr ""
 
-#: src/usr/local/www/system_usermanager.php:823
+#: src/usr/local/www/system_usermanager.php:825
 msgid "Click to paste an authorized key"
 msgstr ""
 
@@ -30887,8 +32268,8 @@ msgid "Allow clients to save Xauth passwords (Cisco VPN client only)."
 msgstr ""
 
 #: src/usr/local/www/vpn_ipsec_mobile.php:595
-#: src/usr/local/www/vpn_openvpn_csc.php:448
-#: src/usr/local/www/vpn_openvpn_server.php:1013
+#: src/usr/local/www/vpn_openvpn_csc.php:452
+#: src/usr/local/www/vpn_openvpn_server.php:1018
 msgid "Provide a default domain name to clients"
 msgstr ""
 
@@ -30899,14 +32280,14 @@ msgid ""
 msgstr ""
 
 #: src/usr/local/www/vpn_ipsec_mobile.php:641
-#: src/usr/local/www/vpn_openvpn_csc.php:468
-#: src/usr/local/www/vpn_openvpn_server.php:1027
+#: src/usr/local/www/vpn_openvpn_csc.php:472
+#: src/usr/local/www/vpn_openvpn_server.php:1032
 msgid "Provide a DNS server list to clients"
 msgstr ""
 
 #: src/usr/local/www/vpn_ipsec_mobile.php:666
-#: src/usr/local/www/vpn_openvpn_csc.php:560
-#: src/usr/local/www/vpn_openvpn_server.php:1114
+#: src/usr/local/www/vpn_openvpn_csc.php:564
+#: src/usr/local/www/vpn_openvpn_server.php:1119
 msgid "Provide a WINS server list to clients"
 msgstr ""
 
@@ -30920,28 +32301,35 @@ msgstr ""
 msgid "Provide a login banner to clients"
 msgstr ""
 
-#: src/usr/local/www/vpn_ipsec_phase1.php:667
+#: src/usr/local/www/vpn_ipsec_phase1.php:693
 msgid ""
 "Set this option to disable this phase1 without removing it from the list. "
 msgstr ""
 
-#: src/usr/local/www/vpn_ipsec_phase1.php:838
+#: src/usr/local/www/vpn_ipsec_phase1.php:864
 msgid "Disables renegotiation when a connection is about to expire."
 msgstr ""
 
-#: src/usr/local/www/vpn_ipsec_phase1.php:845
+#: src/usr/local/www/vpn_ipsec_phase1.php:871
 msgid ""
 "Whether rekeying of an IKE_SA should also reauthenticate the peer. In IKEv1, "
 "reauthentication is always done."
 msgstr ""
 
-#: src/usr/local/www/vpn_ipsec_phase1.php:852
+#: src/usr/local/www/vpn_ipsec_phase1.php:878
 msgid ""
 "Enable this option to never initiate this connection from this side, only "
 "respond to incoming requests."
 msgstr ""
 
-#: src/usr/local/www/vpn_ipsec_phase1.php:874
+#: src/usr/local/www/vpn_ipsec_phase1.php:900
+msgid ""
+"Enable this to split connection entries with multiple phase 2 "
+"configurations. Required for remote endpoints that support only a single "
+"traffic selector per child SA."
+msgstr ""
+
+#: src/usr/local/www/vpn_ipsec_phase1.php:926
 msgid "Enable DPD"
 msgstr ""
 
@@ -30997,110 +32385,110 @@ msgstr ""
 msgid "Issue IP Addresses via RADIUS server."
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_client.php:543
+#: src/usr/local/www/vpn_openvpn_client.php:548
 msgid "Infinitely resolve server "
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_client.php:580
-#: src/usr/local/www/vpn_openvpn_server.php:702
+#: src/usr/local/www/vpn_openvpn_client.php:585
+#: src/usr/local/www/vpn_openvpn_server.php:707
 msgid "Enable authentication of TLS packets."
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_client.php:588
-#: src/usr/local/www/vpn_openvpn_server.php:710
+#: src/usr/local/www/vpn_openvpn_client.php:593
+#: src/usr/local/www/vpn_openvpn_server.php:715
 msgid "Automatically generate a shared TLS authentication key."
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_client.php:635
-#: src/usr/local/www/vpn_openvpn_server.php:791
+#: src/usr/local/www/vpn_openvpn_client.php:640
+#: src/usr/local/www/vpn_openvpn_server.php:796
 msgid "Automatically generate a shared key"
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_client.php:740
-#: src/usr/local/www/vpn_openvpn_server.php:957
+#: src/usr/local/www/vpn_openvpn_client.php:745
+#: src/usr/local/www/vpn_openvpn_server.php:962
 msgid ""
 "Set the TOS IP header value of tunnel packets to match the encapsulated "
 "packet value."
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_client.php:747
-#: src/usr/local/www/vpn_openvpn_server.php:978
+#: src/usr/local/www/vpn_openvpn_client.php:752
+#: src/usr/local/www/vpn_openvpn_server.php:983
 msgid "Don't forward IPv6 traffic. "
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_client.php:754
+#: src/usr/local/www/vpn_openvpn_client.php:759
 msgid "Bars the server from adding routes to the client's routing table"
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_client.php:761
+#: src/usr/local/www/vpn_openvpn_client.php:766
 msgid "Don't add or remove routes automatically"
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_csc.php:355
+#: src/usr/local/www/vpn_openvpn_csc.php:359
 msgid "Disable this override"
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_csc.php:376
+#: src/usr/local/www/vpn_openvpn_csc.php:380
 msgid "Block this client connection based on its common name. "
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_csc.php:429
-#: src/usr/local/www/vpn_openvpn_server.php:897
+#: src/usr/local/www/vpn_openvpn_csc.php:433
+#: src/usr/local/www/vpn_openvpn_server.php:902
 msgid "Force all client generated traffic through the tunnel."
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_csc.php:441
+#: src/usr/local/www/vpn_openvpn_csc.php:445
 msgid "Prevent this client from receiving any server-defined client settings. "
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_csc.php:509
-#: src/usr/local/www/vpn_openvpn_server.php:1069
+#: src/usr/local/www/vpn_openvpn_csc.php:513
+#: src/usr/local/www/vpn_openvpn_server.php:1074
 msgid "Provide an NTP server list to clients"
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_csc.php:537
-#: src/usr/local/www/vpn_openvpn_server.php:1090
+#: src/usr/local/www/vpn_openvpn_csc.php:541
+#: src/usr/local/www/vpn_openvpn_server.php:1095
 msgid "Enable NetBIOS over TCP/IP"
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_server.php:627
+#: src/usr/local/www/vpn_openvpn_server.php:631
 msgid "Disable this server"
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_server.php:834
+#: src/usr/local/www/vpn_openvpn_server.php:839
 msgid "Enforce match"
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_server.php:865
+#: src/usr/local/www/vpn_openvpn_server.php:870
 msgid "Allow clients on the bridge to obtain DHCP."
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_server.php:964
+#: src/usr/local/www/vpn_openvpn_server.php:969
 msgid "Allow communication between clients connected to this server"
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_server.php:971
+#: src/usr/local/www/vpn_openvpn_server.php:976
 msgid ""
 "Allow multiple concurrent connections from clients using the same Common "
 "Name."
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_server.php:990
+#: src/usr/local/www/vpn_openvpn_server.php:995
 msgid ""
 "Allow connected clients to retain their connections if their IP address "
 "changes"
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_server.php:997
+#: src/usr/local/www/vpn_openvpn_server.php:1002
 msgid "Provide a virtual adapter IP address to clients (see Tunnel Network)"
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_server.php:1062
+#: src/usr/local/www/vpn_openvpn_server.php:1067
 msgid ""
 "Run \"net stop dnscache\", \"net start dnscache\", \"ipconfig /flushdns\" "
 "and \"ipconfig /registerdns\" on connection initiation."
 msgstr ""
 
-#: src/usr/local/www/vpn_openvpn_server.php:1135
+#: src/usr/local/www/vpn_openvpn_server.php:1140
 msgid "Use a different management port for clients."
 msgstr ""
-- 
cgit v1.1