From 5767cea8f23e3fed0a55dd0d462808cc3b0cc247 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Wed, 6 Jan 2016 12:58:05 +0100
Subject: [PATCH] fixes build/merge

---
 src/Umbraco.Web/Editors/ContentTypeController.cs            | 6 +++---
 src/Umbraco.Web/Models/Mapping/TabsAndPropertiesResolver.cs | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Umbraco.Web/Editors/ContentTypeController.cs b/src/Umbraco.Web/Editors/ContentTypeController.cs
index aab169a8a2..4622fee1b5 100644
--- a/src/Umbraco.Web/Editors/ContentTypeController.cs
+++ b/src/Umbraco.Web/Editors/ContentTypeController.cs
@@ -4,15 +4,15 @@ using System.Net;
 using System.Web.Http;
 using AutoMapper;
 using Umbraco.Core.Models;
-using Umbraco.Web.Models;
 using Umbraco.Web.Models.ContentEditing;
 using Umbraco.Web.Mvc;
 using Constants = Umbraco.Core.Constants;
 using Umbraco.Core.Services;
 using Umbraco.Core.PropertyEditors;
-using System;
 using System.Net.Http;
-using Umbraco.Core.Services;
+using Umbraco.Core;
+using Umbraco.Web.WebApi;
+using Umbraco.Web.WebApi.Filters;
 
 namespace Umbraco.Web.Editors
 {
diff --git a/src/Umbraco.Web/Models/Mapping/TabsAndPropertiesResolver.cs b/src/Umbraco.Web/Models/Mapping/TabsAndPropertiesResolver.cs
index 7ec7351038..0e4549811c 100644
--- a/src/Umbraco.Web/Models/Mapping/TabsAndPropertiesResolver.cs
+++ b/src/Umbraco.Web/Models/Mapping/TabsAndPropertiesResolver.cs
@@ -231,7 +231,7 @@ namespace Umbraco.Web.Models.Mapping
                 {
                     Id = groupId,
                     Alias = groupName,
-                    Label = TranslateItem(groupName),
+                    Label = _localizedTextService.UmbracoDictionaryTranslate(groupName),
                     Properties = properties,
                     IsActive = false
                 });