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

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

Browse Source
This commit is contained in:
Shannon
2015-03-30 17:40:46 +11:00
parent fb24becd0d 021bb6d367
commit a2bfca4d3a
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1010,7 +1010,7 @@ To manage your website, simply open the Umbraco back office and start adding con
<key alias="editors">Editor</key>
<key alias="excerptField">Excerpt field</key>
<key alias="language">Language</key>
<key alias="loginname">Login</key>
<key alias="loginname">Username</key>
<key alias="mediastartnode">Start Node in Media Library</key>
<key alias="modules">Sections</key>
<key alias="noConsole">Disable Umbraco Access</key>
@@ -1029,7 +1029,7 @@ To manage your website, simply open the Umbraco back office and start adding con
<key alias="permissionSelectPages">Select pages to modify their permissions</key>
<key alias="searchAllChildren">Search all children</key>
<key alias="startnode">Start Node in Content</key>
<key alias="username">Username</key>
<key alias="username">Name</key>
<key alias="userPermissions">User permissions</key>
<key alias="usertype">User type</key>
<key alias="userTypes">User types</key>