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

Merge

Browse source
This commit is contained in:
Alexander Trofimov 2015-04-23 07:43:40 +03:00
commit f6ffbc7513
155 changed files with 10718 additions and 1770 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -3345,7 +3345,6 @@
</data>
<data name="ResourceGroup.Hosted CRM" xml:space="preserve">
<value>CRM 4/2011</value>
<comment> </comment>
</data>
<data name="ResourceGroup.BlackBerry" xml:space="preserve">
<value>BlackBerry</value>
@ -3374,7 +3373,10 @@
<data name="ResourceGroup.SharePoint Foundation Server" xml:space="preserve">
<value>SharePoint Foundation Server</value>
</data>
<data name="ResourceGroup.SharePoint Enterprise Server" xml:space="preserve">
<data name="ResourceGroup.SharePoint Server" xml:space="preserve">
<value>SharePoint Server</value>
</data>
<data name="ResourceGroup.SharePoint Enterprise Server" xml:space="preserve">
<value>SharePoint Enterprise Server</value>
</data>
<data name="ResourceGroup.OCS" xml:space="preserve">
@ -5826,4 +5828,13 @@
<data name="Success.REMOTE_DESKTOP_SERVICES_USER_EXPERIENCE" xml:space="preserve">
<value>RDS User experience has been updated</value>
</data>
<data name="SchedulerTask.SCHEDULE_TASK_USER_PASSWORD_EXPIRATION_NOTIFICATION" xml:space="preserve">
<value>User password expiration notification</value>
</data>
<data name="ERROR.ORANIZATIONSETTINGS_NOT_UPDATED" xml:space="preserve">
<value>Error during updating settings.</value>
</data>
<data name="Error.UNABLETOLOADPASSWORDSETTINGS" xml:space="preserve">
<value>Unable to load password settings</value>
</data>
</root>