diff --git a/src/Umbraco.Web.UI/Umbraco/create/PartialView.ascx b/src/Umbraco.Web.UI/Umbraco/create/PartialView.ascx
index 8e8e53e196..755b3d772d 100644
--- a/src/Umbraco.Web.UI/Umbraco/create/PartialView.ascx
+++ b/src/Umbraco.Web.UI/Umbraco/create/PartialView.ascx
@@ -26,6 +26,6 @@
 
 
 <cc1:Pane runat="server" CssClass="btn-toolbar umb-btn-toolbar">
-    <a href="#" class="btn btn-link" onclick="UmbClientMgr.closeModalWindow()"><%=umbraco.ui.Text("cancel")%></a>
+    <a href="#" class="btn btn-link" onclick="UmbClientMgr.closeModalWindow()"><%=Services.TextService.Localize("cancel")%></a>
     <asp:Button ID="sbmt" runat="server" CssClass="btn btn-primary" Text="Create" OnClick="SubmitButton_Click"></asp:Button>
 </cc1:Pane>
diff --git a/src/Umbraco.Web.UI/umbraco/create/PartialViewMacro.ascx b/src/Umbraco.Web.UI/umbraco/create/PartialViewMacro.ascx
index 7ceea23455..deaeebe2f9 100644
--- a/src/Umbraco.Web.UI/umbraco/create/PartialViewMacro.ascx
+++ b/src/Umbraco.Web.UI/umbraco/create/PartialViewMacro.ascx
@@ -33,6 +33,6 @@
 <input type="hidden" name="nodeType" value="-1">
 
 <cc1:Pane runat="server" CssClass="btn-toolbar umb-btn-toolbar">
-    <a href="#" class="btn btn-link" onclick="UmbClientMgr.closeModalWindow()"><%=umbraco.ui.Text("cancel")%></a>
+    <a href="#" class="btn btn-link" onclick="UmbClientMgr.closeModalWindow()"><%=Services.TextService.Localize("cancel")%></a>
     <asp:Button ID="SubmitButton" CssClass="btn btn-primary" runat="server" OnClick="SubmitButton_Click" Text='<%#ui.Text("create") %>'></asp:Button>
 </cc1:Pane>
diff --git a/src/Umbraco.Web.UI/umbraco/create/content.ascx b/src/Umbraco.Web.UI/umbraco/create/content.ascx
index 47ea26143d..e3e0f3f75f 100644
--- a/src/Umbraco.Web.UI/umbraco/create/content.ascx
+++ b/src/Umbraco.Web.UI/umbraco/create/content.ascx
@@ -1,11 +1,11 @@
 <%@ Control Language="c#" AutoEventWireup="True" Codebehind="content.ascx.cs" Inherits="umbraco.cms.presentation.create.controls.content" TargetSchema="http://schemas.microsoft.com/intellisense/ie5" %>
 <asp:literal id="typeJs" runat="server"/>
 
-<div><%=umbraco.ui.Text("name")%>:<br /></div>
+<div><%=Services.TextService.Localize("name")%>:<br /></div>
 <asp:TextBox  id="rename" Runat="server" CssClass="bigInput"></asp:TextBox><br /><br />
 <asp:RequiredFieldValidator id="RequiredFieldValidator1" ErrorMessage="*" ControlToValidate="rename" runat="server">*</asp:RequiredFieldValidator>
 
-<span style="margin-left: -7px;"><%=umbraco.ui.Text("choose")%> <%=umbraco.ui.Text("documentType")%>:<br /></span>
+<span style="margin-left: -7px;"><%=Services.TextService.Localize("choose")%> <%=Services.TextService.Localize("documentType")%>:<br /></span>
 <asp:ListBox id="nodeType" Runat="server" cssClass="bigInput" Rows="1" SelectionMode="Single"></asp:ListBox>
 <asp:RequiredFieldValidator id="RequiredFieldValidator2" ErrorMessage="*" ControlToValidate="nodeType" runat="server">*</asp:RequiredFieldValidator>
 
@@ -18,10 +18,10 @@
 
 <div style="margin-right: 15px;">
 	<asp:Button id="sbmt" Runat="server" style="Width: 90px; margin-right: 6px;" onclick="sbmt_Click"></asp:Button>
-	<em> <%= umbraco.ui.Text("or") %> </em>  
-	<a href="#" style="color: Blue; margin-left: 6px;" onclick="UmbClientMgr.closeModalWindow()"><%=umbraco.ui.Text("cancel")%></a>
+	<em> <%= Services.TextService.Localize("or") %> </em>  
+	<a href="#" style="color: Blue; margin-left: 6px;" onclick="UmbClientMgr.closeModalWindow()"><%=Services.TextService.Localize("cancel")%></a>
 	
 	<!--
-	 <input type="button" value="" onClick="if (confirm('<%=umbraco.ui.Text("areyousure")%>')) window.close()" style="width: 90px; margin-left: 6px;"/>
+	 <input type="button" value="" onClick="if (confirm('<%=Services.TextService.Localize("areyousure")%>')) window.close()" style="width: 90px; margin-left: 6px;"/>
 -->
 </div>
diff --git a/src/Umbraco.Web.UI/umbraco/create/language.ascx b/src/Umbraco.Web.UI/umbraco/create/language.ascx
index 686cbbdb96..a5c2f06c4f 100644
--- a/src/Umbraco.Web.UI/umbraco/create/language.ascx
+++ b/src/Umbraco.Web.UI/umbraco/create/language.ascx
@@ -11,8 +11,8 @@
 </cc1:Pane>
 
 <cc1:Pane runat="server" CssClass="btn-toolbar umb-btn-toolbar">
-    <a href="#" class="btn btn-link" onclick="UmbClientMgr.closeModalWindow()"><%=umbraco.ui.Text("cancel")%></a>
-    <asp:Button ID="sbmt" CssClass="btn btn-primary" OnClick="sbmt_Click" runat="server" Text='<%#umbraco.ui.Text("create") %>'></asp:Button>
+    <a href="#" class="btn btn-link" onclick="UmbClientMgr.closeModalWindow()"><%=Services.TextService.Localize("cancel")%></a>
+    <asp:Button ID="sbmt" CssClass="btn btn-primary" OnClick="sbmt_Click" runat="server" Text='<%#Services.TextService.Localize("create") %>'></asp:Button>
 </cc1:Pane>
 
     
diff --git a/src/Umbraco.Web.UI/umbraco/create/member.ascx b/src/Umbraco.Web.UI/umbraco/create/member.ascx
index 5d6ea30f8e..6bb3b6d378 100644
--- a/src/Umbraco.Web.UI/umbraco/create/member.ascx
+++ b/src/Umbraco.Web.UI/umbraco/create/member.ascx
@@ -7,8 +7,8 @@
     <br />
 <asp:TextBox ID="rename" runat="server" Width="350px" CssClass="bigInput"></asp:TextBox>
 <asp:Panel ID="memberChooser" runat="server">
