diff --git a/templates/Includes/CMSMain_left.ss b/templates/Includes/CMSMain_left.ss
index 56007c40..ff3a5a38 100755
--- a/templates/Includes/CMSMain_left.ss
+++ b/templates/Includes/CMSMain_left.ss
@@ -2,16 +2,16 @@
 
 	<div id="treepanes">
 		<h2 id="heading_sitetree" class="selected">
-			<img id="sitetree_toggle_closed" src="sapphire/images/toggle-closed.gif" alt="+" style="display:none;" title="<% _t('OPENBOX','click to open this box'); %>" />
-			<img id="sitetree_toggle_open" src="sapphire/images/toggle-open.gif" alt="-" title="<% _t('CLOSEBOX','click to close box'); %>" />
-			<% _t('SITECONTENT TITLE','Site Content and Structure',PR_HIGH); %>
+			<img id="sitetree_toggle_closed" src="sapphire/images/toggle-closed.gif" alt="+" style="display:none;" title="<% _t('OPENBOX','click to open this box') %>" />
+			<img id="sitetree_toggle_open" src="sapphire/images/toggle-open.gif" alt="-" title="<% _t('CLOSEBOX','click to close box') %>" />
+			<% _t('SITECONTENT TITLE','Site Content and Structure',PR_HIGH) %>
 		</h2>
 		<div id="sitetree_holder">
 
 			<ul id="TreeActions">
-				<li class="action" id="addpage"><button><% _t('CREATE','Create',PR_HIGH); %></button></li>
-				<li class="action" id="search"><button><% _t('SEARCH','Search',PR_HIGH); %></button></li>
-				<li class="action" id="batchactions"><button><% _t('BATCHACTIONS','Batch Actions',PR_HIGH); %></button></li>
+				<li class="action" id="addpage"><button><% _t('CREATE','Create',PR_HIGH) %></button></li>
+				<li class="action" id="search"><button><% _t('SEARCH','Search',PR_HIGH) %></button></li>
+				<li class="action" id="batchactions"><button><% _t('BATCHACTIONS','Batch Actions',PR_HIGH) %></button></li>
 				<!-- <li class="action" id="duplicate"><a href="#">Duplicate</a></li>
 				Sam: this should be put into the Create area, I think, so we don't stuff up the layout -->
 			</ul>
@@ -36,7 +36,7 @@
 				</div>
 				<div class="field dropdown nolabel" style="margin-top: 4px;">
 					<span class="middleColumn">
-						<input type="checkbox" id="sortitems" /> <label for="sortitems"><% _t('ENABLEDRAGGING','Allow drag &amp; drop reordering', PR_HIGH); %></label>
+						<input type="checkbox" id="sortitems" /> <label for="sortitems"><% _t('ENABLEDRAGGING','Allow drag &amp; drop reordering', PR_HIGH) %></label>
 					</span>
 				</div>
 				
@@ -46,16 +46,16 @@
 				<div>
 				<input type="hidden" id="SiteTreeIsFiltered" value="0" />
 				<input type="text" id="SiteTreeSearchTerm" name="SiteTreeSearchTerm" />
-				<input type="submit" id="SiteTreeSearchButton" value="<% _t('SEARCH','Search'); %>" title="<% _t('SEARCHTITLE','Search through URL, Title, Menu Title, &amp; Content'); %>" />
-				<div style="display:none" id="TextSiteTreeFilterDate" class="SearchCriteria"><b><% _t('EDITEDSINCE','Edited Since'); %>:</b></div>
+				<input type="submit" id="SiteTreeSearchButton" value="<% _t('SEARCH') %>" title="<% _t('SEARCHTITLE','Search through URL, Title, Menu Title, &amp; Content') %>" />
+				<div style="display:none" id="TextSiteTreeFilterDate" class="SearchCriteria"><b><% _t('EDITEDSINCE','Edited Since') %>:</b></div>
 				<div style="display:none" id="InputSiteTreeFilterDate">$SiteTreeFilterDateField</div>
 				<% control SiteTreeFilterOptions %>
 					<div style="display:none" id="Text$Column" class="SearchCriteria"><b>$Title:</b></div>
 					<input style="display:none" id="Input$Column" name="$Column" class="SearchCriteria" />
 				<% end_control %>
 				<select id="SiteTreeFilterAddCriteria">
