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

Merge Changes wsp-10029 wsp-10030

Browse source
This commit is contained in:
Virtuworks 2012-11-27 21:05:52 -05:00
commit dfbdfc0024
35 changed files with 1698 additions and 478 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -762,10 +762,13 @@
<data name="ModuleTitle.SystemCenterServerAddresses" xml:space="preserve">
<value>System Center Server Addresses</value>
</data>
<data name="ModuleTitle.UserAccountVLanCreate" xml:space="preserve">
<data name="ModuleTitle.UserAccountVLanCreate" xml:space="preserve">
<value>Add VLan to user</value>
</data>
<data name="ModuleTitle.SetupControlPanelAccounts" xml:space="preserve">
<value>Setup WebsitePanel Accounts</value>
</data>
<data name="ModuleTitle.ApplyEnableHardQuotaFeature" xml:space="preserve">
<value>System Hard Quota</value>
</data>
</root>

3
WebsitePanel/Sources/WebsitePanel.WebPortal/App_GlobalResources/WebsitePanel_Pages.ascx.resx
View file

@ -459,4 +459,7 @@
<data name="PageTitle.SpaceVPSForPC" xml:space="preserve">
<value>{user} - {space} - Virtual Private Servers for Private Cloud</value>
</data>
<data name="PageName.SpaceApplyEnableHardQuotaFeature" xml:space="preserve">
<value>System Hard Quota</value>
</data>
</root>

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

@ -2124,7 +2124,6 @@
<data name="ServiceItemType.HostHeader" xml:space="preserve">
<value>Web Site Host Header</value>
</data>
<data name="AuditLogSource.APP_INSTALLER" xml:space="preserve">
<value>Applications Installer</value>
</data>
@ -5265,4 +5264,10 @@
<data name="Success.WEB_SWITCH_TO_SHARED_IP" xml:space="preserve">
<value>Web site has been updated to shared IP</value>
</data>
<data name="Warning.ApplyEnableHardQuotaFeature" xml:space="preserve">
<value>Apply Enable Hard Quota Feature</value>
</data>
<data name="WarningDescription.ApplyEnableHardQuotaFeature" xml:space="preserve">
<value>By clicking on the button 'Apply', you will apply the respective hard quota on each provisioned home folder. Note that this may take some time.</value>
</data>
</root>