zydronium/websitepanel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge

Browse source
This commit is contained in:
me 2015-03-23 09:18:25 +04:00
commit 2b8769b7cb
5 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Base/Servers/ResourceGroups.cs
View file

@ -47,7 +47,7 @@ namespace WebsitePanel.EnterpriseServer
public const string HostedSharePoint = "Hosted SharePoint";
public const string Exchange = "Exchange";
public const string HostedOrganizations = "Hosted Organizations";
public const string HostedCRM = "Hosted CRM";
public const string HostedCRM = "Hosted CRM"; // CRM 4/2011
public const string HostedCRM2013 = "Hosted CRM2013"; // CRM 2013/2015
public const string VPS = "VPS";
public const string BlackBerry = "BlackBerry";

5
WebsitePanel/Sources/WebsitePanel.WebPortal/App_GlobalResources/WebsitePanel_SharedResources.ascx.resx
View file

@ -3338,7 +3338,8 @@
<value>Hosted Organizations</value>
</data>
<data name="ResourceGroup.Hosted CRM" xml:space="preserve">
<value>Hosted CRM</value>
<value>CRM 4/2011</value>
<comment> </comment>
</data>
<data name="ResourceGroup.BlackBerry" xml:space="preserve">
<value>BlackBerry</value>
@ -5444,7 +5445,7 @@
<value>ESS licenses per organization</value>
</data>
<data name="ResourceGroup.Hosted CRM2013" xml:space="preserve">
<value>Hosted CRM 2013/2015</value>
<value>CRM 2013/2015</value>
</data>
<data name="HostedCRM.USER_QUOTA_HAS_BEEN_REACHED2013_0" xml:space="preserve">
<value>CRM users quota (Professional license) has been reached.</value>

2
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/OrganizationMenu.ascx.resx
View file

@ -133,7 +133,7 @@
<value>Contacts</value>
</data>
<data name="Text.CRMGroup" xml:space="preserve">
<value>CRM</value>
<value>CRM 4/2011</value>
</data>
<data name="Text.CRMOrganization" xml:space="preserve">
<value>CRM Organization</value>

4
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/UserOrganization.ascx.resx
View file

@ -151,10 +151,10 @@
<value>Contacts</value>
</data>
<data name="Text.CRM2013Group" xml:space="preserve">
<value>Hosted Organization - CRM 2013/2015</value>
<value>CRM 2013/2015</value>
</data>
<data name="Text.CRMGroup" xml:space="preserve">
<value>Hosted Organization - CRM</value>
<value>CRM 4/2011</value>
</data>
<data name="Text.CRMOrganization" xml:space="preserve">
<value>CRM Organization</value>

2
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/App_LocalResources/OrganizationHome.ascx.resx
View file

@ -181,7 +181,7 @@
<value>BlackBerry</value>
</data>
<data name="locCRM.Text" xml:space="preserve">
<value>CRM</value>
<value>CRM 4/2011</value>
</data>
<data name="locExchangeStatistics.Text" xml:space="preserve">
<value>Exchange</value>