-					<option><% _t('ADDSEARCHCRITERIA','Add Criteria...'); %></option>
-					<option value="SiteTreeFilterDate"><% _t('EDITEDSINCE','Edited Since'); %></option>
+					<option><% _t('ADDSEARCHCRITERIA','Add Criteria...') %></option>
+					<option value="SiteTreeFilterDate"><% _t('EDITEDSINCE','Edited Since') %></option>
 					<% control SiteTreeFilterOptions %>
         					<option value="$Column">$Title</option>
 					<% end_control %>
@@ -64,23 +64,23 @@
 			</form>
 			<div id="batchactionsforms" style="display: none">
 				<form class="actionparams" style="border:0" id="deletepage_options" action="admin/deleteitems">
-					<p><% _t('SELECTPAGESACTIONS','Select the pages that you want to change &amp; then click an action:'); %></p>
+					<p><% _t('SELECTPAGESACTIONS','Select the pages that you want to change &amp; then click an action:') %></p>
 					<div>		
 					<input type="hidden" name="csvIDs" />
-					<input type="submit"  id="action_delete_selected" value="<% _t('DELETECONFIRM','Delete the selected pages'); %>" />
+					<input type="submit"  id="action_delete_selected" value="<% _t('DELETECONFIRM','Delete the selected pages') %>" />
 					</div>
 				</form>
 				<form class="actionparams" style="border:0" id="publishpage_options" action="admin/publishitems">
 					<div>
 					<input type="hidden" name="csvIDs" />
-					<input type="checkbox" id="publishpage_show_drafts" /> <label for="publishpage_show_drafts"><% _t('SHOWONLYCHANGED','Show only changed pages'); %></label>
-					<input type="submit" id="action_publish_selected" value="<% _t('PUBLISHCONFIRM','Publish the selected pages'); %>" />
+					<input type="checkbox" id="publishpage_show_drafts" /> <label for="publishpage_show_drafts"><% _t('SHOWONLYCHANGED','Show only changed pages') %></label>
+					<input type="submit" id="action_publish_selected" value="<% _t('PUBLISHCONFIRM','Publish the selected pages') %>" />
 					</div>
 				</form>
 			</div>
 			<% control DuplicatePagesOptionsForm %>
 			<form class="actionparams" id="duplicate_options" style="display: none" action="admin/duplicateSiteTree">
-				<p><% _t('SELECTPAGESDUP','Select the pages that you want to duplicate, whether it\'s children should be included, and where you want the duplicates placed'); %></p>
+				<p><% _t('SELECTPAGESDUP','Select the pages that you want to duplicate, whether it\'s children should be included, and where you want the duplicates placed') %></p>
 				<div>		
 					<input type="hidden" name="csvIDs" />
 					<input type="submit" value="Duplicate" />
@@ -89,16 +89,21 @@
 			<% end_control %>
 
 			<div id="publication_key" style="border-bottom: 1px #CCC solid; background-color: #EEE; padding: 3px;">
-				<% _t('KEY','Key:'); %>
-				<ins style="cursor: help" title="<% _t('ADDEDNOTPUB','Added to the draft site and not published yet'); %>"><% _t('NEW','new'); %></ins>
-				<del style="cursor: help" title="<% _t('DELETEDSTILLLIVE','Deleted from the draft site but still on the live site'); %>"><% _t('DEL','deleted'); %></del>
-				<span style="cursor: help" title="<% _t('EDITEDNOTPUB','Edited on the draft site and not published yet'); %>" class="modified"><% _t('CHANGED','changed'); %></span>
+				<% _t('KEY','Key:') %>
+				<ins style="cursor: help" title="<% _t('ADDEDNOTPUB','Added to the draft site and not published yet') %>"><% _t('NEW','new') %></ins>
+				<del style="cursor: help" title="<% _t('DELETEDSTILLLIVE','Deleted from the draft site but still on the live site') %>"><% _t('DEL','deleted') %></del>
+				<span style="cursor: help" title="<% _t('EDITEDNOTPUB','Edited on the draft site and not published yet') %>" class="modified"><% _t('CHANGED','changed') %></span>
 			</div>
 
 			<div id="sitetree_ul">
 				$SiteTreeAsUL
 			</div>
 		</div>
+			<div id="LangSelector_holder" 
+				<% if MultipleLanguages %>
+				<% else %> class="onelang"
+				<% end_if %>
+			 >Language: $LangSelector </div>
 		<!--<div id="search_holder" style="display:none">
 			<h2>Search</h2>
 			<div class="unitBody">
