From 3894b40d12eff9db44047c2d9b239269c65f69fa Mon Sep 17 00:00:00 2001
From: vfedosevich <devnull@localhost>
Date: Tue, 7 Apr 2015 07:13:46 -0700
Subject: [PATCH] Fixes after merge

---
 .../WebsitePanel/App_LocalResources/SpaceQuotas.ascx.resx       | 2 +-
 .../DesktopModules/WebsitePanel/SpaceQuotas.ascx                | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/SpaceQuotas.ascx.resx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/SpaceQuotas.ascx.resx
index 7bbd2597..da260eaf 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/SpaceQuotas.ascx.resx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/SpaceQuotas.ascx.resx
@@ -211,6 +211,6 @@
     <value>Deleted Users:</value>
   </data>
   <data name="lblSharepointEnterpriseSites.Text" xml:space="preserve">
-    <value>SharePoint Enterprise Sites:</value>
+    <value>SharePoint Server Sites:</value>
   </data>
 </root>
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SpaceQuotas.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SpaceQuotas.ascx
index 1da424a9..d5260819 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SpaceQuotas.ascx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SpaceQuotas.ascx
@@ -75,7 +75,7 @@
         <td class="Normal"><wsp:Quota ID="quotaSharepointSites" runat="server" QuotaName="HostedSharePoint.Sites" DisplayGauge="True" /></td>
     </tr>
     <tr ID="pnlEnterpriseSharepointSites" runat="server">
-        <td class="SubHead" nowrap><asp:Label ID="lblEnterpriseSharepointSites" runat="server" meta:resourcekey="lblEnterpriseSharepointSites" Text="Sharepoint Sites:"></asp:Label></td>
+        <td class="SubHead" nowrap><asp:Label ID="lblEnterpriseSharepointSites" runat="server" meta:resourcekey="lblEnterpriseSharepointSites" Text="Sharepoint Server Sites:"></asp:Label></td>
         <td class="Normal"><wsp:Quota ID="quotaEnterpriseSharepointSites" runat="server" QuotaName="HostedSharePointEnterprise.Sites" DisplayGauge="True" /></td>
     </tr>