upnp: consolidate name; fixes #220

src/opnsense/mvc/app/models/OPNsense/Base/Menu/Menu.xml

@@ -106,7 +106,7 @@
         <PPPoEServer VisibleName="PPPoE Server" url="/services_vpn_pppoe.php"/>
         <Proxy VisibleName="Proxy Server" url="/ui/proxy/"/>
         <SNMP VisibleName="SNMP" url="/services_snmp.php"/>
-        <UPnPNATPMP VisibleName="Universal P&amp;P / NAT-PMP" url="/pkg_edit.php?xml=miniupnpd.xml"/>
+        <UPnP VisibleName="Universal Plug and Play" url="/pkg_edit.php?xml=miniupnpd.xml"/>
         <WoL VisibleName="Wake on LAN" url="/services_wol.php"/>
     </Services>
 
@@ -179,7 +179,7 @@
         </SystemLogs>
 
         <TrafficGraphs VisibleName="Traffic Graphs" url="/status_graph.php"/>
-        <UPnPandNATPMP VisibleName="UPnP &amp; NAT-PMP" url="/status_upnp.php"/>
+        <UPnP VisibleName="Universal Plug and Play" url="/status_upnp.php"/>
     </Status>
 
     <Diagnostics order="7" cssClass="glyphicon glyphicon-stats">

src/pkg/miniupnpd.xml

 <?xml version="1.0" encoding="utf-8" ?>
 <packagegui>
-	<title>Services: UPnP &amp; NAT-PMP</title>
+	<title>Services: Universal Plug and Play</title>
 	<name>miniupnpd</name>
 	<version>20100712</version>
 	<savetext>Change</savetext>

src/www/status_upnp.php

@@ -41,7 +41,7 @@ exec("/sbin/pfctl -aminiupnpd -sn", $rdr_entries, $pf_ret);
 $now = time();
 $year = date("Y");
 
-$pgtitle = array(gettext("Status"),gettext("UPnP & NAT-PMP Status"));
+$pgtitle = array(gettext('Status'), gettext('Universal Plug and Play'));
 $shortcut_section = "upnp";
 include("head.inc");
 ?>