@@ -107,18 +112,18 @@
 
 		<% if EnterpriseCMS %>
 		<h2 id="heading_tasklist">
-			<img id="tasklist_toggle_closed" src="sapphire/images/toggle-closed.gif" alt="+" title="<% _t('OPENBOX'); %>" />
-			<img id="tasklist_toggle_open" src="sapphire/images/toggle-open.gif" alt="-" style="display:none;" title="<% _t('CLOSEBOX'); %>" /> 
-			<% _t('TASKLIST','Tasklist'); %>
+			<img id="tasklist_toggle_closed" src="sapphire/images/toggle-closed.gif" alt="+" title="<% _t('OPENBOX') %>" />
+			<img id="tasklist_toggle_open" src="sapphire/images/toggle-open.gif" alt="-" style="display:none;" title="<% _t('CLOSEBOX') %>" /> 
+			<% _t('TASKLIST','Tasklist') %>
 		</h2>
 		<div class="listpane" id="tasklist_holder" style="display:none">	
 			<div class="unitBody">
 			</div>
 		</div>
 		<h2 id="heading_waitingon">
-			<img id="waitingon_toggle_closed" src="sapphire/images/toggle-closed.gif" alt="+" title="<% _t('OPENBOX'); %>" />
-			<img id="waitingon_toggle_open" src="sapphire/images/toggle-open.gif" alt="-" style="display:none;" title="<% _t('CLOSEBOX'); %>" /> 
-			<% _t('WAITINGON','Waiting on'); %>
+			<img id="waitingon_toggle_closed" src="sapphire/images/toggle-closed.gif" alt="+" title="<% _t('OPENBOX') %>" />
+			<img id="waitingon_toggle_open" src="sapphire/images/toggle-open.gif" alt="-" style="display:none;" title="<% _t('CLOSEBOX') %>" /> 
+			<% _t('WAITINGON','Waiting on') %>
 		</h2>
 		<div class="listpane" id="waitingon_holder" style="display:none">	
 			<div class="unitBody">
@@ -126,16 +131,16 @@
 		</div>
 		<% end_if %>
 		<h2 id="heading_versions">
-			<img id="versions_toggle_closed" src="sapphire/images/toggle-closed.gif" alt="+" title="<% _t('OPENBOX'); %>" />
-			<img id="versions_toggle_open" src="sapphire/images/toggle-open.gif" alt="-" style="display:none;" title="<% _t('CLOSEBOX'); %>" /> 
-			<% _t('PAGEVERSIONH','Page Version History'); %>
+			<img id="versions_toggle_closed" src="sapphire/images/toggle-closed.gif" alt="+" title="<% _t('OPENBOX') %>" />
+			<img id="versions_toggle_open" src="sapphire/images/toggle-open.gif" alt="-" style="display:none;" title="<% _t('CLOSEBOX') %>" /> 
+			<% _t('PAGEVERSIONH','Page Version History') %>
 		</h2>
 		<div class="listpane" id="versions_holder" style="display:none">
 			<p class="pane_actions" id="versions_actions">
-				<input type="checkbox" id="versions_comparemode" /> <label for="versions_comparemode"><% _t('COMPAREMODE','Compare mode (click 2 below)'); %></label>
+				<input type="checkbox" id="versions_comparemode" /> <label for="versions_comparemode"><% _t('COMPAREMODE','Compare mode (click 2 below)') %></label>
 				<br />
 
-				<input type="checkbox" id="versions_showall" /> <label for="versions_showall"><% _t('SHOWUNPUB','Show unpublished versions'); %></label>
+				<input type="checkbox" id="versions_showall" /> <label for="versions_showall"><% _t('SHOWUNPUB','Show unpublished versions') %></label>
 			</p>
 			
 			<div class="unitBody">
@@ -143,9 +148,9 @@
 		</div>
 		<% if EnterpriseCMS %>
 		<h2 id="heading_comments">
-			<img id="comments_toggle_closed" src="sapphire/images/toggle-closed.gif" alt="+" title="<% _t('OPENBOX'); %>" />
-			<img id="comments_toggle_open" src="sapphire/images/toggle-open.gif" alt="-" style="display:none;" title="<% _t('CLOSEBOX'); %>" /> 
-			<% _t('COMMENTS','Comments'); %>
+			<img id="comments_toggle_closed" src="sapphire/images/toggle-closed.gif" alt="+" title="<% _t('OPENBOX') %>" />
+			<img id="comments_toggle_open" src="sapphire/images/toggle-open.gif" alt="-" style="display:none;" title="<% _t('CLOSEBOX') %>" /> 
+			<% _t('COMMENTS','Comments') %>
 		</h2>
 		<div class="listpane" id="comments_holder" style="display:none">	
 			<div class="unitBody">