-    <%=umbraco.ui.Text("choose")%>
-    <%=umbraco.ui.Text("membertype")%>:<asp:RequiredFieldValidator ID="memberTypeRequired" ErrorMessage="*" ControlToValidate="nodeType"
+    <%=Services.TextService.Localize("choose")%>
+    <%=Services.TextService.Localize("membertype")%>:<asp:RequiredFieldValidator ID="memberTypeRequired" ErrorMessage="*" ControlToValidate="nodeType"
         runat="server">*</asp:RequiredFieldValidator><br />
     <asp:ListBox ID="nodeType" runat="server" Width="350px" CssClass="bigInput" Rows="1"
         SelectionMode="Single"></asp:ListBox>
@@ -44,5 +44,5 @@
     <asp:Button ID="sbmt" runat="server" Style="margin-top: 14px" Width="90" OnClick="sbmt_Click">
     </asp:Button>
     &nbsp; <em>
-        <%= umbraco.ui.Text("or") %></em> &nbsp;<a href="#" style="color: blue" onclick="UmbClientMgr.closeModalWindow()"><%=umbraco.ui.Text("cancel")%></a>
+        <%= Services.TextService.Localize("or") %></em> &nbsp;<a href="#" style="color: blue" onclick="UmbClientMgr.closeModalWindow()"><%=Services.TextService.Localize("cancel")%></a>
 </div>
diff --git a/src/Umbraco.Web.UI/umbraco/create/nodeType.ascx b/src/Umbraco.Web.UI/umbraco/create/nodeType.ascx
index 4b11f4d990..a4c010a46e 100644
--- a/src/Umbraco.Web.UI/umbraco/create/nodeType.ascx
+++ b/src/Umbraco.Web.UI/umbraco/create/nodeType.ascx
@@ -27,6 +27,6 @@
 </cc1:Pane>
 
 <cc1:Pane runat="server" CssClass="btn-toolbar umb-btn-toolbar">
-     <a href="#" class="btn btn-link" onclick="UmbClientMgr.closeModalWindow()"><%=umbraco.ui.Text("cancel")%></a>
+     <a href="#" class="btn btn-link" onclick="UmbClientMgr.closeModalWindow()"><%=Services.TextService.Localize("cancel")%></a>
      <asp:Button id="sbmt" Runat="server" CssClass="btn btn-primary" onclick="sbmt_Click"></asp:Button>
 </cc1:Pane>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI/umbraco/create/script.ascx b/src/Umbraco.Web.UI/umbraco/create/script.ascx
index 4a4671ec6f..0dc6ebc9a3 100644
--- a/src/Umbraco.Web.UI/umbraco/create/script.ascx
+++ b/src/Umbraco.Web.UI/umbraco/create/script.ascx
@@ -29,6 +29,6 @@
 </cc1:Pane>
 
 <cc1:Pane runat="server" CssClass="btn-toolbar umb-btn-toolbar">
-    <a href="#" class="btn btn-link" onclick="UmbClientMgr.closeModalWindow()"><%=umbraco.ui.Text("cancel")%></a>
-    <asp:Button ID="sbmt" CssClass="btn btn-primary" runat="server" Text='<%#umbraco.ui.Text("create") %>' OnClick="SubmitClick"></asp:Button>
+    <a href="#" class="btn btn-link" onclick="UmbClientMgr.closeModalWindow()"><%=Services.TextService.Localize("cancel")%></a>
+    <asp:Button ID="sbmt" CssClass="btn btn-primary" runat="server" Text='<%#Services.TextService.Localize("create") %>' OnClick="SubmitClick"></asp:Button>
 </cc1:Pane>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI/umbraco/create/simple.ascx b/src/Umbraco.Web.UI/umbraco/create/simple.ascx
index a057cb3d98..4dba61cbe8 100644
--- a/src/Umbraco.Web.UI/umbraco/create/simple.ascx
+++ b/src/Umbraco.Web.UI/umbraco/create/simple.ascx
@@ -9,7 +9,7 @@
 </cc1:Pane>
 
 <cc1:Pane runat="server" CssClass="btn-toolbar umb-btn-toolbar">
-     <a href="#" class="btn btn-link" onclick="UmbClientMgr.closeModalWindow()"><%=umbraco.ui.Text("cancel")%></a>
+     <a href="#" class="btn btn-link" onclick="UmbClientMgr.closeModalWindow()"><%=Services.TextService.Localize("cancel")%></a>
      <asp:Button id="sbmt" Runat="server" CssClass="btn btn-primary" onclick="sbmt_Click"></asp:Button>
 </cc1:Pane>
 
diff --git a/src/Umbraco.Web.UI/umbraco/create/xslt.ascx b/src/Umbraco.Web.UI/umbraco/create/xslt.ascx
index 857db84f9e..38475c2457 100644
--- a/src/Umbraco.Web.UI/umbraco/create/xslt.ascx
+++ b/src/Umbraco.Web.UI/umbraco/create/xslt.ascx
@@ -24,7 +24,7 @@
 
 
 <cc1:Pane runat="server" CssClass="btn-toolbar umb-btn-toolbar">
-     <a href="#" class="btn btn-link" onclick="UmbClientMgr.closeModalWindow()"><%=umbraco.ui.Text("cancel")%></a>
+     <a href="#" class="btn btn-link" onclick="UmbClientMgr.closeModalWindow()"><%=Services.TextService.Localize("cancel")%></a>
      <asp:Button id="sbmt" Runat="server" CssClass="btn btn-primary" onclick="sbmt_Click"></asp:Button>
 </cc1:Pane>
 
diff --git a/src/Umbraco.Web.UI/umbraco/developer/Packages/SubmitPackage.aspx b/src/Umbraco.Web.UI/umbraco/developer/Packages/SubmitPackage.aspx
index a882fedef2..1a986594e3 100644
--- a/src/Umbraco.Web.UI/umbraco/developer/Packages/SubmitPackage.aspx
+++ b/src/Umbraco.Web.UI/umbraco/developer/Packages/SubmitPackage.aspx
@@ -105,7 +105,7 @@
     </div>
     
     <p>
-      <asp:Button ID="bt_submit" runat="server" Text="Submit package" OnClick="submitPackage" /> &nbsp;<em><%= umbraco.ui.Text("or") %></em> &nbsp;<a href="editpackage.aspx?id=<%= Request.QueryString["id"] %>"><%= umbraco.ui.Text("cancel") %></a>
+      <asp:Button ID="bt_submit" runat="server" Text="Submit package" OnClick="submitPackage" /> &nbsp;<em><%= Services.TextService.Localize("or") %></em> &nbsp;<a href="editpackage.aspx?id=<%= Request.QueryString["id"] %>"><%= Services.TextService.Localize("cancel") %></a>
     </p>
     </asp:PlaceHolder>
     
