From 44aaac4a8b062c27f2dcf0922800a202ba7f487c Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Sun, 20 Nov 2016 12:18:53 +0100
Subject: [PATCH] web proxy: visibly rename from "proxy server", avoid
 confusion...

.. with either IGMP or FTP proxy.
---
 src/etc/inc/plugins.inc.d/squid.inc                             | 2 +-
 .../mvc/app/controllers/OPNsense/Proxy/IndexController.php      | 2 +-
 src/opnsense/mvc/app/models/OPNsense/Proxy/Menu/Menu.xml        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/etc/inc/plugins.inc.d/squid.inc b/src/etc/inc/plugins.inc.d/squid.inc
index 84c75c18f..8a9f35517 100644
--- a/src/etc/inc/plugins.inc.d/squid.inc
+++ b/src/etc/inc/plugins.inc.d/squid.inc
@@ -34,7 +34,7 @@ function squid_services()
 
     if (isset($config['OPNsense']['proxy']['general']['enabled']) && $config['OPNsense']['proxy']['general']['enabled'] == 1) {
         $services[] = array(
-            'description' => gettext('Proxy server'),
+            'description' => gettext('Web Proxy'),
             'configd' => array(
                 'restart' => array('proxy restart'),
                 'start' => array('proxy start'),
diff --git a/src/opnsense/mvc/app/controllers/OPNsense/Proxy/IndexController.php b/src/opnsense/mvc/app/controllers/OPNsense/Proxy/IndexController.php
index 995c5b0c7..09294c444 100644
--- a/src/opnsense/mvc/app/controllers/OPNsense/Proxy/IndexController.php
+++ b/src/opnsense/mvc/app/controllers/OPNsense/Proxy/IndexController.php
@@ -42,7 +42,7 @@ class IndexController extends \OPNsense\Base\IndexController
      */
     public function indexAction()
     {
-        $this->view->title = gettext('Proxy Server');
+        $this->view->title = gettext('Web Proxy');
         $this->view->mainForm = $this->getForm("main");
         $this->view->formDialogEditBlacklist = $this->getForm("dialogEditBlacklist");
         $this->view->pick('OPNsense/Proxy/index');
diff --git a/src/opnsense/mvc/app/models/OPNsense/Proxy/Menu/Menu.xml b/src/opnsense/mvc/app/models/OPNsense/Proxy/Menu/Menu.xml
index 2fd0f50d5..f1a2693de 100644
--- a/src/opnsense/mvc/app/models/OPNsense/Proxy/Menu/Menu.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/Proxy/Menu/Menu.xml
@@ -1,6 +1,6 @@
 <menu>
     <Services>
-      <Proxy VisibleName="Proxy Server" cssClass="fa fa-bolt fa-fw">
+      <Proxy VisibleName="Web Proxy" cssClass="fa fa-bolt fa-fw">
           <Administration url="/ui/proxy/">
             <GeneralSettings VisibleName="General" url="/ui/proxy/#subtab_proxy-general-settings"/>
             <LocalCache VisibleName="Cache" url="/ui/proxy/#subtab_proxy-general-cache-local"/>