@@ -153,12 +158,12 @@
 		</div>
 		<% end_if %>
 		<h2 id="heading_reports">
-			<img id="reports_toggle_closed" src="sapphire/images/toggle-closed.gif" alt="+" title="<% _t('OPENBOX'); %>" />
-			<img id="reports_toggle_open" src="sapphire/images/toggle-open.gif" alt="-" style="display:none;" title="<% _t('CLOSEBOX'); %>" /> 
-			<% _t('SITEREPORTS','Site Reports'); %>
+			<img id="reports_toggle_closed" src="sapphire/images/toggle-closed.gif" alt="+" title="<% _t('OPENBOX') %>" />
+			<img id="reports_toggle_open" src="sapphire/images/toggle-open.gif" alt="-" style="display:none;" title="<% _t('CLOSEBOX') %>" /> 
+			<% _t('SITEREPORTS','Site Reports') %>
 		</h2>
 		<div class="listpane" id="reports_holder" style="display:none">
-			<p id="ReportSelector_holder">$ReportSelector <input class="action" type="submit" id="report_select_go" value="<% _t('GO','Go'); %>" /></p>
+			<p id="ReportSelector_holder">$ReportSelector <input class="action" type="submit" id="report_select_go" value="<% _t('GO','Go') %>" /></p>
 			<div class="unitBody">
 			</div>
 		</div>
diff --git a/templates/Includes/CMSMain_right.ss b/templates/Includes/CMSMain_right.ss
index e6ea6db5..08d873fa 100755
--- a/templates/Includes/CMSMain_right.ss
+++ b/templates/Includes/CMSMain_right.ss
@@ -1,5 +1,6 @@
 <!-- <div class="title"><div style="background-image : url(cms/images/panels/EditPage.png)">Edit Page</div></div> -->
 <% include Editor_toolbar %>
+<span id="Translating_Message" class="translatingMessage <% if EditingLang %><% else %>nonTranslating<% end_if %>"></span>
 
 <div id="form_actions_right" class="ajaxActions">
 </div>
@@ -8,20 +9,20 @@
 	<fieldset>
 	<input type="hidden" name="ID" />
 	<div class="field" id="action_submit_options_recipient">
-		<label class="left"><% _t('SENDTO','Send to'); %></label>
-		<span><% _t('LOADING','loading...'); %></span>
+		<label class="left"><% _t('SENDTO','Send to') %></label>
+		<span><% _t('LOADING','loading...') %></span>
 	</div>
 	<div class="field" id="action_submit_options_status">
-		<label class="left"><% _t('STATUS','Status'); %></label>
+		<label class="left"><% _t('STATUS','Status') %></label>
 		<input type="hidden" name="Status" />
 		<span></span>
 	</div>
-	<p class="label"><% _t('ANYMESSAGE','Do you have any message for your editor?'); %></p>
-	<textarea name="<% _t('MESSAGE','Message'); %>" rows="4" cols="20"></textarea>
+	<p class="label"><% _t('ANYMESSAGE','Do you have any message for your editor?') %></p>
+	<textarea name="<% _t('MESSAGE','Message') %>" rows="4" cols="20"></textarea>
 	</fieldset>
 	
 	<p class="actions">
-		<input type="submit" value="<% _t('SUBMIT','Submit for approval'); %>" />
+		<input type="submit" value="<% _t('SUBMIT','Submit for approval') %>" />
 	</p>
 </form>
 
@@ -31,7 +32,7 @@
 	<form id="Form_EditForm" action="admin?executeForm=EditForm" method="post" enctype="multipart/form-data">
 		<h1>$ApplicationName</h1>
 
-		<p><% _t('WELCOMETO','Welcome to'); %> $ApplicationName! <% _t('CHOOSEPAGE','Please choose a page from the left.'); %></p>
+		<p><% _t('WELCOMETO','Welcome to') %> $ApplicationName! <% _t('CHOOSEPAGE','Please choose a page from the left.') %></p>
 	</form>
 <% end_if %>