Fixed merge error (mainly new translation entity format in templates)

Merge error from 2a35f2f928,
which was then further regressed by Sam running the text collector
on those faulty templates: 750b5b4079

admin/templates/Includes/LeftAndMain_Menu.ss

@@ -8,10 +8,10 @@
 		</div>
 	
 		<div class="cms-login-status">
-			<a href="Security/logout" class="logout-link" title="<% _t('LeftAndMain_Menu.ss.LOGOUT','Log out') %>"><% _t('LeftAndMain_Menu.ss.LOGOUT','Log out') %></a>
+			<a href="Security/logout" class="logout-link" title="<% _t('LeftAndMain_Menu_ss.LOGOUT','Log out') %>"><% _t('LeftAndMain_Menu_ss.LOGOUT','Log out') %></a>
 			<% with $CurrentMember %>
 				<span>
-					<% _t('LeftAndMain_Menu.ss.Hello','Hi') %>
+					<% _t('LeftAndMain_Menu_ss.Hello','Hi') %>
 					<a href="{$AbsoluteBaseURL}admin/myprofile" class="profile-link">
 						<% if $FirstName && $Surname %>$FirstName $Surname<% else_if $FirstName %>$FirstName<% else %>$Email<% end_if %>
 					</a>

admin/templates/Includes/ModelAdmin_ImportSpec.ss

@@ -1,8 +1,8 @@
 <div class="importSpec" id="SpecFor{$ModelName}">
-	<a href="#SpecDetailsFor{$ModelName}" class="detailsLink"><% sprintf(_t('IMPORTSPECLINK', 'Show Specification for %s'),$ModelName) %></a>
+	<a href="#SpecDetailsFor{$ModelName}" class="detailsLink"><% sprintf(_t('ModelAdmin_ImportSpec_ss.IMPORTSPECLINK', 'Show Specification for %s'),$ModelName) %></a>
 	<div class="details" id="SpecDetailsFor{$ModelName}">
-	<h4><% sprintf(_t('ModelAdmin_ImportSpec.ss.IMPORTSPECTITLE', 'Specification for %s'),$ModelName) %></h4>
+	<h4><% sprintf(_t('ModelAdmin_ImportSpec_ss.IMPORTSPECTITLE', 'Specification for %s'),$ModelName) %></h4>
-		<h5><% _t('ModelAdmin_ImportSpec.ss.IMPORTSPECFIELDS', 'Database columns') %></h5>
+		<h5><% _t('ModelAdmin_ImportSpec_ss.IMPORTSPECFIELDS', 'Database columns') %></h5>
 		<% loop $Fields %>
 		<dl>
 			<dt><em>$Name</em></dt>
@@ -10,7 +10,7 @@
 		</dl>
 		<% end_loop %>
 
-		<h5><% _t('ModelAdmin_ImportSpec.ss.IMPORTSPECRELATIONS', 'Relations') %></h5>
+		<h5><% _t('ModelAdmin_ImportSpec_ss.IMPORTSPECRELATIONS', 'Relations') %></h5>
 		<% loop $Relations %>
 		<dl>
 			<dt><em>$Name</em></dt>

admin/templates/Includes/ModelAdmin_Tools.ss

@@ -1,14 +1,14 @@
 <div class="cms-content-tools west cms-panel cms-panel-layout" id="cms-content-tools-ModelAdmin" data-expandOnClick="true" data-layout-type="border">
 	<div class="cms-panel-content center">
-		<h3 class="cms-panel-header"><% _t('ModelAdmin_Tools.ss.FILTER', 'Filter') %></h3>
+		<h3 class="cms-panel-header"><% _t('ModelAdmin_Tools_ss.FILTER', 'Filter') %></h3>
 		$SearchForm
 
 		<% if $ImportForm %>
-			<h3 class="cms-panel-header"><% _t('ModelAdmin_Tools.ss.IMPORT', 'Import') %></h3>
+			<h3 class="cms-panel-header"><% _t('ModelAdmin_Tools_ss.IMPORT', 'Import') %></h3>
 			$ImportForm
 		<% end_if %>
 	</div>
 	<div class="cms-panel-content-collapsed">
-		<h3 class="cms-panel-header"><% _t('ModelAdmin_Tools.ss.FILTER', 'Filter') %></h3>
+		<h3 class="cms-panel-header"><% _t('ModelAdmin_Tools_ss.FILTER', 'Filter') %></h3>
 	</div>
 </div>

admin/templates/LeftAndMain.ss

@@ -14,7 +14,7 @@
 		$Content
 
 		<div class="cms-preview east" data-layout-type="border">
-			<div class="preview-note"><span><!-- --></span><% _t('CMSPageHistoryController_versions.ss.PREVIEW','Website preview') %></div>
+			<div class="preview-note"><span><!-- --></span><% _t('CMSPageHistoryController_versions_ss.PREVIEW','Website preview') %></div>
 			<div class="preview-scroll center">
 				<div class="preview-device-outer">
 					<div class="preview-device-inner">

admin/templates/ModelSidebar.ss

@@ -1,7 +1,7 @@
-<h3><% _t('ModelSidebar.ss.SEARCHLISTINGS','Search') %></h3>
+<h3><% _t('ModelSidebar_ss.SEARCHLISTINGS','Search') %></h3>
 $SearchForm
 
 <% if $ImportForm %>
-	<h3><% _t('ModelSidebar.ss.IMPORT_TAB_HEADER', 'Import') %></h3>
+	<h3><% _t('ModelSidebar_ss.IMPORT_TAB_HEADER', 'Import') %></h3>
 	$ImportForm
 <% end_if %>

i18n/i18n.php

@@ -2237,7 +2237,7 @@ class i18n extends Object implements TemplateGlobalProvider {
 					} else if(isset(self::$all_locales[$labelLocale])) {
 						$locales[$locale] = self::$all_locales[$labelLocale];	
 					} 
-				} 
+				}
 			}
 		}
 

lang/en.yml

@@ -610,26 +610,10 @@ en:
     PREVIEW: 'Website preview'
   GridFieldEditButton_ss:
     EDIT: Edit
-  CMSPageHistoryController_versions.ss:
-    PREVIEW: 'Website preview'
   ContentController:
     NOTLOGGEDIN: 'Not logged in'
   GridFieldItemEditView:
     Go_back: 'Go back'
-  LeftAndMain_Menu.ss:
-    Hello: Hi
-    LOGOUT: 'Log out'
-  ModelAdmin_ImportSpec.ss:
-    IMPORTSPECFIELDS: 'Database columns'
-    IMPORTSPECLINK: 'Show Specification for %s'
-    IMPORTSPECRELATIONS: Relations
-    IMPORTSPECTITLE: 'Specification for %s'
-  ModelAdmin_Tools.ss:
-    FILTER: Filter
-    IMPORT: Import
-  ModelSidebar.ss:
-    IMPORT_TAB_HEADER: Import
-    SEARCHLISTINGS: Search
   PasswordValidator:
     LOWCHARSTRENGTH: 'Please increase password strength by adding some of the following characters: %s'
     PREVPASSWORD: 'You''ve already used that password in the past, please choose a new password'

lang/es.yml

@@ -1,7 +1,7 @@
 es:
   AssetAdmin:
     ALLOWEDEXTS: 'Extensiones permitidas'
-    NEWFOLDER: Nueva Carpeta
+    NEWFOLDER: NuevaCarpeta
     SHOWALLOWEDEXTS: 'Mostrar extensiones permitidas'
   AssetTableField:
     CREATED: 'Agregado por primera vez'