commit d3d237548fd6e594be9a06bd35276b6a5e1f5996
Author: Chris Buechler <cmb@pfsense.org>
Date:   Thu Nov 6 22:03:50 2014 -0600

    fix text, PPPoE Server, not VPN

diff --git a/etc/inc/easyrule.inc b/etc/inc/easyrule.inc
index 6696844793..aeaa07c772 100644
--- a/etc/inc/easyrule.inc
+++ b/etc/inc/easyrule.inc
@@ -47,7 +47,7 @@ function easyrule_find_rule_interface($int) {
 		$iflist['pptp'] = "PPTP VPN";
 
 	if ($config['pppoe']['mode'] == "server")
-		$iflist['pppoe'] = "PPPoE VPN";
+		$iflist['pppoe'] = "PPPoE Server";
 
 	if ($config['l2tp']['mode'] == "server")
                 $iflist['l2tp'] = "L2TP VPN";
diff --git a/etc/inc/vpn.inc b/etc/inc/vpn.inc
index 55ed8032b8..6f8c7625f6 100644
--- a/etc/inc/vpn.inc
+++ b/etc/inc/vpn.inc
@@ -1182,7 +1182,7 @@ function vpn_pppoe_configure(&$pppoecfg) {
 		if (!$pppoecfg['mode'] || ($pppoecfg['mode'] == "off"))
 			return 0;
 
-		echo gettext("Configuring PPPoE VPN service... ");
+		echo gettext("Configuring PPPoE Server service... ");
 	} else {
 		/* kill mpd */
 		killbypid("{$g['varrun_path']}/pppoe{$pppoecfg['pppoeid']}-vpn.pid");
diff --git a/usr/local/share/locale/en/LC_MESSAGES/pfSense.pot b/usr/local/share/locale/en/LC_MESSAGES/pfSense.pot
index 2b7eb10943..892db334f9 100644
--- a/usr/local/share/locale/en/LC_MESSAGES/pfSense.pot
+++ b/usr/local/share/locale/en/LC_MESSAGES/pfSense.pot
@@ -3358,7 +3358,7 @@ msgstr ""
 
 #: etc/inc/vpn.inc:1279 etc/inc/vpn.inc:1285 etc/inc/vpn.inc:1283
 #: etc/inc/vpn.inc:1295 etc/inc/vpn.inc:1308 etc/inc/vpn.inc:1307
-msgid "Configuring PPPoE VPN service... "
+msgid "Configuring PPPoE Server service... "
 msgstr ""
 
 #: etc/inc/vpn.inc:1303 etc/inc/vpn.inc:1309 etc/inc/vpn.inc:1307
diff --git a/usr/local/share/locale/ja/LC_MESSAGES/pfSense.po b/usr/local/share/locale/ja/LC_MESSAGES/pfSense.po
index bd94d1eccb..812ce6089a 100644
--- a/usr/local/share/locale/ja/LC_MESSAGES/pfSense.po
+++ b/usr/local/share/locale/ja/LC_MESSAGES/pfSense.po
@@ -3368,7 +3368,7 @@ msgstr "エラー： vpn_pptpd_configure.()にmpd.secretを開くことができ
 
 #: etc/inc/vpn.inc:1279 etc/inc/vpn.inc:1285 etc/inc/vpn.inc:1283
 #: etc/inc/vpn.inc:1295 etc/inc/vpn.inc:1308 etc/inc/vpn.inc:1307
-msgid "Configuring PPPoE VPN service... "
+msgid "Configuring PPPoE Server service... "
 msgstr "PPPoEのVPNサービスの設定..."
 
 #: etc/inc/vpn.inc:1303 etc/inc/vpn.inc:1309 etc/inc/vpn.inc:1307
diff --git a/usr/local/share/locale/pt_BR.ISO8859-1/LC_MESSAGES/pfSense.mo b/usr/local/share/locale/pt_BR.ISO8859-1/LC_MESSAGES/pfSense.mo
index 044b51ca0f..5ede625c46 100644
Binary files a/usr/local/share/locale/pt_BR.ISO8859-1/LC_MESSAGES/pfSense.mo and b/usr/local/share/locale/pt_BR.ISO8859-1/LC_MESSAGES/pfSense.mo differ
diff --git a/usr/local/share/locale/pt_BR.ISO8859-1/LC_MESSAGES/pfSense.po b/usr/local/share/locale/pt_BR.ISO8859-1/LC_MESSAGES/pfSense.po
index a458fa6e66..41155ffba2 100644
--- a/usr/local/share/locale/pt_BR.ISO8859-1/LC_MESSAGES/pfSense.po
+++ b/usr/local/share/locale/pt_BR.ISO8859-1/LC_MESSAGES/pfSense.po
@@ -3040,7 +3040,7 @@ msgstr "Erro: n
 #: etc/inc/vpn.inc:1279 etc/inc/vpn.inc:1285 etc/inc/vpn.inc:1283
 #: etc/inc/vpn.inc:1295 etc/inc/vpn.inc:1308 etc/inc/vpn.inc:1307
 #: etc/inc/vpn.inc:1309
-msgid "Configuring PPPoE VPN service... "
+msgid "Configuring PPPoE Server service... "
 msgstr "Configurando servi�o PPPoE da VPN..."
 
 #: etc/inc/vpn.inc:1303 etc/inc/vpn.inc:1309 etc/inc/vpn.inc:1307
diff --git a/usr/local/share/locale/tr/LC_MESSAGES/pfSense.mo b/usr/local/share/locale/tr/LC_MESSAGES/pfSense.mo
index 796d344663..ba7a6a6632 100644
Binary files a/usr/local/share/locale/tr/LC_MESSAGES/pfSense.mo and b/usr/local/share/locale/tr/LC_MESSAGES/pfSense.mo differ
diff --git a/usr/local/share/locale/tr/LC_MESSAGES/pfSense.po b/usr/local/share/locale/tr/LC_MESSAGES/pfSense.po
index 0c07ddcccc..16e298bfb4 100644
--- a/usr/local/share/locale/tr/LC_MESSAGES/pfSense.po
+++ b/usr/local/share/locale/tr/LC_MESSAGES/pfSense.po
@@ -2959,8 +2959,8 @@ msgstr "Hata: vpn_pptpd_configure(). içinde mpd.secret açılamadı."
 
 #: etc/inc/vpn.inc:1279 etc/inc/vpn.inc:1285 etc/inc/vpn.inc:1283
 #: etc/inc/vpn.inc:1295
-msgid "Configuring PPPoE VPN service... "
-msgstr "PPPoE VPN servisi yapılandırılıyor..."
+msgid "Configuring PPPoE Server service... "
+msgstr "PPPoE Server servisi yapılandırılıyor..."
 
 #: etc/inc/vpn.inc:1303 etc/inc/vpn.inc:1309 etc/inc/vpn.inc:1307
 #: etc/inc/vpn.inc:1319
diff --git a/usr/local/www/diag_logs_filter.php b/usr/local/www/diag_logs_filter.php
index 5595fc668b..6b6f4cfefe 100644
--- a/usr/local/www/diag_logs_filter.php
+++ b/usr/local/www/diag_logs_filter.php
@@ -252,7 +252,7 @@ include("head.inc");
 								$interfaces['pptp'] = "PPTP VPN";
 
 							if (is_pppoe_server_enabled() && have_ruleint_access("pppoe"))
-								$interfaces['pppoe'] = "PPPoE VPN";
+								$interfaces['pppoe'] = "PPPoE Server";
 
 							/* add ipsec interfaces */
 							if (isset($config['ipsec']['enable']) || isset($config['ipsec']['client']['enable']))
diff --git a/usr/local/www/firewall_nat_1to1_edit.php b/usr/local/www/firewall_nat_1to1_edit.php
index 9283962847..29476a12e5 100644
--- a/usr/local/www/firewall_nat_1to1_edit.php
+++ b/usr/local/www/firewall_nat_1to1_edit.php
@@ -307,7 +307,7 @@ if ($input_errors)
 							$interfaces['pptp'] = "PPTP VPN";
 
 					if (is_pppoe_server_enabled() && have_ruleint_access("pppoe"))
-						$interfaces['pppoe'] = "PPPoE VPN";
+						$interfaces['pppoe'] = "PPPoE Server";
 
 					/* add ipsec interfaces */
 					if (isset($config['ipsec']['enable']) || isset($config['ipsec']['client']['enable']))
diff --git a/usr/local/www/firewall_nat_edit.php b/usr/local/www/firewall_nat_edit.php
index cb892fd6c0..099e9c72f5 100644
--- a/usr/local/www/firewall_nat_edit.php
+++ b/usr/local/www/firewall_nat_edit.php
@@ -511,7 +511,7 @@ include("fbegin.inc"); ?>
 								$interfaces['pptp'] = "PPTP VPN";
 
 						if (is_pppoe_server_enabled() && have_ruleint_access("pppoe"))
-							$interfaces['pppoe'] = "PPPoE VPN";
+							$interfaces['pppoe'] = "PPPoE Server";
 
 						/* add ipsec interfaces */
 						if (isset($config['ipsec']['enable']) || isset($config['ipsec']['client']['enable']))
diff --git a/usr/local/www/firewall_nat_npt_edit.php b/usr/local/www/firewall_nat_npt_edit.php
index a0d3ff3e48..9549fb2cc2 100644
--- a/usr/local/www/firewall_nat_npt_edit.php
+++ b/usr/local/www/firewall_nat_npt_edit.php
@@ -187,7 +187,7 @@ include("head.inc");
 
 					if ($config['pppoe']['mode'] == "server")
 						if(have_ruleint_access("pppoe"))
-							$interfaces['pppoe'] = "PPPoE VPN";
+							$interfaces['pppoe'] = "PPPoE Server";
 
 					/* add ipsec interfaces */
 					if (isset($config['ipsec']['enable']) || isset($config['ipsec']['mobileclients']['enable']))
diff --git a/usr/local/www/firewall_nat_out_edit.php b/usr/local/www/firewall_nat_out_edit.php
index 09f50e541a..d5f4684e21 100644
--- a/usr/local/www/firewall_nat_out_edit.php
+++ b/usr/local/www/firewall_nat_out_edit.php
@@ -483,7 +483,7 @@ function poolopts_change() {
 							$interfaces['pptp'] = "PPTP VPN";
 
 					if (is_pppoe_server_enabled() && have_ruleint_access("pppoe"))
-						$interfaces['pppoe'] = "PPPoE VPN";
+						$interfaces['pppoe'] = "PPPoE Server";
 
 					/* add ipsec interfaces */
 					if (isset($config['ipsec']['enable']) || isset($config['ipsec']['client']['enable']))
diff --git a/usr/local/www/firewall_rules_edit.php b/usr/local/www/firewall_rules_edit.php
index 21f93888f8..20106c735c 100644
--- a/usr/local/www/firewall_rules_edit.php
+++ b/usr/local/www/firewall_rules_edit.php
@@ -923,7 +923,7 @@ include("head.inc");
 							$interfaces['pptp'] = "PPTP VPN";
 
 					if (is_pppoe_server_enabled() && have_ruleint_access("pppoe"))
-						$interfaces['pppoe'] = "PPPoE VPN";
+						$interfaces['pppoe'] = "PPPoE Server";
 					/* add ipsec interfaces */
 					if (isset($config['ipsec']['enable']) || isset($config['ipsec']['client']['enable']))
 						if(have_ruleint_access("enc0"))