diff --git a/src/Umbraco.Web.UI/umbraco/developer/RelationTypes/NewRelationType.aspx b/src/Umbraco.Web.UI/umbraco/developer/RelationTypes/NewRelationType.aspx
index b42ec52761..b6aeecca43 100644
--- a/src/Umbraco.Web.UI/umbraco/developer/RelationTypes/NewRelationType.aspx
+++ b/src/Umbraco.Web.UI/umbraco/developer/RelationTypes/NewRelationType.aspx
@@ -42,7 +42,7 @@
     
     
 <umb:Pane runat="server" CssClass="btn-toolbar umb-btn-toolbar">
-     <a href="#" class="btn btn-link" onclick="UmbClientMgr.closeModalWindow()"><%=umbraco.ui.Text("cancel")%></a>
+     <a href="#" class="btn btn-link" onclick="UmbClientMgr.closeModalWindow()"><%=Services.TextService.Localize("cancel")%></a>
      <asp:Button ID="addButton" runat="server" Text="Create" cssclass="btn btn-primary" onclick="AddButton_Click" CausesValidation="true" ValidationGroup="NewRelationType" />
 </umb:Pane>
 
diff --git a/src/Umbraco.Web.UI/umbraco/developer/Xslt/xsltChooseExtension.aspx b/src/Umbraco.Web.UI/umbraco/developer/Xslt/xsltChooseExtension.aspx
index 0700ee1c91..5fab78f083 100644
--- a/src/Umbraco.Web.UI/umbraco/developer/Xslt/xsltChooseExtension.aspx
+++ b/src/Umbraco.Web.UI/umbraco/developer/Xslt/xsltChooseExtension.aspx
@@ -37,7 +37,7 @@ div.code input{border: none; background:#F6F6F9; color: #000; padding: 5px; font
 </cc1:Pane>
 
 <p>
-  <asp:Button ID="bt_insert" OnClientClick="returnResult(); return false;" Enabled="false" runat="server" Text="Insert" /> <em><%= umbraco.ui.Text("or") %></em> <a href="xsltInsertValueOf.aspx"><%= umbraco.ui.Text("cancel") %></a>
+  <asp:Button ID="bt_insert" OnClientClick="returnResult(); return false;" Enabled="false" runat="server" Text="Insert" /> <em><%= Services.TextService.Localize("or") %></em> <a href="xsltInsertValueOf.aspx"><%= Services.TextService.Localize("cancel") %></a>
 </p> 
 
 </asp:Content>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI/umbraco/developer/Xslt/xsltInsertValueOf.aspx b/src/Umbraco.Web.UI/umbraco/developer/Xslt/xsltInsertValueOf.aspx
index 576cd6dff2..4a0a92f2a4 100644
--- a/src/Umbraco.Web.UI/umbraco/developer/Xslt/xsltInsertValueOf.aspx
+++ b/src/Umbraco.Web.UI/umbraco/developer/Xslt/xsltInsertValueOf.aspx
@@ -57,6 +57,6 @@ body{margin: 0px; padding: 0px;}
 </cc1:Pane>
 
 <p>
-          <input type="button" value="Insert value" onclick="doSubmit();" /> <em><%= umbraco.ui.Text("or") %></em> <a href="#" onclick="UmbClientMgr.closeModalWindow(); return false;"><%= umbraco.ui.Text("cancel") %></a>
+          <input type="button" value="Insert value" onclick="doSubmit();" /> <em><%= Services.TextService.Localize("or") %></em> <a href="#" onclick="UmbClientMgr.closeModalWindow(); return false;"><%= Services.TextService.Localize("cancel") %></a>
 </p>
 </asp:Content>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI/umbraco/dialogs/ChangeDocType.aspx b/src/Umbraco.Web.UI/umbraco/dialogs/ChangeDocType.aspx
index a5ebd8be30..03f909abaa 100644
--- a/src/Umbraco.Web.UI/umbraco/dialogs/ChangeDocType.aspx
+++ b/src/Umbraco.Web.UI/umbraco/dialogs/ChangeDocType.aspx
@@ -113,7 +113,7 @@
         <p>
             <asp:PlaceHolder ID="SavePlaceholder" runat="server">        
                 <asp:Button ID="ValidateAndSave" runat="server" OnClick="ValidateAndSave_Click" />
-                <em> <%= umbraco.ui.Text("or") %> </em>
+                <em> <%= Services.TextService.Localize("or") %> </em>
             </asp:PlaceHolder>        
             <a href="#" style="color: blue" onclick="UmbClientMgr.closeModalWindow()"><%=umbraco.ui.Text("general", "cancel", Security.CurrentUser)%></a>  
         </p>
diff --git a/src/Umbraco.Web.UI/umbraco/dialogs/SendPublish.aspx b/src/Umbraco.Web.UI/umbraco/dialogs/SendPublish.aspx
index 39ee58aee0..5ab6a3b97a 100644
--- a/src/Umbraco.Web.UI/umbraco/dialogs/SendPublish.aspx
+++ b/src/Umbraco.Web.UI/umbraco/dialogs/SendPublish.aspx
@@ -2,12 +2,12 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
 <html xmlns="http://www.w3.org/1999/xhtml">
 	<head>
-		<title>umbraco - <%=umbraco.ui.Text("editContentSendToPublish")%></title>
+		<title>umbraco - <%=Services.TextService.Localize("editContentSendToPublish")%></title>
 		<link href="../css/umbracoGui.css" type="text/css" rel="stylesheet"/>
 	</head>
 	<body style="padding: 10px;">
-		<h3><img src="../images/publish.gif" alt="Republish" align="absmiddle" style="float:left; margin-top: 3px; margin-right: 5px"/> <%=umbraco.ui.Text("editContentSendToPublishText")%></h3>
+		<h3><img src="../images/publish.gif" alt="Republish" align="absmiddle" style="float:left; margin-top: 3px; margin-right: 5px"/> <%=Services.TextService.Localize("editContentSendToPublishText")%></h3>
 		<br/>
-		<a href="#" onclick="javascript:UmbClientMgr.closeModalWindow();" style="margin-left: 30px" class="guiDialogNormal"><%=umbraco.ui.Text("closewindow")%></a>
+		<a href="#" onclick="javascript:UmbClientMgr.closeModalWindow();" style="margin-left: 30px" class="guiDialogNormal"><%=Services.TextService.Localize("closewindow")%></a>
 	</body>
 </html>
diff --git a/src/Umbraco.Web.UI/umbraco/dialogs/create.aspx b/src/Umbraco.Web.UI/umbraco/dialogs/create.aspx
index a60a23a9a3..64b856a697 100644
--- a/src/Umbraco.Web.UI/umbraco/dialogs/create.aspx
+++ b/src/Umbraco.Web.UI/umbraco/dialogs/create.aspx
@@ -52,11 +52,11 @@
         <cc1:Feedback runat="server" ID="PageNameHolder" type="notice" Style="margin-top: 10px;"
             Text='<%#Services.TextService.Localize("moveOrCopy/noNodeSelected")%>' />
         <div style="padding-top: 10px;" class="guiDialogNormal">
-            <input type="button" id="ok" value="<%=umbraco.ui.Text("ok")%>" onclick="onNodeSelectionConfirmed();"
+            <input type="button" id="ok" value="<%=Services.TextService.Localize("ok")%>" onclick="onNodeSelectionConfirmed();"
                 disabled="true" style="width: 100px" />
             &nbsp; <em>
-                <%= umbraco.ui.Text("or") %></em>&nbsp; <a href="#" style="color: blue" onclick="UmbClientMgr.closeModalWindow()">
-                    <%=umbraco.ui.Text("cancel")%></a>
+                <%= Services.TextService.Localize("or") %></em>&nbsp; <a href="#" style="color: blue" onclick="UmbClientMgr.closeModalWindow()">
+                    <%=Services.TextService.Localize("cancel")%></a>
         </div>
     </asp:Panel>
     <cc1:Pane ID="pane_chooseName" Visible="false" runat="server">
diff --git a/src/Umbraco.Web.UI/umbraco/dialogs/emptyTrashcan.aspx b/src/Umbraco.Web.UI/umbraco/dialogs/emptyTrashcan.aspx
index 0d886037a8..86ae240117 100644
--- a/src/Umbraco.Web.UI/umbraco/dialogs/emptyTrashcan.aspx
+++ b/src/Umbraco.Web.UI/umbraco/dialogs/emptyTrashcan.aspx
@@ -30,7 +30,7 @@
 		    }
 		    
 		    function updateStatusLabel(retVal) {
-                jQuery('#statusLabel').html("<strong>" + retVal + " <%=umbraco.ui.Text("remaining")%></strong>");            
+                jQuery('#statusLabel').html("<strong>" + retVal + " <%=Services.TextService.Localize("remaining")%></strong>");            
 
                 if (retVal != '' && retVal != '0') {
                     setTimeout('updateStatus();', 500);
@@ -74,9 +74,9 @@
 		<br />
 		<div id="buttons">
 		<input type="button" ID="ok" value="<%=Services.TextService.Localize("actions/emptyTrashcan") %>" class="guiInputButton" onclick="if ($get('confirmDelete').checked) {emptyRecycleBin();}" disabled="true" />  
-		<em><%= umbraco.ui.Text("or") %></em> 
+		<em><%= Services.TextService.Localize("or") %></em> 
     <a href="#" onclick="UmbClientMgr.closeModalWindow();">
-      <%=umbraco.ui.Text("cancel")%>
+      <%=Services.TextService.Localize("cancel")%>
     </a>
 		</div>
 		</div>
diff --git a/src/Umbraco.Web.UI/umbraco/dialogs/importDocumenttype.aspx b/src/Umbraco.Web.UI/umbraco/dialogs/importDocumenttype.aspx
index f684e368ba..94f4cdd485 100644
--- a/src/Umbraco.Web.UI/umbraco/dialogs/importDocumenttype.aspx
+++ b/src/Umbraco.Web.UI/umbraco/dialogs/importDocumenttype.aspx
@@ -12,7 +12,7 @@
           <asp:Panel ID="Wizard" runat="server" Visible="True">
             <p>
             <span class="guiDialogNormal">
-              <%=umbraco.ui.Text("importDocumentTypeHelp")%>
+              <%=Services.TextService.Localize("importDocumentTypeHelp")%>
             </span>
             </p>
             
@@ -21,18 +21,18 @@
             </p>
             
             
-            <asp:Button ID="submit" runat="server"></asp:Button> <em><%= umbraco.ui.Text("or") %></em> <a href="#" onclick="UmbClientMgr.closeModalWindow(); return false;"><%= umbraco.ui.Text("cancel") %></a>
+            <asp:Button ID="submit" runat="server"></asp:Button> <em><%= Services.TextService.Localize("or") %></em> <a href="#" onclick="UmbClientMgr.closeModalWindow(); return false;"><%= Services.TextService.Localize("cancel") %></a>
           </asp:Panel>
           
           
           <asp:Panel ID="Confirm" runat="server" Visible="False">
             <strong>
-              <%=umbraco.ui.Text("name")%>
+              <%=Services.TextService.Localize("name")%>
               :</strong>
             <asp:Literal ID="dtName" runat="server"></asp:Literal>
             <br />
             <strong>
-              <%=umbraco.ui.Text("alias")%>
+              <%=Services.TextService.Localize("alias")%>
               :</strong>
             <asp:Literal ID="dtAlias" runat="server"></asp:Literal>
             <br />
diff --git a/src/Umbraco.Web.UI/umbraco/dialogs/insertMasterpageContent.aspx b/src/Umbraco.Web.UI/umbraco/dialogs/insertMasterpageContent.aspx
index 988b0e179e..349c4b542d 100644
--- a/src/Umbraco.Web.UI/umbraco/dialogs/insertMasterpageContent.aspx
+++ b/src/Umbraco.Web.UI/umbraco/dialogs/insertMasterpageContent.aspx
@@ -27,6 +27,6 @@
    
   <cc1:Pane runat="server" CssClass="btn-toolbar umb-btn-toolbar">
             <a class="btn btn-link" onclick="UmbClientMgr.closeModalWindow(); return false;"><%=umbraco.ui.Text("general", "cancel", this.getUser())%></a>
-            <input type="button" onclick="insertCode(); return false;" Class="btn btn-primary" value="<%= umbraco.ui.Text("insert") %>" />
+            <input type="button" onclick="insertCode(); return false;" Class="btn btn-primary" value="<%= Services.TextService.Localize("insert") %>" />
   </cc1:Pane>
 </asp:Content>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI/umbraco/dialogs/insertMasterpagePlaceholder.aspx b/src/Umbraco.Web.UI/umbraco/dialogs/insertMasterpagePlaceholder.aspx
index bfa223b4b0..fea07fc474 100644
--- a/src/Umbraco.Web.UI/umbraco/dialogs/insertMasterpagePlaceholder.aspx
+++ b/src/Umbraco.Web.UI/umbraco/dialogs/insertMasterpagePlaceholder.aspx
@@ -31,6 +31,6 @@
    
   <cc1:Pane runat="server" CssClass="btn-toolbar umb-btn-toolbar">
             <a class="btn btn-link" onclick="UmbClientMgr.closeModalWindow(); return false;"><%=umbraco.ui.Text("general", "cancel", this.getUser())%></a>
-            <input type="button" onclick="insertCode(); return false;" Class="btn btn-primary" value="<%= umbraco.ui.Text("insert") %>" />
+            <input type="button" onclick="insertCode(); return false;" Class="btn btn-primary" value="<%= Services.TextService.Localize("insert") %>" />
   </cc1:Pane>
 </asp:Content>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI/umbraco/dialogs/insertTable.aspx b/src/Umbraco.Web.UI/umbraco/dialogs/insertTable.aspx
index 3943cae364..7d8c745564 100644
--- a/src/Umbraco.Web.UI/umbraco/dialogs/insertTable.aspx
+++ b/src/Umbraco.Web.UI/umbraco/dialogs/insertTable.aspx
@@ -284,7 +284,7 @@ function insertTable()
 		</TR></FORM>
 	</TABLE>
 	&nbsp;
-	<input type="button" class="guiInputButton" onClick="if (confirm('<%=umbraco.ui.Text("areyousure").Replace("'", "\\'")%>')) window.close();" value="<%=umbraco.ui.Text("cancel")%>"> &nbsp; 
-	<input type="button" class="guiInputButton" onClick="insertTable()" value="<%=umbraco.ui.Text("insert")%>">
+	<input type="button" class="guiInputButton" onClick="if (confirm('<%=Services.TextService.Localize("areyousure").Replace("'", "\\'")%>')) window.close();" value="<%=Services.TextService.Localize("cancel")%>"> &nbsp; 
+	<input type="button" class="guiInputButton" onClick="insertTable()" value="<%=Services.TextService.Localize("insert")%>">
 	</body>
 </HTML>
diff --git a/src/Umbraco.Web.UI/umbraco/dialogs/mediaPicker.aspx b/src/Umbraco.Web.UI/umbraco/dialogs/mediaPicker.aspx
index a1620e6c2a..2311b5b568 100644
--- a/src/Umbraco.Web.UI/umbraco/dialogs/mediaPicker.aspx
+++ b/src/Umbraco.Web.UI/umbraco/dialogs/mediaPicker.aspx
@@ -87,11 +87,11 @@
     </asp:Panel>
     <br />
     <p>
-        <input type="submit" value="<%# umbraco.ui.Text("treepicker")%>" style="width: 60px;
+        <input type="submit" value="<%# Services.TextService.Localize("treepicker")%>" style="width: 60px;
             color: gray" disabled="disabled" id="submitbutton" />
         <em id="orcopy">
-            <%# umbraco.ui.Text("or") %></em> <a href="javascript:cancel();" style="color: blue"
+            <%# Services.TextService.Localize("or") %></em> <a href="javascript:cancel();" style="color: blue"
                 id="cancelbutton">
-                <%#umbraco.ui.Text("cancel") %></a>
+                <%#Services.TextService.Localize("cancel") %></a>
     </p>
 </asp:Content>
diff --git a/src/Umbraco.Web.UI/umbraco/dialogs/protectPage.aspx b/src/Umbraco.Web.UI/umbraco/dialogs/protectPage.aspx
index cdd8c29acb..3205e90a8a 100644
--- a/src/Umbraco.Web.UI/umbraco/dialogs/protectPage.aspx
+++ b/src/Umbraco.Web.UI/umbraco/dialogs/protectPage.aspx
@@ -116,7 +116,7 @@
         </div>
 
         <div class="umb-dialog-footer btn-toolbar umb-btn-toolbar">
-            <a href="#" class="btn btn-link" onclick="UmbClientMgr.closeModalWindow()"><%=umbraco.ui.Text("cancel")%></a>
+            <a href="#" class="btn btn-link" onclick="UmbClientMgr.closeModalWindow()"><%=Services.TextService.Localize("cancel")%></a>
             <asp:Button ID="bt_selectMode" runat="server" Text="select" CssClass="btn btn-primary" OnClick="selectMode" />
         </div>
     </asp:Panel>
@@ -156,7 +156,7 @@
 
             <cc1:PropertyPanel runat="server" ID="pp_loginPage" CssClass="pa-select-pages">
                 <small class="umb-detail">
-                    <%=umbraco.ui.Text("paLoginPageHelp")%>
+                    <%=Services.TextService.Localize("paLoginPageHelp")%>
                 </small>
                 <div class="pa-choose-page">
                     <asp:PlaceHolder ID="ph_loginpage" runat="server" />
@@ -168,7 +168,7 @@
 
             <cc1:PropertyPanel runat="server" ID="pp_errorPage" CssClass="pa-select-pages">
                 <small class="umb-detail">
-                    <%=umbraco.ui.Text("paErrorPageHelp")%>
+                    <%=Services.TextService.Localize("paErrorPageHelp")%>
                 </small>
                 <div class="pa-choose-page">
                     <asp:PlaceHolder ID="ph_errorpage" runat="server" />
@@ -180,7 +180,7 @@
 
 
         <div class="umb-dialog-footer btn-toolbar umb-btn-toolbar">
-            <a href="#" class="btn btn-link" onclick="UmbClientMgr.closeModalWindow()"><%=umbraco.ui.Text("cancel")%></a>
+            <a href="#" class="btn btn-link" onclick="UmbClientMgr.closeModalWindow()"><%=Services.TextService.Localize("cancel")%></a>
             <asp:Button ID="bt_protect" CssClass="btn btn-primary" runat="server" OnCommand="protect_Click"></asp:Button>
             <asp:Button ID="bt_buttonRemoveProtection" CssClass="btn btn-danger" runat="server" Visible="False" OnClick="buttonRemoveProtection_Click" />
         </div>
diff --git a/src/Umbraco.Web.UI/umbraco/dialogs/publish.aspx b/src/Umbraco.Web.UI/umbraco/dialogs/publish.aspx
index 196c190575..4185f3c50e 100644
--- a/src/Umbraco.Web.UI/umbraco/dialogs/publish.aspx
+++ b/src/Umbraco.Web.UI/umbraco/dialogs/publish.aspx
@@ -88,7 +88,7 @@
                 </ul>
             </div>
              <p>
-                 <a href='#' class="btn" data-bind="click: closeDialog"><%=umbraco.ui.Text("closeThisWindow") %></a>
+                 <a href='#' class="btn" data-bind="click: closeDialog"><%=Services.TextService.Localize("closeThisWindow") %></a>
              </p>
         </div> 
        
diff --git a/src/Umbraco.Web.UI/umbraco/dialogs/republish.aspx b/src/Umbraco.Web.UI/umbraco/dialogs/republish.aspx
index 3261f3edd1..2b3acfa093 100644
--- a/src/Umbraco.Web.UI/umbraco/dialogs/republish.aspx
+++ b/src/Umbraco.Web.UI/umbraco/dialogs/republish.aspx
@@ -19,7 +19,7 @@
     </div>
       
     <div id="buttons" class="btn-toolbar umb-btn-toolbar">
-        <a href="#" class="btn btn-link" onclick="UmbClientMgr.closeModalWindow();"><%=umbraco.ui.Text("cancel")%></a>
+        <a href="#" class="btn btn-link" onclick="UmbClientMgr.closeModalWindow();"><%=Services.TextService.Localize("cancel")%></a>
         <asp:Button ID="bt_go" cssclass="btn btn-primary" OnClick="go" OnClientClick="showProgress(document.getElementById('buttons'),'progress'); return true;" runat="server" Text="Republish" />
     </div>     
       
diff --git a/src/Umbraco.Web.UI/umbraco/dialogs/sendToTranslation.aspx b/src/Umbraco.Web.UI/umbraco/dialogs/sendToTranslation.aspx
index 023b5ef693..5e27895926 100644
--- a/src/Umbraco.Web.UI/umbraco/dialogs/sendToTranslation.aspx
+++ b/src/Umbraco.Web.UI/umbraco/dialogs/sendToTranslation.aspx
@@ -30,7 +30,7 @@
 <asp:Panel ID="pl_buttons" runat="server">
 <p>
 <asp:Button ID="doTranslation" runat="Server" OnClick="doTranslation_Click" />
-&nbsp; <em><%= umbraco.ui.Text("or") %></em> &nbsp;<a href="#" onClick="UmbClientMgr.closeModalWindow()"><%=umbraco.ui.Text("cancel")%></a>
+&nbsp; <em><%= Services.TextService.Localize("or") %></em> &nbsp;<a href="#" onClick="UmbClientMgr.closeModalWindow()"><%=Services.TextService.Localize("cancel")%></a>
 </p>
 </asp:Panel>
 </asp:Content>
diff --git a/src/Umbraco.Web.UI/umbraco/dialogs/sort.aspx b/src/Umbraco.Web.UI/umbraco/dialogs/sort.aspx
index 5a7addb1f5..201bd1111a 100644
--- a/src/Umbraco.Web.UI/umbraco/dialogs/sort.aspx
+++ b/src/Umbraco.Web.UI/umbraco/dialogs/sort.aspx
@@ -63,7 +63,7 @@
     </div>
     <div class="umb-dialog-footer btn-toolbar umb-btn-toolbar">
         <a id="closeWindowButton" href="#" class="btn btn-link"><%=umbraco.ui.Text("general", "cancel", this.getUser())%></a>
-        <input id="submitButton" type="button" class="btn btn-primary" value="<%=umbraco.ui.Text("save") %>" />
+        <input id="submitButton" type="button" class="btn btn-primary" value="<%=Services.TextService.Localize("save") %>" />
     </div>
 
     <script type="text/javascript">
diff --git a/src/Umbraco.Web.UI/umbraco/dialogs/umbracoField.aspx b/src/Umbraco.Web.UI/umbraco/dialogs/umbracoField.aspx
index e91780a000..212d2968b7 100644
--- a/src/Umbraco.Web.UI/umbraco/dialogs/umbracoField.aspx
+++ b/src/Umbraco.Web.UI/umbraco/dialogs/umbracoField.aspx
@@ -83,7 +83,7 @@
 
         <cc1:PropertyPanel ID="pp_encode" runat="server">
             <input type="radio" name="urlEncode" value=""/>
-            <%=umbraco.ui.Text("none")%>
+            <%=Services.TextService.Localize("none")%>
             <input type="radio" name="urlEncode" value="url"/>
             <%=Services.TextService.Localize("templateEditor/urlEncode")%>
             <input type="radio" name="urlEncode" value="html"/>
@@ -132,7 +132,7 @@
             <a id="cancelButton" href="#" class="btn btn-link">
                 <%=Services.TextService.Localize("general/cancel")%></a> 
     
-            <input id="submitButton" type="button" name="gem" class="btn btn-primary" value="<%=umbraco.ui.Text("insert")%>" />
+            <input id="submitButton" type="button" name="gem" class="btn btn-primary" value="<%=Services.TextService.Localize("insert")%>" />
         </div>
     </div>
 
diff --git a/src/Umbraco.Web.UI/umbraco/dialogs/viewAuditTrail.aspx b/src/Umbraco.Web.UI/umbraco/dialogs/viewAuditTrail.aspx
index 4a51de9800..ba0636a95e 100644
--- a/src/Umbraco.Web.UI/umbraco/dialogs/viewAuditTrail.aspx
+++ b/src/Umbraco.Web.UI/umbraco/dialogs/viewAuditTrail.aspx
@@ -22,7 +22,7 @@
                 <asp:TemplateColumn>
                   <HeaderTemplate>
                     <b>
-                      <%=umbraco.ui.Text("action")%>&nbsp;&nbsp;
+                      <%=Services.TextService.Localize("action")%>&nbsp;&nbsp;
                     </b>
                   </HeaderTemplate>
                   <ItemTemplate>
@@ -32,7 +32,7 @@
                 <asp:TemplateColumn>
                   <HeaderTemplate>
                     <b>
-                      <%=umbraco.ui.Text("user")%>
+                      <%=Services.TextService.Localize("user")%>
                     </b>
                   </HeaderTemplate>
                   <ItemTemplate>
@@ -42,7 +42,7 @@
                 <asp:TemplateColumn>
                   <HeaderTemplate>
                     <b>
-                      <%=umbraco.ui.Text("date")%>
+                      <%=Services.TextService.Localize("date")%>
                     </b>
                   </HeaderTemplate>
                   <ItemTemplate>
@@ -52,7 +52,7 @@
                 <asp:TemplateColumn>
                   <HeaderTemplate>
                     <b>
-                      <%=umbraco.ui.Text("comment")%>
+                      <%=Services.TextService.Localize("comment")%>
                     </b>
                   </HeaderTemplate>
                   <ItemTemplate>
diff --git a/src/Umbraco.Web.UI/umbraco/members/MemberSearch.ascx b/src/Umbraco.Web.UI/umbraco/members/MemberSearch.ascx
index 76e7749e0e..e1c6f6e664 100644
--- a/src/Umbraco.Web.UI/umbraco/members/MemberSearch.ascx
+++ b/src/Umbraco.Web.UI/umbraco/members/MemberSearch.ascx
@@ -13,7 +13,7 @@
 	<HeaderTemplate>
 	<table rules="rows" border="0" class="members_table">
 	<thead>
-	<tr><th><%= umbraco.ui.Text("name") %></th><th><%= umbraco.ui.Text("email") %></th><th><%= umbraco.ui.Text("login") %></th></tr>
+	<tr><th><%= Services.TextService.Localize("name") %></th><th><%= Services.TextService.Localize("email") %></th><th><%= Services.TextService.Localize("login") %></th></tr>
 	</thead>
 	<tbody>
 	</HeaderTemplate>
diff --git a/src/Umbraco.Web.UI/umbraco/members/ViewMembers.aspx b/src/Umbraco.Web.UI/umbraco/members/ViewMembers.aspx
index aa3417d6d2..3dd8012118 100644
--- a/src/Umbraco.Web.UI/umbraco/members/ViewMembers.aspx
+++ b/src/Umbraco.Web.UI/umbraco/members/ViewMembers.aspx
@@ -9,7 +9,7 @@
     <HeaderTemplate>
     <table rules="rows" border="0" class="members_table">
     <thead>
-    <tr><th><%= umbraco.ui.Text("name") %></th><th><%= umbraco.ui.Text("email") %></th><th colspan="2"><%= umbraco.ui.Text("login") %></th></tr>
+    <tr><th><%= Services.TextService.Localize("name") %></th><th><%= Services.TextService.Localize("email") %></th><th colspan="2"><%= Services.TextService.Localize("login") %></th></tr>
     </thead>
     <tbody>
     </HeaderTemplate>
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/SubmitPackage.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/SubmitPackage.aspx
index a882fedef2..1a986594e3 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/SubmitPackage.aspx
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/SubmitPackage.aspx
@@ -105,7 +105,7 @@
     </div>
     
     <p>
-      <asp:Button ID="bt_submit" runat="server" Text="Submit package" OnClick="submitPackage" /> &nbsp;<em><%= umbraco.ui.Text("or") %></em> &nbsp;<a href="editpackage.aspx?id=<%= Request.QueryString["id"] %>"><%= umbraco.ui.Text("cancel") %></a>
+      <asp:Button ID="bt_submit" runat="server" Text="Submit package" OnClick="submitPackage" /> &nbsp;<em><%= Services.TextService.Localize("or") %></em> &nbsp;<a href="editpackage.aspx?id=<%= Request.QueryString["id"] %>"><%= Services.TextService.Localize("cancel") %></a>
     </p>
     </asp:PlaceHolder>
     
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Xslt/xsltChooseExtension.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Xslt/xsltChooseExtension.aspx
index a127ead2d5..5ae03829cc 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Xslt/xsltChooseExtension.aspx
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Xslt/xsltChooseExtension.aspx
@@ -38,7 +38,7 @@ div.code input{border: none; background:#F6F6F9; color: #000; padding: 5px; font
 </cc1:Pane>
 
 <p>
-  <asp:Button ID="bt_insert" OnClientClick="returnResult(); return false;" Enabled="false" runat="server" Text="Insert" /> <em><%= umbraco.ui.Text("or") %></em> <a href="xsltInsertValueOf.aspx"><%= umbraco.ui.Text("cancel") %></a>
+  <asp:Button ID="bt_insert" OnClientClick="returnResult(); return false;" Enabled="false" runat="server" Text="Insert" /> <em><%= Services.TextService.Localize("or") %></em> <a href="xsltInsertValueOf.aspx"><%= Services.TextService.Localize("cancel") %></a>
 </p> 
 
 </asp:Content>
\ No newline at end of file
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Xslt/xsltInsertValueOf.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Xslt/xsltInsertValueOf.aspx
index f5188b41ac..2a550dec6d 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Xslt/xsltInsertValueOf.aspx
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Xslt/xsltInsertValueOf.aspx
@@ -56,6 +56,6 @@ body{margin: 0px; padding: 0px;}
 </cc1:Pane>
 
 <p>
-          <input type="button" value="Insert value" onclick="doSubmit();" /> <em><%= umbraco.ui.Text("or") %></em> <a href="#" onclick="UmbClientMgr.closeModalWindow(); return false;"><%= umbraco.ui.Text("cancel") %></a>
+          <input type="button" value="Insert value" onclick="doSubmit();" /> <em><%= Services.TextService.Localize("or") %></em> <a href="#" onclick="UmbClientMgr.closeModalWindow(); return false;"><%= Services.TextService.Localize("cancel") %></a>
 </p>
 </asp:Content>
\ No newline at end of file
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/SendPublish.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/SendPublish.aspx
index 39ee58aee0..5ab6a3b97a 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/SendPublish.aspx
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/SendPublish.aspx
@@ -2,12 +2,12 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
 <html xmlns="http://www.w3.org/1999/xhtml">
 	<head>
-		<title>umbraco - <%=umbraco.ui.Text("editContentSendToPublish")%></title>
+		<title>umbraco - <%=Services.TextService.Localize("editContentSendToPublish")%></title>
 		<link href="../css/umbracoGui.css" type="text/css" rel="stylesheet"/>
 	</head>
 	<body style="padding: 10px;">
-		<h3><img src="../images/publish.gif" alt="Republish" align="absmiddle" style="float:left; margin-top: 3px; margin-right: 5px"/> <%=umbraco.ui.Text("editContentSendToPublishText")%></h3>
+		<h3><img src="../images/publish.gif" alt="Republish" align="absmiddle" style="float:left; margin-top: 3px; margin-right: 5px"/> <%=Services.TextService.Localize("editContentSendToPublishText")%></h3>
 		<br/>
-		<a href="#" onclick="javascript:UmbClientMgr.closeModalWindow();" style="margin-left: 30px" class="guiDialogNormal"><%=umbraco.ui.Text("closewindow")%></a>
+		<a href="#" onclick="javascript:UmbClientMgr.closeModalWindow();" style="margin-left: 30px" class="guiDialogNormal"><%=Services.TextService.Localize("closewindow")%></a>
 	</body>
 </html>
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/importDocumenttype.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/importDocumenttype.aspx
index f684e368ba..94f4cdd485 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/importDocumenttype.aspx
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/importDocumenttype.aspx
@@ -12,7 +12,7 @@
           <asp:Panel ID="Wizard" runat="server" Visible="True">
             <p>
             <span class="guiDialogNormal">
-              <%=umbraco.ui.Text("importDocumentTypeHelp")%>
+              <%=Services.TextService.Localize("importDocumentTypeHelp")%>
             </span>
             </p>
             
@@ -21,18 +21,18 @@
             </p>
             
             
-            <asp:Button ID="submit" runat="server"></asp:Button> <em><%= umbraco.ui.Text("or") %></em> <a href="#" onclick="UmbClientMgr.closeModalWindow(); return false;"><%= umbraco.ui.Text("cancel") %></a>
+            <asp:Button ID="submit" runat="server"></asp:Button> <em><%= Services.TextService.Localize("or") %></em> <a href="#" onclick="UmbClientMgr.closeModalWindow(); return false;"><%= Services.TextService.Localize("cancel") %></a>
           </asp:Panel>
           
           
           <asp:Panel ID="Confirm" runat="server" Visible="False">
             <strong>
-              <%=umbraco.ui.Text("name")%>
+              <%=Services.TextService.Localize("name")%>
               :</strong>
             <asp:Literal ID="dtName" runat="server"></asp:Literal>
             <br />
             <strong>
-              <%=umbraco.ui.Text("alias")%>
+              <%=Services.TextService.Localize("alias")%>
               :</strong>
             <asp:Literal ID="dtAlias" runat="server"></asp:Literal>
             <br />
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/insertMasterpageContent.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/insertMasterpageContent.aspx
index 95f1c9ce10..9fa666c7d0 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/insertMasterpageContent.aspx
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/insertMasterpageContent.aspx
@@ -27,6 +27,6 @@
    
   <cc1:Pane runat="server" CssClass="btn-toolbar umb-btn-toolbar">
             <a class="btn btn-link" onclick="UmbClientMgr.closeModalWindow(); return false;"><%=Services.TextService.Localize("general/cancel")%></a>
-            <input type="button" onclick="insertCode(); return false;" Class="btn btn-primary" value="<%= umbraco.ui.Text("insert") %>" />
+            <input type="button" onclick="insertCode(); return false;" Class="btn btn-primary" value="<%= Services.TextService.Localize("insert") %>" />
   </cc1:Pane>
 </asp:Content>
\ No newline at end of file
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/insertMasterpagePlaceholder.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/insertMasterpagePlaceholder.aspx
index 556a1cb2d1..37636a8dbd 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/insertMasterpagePlaceholder.aspx
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/insertMasterpagePlaceholder.aspx
@@ -29,6 +29,6 @@
    
   <cc1:Pane runat="server" CssClass="btn-toolbar umb-btn-toolbar">
             <a class="btn btn-link" onclick="UmbClientMgr.closeModalWindow(); return false;"><%=umbraco.ui.Text("general", "cancel", this.getUser())%></a>
-            <input type="button" onclick="insertCode(); return false;" Class="btn btn-primary" value="<%= umbraco.ui.Text("insert") %>" />
+            <input type="button" onclick="insertCode(); return false;" Class="btn btn-primary" value="<%= Services.TextService.Localize("insert") %>" />
   </cc1:Pane>
 </asp:Content>
\ No newline at end of file
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/republish.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/republish.aspx
index ded65f1bd9..8d27af83b8 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/republish.aspx
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/republish.aspx
@@ -20,8 +20,8 @@
       
           <div id="buttons">
             <asp:Button ID="bt_go" OnClick="go" OnClientClick="showProgress(document.getElementById('buttons'),'progress'); return true;" runat="server" Text="Republish" />
-            <em><%= umbraco.ui.Text("or") %></em>  
-            <a href="#" onclick="UmbClientMgr.closeModalWindow();"><%=umbraco.ui.Text("cancel")%></a>
+            <em><%= Services.TextService.Localize("or") %></em>  
+            <a href="#" onclick="UmbClientMgr.closeModalWindow();"><%=Services.TextService.Localize("cancel")%></a>
           </div>     
       
       <div id="progress" style="visibility: hidden;">
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/sendToTranslation.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/sendToTranslation.aspx
index 023b5ef693..5e27895926 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/sendToTranslation.aspx
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/sendToTranslation.aspx
@@ -30,7 +30,7 @@
 <asp:Panel ID="pl_buttons" runat="server">
 <p>
 <asp:Button ID="doTranslation" runat="Server" OnClick="doTranslation_Click" />
-&nbsp; <em><%= umbraco.ui.Text("or") %></em> &nbsp;<a href="#" onClick="UmbClientMgr.closeModalWindow()"><%=umbraco.ui.Text("cancel")%></a>
+&nbsp; <em><%= Services.TextService.Localize("or") %></em> &nbsp;<a href="#" onClick="UmbClientMgr.closeModalWindow()"><%=Services.TextService.Localize("cancel")%></a>
 </p>
 </asp:Panel>
 </asp:Content>
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/viewAuditTrail.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/viewAuditTrail.aspx
index 4a51de9800..ba0636a95e 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/viewAuditTrail.aspx
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/viewAuditTrail.aspx
@@ -22,7 +22,7 @@
                 <asp:TemplateColumn>
                   <HeaderTemplate>
                     <b>
-                      <%=umbraco.ui.Text("action")%>&nbsp;&nbsp;
+                      <%=Services.TextService.Localize("action")%>&nbsp;&nbsp;
                     </b>
                   </HeaderTemplate>
                   <ItemTemplate>
@@ -32,7 +32,7 @@
                 <asp:TemplateColumn>
                   <HeaderTemplate>
                     <b>
-                      <%=umbraco.ui.Text("user")%>
+                      <%=Services.TextService.Localize("user")%>
                     </b>
                   </HeaderTemplate>
                   <ItemTemplate>
@@ -42,7 +42,7 @@
                 <asp:TemplateColumn>
                   <HeaderTemplate>
                     <b>
-                      <%=umbraco.ui.Text("date")%>
+                      <%=Services.TextService.Localize("date")%>
                     </b>
                   </HeaderTemplate>
                   <ItemTemplate>
@@ -52,7 +52,7 @@
                 <asp:TemplateColumn>
                   <HeaderTemplate>
                     <b>
-                      <%=umbraco.ui.Text("comment")%>
+                      <%=Services.TextService.Localize("comment")%>
                     </b>
                   </HeaderTemplate>
                   <ItemTemplate>
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/members/MemberSearch.ascx b/src/Umbraco.Web/umbraco.presentation/umbraco/members/MemberSearch.ascx
index 76e7749e0e..e1c6f6e664 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/members/MemberSearch.ascx
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/members/MemberSearch.ascx
@@ -13,7 +13,7 @@
 	<HeaderTemplate>
 	<table rules="rows" border="0" class="members_table">
 	<thead>
-	<tr><th><%= umbraco.ui.Text("name") %></th><th><%= umbraco.ui.Text("email") %></th><th><%= umbraco.ui.Text("login") %></th></tr>
+	<tr><th><%= Services.TextService.Localize("name") %></th><th><%= Services.TextService.Localize("email") %></th><th><%= Services.TextService.Localize("login") %></th></tr>
 	</thead>
 	<tbody>
 	</HeaderTemplate>
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/members/ViewMembers.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/members/ViewMembers.aspx
index aa3417d6d2..3dd8012118 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/members/ViewMembers.aspx
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/members/ViewMembers.aspx
@@ -9,7 +9,7 @@
     <HeaderTemplate>
     <table rules="rows" border="0" class="members_table">
     <thead>
-    <tr><th><%= umbraco.ui.Text("name") %></th><th><%= umbraco.ui.Text("email") %></th><th colspan="2"><%= umbraco.ui.Text("login") %></th></tr>
+    <tr><th><%= Services.TextService.Localize("name") %></th><th><%= Services.TextService.Localize("email") %></th><th colspan="2"><%= Services.TextService.Localize("login") %></th></tr>
     </thead>
     <tbody>
     </HeaderTemplate>