From 552b873a87adda71e6092e5197baa0087af277c8 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Mon, 8 Jan 2018 06:55:35 +0100
Subject: [PATCH] firewall: rename NPT to NPTv6 for clarity #667

---
 src/opnsense/mvc/app/models/OPNsense/Base/Menu/Menu.xml | 4 ++--
 src/www/firewall_nat_npt.php                            | 6 +++---
 src/www/firewall_nat_npt_edit.php                       | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/opnsense/mvc/app/models/OPNsense/Base/Menu/Menu.xml b/src/opnsense/mvc/app/models/OPNsense/Base/Menu/Menu.xml
index 89f952659..bfcd8f506 100644
--- a/src/opnsense/mvc/app/models/OPNsense/Base/Menu/Menu.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/Base/Menu/Menu.xml
@@ -154,9 +154,9 @@
             <Outbound order="300" VisibleName="Outbound" url="/firewall_nat_out.php">
               <Edit url="/firewall_nat_out_edit.php*" visibility="hidden"/>
             </Outbound>
-            <NPT VisibleName="NPT (IPv6)" order="400" url="/firewall_nat_npt.php">
+            <NPTv6 order="400" url="/firewall_nat_npt.php">
                 <Edit url="/firewall_nat_npt_edit.php*" visibility="hidden"/>
-            </NPT>
+            </NPTv6>
         </NAT>
         <Groups order="50" url="/interfaces_groups.php" cssClass="fa fa-sitemap fa-fw">
             <Edit url="/interfaces_groups_edit.php*" visibility="hidden"/>
diff --git a/src/www/firewall_nat_npt.php b/src/www/firewall_nat_npt.php
index ad6a7cc80..cef78aeec 100644
--- a/src/www/firewall_nat_npt.php
+++ b/src/www/firewall_nat_npt.php
@@ -82,7 +82,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') {
         } else {
             $a_npt[$id]['disabled'] = true;
         }
-        write_config('Toggled NAT NPT rule');
+        write_config('Toggled NAT NPTv6 rule');
         mark_subsystem_dirty('natconf');
         header(url_safe('Location: /firewall_nat_npt.php'));
         exit;
@@ -110,7 +110,7 @@ $main_buttons = array(
         // delete single
         BootstrapDialog.show({
           type:BootstrapDialog.TYPE_DANGER,
-          title: "<?=gettext("NPT");?>",
+          title: "<?=gettext("NPTv6");?>",
           message: "<?=gettext("Do you really want to delete this rule?");?>",
           buttons: [{
                     label: "<?= gettext("No");?>",
@@ -129,7 +129,7 @@ $main_buttons = array(
         // delete selected
         BootstrapDialog.show({
           type:BootstrapDialog.TYPE_DANGER,
-          title: "<?= gettext("NPT");?>",
+          title: "<?= gettext("NPTv6");?>",
           message: "<?=gettext("Do you really want to delete the selected rules?");?>",
           buttons: [{
                     label: "<?= gettext("No");?>",
diff --git a/src/www/firewall_nat_npt_edit.php b/src/www/firewall_nat_npt_edit.php
index a4441f2c4..24268abf6 100644
--- a/src/www/firewall_nat_npt_edit.php
+++ b/src/www/firewall_nat_npt_edit.php
@@ -144,7 +144,7 @@ include("head.inc");
               <form method="post" name="iform" id="iform">
                 <table class="table table-striped opnsense_standard_table_form">
                   <tr>
-                    <td><?=gettext("Edit NAT NPT entry"); ?></td>
+                    <td><?=gettext("Edit NAT NPTv6 entry"); ?></td>
                     <td style="text-align:right">
                         <small><?=gettext("full help"); ?> </small>
                         <i class="fa fa-toggle-off text-danger"  style="cursor: pointer;" id="show_all_help_page"></i>