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

2013-11-18 18:11:46 +01:00
parent 734895c90c b743ea4fb8
commit 64d5533274
13 changed files with 263 additions and 140 deletions
--- a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
@@ -255,7 +255,7 @@
    <key alias="newtab">New tab</key>
    <key alias="tab">Tab</key>
    <key alias="thumbnail">Thumbnail</key>
-    <key alias="iscontainercontenttype">Use as container content type</key>
+    <key alias="hasListView">Enable list view</key>
  </area>
  <area alias="editdatatype">
    <key alias="addPrevalue">Add prevalue</key>