yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev-v7.9' of https://github.com/umbraco/Umbraco-CMS into dev-v7.9

Browse Source
This commit is contained in:
Shannon
2018-02-27 01:39:05 +11:00
parent 0c2c12fdd9 ec427afe14
commit 55a2eb5b6c
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Web.UI/umbraco/config/lang/en.xml
View File

@@ -1404,7 +1404,7 @@ To manage your website, simply open the Umbraco back office and start adding con
<key alias="unlockUserSuccess">%0% is now unlocked</key>
<key alias="unlockUserError">An error occurred while unlocking the user</key>
<key alias="memberExportedSuccess">Member was exported to file</key>
<key alias="memberExportedError">An error occurred while exporing the member</key>
<key alias="memberExportedError">An error occurred while exporting the member</key>
</area>
<area alias="stylesheet">
<key alias="aliasHelp">Uses CSS syntax ex: h1, .redHeader, .blueTex</key>

2
src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
View File

@@ -1401,7 +1401,7 @@ To manage your website, simply open the Umbraco back office and start adding con
<key alias="unlockUserSuccess">%0% is now unlocked</key>
<key alias="unlockUserError">An error occurred while unlocking the user</key>
<key alias="memberExportedSuccess">Member was exported to file</key>
<key alias="memberExportedError">An error occurred while exporing the member</key>
<key alias="memberExportedError">An error occurred while exporting the member</key>
</area>
<area alias="stylesheet">
<key alias="aliasHelp">Uses CSS syntax ex: h1, .redHeader, .blueTex</key>