Merge remote-tracking branch 'origin/3.0'

admin/css/screen.css

@@ -192,7 +192,7 @@ form.small .field input.text, form.small .field textarea, form.small .field sele
 .cms input.loading, .cms button.loading, .cms input.ui-state-default.loading, .cms .ui-widget-content input.ui-state-default.loading, .cms .ui-widget-header input.ui-state-default.loading { color: #525252; border-color: #d5d3d3; cursor: default; }
 .cms input.loading .ui-icon, .cms button.loading .ui-icon, .cms input.ui-state-default.loading .ui-icon, .cms .ui-widget-content input.ui-state-default.loading .ui-icon, .cms .ui-widget-header input.ui-state-default.loading .ui-icon { background: transparent url(../../images/network-save.gif) no-repeat 0 0; }
 .cms input.loading.ss-ui-action-constructive .ui-icon, .cms button.loading.ss-ui-action-constructive .ui-icon { background: transparent url(../../images/network-save-constructive.gif) no-repeat 0 0; }
-.cms .ss-ui-button { margin-top: 0px; font-weight: bold; text-decoration: none; line-height: 16px; color: #393939; border: 1px solid #c0c0c2; border-bottom: 1px solid #a6a6a9; cursor: pointer; text-shadow: white 0 1px 1px; background-color: #e6e6e6; background: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjUwJSIgeTE9IjAlIiB4Mj0iNTAlIiB5Mj0iMTAwJSI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2ZmZmZmZiIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iI2Q5ZDlkOSIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #ffffff), color-stop(100%, #d9d9d9)); background: -webkit-linear-gradient(#ffffff, #d9d9d9); background: -moz-linear-gradient(#ffffff, #d9d9d9); background: -o-linear-gradient(#ffffff, #d9d9d9); background: linear-gradient(#ffffff, #d9d9d9); /* constructive */ /* destructive */ }
+.cms .ss-ui-button { margin-top: 0px; font-weight: bold; text-decoration: none; line-height: 16px; color: #393939; border: 1px solid #c0c0c2; border-bottom: 1px solid #a6a6a9; cursor: pointer; background-color: #e6e6e6; white-space: nowrap; background: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjUwJSIgeTE9IjAlIiB4Mj0iNTAlIiB5Mj0iMTAwJSI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2ZmZmZmZiIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iI2Q5ZDlkOSIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #ffffff), color-stop(100%, #d9d9d9)); background: -webkit-linear-gradient(#ffffff, #d9d9d9); background: -moz-linear-gradient(#ffffff, #d9d9d9); background: -o-linear-gradient(#ffffff, #d9d9d9); background: linear-gradient(#ffffff, #d9d9d9); text-shadow: white 0 1px 1px; /* constructive */ /* destructive */ }
 .cms .ss-ui-button.buttonset { margin: 0 -1px; }
 .cms .ss-ui-button.ui-state-hover, .cms .ss-ui-button:hover { text-decoration: none; background-color: white; background: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjUwJSIgeTE9IjAlIiB4Mj0iNTAlIiB5Mj0iMTAwJSI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2ZmZmZmZiIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iI2U2ZTZlNiIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #ffffff), color-stop(100%, #e6e6e6)); background: -webkit-linear-gradient(#ffffff, #e6e6e6); background: -moz-linear-gradient(#ffffff, #e6e6e6); background: -o-linear-gradient(#ffffff, #e6e6e6); background: linear-gradient(#ffffff, #e6e6e6); -webkit-box-shadow: 0 0 5px #b3b3b3; -moz-box-shadow: 0 0 5px #b3b3b3; box-shadow: 0 0 5px #b3b3b3; }
 .cms .ss-ui-button:active, .cms .ss-ui-button:focus, .cms .ss-ui-button.ui-state-active, .cms .ss-ui-button.ui-state-focus { border: 1px solid #b3b3b3; background-color: white; background: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjUwJSIgeTE9IjAlIiB4Mj0iNTAlIiB5Mj0iMTAwJSI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2ZmZmZmZiIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iI2U2ZTZlNiIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #ffffff), color-stop(100%, #e6e6e6)); background: -webkit-linear-gradient(#ffffff, #e6e6e6); background: -moz-linear-gradient(#ffffff, #e6e6e6); background: -o-linear-gradient(#ffffff, #e6e6e6); background: linear-gradient(#ffffff, #e6e6e6); -webkit-box-shadow: 0 0 5px #b3b3b3 inset; -moz-box-shadow: 0 0 5px #b3b3b3 inset; box-shadow: 0 0 5px #b3b3b3 inset; }
@@ -555,15 +555,12 @@ body.cms-dialog { overflow: auto; background: url("../images/textures/bg_cms_mai
 
 /** -------------------------------------------- "Insert X" forms -------------------------------------------- */
 .htmleditorfield-dialog.ui-dialog-content { padding: 0; position: relative; }
-.htmleditorfield-dialog #MediaFormInsertMediaTabs_Fromtheweb .CompositeField:after { content: "."; display: block; height: 0; clear: both; visibility: hidden; }
+.htmleditorfield-dialog #MediaFormInsertMediaTabs_Fromtheweb .CompositeField { overflow: hidden; *zoom: 1; }
-*:first-child .htmleditorfield-dialog #MediaFormInsertMediaTabs_Fromtheweb .CompositeField { zoom: 1; }
 .htmleditorfield-dialog #MediaFormInsertMediaTabs_Fromtheweb #RemoteURL { border: none; -moz-box-shadow: none; -webkit-box-shadow: none; box-shadow: none; width: 55%; max-width: 512px; float: left; position: relative; }
 .htmleditorfield-dialog #MediaFormInsertMediaTabs_Fromtheweb #RemoteURL label { position: absolute; left: 8px; top: 13px; font-weight: normal; color: #888; }
 .htmleditorfield-dialog #MediaFormInsertMediaTabs_Fromtheweb #RemoteURL .middleColumn { margin-left: 0; }
 .htmleditorfield-dialog #MediaFormInsertMediaTabs_Fromtheweb #RemoteURL input.remoteurl { padding-left: 40px; }
-.htmleditorfield-dialog #MediaFormInsertMediaTabs_Fromtheweb button.add-url { margin-top: 13px; padding-top: 15px; border: none; background: none; opacity: 0.8; cursor: hand; }
+.htmleditorfield-dialog #MediaFormInsertMediaTabs_Fromtheweb button.add-url { margin-top: 13px; padding-top: 15px; overflow: hidden; *zoom: 1; border: none; background: none; opacity: 0.8; cursor: hand; }
-.htmleditorfield-dialog #MediaFormInsertMediaTabs_Fromtheweb button.add-url:after { content: "."; display: block; height: 0; clear: both; visibility: hidden; }
-*:first-child .htmleditorfield-dialog #MediaFormInsertMediaTabs_Fromtheweb button.add-url { zoom: 1; }
 .htmleditorfield-dialog #MediaFormInsertMediaTabs_Fromtheweb button.add-url .btn-icon-addMedia { width: 20px; height: 20px; }
 .htmleditorfield-dialog #MediaFormInsertMediaTabs_Fromtheweb button.add-url:hover, .htmleditorfield-dialog #MediaFormInsertMediaTabs_Fromtheweb button.add-url:active { border: none; -moz-box-shadow: none; -webkit-box-shadow: none; box-shadow: none; opacity: 1; }
 .htmleditorfield-dialog #MediaFormInsertMediaTabs_Fromtheweb button.add-url.ui-state-disabled, .htmleditorfield-dialog #MediaFormInsertMediaTabs_Fromtheweb button.add-url.ui-state-disabled:hover, .htmleditorfield-dialog #MediaFormInsertMediaTabs_Fromtheweb button.add-url.ui-state-disabled:active { opacity: 0.35; filter: Alpha(Opacity=35); }

admin/javascript/LeftAndMain.Tree.js

@@ -342,7 +342,7 @@
 				self.jstree('save_selected');
 
 				$.ajax({
-					url: this.data('urlUpdatetreenodes') + '?ids=' + ids.join(','),
+					url: $.path.addSearchParams(this.data('urlUpdatetreenodes'), 'ids=' + ids.join(',')),
 					dataType: 'json',
 					success: function(data, xhr) {
 						$.each(data, function(nodeId, nodeData) {

admin/scss/_forms.scss

@@ -300,11 +300,7 @@ form.small .field, .field.small {
 	}
 
 	.ss-ui-button {
-		margin-top:0px;	
+		margin-top:0px;
-		&.buttonset {
-			margin: 0 -1px; // hack to avoid double borders
-		}
-		
 		font-weight: bold;
 		text-decoration: none;
 		line-height: $grid-y * 2;
@@ -312,8 +308,9 @@ form.small .field, .field.small {
 		border: 1px solid $color-button-generic-border;
 		border-bottom: 1px solid darken($color-button-generic-border, 10%);
 		cursor: pointer;
-		@include text-shadow(lighten($color-button-generic, 20%) 0 1px 1px);
 		background-color: $color-button-generic;
+		white-space: nowrap;
+
 		@include background(
 			linear-gradient(color-stops(
 				lighten($color-button-generic, 10%),
@@ -321,6 +318,12 @@ form.small .field, .field.small {
 			))
 		);
 
+		@include text-shadow(lighten($color-button-generic, 20%) 0 1px 1px);
+
+		&.buttonset {
+			margin: 0 -1px; // hack to avoid double borders
+		}
+
 		&.ui-state-hover, &:hover {
 			text-decoration: none;
 			background-color: lighten($color-button-generic, 10%);

admin/scss/_style.scss

@@ -170,6 +170,7 @@ body.cms {
 	// Reset to default styles
 	.ss-ui-button {
 		line-height: $grid-x*3;
+
 		.ui-button-text {
 			line-height: 1.4;
 		}

admin/templates/Includes/BackLink_Button.ss

@@ -1,7 +1,7 @@
 <% if Backlink %>
 	<div class="cms_backlink">
 		<a class="backlink ss-ui-button cms-panel-link" data-icon="back" href="$Backlink">
-			<% _t('Back', 'Back') %>
+			<% _t('BackLink_Button.ss.Back', 'Back') %>
 		</a>
 	</div>
 <% end_if %>	

admin/templates/Includes/CMSLoadingScreen.ss

@@ -1,6 +1,6 @@
 <div class="ss-loading-screen">
 	<div class="loading-logo">
-		<img class="loading-animation" src="$ModulePath(frameworkadmin)/images/spinner.gif" alt="<% _t('LOADING','Loading...') %>" />
+		<img class="loading-animation" src="$ModulePath(frameworkadmin)/images/spinner.gif" alt="<% _t('CMSLoadingScreen.ss.LOADING','Loading...') %>" />
-		<noscript><p class="nojs-warning"><span class="message notice"><% _t('REQUIREJS','The CMS requires that you have JavaScript enabled.') %></span></p></noscript>
+		<noscript><p class="nojs-warning"><span class="message notice"><% _t('CMSLoadingScreen.ss.REQUIREJS','The CMS requires that you have JavaScript enabled.') %></span></p></noscript>
 	</div>
 </div>

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('LOGOUT','Log out') %>"><% _t('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('Hello','Hi') %>
+					<% _t('LeftAndMain_Menu.ss.Hello','Hi') %>
 					<a href="{$AbsoluteBaseURL}admin/myprofile" class="profile-link ss-ui-dialog-link" data-popupclass="edit-profile-popup">
 						<% 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>
 	<div class="details" id="SpecDetailsFor{$ModelName}">
-	<h4><% sprintf(_t('IMPORTSPECTITLE', 'Specification for %s'),$ModelName) %></h4>
+	<h4><% sprintf(_t('ModelAdmin_ImportSpec.ss.IMPORTSPECTITLE', 'Specification for %s'),$ModelName) %></h4>
-		<h5><% _t('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('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('FILTER', 'Filter') %></h3>
+		<h3 class="cms-panel-header"><% _t('ModelAdmin_Tools.ss.FILTER', 'Filter') %></h3>
 		$SearchForm
 
 		<% if ImportForm %>
-			<h3 class="cms-panel-header"><% _t('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('FILTER', 'Filter') %></h3>
+		<h3 class="cms-panel-header"><% _t('ModelAdmin_Tools.ss.FILTER', 'Filter') %></h3>
 	</div>
 </div>

admin/templates/ModelSidebar.ss

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

dev/TestRunner.php

@@ -32,6 +32,7 @@ class TestRunner extends Controller {
 		'sessionloadyml' => 'sessionloadyml',
 		'startsession' => 'startsession',
 		'endsession' => 'endsession',
+		'setdb' => 'setdb',
 		'cleanupdb' => 'cleanupdb',
 		'emptydb' => 'emptydb',
 		'module/$ModuleName' => 'module',
@@ -49,6 +50,7 @@ class TestRunner extends Controller {
 		'coverageOnly',
 		'startsession',
 		'endsession',
+		'setdb',
 		'cleanupdb',
 		'module',
 		'all',
@@ -341,6 +343,10 @@ class TestRunner extends Controller {
 	 * Start a test session.
 	 * Usage: visit dev/tests/startsession?fixture=(fixturefile).  A test database will be constructed, and your browser session will be amended
 	 * to use this database.  This can only be run on dev and test sites.
+	 *
+	 * See {@link setdb()} for an alternative approach which just sets a database
+	 * name, and is used for more advanced use cases like interacting with test databases
+	 * directly during functional tests.
 	 */
 	function startsession() {
 		if(!Director::isLive()) {
@@ -405,6 +411,47 @@ HTML;
 			return "<p>startession can only be used on dev and test sites</p>";
 		}
 	}
+
+	/**
+	 * Set an alternative database name in the current browser session.
+	 * Useful for functional testing libraries like behat to create a "clean slate". 
+	 * Does not actually create the database, that's usually handled
+	 * by {@link SapphireTest::create_temp_db()}.
+	 *
+	 * The database names are limited to a specific naming convention as a security measure:
+	 * The "tmpdb" prefix and a random sequence of seven digits.
+	 * This avoids the user gaining access to other production databases 
+	 * available on the same connection.
+	 *
+	 * See {@link startsession()} for a different approach which actually creates
+	 * the DB and loads a fixture file instead.
+	 */
+	function setdb() {
+		if(Director::isLive()) {
+			return $this->permissionFailure("dev/tests/setdb can only be used on dev and test sites");
+		}
+		
+		if(!isset($_GET['database'])) {
+			return $this->permissionFailure("dev/tests/setdb must be used with a 'database' parameter");
+		}
+		
+		$database_name = $_GET['database'];
+		$prefix = defined('SS_DATABASE_PREFIX') ? SS_DATABASE_PREFIX : 'ss_';
+		$pattern = strtolower(sprintf('#^%stmpdb\d{7}#', $prefix));
+		if(!preg_match($pattern, $database_name)) {
+			return $this->permissionFailure("Invalid database name format");
+		}
+
+		DB::set_alternative_database_name($database_name);
+
+		return "<p>Set database session to '$database_name'.  Time to start testing; where would you like to start?</p>
+			<ul>
+				<li><a id=\"home-link\" href=\"" .Director::baseURL() . "\">Homepage - published site</a></li>
+				<li><a id=\"draft-link\" href=\"" .Director::baseURL() . "?stage=Stage\">Homepage - draft site</a></li>
+				<li><a id=\"admin-link\" href=\"" .Director::baseURL() . "admin/\">CMS Admin</a></li>
+				<li><a id=\"endsession-link\" href=\"" .Director::baseURL() . "dev/tests/endsession\">End your test session</a></li>
+			</ul>";
+	}
 	
 	function emptydb() {
 		if(SapphireTest::using_temp_db()) {

docs/en/howto/customize-cms-tree.md

@@ -2,6 +2,11 @@
 
 ## Overview
 
+The CMS tree for viewing hierarchical structures (mostly pages) is powered
+by the [jstree](http://jstree.com) library. It is configured through
+`sapphire/admin/javascript/LeftAndMain.Tree.js`, as well as some
+HTML5 metadata generated on its container (see the `data-hints` attribute).
+
 The tree is rendered through `[api:LeftAndMain->getSiteTreeFor()]`,
 which recursively collects all nodes based on various filtering criteria.
 The node strictly just has to implement the `[api:Hierarchy]` extension,

docs/en/howto/navigation-menu.md

@@ -0,0 +1,21 @@
+# How to create a navigation menu
+
+In this how-to, we'll create a simple menu which
+you can use as the primary navigation for your website.
+
+Add the following code to your main template,
+most likely the "Page" template in your theme,
+located in `themes/<mytheme>/templates/Page.ss`.
+
+    :::ss
+    <ul> 
+    	<% loop Menu(1) %>	  
+    	<li>
+          <a href="$Link" title="Go to the $Title page" class="$LinkingMode">
+           <span>$MenuTitle</span>
+          </a>
+        </li> 
+     	<% end_loop %> 
+    </ul>
+
+More details on creating a menu are explained as part of ["Tutorial 1: Building a basic site"](/tutorials/1-building-a-basic-site), as well as ["Page type templates" topic](/topics/page-type-templates).

docs/en/howto/simple-contact-form.md

@@ -0,0 +1,114 @@
+# How to make a simple contact form
+
+In this how-to, we'll explain how to set up a specific page type
+holding a contact form, which submits a message via email.
+Let's start by defining a new `ContactPage` page type:
+
+	:::php
+	<?php
+	class ContactPage extends Page {
+	}
+	class ContactPage_Controller extends Page_Controller {
+		function Form() { 
+			$fields = new FieldList( 
+				new TextField('Name'), 
+				new EmailField('Email'), 
+				new TextareaField('Message')
+			); 
+			$actions = new FieldList( 
+				new FormAction('submit', 'Submit') 
+			); 
+			return new Form($this, 'Form', $fields, $actions); 
+		}
+	}
+
+To create a form, we instanciate a `Form` object on a function on our page controller. We'll call this function `Form()`. You're free to choose this name, but it's standard practice to name the function `Form()` if there's only a single form on the page.
+
+There's quite a bit in this function, so we'll step through one piece at a time.
+
+	:::php
+	$fields = new FieldList(
+		new TextField('Name'),
+		new EmailField('Email'),
+		new TextareaField('Message')
+	);
+
+First we create all the fields we want in the contact form, and put them inside a FieldList. You can find a list of form fields available on the `[api:FormField]` page.   
+
+	:::php
+	$actions = FieldList(
+		new FormAction('submit', 'Submit')
+	);
+
+We then create a `[api:FieldList]` of the form actions, or the buttons that submit the form. Here we add a single form action, with the name 'submit', and the label 'Submit'. We'll use the name of the form action later.
+
+	:::php
+	return new Form('Form', $this, $fields, $actions);
+
+Finally we create the `Form` object and return it. The first argument is the name of the form – this has to be the same as the name of the function that creates the form, so we've used 'Form'. The second argument is the controller that the form is on – this is almost always $this. The third and fourth arguments are the fields and actions we created earlier.
+
+To show the form on the page, we need to render it in our template. We do this by appending $ to the name of the form – so for the form we just created we need to add $Form. Add $Form to the themes/currenttheme/Layout/Page.ss template, below $Content.
+
+The reason it's standard practice to name the form function 'Form' is so that we don't have to create a separate template for each page with a form. By adding $Form to the generic Page.ss template, all pages with a form named 'Form' will have their forms shown.
+
+If you now create a ContactPage in the CMS (making sure you have rebuilt the database and flushed the templates /dev/build?flush=all) and visit the page, you will now see a contact form.
+
+![](../_images/howto_contactForm.jpg)
+
+
+Now that we have a contact form, we need some way of collecting the data submitted. We do this by creating a function on the controller with the same name as the form action. In this case, we create the function 'submit' on the ContactPage_Controller class.
+
+	:::php
+	class ContactPage_Controller extends Page_Controller {
+		function Form() {
+			// ...
+		}
+		function submit($data, $form) { 
+			$email = new Email(); 
+			 
+			$email->setTo('siteowner@mysite.com'); 
+			$email->setFrom($data['Email']); 
+			$email->setSubject("Contact Message from {$data["Name"]}"); 
+			 
+			$messageBody = " 
+				<p><strong>Name:</strong> {$data['Name']}</p> 
+				<p><strong>Website:</strong> {$data['Website']}</p> 
+				<p><strong>Message:</strong> {$data['Message']}</p> 
+			"; 
+			$email->setBody($messageBody); 
+			$email->send(); 
+			return array(
+				'Content' => '<p>Thank you for your feedback.</p>',
+				'Form' => ''
+			);
+		}
+	}
+
+<div class="hint" markdown="1">
+	Caution: This form is prone to abuse by spammers,
+	since it doesn't enforce a rate limitation, or checks for bots.
+	We recommend to use a validation service like the ["recaptcha" module](http://www.silverstripe.org/recaptcha-module/)
+	for better security.
+</div>
+
+Any function that receives a form submission takes two arguments: the data passed to the form as an indexed array, and the form itself. In order to extract the data, you can either use functions on the form object to get the fields and query their values, or just use the raw data in the array. In the example above, we used the array, as it's the easiest way to get data without requiring the form fields to perform any special transformations.
+
+This data is used to create an email, which you then send to the address you choose.
+
+The final thing we do is return a 'thank you for your feedback' message to the user. To do this we override some of the methods called in the template by returning an array. We return the HTML content we want rendered instead of the usual CMS-entered content, and we return false for Form, as we don't want the form to render.
+
+
+##How to add form validation
+
+All forms have some basic validation built in – email fields will only let the user enter email addresses, number fields will only accept numbers, and so on. Sometimes you need more complicated validation, so you can define your own validation by extending the Validator class.
+
+The framework comes with a predefined validator called `[api:RequiredFields]`, which performs the common task of making sure particular fields are filled out. Below is the code to add validation to a contact form:
+
+	function Form() { 
+		// ...
+		$validator = new RequiredFields('Name', 'Message');
+		return new Form($this, 'Form', $fields, $actions, $validator); 
+	}
+
+We've created a RequiredFields object, passing the name of the fields we want to be required. The validator we have created is then passed as the fifth argument of the form constructor. If we now try to submit the form without filling out the required fields, JavaScript validation will kick in, and the user will be presented with a message about the missing fields. If the user has JavaScript disabled, PHP validation will kick in when the form is submitted, and the user will be redirected back to the Form with messages about their missing fields.
+

docs/en/installation/windows-manual-iis-7.md

@@ -14,7 +14,7 @@ These versions of Windows will **NOT** work with this guide:
 
 **IMPORTANT**: Windows Server 2003 users should [follow this guide](http://doc.silverstripe.org/installation-on-windows-server-2003-iis-6) to installing SilverStripe.
 
-The goal is to get a good working web server platform so that one or more SilverStripe projects can be easily deployed onto the server using SVN.
+The goal is to get a good working web server platform so that one or more SilverStripe projects can be easily deployed onto the server using SVN/GIT.
 
 We'll also install SQL Server 2008 R2, and support for connecting to it in PHP.
 
@@ -194,6 +194,17 @@ Make sure that the SMTP and smtp_port are set to your mail server's hostname and
 
 That should do it for the PHP configuration.
 
+## Folder permissions for PHP
+
+Now we need to set up folder permissions for PHP. Open the php.ini and find the paths for sessions and file uploads. They will look like this:
+
+	upload_tmp_dir="C:\Windows\Temp"
+	session.save_path="C:\Windows\Temp"
+
+You will need to give the IIS permission to write to these folders. This can be done by giving **Modify** permission to **IIS** user and **IIS_IUSRS** group.
+
+Other important folders to give these permissions to are `assets` and `silverstripe-cache` (if used) in your web root.
+
 ## Test PHP installation
 
 Now that we've got PHP configured how we want it, let's test that PHP is working correctly.
@@ -247,6 +258,8 @@ First of all, install a copy of TortoiseSVN and then follow these steps:
   * Click Yes when warned of creating a new directory
   * Drag the newly created folder to **C:\inetpub\wwwroot** (you'll be asked for admin permissions to do this)
 
+After gettng the code installed, make sure you set the folder permissions properly (see *Folder permissions for PHP* above).
+
 ## Install the SilverStripe SQL Server module ("mssql")
 
   * In Windows Explorer, browse to your desktop
@@ -392,4 +405,10 @@ You can also [install wincache](http://learn.iis.net/page.aspx/678/use-the-windo
 
 You can also try installing and enabling static content compression for IIS on live sites. Do this in IIS Manager > Compression.
 
-Doing all of the above should provide a significant performance boost to your site.
+Doing all of the above should provide a significant performance boost to your site.
+
+**Q: I can upload files, but I get server error when downloading them.**
+
+**Q: I get a lot of stale session files - garbage collector seems not running.**
+
+**A:** This is because of the permissions being incorrectly configured on the temporary upload or session storage folders that the PHP uses. See *Folder permissions for PHP* section for how to configure this correctly.

docs/en/misc/contributing.md

@@ -46,6 +46,7 @@ changes
 * Also check and update documentation on [doc.silverstripe.org](http://doc.silverstripe.org). Check for any references to functionality deprecated or extended through your patch. Documentation changes should be included in the patch.
 * We will attribute the change to you whereever possible (git does this automatically for pull requests)
 * If you get stuck, please post to the [forum](http://silverstripe.org/forum) or for deeper core problems, to the [core mailinglist](https://groups.google.com/forum/#!forum/silverstripe-dev)
+* When working with the CMS, please read the ["CMS Architecture Guide"](/reference/cms-architecture) first
 
 The core team is responsible for reviewing patches and deciding if they will make it into core.  If
 there are any problems they will follow up with you, so please ensure they have a way to contact you! 
@@ -101,7 +102,7 @@ Example: Bad commit message
 
 Example: Good commit message
 
-	ENHANCEMENT Formatting through prepValueForDB() 
+	BUG Formatting through prepValueForDB() 
 
 	Added prepValueForDB() which is called on DBField->writeToManipulation() 
 	to ensure formatting of value before insertion to DB on a per-DBField type basis (fixes #1234).

docs/en/reference/cms-architecture.md

@@ -334,6 +334,18 @@ so you don't need to worry about it. The same concept applies for
 'X-Title' (change the window title) and 'X-ControllerURL' (change the URL recorded in browser history).
 Note: You can see any additional HTTP headers through the web developer tools in your browser of choice.
 
+## Tree
+
+The CMS tree for viewing hierarchical structures (mostly pages) is powered
+by the [jstree](http://jstree.com) library. It is configured through
+`sapphire/admin/javascript/LeftAndMain.Tree.js`, as well as some
+HTML5 metadata generated on its container (see the `data-hints` attribute).
+For more information, see the [Howto: Customize the CMS tree](../howto/customize-cms-tree).
+
+Note that a similar tree logic is also used for the 
+form fields to select one or more entries from those hierarchies
+(`[api:TreeDropdownField]` and `[api:TreeMultiselectField]`).
+
 ## Related
 
  * [Howto: Extend the CMS Interface](../howto/extend-cms-interface)

docs/en/reference/database-structure.md

@@ -111,15 +111,4 @@ The information documented in this page is reflected in a few places in the code
     * augmentQuery() is responsible for altering the normal data selection queries to support versions.
     * augmentDatabase() is responsible for specifying the altered database schema to support versions.
 *  `[api:MySQLDatabase]`: getNextID() is used when creating new objects; it also handles the mechanics of
-updating the database to have the required schema.
+updating the database to have the required schema.
-
-
-## Future work
-
-*  We realise that a fixed mapping between the database and object-model isn't appropriate in all cases.  In particular,
-it could be beneficial to set up a SilverStripe data-object as an interface layer to the databases of other
-applications.  This kind of configuration support is on the cards for development once we start looking more seriously
-at providing avenues for clean integration between systems.
-*  Some developers have commented that the the database layer could be used to maintain the relational integrity of this
-database structure.
-*  It could be desirable to implement a non-repeating auto-numbering system.

docs/en/topics/datamodel.md

@@ -40,8 +40,15 @@ are `filter()` and `sort()`:
 	$members = Member::get()->filter(array('FirstName' => 'Sam'))->sort('Surname');
 	
 Those of you who know a bit about SQL might be thinking "it looks like you're querying all members, and then filtering
-to those with a first name of 'Sam'. Isn't this very slow?"  Is isn't, because the ORM doesn't actually execute the 
+to those with a first name of 'Sam'. Isn't this very slow?"  Is isn't, because the ORM doesn't actually execute the SQL
-query until you iterate on the result with a `foreach()` or `<% loop %>`.
+query until you iterate on the result with a `foreach()` or `<% loop %>`. The ORM is smart enough to generate a single 
+efficient query at the last moment in time without needing to post process the result set in PHP. In MySQL the query 
+generated by the ORM may look something like this for the previous query.
+
+	:::
+	SELECT * FROM Member WHERE FirstName = 'Sam' ORDER BY Surname
+
+An example of the query process in action:
 
 	:::php
 	// The SQL query isn't executed here...
@@ -60,14 +67,16 @@ This also means that getting the count of a list of objects will be done with a
 
 	:::php
 	$members = Member::get()->filter(array('FirstName' => 'Sam'))->sort('Surname');
-	// This will create an single SELECT COUNT query.
+	
+	// This will create an single SELECT COUNT query similar to -
+	// SELECT COUNT(*) FROM Members WHERE FirstName = 'Sam'
 	echo $members->Count();
 	
-All of this lets you focus on writing your application, and not worrying too much about whether or not your queries are efficient.
 
 ### Returning a single DataObject
 
-There are a couple of ways of getting a single DataObject from the ORM.  If you know the ID number of the object, you can use `byID($id)`:
+There are a couple of ways of getting a single DataObject from the ORM.  If you know the ID number of the object, 
+you can use `byID($id)`:
 
 	:::php
 	$member = Member::get()->byID(5);
@@ -80,12 +89,12 @@ If you have constructed a query that you know should return a single record, you
 
 ### Sort
 
-Quiet often you would like to sort a list. Doing this on a list could be done in a few ways.
+Quite often you would like to sort a list. Doing this on a list could be done in a few ways.
 
 If would like to sort the list by `FirstName` in a ascending way (from A to Z).
 
 	:::php
-	$member = Member::get()->sort('FirstName', 'ASC');
+	$member = Member::get()->sort('FirstName', 'ASC'); // ASC or DESC
 	$member = Member::get()->sort('FirstName'); // Ascending is implied
 
 To reverse the sort
@@ -93,7 +102,8 @@ To reverse the sort
 	:::php
 	$member = Member::get()->sort('FirstName', 'DESC');
 
-However you might have several entries with the same `FirstName` and would like to sort them by `FirstName` and `LastName`
+However you might have several entries with the same `FirstName` and would like to sort them by `FirstName` 
+and `LastName`
 
 	:::php
 	$member = Member::get()->sort(array(
@@ -101,9 +111,14 @@ However you might have several entries with the same `FirstName` and would like
 		'LastName'=>'ASC'
 	));
 
+You can also sort randomly
+
+	:::php
+	$member = Member::get()->sort('RAND()')
+	
 ### Filter
 
-As you might expect, the `filter()` method filters the list of objects that gets returned.  The previous example 
+As you might expect, the `filter()` method filters the list of objects that gets returned. The previous example 
 included this filter, which returns all Members with a first name of "Sam".
 
 	:::php
@@ -113,8 +128,8 @@ In SilverStripe 2, we would have passed `"\"FirstName\" = 'Sam'` to make this qu
 `array('FirstName' => 'Sam')`, to minimise the risk of SQL injection bugs.  The format of this array follows a few 
 rules:
 
- * Each element of the array specifies a filter.  You can specify as many filters as you like, and they **all** must be 
+ * Each element of the array specifies a filter.  You can specify as many filters as you like, and they **all** must 
-true.
+ be true.
  * The key in the filter corresponds to the field that you want to filter by.
  * The value in the filter corresponds to the value that you want to filter to.
 
@@ -126,7 +141,7 @@ So, this would return only those members called "Sam Minnée".
 		'Surname' => 'Minnée',
 	));
 
-There are also a short hand way of getting Members with the FirstName of Sam.
+There is also a short hand way of getting Members with the FirstName of Sam.
 
 	:::php
 	$members = Member::get()->filter('FirstName', 'Sam');
@@ -188,10 +203,17 @@ This would be equivalent to a SQL query of
 	:::
 	... WHERE ("FirstName" NOT IN ('Sam','Sig) OR "Age" NOT IN ('17', '74));
 
-By default, these filters specify case-insensitive exact matches.  There are a number of suffixes that you can put on 
+### Search Filter Modifiers
-field names to change this: `":StartsWith"`, `":EndsWith"`, `":PartialMatch"`, `":GreaterThan"`, `":LessThan"`, `":Negation"`.
 
-This query will return everyone whose first name doesn't start with S, who have logged on since 1/1/2011.
+The where clauses showcased in the previous two sections (filter and exclude) specify case-insensitive exact 
+matches by default. However, there are a number of suffixes that you can put on field names to change this 
+behaviour `":StartsWith"`, `":EndsWith"`, `":PartialMatch"`, `":GreaterThan"`, `":LessThan"`, `":Negation"`.
+
+Each of these suffixes is represented in the ORM as a subclass of `[api:SearchFilter]`. Developers can define
+their own SearchFilters if needing to extend the ORM filter and exclude behaviours.
+
+The following is a query which will return everyone whose first name doesn't start with S, who has logged in 
+since 1/1/2011.
 
 	:::php
 	$members = Member::get()->filter(array(
@@ -199,21 +221,14 @@ This query will return everyone whose first name doesn't start with S, who have
 		'LastVisited:GreaterThan' => '2011-01-01'
 	));
 
-If you wish to match against any of a number of columns, you can list several field names, separated by commas.  This 
+If you wish to match against any of a number of columns, you can list several field names, separated by commas. 
-will return all members whose first name or surname contain the string 'sam'.
+This will return all members whose first name or surname contain the string 'sam'.
 
 	:::php
 	$members = Member::get()->filter(array(
 		'FirstName,Surname:PartialMatch' => 'sam'
 	));
 
-If you wish to match against any of a number of values, you can pass an array as the value.  This will return all 
-members whose first name is either Sam or Ingo.
-
-	:::php
-	$members = Member::get()->filter(array(
-		'FirstName' => array('sam', 'ingo'),
-	));
 
 ### Subtract
 
@@ -238,18 +253,20 @@ So far we have only filtered a data list by fields on the object that you're req
 be okay, but often, a data model is made up of a number of related objects.  For example, in SilverStripe each member 
 can be placed in a number of groups, and each group has a number of permissions.
 
-For this, the SilverStripe ORM supports **Relation Filters**.  Any ORM request can be filtered by fields on a related object by 
+For this, the SilverStripe ORM supports **Relation Filters**.  Any ORM request can be filtered by fields on a related 
-specifying the filter key as `<relation-name>.<field-in-related-object>`.  You can chain relations together as many 
+object by specifying the filter key as `<relation-name>.<field-in-related-object>`.  You can chain relations together 
-times as is necessary.
+as many times as is necessary.
 
-For example, this will return all members assigned ot a group that has a permission record with the code "ADMIN".  In other words, it will return all administrators.
+For example, this will return all members assigned to a group that has a permission record with the code "ADMIN". In 
+other words, it will return all administrators.
 
 	:::php
 	$members = Member::get()->filter(array(
-		'Groups.Permissions.Code' => 'ADMIN',
+		'Groups.Permissions.Code:ExactMatch' => 'ADMIN',
 	));
 
-Note that we are just joining to these tables to filter the records.  Even if a member is in more than 1 administrator group, unique members will still be returned by this query.
+Note that we are just joining these tables to filter the records. Even if a member is in more than 1 administrator 
+group, unique members will still be returned by this query.
 
 The other features of filters can be applied to relation filters as well.  This will return all members in groups whose
 names start with 'A' or 'B'.
@@ -259,7 +276,8 @@ names start with 'A' or 'B'.
 		'Groups.Title:StartsWith' => array('A', 'B'),
 	));
 
-You can even follow a relation back to the original model class!  This will return all members are in at least 1 group that also has a member called Sam.
+You can even follow a relation back to the original model class!  This will return all members are in at least 1 group 
+that also has a member called Sam.
 
 	:::php
 	$members = Member::get()->filter(array(
@@ -273,13 +291,14 @@ methods that manipulate the SQL query at a lower level.  When using these, pleas
 are escaped with double quotes, otherwise some DB back-ends (e.g. PostgreSQL) won't work.
 
 In general, we advise against using these methods unless it's absolutely necessary.  If the ORM doesn't do quite what 
-you need it to, you may also consider extending the ORM with new data types or filter modifiers (that documentation still needs to be written)
+you need it to, you may also consider extending the ORM with new data types or filter modifiers (that documentation 
+still needs to be written)
 
 #### Where clauses
 
 You can specify a WHERE clause fragment (that will be combined with other filters using AND) with the `where()` method:
 
-	:: php
+	:::php
 	$members = Member::get()->where("\"FirstName\" = 'Sam'")
 
 #### Joining 
@@ -292,7 +311,7 @@ You can specify a join with the innerJoin and leftJoin methods.  Both of these m
 
 For example:
 
-	:: php
+	:::php
 	// Without an alias
 	$members = Member::get()->leftJoin("Group_Members", "\"Group_Members\".\"MemberID\" = \"Member\".\"ID\"");
 
@@ -312,7 +331,7 @@ Data is defined in the static variable $db on each class, in the format:
 
 	:::php
 	class Player extends DataObject {
-	  static $db = array(
+	  public static $db = array(
 	    "FirstName" => "Varchar",
 	    "Surname" => "Varchar",
 	    "Description" => "Text",
@@ -331,7 +350,7 @@ default behaviour by making a function called "get`<fieldname>`" or "set`<fieldn
 
 	:::php
 	class Player extends DataObject {
-	  static $db = array(
+	  public static $db = array(
 	    "Status" => "Enum('Active, Injured, Retired')"
 	  );
 	
@@ -379,7 +398,7 @@ new object is created.
 
 	:::php
 	class Player extends DataObject {
-	  static $defaults = array(
+	  public static $defaults = array(
 	    "Status" => 'Active',
 	  );
 	}
@@ -398,7 +417,7 @@ but using the *obj()*-method or accessing through a template will cast the value
 
 	:::php
 	class Player extends DataObject {
-	  static $casting = array(
+	  public static $casting = array(
 	    "MembershipFee" => 'Currency',
 	  );
 	
@@ -423,7 +442,7 @@ on the "Player"-table.
 	:::php
 	// access with $myPlayer->Team()
 	class Player extends DataObject {
-	  static $has_one = array(
+	  public static $has_one = array(
 	    "Team" => "Team",
 	  );
 	}
@@ -434,7 +453,7 @@ parent element in the tree:
 	:::php
 	// access with $mySiteTree->Parent()
 	class SiteTree extends DataObject {
-	  static $has_one = array(
+	  public static $has_one = array(
 	    "Parent" => "SiteTree",
 	  );
 	}
@@ -451,12 +470,12 @@ accessors available on both ends.
 	:::php
 	// access with $myTeam->Players() or $player->Team()
 	class Team extends DataObject {
-	  static $has_many = array(
+	  public static $has_many = array(
 	    "Players" => "Player",
 	  );
 	}
 	class Player extends DataObject {
-	  static $has_one = array(
+	  public static $has_one = array(
 	    "Team" => "Team",
 	  );
 	}
@@ -465,15 +484,15 @@ accessors available on both ends.
 To specify multiple $has_manys to the same object you can use dot notation to distinguish them like below
 
 	:::php
-	class Person {
+	class Person extends DataObject {
-		static $has_many = array(
+		public static $has_many = array(
 			"Managing" => "Company.Manager",
 			"Cleaning" => "Company.Cleaner",
 		);
 	}
 	
-	class Company {
+	class Company extends DataObject {
-		static $has_one = array(
+		public static $has_one = array(
 			"Manager" => "Person",
 			"Cleaner" => "Person"
 		);
@@ -487,12 +506,12 @@ Multiple $has_one relationships are okay if they aren't linking to the same obje
 	 * THIS IS BAD
 	 */
 	class Team extends DataObject {
-	  static $has_many = array(
+	  public static $has_many = array(
 	    "Players" => "Player",
 	  );
 	}
 	class Player extends DataObject {
-	  static $has_one = array(
+	  public static $has_one = array(
 	    "Team" => "Team",
 	    "AnotherTeam" => "Team",
 	  );
@@ -511,12 +530,12 @@ accessors available on both ends.
 	:::php
 	// access with $myTeam->Categories() or $myCategory->Teams()
 	class Team extends DataObject {
-	  static $many_many = array(
+	  public static $many_many = array(
 	    "Categories" => "Category",
 	  );
 	}
 	class Category extends DataObject {
-	  static $belongs_many_many = array(
+	  public static $belongs_many_many = array(
 	    "Teams" => "Team",
 	  );
 	}
@@ -524,15 +543,14 @@ accessors available on both ends.
 
 ### Adding relations
 
-Adding new items to a relations works the same,
+Adding new items to a relations works the same, regardless if you're editing a *has_many*- or a *many_many*. 
-regardless if you're editing a *has_many*- or a *many_many*. 
+They are encapsulated by `[api:HasManyList]` and `[api:ManyManyList]`, both of which provide very similar APIs, 
-They are encapsulated by `[api:HasManyList]` and `[api:ManyManyList]`,
+e.g. an `add()` and `remove()` method.
-both of which provide very similar APIs, e.g. an `add()` and `remove()` method.
 
 	:::php
 	class Team extends DataObject {
 	  // see "many_many"-description for a sample definition of class "Category"
-	  static $many_many = array(
+	  public static $many_many = array(
 	    "Categories" => "Category",
 	  );
 		
@@ -544,13 +562,14 @@ both of which provide very similar APIs, e.g. an `add()` and `remove()` method.
 
 ### Custom Relations
 
-You can use the flexible datamodel to get a filtered result-list without writing any SQL. For example, this snippet gets
+You can use the flexible datamodel to get a filtered result-list without writing any SQL. For example, this snippet 
-you the "Players"-relation on a team, but only containing active players. 
+gets you the "Players"-relation on a team, but only containing active players.
+
 See `[api:DataObject::$has_many]` for more info on the described relations.
 
 	:::php
 	class Team extends DataObject {
-	  static $has_many = array(
+	  public static $has_many = array(
 	    "Players" => "Player"
 	  );
 	
@@ -560,8 +579,8 @@ See `[api:DataObject::$has_many]` for more info on the described relations.
 	  }
 	}
 
-Note: Adding new records to a filtered `RelationList` like in the example above
+Note: Adding new records to a filtered `RelationList` like in the example above doesn't automatically set the 
-doesn't automatically set the filtered criteria on the added record.
+filtered criteria on the added record.
 
 ## Validation and Constraints
 
@@ -589,10 +608,11 @@ Example: Validate postcodes based on the selected country
 
 	:::php
 	class MyObject extends DataObject {
-		static $db = array(
+		public static $db = array(
 			'Country' => 'Varchar',
 			'Postcode' => 'Varchar'
 		);
+
 		public function validate() {
 			$result = parent::validate();
 			if($this->Country == 'DE' && $this->Postcode && strlen($this->Postcode) != 5) {
@@ -643,7 +663,7 @@ You have to make sure though that certain properties are not overwritten, e.g. *
 ### Update
 
 	:::php
-	$myPlayer = DataObject::get_by_id('Player',99);
+	$myPlayer = Player::get()->byID(99);
 	if($myPlayer) {
 	  $myPlayer->Firstname = "John"; // sets property on object
 	  $myPlayer->write(); // writes row to database
@@ -675,14 +695,15 @@ casting data before saving.
 
 ### onBeforeWrite
 
-You can customize saving-behaviour for each DataObject, e.g. for adding security. These functions are private, obviously
+You can customize saving-behaviour for each DataObject, e.g. for adding workflow or data customization. The function is 
-it wouldn't make sense to call them externally on the object. They are triggered when calling *write()*.
+triggered when calling *write()* to save the object to the database. This includes saving a page in the CMS or altering
+a ModelAdmin record.
 
 Example: Disallow creation of new players if the currently logged-in player is not a team-manager.
 
 	:::php
 	class Player extends DataObject {
-	  static $has_many = array(
+	  public static $has_many = array(
 	    "Teams"=>"Team"
 	  );
 	
@@ -722,7 +743,7 @@ It checks if a member is logged in who belongs to a group containing the permiss
 
 	:::php
 	class Player extends DataObject {
-	  static $has_many = array(
+	  public static $has_many = array(
 	    "Teams"=>"Team"
 	  );
 	
@@ -746,19 +767,17 @@ See the ["sql queries" topic](/reference/sqlquery) for custom *INSERT*, *UPDATE*
 
 ## Extending DataObjects
 
-You can add properties and methods to existing `[api:DataObjects]`s like `[api:Member]` (a core class) without hacking core
+You can add properties and methods to existing `[api:DataObjects]`s like `[api:Member]` (a core class) without 
-code or subclassing.
+hacking core code or subclassing. See `[api:DataExtension]` for a general description, and `[api:Hierarchy]` for 
-Please see `[api:DataExtension]` for a general description, and `[api:Hierarchy]` for our most
+the most popular examples.
-popular examples.
 
 ## FAQ
 
-### Whats the difference between DataObject::get() and a relation-getter?
+### What's the difference between DataObject::get() and a relation-getter?
 
-You can work with both in pretty much the same way, 
+You can work with both in pretty much the same way, but relationship-getters return a special type of collection: 
-but relationship-getters return a special type of collection: 
 A `[api:HasManyList]` or a `[api:ManyManyList]` with relation-specific functionality.
 
 	:::php
 	$myTeams = $myPlayer->Team(); // returns HasManyList
-	$myTeam->add($myOtherPlayer);
+	$myTeam->add($myOtherPlayer);

docs/en/topics/i18n.md

@@ -195,7 +195,7 @@ which might vary depending on the used language.
 
 	:::php
 	// in SS-template ($Name must be available in the current template-scope)
-	<%t MYPROJECT.INJECTIONS "Hello {name} {greeting}" name="$Name" greeting="good to see you" %>
+	<%t MYPROJECT.INJECTIONS "Hello {name} {greeting}" name=$Name greeting="good to see you" %>
 
 Note that you can still use `sprintf()` wrapped around a `_t()` call
 for your substitutions. In contrast to `sprintf()`, our API has a more translator friendly

docs/en/tutorials/1-building-a-basic-site.md

@@ -97,8 +97,7 @@ You should ensure the URL for the home page is *home*, as that's the page Silver
 ## Templates
 
 All pages on a SilverStripe site are rendered using a template. A template is an file 
-with a special `*.ss` file extension, containing HTML augmented with some
+with a special `*.ss` file extension, containing HTML augmented with some control codes.  Through the use of templates, you can have as much control over your site’s HTML code as you like. In SilverStripe, these files and others for controlling your sites appearance – the CSS, images, and some javascript – are collectively described as a theme. Themes live in the 'themes' folder of your site.
-control codes. Because of this, you can have as much control of your site’s HTML code as you like.
 
 Every page in your site has a **page type**. We will briefly talk about page types later, and go into much more detail
 in tutorial two; right now all our pages will be of the page type *Page*. When rendering a page, SilverStripe will look

docs/en/tutorials/2-extending-a-basic-site.md

@@ -135,9 +135,9 @@ To add our new fields to the CMS we have to override the *getCMSFields()* method
 		public function getCMSFields() {
 			$fields = parent::getCMSFields();
 			
-			$datefield = new DateField('Date');
+			$dateField = new DateField('Date');
-			$datefield->setConfig('showcalendar', true);
+			$dateField->setConfig('showcalendar', true);
-			$fields->addFieldToTab('Root.Main', $datefield, 'Content');
+			$fields->addFieldToTab('Root.Main', $dateField, 'Content');
 			$fields->addFieldToTab('Root.Main', new TextField('Author'), 'Content');
 			
 			return $fields;
@@ -202,18 +202,17 @@ the date field will have the date format defined by your locale.
 		$fields = parent::getCMSFields();
 		
 		$fields->addFieldToTab('Root.Main', $dateField = new DateField('Date','Article Date (for example: 20/12/2010)'), 'Content');
-		$dateField->setConfig('showcalendar', true);
+        $dateField->setConfig('showcalendar', true);
-		$dateField->setConfig('dateformat', 'dd/MM/YYYY');
+        $fields->addFieldToTab('Root.Main', $dateField, 'Content');
-		
+        $fields->addFieldToTab('Root.Main', new TextField('Author'), 'Content');
-		$fields->addFieldToTab('Root.Main', new TextField('Author','Author Name'), 'Content');
+
-		
 		return $fields;
 	}
 
 Let's walk through these changes.
 
 	:::php
-	$fields->addFieldToTab('Root.Content', $dateField = new DateField('Date','Article Date (for example: 20/12/2010)'), 'Content');
+	$fields->addFieldToTab('Root.Main', $dateField = new DateField('Date','Article Date (for example: 20/12/2010)'), 'Content');
 
 *$dateField* is declared only to in order to change the configuration of the DateField.
 
@@ -228,7 +227,7 @@ By enabling *showCalendar* you show a calendar overlay when clicking on the fiel
 *dateFormat* allows you to specify how you wish the date to be entered and displayed in the CMS field.  See the `[api:DateField]` documentation for more configuration options.
 
 	:::php
-	$fields->addFieldToTab('Root.Content', new TextField('Author','Author Name'), 'Content');
+	$fields->addFieldToTab('Root.Main', new TextField('Author','Author Name'), 'Content');
 
 By default the field name *'Date'* or *'Author'* is shown as the title, however this might not be that helpful so to change the title, add the new title as the second argument.
 
@@ -237,7 +236,7 @@ By default the field name *'Date'* or *'Author'* is shown as the title, however
 
 Because our new pages inherit their templates from *Page*, we can view anything entered in the content area when navigating to these pages on our site. However, as there is no reference to the date or author fields in the *Page* template this data is not being displayed.
 
-To fix this we will create a template for each of our new page types. We'll put these in *themes/tutorial/templates/Layout* so we only have to define the page specific parts: SilverStripe will use *themes/tutorial/templates/Page.ss* for the basic
+To fix this we will create a template for each of our new page types. We'll put these in *themes/simple/templates/Layout* so we only have to define the page specific parts: SilverStripe will use *themes/simple/templates/Page.ss* for the basic
 page layout.
 
 ### ArticlePage Template
@@ -309,7 +308,7 @@ We can make our templates more modular and easier to maintain by separating comm
 
 We'll separate the display of linked articles as we want to reuse this code later on.
 
-Cut the code in *ArticleHolder.ss** and replace it with an include statement:
+Cut the code between "loop Children" in *ArticleHolder.ss** and replace it with an include statement:
 
 **themes/simple/templates/Layout/ArticleHolder.ss**
 
@@ -367,11 +366,11 @@ It would be nice to greet page visitors with a summary of the latest news when t
 
 This function simply runs a database query that gets the latest news articles from the database. By default, this is five, but you can change it by passing a number to the function. See the [Data Model](../topics/datamodel) documentation for details. We can reference this function as a page control in our *HomePage* template:
 
-**themes/tutorial/templates/Layout/Homepage.ss**
+**themes/simple/templates/Layout/Homepage.ss**
 
 	:::ss
 	...
-	<div class="content">$Content</div>
+		<div class="content">$Content</div>
 	</article>
 	<% loop LatestNews %>
 		<% include ArticleTeaser %>
@@ -515,7 +514,7 @@ resize the image every time the page is viewed.
 
 The *StaffPage* template is also very straight forward.
 
-**themes/tutorial/templates/Layout/StaffPage.ss**
+**themes/simple/templates/Layout/StaffPage.ss**
 
 	:::ss
 	<div class="content-container"> 

docs/en/tutorials/3-forms.md

@@ -2,30 +2,22 @@
 
 ## Overview
 
-This tutorial is intended to be a continuation of the first two tutorials, and will build on the site produced in those
+This tutorial is intended to be a continuation of the first two tutorials ([first tutorial](1-building-a-basic-site), [second tutorial](2-extending-a-basic-site)). In this tutorial we will build on the site we developed in the earlier tutorials and explore forms in SilverStripe. We will look at custom coded forms: forms which need to be written in PHP.
-two tutorials.
 
-This tutorial explores forms in SilverStripe. It will look at coded forms. Forms which need to be written in PHP.
+Instead of using a custom coded form, we could use the [userforms module](http://silverstripe.org/user-forms-module). This module allows users to construct forms via the CMS. A form created this way is much quicker to implement, but also lacks the flexibility of a coded form. 
-
-Another method which allows you to construct forms via the CMS is by using the [userforms module](http://silverstripe.org/user-forms-module). 
-A UserDefinedForm is much quicker to implement, but lacks the flexibility of a coded form. 
 
 ## What are we working towards?
 
-We will create a poll on the home page that asks the user their favourite web browser, and displays a bar graph of the
+We will create a poll on the home page that asks the user their favourite web browser, and displays a bar graph of the results.
-results.
 
-![tutorial:pollresults-small.png](_images/pollresults-small.jpg)
+![tutorial:tutorial3_pollresults.png](_images/tutorial3_pollresults.jpg)
 
 
 ## Creating the form
 
-We will be creating a form for a poll on the home page.
+The poll we will be creating on our homepage will ask the user for their name and favourite web browser. It will then collate the results into a bar graph. We create the form in a method on *HomePage_Controller*.
 
-The poll will ask the user's name and favourite web browser, and then collate the results into a bar graph. We create
+**mysite/code/HomePage.php**
-the form in a method on *HomePage_Controller*.
-
-*mysite/code/HomePage.php*
 
 	:::php
 	class HomePage_Controller extends Page_Controller {
@@ -63,27 +55,24 @@ Let's step through this code.
 
 	:::php
 	// Create fields
-		$fields = new FieldList(
+	$fields = new FieldList(
-			new TextField('Name'),
+		new TextField('Name'),
-			new OptionsetField('Browser', 'Your Favourite Browser', array(
+		new OptionsetField('Browser', 'Your Favourite Browser', array(
-				'Firefox' => 'Firefox',
+			'Firefox' => 'Firefox',
-				'Chrome' => 'Chrome',
+			'Chrome' => 'Chrome',
-				'Internet Explorer' => 'Internet Explorer',
+			'Internet Explorer' => 'Internet Explorer',
-				'Safari' => 'Safari',
+			'Safari' => 'Safari',
-				'Opera' => 'Opera',
+			'Opera' => 'Opera',
-				'Lynx' => 'Lynx'
+			'Lynx' => 'Lynx'
-			))
+		))
-		);
+	);
 
 
-First we create our form fields.
+First we create our form fields. 
-
+We do this by creating a `[api:FieldList]` and passing our fields as arguments. 
-We do this by creating a `[api:FieldList]` and passing our fields as arguments. The first field is a new
+The first field is a `[api:TextField]` with the name 'Name'.
-`[api:TextField]` with the name 'Name'.
-
 There is a second argument when creating a field which specifies the text on the label of the field. If no second
 argument is passed, as in this case, it is assumed the label is the same as the name of the field.
-
 The second field we create is an `[api:OptionsetField]`. This is a dropdown, and takes a third argument - an
 array mapping the values to the options listed in the dropdown.
 
@@ -93,13 +82,9 @@ array mapping the values to the options listed in the dropdown.
 	);
 
 
-After creating the fields, we create the form actions. Form actions appear as buttons at the bottom of the form.
+After creating the fields, we create the form actions. Form actions appear as buttons at the bottom of the form. 
-
+The first argument is the name of the function to call when the button is pressed, and the second is the label of the button.
-The first argument is the name of the function to call when the button is pressed, and the second is the label of the
-button.
-
 Here we create a 'Submit' button which calls the 'doBrowserPoll' method, which we will create later.
-
 All the form actions (in this case only one) are collected into a `[api:FieldList]` object the same way we did with
 the fields.
 
@@ -108,16 +93,14 @@ the fields.
 
 
 Finally we create the `[api:Form]` object and return it.
-
 The first argument is the controller that contains the form, in most cases '$this'. The second is the name of the method
 that returns the form, which is 'BrowserPollForm' in our case. The third and fourth arguments are the
 FieldLists containing the fields and form actions respectively.
 
 After creating the form function, we need to add the form to our home page template.
+Add the following code to the top of your home page template, just before `<div class="Content">`:
 
-Add the following code to the home page template, just before the Content `<div>`:
+**themes/simple/templates/Layout/HomePage.ss**
-
-*themes/tutorial/templates/Layout/HomePage.ss*
 
 	:::ss
 	...
@@ -125,12 +108,14 @@ Add the following code to the home page template, just before the Content `<div>
 		<h2>Browser Poll</h2>
 		$BrowserPollForm
 	</div>
-	<div id="Content">
+	<div class="Content">
 	...
 
-Add the following code to the form style sheet:
+In order to make the graphs render correctly,
+we need to add some CSS styling.
+Add the following code to the existing `form.css` file:
 
-*themes/tutorial/css/form.css*
+**themes/simple/css/form.css**
 
 	:::css
 	/* BROWSER POLL */
@@ -142,21 +127,27 @@ Add the following code to the form style sheet:
 		form FieldList {
 			border:0;
 		}
-		#BrowserPoll .message {
+   		#BrowserPoll .message {
-			display: block;
+            float:left;
-			color:red;
+            display: block;
-			background:#ddd;
+            color:red;
-			border:1px solid #ccc;
+            background:#efefef;
-			padding:5px;
+            border:1px solid #ccc;
-			margin:5px;
+            padding:5px;
-		}
+            margin:5px;
+        }
 		#BrowserPoll h2 {
 			font-size: 1.5em;
+			line-height:2em;
 			color: #0083C8;
 		}
 		#BrowserPoll .field {
 			padding:3px 0;
 		}
+		#BrowserPoll input.text {
+			padding: 0;
+			font-size:1em;
+		}
 		#BrowserPoll .Actions {
 			padding:5px 0;
 		}
@@ -165,25 +156,19 @@ Add the following code to the form style sheet:
 		}
 
 
-This CSS code will ensure that the form is formatted and positioned correctly. All going according to plan, if you visit
+All going according to plan, if you visit [http://localhost/your_site_name/home?flush=all](http://localhost/your_site_name/home?flush=all) it should look something like this:
-[http://localhost/home?flush=1](http://localhost/home?flush=1) it should look something like below.
 
-![](_images/pollform.jpg)
+![](_images/tutorial3_pollform.jpg)
 
 
 ## Processing the form
 
-Great! We now have a browser poll form, but it doesn't actually do anything. In order to make the form work, we have to
+Great! We now have a browser poll form, but it doesn't actually do anything. In order to make the form work, we have to implement the 'doBrowserPoll()' method that we told it about.
-implement the 'doBrowserPoll' method that we told it about.
 
-First, we need some way of saving the poll submissions to the database, so we can retrieve the results later. We can do
+First, we need some way of saving the poll submissions to the database, so we can retrieve the results later. We can do this by creating a new object that extends from `[api:DataObject]`.
-this by creating a new object that extends from `[api:DataObject]`.
+If you recall, in the [second tutorial](2-extending-a-basic-site) we said that all objects that inherit from DataObject and have their own fields are stored in tables the database. Also recall that all pages extend DataObject indirectly through `[api:SiteTree]`. Here instead of extending SiteTree (or `[api:Page]`) to create a page type, we will extend `[api:DataObject]` directly:
 
-If you recall, in tutorial two we said that all objects that inherit from DataObject and that add fields are stored in
+**mysite/code/BrowserPollSubmission.php**
-the database. Also recall that all pages extend DataObject indirectly through `[api:SiteTree]`. Here instead of
-extending SiteTree (or `[api:Page]`) to create a page type, we extend DataObject directly.
-
-*mysite/code/BrowserPollSubmission.php*
 
 	:::php
 	<?php	
@@ -194,11 +179,9 @@ extending SiteTree (or `[api:Page]`) to create a page type, we extend DataObject
 		);
 	}
 
+If we then rebuild the database ([http://localhost/your_site_name/dev/build?flush=all](http://localhost/your_site_name/dev/build?flush=all)), we will see that the *BrowserPollSubmission* table is created. Now we just need to define 'doBrowserPoll' on *HomePage_Controller*:
 
-If we then rebuild the database ([http://localhost/dev/build?flush=1](http://localhost/dev/build?flush=1)), we will see
+**mysite/code/HomePage.php**
-that the *BrowserPollSubmission* table is created. Now we just need to define 'doBrowserPoll' on *HomePage_Controller*.
-
-*mysite/code/HomePage.php*
 
 	:::php	
 	class HomePage_Controller extends Page_Controller {
@@ -212,28 +195,19 @@ that the *BrowserPollSubmission* table is created. Now we just need to define 'd
 	}
 
 
-A function that processes a form submission takes two arguments - the first is the data in the form, the second is the
+A function that processes a form submission takes two arguments - the first is the data in the form, the second is the `[api:Form]` object.
-`[api:Form]` object.
+In our function we create a new *BrowserPollSubmission* object. Since the name of our form fields, and the name of the database fields, are the same we can save the form directly into the data object.
-
+We call the 'write' method to write our data to the database, and '$this->redirectBack()' will redirect the user back to the home page.
-In our function we create a new *BrowserPollSubmission* object. Since the name of our form fields and the name of the
-database fields are the same we can save the form directly into the data object.
-
-We call the 'write' method to write our data to the database, and 'redirectBack()' will redirect the user back
-to the home page.
-
 
 ## Form validation
 
-SilverStripe forms all have automatic validation on fields where it is logical. For example, all email fields check that
+SilverStripe forms all have automatic validation on fields where it is logical. For example, all email fields check that they contain a valid email address. You can write your own validation by subclassing the *Validator* class.
-they contain a valid email address. You can write your own validation by subclassing the *Validator* class.
 
-SilverStripe provides the *RequiredFields* validator, which ensures that the fields specified are filled in before the
+SilverStripe provides the *RequiredFields* validator, which ensures that the fields specified are filled in before the form is submitted. To use it we create a new *RequiredFields* object with the name of the fields we wish to be required as the arguments, then pass this as a fifth argument to the Form constructor.
-form is submitted. To use it we create a new *RequiredFields* object with the name of the fields we wish to be required
-as the arguments, then pass this as a fifth argument to the Form constructor.
 
 Change the end of the 'BrowserPollForm' function so it looks like this:
 
-** mysite/code/HomePage.php **
+**mysite/code/HomePage.php**
 
 	:::php
 	public function BrowserPollForm() {
@@ -243,24 +217,19 @@ Change the end of the 'BrowserPollForm' function so it looks like this:
 	}
 
 
-If we then open the homepage and attempt to submit the form without filling in the required fields an error will be
+If we then open the homepage and attempt to submit the form without filling in the required fields errors should appear.
-shown.
-
-![](_images/validation.jpg)
 
+![](_images/tutorial3_validation.jpg)
 
 
 ## Showing the poll results
 
 Now that we have a working form, we need some way of showing the results.
+The first thing to do is make it so a user can only vote once per session. If the user hasn't voted, show the form, otherwise show the results.
 
-The first thing to do is make it so a user can only vote once per session. If the user hasn't voted, show the form,
+We can do this using a session variable. The `[api:Session]` class handles all session variables in SilverStripe. First modify the 'doBrowserPoll' to set the session variable 'BrowserPollVoted' when a user votes.
-otherwise show the results.
 
-We can do this using a session variable. The `[api:Session]` class handles all session variables in SilverStripe.
+**mysite/code/HomePage.php**
-First modify the 'doBrowserPoll' to set the session variable 'BrowserPollVoted' when a user votes.
-
-*mysite/code/HomePage.php*
 
 	:::php
 	// ...
@@ -280,31 +249,28 @@ Then we simply need to check if the session variable has been set in 'BrowserPol
 it is.
 
 	:::php
-	public function BrowserPollForm() {
+	// ...
-		if(Session::get('BrowserPollVoted')) {
+	class HomePage_Controller extends Page_Controller {
-			return false;
-		}
 		// ...
-	}	
+		public function BrowserPollForm() {
+			if(Session::get('BrowserPollVoted')) return false;
+			// ...
+		}	
+	}
 
 
-If you visit the home page now you will see you can only vote once per session; 
+If you visit the home page now you will see you can only vote once per session; after that the form won't be shown. You can start a new session by closing and reopening your browser,
-after that the form won't be shown. 
+or clearing your browsing session through your browsers preferences.
-You can start a new session by closing and reopening your browser.
 
-Now that we're collecting data, it would be nice to show the results
+Although the form is not shown, you'll still see the 'Browser Poll' heading. We'll leave this for now: after we've built the bar graph of the results, we'll modify the template to show the graph instead of the form if the user has already voted.
-on the website as well. We could simply output every vote, but that's boring.
-Let's group the results by browser, through the SilverStripe data model.
 
-In the [second tutorial](/tutorials/2-extending-a-basic-site), 
+Now that we're collecting data, it would be nice to show the results on the website as well. We could simply output every vote, but that's boring. Let's group the results by browser, through the SilverStripe data model.
-we got a collection of news articles for the home page by 
+
-using the 'ArticleHolder::get()' function, which returns a `[api:DataList]`.
+In the [second tutorial](/tutorials/2-extending-a-basic-site), we got a collection of news articles for the home page by using the 'ArticleHolder::get()' function, which returns a `[api:DataList]`. We can get all submissions in the same fashion, through `BrowserPollSubmission::get()`. This list will be the starting point for our result aggregation.
-We can get all submissions in the same fashion, through `BrowserPollSubmission::get()`.
-This list will be the starting point for our result aggregation.
 
 Create the function 'BrowserPollResults' on the *HomePage_Controller* class.
 
-** mysite/code/HomePage.php **
+**mysite/code/HomePage.php**
 
 	:::php
 	public function BrowserPollResults() {
@@ -327,17 +293,11 @@ This code introduces a few new concepts, so let's step through it.
 	:::php
 	$submissions = new GroupedList(BrowserPollSubmission::get());
 
-
+First we get all of the `BrowserPollSubmission` records from the database. This returns the submissions as a `[api:DataList]`.Then we wrap it inside a `[api:GroupedList]`, which adds the ability to group those records. The resulting object will behave just like the original `DataList`, though (with the addition of a `groupBy()` method). 
-First we get all of the `BrowserPollSubmission` records from the database. 
-This returns the submissions as a `[api:DataList]`.
-Then we wrap it inside a `[api:GroupedList]`, which adds the ability
-to group those records. The resulting object will behave just like
-the original `DataList`, though (with the addition of a `groupBy()` method).
 
 	:::php
 	$total = $submissions->Count();
 
-
 We get the total number of submissions, which is needed to calculate the percentages.
 
 	:::php
@@ -351,17 +311,14 @@ We get the total number of submissions, which is needed to calculate the percent
 	}
 
 
-Now we create an empty `[api:ArrayList]` to hold the data we'll pass to the template.
+Now we create an empty `[api:ArrayList]` to hold the data we'll pass to the template. Its similar to `[api:DataList]`, but can hold arbitrary objects rather than just DataObject` instances. Then we iterate over the 'Browser' submissions field. 
-Its similar to `[api:DataList]`, but can hold arbitrary objects rather than just `DataObject` instances.
-Then iterate over the 'Browser' submissions field. 
-The `groupBy()` method splits our list by the 'Browser' field passed to it,
-creating new lists with submissions just for a specific browser.
-Each of those lists is keyed by the browser name.
-The aggregated result is then contained in an `[api:ArrayData]` object,
-which behaves much like a standard PHP array, but allows us to use it in SilverStripe templates.
 
-The final step is to create the template to display our data. Change the 'BrowserPoll' div in
+The `groupBy()` method splits our list by the 'Browser' field passed to it, creating new lists with submissions just for a specific browser. Each of those lists is keyed by the browser name. The aggregated result is then contained in an `[api:ArrayData]` object, which behaves much like a standard PHP array, but allows us to use it in SilverStripe templates.
-*themes/tutorial/templates/Layout/HomePage.ss* to the below.
+
+
+The final step is to create the template to display our data. Change the 'BrowserPoll' div to the below.
+
+**themes/simple/templates/Layout/HomePage.ss** 
 
 	:::ss
 	<div id="BrowserPoll">
@@ -384,20 +341,12 @@ The final step is to create the template to display our data. Change the 'Browse
 Here we first check if the *BrowserPollForm* is returned, and if it is display it. Otherwise the user has already voted,
 and the poll results need to be displayed.
 
-We use the normal tactic of putting the data into an unordered list and using CSS to style it, except here we use inline
+We use the normal tactic of putting the data into an unordered list and using CSS to style it, except here we use inline styles to display a bar that is sized proportionate to the number of votes the browser has received. You should now have a complete poll.
-styles to display a bar that is sized proportionate to the number of votes the browser has received. You should now have
-a complete poll.
 
-![](_images/pollresults.jpg)
+![](_images/tutorial3_pollresults.jpg)
-
-<div class="hint" markdown="1">
-While the ORM is
-</div>
 
 ## Summary
 
-In this tutorial we have explored forms, and seen the different approaches to creating and using forms. Whether you
+In this tutorial we have explored custom php forms, and displayed result sets through Grouped Lists. We have briefly covered the different approaches to creating and using forms. Whether you decide to use the [userforms module](http://silverstripe.org/user-forms-module) or create a form in PHP depends on the situation and flexibility required.
-decide to use the [userforms module](http://silverstripe.org/user-forms-module) or create a form in PHP depends on the situation and flexibility
-required.
 
 [Next Tutorial >>](4-site-search)

docs/en/tutorials/4-site-search.md

@@ -2,17 +2,13 @@
 
 ## Overview
 
-This is a short tutorial demonstrating how to add search functionality to a SilverStripe site. It is recommended that
+This is a short tutorial demonstrating how to add search functionality to a SilverStripe site. It is recommended that you have completed the earlier tutorials  ([Building a basic site](1-building-a-basic-site), [Extending a basic site](2-extending-a-basic-site), [Forms](3-forms)), especially the tutorial on forms, before attempting this tutorial. While this tutorial will add search functionality to the site built in the previous tutorials, it should be straight  forward to follow this tutorial on any site of your own. 
-you have completed the earlier tutorials, especially the tutorial on forms, before attempting this tutorial. While this
-tutorial will add search functionality to the site built in the previous tutorials, it should be straight forward to
-follow this tutorial on any site of your own. 
 
 ## What are we working towards?
 
-We are going to add a search box on the top of the page. When a user types something in the box, they are taken to a
+We are going to add a search box on the top of the page. When a user types something in the box, they are taken to a results page.
-results page.
 
-![](_images/tutorial4_search.png)
+![](_images/tutorial4_search.jpg)
 
 ## Creating the search form
 
@@ -22,20 +18,18 @@ This will enable fulltext search on page content as well as names of all files i
 	:::php
 	FulltextSearchable::enable();
 
-After including that in your `_config.php` you will need to rebuild the database by visiting `http://yoursite.com/dev/build` in your web browser. This will add the fulltext search columns.
+After including that in your `_config.php` you will need to rebuild the database by visiting [http://localhost/your_site_name/home?flush=all](http://localhost/your_site_name/home?flush=all) in your web browser (replace localhost/your_site_name with a domain if applicable). This will add fulltext search columns.
 
-The actual search form code is already provided in FulltextSearchable so when you add the enable line above to your
+The actual search form code is already provided in FulltextSearchable so when you add the enable line above to your `_config.php` you can add your form as `$SearchForm`.
-`_config.php` you can add your form as `$SearchForm`.
 
 In the simple theme, the SearchForm is already added to the header. We will go through the code and explain it.
 
 
 ## Adding the search form
 
-To add the search form, we can add `$SearchForm` anywhere in our templates. In the simple theme, this is in
+To add the search form, we can add `$SearchForm` anywhere in our templates. In the simple theme, this is in *themes/simple/templates/Includes/Header.ss*
-*themes/simple/templates/Includes/Header.ss*
 
-*themes/simple/templates/Includes/Header.ss*
+**themes/simple/templates/Includes/Header.ss**
 
 	:::ss
 	...
@@ -43,21 +37,20 @@ To add the search form, we can add `$SearchForm` anywhere in our templates. In t
 		<span class="search-dropdown-icon">L</span>
 		<div class="search-bar">
 			$SearchForm
-			<span class="search-bubble-arrow">}</span>
 		</div>      
 	<% end_if %>
 	<% include Navigation %>
 
-This results in:
+This displays as:
 
-![](_images/tutorial4_searchbox.png)
+![](_images/tutorial4_searchbox.jpg)
 
 ## Showing the results
 
 The results function is already included in the `ContentControllerSearchExtension` which
 is applied via `FulltextSearchable::enable()`
 
-*cms/code/search/ContentControllerSearchExtension.php*
+**cms/code/search/ContentControllerSearchExtension.php**
 
 	:::php
 	class ContentControllerSearchExtension extends Extension {
@@ -74,11 +67,9 @@ is applied via `FulltextSearchable::enable()`
 	}
 
 
-The code populates an array with the data we wish to pass to the template - the search results, query and title of the
+The code populates an array with the data we wish to pass to the template - the search results, query and title of the page. The final line is a little more complicated.
-page. The final line is a little more complicated.
 
-When we call a function by its url (eg http://localhost/home/results), SilverStripe will look for a template with the
+When we call a function by its url (eg http://localhost/home/results), SilverStripe will look for a template with the name `PageType_function.ss`. As we are implementing the *results* function on the *Page* page type, we create our
-name `PageType_function.ss`. As we are implementing the *results* function on the *Page* page type, we create our
 results page template as *Page_results.ss*. Unfortunately this doesn't work when we are using page types that are
 children of the *Page* page type. For example, if someone used the search on the homepage, it would be rendered with
 *Homepage.ss* rather than *Page_results.ss*. SilverStripe always looks for the template from the most specific page type
@@ -155,14 +146,13 @@ class.
 	    <% end_if %>
 	</div>
 
-Then finally add ?flush=1 to the URL and you should see the new template.
+Then finally add ?flush=all to the URL and you should see the new template.
 
 
-![](_images/tutorial4_search.png)
+![](_images/tutorial4_search.jpg)
 
 ## Summary
 
-This tutorial has demonstrated how easy it is to have full text searching on your site. To add search to a SilverStripe
+This tutorial has demonstrated how easy it is to have full text searching on your site. To add search to a SilverStripe site add a search form, a results page, and you're done!
-site, only a search form and a results page need to be created.
 
 [Next Tutorial >>](5-dataobject-relationship-management)

docs/en/tutorials/5-dataobject-relationship-management.md

@@ -2,774 +2,432 @@
 
 ## Overview
 
-In the [second tutorial](2-extending-a-basic-site) we have learned how to add extrafields to a page type thanks
+This tutorial explores the relationship and management of [DataObjects](/topics/datamodel#relations). It builds on the [second tutorial](2-extending-a-basic-site) where we learnt how to define
-to the *$db* array and how to add an image using the *$has_one* array and so create a relationship between a table and
+additional fields on our models, and attach images to them.
-the *Image* table by storing the id of the respective *Image* in the first table. This tutorial explores all this
-relations between [DataObjects](/topics/datamodel#relations) and the way to manage them easily.
-
-<div class="notice" markdown='1'>
-	I'm using the default tutorial theme in the following examples so the templates may vary or you may need to change
-	the template code in this example to fit your theme
-</div>
 
 ## What are we working towards?
 
-To simulate these relations between objects, we are going to simulate the management via the CMS of the **[Google Summer
+To demonstrate relationships between objects, 
-Of Code 2007](http://www.silverstripe.com/google-summer-of-code-2007-we-are-in/)** that SilverStripe was part of.
+we are going to use the example of students working on various projects.
+Each student has a single project, and each project has one or more
+mentors supervising their progress. We'll create these objects,
+make them editable in the CMS, and render them on the website.
 
-To do this, we are gonna use the following objects :
+This table shows some example data we'll be using:
 
-*  Project : Project on SilverStripe system for the GSOC 
+ | Project             | Student             | Mentor   	    | 
-*  Student : Student involved in the project
+ | -------             | -------             | -------			  |
-*  Mentor : SilverStripe developer
+ | Developer Toolbar | Jakob,Ofir   | Mark,Sean	|
-*  Module : Module used for the project
+ | Behaviour Testing  | Michal,Wojtek | Ingo, Sean |
+ | Content Personalization | Yuki | Philipp	| 
+ | Module Management | Andrew | Marcus,Sam | 
 
+### Has-One and Has-Many Relationships: Project and Student
 
-This is a table which sums up the relations between them :
+A student can have only one project, it'll keep them busy enough.
- | Project             | Student             | Mentor        | Modules          |                           
+But each project can be done by one or more students.
- | -------             | -------             | ------        | ------------------                           
+This is called a **one-to-many** relationship.
- | i18n Multi-Language | Bernat Foj Capell   | Ingo Schommer | Cms, Framework, i18n, Translation              | 
+Let's create the `Student` and `Project` objects.
- | Image Manipulation  | Mateusz Ujma        | Sam Minnee    | Cms, Framework, ImageManipulation              | 
- | Google Maps         | Ofir Picazo Navarro | Hayden Smith  | Cms, Framework, Maps                           | 
- | Mashups             | Lakshan Perera      | Matt Peel     | Cms, Framework, MashUps                        | 
- | Multiple Databases  | Philipp Krenn       | Brian Calhoun | Cms, Framework, MultipleDatabases              | 
- | Reporting           | Quin Hoxie          | Sam Minnee    | Cms, Framework, Reporting                      | 
- | Security & OpenID   | Markus Lanthaler    | Hayden Smith  | Cms, Framework, auth_openid                    | 
- | SEO                 | Will Scott          | Brian Calhoun | Cms, Framework, googleadwords, googleanalytics | 
- | Usability           | Elijah Lofgren      | Sean Harvey   | Cms, Framework, UsabilityElijah                | 
- | Safari 3 Support    | Meg Risen           | Sean Harvey   | Cms, Framework, UsabilityMeg                   | 
 
-## GSOC Projects
+**mysite/code/Student.php**
-
-Before starting the relations management, we need to create a *ProjectsHolder* class where we will save the GSOC Project
-pages.
-
-*tutorial/code/ProjectsHolder.php*
 
 	:::php
 	<?php
-	
-	class ProjectsHolder extends Page {
-	
-		static $allowed_children = array( 'Project' );
-	
-	}
-	
-	class ProjectsHolder_Controller extends Page_Controller {
-	
-	}
-
-## Project - Student relation
-
-**A project can only be done by one student.**
-
-**A student has only one project.**
-
-This relation is called a **1-to-1** relation.
-
-The first step is to create the student and project objects.
-
-*tutorial/code/Student.php*
-
-	:::php
-	<?php
-	
 	class Student extends DataObject {
-	
 		static $db = array(
-			'FirstName' => 'Text',
+			'Name' => 'Varchar',
-			'Lastname' => 'Text',
+			'University' => 'Varchar',
-			'Nationality' => 'Text'
 		);
-	
-		public function getCMSFields_forPopup() {
-			$fields = new FieldList();
-			
-			$fields->push( new TextField( 'FirstName', 'First Name' ) );
-			$fields->push( new TextField( 'Lastname' ) );
-			$fields->push( new TextField( 'Nationality' ) );
-			
-			return $fields;
-		}
-	
-	}
-
-
-*tutorial/code/Project.php*
-
-	:::php
-	<?php
-	
-	class Project extends Page {
-	
 		static $has_one = array(
-			'MyStudent' => 'Student'
+			'Project' => 'Project'
-		);
+		);	
-	
-	}
-	class Project_Controller extends Page_Controller {}
-
-This code will create a relationship between the *Project* table and the *Student* table by storing the id of the
-respective *Student* in the *Project* table.
-
-The second step is to add the table in the method *getCMSFields* which will allow you to manage the *has_one* relation.
-
-	:::php
-	class Project extends Page {
-	
-		...
-	
-		public function getCMSFields() {
-			$fields = parent::getCMSFields();
-			
-			$tablefield = new HasOneComplexTableField(
-				$this,
-				'MyStudent',
-				'Student',
-				array(
-					'FirstName' => 'First Name',
-					'Lastname' => 'Family Name',
-					'Nationality' => 'Nationality'
-				),
-				'getCMSFields_forPopup'
-			);
-			$tablefield->setParentClass('Project');
-			
-			$fields->addFieldToTab( 'Root.Student', $tablefield );
-			
-			return $fields;
-		}
-	
 	}
 
-Let’s walk through the parameters of the *HasOneComplexTableField* constructor.
+**mysite/code/Project.php**
-
-1.  **$this** : The first object concerned by the relation
-2.  **'MyStudent'** : The name of the second object of the relation
-3.  **'Student'** : The type of the second object of the relation
-4.  **array(...)** : The fields of the second object which will be in the table
-5.  **'getCMSFields_forPopup'** : The method which will be called to add, edit or only show a second object
-
-You can also directly replace the last parameter by this code :
-
-	:::php
-	   new FieldList(
-	      new TextField( 'FirstName', 'First Name' ),
-	      new TextField( 'Lastname' ),
-	      new TextField( 'Nationality' )
-	   );
-
-
-<div class="tip" markdown='1'>
-	Don't forget to rebuild the database using *dev/build?flush=1* before you 
-	proceed to the next part of this tutorial.
-</div>
-
-Now that we have created our *Project* page type and *Student* data object, let’s add some content.
-
-Go into the CMS and create one *Project* page for each project listed [above](#what-are-we-working-towards) under a 
-*ProjectsHolder* page named **GSOC Projects** for instance.
-
-![tutorial:gsoc-project-creation.png](_images/gsoc-project-creation.jpg)
-
-As you can see in the tab panel *Student*, the adding functionality is titled *Add Student*. However, if you want to
-modify this title, you have to add this code in the *getCMSFields* method of the *Project* class :
-
-	:::php
-	$tablefield->setAddTitle( 'A Student' );
-
-
-Select now one of the *Project* page that you have created, go in the tab panel *Student* and add all the students
-listed [above](#what-are-we-working-towards) by clicking on the link **Add A Student** of your 
-*HasOneComplexTableField* table.
-
-![tutorial:gsoc-student-creation.png](_images/gsoc-student-creation.jpg)
-
-After having added all the students, you will see that, in the tab panel *Student* of all the *Project* pages, the
-*HasOneComplexTableField* tables have the same content.
-
-For each *Project* page, you can now affect **one and only one** student to it ( see the
-[list](#What_are_we_working_towards?) ).
-
-![tutorial:gsoc-project-student-selection.png](_images/gsoc-project-student-selection.jpg)
-
-You will also notice, that you have the possibility to **unselect** a student which will make your *Project* page
-without any student affected to it.
-
-**At the moment, the *HasOneComplexTableField* table doesn't manage totally the *1-to-1* relation because you can easily
-select the same student for two ( or more ) differents *Project* pages which corresponds to a *1-to-many* relation.**
-
-To use your *HasOneComplexTableField* table for a **1-to-1** relation, make this modification in the class *Project* :
-
-	:::php
-	class Project extends Page {
-	
-		...
-	
-		public function getCMSFields() {
-		
-			...
-			
-			$tablefield->setParentClass('Project');
-			
-			$tablefield->setOneToOne();
-			
-			$fields->addFieldToTab( 'Root.Student', $tablefield );
-			
-			return $fields;
-		}
-	
-	}
-
-Now, you will notice that by checking a student in a *Project* page, you will be unable to select him again in any other
-*Project* page which is the definition of a **1-to-1** relation.
-
-
-
-
-
-
-## Student - Mentor relation
-
-**A student has one mentor.**
-
-**A mentor has several students.**
-
-This relation is called a **1-to-many** relation.
-
-The first step is to create the mentor object and set the relation with the *Student* data object.
-
-*tutorial/code/Mentor.php*
 
 	:::php
 	<?php
-	
+	class Project extends Page {
-	class Mentor extends Page {
-	
-		static $db = array(
-			'FirstName' => 'Text',
-			'Lastname' => 'Text',
-			'Nationality' => 'Text'
-		);
-		
 		static $has_many = array(
 			'Students' => 'Student'
 		);
-		
-		public function getCMSFields() {
-			$fields = parent::getCMSFields();
-			
-			$fields->addFieldToTab( 'Root.Content', new TextField( 'FirstName' ) );
-			$fields->addFieldToTab( 'Root.Content', new TextField( 'Lastname' ) );
-			$fields->addFieldToTab( 'Root.Content', new TextField( 'Nationality' ) );
-		
-			return $fields;
-		}
-	
 	}
-	class Mentor_Controller extends Page_Controller {}
+	class Project_Controller extends Page_Controller {
-
-*tutorial/code/Student.php*
-
-	:::php
-	class Student extends DataObject {
-	
-		...
-	
-		static $has_one = array(
-			'MyMentor' => 'Mentor'
-		);
-	
 	}
 
+The relationships are defined through the `$has_one`
+and `$has_many` properties on the objects.
+The array keys declares the name of the relationship,
+the array values contain the class name (see the ["database structure"](/reference/database-structure)
+and ["datamodel"](/topics/datamodel) topics for more information).
 
-This code will create a relationship between the *Student* table and the *Mentor* table by storing the id of the
+As you can see, only the `Project` model extends `Page`,
-respective *Mentor* in the *Student* table.
+while `Student` is a plain `DataObject` subclass.
+This allows us to view projects through the standard
+theme setup, just like any other page. 
+It would be possible to render students separately as well,
+but for now we'll assume they're just listed as part of their `Project` page.
+Since `Project` inherits all properties (e.g. a title) from its parent class,
+we don't need to define any additional ones for our purposes.
 
-The second step is to add the table in the method *getCMSFields* which will allow you to manage the *has_many* relation.
+Now that we have our models defined in PHP code,
+we need to tell the database to create the related tables. 
+Trigger a rebuild through *dev/build?flush=all* before you 
+proceed to the next part of this tutorial.
 
-*tutorial/code/Mentor.php*
+### Organizing pages: ProjectHolder
 
-	:::php
+A `Project` is just a page, so we could create it anywhere in the CMS.
-	class Mentor extends Page {
+In order to list and organize them, it makes sense to collect them under a common parent page.
-	
+We'll create a new page type called `ProjectsHolder` for this purpose,
-		...
+which is a common pattern in SilverStripe's page types. Holders
-	
+are useful for listing their children, and usually restrict these children to a specific class,
-		public function getCMSFields() {
+in our case pages of type `Project`.
-			$fields = parent::getCMSFields();
+The restriction is enforced through the `$allowed_children` directive.
-		
-			...
-		
-			$tablefield = new HasManyComplexTableField(
-				$this,
-				'Students',
-				'Student',
-				array(
-					'FirstName' => 'FirstName',
-					'Lastname' => 'Family Name',
-					'Nationality' => 'Nationality'
-				),
-				'getCMSFields_forPopup'
-			);
-			$tablefield->setAddTitle( 'A Student' );
-		
-			$fields->addFieldToTab( 'Root.Students', $tablefield );
-		
-			return $fields;
-		}
-	
-	}
-	class Mentor_Controller extends Page_Controller {}
 
-To know more about the parameters of the *HasManyComplexTableField* constructor, [check](#project_-_student_relation)
+**mysite/code/ProjectsHolder.php**
-those of the *HasOneComplexTableField* constructor.
-
-<div class="tip" markdown='1'>
-	Don't forget to rebuild the database using *dev/build?flush=1* before you 
-	proceed to the next part of this tutorial.
-</div>
-
-Now that we have created our *Mentor* page type, go into the CMS and create one *Mentor* page for each mentor listed
-[above](#what-are-we-working-towards) under a simple *Page* named
-**Mentors** for instance.
-
-![tutorial:gsoc-mentor-creation.png](_images/gsoc-mentor-creation.jpg)
-
-For each *Mentor* page, you can now affect **many** students created previously ( see the
-[list](#What_are_we_working_towards?) ) by going in the tab panel *Students*.
-
-![tutorial:gsoc-mentor-student-selection.png](_images/gsoc-mentor-student-selection.jpg)
-
-You will also notice, that by checking a student in a *Mentor* page, you will be unable to select him again in any other
-*Mentor* page which is the definition of a **1-to-many** relation.
-
-As the *HasOneComplexTableField* table, you also have the possibility not to select any student which will make your
-*Mentor* page without any student affected to it.
-
-
-
-
-
-
-
-
-
-
-## Project - Module relation
-
-**A project uses several modules.**
-
-**A module is used by several projects.**
-
-This relation is called a **many-to-many** relation.
-
-The first step is to create the module object and set the relation with the *Project* page type.
-
-*tutorial/code/Module.php*
 
 	:::php
 	<?php
-	
+	class ProjectsHolder extends Page {
-	class Module extends DataObject {
+		static $allowed_children = array(
-	
+			'Project'
-	   static $db = array(
+		);
-	      'Name' => 'Text'
+	}
-	   );
+	class ProjectsHolder_Controller extends Page_Controller {
-	
-	   static $belongs_many_many = array(
-	      'Projects' => 'Project'
-	   );
-	
-	   public function getCMSFields_forPopup() {
-	      $fields = new FieldList();
-	      $fields->push( new TextField( 'Name' ) );
-	      return $fields;
-	   }
-	
 	}
 
-*tutorial/code/Project.php*
+You might have noticed that we don't specify the relationship
+to a project. That's because its already inherited from the parent implementation,
+as part of the normal page hierarchy in the CMS.
+
+Now that we have created our `ProjectsHolder` and `Project` page types,  we'll add some content.
+Go into the CMS and create a `ProjectsHolder` page named **Projects**. 
+Then create one `Project` page for each project listed [above](#what-are-we-working-towards).
+
+### Data Management Interface: GridField
+
+So we have our models, and can create pages of type
+`Project` through the standard CMS interface,
+and collect those within a `ProjectsHolder`.
+But what about creating `Student` records?
+
+Since students are related to a single project, we will
+allow editing them right the on the CMS interface in the `Project` page type.
+We do this through a powerful field called `[GridField](/topics/grid-field)`.
+All customization to fields for a page type are managed through a method called
+`getCMSFields()`, so let's add it there:
+
+**mysite/code/Project.php**
 
 	:::php
+	<?php
 	class Project extends Page {
-	
+		// ...
-	   ...
+		public function getCMSFields() {
-	
+			// Get the fields from the parent implementation
-	   static $many_many = array(
+			$fields = parent::getCMSFields();	
-	      'Modules' => 'Module'
+
-	   );
+			// Create a default configuration for the new GridField, allowing record editing
-	
+			$config = GridFieldConfig_RelationEditor::create();
+
+			// Set the names and data for our gridfield columns
+			$config->getComponentByType('GridFieldDataColumns')->setDisplayFields(array(
+				'Name' => 'Name',
+				'Project.Title'=> 'Project' // Retrieve from a has-one relationship
+			));	
+						
+			// Create a gridfield to hold the student relationship    
+			$studentsField = new GridField(
+				'Students', // Field name
+				'Student', // Field title
+				$this->Students(), // List of all related students
+				$config
+			);		
+			 
+			// Create a tab named "Students" and add our field to it
+			$fields->addFieldToTab('Root.Students', $studentsField); 
+						
+			return $fields;
+		}
 	}
 
+This creates a tabular field, which lists related student records, one row at a time.
+Its empty by default, but you can add new students as required,
+or relate them to the project by typing in the box above the table.
 
-This code will create a relationship between the *Project* table and the *Module* table by storing the ids of the
+In our case, want to manage those records, edit their details, and add new ones. 
-respective *Project* and *Module* in a another table named **Project_Modules**.
+To accomplish this, we have added a specific `[api:GridFieldConfig]`.
+While we could've built the config from scratch, there's several
+preconfigured instances. The `GridFieldConfig_RecordEditor` default configures
+the field to edit records, rather than just viewing them.
+The GridField API is composed of "components", which makes it very flexible.
+One example of this is the configuration of column names on our table:
+We call `setDisplayFields()` directly on the component responsible for their rendering.
 
-The second step is to add the table in the method *getCMSFields* which will allow you to manage the *many_many*
+<div class="note" markdown="1">
-relation.
+	Adding a `GridField` to a page type is a popular way to manage data,
-
+	but not the only one. If your data requires a dedicated interface
-	:::php
+	with more sophisticated search and management logic, consider
-	class Project extends Page {
+	using the `[ModelAdmin](reference/modeladmin)` interface instead.
-	
-	   ...
-	
-	   public function getCMSFields() {
-	      $fields = parent::getCMSFields();
-	
-	      ...
-	
-	      $modulesTablefield = new ManyManyComplexTableField(
-	         $this,
-	         'Modules',
-	         'Module',
-	         array(
-		    'Name' => 'Name'
-	         ),
-	         'getCMSFields_forPopup'
-	      );
-	      $modulesTablefield->setAddTitle( 'A Module' );
-	
-	      $fields->addFieldToTab( 'Root.Modules', $modulesTablefield );
-	
-	      return $fields;
-	   }
-	
-	}
-
-To know more about the parameters of the *ManyManyComplexTableField* constructor,
-[check](#project_-_student_relation) those of the *HasOneComplexTableField*
-constructor.
-
-<div class="tip" markdown='1'>
-	Don't forget to rebuild the database using *dev/build?flush=1* before you 
-	proceed to the next part of this tutorial.
 </div>
 
-Select now one of the *Project* page, go in the tab panel *Modules* and add all the modules listed
+![tutorial:tutorial5_project_creation.jpg](_images/tutorial5_project_creation.jpg)
-[above](#what-are-we-working-towards) by clicking on the link **Add A
-Module** of your *ManyManyComplexTableField* table.
 
-![tutorial:gsoc-module-creation.png](_images/gsoc-module-creation.jpg)
+Select each `Project` page you have created before, 
+go in the tab panel called "Students", and add all students as required,
+by clicking on the link **Add Student** of your *GridField* table.
 
-For each *Project* page, you can now affect **many** modules created previously ( see the
+![tutorial:tutorial5_addNew.jpg](_images/tutorial5_addNew.jpg)
-[list](#What_are_we_working_towards?) ) by going in the tab panel
-*Modules*.
 
-![tutorial:gsoc-project-module-selection.png](_images/gsoc-project-module-selection.jpg)
+Once you have added all the students, and selected their projects, it should look a little like this:
 
-You will also notice, that you are able to select several times a *Module* on different *Project* pages which is the
+![tutorial:tutorial5_students.jpg](_images/tutorial5_students.jpg)
-definition of a **many-to-many** relation.
 
-As the *HasOneComplexTableField* and *HasManyComplexTableField* table, you also have the possibility not to select any
+### Many-many relationships: Mentor
-module which will make your *Project* page without any module affected to it.
+
+Now we have a fairly good picture of how students relate to their projects.
+But students generally have somebody looking them over the shoulder.
+In our case, that's the "mentor". Each project can have many of them,
+and each mentor can be have one or more projects. They're busy guys!
+This is called a *many-many* relationship.
+
+The first step is to create the `Mentor` object and set the relation with the `Project` page type.
+
+**mysite/code/Mentor.php**
+
+	:::php
+	<?php
+	class Mentor extends DataObject {
+		static $db = array(
+			'Name' => 'Varchar',
+		);
+		static $belongs_many_many = array(
+			'Projects' => 'Project'
+		);
+	}
+
+**mysite/code/Project.php**
+
+	:::php
+	class Project extends Page {
+		// ...
+		static $many_many = array(
+			'Mentors' => 'Mentor'
+		);
+	}
+
+This code will create a relationship between the `Project` table and the `Mentor` table by storing the ids of the respective `Project` and `Mentor` in a another table named "Project_Mentors"
+(after you've performed a `dev/build` command, of course).
+
+The second step is to add the table in the method `getCMSFields()`,
+which will allow you to manage the *many_many* relation.
+Again, GridField will come in handy here, we just have
+to configure it a bit differently.
+
+**mysite/code/Project.php**
+
+	:::php
+	class Project extends Page {
+		// ...
+		public function getCMSFields() {
+			// ...
+
+			// Same setup, but for mentors
+			$mentorsField = new GridField(
+				'Mentors',
+				'Mentors',
+				$this->Mentors(),
+				GridFieldConfig_RelationEditor::create()
+			);		      
+			$fields->addFieldToTab('Root.Mentors', $mentorsField);
+
+			return $fields;
+		}
+	}
+
+The important difference to our student management UI is the usage
+of `$this->Mentor()` (rather than `Mentor::get()`). It will limit
+the list of records to those related through the many-many relationship.
+
+In the CMS, open one of your `Project` pages and select the "Mentors" tab. 
+Add all the mentors listed [above](#what-are-we-working-towards) 
+by clicking on the **Add Mentor** button. 
+
+![tutorial:tutorial5_module_creation.jpg](_images/tutorial5_module_creation.jpg)
+
+To associate the mentor with a project, select one the the mentors, and click on the projects tab. Add all the projects a mentor is associated with (see the [list](#What_are_we_working_towards?)), by typing the name in "Find Projects by Page name" and clicking the "Link Existing" button.
+You will notice that you are able to select the same `Project` for multiple mentors. 
+This is the definition of a **many-to-many** relation.
+
+![tutorial:tutorial5_module_selection.jpg](_images/tutorial5_module_selection.jpg)
 
 
+## Website Display
 
-
+Now that we have created all the *Page* and *DataObject* classes necessary and the relational tables to manage the [relations](/topics/datamodel#relations) between them, we would like to see these relations on the website. We will see in this section how to display all these relations, 
-
+but also how to create a template for a *DataObject*.
-## Displaying the data on your website
-
-Now that we have created all the *Page* and *DataObject* classes necessary and the relational tables to
-manage the [relations](../topics/datamodel#relations) between them, we would like to see these relations on the website.
-
-We will see in this section how to display all these relations but also how to create a template for a *DataObject*.
 
 For every kind of *Page* or *DataObject*, you can access to their relations thanks to the **control** loop.
 
-**1. GSOC Projects**
+### Projects Overview Template
 
-Let's start with the *ProjectsHolder* page created before. For this template, we are will display the same table than
+We'll start by creating a `ProjectsHolder` template,
-[above](#what-are-we-working-towards).
+which lists all projects, and condenses their
+student and mentor relationships into a single line.
+You'll notice that there's no difference between
+accessing a "has-many" and "many-many" relationship
+in the template loops: To the template, its just
+a named list of object.
 
-![tutorial:gsoc-projects-table.png](_images/gsoc-projects-table.jpg)
+![tutorial:tutorial5_projects_table.jpg](_images/tutorial5_projects_table.jpg)
 
-*tutorial/templates/Layout/ProjectsHolder.ss*
+**themes/simple/templates/Layout/ProjectsHolder.ss**
 
 	:::ss
-	<% include Menu2 %>
+	<div class="content-container typography">	
-
+		<article>
-	<div id="Content" class="typography">
+			<h1>$Title</h1>
-		<% if Level(2) %>
+			<div class="content">
-	        <% include BreadCrumbs %>
+				$Content
-	    <% end_if %>
+				
-
+				<table>
-		$Content
+					<thead>
-
+						<tr>
-		<table>
+							<th>Project</th>
-	        <thead>
+							<th>Students</th>
-	            <tr>
+							<th>Mentors</th>
-	                <th>Project</th>
+						</tr>
-	                <th>Student</th>
+					</thead>
-	                <th>Mentor</th>
+					<tbody>
-	                <th>Modules</th>
+					<% loop Children %>
-	            </tr>
+						<tr>
-	        </thead>
+							<td>
-	        <tbody>
+								<a href="$Link">$Title</a>
-	            <% loop Children %>
+							</td>	
-	                <tr>
+							<td>
-	                    <td>$Title</td>
+								<% loop Students %>	                            
-	                    <td>
+									$Name ($University)<% if Last !=1 %>,<% end_if %>
-	                        <% if MyStudent %>
+								<% end_loop %>
-	                            <% loop MyStudent %>
+							</td>    
-	                                $FirstName $Lastname
+							<td>
-	                            <% end_loop %>
+								<% loop Mentor %>
-	                        <% else %>
+									$Name<% if Last !=1 %>,<% end_if %>
-	                            No Student
+								<% end_loop %>
-	                        <% end_if %>
+							</td>
-	                    </td>
+						</tr>
-	                    <td>
+					<% end_loop %>
-	                        <% if MyStudent %>
+					</tbody>
-	                            <% loop MyStudent %>
+					</table>
-	                                <% if MyMentor %>
+			</div>
-	                                    <% loop MyMentor %>
+		</article>
-	                                        $FirstName $Lastname
-	                                    <% end_loop %>
-	                                <% else %>
-	                                    No Mentor
-	                                <% end_if %>
-	                            <% end_loop %>
-	                        <% else %>
-	                            No Mentor
-	                        <% end_if %>
-	                    </td>
-	                    <td>
-	                        <% if Modules %>
-	                            <% loop Modules %>
-	                                $Name &nbsp;
-	                            <% end_loop %>
-	                        <% else %>
-	                            No Modules
-	                        <% end_if %>
-	                    </td>
-	                </tr>
-	            <% end_loop %>
-	        </tbody>
-	    </table>
-
-		$Form
-
 	</div>
+	<% include SideBar %>
 
+Navigate to the holder page through your website navigation,
+or the "Preview" feature in the CMS. You should see a list of all projects now.
+Add `?flush=all` to the page URL to force a refresh of the template cache.
 
-<div class="notice" markdown='1'>
+To get a list of all projects, we've looped through the "Children" list,
-	If you are using the blackcandy template: You might want to move the `<% include Sidebar %>`
+which is a relationship we didn't define explictly.
-	(tutorial/templates/Includes/SideBar.ss) include in the *tutorial/templates/Layout/Page.ss* template above
+It is provided to us by the parent implementation,
-	the typography div to get rid of the bullets
+since projects are nothing other than children pages in the standard page hierarchy.
-</div>
 
+### Project Detail Template
 
-**2. Project**
+Creating the detail view for each `Project` page works in a very similar way.
+Given that we're in the context of a single project,
+we can access the "Students" and "Mentors" relationships directly in the template.
 
-We know now how to easily access and show [relations](../topics/datamodel#relations) between *DataObject* in a template.
+![tutorial:tutorial5_project.jpg](_images/tutorial5_project.jpg)
 
-We can now do the same for every *Project* page by creating its own template.
+**themes/simple/templates/Layout/Project.ss**
-
-![tutorial:gsoc-project.png](_images/gsoc-project.jpg)
-
-*tutorial/templates/Layout/Project.ss*
 
 	:::ss
-	<% include Menu2 %>
+	<div class="content-container typography">	
+		<article>
+			<h1>$Title</h1>
+			<div class="content">
+				$Content
 
-	<div id="Content" class="typography">
+				<h2>Students</h2>
-		<% if Level(2) %>
+				<% if Students %>
-	        <% include BreadCrumbs %>
+					<ul>
-	    <% end_if %>
+					<% loop Students %>
+						<li>$Name ($University)</li>
+					<% end_loop %>
+					</ul>
+				<% else %>
+					<p>No students found</p>
+				<% end_if %>
 
-		$Content
+				<h2>Mentors</h2>
-
+				<% if Mentors %>
-		<% if MyStudent %>
+					<ul>
-	        <% loop MyStudent %>
+					<% loop Mentors %>
-	            <p>First Name: <strong>$FirstName</strong></p>
+						<li>$Name</li>
-	            <p>Lastname: <strong>$Lastname</strong></p>
+					<% end_loop %>
-	            <p>Nationality: <strong>$Nationality</strong></p>
+					</ul>
-
+				<% else %>
-	            <h3>Mentor</h3>
+					<p>No mentors found</p>
-
+				<% end_if %>
-	            <% if MyMentor %>
-	                <% loop MyMentor %>
-	                    <p>First Name: <strong>$FirstName</strong></p>
-	                    <p>Lastname: <strong>$Lastname</strong></p>
-	                    <p>Nationality: <strong>$Nationality</strong></p>
-	                <% end_loop %>
-	            <% else %>
-	                <p>This student doesn't have any mentor.</p>
-	            <% end_if %>
-	        <% end_loop %>
-	    <% else %>
-	        <p>There is no any student working on this project.</p>
-	    <% end_if %>
-
-	    <h3>Modules</h3>
-
-	    <% if Modules %>
-	        <ul>
-	            <% loop Modules %>
-	                <li>$Name</li>
-	            <% end_loop %>
-	        </ul>
-	    <% else %>
-	        <p>This project has not used any modules.</p>
-	    <% end_if %>
-
-		$Form
 
+			</div>
+		</article>
 	</div>
+	<% include SideBar %>
 
+Follow the link to a project detail from from your holder page,
+or navigate to it through the submenu provided by the theme.
 
-What we would like now is to create a special template for the *DataObject* *Student* and the *Page* *Mentor* which will
+### Student Detail Template
-be used when we will call directly the variable in the *Project* template. In our case, we will use the same template
-because these two classes have the same fields ( FirstName, Surname and Nationality ).
 
-*tutorial/templates/Includes/GSOCPerson.ss*
+You might have noticed that we duplicate the same template code
+between both views when it comes to displaying the details
+on students and mentors. We'll fix this for students,
+by introducing a new template for them.
+
+**themes/simple/templates/Includes/StudentInfo.ss**
 
 	:::ss
-	<p>First Name: <strong>$FirstName</strong></p>
+	$Name ($University)
-	<p>Lastname: <strong>$Lastname</strong></p>
-	<p>Nationality: <strong>$Nationality</strong></p>
 
-
+To use this template, we need to add a new method to our student class:
-Now the template is created, we need to establish the link between the *Student* and *Mentor* classes with their common
-template.
-
-To do so, add this code in the two classes.  This will create a control on each of those objects which can be called 
-from templates either within a control block or dot notation.
-
-*tutorial/code/Student.php, tutorial/code/Mentor.php*
-
-	:::php
-	public function PersonalInfo() {
-		$template = 'GSOCPerson';
-		return $this->renderWith( $template );
-	}
-
-
-We can now modify the *Project.ss* template.
-
-	:::ss
-	
-	...
-	
-	<% if MyStudent %>
-		$MyStudent.PersonalInfo
-	
-		<h3>Mentor</h3>
-		
-		<% loop MyStudent %>
-			<% if MyMentor %>
-				$MyMentor.PersonalInfo
-			<% else %>
-				<p>This student doesn't have any mentor.</p>
-			<% end_if %>
-		<% end_loop %>
-	<% else %>
-		<p>There is no any student working on this project.</p>
-	<% end_if %>
-	
-	...
-
-<div class="notice" markdown='1'>
-	Remember to add `?flush=1` to the url when refreshing the project page or otherwise you will get a template error
-</div>
-
-In the *Project* template, it has been really easy to display the **1-to-1** relation with a *Student* object just by
-calling the variable **$MyStudent**. This has been made possible thanks to the code below present in the *Project*
-class.
-
-	:::php
-	static $has_one = array(
-	    'MyStudent' => 'Student'
-	);
-
-
-However, in the *Student* class, there is no any code relating to the **1-to-1** relation with a *Project* *Page*. So
-how to access it from a *Student* *DataObject* ?
-
-**3. Mentor**
-
-In this template, we are gonna try to access the *Project* details from a *Student* *DataObject*.
-
-What we want to do is to access to the *Project* page in the same way than we have done for the other relations
-**without modifying the relations between *Page* and *DataObject* and the database structure**.
-
-![tutorial:gsoc-mentor.png](_images/gsoc-mentor.jpg)
-
-To do so, we have to create a function in the *Student* class which will return the *Project* linked with it. Let's call
-it *MyProject* for instance.
 
 	:::php
 	class Student extends DataObject {
-	
+		function getInfo() {
-		...
+			return $this->renderWith('StudentInfo');
-	
-		public function MyProject() {
-			return Project::get()->filter("MyStudentID", $this->ID);
 		}
-	
 	}
 
-
+Replace the student template code in both `Project.ss`
-We can now use this value in the same way that we have used the other relations.
+and `ProjectHolder.ss` templates with the new placeholder, `$Info`.
-That's how we can use this function in the *Mentor* template.
+That's the code enclosed in `<% loop Students %>` and `<% end_loop %>`.
-
+With this pattern, you can increase code reuse across templates.
-*tutorial/templates/Layout/Mentor.ss*
-
-	:::ss
-	<% include Menu2 %>
-
-	<div id="Content" class="typography">
-		<% include BreadCrumbs %>
-		$Content
-
-	    <h3>Personal Details</h3>
-
-	    <p>First Name: <strong>$FirstName</strong></p>
-	    <p>Lastname: <strong>$Lastname</strong></p>
-	    <p>Nationality: <strong>$Nationality</strong></p>
-
-	    <h3>Students</h3>
-
-	    <% if Students %>
-	        <table>
-	            <thead>
-	                <tr>
-	                    <th>Student</th>
-	                    <th>Project</th>
-	                </tr>
-	            </thead>
-	            <tbody>
-	                <% loop Students %>
-	                    <tr>
-	                        <td>$FirstName $Lastname</td>
-	                        <td>
-	                            <% if MyProject %>
-	                                <% loop MyProject %>
-	                                    $Title
-	                                <% end_loop %>
-	                            <% else %>
-	                                No Project
-	                            <% end_if %>
-	                        </td>
-	                    </tr>
-	                <% end_loop %>
-	            </tbody>
-	        </table>
-	    <% else %>
-	        <p>There is no any student working with this mentor.</p>
-	    <% end_if %>
-
-	    $Form
-	</div>
-
 
 ## Summary
 
-This tutorial has demonstrated how easy it is to manage all the type of relations between *DataObject* objects in the
+This tutorial has demonstrated how you can manage data with
-CMS and how to display them on the website.
+different types of relations between in the CMS, 
+and how you can display this data on your website.
+We illustrated how the powerful `Page` class can be useful to structure
+your own content, and how we can correlate it to more
+lightweight `DataObject` classes. The transition between
+the two classes is intentionally fluent in the CMS, you can
+manage them depending on your needs.
+`DataObject` gives you a no-frills solution to data storage,
+but `Page` allows for built-in WYSIWIG editing, versioning,
+publication and hierarchical organization.
 
+## Exercises
 
-## Download the code
+This is a simplified example, so there's naturally room for improvement.
+In order to challenge your knowledge gained in the tutorials so far,
+we suggest some excercises to make the solution more flexible:
 
-Download all the [code](http://doc.silverstripe.org/framework/docs/en/tutorials/_images/tutorial5-completecode.zip) for this tutorial.
+ * Refactor the `Student` and `Mentor` classes to inherit from a common parent class `Person`,
-
+   and avoid any duplication between the two subclasses.
-You can also download the [code](http://doc.silverstripe.org/framework/docs/en/tutorials/_images/tutorial5-completecode-blackcandy.zip) for use in the blackcandy template.
+ * Render mentor details in their own template
+ * Change the `GridField` to list only five records per page (the default is 20).
+   This configuration is stored in the `[api:GridFieldPaginator]` component

forms/gridfield/GridFieldDetailForm.php

@@ -316,7 +316,9 @@ class GridFieldDetailForm_ItemRequest extends RequestHandler {
 			$actions,
 			$this->component->getValidator()
 		);
-		$form->loadDataFrom($this->record);
+		if($this->record->ID !== 0) {
+		  $form->loadDataFrom($this->record);
+		}
 
 		// TODO Coupling with CMS
 		$toplevelController = $this->getToplevelController();

i18n/i18nTextCollector.php

@@ -326,7 +326,7 @@ class i18nTextCollector extends Object {
 	/**
 	 * @uses i18nEntityProvider
 	 */
-	function collectFromEntityProviders($filePath) {
+	function collectFromEntityProviders($filePath, $module) {
 		$entities = array();
 		
 		$classes = ClassInfo::classes_for_file($filePath);
@@ -334,7 +334,7 @@ class i18nTextCollector extends Object {
 			// Not all classes can be instanciated without mandatory arguments,
 			// so entity collection doesn't work for all SilverStripe classes currently
 			// Requires PHP 5.1+
-			if(class_exists($class, false) && in_array('i18nEntityProvider', class_implements($class))) {
+			if(class_exists($class) && in_array('i18nEntityProvider', class_implements($class))) {
 				$reflectionClass = new ReflectionClass($class);
 				if($reflectionClass->isAbstract()) continue;
 

javascript/TreeDropdownField.js

@@ -192,10 +192,12 @@
 						// TODO Hack to avoid ajax load on init, see http://code.google.com/p/jstree/issues/detail?id=911
 						'data': this.getPanel().find('.tree-holder').html(),
 						'ajax': {
-							'url': this.data('urlTree'),
+							'url': function(node) {
+								return self.data('urlTree') + '/' + ($(node).data("id") ? $(node).data("id") : 0);
+							},
 							'data': function(node) {
-								var id = $(node).data("id") ? $(node).data("id") : 0, params = self.getRequestParams();
+								var params = self.getRequestParams();
-								params = $.extend({}, params, {ID: id, ajax: 1});
+								params = $.extend({}, params, {ajax: 1});
 								return params;
 							}
 						}

javascript/i18n.js

@@ -22,9 +22,14 @@ ss.i18n = {
 	defaultLocale: 'en_US',
 	
 	lang: {},
+
+	inited: false,
 	
 	init: function() {
+		if(this.inited) return;
+
 		this.currentLocale = this.detectLocale();
+		this.inited = true;
 	},
 	
 	/**
@@ -59,6 +64,8 @@ ss.i18n = {
 	 *
 	 */
 		_t: function (entity, fallbackString, priority, context) {
+			this.init();
+
 			if (this.lang && this.lang[this.getLocale()] && this.lang[this.getLocale()][entity]) {
 				return this.lang[this.getLocale()][entity];
 			} else if (this.lang && this.lang[this.defaultLocale] && this.lang[this.defaultLocale][entity]) {
@@ -165,15 +172,20 @@ ss.i18n = {
 		detectLocale: function() {
 			var rawLocale;
 			var detectedLocale;
+
+			// get by container tag
+			rawLocale = jQuery('body').attr('lang');
 		
 			// get by meta
-			var metas = document.getElementsByTagName('meta');
+			if(!rawLocale) {
-			for(var i=0; i<metas.length; i++) {
+				var metas = document.getElementsByTagName('meta');
-				if(metas[i].attributes['http-equiv'] && metas[i].attributes['http-equiv'].nodeValue.toLowerCase() == 'content-language') {
+				for(var i=0; i<metas.length; i++) {
-					rawLocale = metas[i].attributes['content'].nodeValue;
+					if(metas[i].attributes['http-equiv'] && metas[i].attributes['http-equiv'].nodeValue.toLowerCase() == 'content-language') {
+						rawLocale = metas[i].attributes['content'].nodeValue;
+					}
 				}
 			}
-
+			
 			// fallback to default locale
 			if(!rawLocale) rawLocale = this.defaultLocale;
 			

javascript/lang/de_DE.js

@@ -2,6 +2,38 @@ if(typeof(ss) == 'undefined' || typeof(ss.i18n) == 'undefined') {
 	console.error('Class ss.i18n not defined');
 } else {
 	ss.i18n.addDictionary('de_DE', {
-		'VALIDATOR.FIELDREQUIRED': '"%s" wird benötigt'
+		'VALIDATOR.FIELDREQUIRED': '"%s" wird benötigt',
+		'HASMANYFILEFIELD.UPLOADING': 'Lädt hoch... %s',
+		'TABLEFIELD.DELETECONFIRMMESSAGE': 'Sind Sie sicher, dass sie dieses Element löschen wollen?',
+		'LOADING': 'Lädt...',
+		'UNIQUEFIELD.SUGGESTED': "Der Wert wurde nach '%s' geändert : %s",
+		'UNIQUEFIELD.ENTERNEWVALUE': 'Sie müssen einen neuen Wert für dieses Feld eingeben',
+		'UNIQUEFIELD.CANNOTLEAVEEMPTY': 'Dieses Feld kann nicht leer sein',
+		'RESTRICTEDTEXTFIELD.CHARCANTBEUSED': "Das Zeichen '%s' darf in diesem Feld nicht vewendet werden",
+		'UPDATEURL.CONFIRM': 'Sollen wir die URL in diesen Wert ändern:\n\n%s/\n\nKlicken Sie OK, um den URL zu ändern, Abbrechen um ihn so zu lassen:\n\n%s',
+		'UPDATEURL.CONFIRMURLCHANGED':'Die URL wurde geändert:\n"%s"',
+		'FILEIFRAMEFIELD.DELETEFILE': 'Datei löschen',
+		'FILEIFRAMEFIELD.UNATTACHFILE': 'Datei loslösen',
+		'FILEIFRAMEFIELD.DELETEIMAGE': 'Bild löschen',
+		'FILEIFRAMEFIELD.CONFIRMDELETE': 'Sind Sie sicher, dass sie diese Datei löschen wollen?',
+		'LeftAndMain.IncompatBrowserWarning': 'Ihr Browser ist nicht kompatibel mit der CMS Benutzeroverfläche. Bitte benutzen sie Internet Explorer 7+, Google Chrome 10+ oder Mozilla Firefox 3.5+.',
+		'GRIDFIELD.ERRORINTRANSACTION': 'Beim Laden der Daten vom Server ist ein Fehler aufgetretetn\n Bitte versuchen sie es später noch einmal.',
+		'UploadField.ConfirmDelete': 'Sind sie sicher, dass sie diese Datei aus dem Dateisystem löschen wollen?',
+		'UploadField.PHP_MAXFILESIZE': 'Die Dateigröße überschreitet upload_max_filesize (php.ini Einstellung)',
+		'UploadField.HTML_MAXFILESIZE': 'Die Dateigröße überschreitet MAX_FILE_SIZE (HTML Form Einstellung)',
+		'UploadField.ONLYPARTIALUPLOADED': 'Die Datei wurde nur teilweise hochgeladen',
+		'UploadField.NOFILEUPLOADED': 'Keine Datei wurde hochgeladen',
+		'UploadField.NOTMPFOLDER': 'Es wurde kein temporäres Verzeichnis gefunden',
+		'UploadField.WRITEFAILED': 'Es konnte nicht auf die Festplatte geschrieben werden',
+		'UploadField.STOPEDBYEXTENSION': 'Dateiupload wurde wegen einer nicht erlaubten Erweiterung gestoppt',
+		'UploadField.TOOLARGE': 'Die Datei ist zu groß',
+		'UploadField.TOOSMALL': 'Die Datei ist zu klein',
+		'UploadField.INVALIDEXTENSION': 'Dateierweiterung ist nicht erlaubt',
+		'UploadField.MAXNUMBEROFFILESSIMPLE': 'Maximal erlaubt Anzahl von Dateien überschritten',
+		'UploadField.UPLOADEDBYTES': 'Hochgeladene Bytes überschreiten Dateigröße',
+		'UploadField.EMPTYRESULT': 'Leere Datei erhalten',
+		'UploadField.LOADING': 'Lädt ...',
+		'UploadField.Editing': 'Bearbeite ...',
+		'UploadField.Uploaded': 'Hochgeladen'
 	});
 }

lang/af.yml

@@ -50,6 +50,8 @@ af:
     UNORDERED: 'Unordered list'
     UNORDEREDDESCRIPTION: 'Unordered list'
     UNORDEREDEXAMPLE1: 'unordered item 1'
+  BackLink_Button.ss:
+    Back: Back
   BasicAuth:
     ENTERINFO: 'Please enter a username and password.'
     ERRORNOTADMIN: 'That user is not an administrator.'
@@ -57,9 +59,10 @@ af:
   Boolean:
     0: 'False'
     ANY: Any
-    Hello: Hi
-    LOGOUT: 'Log out'
     1: 'True'
+  CMSLoadingScreen.ss:
+    LOADING: Loading...
+    REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
   CMSMain:
     ACCESS: 'Access to ''{title}'' section'
     ACCESSALLINTERFACES: 'Access to all CMS sections'
@@ -67,6 +70,12 @@ af:
     SAVE: Save
   CMSProfileController:
     MENUTITLE: CMSProfileController
+  ChangePasswordEmail.ss:
+    CHANGEPASSWORDTEXT1: 'U het die wagwoord vir'
+    CHANGEPASSWORDTEXT2: 'You can now use the following credentials to log in:'
+    EMAIL: Email
+    HELLO: Hi
+    PASSWORD: Password
   CheckboxField:
     - 'False'
     - 'True'
@@ -74,6 +83,14 @@ af:
     CLOSEPOPUP: 'Close Popup'
     SUCCESSADD2: 'Added {name}'
     SUCCESSEDIT: 'Saved %s %s %s'
+  ComplexTableField.ss:
+    ADDITEM: 'Add %s'
+    NOITEMSFOUND: 'No items found'
+    SORTASC: 'Sort ascending'
+    SORTDESC: 'Sort descending'
+  ComplexTableField_popup.ss:
+    NEXT: Next
+    PREVIOUS: Previous
   ConfirmedPasswordField:
     ATLEAST: 'Passwords must be at least {min} characters long.'
     BETWEEN: 'Passwords must be {min} to {max} characters long.'
@@ -111,10 +128,7 @@ af:
     VALIDDATEMAXDATE: 'Your date has to be older or matching the maximum allowed date ({date})'
     VALIDDATEMINDATE: 'Your date has to be newer or matching the minimum allowed date ({date})'
   Director:
-    ADD: 'Voeg by'
-    CSVEXPORT: 'Export to CSV'
     INVALID_REQUEST: 'Invalid request'
-    NOTFOUND: 'No items found'
   DropdownField:
     CHOOSE: (Kies)
   EmailField:
@@ -124,8 +138,6 @@ af:
     SINGULARNAME: 'Email Bounce Record'
   Enum:
     ANY: Any
-    LOADING: Loading...
-    REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
   File:
     Content: Content
     Filename: Filename
@@ -150,13 +162,17 @@ af:
     FROMFILESTORE: 'From the File Store'
     NOSOURCE: 'Kies asseblief ''n bron lêer om by te voeg'
     REPLACE: 'Replace {type}'
+  FileIFrameField_iframe.ss:
+    TITLE: 'Image Uploading Iframe'
   Filesystem:
-    IMPORT_TAB_HEADER: Import
-    SEARCHLISTINGS: Search
     SYNCRESULTS: 'Sync complete: {createdcount} items created, {deletedcount} items deleted'
+  ForgotPasswordEmail.ss:
+    HELLO: Hi
+    TEXT1: 'Hier is u'
+    TEXT2: 'wagwoord herstel skakel'
+    TEXT3: vir
   Form:
     FIELDISREQUIRED: '%s word benodig.'
-    TITLE: 'Image Uploading Iframe'
     VALIDATIONCREDITNUMBER: 'Please ensure you have entered the {number} credit card number correctly'
     VALIDATIONNOTUNIQUE: 'The waarde wat ingesleutel is is nie uniek nie'
     VALIDATIONPASSWORDSDONTMATCH: 'Wagwoorde pas nie'
@@ -187,37 +203,26 @@ af:
     ResetFilter: Reset
   GridFieldAction_Delete:
     DeletePermissionsFailure: 'No delete permissions'
-    NEXT: Next
-    PREVIOUS: Previous
   GridFieldDetailForm:
     Create: Create
     Delete: Delete
     DeletePermissionsFailure: 'No delete permissions'
     Deleted: 'Deleted %s %s'
-    HELLO: Hi
     Save: Save
     Saved: 'Saved %s %s'
-    TEXT1: 'Hier is u'
+  GridFieldItemEditView.ss: null
-    TEXT2: 'wagwoord herstel skakel'
-    TEXT3: vir
   Group:
     AddRole: 'Add a role for this group'
-    CHANGEPASSWORDTEXT1: 'U het die wagwoord vir'
-    CHANGEPASSWORDTEXT2: 'You can now use the following credentials to log in:'
     Code: 'Groep Kode'
     DefaultGroupTitleAdministrators: Administrateurs
     DefaultGroupTitleContentAuthors: 'Inhouds Outeurs'
     Description: Description
-    EMAIL: Email
     GroupReminder: 'If you choose a parent group, this group will take all it''s roles'
-    HELLO: Hi
     Locked: 'Gesluit?'
     NoRoles: 'No roles found'
-    PASSWORD: Password
     Parent: 'Ouer Groep'
     RolesAddEditLink: 'Manage roles'
     Sort: 'Sort Order'
-    TITLE: 'Image Uploading Iframe'
     has_many_Permissions: Toestemmings
     many_many_Members: Lidde
   GroupImportForm:
@@ -275,10 +280,9 @@ af:
     UpdateMEDIA: 'Update Media'
   ImageField:
     IMAGE: Image
-  Image_iframe.ss: 'ChangePasswordEmail.ss:  BackLink_Button.ss:  CMSLoadingScreen.ss:  RelationComplexTableField.ss:  ForgotPasswordEmail.ss:    APPLY FILTER: "Apply Filter"  GridFieldItemEditView.ss:    Go back: "Go back"  ModelSidebar.ss:  TableListField_PageControls.ss:  ModelAdmin_Tools.ss:  ComplexTableField_popup.ss:  TableField.ss:  FileIFrameField_iframe.ss:  ComplexTableField.ss:  TableListField.ss:  ModelAdmin_ImportSpec.ss:  LeftAndMain_Menu.ss:'
+  Image_iframe.ss:
+    TITLE: 'Image Uploading Iframe'
   LeftAndMain:
-    ADD: 'Voeg nuwe ry by'
-    ADDITEM: 'Add %s'
     CANT_REORGANISE: 'You do not have permission to alter Top level pages. Your change was not saved.'
     DELETED: Deleted.
     DropdownBatchActionsDefault: Actions
@@ -292,6 +296,9 @@ af:
     REORGANISATIONSUCCESSFUL: 'Reorganised the site tree successfully.'
     SAVEDUP: Saved.
     VersionUnknown: Unknown
+  LeftAndMain_Menu.ss:
+    Hello: Hi
+    LOGOUT: 'Log out'
   LoginAttempt:
     Email: 'Email Address'
     IP: 'IP Address'
@@ -368,6 +375,7 @@ af:
     ResultUpdated: 'Updated {count} members'
   MemberTableField: null
   ModelAdmin:
+    'APPLY FILTER': 'Apply Filter'
     DELETE: Delete
     DELETEDRECORDS: 'Deleted {count} records.'
     IMPORT: 'Import from CSV'
@@ -377,6 +385,17 @@ af:
     RESET: Reset
     Title: 'Data Models'
     UPDATEDRECORDS: 'Updated {count} records.'
+  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
   MoneyField:
     FIELDLABELAMOUNT: Amount
     FIELDLABELCURRENCY: Currency
@@ -389,10 +408,6 @@ af:
     CMS_ACCESS_CATEGORY: 'IBS Toegang'
     FULLADMINRIGHTS: 'Full administrative rights'
     FULLADMINRIGHTS_HELP: 'Impliseer en oorskryf alle ander toegekende permissies.'
-    IMPORTSPECFIELDS: 'Database columns'
-    IMPORTSPECLINK: 'Show Specification for %s'
-    IMPORTSPECRELATIONS: Relations
-    IMPORTSPECTITLE: 'Specification for %s'
   PermissionCheckboxSetField:
     AssignedTo: 'assigned to "{title}"'
     FromGroup: 'inherited from group "{title}"'
@@ -401,8 +416,11 @@ af:
   Permissions:
     PERMISSIONS_CATEGORY: 'Rolle en toegang permissies'
   PhoneNumberField:
-    Back: Back
     VALIDATION: 'Please enter a valid phone number'
+  RelationComplexTableField.ss:
+    ADD: 'Voeg by'
+    CSVEXPORT: 'Export to CSV'
+    NOTFOUND: 'No items found'
   Security:
     ALREADYLOGGEDIN: 'U het nie toegang tot hierdie bladsy nie. As u n'' ander rekening het wat toegang tot hierdie bladsy het, kan u weer <a href="%s">inteken</a>.'
     BUTTONSEND: 'Send me the password reset link'
@@ -439,31 +457,33 @@ af:
     BtnImport: 'Voer In'
     FileFieldLabel: 'CSV Lêer <small>(Laat toe uitbreidings: *.csv)</small>'
   SilverStripeNavigator:
-    DISPLAYING: Displaying
     Edit: Edit
-    FILTER: Filter
+  SimpleImageField:
-    IMPORT: Import
+    NOUPLOAD: 'No Image Uploaded'
+  SiteTree:
+    TABMAIN: Hoof
+  TableField:
+    ISREQUIRED: 'In %s ''%s'' is required'
+  TableField.ss:
+    ADD: 'Voeg nuwe ry by'
+    ADDITEM: 'Add %s'
+  TableListField:
+    CSVEXPORT: 'Export to CSV'
+    PRINT: Druk
+    Print: Print
+    SELECT: 'Select:'
+  TableListField.ss:
+    NOITEMSFOUND: 'No items found'
+    SORTASC: 'Sorteer in stygende orde'
+    SORTDESC: 'Sorteer in dalende orde'
+  TableListField_PageControls.ss:
+    DISPLAYING: Displaying
     OF: of
     TO: to
     VIEWFIRST: 'View first'
     VIEWLAST: 'View last'
     VIEWNEXT: 'View next'
     VIEWPREVIOUS: 'View previous'
-  SimpleImageField:
-    NOUPLOAD: 'No Image Uploaded'
-  SiteTree:
-    TABMAIN: Hoof
-  TableField:
-    ADDITEM: 'Add %s'
-    ISREQUIRED: 'In %s ''%s'' is required'
-    NOITEMSFOUND: 'No items found'
-    SORTASC: 'Sorteer in stygende orde'
-    SORTDESC: 'Sorteer in dalende orde'
-  TableListField:
-    CSVEXPORT: 'Export to CSV'
-    PRINT: Druk
-    Print: Print
-    SELECT: 'Select:'
   TimeField:
     VALIDATEFORMAT: 'Please enter a valid time format ({format})'
   ToggleField:

lang/ar.yml

@@ -7,8 +7,8 @@ ar:
     FILENAME: 'اسم الملف'
     FOLDER: Folder
     LASTEDIT: 'آخر التعديلات'
-    OWNER: المالك
+    OWNER: 'المالك'
-    SIZE: الحجم
+    SIZE: 'الحجم'
     TITLE: العنوان
     TYPE: النوع
     URL: الرابط
@@ -26,7 +26,7 @@ ar:
     UPLOADINPROGRESS: 'Please wait… upload in progress'
     UPLOADOR: OR
   BBCodeParser:
-    ALIGNEMENT: المحاذاة
+    ALIGNEMENT: 'المحاذاة'
     ALIGNEMENTEXAMPLE: 'محاذاة إلى اليمين'
     BOLD: 'خط عريض'
     BOLDEXAMPLE: عريض
@@ -40,7 +40,7 @@ ar:
     IMAGE: الصورة
     IMAGEDESCRIPTION: 'عرض الصورة في الموضوع'
     ITALIC: 'خط مائل'
-    ITALICEXAMPLE: مائل
+    ITALICEXAMPLE: 'مائل'
     LINK: 'رابط الموقع'
     LINKDESCRIPTION: 'رابط إلى موقع آخر'
     STRUCK: 'خط في المنتصف'
@@ -50,6 +50,8 @@ ar:
     UNORDERED: 'قائمة غير مرتبة'
     UNORDEREDDESCRIPTION: 'قائمة غير مرتبة'
     UNORDEREDEXAMPLE1: 'العنصر 1 غير مرتب'
+  BackLink_Button.ss:
+    Back: Back
   BasicAuth:
     ENTERINFO: 'فضلاً أدخل اسم المستخدم و كلمة المرور'
     ERRORNOTADMIN: 'هذا المستخدم لا يملك صلاحيات الإدارة'
@@ -57,9 +59,10 @@ ar:
   Boolean:
     0: لا
     ANY: أي
-    Hello: Hi
+    1: 'نعم'
-    LOGOUT: 'Log out'
+  CMSLoadingScreen.ss:
-    1: نعم
+    LOADING: Loading...
+    REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
   CMSMain:
     ACCESS: 'Access to ''{title}'' section'
     ACCESSALLINTERFACES: 'الدخول إلى جميع واجهات إدارة المحتوى'
@@ -67,13 +70,27 @@ ar:
     SAVE: حفظ
   CMSProfileController:
     MENUTITLE: CMSProfileController
+  ChangePasswordEmail.ss:
+    CHANGEPASSWORDTEXT1: 'تم تغيير كلمة المرور لـ'
+    CHANGEPASSWORDTEXT2: 'يمكنك الآن استخدام هذه البيانات للدخول إلى حسابك'
+    EMAIL: 'البريد الإلكتروني'
+    HELLO: أهلاً
+    PASSWORD: 'الرقم السري'
   CheckboxField:
     - لا
-    - نعم
+    - 'نعم'
   ComplexTableField:
     CLOSEPOPUP: 'إغلاق النافذة'
     SUCCESSADD2: 'Added {name}'
     SUCCESSEDIT: 'حفظ %s %s %s'
+  ComplexTableField.ss:
+    ADDITEM: 'Add %s'
+    NOITEMSFOUND: 'No items found'
+    SORTASC: 'ترتيب تصاعدي'
+    SORTDESC: 'ترتيب تنازلي'
+  ComplexTableField_popup.ss:
+    NEXT: التالي
+    PREVIOUS: السابق
   ConfirmedPasswordField:
     ATLEAST: 'Passwords must be at least {min} characters long.'
     BETWEEN: 'Passwords must be {min} to {max} characters long.'
@@ -90,8 +107,8 @@ ar:
     PLURALNAME: 'بيانات كائن'
     SINGULARNAME: 'بيانات كائن'
   Date:
-    DAY: اليوم
+    DAY: 'اليوم'
-    DAYS: الأيام
+    DAYS: 'الأيام'
     HOUR: ساعة
     HOURS: ساعات
     MIN: دقيقة
@@ -106,15 +123,12 @@ ar:
     YEARS: السنوات
   DateField:
     NOTSET: 'غير محدد'
-    TODAY: اليوم
+    TODAY: 'اليوم'
     VALIDDATEFORMAT2: 'Please enter a valid date format ({format})'
     VALIDDATEMAXDATE: 'Your date has to be older or matching the maximum allowed date ({date})'
     VALIDDATEMINDATE: 'Your date has to be newer or matching the minimum allowed date ({date})'
   Director:
-    ADD: إضافة
-    CSVEXPORT: 'Export to CSV'
     INVALID_REQUEST: 'Invalid request'
-    NOTFOUND: 'No items found'
   DropdownField:
     CHOOSE: (اختر)
   EmailField:
@@ -124,18 +138,16 @@ ar:
     SINGULARNAME: 'سجل البريد الإلكتروني Bounce'
   Enum:
     ANY: أي
-    LOADING: Loading...
-    REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
   File:
-    Content: المحتوى
+    Content: 'المحتوى'
     Filename: 'اسم الملف'
     INVALIDEXTENSION: 'Extension is not allowed (valid: {extensions})'
     INVALIDEXTENSIONSHORT: 'Extension is not allowed'
     NOFILESIZE: 'حجم الملف 0 بايت'
     NOVALIDUPLOAD: 'نوع الملف غير قابل للرفع'
-    Name: الاسم
+    Name: 'الاسم'
-    PLURALNAME: الملفات
+    PLURALNAME: 'الملفات'
-    SINGULARNAME: الملف
+    SINGULARNAME: 'الملف'
     TOOLARGE: 'Filesize is too large, maximum {size} allowed'
     TOOLARGESHORT: 'Filesize exceeds {size}'
     Title: العنوان
@@ -145,24 +157,28 @@ ar:
     ATTACHONCESAVED2: 'Files can be attached once you have saved the record for the first time.'
     DELETE: 'Delete {type}'
     DISALLOWEDFILETYPE: 'This filetype is not allowed to be uploaded'
-    FILE: ملف
+    FILE: 'ملف'
     FROMCOMPUTER: 'من جهازك الشخصي'
     FROMFILESTORE: 'من مكتبة الملفات'
     NOSOURCE: 'الرجاء اختيارمصدر ملف المرفق'
     REPLACE: 'Replace {type}'
+  FileIFrameField_iframe.ss:
+    TITLE: 'Image Uploading Iframe'
   Filesystem:
-    IMPORT_TAB_HEADER: Import
-    SEARCHLISTINGS: Search
     SYNCRESULTS: 'Sync complete: {createdcount} items created, {deletedcount} items deleted'
+  ForgotPasswordEmail.ss:
+    HELLO: أهلاً
+    TEXT1: هنا
+    TEXT2: 'رابط إعادة تعيين كلمة المرور'
+    TEXT3: لـ
   Form:
     FIELDISREQUIRED: '%s مطلوب'
-    TITLE: 'Image Uploading Iframe'
     VALIDATIONCREDITNUMBER: 'Please ensure you have entered the {number} credit card number correctly'
     VALIDATIONNOTUNIQUE: 'القيمة المدخلة غير فريدة و قابلة للتكرار '
     VALIDATIONPASSWORDSDONTMATCH: 'رقم المرور غير صحيح'
     VALIDATIONPASSWORDSNOTEMPTY: 'أرقام المرور لا يمكن أن تكون فارغة'
     VALIDATIONSTRONGPASSWORD: 'Passwords must have at least one digit and one alphanumeric character'
-    VALIDATOR: المحقق
+    VALIDATOR: 'المحقق'
     VALIDCURRENCY: 'Please enter a valid currency'
   FormField:
     NONE: لايوجد
@@ -187,37 +203,26 @@ ar:
     ResetFilter: Reset
   GridFieldAction_Delete:
     DeletePermissionsFailure: 'No delete permissions'
-    NEXT: التالي
-    PREVIOUS: السابق
   GridFieldDetailForm:
     Create: Create
     Delete: Delete
     DeletePermissionsFailure: 'No delete permissions'
     Deleted: 'Deleted %s %s'
-    HELLO: أهلاً
     Save: Save
     Saved: 'Saved %s %s'
-    TEXT1: هنا
+  GridFieldItemEditView.ss: null
-    TEXT2: 'رابط إعادة تعيين كلمة المرور'
-    TEXT3: لـ
   Group:
     AddRole: 'Add a role for this group'
-    CHANGEPASSWORDTEXT1: 'تم تغيير كلمة المرور لـ'
-    CHANGEPASSWORDTEXT2: 'يمكنك الآن استخدام هذه البيانات للدخول إلى حسابك'
     Code: 'شفرة المجموعة'
     DefaultGroupTitleAdministrators: الإدارة
     DefaultGroupTitleContentAuthors: 'مؤلفي المحتوى'
     Description: الوصف
-    EMAIL: 'البريد الإلكتروني'
     GroupReminder: 'If you choose a parent group, this group will take all it''s roles'
-    HELLO: أهلاً
     Locked: 'مغلق ؟'
     NoRoles: 'No roles found'
-    PASSWORD: 'الرقم السري'
     Parent: 'المجموعة الرئيسة'
     RolesAddEditLink: 'قوانين التعديل/الإضافة'
     Sort: ترتيب
-    TITLE: 'إطار تحميل الصور'
     has_many_Permissions: الصلاحيات
     many_many_Members: الأعضاء
   GroupImportForm:
@@ -244,8 +249,8 @@ ar:
     CSSCLASSRIGHT: 'إلى اليمين ، مع التفاف النص'
     DETAILS: Details
     EMAIL: 'بريد إلكتروني'
-    FILE: ملف
+    FILE: 'ملف'
-    FOLDER: المجلد
+    FOLDER: 'المجلد'
     FROMCMS: 'From the CMS'
     FROMCOMPUTER: 'From your computer'
     FROMWEB: 'From the web'
@@ -275,14 +280,13 @@ ar:
     UpdateMEDIA: 'Update Media'
   ImageField:
     IMAGE: الصورة
-  Image_iframe.ss: 'ChangePasswordEmail.ss:  BackLink_Button.ss:  CMSLoadingScreen.ss:  RelationComplexTableField.ss:  ForgotPasswordEmail.ss:    APPLY FILTER: "Apply Filter"  GridFieldItemEditView.ss:    Go back: "Go back"  ModelSidebar.ss:  TableListField_PageControls.ss:  ModelAdmin_Tools.ss:  ComplexTableField_popup.ss:  TableField.ss:  FileIFrameField_iframe.ss:  ComplexTableField.ss:  TableListField.ss:  ModelAdmin_ImportSpec.ss:  LeftAndMain_Menu.ss:'
+  Image_iframe.ss:
+    TITLE: 'إطار تحميل الصور'
   LeftAndMain:
-    ADD: 'إضافة صف جديد'
-    ADDITEM: 'Add %s'
     CANT_REORGANISE: 'You do not have permission to alter Top level pages. Your change was not saved.'
     DELETED: Deleted.
     DropdownBatchActionsDefault: Actions
-    HELP: مساعدة
+    HELP: 'مساعدة'
     PAGETYPE: 'نوع الصفحة:'
     PERMAGAIN: 'تم خروجك من النظام بنجاح. للدخول مرة أخرى أدحل البريد الإلكتروني و الرقم السري بالأسفل'
     PERMALREADY: 'عذراً , لكن لا يمكنك الوصول لهذا القسم من النظام. يتوجب عليك الدخول بصلاحية أخرى'
@@ -292,6 +296,9 @@ ar:
     REORGANISATIONSUCCESSFUL: 'Reorganised the site tree successfully.'
     SAVEDUP: Saved.
     VersionUnknown: unknown
+  LeftAndMain_Menu.ss:
+    Hello: Hi
+    LOGOUT: 'Log out'
   LoginAttempt:
     Email: 'عنوان البريد الإلكتروني'
     IP: 'عنوان IP'
@@ -330,7 +337,7 @@ ar:
     ValidationIdentifierFailed: 'Can''t overwrite existing member #{id} with identical identifier ({name} = {value}))'
     WELCOMEBACK: 'Welcome Back, {firstname}'
     YOUROLDPASSWORD: 'رقم المرور السابق'
-    belongs_many_many_Groups: المجموعات
+    belongs_many_many_Groups: 'المجموعات'
     db_LastVisited: 'تاريخ آخر زيارة'
     db_Locale: 'واجهة الموقع'
     db_LockedOutUntil: 'مغلق حتى تاريخ'
@@ -368,6 +375,7 @@ ar:
     ResultUpdated: 'Updated {count} members'
   MemberTableField: null
   ModelAdmin:
+    'APPLY FILTER': 'Apply Filter'
     DELETE: حذف
     DELETEDRECORDS: 'Deleted {count} records.'
     IMPORT: 'استيراد من CSV'
@@ -377,9 +385,20 @@ ar:
     RESET: Reset
     Title: 'Data Models'
     UPDATEDRECORDS: 'Updated {count} records.'
+  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
   MoneyField:
-    FIELDLABELAMOUNT: الكمية
+    FIELDLABELAMOUNT: 'الكمية'
-    FIELDLABELCURRENCY: العملة
+    FIELDLABELCURRENCY: 'العملة'
   NullableField:
     IsNullLabel: باطل
   NumericField:
@@ -389,10 +408,6 @@ ar:
     CMS_ACCESS_CATEGORY: 'الوصل لنظام إدارة المحتوى'
     FULLADMINRIGHTS: 'جميع صلاحيات الإدارة'
     FULLADMINRIGHTS_HELP: 'يتضمن وينقض جميع الأذونات الأخرىالمساندة.'
-    IMPORTSPECFIELDS: 'Database columns'
-    IMPORTSPECLINK: 'Show Specification for %s'
-    IMPORTSPECRELATIONS: Relations
-    IMPORTSPECTITLE: 'Specification for %s'
   PermissionCheckboxSetField:
     AssignedTo: 'assigned to "{title}"'
     FromGroup: 'inherited from group "{title}"'
@@ -401,8 +416,11 @@ ar:
   Permissions:
     PERMISSIONS_CATEGORY: 'تصاريح القاعدة والوصول'
   PhoneNumberField:
-    Back: Back
     VALIDATION: 'فضلاً أدخل رقم هاتف صحيح'
+  RelationComplexTableField.ss:
+    ADD: إضافة
+    CSVEXPORT: 'Export to CSV'
+    NOTFOUND: 'No items found'
   Security:
     ALREADYLOGGEDIN: 'لاتملك صلاحية الدخول لهذه الصفحة ، إذا كنت تملك حساب آخر فيمكنك تسجيل الدخول'
     BUTTONSEND: 'أرسل لي رابط إعادة تهيئة كلمة المرور'
@@ -439,31 +457,33 @@ ar:
     BtnImport: استيراد
     FileFieldLabel: ' CSV ملف <small>(الامتداد المسموح :*.csv )</small>'
   SilverStripeNavigator:
-    DISPLAYING: Displaying
     Edit: Edit
-    FILTER: Filter
+  SimpleImageField:
-    IMPORT: Import
+    NOUPLOAD: 'لا توجد صور مرفوعة'
+  SiteTree:
+    TABMAIN: الرئيسة
+  TableField:
+    ISREQUIRED: 'In %s ''%s'' is required'
+  TableField.ss:
+    ADD: 'إضافة صف جديد'
+    ADDITEM: 'Add %s'
+  TableListField:
+    CSVEXPORT: 'تصدير إلى CSV'
+    PRINT: طباعة
+    Print: Print
+    SELECT: اختيار
+  TableListField.ss:
+    NOITEMSFOUND: 'No items found'
+    SORTASC: 'فرز في ترتيب تصاعدي'
+    SORTDESC: 'فرز في ترتيب تنازلي'
+  TableListField_PageControls.ss:
+    DISPLAYING: Displaying
     OF: of
     TO: to
     VIEWFIRST: 'عرض الأول'
     VIEWLAST: 'عرض الأخير'
     VIEWNEXT: 'عرض التالي'
     VIEWPREVIOUS: 'عرض السابق'
-  SimpleImageField:
-    NOUPLOAD: 'لا توجد صور مرفوعة'
-  SiteTree:
-    TABMAIN: الرئيسة
-  TableField:
-    ADDITEM: 'Add %s'
-    ISREQUIRED: 'In %s ''%s'' is required'
-    NOITEMSFOUND: 'No items found'
-    SORTASC: 'فرز في ترتيب تصاعدي'
-    SORTDESC: 'فرز في ترتيب تنازلي'
-  TableListField:
-    CSVEXPORT: 'تصدير إلى CSV'
-    PRINT: طباعة
-    Print: Print
-    SELECT: اختيار
   TimeField:
     VALIDATEFORMAT: 'Please enter a valid time format ({format})'
   ToggleField:

lang/ast.yml

@@ -50,6 +50,8 @@ ast:
     UNORDERED: 'Unordered list'
     UNORDEREDDESCRIPTION: 'Unordered list'
     UNORDEREDEXAMPLE1: 'unordered item 1'
+  BackLink_Button.ss:
+    Back: Back
   BasicAuth:
     ENTERINFO: 'Please enter a username and password.'
     ERRORNOTADMIN: 'That user is not an administrator.'
@@ -57,9 +59,10 @@ ast:
   Boolean:
     0: 'False'
     ANY: Any
-    Hello: Hi
-    LOGOUT: 'Log out'
     1: 'True'
+  CMSLoadingScreen.ss:
+    LOADING: Loading...
+    REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
   CMSMain:
     ACCESS: 'Access to ''{title}'' section'
     ACCESSALLINTERFACES: 'Access to all CMS sections'
@@ -67,6 +70,12 @@ ast:
     SAVE: Save
   CMSProfileController:
     MENUTITLE: CMSProfileController
+  ChangePasswordEmail.ss:
+    CHANGEPASSWORDTEXT1: 'Camudasti la contraseña pa'
+    CHANGEPASSWORDTEXT2: 'You can now use the following credentials to log in:'
+    EMAIL: Email
+    HELLO: Hi
+    PASSWORD: Password
   CheckboxField:
     - 'False'
     - 'True'
@@ -74,6 +83,14 @@ ast:
     CLOSEPOPUP: 'Close Popup'
     SUCCESSADD2: 'Added {name}'
     SUCCESSEDIT: 'Saved %s %s %s'
+  ComplexTableField.ss:
+    ADDITEM: 'Add %s'
+    NOITEMSFOUND: 'No items found'
+    SORTASC: 'Sort ascending'
+    SORTDESC: 'Sort descending'
+  ComplexTableField_popup.ss:
+    NEXT: Next
+    PREVIOUS: Previous
   ConfirmedPasswordField:
     ATLEAST: 'Passwords must be at least {min} characters long.'
     BETWEEN: 'Passwords must be {min} to {max} characters long.'
@@ -111,10 +128,7 @@ ast:
     VALIDDATEMAXDATE: 'Your date has to be older or matching the maximum allowed date ({date})'
     VALIDDATEMINDATE: 'Your date has to be newer or matching the minimum allowed date ({date})'
   Director:
-    ADD: Add
-    CSVEXPORT: 'Export to CSV'
     INVALID_REQUEST: 'Invalid request'
-    NOTFOUND: 'No items found'
   DropdownField:
     CHOOSE: (Escoyer)
   EmailField:
@@ -124,8 +138,6 @@ ast:
     SINGULARNAME: 'Rexistru de rebote de corréu'
   Enum:
     ANY: Any
-    LOADING: Loading...
-    REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
   File:
     Content: Content
     Filename: Filename
@@ -150,13 +162,17 @@ ast:
     FROMFILESTORE: 'From the File Store'
     NOSOURCE: 'Please select a source file to attach'
     REPLACE: 'Replace {type}'
+  FileIFrameField_iframe.ss:
+    TITLE: 'Image Uploading Iframe'
   Filesystem:
-    IMPORT_TAB_HEADER: Import
-    SEARCHLISTINGS: Search
     SYNCRESULTS: 'Sync complete: {createdcount} items created, {deletedcount} items deleted'
+  ForgotPasswordEmail.ss:
+    HELLO: Hi
+    TEXT1: 'Here is your'
+    TEXT2: 'password reset link'
+    TEXT3: for
   Form:
     FIELDISREQUIRED: '%s is required'
-    TITLE: 'Image Uploading Iframe'
     VALIDATIONCREDITNUMBER: 'Please ensure you have entered the {number} credit card number correctly'
     VALIDATIONNOTUNIQUE: 'The value entered is not unique'
     VALIDATIONPASSWORDSDONTMATCH: 'Passwords don''t match'
@@ -187,37 +203,26 @@ ast:
     ResetFilter: Reset
   GridFieldAction_Delete:
     DeletePermissionsFailure: 'No delete permissions'
-    NEXT: Next
-    PREVIOUS: Previous
   GridFieldDetailForm:
     Create: Create
     Delete: Delete
     DeletePermissionsFailure: 'No delete permissions'
     Deleted: 'Deleted %s %s'
-    HELLO: Hi
     Save: Save
     Saved: 'Saved %s %s'
-    TEXT1: 'Here is your'
+  GridFieldItemEditView.ss: null
-    TEXT2: 'password reset link'
-    TEXT3: for
   Group:
     AddRole: 'Add a role for this group'
-    CHANGEPASSWORDTEXT1: 'Camudasti la contraseña pa'
-    CHANGEPASSWORDTEXT2: 'You can now use the following credentials to log in:'
     Code: 'Códigu de grupu'
     DefaultGroupTitleAdministrators: Alministradores
     DefaultGroupTitleContentAuthors: 'Content Authors'
     Description: Descripción
-    EMAIL: Email
     GroupReminder: 'If you choose a parent group, this group will take all it''s roles'
-    HELLO: Hi
     Locked: '¿Bloquiáu?'
     NoRoles: 'No roles found'
-    PASSWORD: Password
     Parent: 'Grupu padre'
     RolesAddEditLink: 'Manage roles'
     Sort: 'Orde de clasificación'
-    TITLE: 'Image Uploading Iframe'
     has_many_Permissions: Permisos
     many_many_Members: Miembros
   GroupImportForm:
@@ -275,10 +280,9 @@ ast:
     UpdateMEDIA: 'Update Media'
   ImageField:
     IMAGE: Image
-  Image_iframe.ss: 'ChangePasswordEmail.ss:  BackLink_Button.ss:  CMSLoadingScreen.ss:  RelationComplexTableField.ss:  ForgotPasswordEmail.ss:    APPLY FILTER: "Apply Filter"  GridFieldItemEditView.ss:    Go back: "Go back"  ModelSidebar.ss:  TableListField_PageControls.ss:  ModelAdmin_Tools.ss:  ComplexTableField_popup.ss:  TableField.ss:  FileIFrameField_iframe.ss:  ComplexTableField.ss:  TableListField.ss:  ModelAdmin_ImportSpec.ss:  LeftAndMain_Menu.ss:'
+  Image_iframe.ss:
+    TITLE: 'Image Uploading Iframe'
   LeftAndMain:
-    ADD: 'Add a new row'
-    ADDITEM: 'Add %s'
     CANT_REORGANISE: 'You do not have permission to alter Top level pages. Your change was not saved.'
     DELETED: Deleted.
     DropdownBatchActionsDefault: Actions
@@ -292,6 +296,9 @@ ast:
     REORGANISATIONSUCCESSFUL: 'Reorganised the site tree successfully.'
     SAVEDUP: Saved.
     VersionUnknown: unknown
+  LeftAndMain_Menu.ss:
+    Hello: Hi
+    LOGOUT: 'Log out'
   LoginAttempt:
     Email: 'Email Address'
     IP: 'IP Address'
@@ -368,6 +375,7 @@ ast:
     ResultUpdated: 'Updated {count} members'
   MemberTableField: null
   ModelAdmin:
+    'APPLY FILTER': 'Apply Filter'
     DELETE: Delete
     DELETEDRECORDS: 'Deleted {count} records.'
     IMPORT: 'Import from CSV'
@@ -377,6 +385,17 @@ ast:
     RESET: Reset
     Title: 'Data Models'
     UPDATEDRECORDS: 'Updated {count} records.'
+  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
   MoneyField:
     FIELDLABELAMOUNT: Amount
     FIELDLABELCURRENCY: Currency
@@ -389,10 +408,6 @@ ast:
     CMS_ACCESS_CATEGORY: 'CMS Access'
     FULLADMINRIGHTS: 'Full administrative rights'
     FULLADMINRIGHTS_HELP: 'Implies and overrules all other assigned permissions.'
-    IMPORTSPECFIELDS: 'Database columns'
-    IMPORTSPECLINK: 'Show Specification for %s'
-    IMPORTSPECRELATIONS: Relations
-    IMPORTSPECTITLE: 'Specification for %s'
   PermissionCheckboxSetField:
     AssignedTo: 'assigned to "{title}"'
     FromGroup: 'inherited from group "{title}"'
@@ -401,8 +416,11 @@ ast:
   Permissions:
     PERMISSIONS_CATEGORY: 'Roles and access permissions'
   PhoneNumberField:
-    Back: Back
     VALIDATION: 'Please enter a valid phone number'
+  RelationComplexTableField.ss:
+    ADD: Add
+    CSVEXPORT: 'Export to CSV'
+    NOTFOUND: 'No items found'
   Security:
     ALREADYLOGGEDIN: 'Nun tienes accesu a esta páxina. Si tienes otra cuenta que pueda entrar nesta páxina, puedes <a href="%s">volver conectate</a>.'
     BUTTONSEND: 'Send me the password reset link'
@@ -439,31 +457,33 @@ ast:
     BtnImport: 'Import from CSV'
     FileFieldLabel: 'CSV File <small>(Allowed extensions: *.csv)</small>'
   SilverStripeNavigator:
-    DISPLAYING: Displaying
     Edit: Edit
-    FILTER: Filter
+  SimpleImageField:
-    IMPORT: Import
+    NOUPLOAD: 'No Image Uploaded'
+  SiteTree:
+    TABMAIN: Main
+  TableField:
+    ISREQUIRED: 'In %s ''%s'' is required'
+  TableField.ss:
+    ADD: 'Add a new row'
+    ADDITEM: 'Add %s'
+  TableListField:
+    CSVEXPORT: 'Export to CSV'
+    PRINT: Print
+    Print: Print
+    SELECT: 'Select:'
+  TableListField.ss:
+    NOITEMSFOUND: 'No items found'
+    SORTASC: 'Sort in ascending order'
+    SORTDESC: 'Sort in descending order'
+  TableListField_PageControls.ss:
+    DISPLAYING: Displaying
     OF: of
     TO: to
     VIEWFIRST: 'View first'
     VIEWLAST: 'View last'
     VIEWNEXT: 'View next'
     VIEWPREVIOUS: 'View previous'
-  SimpleImageField:
-    NOUPLOAD: 'No Image Uploaded'
-  SiteTree:
-    TABMAIN: Main
-  TableField:
-    ADDITEM: 'Add %s'
-    ISREQUIRED: 'In %s ''%s'' is required'
-    NOITEMSFOUND: 'No items found'
-    SORTASC: 'Sort in ascending order'
-    SORTDESC: 'Sort in descending order'
-  TableListField:
-    CSVEXPORT: 'Export to CSV'
-    PRINT: Print
-    Print: Print
-    SELECT: 'Select:'
   TimeField:
     VALIDATEFORMAT: 'Please enter a valid time format ({format})'
   ToggleField:

lang/az.yml

@@ -50,6 +50,8 @@ az:
     UNORDERED: 'Sıralanmamış siyahı'
     UNORDEREDDESCRIPTION: 'Sıralanmamış siyahı'
     UNORDEREDEXAMPLE1: 'nizamlanmamış element 1'
+  BackLink_Button.ss:
+    Back: Back
   BasicAuth:
     ENTERINFO: 'Zəhmət olmasa istifadəçi adı və ya parolu yazın.'
     ERRORNOTADMIN: 'İstifadəçi administrator deyil'
@@ -57,9 +59,10 @@ az:
   Boolean:
     0: Yox
     ANY: İstənilən
-    Hello: Hi
-    LOGOUT: 'Log out'
     1: Bəli
+  CMSLoadingScreen.ss:
+    LOADING: Loading...
+    REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
   CMSMain:
     ACCESS: 'Access to ''{title}'' section'
     ACCESSALLINTERFACES: 'Access to all CMS sections'
@@ -67,6 +70,12 @@ az:
     SAVE: 'Yadda saxla'
   CMSProfileController:
     MENUTITLE: CMSProfileController
+  ChangePasswordEmail.ss:
+    CHANGEPASSWORDTEXT1: 'Siz parolu bu url üçün dəyişdiniz'
+    CHANGEPASSWORDTEXT2: 'Siz aşağıdakilarla daxil ola bilərsiniz.'
+    EMAIL: E-poçt
+    HELLO: Salam
+    PASSWORD: Parol
   CheckboxField:
     - Yox
     - Bəli
@@ -74,6 +83,14 @@ az:
     CLOSEPOPUP: Bağla
     SUCCESSADD2: 'Added {name}'
     SUCCESSEDIT: '%s %s %s yadda saxlanıldı'
+  ComplexTableField.ss:
+    ADDITEM: 'Add %s'
+    NOITEMSFOUND: 'No items found'
+    SORTASC: 'Artma ilə sırala'
+    SORTDESC: 'Azalma ilə sırala'
+  ComplexTableField_popup.ss:
+    NEXT: Sonrakı
+    PREVIOUS: Əvvəlki
   ConfirmedPasswordField:
     ATLEAST: 'Passwords must be at least {min} characters long.'
     BETWEEN: 'Passwords must be {min} to {max} characters long.'
@@ -111,10 +128,7 @@ az:
     VALIDDATEMAXDATE: 'Your date has to be older or matching the maximum allowed date ({date})'
     VALIDDATEMINDATE: 'Your date has to be newer or matching the minimum allowed date ({date})'
   Director:
-    ADD: 'Əlavə et'
-    CSVEXPORT: 'Export to CSV'
     INVALID_REQUEST: 'Invalid request'
-    NOTFOUND: 'No items found'
   DropdownField:
     CHOOSE: (Seçin)
   EmailField:
@@ -124,8 +138,6 @@ az:
     SINGULARNAME: 'Email Bounce Record'
   Enum:
     ANY: İxtiyari
-    LOADING: Loading...
-    REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
   File:
     Content: Məzmun
     Filename: 'Faylın adı'
@@ -150,13 +162,17 @@ az:
     FROMFILESTORE: 'Fayllar siyahısından'
     NOSOURCE: 'Xahiş edirik əlavə etmək üçün source faylı seçin'
     REPLACE: 'Replace {type}'
+  FileIFrameField_iframe.ss:
+    TITLE: 'Image Uploading Iframe'
   Filesystem:
-    IMPORT_TAB_HEADER: Import
-    SEARCHLISTINGS: Search
     SYNCRESULTS: 'Sync complete: {createdcount} items created, {deletedcount} items deleted'
+  ForgotPasswordEmail.ss:
+    HELLO: Salam
+    TEXT1: 'Burada sizin'
+    TEXT2: 'parolu sıfırlma linki'
+    TEXT3: üçün
   Form:
     FIELDISREQUIRED: '%s tələb olunur.'
-    TITLE: 'Image Uploading Iframe'
     VALIDATIONCREDITNUMBER: 'Please ensure you have entered the {number} credit card number correctly'
     VALIDATIONNOTUNIQUE: 'Daxil edilən məlumat unikal deyil'
     VALIDATIONPASSWORDSDONTMATCH: 'Parollar uyğun gəlmir'
@@ -187,37 +203,26 @@ az:
     ResetFilter: Reset
   GridFieldAction_Delete:
     DeletePermissionsFailure: 'No delete permissions'
-    NEXT: Sonrakı
-    PREVIOUS: Əvvəlki
   GridFieldDetailForm:
     Create: Create
     Delete: Delete
     DeletePermissionsFailure: 'No delete permissions'
     Deleted: 'Deleted %s %s'
-    HELLO: Salam
     Save: Save
     Saved: 'Saved %s %s'
-    TEXT1: 'Burada sizin'
+  GridFieldItemEditView.ss: null
-    TEXT2: 'parolu sıfırlma linki'
-    TEXT3: üçün
   Group:
     AddRole: 'Add a role for this group'
-    CHANGEPASSWORDTEXT1: 'Siz parolu bu url üçün dəyişdiniz'
-    CHANGEPASSWORDTEXT2: 'Siz aşağıdakilarla daxil ola bilərsiniz.'
     Code: 'Qrup kodu'
     DefaultGroupTitleAdministrators: Administratorlar
     DefaultGroupTitleContentAuthors: 'Məzmun müəllifləri'
     Description: 'Qısa təsvir'
-    EMAIL: E-poçt
     GroupReminder: 'If you choose a parent group, this group will take all it''s roles'
-    HELLO: Salam
     Locked: 'Bloklanıb?'
     NoRoles: 'No roles found'
-    PASSWORD: Parol
     Parent: 'Valideyn qrupu'
     RolesAddEditLink: 'Manage roles'
     Sort: Sıralama
-    TITLE: 'Image Uploading Iframe'
     has_many_Permissions: Səlahiyyətlər
     many_many_Members: Üzvlər
   GroupImportForm:
@@ -275,10 +280,9 @@ az:
     UpdateMEDIA: 'Update Media'
   ImageField:
     IMAGE: Şəkil
-  Image_iframe.ss: 'ChangePasswordEmail.ss:  BackLink_Button.ss:  CMSLoadingScreen.ss:  RelationComplexTableField.ss:  ForgotPasswordEmail.ss:    APPLY FILTER: "Apply Filter"  GridFieldItemEditView.ss:    Go back: "Go back"  ModelSidebar.ss:  TableListField_PageControls.ss:  ModelAdmin_Tools.ss:  ComplexTableField_popup.ss:  TableField.ss:  FileIFrameField_iframe.ss:  ComplexTableField.ss:  TableListField.ss:  ModelAdmin_ImportSpec.ss:  LeftAndMain_Menu.ss:'
+  Image_iframe.ss:
+    TITLE: 'Image Uploading Iframe'
   LeftAndMain:
-    ADD: 'Yeni sətir əlavə et'
-    ADDITEM: 'Add %s'
     CANT_REORGANISE: 'You do not have permission to alter Top level pages. Your change was not saved.'
     DELETED: Deleted.
     DropdownBatchActionsDefault: Actions
@@ -292,6 +296,9 @@ az:
     REORGANISATIONSUCCESSFUL: 'Reorganised the site tree successfully.'
     SAVEDUP: Saved.
     VersionUnknown: unknown
+  LeftAndMain_Menu.ss:
+    Hello: Hi
+    LOGOUT: 'Log out'
   LoginAttempt:
     Email: E-poçt
     IP: 'İP ünvan'
@@ -368,6 +375,7 @@ az:
     ResultUpdated: 'Updated {count} members'
   MemberTableField: null
   ModelAdmin:
+    'APPLY FILTER': 'Apply Filter'
     DELETE: Delete
     DELETEDRECORDS: 'Deleted {count} records.'
     IMPORT: 'Import from CSV'
@@ -377,6 +385,17 @@ az:
     RESET: Reset
     Title: 'Data Models'
     UPDATEDRECORDS: 'Updated {count} records.'
+  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
   MoneyField:
     FIELDLABELAMOUNT: Miqdar
     FIELDLABELCURRENCY: Valyuta
@@ -389,10 +408,6 @@ az:
     CMS_ACCESS_CATEGORY: 'CMS Access'
     FULLADMINRIGHTS: 'Tam administrativ hüquqlar'
     FULLADMINRIGHTS_HELP: 'Başqa təyin edilmiş bütün icazələr rədd olunur.'
-    IMPORTSPECFIELDS: 'Database columns'
-    IMPORTSPECLINK: 'Show Specification for %s'
-    IMPORTSPECRELATIONS: Relations
-    IMPORTSPECTITLE: 'Specification for %s'
   PermissionCheckboxSetField:
     AssignedTo: 'assigned to "{title}"'
     FromGroup: 'inherited from group "{title}"'
@@ -401,8 +416,11 @@ az:
   Permissions:
     PERMISSIONS_CATEGORY: İcazələr
   PhoneNumberField:
-    Back: Back
     VALIDATION: 'Düzgün telefon nömrəsi daxil et.'
+  RelationComplexTableField.ss:
+    ADD: 'Əlavə et'
+    CSVEXPORT: 'Export to CSV'
+    NOTFOUND: 'No items found'
   Security:
     ALREADYLOGGEDIN: 'Sizin bu səhifəyə icazəniz yoxdur. Əgər bu səhifəyə icazəsi olan başqa profiliniz varsa hesabınıza <a href="%s">daxil olun'
     BUTTONSEND: 'Parolu sıfırlama linkini göndər'
@@ -439,31 +457,33 @@ az:
     BtnImport: 'Import from CSV'
     FileFieldLabel: 'CSV File <small>(Allowed extensions: *.csv)</small>'
   SilverStripeNavigator:
-    DISPLAYING: Displaying
     Edit: Edit
-    FILTER: Filter
+  SimpleImageField:
-    IMPORT: Import
+    NOUPLOAD: 'Şəkil yüklənməmişdir'
+  SiteTree:
+    TABMAIN: Əsas
+  TableField:
+    ISREQUIRED: 'In %s ''%s'' is required'
+  TableField.ss:
+    ADD: 'Yeni sətir əlavə et'
+    ADDITEM: 'Add %s'
+  TableListField:
+    CSVEXPORT: 'CSV-yə ixrac et'
+    PRINT: 'Çap et'
+    Print: Print
+    SELECT: 'Seç:'
+  TableListField.ss:
+    NOITEMSFOUND: 'No items found'
+    SORTASC: 'Artma sırası ilə sırala'
+    SORTDESC: 'Azalma sırası ilə sırala'
+  TableListField_PageControls.ss:
+    DISPLAYING: Displaying
     OF: of
     TO: to
     VIEWFIRST: 'Birinciyə bax'
     VIEWLAST: 'Axırıncı baxılmış'
     VIEWNEXT: Növbəti
     VIEWPREVIOUS: 'Əvvəlkinə bax'
-  SimpleImageField:
-    NOUPLOAD: 'Şəkil yüklənməmişdir'
-  SiteTree:
-    TABMAIN: Əsas
-  TableField:
-    ADDITEM: 'Add %s'
-    ISREQUIRED: 'In %s ''%s'' is required'
-    NOITEMSFOUND: 'No items found'
-    SORTASC: 'Artma sırası ilə sırala'
-    SORTDESC: 'Azalma sırası ilə sırala'
-  TableListField:
-    CSVEXPORT: 'CSV-yə ixrac et'
-    PRINT: 'Çap et'
-    Print: Print
-    SELECT: 'Seç:'
   TimeField:
     VALIDATEFORMAT: 'Please enter a valid time format ({format})'
   ToggleField:

lang/bg.yml

@@ -3,7 +3,7 @@ bg:
     NEWFOLDER: NewFolder
   AssetTableField:
     CREATED: Създаден
-    DIM: Размери
+    DIM: 'Размери'
     FILENAME: 'Име на файл'
     FOLDER: Папка
     LASTEDIT: 'Последна промяна'
@@ -13,7 +13,7 @@ bg:
     TYPE: 'Тип на файла'
     URL: URL
   AssetUploadField:
-    ChooseFiles: 'Choose files'
+    ChooseFiles: 'Избери файлове'
     DRAGFILESHERE: 'Завлечете файловете тук'
     DROPAREA: 'Drop Area'
     EDITALL: 'Редакция на всички'
@@ -24,7 +24,7 @@ bg:
     FROMCOMPUTERINFO: 'Upload from your computer'
     TOTAL: Общо
     UPLOADINPROGRESS: 'Моля, изчакайте... файловете се качват'
-    UPLOADOR: OR
+    UPLOADOR: ИЛИ
   BBCodeParser:
     ALIGNEMENT: Подреждане
     ALIGNEMENTEXAMPLE: 'подреди в дясно'
@@ -50,6 +50,8 @@ bg:
     UNORDERED: 'Неподреден лист'
     UNORDEREDDESCRIPTION: 'Неподреден лист'
     UNORDEREDEXAMPLE1: 'Неподреден предмет 1'
+  BackLink_Button.ss:
+    Back: Назад
   BasicAuth:
     ENTERINFO: 'Моля, въведете потребителско име и парола.'
     ERRORNOTADMIN: 'Този потребител не е администратор.'
@@ -57,9 +59,10 @@ bg:
   Boolean:
     0: 'False'
     ANY: Any
-    Hello: Здравей
-    LOGOUT: 'Log out'
     1: 'True'
+  CMSLoadingScreen.ss:
+    LOADING: 'Зареждане ...'
+    REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
   CMSMain:
     ACCESS: 'Access to ''{title}'' section'
     ACCESSALLINTERFACES: 'Достъп до всички секции на CMS'
@@ -67,6 +70,12 @@ bg:
     SAVE: Запис
   CMSProfileController:
     MENUTITLE: CMSProfileController
+  ChangePasswordEmail.ss:
+    CHANGEPASSWORDTEXT1: 'Вие сменихте вашата парола за'
+    CHANGEPASSWORDTEXT2: 'Вече можете да ползвате следните данни за вход:'
+    EMAIL: Email
+    HELLO: Здравей!
+    PASSWORD: Парола
   CheckboxField:
     - 'False'
     - 'True'
@@ -74,6 +83,14 @@ bg:
     CLOSEPOPUP: 'Close Popup'
     SUCCESSADD2: 'Беше добавен {name}'
     SUCCESSEDIT: 'Съхранено %s %s %s'
+  ComplexTableField.ss:
+    ADDITEM: 'Add %s'
+    NOITEMSFOUND: 'No items found'
+    SORTASC: 'Възходящ'
+    SORTDESC: 'Низходящ'
+  ComplexTableField_popup.ss:
+    NEXT: Следващо
+    PREVIOUS: Предишно
   ConfirmedPasswordField:
     ATLEAST: 'Passwords must be at least {min} characters long.'
     BETWEEN: 'Passwords must be {min} to {max} characters long.'
@@ -111,10 +128,7 @@ bg:
     VALIDDATEMAXDATE: 'Датата трябва да бъде същата или преди ({date})'
     VALIDDATEMINDATE: 'Датата трябва да бъде същата или след ({date})'
   Director:
-    ADD: Добави
-    CSVEXPORT: 'Export to CSV'
     INVALID_REQUEST: 'Грешна заявка'
-    NOTFOUND: 'No items found'
   DropdownField:
     CHOOSE: (Избери)
   EmailField:
@@ -124,8 +138,6 @@ bg:
     SINGULARNAME: 'Email Bounce Record'
   Enum:
     ANY: Any
-    LOADING: 'Зареждане ...'
-    REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
   File:
     Content: Съдържание
     Filename: 'Име на файл'
@@ -150,13 +162,17 @@ bg:
     FROMFILESTORE: 'От Файлове и Изображения'
     NOSOURCE: 'Please select a source file to attach'
     REPLACE: 'Replace {type}'
+  FileIFrameField_iframe.ss:
+    TITLE: 'Iframe за качване на изображение'
   Filesystem:
-    IMPORT_TAB_HEADER: Внасяне
-    SEARCHLISTINGS: Търсене
     SYNCRESULTS: 'Синхронизацията завърши: бяха създадени {createdcount} елемента, бяха изтрити {deletedcount} елемента'
+  ForgotPasswordEmail.ss:
+    HELLO: Здравей!
+    TEXT1: 'Ето вашият'
+    TEXT2: 'адрес за рестартирване на парола'
+    TEXT3: за
   Form:
     FIELDISREQUIRED: 'нужно е %s'
-    TITLE: 'Iframe за качване на изображение'
     VALIDATIONCREDITNUMBER: 'Please ensure you have entered the {number} credit card number correctly'
     VALIDATIONNOTUNIQUE: 'Въведената стойност не е уникална'
     VALIDATIONPASSWORDSDONTMATCH: 'Паролите не съвпадат'
@@ -171,7 +187,7 @@ bg:
     Delete: Delete
     UnlinkRelation: Откачане
   GridField:
-    Add: 'Добваи {name}'
+    Add: 'Добави {name}'
     Filter: Филтър
     FilterBy: 'Филтриране по'
     Find: Find
@@ -187,38 +203,27 @@ bg:
     ResetFilter: Reset
   GridFieldAction_Delete:
     DeletePermissionsFailure: 'Изтриването не е разрешено'
-    NEXT: Следващо
-    PREVIOUS: Предишно
   GridFieldDetailForm:
     Create: Създай
     Delete: Изтрий
     DeletePermissionsFailure: 'Изтриването не е разрешено'
     Deleted: 'Изтрити %s %s'
-    HELLO: Здравей!
     Save: Запис
     Saved: 'Съхранени %s %s'
-    TEXT1: 'Ето вашият'
+  GridFieldItemEditView.ss: null
-    TEXT2: 'адрес за рестартирване на парола'
-    TEXT3: за
   Group:
     AddRole: 'Добавяне на роля към групата'
-    CHANGEPASSWORDTEXT1: 'Вие сменихте вашата парола за'
-    CHANGEPASSWORDTEXT2: 'Вече можете да ползвате следните данни за вход:'
     Code: 'Group Code'
     DefaultGroupTitleAdministrators: Администратори
     DefaultGroupTitleContentAuthors: 'Редактори на съдържание'
     Description: Описание
-    EMAIL: Email
     GroupReminder: 'If you choose a parent group, this group will take all it''s roles'
-    HELLO: Здравей!
     Locked: 'Заключена?'
     NoRoles: 'Няма намерени роли'
-    PASSWORD: Парола
     Parent: 'Parent Group'
     RolesAddEditLink: 'Управление на ролите'
     Sort: Сортиране
-    TITLE: 'Iframe за качване на изображение'
+    has_many_Permissions: 'Разрешения'
-    has_many_Permissions: Разрешения
     many_many_Members: Потребители
   GroupImportForm:
     Help1: '<p>Import one or more groups in <em>CSV</em> format (comma-separated values). <small><a href="#" class="toggle-advanced">Show advanced usage</a></small></p>'
@@ -253,7 +258,7 @@ bg:
     IMAGEALT: 'Алтернативен текст (alt)'
     IMAGEALTTEXT: 'Алтернативен текст (alt) - показва се ако изображението не е заредено'
     IMAGEALTTEXTDESC: 'Shown to screen readers or if image can not be displayed'
-    IMAGEDIMENSIONS: Размери
+    IMAGEDIMENSIONS: 'Размери'
     IMAGEHEIGHTPX: Височина
     IMAGETITLE: 'Описание (tooltip) - за допълнителна информация към изображението'
     IMAGETITLETEXT: 'Описание (tooltip)'
@@ -275,10 +280,9 @@ bg:
     UpdateMEDIA: 'Актуализация на медиа'
   ImageField:
     IMAGE: Image
-  Image_iframe.ss: 'ChangePasswordEmail.ss:  BackLink_Button.ss:  CMSLoadingScreen.ss:  RelationComplexTableField.ss:  ForgotPasswordEmail.ss:    APPLY FILTER: "Приложи филтър"  GridFieldItemEditView.ss:    Go back: "Обратно"  ModelSidebar.ss:  TableListField_PageControls.ss:  ModelAdmin_Tools.ss:  ComplexTableField_popup.ss:  TableField.ss:  FileIFrameField_iframe.ss:  ComplexTableField.ss:  TableListField.ss:  ModelAdmin_ImportSpec.ss:  LeftAndMain_Menu.ss:'
+  Image_iframe.ss:
+    TITLE: 'Iframe за качване на изображение'
   LeftAndMain:
-    ADD: 'Добави нов ред'
-    ADDITEM: 'Add %s'
     CANT_REORGANISE: 'You do not have permission to alter Top level pages. Your change was not saved.'
     DELETED: Изтрит
     DropdownBatchActionsDefault: Действия
@@ -292,9 +296,12 @@ bg:
     REORGANISATIONSUCCESSFUL: 'Reorganised the site tree successfully.'
     SAVEDUP: Записано
     VersionUnknown: непозната
+  LeftAndMain_Menu.ss:
+    Hello: Здравей
+    LOGOUT: 'Log out'
   LoginAttempt:
     Email: 'Email Address'
-    IP: 'IP Address'
+    IP: 'IP адрес'
     Status: Status
   Member:
     ADDGROUP: 'Добави група'
@@ -368,6 +375,7 @@ bg:
     ResultUpdated: 'Бяха актуализирани {count} потребители'
   MemberTableField: null
   ModelAdmin:
+    'APPLY FILTER': 'Приложи филтър'
     DELETE: Изтрий
     DELETEDRECORDS: 'Deleted {count} records.'
     IMPORT: 'Import from CSV'
@@ -377,6 +385,17 @@ bg:
     RESET: Reset
     Title: 'Data Models'
     UPDATEDRECORDS: 'Updated {count} records.'
+  ModelAdmin_ImportSpec.ss:
+    IMPORTSPECFIELDS: 'Database columns'
+    IMPORTSPECLINK: 'Show Specification for %s'
+    IMPORTSPECRELATIONS: Relations
+    IMPORTSPECTITLE: 'Specification for %s'
+  ModelAdmin_Tools.ss:
+    FILTER: Филтър
+    IMPORT: Внасяне
+  ModelSidebar.ss:
+    IMPORT_TAB_HEADER: Внасяне
+    SEARCHLISTINGS: Търсене
   MoneyField:
     FIELDLABELAMOUNT: Сума
     FIELDLABELCURRENCY: Валута
@@ -389,10 +408,6 @@ bg:
     CMS_ACCESS_CATEGORY: 'Достъп до CMS'
     FULLADMINRIGHTS: 'Пълни административни права'
     FULLADMINRIGHTS_HELP: 'Implies and overrules all other assigned permissions.'
-    IMPORTSPECFIELDS: 'Database columns'
-    IMPORTSPECLINK: 'Show Specification for %s'
-    IMPORTSPECRELATIONS: Relations
-    IMPORTSPECTITLE: 'Specification for %s'
   PermissionCheckboxSetField:
     AssignedTo: 'приписана на "{title}"'
     FromGroup: 'унаследена от група "{title}"'
@@ -401,8 +416,11 @@ bg:
   Permissions:
     PERMISSIONS_CATEGORY: 'Роли и разрешения за достъп'
   PhoneNumberField:
-    Back: Назад
     VALIDATION: 'Моля, въведете валиден телефонен номер'
+  RelationComplexTableField.ss:
+    ADD: Добави
+    CSVEXPORT: 'Export to CSV'
+    NOTFOUND: 'No items found'
   Security:
     ALREADYLOGGEDIN: 'Вие нямате достъп до тази страница. Ако имате друг акаунт, с който може да влезете в тази страница, въведете го по-долу.'
     BUTTONSEND: 'Пратете ми линка за промяна на паролата'
@@ -421,7 +439,7 @@ bg:
     ACCESS_HELP: 'Позволява преглед, добавяне и редактиране на потребители, както и задаване на разрешения и роли за тях.'
     APPLY_ROLES: 'Задаване роли на групи'
     APPLY_ROLES_HELP: 'Възможност за редактиране на ролите, възложени на група. Необходим е достъп до раздел "Потребители".'
-    EDITPERMISSIONS: 'Manage permissions for groups'
+    EDITPERMISSIONS: 'Управление на разрешенията на групите'
     EDITPERMISSIONS_HELP: 'Възможност за редактиране на Разрешенията и IP адресите за група. Необходим е достъп до раздел "Сигурност".'
     GROUPNAME: 'Име на група'
     IMPORTGROUPS: 'Внасяне на файл с групи'
@@ -430,40 +448,42 @@ bg:
     MENUTITLE: Security
     MemberListCaution: 'Внимание: изтривайки потребители от този списък, ще ги премахне от всички групи и от базата данни.'
     NEWGROUP: 'Нова група'
-    PERMISSIONS: Разрешения
+    PERMISSIONS: 'Разрешения'
-    ROLES: Роли
+    ROLES: 'Роли'
     ROLESDESCRIPTION: 'Ролите са предварително зададени сетове от разрешения и могат да бъдат присвоявани на групи.<br />Ако е нужно, те се наследяват от родителските групи.'
-    TABROLES: Роли
+    TABROLES: 'Роли'
-    Users: Users
+    Users: Потребители
   SecurityAdmin_MemberImportForm:
     BtnImport: 'Внасяне от CSV'
     FileFieldLabel: 'CSV файл <small>(разширение: *.csv)</small>'
   SilverStripeNavigator:
+    Edit: 'Редакция'
+  SimpleImageField:
+    NOUPLOAD: 'Няма качени изображения'
+  SiteTree:
+    TABMAIN: Главно
+  TableField:
+    ISREQUIRED: 'In %s ''%s'' is required'
+  TableField.ss:
+    ADD: 'Добави нов ред'
+    ADDITEM: 'Add %s'
+  TableListField:
+    CSVEXPORT: 'Експортирай на CSV'
+    PRINT: Принтирай
+    Print: Print
+    SELECT: 'Избери:'
+  TableListField.ss:
+    NOITEMSFOUND: 'No items found'
+    SORTASC: 'Sort in ascending order'
+    SORTDESC: 'Sort in descending order'
+  TableListField_PageControls.ss:
     DISPLAYING: Displaying
-    Edit: Редакция
-    FILTER: Филтър
-    IMPORT: Внасяне
     OF: of
     TO: to
     VIEWFIRST: 'Преглед на първото'
     VIEWLAST: 'Преглед на последното'
     VIEWNEXT: 'Преглед на следващото'
     VIEWPREVIOUS: 'Преглед на предишното'
-  SimpleImageField:
-    NOUPLOAD: 'Няма качени изображения'
-  SiteTree:
-    TABMAIN: Главно
-  TableField:
-    ADDITEM: 'Add %s'
-    ISREQUIRED: 'In %s ''%s'' is required'
-    NOITEMSFOUND: 'No items found'
-    SORTASC: 'Sort in ascending order'
-    SORTDESC: 'Sort in descending order'
-  TableListField:
-    CSVEXPORT: 'Експортирай на CSV'
-    PRINT: Принтирай
-    Print: Print
-    SELECT: 'Избери:'
   TimeField:
     VALIDATEFORMAT: 'Моля, въведете валиден формат за дата ({format})'
   ToggleField:
@@ -471,27 +491,27 @@ bg:
     MORE: повече
   UploadField:
     ATTACHFILE: 'Прикачване на файл'
-    ATTACHFILES: 'Attach files'
+    ATTACHFILES: 'Прикачване на файлове'
     AttachFile: 'Прикачване на файл(ове)'
     DELETE: 'Delete from files'
-    DELETEINFO: 'Permanently delete this file from the file store'
+    DELETEINFO: 'Изтрий файла от сървъра'
-    DOEDIT: Save
+    DOEDIT: Запис
     DROPFILE: 'drop a file'
     DROPFILES: 'drop files'
-    Dimensions: Размери
+    Dimensions: 'Размери'
     EDIT: Edit
-    EDITINFO: 'Edit this file'
+    EDITINFO: 'Редактирай този файл'
     FIELDNOTSET: 'File information not found'
-    FROMCOMPUTER: 'From your computer'
+    FROMCOMPUTER: 'От компютъра'
     FROMCOMPUTERINFO: 'Select from files'
     FROMFILES: 'From files'
     MAXNUMBEROFFILES: 'Максималния брой файлове ({count}) е надхвърлен.'
     MAXNUMBEROFFILESSHORT: 'Максималният брой файлове за качване е {count}'
-    REMOVE: Премахни
+    REMOVE: 'Премахни'
-    REMOVEERROR: 'Error removing file'
+    REMOVEERROR: 'Грешка при премахване на файл'
-    REMOVEINFO: 'Remove this file from here, but do not delete it from the file store'
+    REMOVEINFO: 'Премахни файла без да го изтриваш'
     STARTALL: 'Start all'
     STARTALLINFO: 'Start all uploads'
-    Saved: Saved
+    Saved: Записано
   Versioned:
     has_many_Versions: Версии

lang/bs.yml

@@ -50,6 +50,8 @@ bs:
     UNORDERED: 'Neuređena lista'
     UNORDEREDDESCRIPTION: 'Neuređena lista'
     UNORDEREDEXAMPLE1: 'neuređena stavka 1'
+  BackLink_Button.ss:
+    Back: Back
   BasicAuth:
     ENTERINFO: 'Molimo, unesite korisničko ime i šifru.'
     ERRORNOTADMIN: 'Ovaj korisnik nije administrator.'
@@ -57,9 +59,10 @@ bs:
   Boolean:
     0: 'False'
     ANY: Any
-    Hello: Hi
-    LOGOUT: 'Log out'
     1: 'True'
+  CMSLoadingScreen.ss:
+    LOADING: Loading...
+    REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
   CMSMain:
     ACCESS: 'Access to ''{title}'' section'
     ACCESSALLINTERFACES: 'Access to all CMS sections'
@@ -67,6 +70,12 @@ bs:
     SAVE: Snimi
   CMSProfileController:
     MENUTITLE: CMSProfileController
+  ChangePasswordEmail.ss:
+    CHANGEPASSWORDTEXT1: 'Promijenili ste svoju šifru za'
+    CHANGEPASSWORDTEXT2: 'Možete koristiti slijedeće podatke za prijavu:'
+    EMAIL: Email
+    HELLO: Pozdrav
+    PASSWORD: Password
   CheckboxField:
     - 'False'
     - 'True'
@@ -74,6 +83,14 @@ bs:
     CLOSEPOPUP: 'Close Popup'
     SUCCESSADD2: 'Added {name}'
     SUCCESSEDIT: 'Saved %s %s %s'
+  ComplexTableField.ss:
+    ADDITEM: 'Add %s'
+    NOITEMSFOUND: 'No items found'
+    SORTASC: 'Uzlazno raszvrstavanje'
+    SORTDESC: 'Silazno razvrstavanje'
+  ComplexTableField_popup.ss:
+    NEXT: Slijedeći
+    PREVIOUS: Prethodni
   ConfirmedPasswordField:
     ATLEAST: 'Passwords must be at least {min} characters long.'
     BETWEEN: 'Passwords must be {min} to {max} characters long.'
@@ -111,10 +128,7 @@ bs:
     VALIDDATEMAXDATE: 'Your date has to be older or matching the maximum allowed date ({date})'
     VALIDDATEMINDATE: 'Your date has to be newer or matching the minimum allowed date ({date})'
   Director:
-    ADD: Dodaj
-    CSVEXPORT: 'Export to CSV'
     INVALID_REQUEST: 'Invalid request'
-    NOTFOUND: 'No items found'
   DropdownField:
     CHOOSE: (Izaberite)
   EmailField:
@@ -124,8 +138,6 @@ bs:
     SINGULARNAME: 'Email Bounce Record'
   Enum:
     ANY: Any
-    LOADING: Loading...
-    REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
   File:
     Content: Content
     Filename: Filename
@@ -150,13 +162,17 @@ bs:
     FROMFILESTORE: 'From the File Store'
     NOSOURCE: 'Please select a source file to attach'
     REPLACE: 'Replace {type}'
+  FileIFrameField_iframe.ss:
+    TITLE: 'Image Uploading Iframe'
   Filesystem:
-    IMPORT_TAB_HEADER: Import
-    SEARCHLISTINGS: Search
     SYNCRESULTS: 'Sync complete: {createdcount} items created, {deletedcount} items deleted'
+  ForgotPasswordEmail.ss:
+    HELLO: Pozdrav
+    TEXT1: 'Ovo je Vaš'
+    TEXT2: 'link za ponovno podešavanje šifre'
+    TEXT3: za
   Form:
     FIELDISREQUIRED: '%s je obavezno'
-    TITLE: 'Image Uploading Iframe'
     VALIDATIONCREDITNUMBER: 'Please ensure you have entered the {number} credit card number correctly'
     VALIDATIONNOTUNIQUE: 'Unesena vrijednost nije jedinstvena'
     VALIDATIONPASSWORDSDONTMATCH: 'Šifre se ne slažu'
@@ -187,37 +203,26 @@ bs:
     ResetFilter: Reset
   GridFieldAction_Delete:
     DeletePermissionsFailure: 'No delete permissions'
-    NEXT: Slijedeći
-    PREVIOUS: Prethodni
   GridFieldDetailForm:
     Create: Create
     Delete: Delete
     DeletePermissionsFailure: 'No delete permissions'
     Deleted: 'Deleted %s %s'
-    HELLO: Pozdrav
     Save: Save
     Saved: 'Saved %s %s'
-    TEXT1: 'Ovo je Vaš'
+  GridFieldItemEditView.ss: null
-    TEXT2: 'link za ponovno podešavanje šifre'
-    TEXT3: za
   Group:
     AddRole: 'Add a role for this group'
-    CHANGEPASSWORDTEXT1: 'Promijenili ste svoju šifru za'
-    CHANGEPASSWORDTEXT2: 'Možete koristiti slijedeće podatke za prijavu:'
     Code: 'Group Code'
     DefaultGroupTitleAdministrators: Administrators
     DefaultGroupTitleContentAuthors: 'Content Authors'
     Description: Description
-    EMAIL: Email
     GroupReminder: 'If you choose a parent group, this group will take all it''s roles'
-    HELLO: Pozdrav
     Locked: 'Locked?'
     NoRoles: 'No roles found'
-    PASSWORD: Password
     Parent: 'Parent Group'
     RolesAddEditLink: 'Manage roles'
     Sort: 'Sort Order'
-    TITLE: 'Iframe za postavljanje slika'
     has_many_Permissions: Permissions
     many_many_Members: Members
   GroupImportForm:
@@ -258,7 +263,7 @@ bs:
     IMAGETITLE: 'Title text (tooltip) - for additional information about the image'
     IMAGETITLETEXT: 'Title text (tooltip)'
     IMAGETITLETEXTDESC: 'For additional information about the image'
-    IMAGEWIDTHPX: Širina
+    IMAGEWIDTHPX: 'Širina'
     INSERTMEDIA: 'Insert Media'
     LINK: Link
     LINKANCHOR: 'Sidro na ovoj stranici'
@@ -275,10 +280,9 @@ bs:
     UpdateMEDIA: 'Update Media'
   ImageField:
     IMAGE: Image
-  Image_iframe.ss: 'ChangePasswordEmail.ss:  BackLink_Button.ss:  CMSLoadingScreen.ss:  RelationComplexTableField.ss:  ForgotPasswordEmail.ss:    APPLY FILTER: "Apply Filter"  GridFieldItemEditView.ss:    Go back: "Go back"  ModelSidebar.ss:  TableListField_PageControls.ss:  ModelAdmin_Tools.ss:  ComplexTableField_popup.ss:  TableField.ss:  FileIFrameField_iframe.ss:  ComplexTableField.ss:  TableListField.ss:  ModelAdmin_ImportSpec.ss:  LeftAndMain_Menu.ss:'
+  Image_iframe.ss:
+    TITLE: 'Iframe za postavljanje slika'
   LeftAndMain:
-    ADD: 'Dodaj novi red'
-    ADDITEM: 'Add %s'
     CANT_REORGANISE: 'You do not have permission to alter Top level pages. Your change was not saved.'
     DELETED: Deleted.
     DropdownBatchActionsDefault: Actions
@@ -292,6 +296,9 @@ bs:
     REORGANISATIONSUCCESSFUL: 'Reorganised the site tree successfully.'
     SAVEDUP: Saved.
     VersionUnknown: unknown
+  LeftAndMain_Menu.ss:
+    Hello: Hi
+    LOGOUT: 'Log out'
   LoginAttempt:
     Email: 'Email Address'
     IP: 'IP Address'
@@ -318,7 +325,7 @@ bs:
     INVALIDNEWPASSWORD: 'We couldn''t accept that password: {password}'
     LOGGEDINAS: 'You''re logged in as {name}.'
     NEWPASSWORD: 'Nova šifra'
-    PASSWORD: Šifra
+    PASSWORD: 'Šifra'
     PLURALNAME: Members
     PROFILESAVESUCCESS: 'Successfully saved.'
     REMEMBERME: 'Zapamti me slijedeći put'
@@ -368,6 +375,7 @@ bs:
     ResultUpdated: 'Updated {count} members'
   MemberTableField: null
   ModelAdmin:
+    'APPLY FILTER': 'Apply Filter'
     DELETE: Delete
     DELETEDRECORDS: 'Deleted {count} records.'
     IMPORT: 'Import from CSV'
@@ -377,6 +385,17 @@ bs:
     RESET: Reset
     Title: 'Data Models'
     UPDATEDRECORDS: 'Updated {count} records.'
+  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
   MoneyField:
     FIELDLABELAMOUNT: Amount
     FIELDLABELCURRENCY: Currency
@@ -389,10 +408,6 @@ bs:
     CMS_ACCESS_CATEGORY: 'CMS Access'
     FULLADMINRIGHTS: 'Puna administrativna ovlaštenja'
     FULLADMINRIGHTS_HELP: 'Implies and overrules all other assigned permissions.'
-    IMPORTSPECFIELDS: 'Database columns'
-    IMPORTSPECLINK: 'Show Specification for %s'
-    IMPORTSPECRELATIONS: Relations
-    IMPORTSPECTITLE: 'Specification for %s'
   PermissionCheckboxSetField:
     AssignedTo: 'assigned to "{title}"'
     FromGroup: 'inherited from group "{title}"'
@@ -401,8 +416,11 @@ bs:
   Permissions:
     PERMISSIONS_CATEGORY: 'Roles and access permissions'
   PhoneNumberField:
-    Back: Back
     VALIDATION: 'Molimo, unesite ispravan broj telefona'
+  RelationComplexTableField.ss:
+    ADD: Dodaj
+    CSVEXPORT: 'Export to CSV'
+    NOTFOUND: 'No items found'
   Security:
     ALREADYLOGGEDIN: 'Ne možete pristupiti ovoj stranici. Ukoliko imate drugi korisnički račun koji može pristupiti ovoj stranici, prijavite si ispod.'
     BUTTONSEND: 'Pošalji mi link za ponovno podešavanje šifre'
@@ -439,31 +457,33 @@ bs:
     BtnImport: 'Import from CSV'
     FileFieldLabel: 'CSV File <small>(Allowed extensions: *.csv)</small>'
   SilverStripeNavigator:
-    DISPLAYING: Displaying
     Edit: Edit
-    FILTER: Filter
+  SimpleImageField:
-    IMPORT: Import
+    NOUPLOAD: 'Nijedna slika nije postavljena'
+  SiteTree:
+    TABMAIN: Glavno
+  TableField:
+    ISREQUIRED: 'In %s ''%s'' is required'
+  TableField.ss:
+    ADD: 'Dodaj novi red'
+    ADDITEM: 'Add %s'
+  TableListField:
+    CSVEXPORT: 'Izvezi u CSV'
+    PRINT: 'Štampaj'
+    Print: Print
+    SELECT: 'Select:'
+  TableListField.ss:
+    NOITEMSFOUND: 'No items found'
+    SORTASC: 'Sort in ascending order'
+    SORTDESC: 'Sort in descending order'
+  TableListField_PageControls.ss:
+    DISPLAYING: Displaying
     OF: of
     TO: to
     VIEWFIRST: 'View first'
     VIEWLAST: 'View last'
     VIEWNEXT: 'View next'
     VIEWPREVIOUS: 'View previous'
-  SimpleImageField:
-    NOUPLOAD: 'Nijedna slika nije postavljena'
-  SiteTree:
-    TABMAIN: Glavno
-  TableField:
-    ADDITEM: 'Add %s'
-    ISREQUIRED: 'In %s ''%s'' is required'
-    NOITEMSFOUND: 'No items found'
-    SORTASC: 'Sort in ascending order'
-    SORTDESC: 'Sort in descending order'
-  TableListField:
-    CSVEXPORT: 'Izvezi u CSV'
-    PRINT: Štampaj
-    Print: Print
-    SELECT: 'Select:'
   TimeField:
     VALIDATEFORMAT: 'Please enter a valid time format ({format})'
   ToggleField:

lang/ca.yml

@@ -50,6 +50,8 @@ ca:
     UNORDERED: 'Llista no ordenada'
     UNORDEREDDESCRIPTION: 'Llista no ordenada'
     UNORDEREDEXAMPLE1: 'element no ordenat 1'
+  BackLink_Button.ss:
+    Back: Back
   BasicAuth:
     ENTERINFO: 'Si us plau, introduïu un nom d''usuari i contrasenya'
     ERRORNOTADMIN: 'Aquest usuari no és un administrador.'
@@ -57,9 +59,10 @@ ca:
   Boolean:
     0: 'False'
     ANY: Any
-    Hello: Hi
-    LOGOUT: 'Log out'
     1: 'True'
+  CMSLoadingScreen.ss:
+    LOADING: Loading...
+    REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
   CMSMain:
     ACCESS: 'Access to ''{title}'' section'
     ACCESSALLINTERFACES: 'Access to all CMS sections'
@@ -67,6 +70,12 @@ ca:
     SAVE: Desa
   CMSProfileController:
     MENUTITLE: CMSProfileController
+  ChangePasswordEmail.ss:
+    CHANGEPASSWORDTEXT1: 'Heu canviat la vostra contrasenya per'
+    CHANGEPASSWORDTEXT2: 'Podeu usar ara les següents credencials per a entrar:'
+    EMAIL: 'Correu electrònic'
+    HELLO: Hola
+    PASSWORD: Contrasenya
   CheckboxField:
     - 'False'
     - 'True'
@@ -74,6 +83,14 @@ ca:
     CLOSEPOPUP: 'Tanca la finestra'
     SUCCESSADD2: 'Added {name}'
     SUCCESSEDIT: 'S''ha desat %s %s %s'
+  ComplexTableField.ss:
+    ADDITEM: 'Add %s'
+    NOITEMSFOUND: 'No items found'
+    SORTASC: 'Ordena ascendentment'
+    SORTDESC: 'Ordena descendentment'
+  ComplexTableField_popup.ss:
+    NEXT: Següent
+    PREVIOUS: Anterior
   ConfirmedPasswordField:
     ATLEAST: 'Passwords must be at least {min} characters long.'
     BETWEEN: 'Passwords must be {min} to {max} characters long.'
@@ -111,10 +128,7 @@ ca:
     VALIDDATEMAXDATE: 'Your date has to be older or matching the maximum allowed date ({date})'
     VALIDDATEMINDATE: 'Your date has to be newer or matching the minimum allowed date ({date})'
   Director:
-    ADD: Afegeix
-    CSVEXPORT: 'Export to CSV'
     INVALID_REQUEST: 'Invalid request'
-    NOTFOUND: 'No items found'
   DropdownField:
     CHOOSE: (Trieu)
   EmailField:
@@ -124,8 +138,6 @@ ca:
     SINGULARNAME: 'Email Bounce Record'
   Enum:
     ANY: Any
-    LOADING: Loading...
-    REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
   File:
     Content: Contingut
     Filename: 'Nom del fitxer'
@@ -150,13 +162,17 @@ ca:
     FROMFILESTORE: 'From the File Store'
     NOSOURCE: 'Please select a source file to attach'
     REPLACE: 'Replace {type}'
+  FileIFrameField_iframe.ss:
+    TITLE: 'Image Uploading Iframe'
   Filesystem:
-    IMPORT_TAB_HEADER: Import
-    SEARCHLISTINGS: Search
     SYNCRESULTS: 'Sync complete: {createdcount} items created, {deletedcount} items deleted'
+  ForgotPasswordEmail.ss:
+    HELLO: Hola
+    TEXT1: 'Aquí teniu el vostre'
+    TEXT2: 'enllaç de reinici de la contrasenya'
+    TEXT3: per
   Form:
     FIELDISREQUIRED: 'Es requereix %s'
-    TITLE: 'Image Uploading Iframe'
     VALIDATIONCREDITNUMBER: 'Please ensure you have entered the {number} credit card number correctly'
     VALIDATIONNOTUNIQUE: 'El valor que heu introduït no és únic'
     VALIDATIONPASSWORDSDONTMATCH: 'Les contrasenyes no concorden'
@@ -187,37 +203,26 @@ ca:
     ResetFilter: Reset
   GridFieldAction_Delete:
     DeletePermissionsFailure: 'No delete permissions'
-    NEXT: Següent
-    PREVIOUS: Anterior
   GridFieldDetailForm:
     Create: Create
     Delete: Delete
     DeletePermissionsFailure: 'No delete permissions'
     Deleted: 'Deleted %s %s'
-    HELLO: Hola
     Save: Save
     Saved: 'Saved %s %s'
-    TEXT1: 'Aquí teniu el vostre'
+  GridFieldItemEditView.ss: null
-    TEXT2: 'enllaç de reinici de la contrasenya'
-    TEXT3: per
   Group:
     AddRole: 'Add a role for this group'
-    CHANGEPASSWORDTEXT1: 'Heu canviat la vostra contrasenya per'
-    CHANGEPASSWORDTEXT2: 'Podeu usar ara les següents credencials per a entrar:'
     Code: 'Codi de grup'
     DefaultGroupTitleAdministrators: Administrators
     DefaultGroupTitleContentAuthors: 'Content Authors'
     Description: Descripció
-    EMAIL: 'Correu electrònic'
     GroupReminder: 'If you choose a parent group, this group will take all it''s roles'
-    HELLO: Hola
     Locked: 'Bloquejat?'
     NoRoles: 'No roles found'
-    PASSWORD: Contrasenya
     Parent: 'Grup precedent'
     RolesAddEditLink: 'Manage roles'
     Sort: Ordre
-    TITLE: 'Iframe Carregador d''imatge'
     has_many_Permissions: Permisos
     many_many_Members: Membres
   GroupImportForm:
@@ -269,16 +274,15 @@ ca:
     LINKINTERNAL: 'Pàgina del lloc web'
     LINKOPENNEWWIN: 'Obrir l''enllaç a una nova finestra?'
     LINKTO: 'Enllaça a'
-    PAGE: Pàgina
+    PAGE: 'Pàgina'
     URL: URL
     URLNOTANOEMBEDRESOURCE: 'The URL ''{url}'' could not be turned into a media resource.'
     UpdateMEDIA: 'Update Media'
   ImageField:
     IMAGE: Image
-  Image_iframe.ss: 'ChangePasswordEmail.ss:  BackLink_Button.ss:  CMSLoadingScreen.ss:  RelationComplexTableField.ss:  ForgotPasswordEmail.ss:    APPLY FILTER: "Apply Filter"  GridFieldItemEditView.ss:    Go back: "Go back"  ModelSidebar.ss:  TableListField_PageControls.ss:  ModelAdmin_Tools.ss:  ComplexTableField_popup.ss:  TableField.ss:  FileIFrameField_iframe.ss:  ComplexTableField.ss:  TableListField.ss:  ModelAdmin_ImportSpec.ss:  LeftAndMain_Menu.ss:'
+  Image_iframe.ss:
+    TITLE: 'Iframe Carregador d''imatge'
   LeftAndMain:
-    ADD: 'Afegeix una nova fila'
-    ADDITEM: 'Add %s'
     CANT_REORGANISE: 'You do not have permission to alter Top level pages. Your change was not saved.'
     DELETED: Deleted.
     DropdownBatchActionsDefault: Actions
@@ -292,6 +296,9 @@ ca:
     REORGANISATIONSUCCESSFUL: 'Reorganised the site tree successfully.'
     SAVEDUP: Saved.
     VersionUnknown: unknown
+  LeftAndMain_Menu.ss:
+    Hello: Hi
+    LOGOUT: 'Log out'
   LoginAttempt:
     Email: 'Adreça de correu'
     IP: 'Adreça IP'
@@ -368,6 +375,7 @@ ca:
     ResultUpdated: 'Updated {count} members'
   MemberTableField: null
   ModelAdmin:
+    'APPLY FILTER': 'Apply Filter'
     DELETE: Suprimeix
     DELETEDRECORDS: 'Deleted {count} records.'
     IMPORT: 'Importa de CSV'
@@ -377,6 +385,17 @@ ca:
     RESET: Reset
     Title: 'Data Models'
     UPDATEDRECORDS: 'Updated {count} records.'
+  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
   MoneyField:
     FIELDLABELAMOUNT: Amount
     FIELDLABELCURRENCY: Currency
@@ -389,10 +408,6 @@ ca:
     CMS_ACCESS_CATEGORY: 'CMS Access'
     FULLADMINRIGHTS: 'Drets administratius totals'
     FULLADMINRIGHTS_HELP: 'Implies and overrules all other assigned permissions.'
-    IMPORTSPECFIELDS: 'Database columns'
-    IMPORTSPECLINK: 'Show Specification for %s'
-    IMPORTSPECRELATIONS: Relations
-    IMPORTSPECTITLE: 'Specification for %s'
   PermissionCheckboxSetField:
     AssignedTo: 'assigned to "{title}"'
     FromGroup: 'inherited from group "{title}"'
@@ -401,8 +416,11 @@ ca:
   Permissions:
     PERMISSIONS_CATEGORY: 'Roles and access permissions'
   PhoneNumberField:
-    Back: Back
     VALIDATION: 'Si us plau, introduïu un número de telèfon vàlid'
+  RelationComplexTableField.ss:
+    ADD: Afegeix
+    CSVEXPORT: 'Export to CSV'
+    NOTFOUND: 'No items found'
   Security:
     ALREADYLOGGEDIN: 'No teniu accés a aquesta pàgina. Si teniu un altre compte que pot accedir a aquesta pàgina, podeu entrar-hi a sota.'
     BUTTONSEND: 'Envia''m l''enllaç per reiniciar la contrasenya'
@@ -439,31 +457,33 @@ ca:
     BtnImport: 'Import from CSV'
     FileFieldLabel: 'CSV File <small>(Allowed extensions: *.csv)</small>'
   SilverStripeNavigator:
-    DISPLAYING: Displaying
     Edit: Edit
-    FILTER: Filter
+  SimpleImageField:
-    IMPORT: Import
+    NOUPLOAD: 'No heu carregat cap imatge'
+  SiteTree:
+    TABMAIN: Principal
+  TableField:
+    ISREQUIRED: 'In %s ''%s'' is required'
+  TableField.ss:
+    ADD: 'Afegeix una nova fila'
+    ADDITEM: 'Add %s'
+  TableListField:
+    CSVEXPORT: 'Exporta a CSV'
+    PRINT: Imprimeix
+    Print: Print
+    SELECT: 'Select:'
+  TableListField.ss:
+    NOITEMSFOUND: 'No items found'
+    SORTASC: 'Sort in ascending order'
+    SORTDESC: 'Sort in descending order'
+  TableListField_PageControls.ss:
+    DISPLAYING: Displaying
     OF: of
     TO: to
     VIEWFIRST: 'Veure el primer'
     VIEWLAST: 'Veure el darrer'
     VIEWNEXT: 'Veure el següent'
     VIEWPREVIOUS: 'Veure l''anterior'
-  SimpleImageField:
-    NOUPLOAD: 'No heu carregat cap imatge'
-  SiteTree:
-    TABMAIN: Principal
-  TableField:
-    ADDITEM: 'Add %s'
-    ISREQUIRED: 'In %s ''%s'' is required'
-    NOITEMSFOUND: 'No items found'
-    SORTASC: 'Sort in ascending order'
-    SORTDESC: 'Sort in descending order'
-  TableListField:
-    CSVEXPORT: 'Exporta a CSV'
-    PRINT: Imprimeix
-    Print: Print
-    SELECT: 'Select:'
   TimeField:
     VALIDATEFORMAT: 'Please enter a valid time format ({format})'
   ToggleField:

lang/cs.yml

@@ -50,6 +50,8 @@ cs:
     UNORDERED: 'Neuspořádaný seznam'
     UNORDEREDDESCRIPTION: 'Neuspořádaný seznam'
     UNORDEREDEXAMPLE1: 'Neuspořádaná položka 1'
+  BackLink_Button.ss:
+    Back: Back
   BasicAuth:
     ENTERINFO: 'Prosím zadejte uživatelské jméno a heslo.'
     ERRORNOTADMIN: 'Tento uživatel není administrátor.'
@@ -57,9 +59,10 @@ cs:
   Boolean:
     0: Ne
     ANY: Jakkýkoliv
-    Hello: Hi
-    LOGOUT: 'Log out'
     1: Ano
+  CMSLoadingScreen.ss:
+    LOADING: Loading...
+    REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
   CMSMain:
     ACCESS: 'Access to ''{title}'' section'
     ACCESSALLINTERFACES: 'Přístup ke všem sekcím CMS'
@@ -67,6 +70,12 @@ cs:
     SAVE: Uložit
   CMSProfileController:
     MENUTITLE: CMSProfileController
+  ChangePasswordEmail.ss:
+    CHANGEPASSWORDTEXT1: 'Vaše heslo bylo změněno pro'
+    CHANGEPASSWORDTEXT2: 'Nyní můžete použít následující přihlašovací údaje pro přihlášení:'
+    EMAIL: Email
+    HELLO: 'Dobrý den'
+    PASSWORD: Heslo
   CheckboxField:
     - Ne
     - Ano
@@ -74,6 +83,14 @@ cs:
     CLOSEPOPUP: Zavřít
     SUCCESSADD2: 'Added {name}'
     SUCCESSEDIT: 'Uloženo %s %s %s'
+  ComplexTableField.ss:
+    ADDITEM: 'Add %s'
+    NOITEMSFOUND: 'No items found'
+    SORTASC: 'Řadit vzestupně'
+    SORTDESC: 'Řadit sestupně'
+  ComplexTableField_popup.ss:
+    NEXT: Další
+    PREVIOUS: Předchozí
   ConfirmedPasswordField:
     ATLEAST: 'Passwords must be at least {min} characters long.'
     BETWEEN: 'Passwords must be {min} to {max} characters long.'
@@ -111,10 +128,7 @@ cs:
     VALIDDATEMAXDATE: 'Your date has to be older or matching the maximum allowed date ({date})'
     VALIDDATEMINDATE: 'Your date has to be newer or matching the minimum allowed date ({date})'
   Director:
-    ADD: Přidat
-    CSVEXPORT: 'Export to CSV'
     INVALID_REQUEST: 'Invalid request'
-    NOTFOUND: 'No items found'
   DropdownField:
     CHOOSE: (Vyberte)
   EmailField:
@@ -124,8 +138,6 @@ cs:
     SINGULARNAME: 'Záznam vrácené pošty'
   Enum:
     ANY: Jakkýkoli
-    LOADING: Loading...
-    REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
   File:
     Content: Obsah
     Filename: 'Jméno souboru'
@@ -150,13 +162,17 @@ cs:
     FROMFILESTORE: 'Ze souborového úložiště'
     NOSOURCE: 'Vyberte zdrojový soubor k připojení, prosím'
     REPLACE: 'Replace {type}'
+  FileIFrameField_iframe.ss:
+    TITLE: 'Image Uploading Iframe'
   Filesystem:
-    IMPORT_TAB_HEADER: Import
-    SEARCHLISTINGS: Search
     SYNCRESULTS: 'Sync complete: {createdcount} items created, {deletedcount} items deleted'
+  ForgotPasswordEmail.ss:
+    HELLO: 'Dobrý den'
+    TEXT1: 'Zde je Váš'
+    TEXT2: 'odkaz na reset hesla'
+    TEXT3: pro
   Form:
     FIELDISREQUIRED: '%s je požadováno.'
-    TITLE: 'Image Uploading Iframe'
     VALIDATIONCREDITNUMBER: 'Please ensure you have entered the {number} credit card number correctly'
     VALIDATIONNOTUNIQUE: 'Zadaná hodnota není unikátní'
     VALIDATIONPASSWORDSDONTMATCH: 'Hesla se neshodují'
@@ -187,37 +203,26 @@ cs:
     ResetFilter: Reset
   GridFieldAction_Delete:
     DeletePermissionsFailure: 'No delete permissions'
-    NEXT: Další
-    PREVIOUS: Předchozí
   GridFieldDetailForm:
     Create: Create
     Delete: Delete
     DeletePermissionsFailure: 'No delete permissions'
     Deleted: 'Deleted %s %s'
-    HELLO: 'Dobrý den'
     Save: Save
     Saved: 'Saved %s %s'
-    TEXT1: 'Zde je Váš'
+  GridFieldItemEditView.ss: null
-    TEXT2: 'odkaz na reset hesla'
-    TEXT3: pro
   Group:
     AddRole: 'Add a role for this group'
-    CHANGEPASSWORDTEXT1: 'Vaše heslo bylo změněno pro'
-    CHANGEPASSWORDTEXT2: 'Nyní můžete použít následující přihlašovací údaje pro přihlášení:'
     Code: 'Kód skupiny'
     DefaultGroupTitleAdministrators: Administrátoři
     DefaultGroupTitleContentAuthors: 'Autoři obsahu'
     Description: Popis
-    EMAIL: Email
     GroupReminder: 'If you choose a parent group, this group will take all it''s roles'
-    HELLO: 'Dobrý den'
     Locked: 'Zamčený?'
     NoRoles: 'No roles found'
-    PASSWORD: Heslo
     Parent: 'Rodičovská skupina'
     RolesAddEditLink: 'Přidat/editovat role'
     Sort: Řazení
-    TITLE: 'Rámec pro nahrání obrázku'
     has_many_Permissions: Oprávnění
     many_many_Members: Členové
   GroupImportForm:
@@ -258,7 +263,7 @@ cs:
     IMAGETITLE: 'Titul text (tooltip) - další informace o obrázku'
     IMAGETITLETEXT: 'Title text (tooltip)'
     IMAGETITLETEXTDESC: 'For additional information about the image'
-    IMAGEWIDTHPX: Šířka
+    IMAGEWIDTHPX: 'Šířka'
     INSERTMEDIA: 'Insert Media'
     LINK: 'Vložit nebo upravit odkaz'
     LINKANCHOR: 'Záložka (kotva) na stránce'
@@ -275,10 +280,9 @@ cs:
     UpdateMEDIA: 'Update Media'
   ImageField:
     IMAGE: Obrázek
-  Image_iframe.ss: 'ChangePasswordEmail.ss:  BackLink_Button.ss:  CMSLoadingScreen.ss:  RelationComplexTableField.ss:  ForgotPasswordEmail.ss:    APPLY FILTER: "Apply Filter"  GridFieldItemEditView.ss:    Go back: "Go back"  ModelSidebar.ss:  TableListField_PageControls.ss:  ModelAdmin_Tools.ss:  ComplexTableField_popup.ss:  TableField.ss:  FileIFrameField_iframe.ss:  ComplexTableField.ss:  TableListField.ss:  ModelAdmin_ImportSpec.ss:  LeftAndMain_Menu.ss:'
+  Image_iframe.ss:
+    TITLE: 'Rámec pro nahrání obrázku'
   LeftAndMain:
-    ADD: 'Přidat nový řádek'
-    ADDITEM: 'Add %s'
     CANT_REORGANISE: 'You do not have permission to alter Top level pages. Your change was not saved.'
     DELETED: Deleted.
     DropdownBatchActionsDefault: Actions
@@ -292,6 +296,9 @@ cs:
     REORGANISATIONSUCCESSFUL: 'Reorganised the site tree successfully.'
     SAVEDUP: Saved.
     VersionUnknown: unknown
+  LeftAndMain_Menu.ss:
+    Hello: Hi
+    LOGOUT: 'Log out'
   LoginAttempt:
     Email: 'Emailové adresy'
     IP: 'IP adresy'
@@ -368,6 +375,7 @@ cs:
     ResultUpdated: 'Updated {count} members'
   MemberTableField: null
   ModelAdmin:
+    'APPLY FILTER': 'Apply Filter'
     DELETE: Smazat
     DELETEDRECORDS: 'Deleted {count} records.'
     IMPORT: 'Importovat ze souboru CSV'
@@ -377,6 +385,17 @@ cs:
     RESET: Reset
     Title: 'Data Models'
     UPDATEDRECORDS: 'Updated {count} records.'
+  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
   MoneyField:
     FIELDLABELAMOUNT: Částka
     FIELDLABELCURRENCY: Měna
@@ -389,10 +408,6 @@ cs:
     CMS_ACCESS_CATEGORY: 'Přístup CMS'
     FULLADMINRIGHTS: 'Plná administrátorská práva'
     FULLADMINRIGHTS_HELP: 'Implies and overrules all other assigned permissions.'
-    IMPORTSPECFIELDS: 'Database columns'
-    IMPORTSPECLINK: 'Show Specification for %s'
-    IMPORTSPECRELATIONS: Relations
-    IMPORTSPECTITLE: 'Specification for %s'
   PermissionCheckboxSetField:
     AssignedTo: 'assigned to "{title}"'
     FromGroup: 'inherited from group "{title}"'
@@ -401,8 +416,11 @@ cs:
   Permissions:
     PERMISSIONS_CATEGORY: 'Role a přístupová práva'
   PhoneNumberField:
-    Back: Back
     VALIDATION: 'Prosím zadejte platné telefonní číslo'
+  RelationComplexTableField.ss:
+    ADD: Přidat
+    CSVEXPORT: 'Export to CSV'
+    NOTFOUND: 'No items found'
   Security:
     ALREADYLOGGEDIN: 'K této stránce nemáte přístup. Pokud máte jiný účet, který k ní může přistupovat, můžete se přihlásit níže'
     BUTTONSEND: 'Pošlete mi nulovací odkaz pro heslo'
@@ -439,31 +457,33 @@ cs:
     BtnImport: Import
     FileFieldLabel: 'Soubor CSV <small>(Povoleny přípony: *.csv)</small>'
   SilverStripeNavigator:
-    DISPLAYING: Displaying
     Edit: Edit
-    FILTER: Filter
+  SimpleImageField:
-    IMPORT: Import
+    NOUPLOAD: 'Nebyl nahrán žádný obrázek'
+  SiteTree:
+    TABMAIN: Hlavní
+  TableField:
+    ISREQUIRED: 'In %s ''%s'' is required'
+  TableField.ss:
+    ADD: 'Přidat nový řádek'
+    ADDITEM: 'Add %s'
+  TableListField:
+    CSVEXPORT: 'Exportovat do souboru CSV'
+    PRINT: Vytisknout
+    Print: Print
+    SELECT: 'Vybrat:'
+  TableListField.ss:
+    NOITEMSFOUND: 'No items found'
+    SORTASC: 'Třídit v vzestupném pořadí'
+    SORTDESC: 'Třídit v sestupném pořadí'
+  TableListField_PageControls.ss:
+    DISPLAYING: Displaying
     OF: of
     TO: to
     VIEWFIRST: 'Zobraz první'
     VIEWLAST: 'Zobraz poslední'
     VIEWNEXT: 'Zobrazit další'
     VIEWPREVIOUS: 'Zobrazit předchozí'
-  SimpleImageField:
-    NOUPLOAD: 'Nebyl nahrán žádný obrázek'
-  SiteTree:
-    TABMAIN: Hlavní
-  TableField:
-    ADDITEM: 'Add %s'
-    ISREQUIRED: 'In %s ''%s'' is required'
-    NOITEMSFOUND: 'No items found'
-    SORTASC: 'Třídit v vzestupném pořadí'
-    SORTDESC: 'Třídit v sestupném pořadí'
-  TableListField:
-    CSVEXPORT: 'Exportovat do souboru CSV'
-    PRINT: Vytisknout
-    Print: Print
-    SELECT: 'Vybrat:'
   TimeField:
     VALIDATEFORMAT: 'Please enter a valid time format ({format})'
   ToggleField:

lang/da.yml

@@ -50,6 +50,8 @@ da:
     UNORDERED: 'Unordered list'
     UNORDEREDDESCRIPTION: 'Unordered list'
     UNORDEREDEXAMPLE1: 'unordered item 1'
+  BackLink_Button.ss:
+    Back: Back
   BasicAuth:
     ENTERINFO: 'Please enter a username and password.'
     ERRORNOTADMIN: 'That user is not an administrator.'
@@ -57,9 +59,10 @@ da:
   Boolean:
     0: 'False'
     ANY: Any
-    Hello: Hi
-    LOGOUT: 'Log out'
     1: 'True'
+  CMSLoadingScreen.ss:
+    LOADING: Loading...
+    REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
   CMSMain:
     ACCESS: 'Access to ''{title}'' section'
     ACCESSALLINTERFACES: 'Adgang til alle CMS grænseflader'
@@ -67,6 +70,12 @@ da:
     SAVE: Gem
   CMSProfileController:
     MENUTITLE: CMSProfileController
+  ChangePasswordEmail.ss:
+    CHANGEPASSWORDTEXT1: 'You changed your password for'
+    CHANGEPASSWORDTEXT2: 'You can now use the following credentials to log in:'
+    EMAIL: Email
+    HELLO: Hi
+    PASSWORD: Password
   CheckboxField:
     - 'False'
     - 'True'
@@ -74,6 +83,14 @@ da:
     CLOSEPOPUP: 'Luk popup'
     SUCCESSADD2: 'Added {name}'
     SUCCESSEDIT: 'Saved %s %s %s'
+  ComplexTableField.ss:
+    ADDITEM: 'Add %s'
+    NOITEMSFOUND: 'No items found'
+    SORTASC: 'Sort ascending'
+    SORTDESC: 'Sort descending'
+  ComplexTableField_popup.ss:
+    NEXT: Next
+    PREVIOUS: Previous
   ConfirmedPasswordField:
     ATLEAST: 'Passwords must be at least {min} characters long.'
     BETWEEN: 'Passwords must be {min} to {max} characters long.'
@@ -111,10 +128,7 @@ da:
     VALIDDATEMAXDATE: 'Your date has to be older or matching the maximum allowed date ({date})'
     VALIDDATEMINDATE: 'Your date has to be newer or matching the minimum allowed date ({date})'
   Director:
-    ADD: Add
-    CSVEXPORT: 'Export to CSV'
     INVALID_REQUEST: 'Invalid request'
-    NOTFOUND: 'No items found'
   DropdownField:
     CHOOSE: (Choose)
   EmailField:
@@ -124,8 +138,6 @@ da:
     SINGULARNAME: 'Email Bounce Record'
   Enum:
     ANY: Any
-    LOADING: Loading...
-    REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
   File:
     Content: Content
     Filename: Filename
@@ -150,13 +162,17 @@ da:
     FROMFILESTORE: 'From the File Store'
     NOSOURCE: 'Please select a source file to attach'
     REPLACE: 'Replace {type}'
+  FileIFrameField_iframe.ss:
+    TITLE: 'Image Uploading Iframe'
   Filesystem:
-    IMPORT_TAB_HEADER: Import
-    SEARCHLISTINGS: Search
     SYNCRESULTS: 'Sync complete: {createdcount} items created, {deletedcount} items deleted'
+  ForgotPasswordEmail.ss:
+    HELLO: Hi
+    TEXT1: 'Here is your'
+    TEXT2: 'password reset link'
+    TEXT3: for
   Form:
     FIELDISREQUIRED: '%s is required'
-    TITLE: 'Image Uploading Iframe'
     VALIDATIONCREDITNUMBER: 'Please ensure you have entered the {number} credit card number correctly'
     VALIDATIONNOTUNIQUE: 'The value entered is not unique'
     VALIDATIONPASSWORDSDONTMATCH: 'Passwords don''t match'
@@ -187,37 +203,26 @@ da:
     ResetFilter: Reset
   GridFieldAction_Delete:
     DeletePermissionsFailure: 'No delete permissions'
-    NEXT: Next
-    PREVIOUS: Previous
   GridFieldDetailForm:
     Create: Create
     Delete: Delete
     DeletePermissionsFailure: 'No delete permissions'
     Deleted: 'Deleted %s %s'
-    HELLO: Hi
     Save: Save
     Saved: 'Saved %s %s'
-    TEXT1: 'Here is your'
+  GridFieldItemEditView.ss: null
-    TEXT2: 'password reset link'
-    TEXT3: for
   Group:
     AddRole: 'Add a role for this group'
-    CHANGEPASSWORDTEXT1: 'You changed your password for'
-    CHANGEPASSWORDTEXT2: 'You can now use the following credentials to log in:'
     Code: 'Group Code'
     DefaultGroupTitleAdministrators: Administrators
     DefaultGroupTitleContentAuthors: 'Content Authors'
     Description: Description
-    EMAIL: Email
     GroupReminder: 'If you choose a parent group, this group will take all it''s roles'
-    HELLO: Hi
     Locked: 'Locked?'
     NoRoles: 'No roles found'
-    PASSWORD: Password
     Parent: 'Parent Group'
     RolesAddEditLink: 'Manage roles'
     Sort: 'Sort Order'
-    TITLE: 'Image Uploading Iframe'
     has_many_Permissions: Permissions
     many_many_Members: Members
   GroupImportForm:
@@ -275,10 +280,9 @@ da:
     UpdateMEDIA: 'Update Media'
   ImageField:
     IMAGE: Image
-  Image_iframe.ss: 'ChangePasswordEmail.ss:  BackLink_Button.ss:  CMSLoadingScreen.ss:  RelationComplexTableField.ss:  ForgotPasswordEmail.ss:    APPLY FILTER: "Apply Filter"  GridFieldItemEditView.ss:    Go back: "Go back"  ModelSidebar.ss:  TableListField_PageControls.ss:  ModelAdmin_Tools.ss:  ComplexTableField_popup.ss:  TableField.ss:  FileIFrameField_iframe.ss:  ComplexTableField.ss:  TableListField.ss:  ModelAdmin_ImportSpec.ss:  LeftAndMain_Menu.ss:'
+  Image_iframe.ss:
+    TITLE: 'Image Uploading Iframe'
   LeftAndMain:
-    ADD: 'Add a new row'
-    ADDITEM: 'Add %s'
     CANT_REORGANISE: 'You do not have permission to alter Top level pages. Your change was not saved.'
     DELETED: Deleted.
     DropdownBatchActionsDefault: Actions
@@ -292,6 +296,9 @@ da:
     REORGANISATIONSUCCESSFUL: 'Reorganised the site tree successfully.'
     SAVEDUP: Saved.
     VersionUnknown: unknown
+  LeftAndMain_Menu.ss:
+    Hello: Hi
+    LOGOUT: 'Log out'
   LoginAttempt:
     Email: 'Email Address'
     IP: 'IP Address'
@@ -368,6 +375,7 @@ da:
     ResultUpdated: 'Updated {count} members'
   MemberTableField: null
   ModelAdmin:
+    'APPLY FILTER': 'Apply Filter'
     DELETE: Slet
     DELETEDRECORDS: 'Deleted {count} records.'
     IMPORT: 'Importer fra CSV'
@@ -377,6 +385,17 @@ da:
     RESET: Reset
     Title: 'Data Models'
     UPDATEDRECORDS: 'Updated {count} records.'
+  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
   MoneyField:
     FIELDLABELAMOUNT: Amount
     FIELDLABELCURRENCY: Currency
@@ -389,10 +408,6 @@ da:
     CMS_ACCESS_CATEGORY: 'CMS Access'
     FULLADMINRIGHTS: 'Full administrative rights'
     FULLADMINRIGHTS_HELP: 'Implies and overrules all other assigned permissions.'
-    IMPORTSPECFIELDS: 'Database columns'
-    IMPORTSPECLINK: 'Show Specification for %s'
-    IMPORTSPECRELATIONS: Relations
-    IMPORTSPECTITLE: 'Specification for %s'
   PermissionCheckboxSetField:
     AssignedTo: 'assigned to "{title}"'
     FromGroup: 'inherited from group "{title}"'
@@ -401,8 +416,11 @@ da:
   Permissions:
     PERMISSIONS_CATEGORY: 'Roles and access permissions'
   PhoneNumberField:
-    Back: Back
     VALIDATION: 'Please enter a valid phone number'
+  RelationComplexTableField.ss:
+    ADD: Add
+    CSVEXPORT: 'Export to CSV'
+    NOTFOUND: 'No items found'
   Security:
     ALREADYLOGGEDIN: 'You don''t have access to this page.  If you have another account that can access that page, you can log in again below.'
     BUTTONSEND: 'Send me the password reset link'
@@ -439,31 +457,33 @@ da:
     BtnImport: 'Import from CSV'
     FileFieldLabel: 'CSV File <small>(Allowed extensions: *.csv)</small>'
   SilverStripeNavigator:
-    DISPLAYING: Displaying
     Edit: Edit
-    FILTER: Filter
+  SimpleImageField:
-    IMPORT: Import
+    NOUPLOAD: 'No Image Uploaded'
+  SiteTree:
+    TABMAIN: Main
+  TableField:
+    ISREQUIRED: 'In %s ''%s'' is required'
+  TableField.ss:
+    ADD: 'Add a new row'
+    ADDITEM: 'Add %s'
+  TableListField:
+    CSVEXPORT: 'Export to CSV'
+    PRINT: Print
+    Print: Print
+    SELECT: 'Select:'
+  TableListField.ss:
+    NOITEMSFOUND: 'No items found'
+    SORTASC: 'Sort in ascending order'
+    SORTDESC: 'Sort in descending order'
+  TableListField_PageControls.ss:
+    DISPLAYING: Displaying
     OF: of
     TO: to
     VIEWFIRST: 'Vis f&oslash;rste'
     VIEWLAST: 'Vis Sidste'
     VIEWNEXT: 'Vis n&aelig;ste'
     VIEWPREVIOUS: 'Vis forrige'
-  SimpleImageField:
-    NOUPLOAD: 'No Image Uploaded'
-  SiteTree:
-    TABMAIN: Main
-  TableField:
-    ADDITEM: 'Add %s'
-    ISREQUIRED: 'In %s ''%s'' is required'
-    NOITEMSFOUND: 'No items found'
-    SORTASC: 'Sort in ascending order'
-    SORTDESC: 'Sort in descending order'
-  TableListField:
-    CSVEXPORT: 'Export to CSV'
-    PRINT: Print
-    Print: Print
-    SELECT: 'Select:'
   TimeField:
     VALIDATEFORMAT: 'Please enter a valid time format ({format})'
   ToggleField:

lang/de.yml

@@ -18,12 +18,12 @@ de:
     DROPAREA: Dateiablage
     EDITALL: 'Alle Bearbeiten'
     EDITANDORGANIZE: Bearbeiten
-    EDITINFO: 'Edit files'
+    EDITINFO: 'Dateien bearbeiten'
     FILES: Dateien
-    FROMCOMPUTER: 'Choose files from your computer'
+    FROMCOMPUTER: 'Dateien von ihrem Computer auswählen'
-    FROMCOMPUTERINFO: 'Upload from your computer'
+    FROMCOMPUTERINFO: 'Von ihrem Computer hochladen'
     TOTAL: Gesamt
-    UPLOADINPROGRESS: 'Please wait… upload in progress'
+    UPLOADINPROGRESS: 'Bitte warten sie... Upload im Gang'
     UPLOADOR: ODER
   BBCodeParser:
     ALIGNEMENT: Ausrichtung
@@ -50,6 +50,8 @@ de:
     UNORDERED: 'Ungeordnete Liste'
     UNORDEREDDESCRIPTION: 'Ungeordnete Liste'
     UNORDEREDEXAMPLE1: 'Ungeordneter Eintrag 1'
+  BackLink_Button.ss:
+    Back: Zurück
   BasicAuth:
     ENTERINFO: 'Bitte geben Sie einen Nutzernamen und ein Passwort ein'
     ERRORNOTADMIN: 'Dieser Nutzer ist kein Administrator'
@@ -57,16 +59,23 @@ de:
   Boolean:
     0: Nein
     ANY: alle
-    Hello: Hi
-    LOGOUT: Ausloggen
     1: Ja
+  CMSLoadingScreen.ss:
+    LOADING: 'Lade Daten ...'
+    REQUIREJS: 'Für die Benutzung des CMS wird JavaScript benötigt.'
   CMSMain:
-    ACCESS: 'Access to ''{title}'' section'
+    ACCESS: 'Zugang zum Bereich ''{title}'''
     ACCESSALLINTERFACES: 'Zugriff auf alle Bereiche des CMS'
     ACCESSALLINTERFACESHELP: 'Hebt alle bereichspezifischen Berechtigungen auf.'
     SAVE: Speichern
   CMSProfileController:
     MENUTITLE: CMSProfileController
+  ChangePasswordEmail.ss:
+    CHANGEPASSWORDTEXT1: 'Sie haben ihr Passwort geändert für'
+    CHANGEPASSWORDTEXT2: 'Sie können nun folgende Angaben benutzen um sich einzuloggen'
+    EMAIL: E-Mail
+    HELLO: Hi
+    PASSWORD: Passwort
   CheckboxField:
     - Nein
     - Ja
@@ -74,10 +83,18 @@ de:
     CLOSEPOPUP: 'Popup schließen'
     SUCCESSADD2: '{name} hinzugefügt'
     SUCCESSEDIT: 'Gespeichert %s %s %s'
+  ComplexTableField.ss:
+    ADDITEM: '%s hinzufügen'
+    NOITEMSFOUND: 'Keine Elemente gefunden'
+    SORTASC: 'Aufsteigend sortieren'
+    SORTDESC: 'Absteigend sortieren'
+  ComplexTableField_popup.ss:
+    NEXT: nächste
+    PREVIOUS: vorherige
   ConfirmedPasswordField:
-    ATLEAST: 'Passwords must be at least {min} characters long.'
+    ATLEAST: 'Passwörter müssen mindestens {min} Zeichen lang sein.'
-    BETWEEN: 'Passwords must be {min} to {max} characters long.'
+    BETWEEN: 'Passwörter müssen mindestens {min} bis maximal {max} Zeichen lang sein.'
-    MAXIMUM: 'Passwords must be at most {max} characters long.'
+    MAXIMUM: 'Passwörter dürfen maxinal {max} Zeichen lang sein.'
     SHOWONCLICKTITLE: 'Passwort ändern'
   CreditCardField:
     FIRST: Zuerst
@@ -107,14 +124,11 @@ de:
   DateField:
     NOTSET: 'nicht gesetzt'
     TODAY: heute
-    VALIDDATEFORMAT2: 'Please enter a valid date format ({format})'
+    VALIDDATEFORMAT2: 'Bitte geben sie das Datum im korrekten Format ein ({format})'
-    VALIDDATEMAXDATE: 'Your date has to be older or matching the maximum allowed date ({date})'
+    VALIDDATEMAXDATE: 'Ihr Datum muss nach dem erlaubtem Datum ({date}) liegen oder gleich sein'
-    VALIDDATEMINDATE: 'Your date has to be newer or matching the minimum allowed date ({date})'
+    VALIDDATEMINDATE: 'Ihr Datum muss vor dem erlaubtem Datum ({date}) liegen oder gleich sein'
   Director:
-    ADD: Hinzufügen
-    CSVEXPORT: 'Export to CSV'
     INVALID_REQUEST: 'Ungültige Anfrage'
-    NOTFOUND: 'No items found'
   DropdownField:
     CHOOSE: (Auswahl)
   EmailField:
@@ -124,46 +138,48 @@ de:
     SINGULARNAME: 'E-Mail Rückläufer'
   Enum:
     ANY: alle
-    LOADING: 'Lade Daten ...'
-    REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
   File:
     Content: Inhalt
     Filename: Dateiname
-    INVALIDEXTENSION: 'Extension is not allowed (valid: {extensions})'
+    INVALIDEXTENSION: 'Dateityp ist nicht erlaubt (erlaubt sind: {extensions})'
-    INVALIDEXTENSIONSHORT: 'Extension is not allowed'
+    INVALIDEXTENSIONSHORT: 'Dateityp ist nicht erlaubt'
     NOFILESIZE: 'Dateigröße ist 0 bytes'
     NOVALIDUPLOAD: 'Datei ist kein gültiger Upload'
     Name: Name
     PLURALNAME: Dateien
     SINGULARNAME: Datei
-    TOOLARGE: 'Filesize is too large, maximum {size} allowed'
+    TOOLARGE: 'Die Datei ist zu groß, maximal sind {size} erlaubt'
-    TOOLARGESHORT: 'Filesize exceeds {size}'
+    TOOLARGESHORT: 'Dateigröße übersteigt {size}'
     Title: Titel
   FileIFrameField:
     ATTACH: '{type} anhängen'
-    ATTACHONCESAVED: '{type}s can be attached once you have saved the record for the first time.'
+    ATTACHONCESAVED: '{type}s können angehängt werden, sobald das Dokument zum ersten Mal gespeichert wurde.'
-    ATTACHONCESAVED2: 'Files can be attached once you have saved the record for the first time.'
+    ATTACHONCESAVED2: 'Dateien können angehängt werden, sobald das Dokument zum ersten Mal gespeichert wurde.'
-    DELETE: 'Delete {type}'
+    DELETE: 'Lösche {type}'
-    DISALLOWEDFILETYPE: 'This filetype is not allowed to be uploaded'
+    DISALLOWEDFILETYPE: 'Der Upload dieses Dateityps ist nicht erlaubt'
     FILE: Datei
     FROMCOMPUTER: 'Von Ihrem Computer'
     FROMFILESTORE: 'Aus dem Datei-Storage'
     NOSOURCE: 'Bitte wählen Sie eine Datei aus'
     REPLACE: '{type} ersetzen'
+  FileIFrameField_iframe.ss:
+    TITLE: 'Iframe Bilderupload'
   Filesystem:
-    IMPORT_TAB_HEADER: Importieren
-    SEARCHLISTINGS: Suche
     SYNCRESULTS: 'Synchronisation beendet: {createdcount} Objekte erstellt, {deletedcount} Objekte gelöscht'
+  ForgotPasswordEmail.ss:
+    HELLO: Hallo
+    TEXT1: 'Hier ist Ihr'
+    TEXT2: 'Link zum Zurücksetzen des Passworts'
+    TEXT3: für
   Form:
     FIELDISREQUIRED: '%s wird benötigt'
-    TITLE: 'Image Uploading Iframe'
+    VALIDATIONCREDITNUMBER: 'Bitte stellen sie sicher, dass sie die Kreditkartennummer ({number}) korrekt eingegeben haben'
-    VALIDATIONCREDITNUMBER: 'Please ensure you have entered the {number} credit card number correctly'
     VALIDATIONNOTUNIQUE: 'Der eingegebene Wert ist nicht einzigartig'
     VALIDATIONPASSWORDSDONTMATCH: 'Passwörter stimmen nicht überein'
     VALIDATIONPASSWORDSNOTEMPTY: 'Passwortfelder dürfen nicht leer sein'
-    VALIDATIONSTRONGPASSWORD: 'Passwords must have at least one digit and one alphanumeric character'
+    VALIDATIONSTRONGPASSWORD: 'Passwörter müssen mindestens eine Zahl und ein alphanumerisches Zeichen enthalten'
     VALIDATOR: Prüfer
-    VALIDCURRENCY: 'Please enter a valid currency'
+    VALIDCURRENCY: 'Bitte geben sie einen korrekten Betrag ein'
   FormField:
     NONE: keine
   GridAction:
@@ -171,63 +187,52 @@ de:
     Delete: Löschen
     UnlinkRelation: 'Verbindung entfernen'
   GridField:
-    Add: '{name} Hinzufügen'
+    Add: '{name} hinzufügen'
     Filter: Filter
     FilterBy: 'Filter nach'
     Find: Suchen
-    LEVELUP: 'Level up'
+    LEVELUP: 'Eine Ebene hoch'
-    LinkExisting: 'Link Existing'
+    LinkExisting: Verknüpfen
     NewRecord: 'Neue(r) %s'
-    NoItemsFound: 'Keine Elemente gefunden.'
+    NoItemsFound: 'Keine Elemente gefunden'
-    PRINTEDAT: 'Printed at'
+    PRINTEDAT: 'Gedruckt am'
-    PRINTEDBY: 'Printed by'
+    PRINTEDBY: 'Gedruckt von'
     PlaceHolder: '{type} Suchen'
-    PlaceHolderWithLabels: 'Find {type} by {name}'
+    PlaceHolderWithLabels: 'Suche {type} über {name}'
-    RelationSearch: 'Relation search'
+    RelationSearch: Relationssuche
     ResetFilter: Zurücksetzen
   GridFieldAction_Delete:
-    DeletePermissionsFailure: 'No delete permissions'
+    DeletePermissionsFailure: 'Keine Berechtigung zum Löschen'
-    NEXT: nächste
-    PREVIOUS: vorherige
   GridFieldDetailForm:
     Create: Erstellen
     Delete: Löschen
     DeletePermissionsFailure: 'Keine Berechtigungen zum löschen'
     Deleted: 'Gelöscht %s %s'
-    HELLO: Hallo
     Save: Speichern
     Saved: 'Gespeichert %s %s'
-    TEXT1: 'Hier ist Ihr'
+  GridFieldItemEditView.ss: null
-    TEXT2: 'Link zum Zurücksetzen des Passworts'
-    TEXT3: für
   Group:
     AddRole: 'Rolle für die Gruppe hinzufügen'
-    CHANGEPASSWORDTEXT1: 'Sie haben ihr Passwort geändert für'
-    CHANGEPASSWORDTEXT2: 'Sie können nun folgende Angaben benutzen um sich einzuloggen'
     Code: 'Gruppen Code'
     DefaultGroupTitleAdministrators: Administratoren
     DefaultGroupTitleContentAuthors: Inhaltsautoren
     Description: Beschreibung
-    EMAIL: E-Mail
     GroupReminder: 'Bei Zuweisung einer Übergruppe werden alle ihre Rollen übernommen'
-    HELLO: Hi
     Locked: 'Gesperrt?'
     NoRoles: 'Keine Rollen gefunden'
-    PASSWORD: Passwort
     Parent: Elterngruppe
     RolesAddEditLink: 'Rollen hinzufügen/editieren'
     Sort: Sortierreihenfolge
-    TITLE: 'Iframe Bilder hochladen'
     has_many_Permissions: Berechtigungen
     many_many_Members: Mitglieder
   GroupImportForm:
     Help1: '<p>Eine oder mehrere Gruppen im <em>CSV</em>-Format (kommaseparierte Werte) importieren. <small><a href="#" class="toggle-advanced">Erweiterte Nutzung</a></small></p>'
     Help2: '<div class="advanced"><h4>Erweiterte Nutzung</h4><ul><li>Gültige Spalten: <em>%s</em></li><li>Vorhandene Gruppen werden über ihren eindeutigen <em>Code</em> ermittelt und mit den Werten aus der importierten Datei aktualisiert.</li><li>Gruppen-Hierarchien können über die <em>ParentCode</em> Spalte definiert werden.</li><li>Berechtigungscodes können über die Splate <em>PermissionCode</em> zugewiesen werden, vorhandene Berechtigungen werden nicht gelöscht.</li></ul></div>'
-    ResultCreated: 'Created {count} groups'
+    ResultCreated: '{count} Gruppe(n) wurden erstellt'
     ResultDeleted: '%d Gruppen gelöscht'
     ResultUpdated: '%d Gruppen aktualisiert'
   Hierarchy:
-    InfiniteLoopNotAllowed: 'Infinite loop found within the "{type}" hierarchy. Please change the parent to resolve this'
+    InfiniteLoopNotAllowed: 'Es wurde eine Endlosschleife innerhalb der "{type}"-Hierarchie gefunden. Bitte ändern sie die übergeordnete Seite, um den Fehler zu beheben'
   HtmlEditorField:
     ADDURL: 'URL hinzufügen'
     ADJUSTDETAILSDIMENSIONS: 'Details &amp; Dimensionen'
@@ -246,20 +251,20 @@ de:
     EMAIL: E-Mail-Adresse
     FILE: Datei
     FOLDER: Ordner
-    FROMCMS: 'From the CMS'
+    FROMCMS: 'Aus dem CMS'
     FROMCOMPUTER: 'Von Ihrem Computer'
     FROMWEB: 'Aus dem Internet'
     FindInFolder: 'In Ordner suchen'
     IMAGEALT: 'Alternativer Text (alt)'
     IMAGEALTTEXT: 'Alternativer Text (alt) - angezeigt, wenn das Bild nicht dargestellt werden kann'
-    IMAGEALTTEXTDESC: 'Shown to screen readers or if image can not be displayed'
+    IMAGEALTTEXTDESC: 'Wird von Screenreadern vorgelesen oder angezeigt, falls das Bild nicht dargestellt werden kann'
     IMAGEDIMENSIONS: Dimensionen
     IMAGEHEIGHTPX: 'Höhe (px)'
     IMAGETITLE: 'Titeltext (Tooltip) - für zusätzliche Informationen über das Bild'
-    IMAGETITLETEXT: 'Title text (tooltip)'
+    IMAGETITLETEXT: 'Titeltext (Tooltip)'
-    IMAGETITLETEXTDESC: 'For additional information about the image'
+    IMAGETITLETEXTDESC: 'Weiterführende Informationen über das Bild'
     IMAGEWIDTHPX: 'Breite (px)'
-    INSERTMEDIA: 'Insert Media'
+    INSERTMEDIA: 'Medienobject einfügen'
     LINK: Verweis
     LINKANCHOR: 'Anker auf dieser Seite'
     LINKDESCR: 'Beschreibung des Verweises'
@@ -271,16 +276,15 @@ de:
     LINKTO: 'Verweis zu'
     PAGE: Seite
     URL: URL
-    URLNOTANOEMBEDRESOURCE: 'The URL ''{url}'' could not be turned into a media resource.'
+    URLNOTANOEMBEDRESOURCE: 'Die URL ''{url}'' konnte nicht in eine Medienquelle umgewandelt werden'
-    UpdateMEDIA: 'Update Media'
+    UpdateMEDIA: 'Medienobjekt aktualisieren'
   ImageField:
     IMAGE: Bild
-  Image_iframe.ss: 'ChangePasswordEmail.ss:  BackLink_Button.ss:  CMSLoadingScreen.ss:  RelationComplexTableField.ss:  ForgotPasswordEmail.ss:    APPLY FILTER: "Filter anwenden"  GridFieldItemEditView.ss:    Go back: "Zurück"  ModelSidebar.ss:  TableListField_PageControls.ss:  ModelAdmin_Tools.ss:  ComplexTableField_popup.ss:  TableField.ss:  FileIFrameField_iframe.ss:  ComplexTableField.ss:  TableListField.ss:  ModelAdmin_ImportSpec.ss:  LeftAndMain_Menu.ss:'
+  Image_iframe.ss:
+    TITLE: 'Iframe Bilder hochladen'
   LeftAndMain:
-    ADD: 'Eine neue Zeile hinzufügen'
+    CANT_REORGANISE: 'Sie besitzen nicht die benötigten Zugriffsrechte um Seiten der höchsten Ebene zu bearbeiten. Ihre Änderungen wurden nicht gespeichert.'
-    ADDITEM: 'Add %s'
+    DELETED: Gelöscht.
-    CANT_REORGANISE: 'You do not have permission to alter Top level pages. Your change was not saved.'
-    DELETED: Deleted.
     DropdownBatchActionsDefault: Aktionen
     HELP: Hilfe
     PAGETYPE: 'Seitentyp:'
@@ -289,9 +293,12 @@ de:
     PERMDEFAULT: 'Bitte wählen Sie eine Authentifizierungsmethode und geben Sie Ihre Benutzerdaten für den Zugang zum CMS ein.'
     PLEASESAVE: 'Diese Seite konnte nicht aktualisiert werden weil sie noch nicht gespeichert wurde - bitte speichern.'
     PreviewButton: Vorschau
-    REORGANISATIONSUCCESSFUL: 'Reorganised the site tree successfully.'
+    REORGANISATIONSUCCESSFUL: 'Der Seitenbaum wurde erfolgreich sortiert.'
     SAVEDUP: Gespeichert.
-    VersionUnknown: unbekannt
+    VersionUnknown: Unbekannt
+  LeftAndMain_Menu.ss:
+    Hello: Hi
+    LOGOUT: Ausloggen
   LoginAttempt:
     Email: E-Mail-Adresse
     IP: IP-Adresse
@@ -315,8 +322,8 @@ de:
     ERRORWRONGCRED: 'Das Passwort oder die E-Mail-Adresse scheinen nicht richtig zu sein. Bitte versuchen Sie es erneut.'
     FIRSTNAME: Vorname
     INTERFACELANG: CMS-Sprache
-    INVALIDNEWPASSWORD: 'We couldn''t accept that password: {password}'
+    INVALIDNEWPASSWORD: 'Das Passwort konnte nicht akzeptiert werden: {password}'
-    LOGGEDINAS: 'You''re logged in as {name}.'
+    LOGGEDINAS: 'Sie sind als {name} eingeloggt.'
     NEWPASSWORD: 'Neues Passwort'
     PASSWORD: Passwort
     PLURALNAME: Benutzer
@@ -327,8 +334,8 @@ de:
     SUBJECTPASSWORDRESET: 'Ihr Link zur Passwortrücksetzung'
     SURNAME: Nachname
     VALIDATIONMEMBEREXISTS: 'Es gibt bereits ein Mitglied mit dieser E-Mail-Adresse'
-    ValidationIdentifierFailed: 'Can''t overwrite existing member #{id} with identical identifier ({name} = {value}))'
+    ValidationIdentifierFailed: 'Das vorhandene Mitglied #{id} mit identischer Bezeichnung kann nicht überschrieben werden ({name} = {value}))'
-    WELCOMEBACK: 'Welcome Back, {firstname}'
+    WELCOMEBACK: 'Hallo {firstname}. Schön, dass du wieder da bist'
     YOUROLDPASSWORD: 'Ihr alten Passwort'
     belongs_many_many_Groups: Gruppe
     db_LastVisited: 'Zuletzt Besucht'
@@ -340,34 +347,35 @@ de:
   MemberAuthenticator:
     TITLE: 'E-Mail &amp; Passwort'
   MemberDatetimeOptionsetField:
-    AMORPM: 'AM (Ante meridiem) or PM (Post meridiem)'
+    AMORPM: 'AM (vormittag) oder PM (nachmittag)'
     Custom: Benutzerdefiniert
     DATEFORMATBAD: 'Ungültiges Datumsformat'
-    DAYNOLEADING: 'Day of month without leading zero'
+    DAYNOLEADING: 'Tag des Monats ohne führende Null'
-    DIGITSDECFRACTIONSECOND: 'One or more digits representing a decimal fraction of a second'
+    DIGITSDECFRACTIONSECOND: 'Eine oder mehrere Ziffern, die einen Dezimalbruch einer Sekunde darstellen'
-    FOURDIGITYEAR: Jahr
+    FOURDIGITYEAR: 'Vierstellige Jahreszahl'
-    FULLNAMEMONTH: 'Full name of month (e.g. June)'
+    FULLNAMEMONTH: 'Volle Monatsbezeichnung (z.B. Juni)'
-    HOURNOLEADING: 'Hour without leading zero'
+    HOURNOLEADING: 'Stunde ohne führende Null'
     MINUTENOLEADING: Minute
-    MONTHNOLEADING: 'Month digit without leading zero'
+    MONTHNOLEADING: 'Monat ohne führende Null'
     Preview: Vorschau
-    SHORTMONTH: 'Short name of month (e.g. Jun)'
+    SHORTMONTH: 'Kurzname des Monats (z.B. Jun)'
-    TOGGLEHELP: 'Toggle formatting help'
+    TOGGLEHELP: 'Formatierungshilfe anzeigen'
-    TWODIGITDAY: 'Two-digit day of month'
+    TWODIGITDAY: 'Tag des Monats mit führender Null'
-    TWODIGITHOUR: 'Two digits of hour (00 through 23)'
+    TWODIGITHOUR: 'Stunde im 24-Stunden-Format, mit führenden Nullen'
-    TWODIGITMINUTE: 'Two digits of minute (00 through 59)'
+    TWODIGITMINUTE: 'Minute mit führenden Nullen'
-    TWODIGITMONTH: 'Two-digit month (01=January, etc.)'
+    TWODIGITMONTH: 'Monat mit führender Null (z.B. 01 = Januar, usw.)'
     TWODIGITSECOND: Sekunde
-    TWODIGITYEAR: 'Two-digit year'
+    TWODIGITYEAR: 'Zweistellige Jahreszahl'
   MemberImportForm:
     Help1: '<p>Mitglieder im <em>CSV</em>-Format (kommaseparierte Werte) importieren. <small><a href="#" class="toggle-advanced">Erweiterte Nutzung</a></small></p>'
     Help2: '<div class="advanced"><h4>Advanced usage</h4><ul><li>Gültige Spalten: <em>%s</em></li><li>Vorhandene Mitglieder werden über ihren eindeutigen <em>Code</em> ermittelt und mit den Werten aus der importierten Datei aktualisiert.</li><li>Gruppen können über die Spalte <em>Gruppen</em> zugewiesen werden. Gruppen werden über ihren eindeutigen <em>Code</em> ermittelt, mehrere Gruppen können durch ein Komma getrennt werden. Vorhandene Gruppenzugehörigkeiten werden nicht gelöscht.</li></ul></div>'
-    ResultCreated: 'Created {count} members'
+    ResultCreated: '{count} Mitglied(er) wurden erstellt'
     ResultDeleted: '%d Mitglieder gelöscht'
     ResultNone: 'Keine Änderungen'
-    ResultUpdated: 'Updated {count} members'
+    ResultUpdated: '{count} Mitglied(er) wurde(n) aktualisiert'
   MemberTableField: null
   ModelAdmin:
+    'APPLY FILTER': 'Filter anwenden'
     DELETE: Löschen
     DELETEDRECORDS: '{count} Datensätze wurden gelöscht.'
     IMPORT: 'CSV Import'
@@ -375,24 +383,31 @@ de:
     NOCSVFILE: 'Wählen sie eine CSV-Datei zum Importieren'
     NOIMPORT: 'Kein Import notwendig.'
     RESET: Zurücksetzen
-    Title: 'Data Models'
+    Title: Datenmodelle
     UPDATEDRECORDS: '{count} Datensätze wurden aktualisiert.'
+  ModelAdmin_ImportSpec.ss:
+    IMPORTSPECFIELDS: Datenbankspalten
+    IMPORTSPECLINK: 'Beschreibung von %s anzeigen'
+    IMPORTSPECRELATIONS: Relationen
+    IMPORTSPECTITLE: 'Beschreibung von %s'
+  ModelAdmin_Tools.ss:
+    FILTER: Filter
+    IMPORT: Importieren
+  ModelSidebar.ss:
+    IMPORT_TAB_HEADER: Importieren
+    SEARCHLISTINGS: Suche
   MoneyField:
     FIELDLABELAMOUNT: Betrag
     FIELDLABELCURRENCY: Währung
   NullableField:
     IsNullLabel: 'ist NULL'
   NumericField:
-    VALIDATION: '''{value}'' is not a number, only numbers can be accepted for this field'
+    VALIDATION: '''{value}'' ist kein numerischer Wert, nur nummerische Werte sind in diesem Feld erlaubt'
   Permission:
     AdminGroup: Administrator
     CMS_ACCESS_CATEGORY: 'CMS Zugriff'
     FULLADMINRIGHTS: 'Unbeschränkte Administratorenrechte'
     FULLADMINRIGHTS_HELP: 'Schließt alle anderen verfügbaren Berechtigungen ein'
-    IMPORTSPECFIELDS: 'Database columns'
-    IMPORTSPECLINK: 'Show Specification for %s'
-    IMPORTSPECRELATIONS: Relations
-    IMPORTSPECTITLE: 'Specification for %s'
   PermissionCheckboxSetField:
     AssignedTo: 'Zugewiesen an "{title}"'
     FromGroup: 'abgeleited von Gruppe "{title}"'
@@ -401,8 +416,11 @@ de:
   Permissions:
     PERMISSIONS_CATEGORY: 'Rollen und Zugriffsberechtigungen'
   PhoneNumberField:
-    Back: Zurück
     VALIDATION: 'Bitte geben Sie eine gültige Telefonnummer ein'
+  RelationComplexTableField.ss:
+    ADD: Hinzufügen
+    CSVEXPORT: 'Als CSV exportieren'
+    NOTFOUND: 'Keine Elemente gefunden'
   Security:
     ALREADYLOGGEDIN: 'Sie haben keinen Zugriff auf diese Seite. Wenn Sie ein anderes Konto besitzen, mit dem Sie auf diese Seite zugreifen können, melden Sie sich bitte unten an.'
     BUTTONSEND: 'Senden Sie mir den Link zur Passwortrücksetzung'
@@ -413,10 +431,10 @@ de:
     LOGGEDOUT: 'Sie wurden ausgeloggt. Wenn Sie sich wieder einloggen möchten, geben Sie bitte unten Ihre Zugangsdaten ein.'
     LOGIN: Anmelden
     NOTEPAGESECURED: 'Diese Seite ist geschützt. Bitte melden Sie sich an und Sie werden sofort weitergeleitet.'
-    NOTERESETLINKINVALID: '<p>The password reset link is invalid or expired.</p><p>You can request a new one <a href="{link1}">here</a> or change your password after you <a href="{link2}">logged in</a>.</p>'
+    NOTERESETLINKINVALID: '<p>Der Link zum Zurücksetzen des Passworts ist entweder nicht korrekt oder abgelaufen</p><p>Sie können <a href="{link1}">einen neuen Link anfordern</a> oder ihr Passwort nach dem <a href="{link2}">einloggen</a> ändern.</p>'
     NOTERESETPASSWORD: 'Geben Sie Ihre E-Mail-Adresse ein und wir werden Ihnen einen Link zuschicken, mit dem Sie Ihr Passwort zurücksetzen können.'
-    PASSWORDSENTHEADER: 'Password reset link sent to ''{email}'''
+    PASSWORDSENTHEADER: 'Der Link zum Zurücksetzen des Passworts wurde an {email} gesendet'
-    PASSWORDSENTTEXT: 'Thank you! A reset link has been sent to ''{email}'', provided an account exists for this email address.'
+    PASSWORDSENTTEXT: 'Vielen Dank! Wenn ein Account zu der E-Mail Adresse {email} existiert, wurde eine E-Mail mit dem Link zum Zurücksetzen des Passworts verschickt.'
   SecurityAdmin:
     ACCESS_HELP: 'Benutzer hinzufügen, anzeigen und editieren sowie diesen Berechtigungen und Rollen zuweisen.'
     APPLY_ROLES: 'Rollen zu Gruppen zuweisen'
@@ -427,7 +445,7 @@ de:
     IMPORTGROUPS: 'Gruppen importieren'
     IMPORTUSERS: 'Benutzer importieren'
     MEMBERS: Mitglieder
-    MENUTITLE: Security
+    MENUTITLE: Sicherheit
     MemberListCaution: 'Achtung: Das Entfernen von Mitgliedern aus dieser Liste löscht diese auch aus der Datenbank sowie die entsprechenden Gruppenzuweisungen.'
     NEWGROUP: 'Neue Gruppe'
     PERMISSIONS: Berechtigungen
@@ -439,33 +457,35 @@ de:
     BtnImport: Import
     FileFieldLabel: 'CSV Datei <small>(Erlaubte Dateierweiterung: *.csv)</small>'
   SilverStripeNavigator:
-    DISPLAYING: Displaying
     Edit: Bearbeiten
-    FILTER: Filter
-    IMPORT: Importieren
-    OF: of
-    TO: to
-    VIEWFIRST: 'Ersten anzeigen'
-    VIEWLAST: 'Letzten anzeigen'
-    VIEWNEXT: 'Nächsten anzeigen'
-    VIEWPREVIOUS: 'Vorigen anzeigen'
   SimpleImageField:
     NOUPLOAD: 'Es wurde kein Bild hochgeladen'
   SiteTree:
     TABMAIN: Hauptteil
   TableField:
-    ADDITEM: 'Add %s'
     ISREQUIRED: 'In %s wird ''%s'' benötigt'
-    NOITEMSFOUND: 'No items found'
+  TableField.ss:
-    SORTASC: 'Aufsteigend sortieren'
+    ADD: 'Eine neue Zeile hinzufügen'
-    SORTDESC: 'Absteigend sortieren'
+    ADDITEM: '%s hinzufügen'
   TableListField:
     CSVEXPORT: 'Exportieren zu CSV'
     PRINT: drucken
-    Print: Print
+    Print: Drucken
     SELECT: 'Auswählen:'
+  TableListField.ss:
+    NOITEMSFOUND: 'Keine Elemente gefunden'
+    SORTASC: 'Aufsteigend sortieren'
+    SORTDESC: 'Absteigend sortieren'
+  TableListField_PageControls.ss:
+    DISPLAYING: Zeige
+    OF: von
+    TO: bis
+    VIEWFIRST: 'Ersten anzeigen'
+    VIEWLAST: 'Letzten anzeigen'
+    VIEWNEXT: 'Nächsten anzeigen'
+    VIEWPREVIOUS: 'Vorigen anzeigen'
   TimeField:
-    VALIDATEFORMAT: 'Please enter a valid time format ({format})'
+    VALIDATEFORMAT: 'Bitte geben sie die Uhrzeit im korrekten Format ein ({format})'
   ToggleField:
     LESS: weniger
     MORE: mehr
@@ -473,25 +493,25 @@ de:
     ATTACHFILE: 'Datei anhängen'
     ATTACHFILES: 'Dateien anhängen'
     AttachFile: 'Dateien anhängen'
-    DELETE: 'Delete from files'
+    DELETE: 'Aus Dateien löschen'
     DELETEINFO: 'Löscht die Datei dauerhaft aus dem Dateisystem'
     DOEDIT: Speichern
     DROPFILE: 'Datei hier ablegen'
     DROPFILES: 'Dateien hier ablegen'
     Dimensions: Dimensionen
-    EDIT: Edit
+    EDIT: Bearbeiten
     EDITINFO: 'Diese Datei bearbeiten'
     FIELDNOTSET: 'Dateiinformationen nicht gefunden'
     FROMCOMPUTER: 'Von Ihrem Computer'
-    FROMCOMPUTERINFO: 'Select from files'
+    FROMCOMPUTERINFO: 'Aus Dateien auswählen'
     FROMFILES: 'Von "Dateien"'
-    MAXNUMBEROFFILES: 'Max number of {count} file(s) exceeded.'
+    MAXNUMBEROFFILES: 'Maximale Anzahl an {count}  Datei(en) überschritten'
-    MAXNUMBEROFFILESSHORT: 'Can only upload {count} files'
+    MAXNUMBEROFFILESSHORT: 'SIe können maximal {count} Datei(en) hochladen'
     REMOVE: Entfernen
     REMOVEERROR: 'Fehler beim Entfernen der Datei'
     REMOVEINFO: 'Entfernt die Datei von hier, löscht Sie aber nicht aus dem Dateisystem.'
     STARTALL: 'Alle starten'
-    STARTALLINFO: 'Start all uploads'
+    STARTALLINFO: 'Alle Uploads starten'
     Saved: Gespeichert
   Versioned:
     has_many_Versions: Versionen

lang/el.yml

@@ -50,6 +50,8 @@ el:
     UNORDERED: 'Unordered list'
     UNORDEREDDESCRIPTION: 'Unordered list'
     UNORDEREDEXAMPLE1: 'unordered item 1'
+  BackLink_Button.ss:
+    Back: Back
   BasicAuth:
     ENTERINFO: 'Please enter a username and password.'
     ERRORNOTADMIN: 'That user is not an administrator.'
@@ -57,16 +59,23 @@ el:
   Boolean:
     0: 'False'
     ANY: Any
-    Hello: Hi
-    LOGOUT: 'Log out'
     1: 'True'
+  CMSLoadingScreen.ss:
+    LOADING: Loading...
+    REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
   CMSMain:
     ACCESS: 'Access to ''{title}'' section'
     ACCESSALLINTERFACES: 'Access to all CMS sections'
     ACCESSALLINTERFACESHELP: 'Overrules more specific access settings.'
-    SAVE: Αποθήκευση
+    SAVE: 'Αποθήκευση'
   CMSProfileController:
     MENUTITLE: CMSProfileController
+  ChangePasswordEmail.ss:
+    CHANGEPASSWORDTEXT1: 'You changed your password for'
+    CHANGEPASSWORDTEXT2: 'You can now use the following credentials to log in:'
+    EMAIL: Email
+    HELLO: Hi
+    PASSWORD: Password
   CheckboxField:
     - 'False'
     - 'True'
@@ -74,6 +83,14 @@ el:
     CLOSEPOPUP: 'Close Popup'
     SUCCESSADD2: 'Added {name}'
     SUCCESSEDIT: 'Saved %s %s %s'
+  ComplexTableField.ss:
+    ADDITEM: 'Add %s'
+    NOITEMSFOUND: 'No items found'
+    SORTASC: 'Sort ascending'
+    SORTDESC: 'Sort descending'
+  ComplexTableField_popup.ss:
+    NEXT: Next
+    PREVIOUS: Previous
   ConfirmedPasswordField:
     ATLEAST: 'Passwords must be at least {min} characters long.'
     BETWEEN: 'Passwords must be {min} to {max} characters long.'
@@ -111,10 +128,7 @@ el:
     VALIDDATEMAXDATE: 'Your date has to be older or matching the maximum allowed date ({date})'
     VALIDDATEMINDATE: 'Your date has to be newer or matching the minimum allowed date ({date})'
   Director:
-    ADD: Add
-    CSVEXPORT: 'Export to CSV'
     INVALID_REQUEST: 'Invalid request'
-    NOTFOUND: 'No items found'
   DropdownField:
     CHOOSE: (Choose)
   EmailField:
@@ -124,8 +138,6 @@ el:
     SINGULARNAME: 'Email Bounce Record'
   Enum:
     ANY: Any
-    LOADING: Loading...
-    REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
   File:
     Content: Content
     Filename: Filename
@@ -150,13 +162,17 @@ el:
     FROMFILESTORE: 'From the File Store'
     NOSOURCE: 'Please select a source file to attach'
     REPLACE: 'Replace {type}'
+  FileIFrameField_iframe.ss:
+    TITLE: 'Image Uploading Iframe'
   Filesystem:
-    IMPORT_TAB_HEADER: Import
-    SEARCHLISTINGS: Search
     SYNCRESULTS: 'Sync complete: {createdcount} items created, {deletedcount} items deleted'
+  ForgotPasswordEmail.ss:
+    HELLO: Hi
+    TEXT1: 'Here is your'
+    TEXT2: 'password reset link'
+    TEXT3: for
   Form:
     FIELDISREQUIRED: '%s is required'
-    TITLE: 'Image Uploading Iframe'
     VALIDATIONCREDITNUMBER: 'Please ensure you have entered the {number} credit card number correctly'
     VALIDATIONNOTUNIQUE: 'The value entered is not unique'
     VALIDATIONPASSWORDSDONTMATCH: 'Passwords don''t match'
@@ -187,37 +203,26 @@ el:
     ResetFilter: Reset
   GridFieldAction_Delete:
     DeletePermissionsFailure: 'No delete permissions'
-    NEXT: Next
-    PREVIOUS: Previous
   GridFieldDetailForm:
     Create: Create
     Delete: Delete
     DeletePermissionsFailure: 'No delete permissions'
     Deleted: 'Deleted %s %s'
-    HELLO: Hi
     Save: Save
     Saved: 'Saved %s %s'
-    TEXT1: 'Here is your'
+  GridFieldItemEditView.ss: null
-    TEXT2: 'password reset link'
-    TEXT3: for
   Group:
     AddRole: 'Add a role for this group'
-    CHANGEPASSWORDTEXT1: 'You changed your password for'
-    CHANGEPASSWORDTEXT2: 'You can now use the following credentials to log in:'
     Code: 'Group Code'
     DefaultGroupTitleAdministrators: Administrators
     DefaultGroupTitleContentAuthors: 'Content Authors'
     Description: Description
-    EMAIL: Email
     GroupReminder: 'If you choose a parent group, this group will take all it''s roles'
-    HELLO: Hi
     Locked: 'Locked?'
     NoRoles: 'No roles found'
-    PASSWORD: Password
     Parent: 'Parent Group'
     RolesAddEditLink: 'Manage roles'
     Sort: 'Sort Order'
-    TITLE: 'Image Uploading Iframe'
     has_many_Permissions: Permissions
     many_many_Members: Members
   GroupImportForm:
@@ -275,10 +280,9 @@ el:
     UpdateMEDIA: 'Update Media'
   ImageField:
     IMAGE: Image
-  Image_iframe.ss: 'ChangePasswordEmail.ss:  BackLink_Button.ss:  CMSLoadingScreen.ss:  RelationComplexTableField.ss:  ForgotPasswordEmail.ss:    APPLY FILTER: "Apply Filter"  GridFieldItemEditView.ss:    Go back: "Go back"  ModelSidebar.ss:  TableListField_PageControls.ss:  ModelAdmin_Tools.ss:  ComplexTableField_popup.ss:  TableField.ss:  FileIFrameField_iframe.ss:  ComplexTableField.ss:  TableListField.ss:  ModelAdmin_ImportSpec.ss:  LeftAndMain_Menu.ss:'
+  Image_iframe.ss:
+    TITLE: 'Image Uploading Iframe'
   LeftAndMain:
-    ADD: 'Add a new row'
-    ADDITEM: 'Add %s'
     CANT_REORGANISE: 'You do not have permission to alter Top level pages. Your change was not saved.'
     DELETED: Deleted.
     DropdownBatchActionsDefault: Actions
@@ -292,6 +296,9 @@ el:
     REORGANISATIONSUCCESSFUL: 'Reorganised the site tree successfully.'
     SAVEDUP: Saved.
     VersionUnknown: unknown
+  LeftAndMain_Menu.ss:
+    Hello: Hi
+    LOGOUT: 'Log out'
   LoginAttempt:
     Email: 'Email Address'
     IP: 'IP Address'
@@ -368,6 +375,7 @@ el:
     ResultUpdated: 'Updated {count} members'
   MemberTableField: null
   ModelAdmin:
+    'APPLY FILTER': 'Apply Filter'
     DELETE: Delete
     DELETEDRECORDS: 'Deleted {count} records.'
     IMPORT: 'Import from CSV'
@@ -377,6 +385,17 @@ el:
     RESET: Reset
     Title: 'Data Models'
     UPDATEDRECORDS: 'Updated {count} records.'
+  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
   MoneyField:
     FIELDLABELAMOUNT: Amount
     FIELDLABELCURRENCY: Currency
@@ -389,10 +408,6 @@ el:
     CMS_ACCESS_CATEGORY: 'CMS Access'
     FULLADMINRIGHTS: 'Full administrative rights'
     FULLADMINRIGHTS_HELP: 'Implies and overrules all other assigned permissions.'
-    IMPORTSPECFIELDS: 'Database columns'
-    IMPORTSPECLINK: 'Show Specification for %s'
-    IMPORTSPECRELATIONS: Relations
-    IMPORTSPECTITLE: 'Specification for %s'
   PermissionCheckboxSetField:
     AssignedTo: 'assigned to "{title}"'
     FromGroup: 'inherited from group "{title}"'
@@ -401,8 +416,11 @@ el:
   Permissions:
     PERMISSIONS_CATEGORY: 'Roles and access permissions'
   PhoneNumberField:
-    Back: Back
     VALIDATION: 'Please enter a valid phone number'
+  RelationComplexTableField.ss:
+    ADD: Add
+    CSVEXPORT: 'Export to CSV'
+    NOTFOUND: 'No items found'
   Security:
     ALREADYLOGGEDIN: 'You don''t have access to this page.  If you have another account that can access that page, you can log in again below.'
     BUTTONSEND: 'Send me the password reset link'
@@ -439,31 +457,33 @@ el:
     BtnImport: 'Import from CSV'
     FileFieldLabel: 'CSV File <small>(Allowed extensions: *.csv)</small>'
   SilverStripeNavigator:
-    DISPLAYING: Displaying
     Edit: Edit
-    FILTER: Filter
+  SimpleImageField:
-    IMPORT: Import
+    NOUPLOAD: 'No Image Uploaded'
+  SiteTree:
+    TABMAIN: Main
+  TableField:
+    ISREQUIRED: 'In %s ''%s'' is required'
+  TableField.ss:
+    ADD: 'Add a new row'
+    ADDITEM: 'Add %s'
+  TableListField:
+    CSVEXPORT: 'Export to CSV'
+    PRINT: Print
+    Print: Print
+    SELECT: 'Select:'
+  TableListField.ss:
+    NOITEMSFOUND: 'No items found'
+    SORTASC: 'Sort in ascending order'
+    SORTDESC: 'Sort in descending order'
+  TableListField_PageControls.ss:
+    DISPLAYING: Displaying
     OF: of
     TO: to
     VIEWFIRST: 'View first'
     VIEWLAST: 'View last'
     VIEWNEXT: 'View next'
     VIEWPREVIOUS: 'View previous'
-  SimpleImageField:
-    NOUPLOAD: 'No Image Uploaded'
-  SiteTree:
-    TABMAIN: Main
-  TableField:
-    ADDITEM: 'Add %s'
-    ISREQUIRED: 'In %s ''%s'' is required'
-    NOITEMSFOUND: 'No items found'
-    SORTASC: 'Sort in ascending order'
-    SORTDESC: 'Sort in descending order'
-  TableListField:
-    CSVEXPORT: 'Export to CSV'
-    PRINT: Print
-    Print: Print
-    SELECT: 'Select:'
   TimeField:
     VALIDATEFORMAT: 'Please enter a valid time format ({format})'
   ToggleField:

lang/en.yml

@@ -166,6 +166,9 @@ en:
     TITLE: 'Image Uploading Iframe'
   Filesystem:
     SYNCRESULTS: 'Sync complete: {createdcount} items created, {deletedcount} items deleted'
+  Folder:
+    PLURALNAME: Folders
+    SINGULARNAME: Folder
   ForgotPasswordEmail.ss:
     HELLO: Hi
     TEXT1: 'Here is your'
@@ -221,8 +224,10 @@ en:
     GroupReminder: 'If you choose a parent group, this group will take all it''s roles'
     Locked: 'Locked?'
     NoRoles: 'No roles found'
+    PLURALNAME: Groups
     Parent: 'Parent Group'
     RolesAddEditLink: 'Manage roles'
+    SINGULARNAME: Group
     Sort: 'Sort Order'
     has_many_Permissions: Permissions
     many_many_Members: Members
@@ -279,8 +284,14 @@ en:
     URL: URL
     URLNOTANOEMBEDRESOURCE: 'The URL ''{url}'' could not be turned into a media resource.'
     UpdateMEDIA: 'Update Media'
+  Image:
+    PLURALNAME: Files
+    SINGULARNAME: File
   ImageField:
     IMAGE: Image
+  Image_Cached:
+    PLURALNAME: Files
+    SINGULARNAME: File
   Image_iframe.ss:
     TITLE: 'Image Uploading Iframe'
   LeftAndMain:
@@ -303,6 +314,8 @@ en:
   LoginAttempt:
     Email: 'Email Address'
     IP: 'IP Address'
+    PLURALNAME: 'Login Attempts'
+    SINGULARNAME: 'Login Attempt'
     Status: Status
   Member:
     ADDGROUP: 'Add group'
@@ -374,6 +387,9 @@ en:
     ResultDeleted: 'Deleted %d members'
     ResultNone: 'No changes'
     ResultUpdated: 'Updated {count} members'
+  MemberPassword:
+    PLURALNAME: 'Member Passwords'
+    SINGULARNAME: 'Member Password'
   MemberTableField:
     'APPLY FILTER': 'Apply Filter'
   ModelAdmin:
@@ -409,11 +425,19 @@ en:
     CMS_ACCESS_CATEGORY: 'CMS Access'
     FULLADMINRIGHTS: 'Full administrative rights'
     FULLADMINRIGHTS_HELP: 'Implies and overrules all other assigned permissions.'
+    PLURALNAME: Permissions
+    SINGULARNAME: Permission
   PermissionCheckboxSetField:
     AssignedTo: 'assigned to "{title}"'
     FromGroup: 'inherited from group "{title}"'
     FromRole: 'inherited from role "{title}"'
     FromRoleOnGroup: 'inherited from role "%s" on group "%s"'
+  PermissionRole:
+    PLURALNAME: Roles
+    SINGULARNAME: Role
+  PermissionRoleCode:
+    PLURALNAME: 'Permission Role Cods'
+    SINGULARNAME: 'Permission Role Code'
   Permissions:
     PERMISSIONS_CATEGORY: 'Roles and access permissions'
   PhoneNumberField:

lang/en_GB.yml

@@ -50,6 +50,8 @@ en_GB:
     UNORDERED: 'Unordered list'
     UNORDEREDDESCRIPTION: 'Unordered list'
     UNORDEREDEXAMPLE1: 'unordered item 1'
+  BackLink_Button.ss:
+    Back: Back
   BasicAuth:
     ENTERINFO: 'Please enter a username and password.'
     ERRORNOTADMIN: 'That user is not an administrator.'
@@ -57,9 +59,10 @@ en_GB:
   Boolean:
     0: 'False'
     ANY: Any
-    Hello: Hi
-    LOGOUT: 'Log out'
     1: 'True'
+  CMSLoadingScreen.ss:
+    LOADING: Loading...
+    REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
   CMSMain:
     ACCESS: 'Access to ''{title}'' section'
     ACCESSALLINTERFACES: 'Access to all CMS sections'
@@ -67,6 +70,12 @@ en_GB:
     SAVE: Save
   CMSProfileController:
     MENUTITLE: CMSProfileController
+  ChangePasswordEmail.ss:
+    CHANGEPASSWORDTEXT1: 'You changed your password for'
+    CHANGEPASSWORDTEXT2: 'You can now use the following credentials to log in:'
+    EMAIL: Email
+    HELLO: Hello
+    PASSWORD: Password
   CheckboxField:
     - 'False'
     - 'True'
@@ -74,6 +83,14 @@ en_GB:
     CLOSEPOPUP: 'Close Popup'
     SUCCESSADD2: 'Added {name}'
     SUCCESSEDIT: 'Saved %s %s %s'
+  ComplexTableField.ss:
+    ADDITEM: 'Add %s'
+    NOITEMSFOUND: 'No items found'
+    SORTASC: 'Sort ascending'
+    SORTDESC: 'Sort descending'
+  ComplexTableField_popup.ss:
+    NEXT: Next
+    PREVIOUS: Previous
   ConfirmedPasswordField:
     ATLEAST: 'Passwords must be at least {min} characters long.'
     BETWEEN: 'Passwords must be {min} to {max} characters long.'
@@ -111,10 +128,7 @@ en_GB:
     VALIDDATEMAXDATE: 'Your date has to be older or matching the maximum allowed date ({date})'
     VALIDDATEMINDATE: 'Your date has to be newer or matching the minimum allowed date ({date})'
   Director:
-    ADD: Add
-    CSVEXPORT: 'Export to CSV'
     INVALID_REQUEST: 'Invalid request'
-    NOTFOUND: 'No items found'
   DropdownField:
     CHOOSE: (Choose)
   EmailField:
@@ -124,8 +138,6 @@ en_GB:
     SINGULARNAME: 'Email Bounce Record'
   Enum:
     ANY: Any
-    LOADING: Loading...
-    REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
   File:
     Content: Content
     Filename: Filename
@@ -150,13 +162,17 @@ en_GB:
     FROMFILESTORE: 'From the File Store'
     NOSOURCE: 'Please select a source file to attach'
     REPLACE: 'Replace {type}'
+  FileIFrameField_iframe.ss:
+    TITLE: 'Image Uploading Iframe'
   Filesystem:
-    IMPORT_TAB_HEADER: Import
-    SEARCHLISTINGS: Search
     SYNCRESULTS: 'Sync complete: {createdcount} items created, {deletedcount} items deleted'
+  ForgotPasswordEmail.ss:
+    HELLO: Hello
+    TEXT1: 'Here is your'
+    TEXT2: 'password reset link'
+    TEXT3: for
   Form:
     FIELDISREQUIRED: '%s is required.'
-    TITLE: 'Image Uploading Iframe'
     VALIDATIONCREDITNUMBER: 'Please ensure you have entered the {number} credit card number correctly'
     VALIDATIONNOTUNIQUE: 'The value entered is not unique'
     VALIDATIONPASSWORDSDONTMATCH: 'Passwords don''t match'
@@ -187,37 +203,26 @@ en_GB:
     ResetFilter: Reset
   GridFieldAction_Delete:
     DeletePermissionsFailure: 'No delete permissions'
-    NEXT: Next
-    PREVIOUS: Previous
   GridFieldDetailForm:
     Create: Create
     Delete: Delete
     DeletePermissionsFailure: 'No delete permissions'
     Deleted: 'Deleted %s %s'
-    HELLO: Hello
     Save: Save
     Saved: 'Saved %s %s'
-    TEXT1: 'Here is your'
+  GridFieldItemEditView.ss: null
-    TEXT2: 'password reset link'
-    TEXT3: for
   Group:
     AddRole: 'Add a role for this group'
-    CHANGEPASSWORDTEXT1: 'You changed your password for'
-    CHANGEPASSWORDTEXT2: 'You can now use the following credentials to log in:'
     Code: 'Group Code'
     DefaultGroupTitleAdministrators: Administrators
     DefaultGroupTitleContentAuthors: 'Content Authors'
     Description: Description
-    EMAIL: Email
     GroupReminder: 'If you choose a parent group, this group will take all it''s roles'
-    HELLO: Hello
     Locked: 'Locked?'
     NoRoles: 'No roles found'
-    PASSWORD: Password
     Parent: 'Parent Group'
     RolesAddEditLink: 'Manage roles'
     Sort: 'Sort Order'
-    TITLE: 'Image Uploading Iframe'
     has_many_Permissions: Permissions
     many_many_Members: Members
   GroupImportForm:
@@ -275,10 +280,9 @@ en_GB:
     UpdateMEDIA: 'Update Media'
   ImageField:
     IMAGE: Image
-  Image_iframe.ss: 'ChangePasswordEmail.ss:  BackLink_Button.ss:  CMSLoadingScreen.ss:  RelationComplexTableField.ss:  ForgotPasswordEmail.ss:    APPLY FILTER: "Apply Filter"  GridFieldItemEditView.ss:    Go back: "Go back"  ModelSidebar.ss:  TableListField_PageControls.ss:  ModelAdmin_Tools.ss:  ComplexTableField_popup.ss:  TableField.ss:  FileIFrameField_iframe.ss:  ComplexTableField.ss:  TableListField.ss:  ModelAdmin_ImportSpec.ss:  LeftAndMain_Menu.ss:'
+  Image_iframe.ss:
+    TITLE: 'Image Uploading Iframe'
   LeftAndMain:
-    ADD: 'Add a new row'
-    ADDITEM: 'Add %s'
     CANT_REORGANISE: 'You do not have permission to alter Top level pages. Your change was not saved.'
     DELETED: Deleted.
     DropdownBatchActionsDefault: Actions
@@ -292,6 +296,9 @@ en_GB:
     REORGANISATIONSUCCESSFUL: 'Reorganised the site tree successfully.'
     SAVEDUP: Saved.
     VersionUnknown: unknown
+  LeftAndMain_Menu.ss:
+    Hello: Hi
+    LOGOUT: 'Log out'
   LoginAttempt:
     Email: 'Email Address'
     IP: 'IP Address'
@@ -368,6 +375,7 @@ en_GB:
     ResultUpdated: 'Updated {count} members'
   MemberTableField: null
   ModelAdmin:
+    'APPLY FILTER': 'Apply Filter'
     DELETE: Delete
     DELETEDRECORDS: 'Deleted {count} records.'
     IMPORT: 'Import from CSV'
@@ -377,6 +385,17 @@ en_GB:
     RESET: Reset
     Title: 'Data Models'
     UPDATEDRECORDS: 'Updated {count} records.'
+  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
   MoneyField:
     FIELDLABELAMOUNT: Amount
     FIELDLABELCURRENCY: Currency
@@ -389,10 +408,6 @@ en_GB:
     CMS_ACCESS_CATEGORY: 'CMS Access'
     FULLADMINRIGHTS: 'Full administrative rights'
     FULLADMINRIGHTS_HELP: 'Implies and overrules all other assigned permissions.'
-    IMPORTSPECFIELDS: 'Database columns'
-    IMPORTSPECLINK: 'Show Specification for %s'
-    IMPORTSPECRELATIONS: Relations
-    IMPORTSPECTITLE: 'Specification for %s'
   PermissionCheckboxSetField:
     AssignedTo: 'assigned to "{title}"'
     FromGroup: 'inherited from group "{title}"'
@@ -401,8 +416,11 @@ en_GB:
   Permissions:
     PERMISSIONS_CATEGORY: 'Roles and access permissions'
   PhoneNumberField:
-    Back: Back
     VALIDATION: 'Please enter a valid phone number'
+  RelationComplexTableField.ss:
+    ADD: Add
+    CSVEXPORT: 'Export to CSV'
+    NOTFOUND: 'No items found'
   Security:
     ALREADYLOGGEDIN: 'You don''t have access to this page. If you have another account that can access that page, you can <a href="%s">log in again</a>.'
     BUTTONSEND: 'Send me the password reset link'
@@ -439,31 +457,33 @@ en_GB:
     BtnImport: 'Import from CSV'
     FileFieldLabel: 'CSV File <small>(Allowed extensions: *.csv)</small>'
   SilverStripeNavigator:
-    DISPLAYING: Displaying
     Edit: Edit
-    FILTER: Filter
+  SimpleImageField:
-    IMPORT: Import
+    NOUPLOAD: 'No Image Uploaded'
+  SiteTree:
+    TABMAIN: Main
+  TableField:
+    ISREQUIRED: 'In %s ''%s'' is required'
+  TableField.ss:
+    ADD: 'Add a new row'
+    ADDITEM: 'Add %s'
+  TableListField:
+    CSVEXPORT: 'Export to CSV'
+    PRINT: Print
+    Print: Print
+    SELECT: 'Select:'
+  TableListField.ss:
+    NOITEMSFOUND: 'No items found'
+    SORTASC: 'Sort in ascending order'
+    SORTDESC: 'Sort in descending order'
+  TableListField_PageControls.ss:
+    DISPLAYING: Displaying
     OF: of
     TO: to
     VIEWFIRST: 'View first'
     VIEWLAST: 'View last'
     VIEWNEXT: 'View next'
     VIEWPREVIOUS: 'View previous'
-  SimpleImageField:
-    NOUPLOAD: 'No Image Uploaded'
-  SiteTree:
-    TABMAIN: Main
-  TableField:
-    ADDITEM: 'Add %s'
-    ISREQUIRED: 'In %s ''%s'' is required'
-    NOITEMSFOUND: 'No items found'
-    SORTASC: 'Sort in ascending order'
-    SORTDESC: 'Sort in descending order'
-  TableListField:
-    CSVEXPORT: 'Export to CSV'
-    PRINT: Print
-    Print: Print
-    SELECT: 'Select:'
   TimeField:
     VALIDATEFORMAT: 'Please enter a valid time format ({format})'
   ToggleField:

lang/eo.yml

@@ -50,6 +50,8 @@ eo:
     UNORDERED: 'Neordigita listo'
     UNORDEREDDESCRIPTION: 'Neordigita listo'
     UNORDEREDEXAMPLE1: 'neordigita ero 1'
+  BackLink_Button.ss:
+    Back: Back
   BasicAuth:
     ENTERINFO: 'bonvolu enigi salutnomon kaj pasvorton.'
     ERRORNOTADMIN: 'Tiu uzanto ne estas administranto.'
@@ -57,9 +59,10 @@ eo:
   Boolean:
     0: Ne
     ANY: Ajna
-    Hello: Hi
-    LOGOUT: 'Log out'
     1: Jes
+  CMSLoadingScreen.ss:
+    LOADING: Loading...
+    REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
   CMSMain:
     ACCESS: 'Access to ''{title}'' section'
     ACCESSALLINTERFACES: 'Aliro al ĉiuj interfacoj de CMS'
@@ -67,6 +70,12 @@ eo:
     SAVE: Konservi
   CMSProfileController:
     MENUTITLE: CMSProfileController
+  ChangePasswordEmail.ss:
+    CHANGEPASSWORDTEXT1: 'Vi ŝanĝis vian pasvorton por'
+    CHANGEPASSWORDTEXT2: 'Nun vi povas uzi la jenan legitimaĵon por ensaluti:'
+    EMAIL: Retpoŝto
+    HELLO: Saluton
+    PASSWORD: Pasvorto
   CheckboxField:
     - Ne
     - Jes
@@ -74,6 +83,14 @@ eo:
     CLOSEPOPUP: 'Fermi Ŝprucfenestron'
     SUCCESSADD2: 'Added {name}'
     SUCCESSEDIT: 'Konservita %s %s %s'
+  ComplexTableField.ss:
+    ADDITEM: 'Add %s'
+    NOITEMSFOUND: 'No items found'
+    SORTASC: 'Ordigi kreske'
+    SORTDESC: 'Ordigi malkreske'
+  ComplexTableField_popup.ss:
+    NEXT: Sekva
+    PREVIOUS: Antaŭa
   ConfirmedPasswordField:
     ATLEAST: 'Passwords must be at least {min} characters long.'
     BETWEEN: 'Passwords must be {min} to {max} characters long.'
@@ -111,10 +128,7 @@ eo:
     VALIDDATEMAXDATE: 'Your date has to be older or matching the maximum allowed date ({date})'
     VALIDDATEMINDATE: 'Your date has to be newer or matching the minimum allowed date ({date})'
   Director:
-    ADD: Enmeti
-    CSVEXPORT: 'Export to CSV'
     INVALID_REQUEST: 'Invalid request'
-    NOTFOUND: 'No items found'
   DropdownField:
     CHOOSE: (Elekti)
   EmailField:
@@ -124,8 +138,6 @@ eo:
     SINGULARNAME: 'Registro de neliverita mesaĝo'
   Enum:
     ANY: Ajna
-    LOADING: Loading...
-    REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
   File:
     Content: Enhavo
     Filename: Dosiernomo
@@ -150,13 +162,17 @@ eo:
     FROMFILESTORE: 'El la dosiera konservejo'
     NOSOURCE: 'Bonvolu elekti fontan dosieron por alkroĉi'
     REPLACE: 'Replace {type}'
+  FileIFrameField_iframe.ss:
+    TITLE: 'Image Uploading Iframe'
   Filesystem:
-    IMPORT_TAB_HEADER: Import
-    SEARCHLISTINGS: Search
     SYNCRESULTS: 'Sync complete: {createdcount} items created, {deletedcount} items deleted'
+  ForgotPasswordEmail.ss:
+    HELLO: Saluton
+    TEXT1: 'Jen via'
+    TEXT2: 'pasvorta reagorda ligilo'
+    TEXT3: por
   Form:
     FIELDISREQUIRED: '%s estas postulita'
-    TITLE: 'Image Uploading Iframe'
     VALIDATIONCREDITNUMBER: 'Please ensure you have entered the {number} credit card number correctly'
     VALIDATIONNOTUNIQUE: 'La enirita valoron ne unika'
     VALIDATIONPASSWORDSDONTMATCH: 'Pasvortoj ne matĉas'
@@ -187,37 +203,26 @@ eo:
     ResetFilter: Reset
   GridFieldAction_Delete:
     DeletePermissionsFailure: 'No delete permissions'
-    NEXT: Sekva
-    PREVIOUS: Antaŭa
   GridFieldDetailForm:
     Create: Create
     Delete: Delete
     DeletePermissionsFailure: 'No delete permissions'
     Deleted: 'Deleted %s %s'
-    HELLO: Saluton
     Save: Save
     Saved: 'Saved %s %s'
-    TEXT1: 'Jen via'
+  GridFieldItemEditView.ss: null
-    TEXT2: 'pasvorta reagorda ligilo'
-    TEXT3: por
   Group:
     AddRole: 'Add a role for this group'
-    CHANGEPASSWORDTEXT1: 'Vi ŝanĝis vian pasvorton por'
-    CHANGEPASSWORDTEXT2: 'Nun vi povas uzi la jenan legitimaĵon por ensaluti:'
     Code: 'Grupa Kodo'
     DefaultGroupTitleAdministrators: Administrantoj
     DefaultGroupTitleContentAuthors: Enhavaŭtoroj
     Description: Priskribo
-    EMAIL: Retpoŝto
     GroupReminder: 'If you choose a parent group, this group will take all it''s roles'
-    HELLO: Saluton
     Locked: 'Ŝlosita?'
     NoRoles: 'No roles found'
-    PASSWORD: Pasvorto
     Parent: 'Patra Grupo'
     RolesAddEditLink: 'Aldoni/redakti rolojn'
     Sort: 'Ordiga Ordo'
-    TITLE: 'Iframe por alŝuti bildon'
     has_many_Permissions: Permesoj
     many_many_Members: Membroj
   GroupImportForm:
@@ -275,10 +280,9 @@ eo:
     UpdateMEDIA: 'Update Media'
   ImageField:
     IMAGE: Bildo
-  Image_iframe.ss: 'ChangePasswordEmail.ss:  BackLink_Button.ss:  CMSLoadingScreen.ss:  RelationComplexTableField.ss:  ForgotPasswordEmail.ss:    APPLY FILTER: "Apply Filter"  GridFieldItemEditView.ss:    Go back: "Go back"  ModelSidebar.ss:  TableListField_PageControls.ss:  ModelAdmin_Tools.ss:  ComplexTableField_popup.ss:  TableField.ss:  FileIFrameField_iframe.ss:  ComplexTableField.ss:  TableListField.ss:  ModelAdmin_ImportSpec.ss:  LeftAndMain_Menu.ss:'
+  Image_iframe.ss:
+    TITLE: 'Iframe por alŝuti bildon'
   LeftAndMain:
-    ADD: 'Enmeti novan vicon'
-    ADDITEM: 'Add %s'
     CANT_REORGANISE: 'You do not have permission to alter Top level pages. Your change was not saved.'
     DELETED: Deleted.
     DropdownBatchActionsDefault: Actions
@@ -292,6 +296,9 @@ eo:
     REORGANISATIONSUCCESSFUL: 'Reorganised the site tree successfully.'
     SAVEDUP: Saved.
     VersionUnknown: unknown
+  LeftAndMain_Menu.ss:
+    Hello: Hi
+    LOGOUT: 'Log out'
   LoginAttempt:
     Email: Retadreso
     IP: IP-Adreso
@@ -368,6 +375,7 @@ eo:
     ResultUpdated: 'Updated {count} members'
   MemberTableField: null
   ModelAdmin:
+    'APPLY FILTER': 'Apply Filter'
     DELETE: Forigi
     DELETEDRECORDS: 'Deleted {count} records.'
     IMPORT: 'Importi el CSV'
@@ -377,6 +385,17 @@ eo:
     RESET: Reset
     Title: 'Data Models'
     UPDATEDRECORDS: 'Updated {count} records.'
+  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
   MoneyField:
     FIELDLABELAMOUNT: Kvanto
     FIELDLABELCURRENCY: Kurzo
@@ -389,10 +408,6 @@ eo:
     CMS_ACCESS_CATEGORY: CMS-aliro
     FULLADMINRIGHTS: 'Ĉiuj administraj rajtoj'
     FULLADMINRIGHTS_HELP: 'Implicas kaj superregas ĉiujn aliajn agorditajn permesojn.'
-    IMPORTSPECFIELDS: 'Database columns'
-    IMPORTSPECLINK: 'Show Specification for %s'
-    IMPORTSPECRELATIONS: Relations
-    IMPORTSPECTITLE: 'Specification for %s'
   PermissionCheckboxSetField:
     AssignedTo: 'assigned to "{title}"'
     FromGroup: 'inherited from group "{title}"'
@@ -401,8 +416,11 @@ eo:
   Permissions:
     PERMISSIONS_CATEGORY: 'Roloj kaj aliraj permesoj'
   PhoneNumberField:
-    Back: Back
     VALIDATION: 'Bonvolu enigi validan telefonnumeron'
+  RelationComplexTableField.ss:
+    ADD: Enmeti
+    CSVEXPORT: 'Export to CSV'
+    NOTFOUND: 'No items found'
   Security:
     ALREADYLOGGEDIN: 'Vi ne rajtas aliri ĉi tiun paĝon. Se vi havas alian konton kiu rajtas aliri tiun paĝon, vi povas <a href="%s">ensaluti denove</a>.'
     BUTTONSEND: 'Sendu al mi la ligilon reagordi pasvorton'
@@ -439,31 +457,33 @@ eo:
     BtnImport: Importi
     FileFieldLabel: 'CSV-dosiero <small>(Permesitaj sufiksoj: *.csv)</small>'
   SilverStripeNavigator:
-    DISPLAYING: Displaying
     Edit: Edit
-    FILTER: Filter
+  SimpleImageField:
-    IMPORT: Import
+    NOUPLOAD: 'Neniu Bildo Alŝutita'
+  SiteTree:
+    TABMAIN: Ĉefaj
+  TableField:
+    ISREQUIRED: 'In %s ''%s'' is required'
+  TableField.ss:
+    ADD: 'Enmeti novan vicon'
+    ADDITEM: 'Add %s'
+  TableListField:
+    CSVEXPORT: 'Eksporti al CSV'
+    PRINT: Presi
+    Print: Print
+    SELECT: 'Select:'
+  TableListField.ss:
+    NOITEMSFOUND: 'No items found'
+    SORTASC: 'Ordigi kreskante'
+    SORTDESC: 'Ordigi malkreskante'
+  TableListField_PageControls.ss:
+    DISPLAYING: Displaying
     OF: of
     TO: to
     VIEWFIRST: 'Vidigi unuan'
     VIEWLAST: 'Vidigi lastan'
     VIEWNEXT: 'Vidigi sekvan'
     VIEWPREVIOUS: 'Vidigi antaŭan'
-  SimpleImageField:
-    NOUPLOAD: 'Neniu Bildo Alŝutita'
-  SiteTree:
-    TABMAIN: Ĉefaj
-  TableField:
-    ADDITEM: 'Add %s'
-    ISREQUIRED: 'In %s ''%s'' is required'
-    NOITEMSFOUND: 'No items found'
-    SORTASC: 'Ordigi kreskante'
-    SORTDESC: 'Ordigi malkreskante'
-  TableListField:
-    CSVEXPORT: 'Eksporti al CSV'
-    PRINT: Presi
-    Print: Print
-    SELECT: 'Select:'
   TimeField:
     VALIDATEFORMAT: 'Please enter a valid time format ({format})'
   ToggleField:

lang/es.yml

@@ -50,6 +50,8 @@ es:
     UNORDERED: 'Lista desordenada'
     UNORDEREDDESCRIPTION: 'Lista desordenada'
     UNORDEREDEXAMPLE1: 'elemento 1 desordenado'
+  BackLink_Button.ss:
+    Back: Back
   BasicAuth:
     ENTERINFO: 'Por favor introduzca su nombre de usuario y contraseña.'
     ERRORNOTADMIN: 'Ese usuario no es un administrador.'
@@ -57,9 +59,10 @@ es:
   Boolean:
     0: 'False'
     ANY: Any
-    Hello: Hi
-    LOGOUT: 'Log out'
     1: 'True'
+  CMSLoadingScreen.ss:
+    LOADING: Loading...
+    REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
   CMSMain:
     ACCESS: 'Access to ''{title}'' section'
     ACCESSALLINTERFACES: 'Acceder a todas las interfaces del CMS'
@@ -67,6 +70,12 @@ es:
     SAVE: Guardar
   CMSProfileController:
     MENUTITLE: CMSProfileController
+  ChangePasswordEmail.ss:
+    CHANGEPASSWORDTEXT1: 'Has cambiado tu contraseña por'
+    CHANGEPASSWORDTEXT2: 'Ahora puede utilizar los siguientes datos de acreditación para iniciar sesión:'
+    EMAIL: 'Correo electrónico'
+    HELLO: Hola
+    PASSWORD: Contraseña
   CheckboxField:
     - 'False'
     - 'True'
@@ -74,6 +83,14 @@ es:
     CLOSEPOPUP: 'Cerrar Popup'
     SUCCESSADD2: 'Added {name}'
     SUCCESSEDIT: 'Guardado %s %s %s'
+  ComplexTableField.ss:
+    ADDITEM: 'Add %s'
+    NOITEMSFOUND: 'No items found'
+    SORTASC: 'Orden Ascendente'
+    SORTDESC: 'Orden Descendente'
+  ComplexTableField_popup.ss:
+    NEXT: Siguiente
+    PREVIOUS: Anterior
   ConfirmedPasswordField:
     ATLEAST: 'Passwords must be at least {min} characters long.'
     BETWEEN: 'Passwords must be {min} to {max} characters long.'
@@ -111,10 +128,7 @@ es:
     VALIDDATEMAXDATE: 'Your date has to be older or matching the maximum allowed date ({date})'
     VALIDDATEMINDATE: 'Your date has to be newer or matching the minimum allowed date ({date})'
   Director:
-    ADD: Añadir
-    CSVEXPORT: 'Export to CSV'
     INVALID_REQUEST: 'Invalid request'
-    NOTFOUND: 'No items found'
   DropdownField:
     CHOOSE: (Elegir)
   EmailField:
@@ -124,8 +138,6 @@ es:
     SINGULARNAME: 'Email Bounce Record'
   Enum:
     ANY: Any
-    LOADING: Loading...
-    REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
   File:
     Content: Contenido
     Filename: 'Nombre del archivo'
@@ -150,13 +162,17 @@ es:
     FROMFILESTORE: 'From the File Store'
     NOSOURCE: 'Please select a source file to attach'
     REPLACE: 'Replace {type}'
+  FileIFrameField_iframe.ss:
+    TITLE: 'Image Uploading Iframe'
   Filesystem:
-    IMPORT_TAB_HEADER: Import
-    SEARCHLISTINGS: Search
     SYNCRESULTS: 'Sync complete: {createdcount} items created, {deletedcount} items deleted'
+  ForgotPasswordEmail.ss:
+    HELLO: Hola
+    TEXT1: 'Aquí tiene su'
+    TEXT2: 'enlace para restablecer contraseña'
+    TEXT3: para
   Form:
     FIELDISREQUIRED: 'se requiere llenar el campo %s'
-    TITLE: 'Image Uploading Iframe'
     VALIDATIONCREDITNUMBER: 'Please ensure you have entered the {number} credit card number correctly'
     VALIDATIONNOTUNIQUE: 'El valor que se ha introducido no es único'
     VALIDATIONPASSWORDSDONTMATCH: 'Las contraseñas no concuerdan'
@@ -187,37 +203,26 @@ es:
     ResetFilter: Reset
   GridFieldAction_Delete:
     DeletePermissionsFailure: 'No delete permissions'
-    NEXT: Siguiente
-    PREVIOUS: Anterior
   GridFieldDetailForm:
     Create: Create
     Delete: Delete
     DeletePermissionsFailure: 'No delete permissions'
     Deleted: 'Deleted %s %s'
-    HELLO: Hola
     Save: Save
     Saved: 'Saved %s %s'
-    TEXT1: 'Aquí tiene su'
+  GridFieldItemEditView.ss: null
-    TEXT2: 'enlace para restablecer contraseña'
-    TEXT3: para
   Group:
     AddRole: 'Add a role for this group'
-    CHANGEPASSWORDTEXT1: 'Has cambiado tu contraseña por'
-    CHANGEPASSWORDTEXT2: 'Ahora puede utilizar los siguientes datos de acreditación para iniciar sesión:'
     Code: 'Código de grupo'
     DefaultGroupTitleAdministrators: Administrators
     DefaultGroupTitleContentAuthors: 'Content Authors'
     Description: Descripción
-    EMAIL: 'Correo electrónico'
     GroupReminder: 'If you choose a parent group, this group will take all it''s roles'
-    HELLO: Hola
     Locked: '¿Bloqueado?'
     NoRoles: 'No roles found'
-    PASSWORD: Contraseña
     Parent: 'Grupo Padre'
     RolesAddEditLink: 'Manage roles'
     Sort: 'Orden de Clasificación'
-    TITLE: 'Iframe para agregar imágenes'
     has_many_Permissions: Permisos
     many_many_Members: Miembros
   GroupImportForm:
@@ -275,10 +280,9 @@ es:
     UpdateMEDIA: 'Update Media'
   ImageField:
     IMAGE: Image
-  Image_iframe.ss: 'ChangePasswordEmail.ss:  BackLink_Button.ss:  CMSLoadingScreen.ss:  RelationComplexTableField.ss:  ForgotPasswordEmail.ss:    APPLY FILTER: "Apply Filter"  GridFieldItemEditView.ss:    Go back: "Go back"  ModelSidebar.ss:  TableListField_PageControls.ss:  ModelAdmin_Tools.ss:  ComplexTableField_popup.ss:  TableField.ss:  FileIFrameField_iframe.ss:  ComplexTableField.ss:  TableListField.ss:  ModelAdmin_ImportSpec.ss:  LeftAndMain_Menu.ss:'
+  Image_iframe.ss:
+    TITLE: 'Iframe para agregar imágenes'
   LeftAndMain:
-    ADD: 'Añadir una nueva línea'
-    ADDITEM: 'Add %s'
     CANT_REORGANISE: 'You do not have permission to alter Top level pages. Your change was not saved.'
     DELETED: Deleted.
     DropdownBatchActionsDefault: Actions
@@ -292,6 +296,9 @@ es:
     REORGANISATIONSUCCESSFUL: 'Reorganised the site tree successfully.'
     SAVEDUP: Saved.
     VersionUnknown: unknown
+  LeftAndMain_Menu.ss:
+    Hello: Hi
+    LOGOUT: 'Log out'
   LoginAttempt:
     Email: 'Correo electrónico'
     IP: 'Dirección IP'
@@ -368,6 +375,7 @@ es:
     ResultUpdated: 'Updated {count} members'
   MemberTableField: null
   ModelAdmin:
+    'APPLY FILTER': 'Apply Filter'
     DELETE: Eliminar
     DELETEDRECORDS: 'Deleted {count} records.'
     IMPORT: 'Importar desde CSV'
@@ -377,6 +385,17 @@ es:
     RESET: Reset
     Title: 'Data Models'
     UPDATEDRECORDS: 'Updated {count} records.'
+  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
   MoneyField:
     FIELDLABELAMOUNT: Amount
     FIELDLABELCURRENCY: Currency
@@ -389,10 +408,6 @@ es:
     CMS_ACCESS_CATEGORY: 'CMS Access'
     FULLADMINRIGHTS: 'Todos los derechos administrativos'
     FULLADMINRIGHTS_HELP: 'Implies and overrules all other assigned permissions.'
-    IMPORTSPECFIELDS: 'Database columns'
-    IMPORTSPECLINK: 'Show Specification for %s'
-    IMPORTSPECRELATIONS: Relations
-    IMPORTSPECTITLE: 'Specification for %s'
   PermissionCheckboxSetField:
     AssignedTo: 'assigned to "{title}"'
     FromGroup: 'inherited from group "{title}"'
@@ -401,8 +416,11 @@ es:
   Permissions:
     PERMISSIONS_CATEGORY: 'Roles and access permissions'
   PhoneNumberField:
-    Back: Back
     VALIDATION: 'Por favor introduzca un número de teléfono válido'
+  RelationComplexTableField.ss:
+    ADD: Añadir
+    CSVEXPORT: 'Export to CSV'
+    NOTFOUND: 'No items found'
   Security:
     ALREADYLOGGEDIN: 'No tiene acceso a esta página. Si posee otra cuenta con los privilegios para acceder a esta página, puede iniciar sesión a continuación.'
     BUTTONSEND: 'Envíenme el enlace para restaurar la contraseña'
@@ -439,31 +457,33 @@ es:
     BtnImport: 'Import from CSV'
     FileFieldLabel: 'CSV File <small>(Allowed extensions: *.csv)</small>'
   SilverStripeNavigator:
-    DISPLAYING: Displaying
     Edit: Edit
-    FILTER: Filter
+  SimpleImageField:
-    IMPORT: Import
+    NOUPLOAD: 'No se han agregado imágenes'
+  SiteTree:
+    TABMAIN: Principal
+  TableField:
+    ISREQUIRED: 'In %s ''%s'' is required'
+  TableField.ss:
+    ADD: 'Añadir una nueva línea'
+    ADDITEM: 'Add %s'
+  TableListField:
+    CSVEXPORT: 'Exportar a CSV'
+    PRINT: Imprimir
+    Print: Print
+    SELECT: 'Select:'
+  TableListField.ss:
+    NOITEMSFOUND: 'No items found'
+    SORTASC: 'Sort in ascending order'
+    SORTDESC: 'Sort in descending order'
+  TableListField_PageControls.ss:
+    DISPLAYING: Displaying
     OF: of
     TO: to
     VIEWFIRST: 'Ver primero'
     VIEWLAST: 'Ver último'
     VIEWNEXT: 'Ver siguiente'
     VIEWPREVIOUS: 'Ver anterior'
-  SimpleImageField:
-    NOUPLOAD: 'No se han agregado imágenes'
-  SiteTree:
-    TABMAIN: Principal
-  TableField:
-    ADDITEM: 'Add %s'
-    ISREQUIRED: 'In %s ''%s'' is required'
-    NOITEMSFOUND: 'No items found'
-    SORTASC: 'Sort in ascending order'
-    SORTDESC: 'Sort in descending order'
-  TableListField:
-    CSVEXPORT: 'Exportar a CSV'
-    PRINT: Imprimir
-    Print: Print
-    SELECT: 'Select:'
   TimeField:
     VALIDATEFORMAT: 'Please enter a valid time format ({format})'
   ToggleField:

lang/es_AR.yml

@@ -50,6 +50,8 @@ es_AR:
     UNORDERED: 'Lista desordenada'
     UNORDEREDDESCRIPTION: 'Lista desordenada'
     UNORDEREDEXAMPLE1: 'elemento 1 desordenado'
+  BackLink_Button.ss:
+    Back: Back
   BasicAuth:
     ENTERINFO: 'Por favor ingresa tu nombre de usuario y contraseña.'
     ERRORNOTADMIN: 'El usuario no es administrador.'
@@ -57,9 +59,10 @@ es_AR:
   Boolean:
     0: No
     ANY: Cualquiera
-    Hello: Hi
-    LOGOUT: 'Log out'
     1: Sí
+  CMSLoadingScreen.ss:
+    LOADING: Loading...
+    REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
   CMSMain:
     ACCESS: 'Access to ''{title}'' section'
     ACCESSALLINTERFACES: 'Acceder a todas las secciones del CMS'
@@ -67,6 +70,12 @@ es_AR:
     SAVE: Guardar
   CMSProfileController:
     MENUTITLE: CMSProfileController
+  ChangePasswordEmail.ss:
+    CHANGEPASSWORDTEXT1: 'Haz cambiado tu contraseña por'
+    CHANGEPASSWORDTEXT2: 'Ahora puedes utilizar las siguientes credenciales para ingresar:'
+    EMAIL: Email
+    HELLO: Hola
+    PASSWORD: Contraseña
   CheckboxField:
     - No
     - No
@@ -74,6 +83,14 @@ es_AR:
     CLOSEPOPUP: 'Cerrar Ventana Emergente'
     SUCCESSADD2: 'Added {name}'
     SUCCESSEDIT: 'Guardado %s %s %s'
+  ComplexTableField.ss:
+    ADDITEM: 'Add %s'
+    NOITEMSFOUND: 'No items found'
+    SORTASC: 'Ordenar ascendente'
+    SORTDESC: 'Ordenar descendente'
+  ComplexTableField_popup.ss:
+    NEXT: Siguiente
+    PREVIOUS: Anterior
   ConfirmedPasswordField:
     ATLEAST: 'Passwords must be at least {min} characters long.'
     BETWEEN: 'Passwords must be {min} to {max} characters long.'
@@ -111,10 +128,7 @@ es_AR:
     VALIDDATEMAXDATE: 'Your date has to be older or matching the maximum allowed date ({date})'
     VALIDDATEMINDATE: 'Your date has to be newer or matching the minimum allowed date ({date})'
   Director:
-    ADD: Agregar
-    CSVEXPORT: 'Export to CSV'
     INVALID_REQUEST: 'Invalid request'
-    NOTFOUND: 'No items found'
   DropdownField:
     CHOOSE: (Selecciona)
   EmailField:
@@ -124,8 +138,6 @@ es_AR:
     SINGULARNAME: 'Registro de rebotes de email'
   Enum:
     ANY: Cualquiera
-    LOADING: Loading...
-    REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
   File:
     Content: Contenido
     Filename: 'Nombre de Archivo'
@@ -150,13 +162,17 @@ es_AR:
     FROMFILESTORE: 'Desde el almacén de archivos'
     NOSOURCE: 'Por favor seleccionar un archivo fuente para adjuntar'
     REPLACE: 'Replace {type}'
+  FileIFrameField_iframe.ss:
+    TITLE: 'Image Uploading Iframe'
   Filesystem:
-    IMPORT_TAB_HEADER: Import
-    SEARCHLISTINGS: Search
     SYNCRESULTS: 'Sync complete: {createdcount} items created, {deletedcount} items deleted'
+  ForgotPasswordEmail.ss:
+    HELLO: Hola
+    TEXT1: 'Aquí esta tu'
+    TEXT2: 'vínculo para restablecer la contraseña'
+    TEXT3: para
   Form:
     FIELDISREQUIRED: '%s es obligatorio.'
-    TITLE: 'Image Uploading Iframe'
     VALIDATIONCREDITNUMBER: 'Please ensure you have entered the {number} credit card number correctly'
     VALIDATIONNOTUNIQUE: 'El valor ingresado no es único'
     VALIDATIONPASSWORDSDONTMATCH: 'Las contraseñas no son iguales'
@@ -187,37 +203,26 @@ es_AR:
     ResetFilter: Reset
   GridFieldAction_Delete:
     DeletePermissionsFailure: 'No delete permissions'
-    NEXT: Siguiente
-    PREVIOUS: Anterior
   GridFieldDetailForm:
     Create: Create
     Delete: Delete
     DeletePermissionsFailure: 'No delete permissions'
     Deleted: 'Deleted %s %s'
-    HELLO: Hola
     Save: Save
     Saved: 'Saved %s %s'
-    TEXT1: 'Aquí esta tu'
+  GridFieldItemEditView.ss: null
-    TEXT2: 'vínculo para restablecer la contraseña'
-    TEXT3: para
   Group:
     AddRole: 'Add a role for this group'
-    CHANGEPASSWORDTEXT1: 'Haz cambiado tu contraseña por'
-    CHANGEPASSWORDTEXT2: 'Ahora puedes utilizar las siguientes credenciales para ingresar:'
     Code: 'Código de Grupo'
     DefaultGroupTitleAdministrators: Administradores
     DefaultGroupTitleContentAuthors: 'Autores de contenido'
     Description: Descripción
-    EMAIL: Email
     GroupReminder: 'If you choose a parent group, this group will take all it''s roles'
-    HELLO: Hola
     Locked: '¿Bloqueado?'
     NoRoles: 'No roles found'
-    PASSWORD: Contraseña
     Parent: 'Grupo Superior'
     RolesAddEditLink: 'Agregar/Editar roles'
     Sort: Ordenar
-    TITLE: 'Subiendo Imagen Iframe'
     has_many_Permissions: Permisos
     many_many_Members: Miembros
   GroupImportForm:
@@ -275,10 +280,9 @@ es_AR:
     UpdateMEDIA: 'Update Media'
   ImageField:
     IMAGE: Imagen
-  Image_iframe.ss: 'ChangePasswordEmail.ss:  BackLink_Button.ss:  CMSLoadingScreen.ss:  RelationComplexTableField.ss:  ForgotPasswordEmail.ss:    APPLY FILTER: "Apply Filter"  GridFieldItemEditView.ss:    Go back: "Go back"  ModelSidebar.ss:  TableListField_PageControls.ss:  ModelAdmin_Tools.ss:  ComplexTableField_popup.ss:  TableField.ss:  FileIFrameField_iframe.ss:  ComplexTableField.ss:  TableListField.ss:  ModelAdmin_ImportSpec.ss:  LeftAndMain_Menu.ss:'
+  Image_iframe.ss:
+    TITLE: 'Subiendo Imagen Iframe'
   LeftAndMain:
-    ADD: 'Agregar una nueva fila'
-    ADDITEM: 'Add %s'
     CANT_REORGANISE: 'You do not have permission to alter Top level pages. Your change was not saved.'
     DELETED: Deleted.
     DropdownBatchActionsDefault: Actions
@@ -292,6 +296,9 @@ es_AR:
     REORGANISATIONSUCCESSFUL: 'Reorganised the site tree successfully.'
     SAVEDUP: Saved.
     VersionUnknown: unknown
+  LeftAndMain_Menu.ss:
+    Hello: Hi
+    LOGOUT: 'Log out'
   LoginAttempt:
     Email: 'Dirección Email'
     IP: 'Dirección IP'
@@ -368,6 +375,7 @@ es_AR:
     ResultUpdated: 'Updated {count} members'
   MemberTableField: null
   ModelAdmin:
+    'APPLY FILTER': 'Apply Filter'
     DELETE: Eliminar
     DELETEDRECORDS: 'Deleted {count} records.'
     IMPORT: 'Importar desde CSV'
@@ -377,6 +385,17 @@ es_AR:
     RESET: Reset
     Title: 'Data Models'
     UPDATEDRECORDS: 'Updated {count} records.'
+  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
   MoneyField:
     FIELDLABELAMOUNT: Cantidad
     FIELDLABELCURRENCY: Moneda
@@ -389,10 +408,6 @@ es_AR:
     CMS_ACCESS_CATEGORY: 'Acceso al CMS'
     FULLADMINRIGHTS: 'Privilegios administrativos completos'
     FULLADMINRIGHTS_HELP: 'Implies and overrules all other assigned permissions.'
-    IMPORTSPECFIELDS: 'Database columns'
-    IMPORTSPECLINK: 'Show Specification for %s'
-    IMPORTSPECRELATIONS: Relations
-    IMPORTSPECTITLE: 'Specification for %s'
   PermissionCheckboxSetField:
     AssignedTo: 'assigned to "{title}"'
     FromGroup: 'inherited from group "{title}"'
@@ -401,8 +416,11 @@ es_AR:
   Permissions:
     PERMISSIONS_CATEGORY: 'Roles y permisos de acceso'
   PhoneNumberField:
-    Back: Back
     VALIDATION: 'Por favor ingresa un número telefónico válido'
+  RelationComplexTableField.ss:
+    ADD: Agregar
+    CSVEXPORT: 'Export to CSV'
+    NOTFOUND: 'No items found'
   Security:
     ALREADYLOGGEDIN: 'Ud no tiene acceso a esta página. Si tiene otra cuenta que puede acceder a esa página, entonces puede <a href="%s">iniciar sesión nuevamente</a>.'
     BUTTONSEND: 'Envíame el enlace para restablecer mi contraseña'
@@ -439,31 +457,33 @@ es_AR:
     BtnImport: importar
     FileFieldLabel: 'Archivo CSV <small>(extensiones permitidas: *.csv)</small>'
   SilverStripeNavigator:
-    DISPLAYING: Displaying
     Edit: Edit
-    FILTER: Filter
+  SimpleImageField:
-    IMPORT: Import
+    NOUPLOAD: 'La Imagen No se Cargó'
+  SiteTree:
+    TABMAIN: Principal
+  TableField:
+    ISREQUIRED: 'In %s ''%s'' is required'
+  TableField.ss:
+    ADD: 'Agregar una nueva fila'
+    ADDITEM: 'Add %s'
+  TableListField:
+    CSVEXPORT: 'Exportar a CSV'
+    PRINT: Imprimir
+    Print: Print
+    SELECT: 'Seleccionar:'
+  TableListField.ss:
+    NOITEMSFOUND: 'No items found'
+    SORTASC: 'Ordenar en orden ascendente'
+    SORTDESC: 'Ordenar en orden descendente'
+  TableListField_PageControls.ss:
+    DISPLAYING: Displaying
     OF: of
     TO: to
     VIEWFIRST: 'Ver primero'
     VIEWLAST: 'Ver último'
     VIEWNEXT: 'Ver siguiente'
     VIEWPREVIOUS: 'Ver previo'
-  SimpleImageField:
-    NOUPLOAD: 'La Imagen No se Cargó'
-  SiteTree:
-    TABMAIN: Principal
-  TableField:
-    ADDITEM: 'Add %s'
-    ISREQUIRED: 'In %s ''%s'' is required'
-    NOITEMSFOUND: 'No items found'
-    SORTASC: 'Ordenar en orden ascendente'
-    SORTDESC: 'Ordenar en orden descendente'
-  TableListField:
-    CSVEXPORT: 'Exportar a CSV'
-    PRINT: Imprimir
-    Print: Print
-    SELECT: 'Seleccionar:'
   TimeField:
     VALIDATEFORMAT: 'Please enter a valid time format ({format})'
   ToggleField:

lang/es_MX.yml

@@ -50,6 +50,8 @@ es_MX:
     UNORDERED: 'Lista desordenada'
     UNORDEREDDESCRIPTION: 'Lista desordenada'
     UNORDEREDEXAMPLE1: 'elemento 1 desordenado'
+  BackLink_Button.ss:
+    Back: Volver
   BasicAuth:
     ENTERINFO: 'Por favor ingresa tu nombre de usuario y contraseña.'
     ERRORNOTADMIN: 'El usuario no es administrador.'
@@ -57,9 +59,10 @@ es_MX:
   Boolean:
     0: No
     ANY: Cualquiera
-    Hello: Hi
-    LOGOUT: 'Log out'
     1: Sí
+  CMSLoadingScreen.ss:
+    LOADING: Cargando...
+    REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
   CMSMain:
     ACCESS: 'Access to ''{title}'' section'
     ACCESSALLINTERFACES: 'Acceder a todas las secciones del CMS'
@@ -67,6 +70,12 @@ es_MX:
     SAVE: Guardar
   CMSProfileController:
     MENUTITLE: 'Controladores de perfil del CMS'
+  ChangePasswordEmail.ss:
+    CHANGEPASSWORDTEXT1: 'Usted ha cambiado su contraseña'
+    CHANGEPASSWORDTEXT2: 'Ahora puedes utilizar las siguientes credenciales para ingresar:'
+    EMAIL: 'Correo Electrónico'
+    HELLO: Hey
+    PASSWORD: Contraseña
   CheckboxField:
     - No
     - Sí
@@ -74,6 +83,14 @@ es_MX:
     CLOSEPOPUP: 'Cerrar Mensaje Emergente'
     SUCCESSADD2: 'Added {name}'
     SUCCESSEDIT: 'Se guardaron %s %s %s'
+  ComplexTableField.ss:
+    ADDITEM: 'Add %s'
+    NOITEMSFOUND: 'No items found'
+    SORTASC: 'Orden ascendente'
+    SORTDESC: 'Orden descendente'
+  ComplexTableField_popup.ss:
+    NEXT: Siguiente
+    PREVIOUS: Anterior
   ConfirmedPasswordField:
     ATLEAST: 'Passwords must be at least {min} characters long.'
     BETWEEN: 'Passwords must be {min} to {max} characters long.'
@@ -111,10 +128,7 @@ es_MX:
     VALIDDATEMAXDATE: 'Tu fecha tiene que ser más antigua o al menos coincidir con la fecha mínima permitida ({date})'
     VALIDDATEMINDATE: 'Tu fecha tiene que ser nueva o al menos coincidir con la fecha mínima permitida ({date})'
   Director:
-    ADD: Agregar
-    CSVEXPORT: 'Export to CSV'
     INVALID_REQUEST: 'Solicitud no válida'
-    NOTFOUND: 'No items found'
   DropdownField:
     CHOOSE: (Seleccione)
   EmailField:
@@ -124,8 +138,6 @@ es_MX:
     SINGULARNAME: 'Correo electrónico devuelto'
   Enum:
     ANY: Cualquiera
-    LOADING: Cargando...
-    REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
   File:
     Content: Contenido
     Filename: 'Nombre de Archivo'
@@ -150,13 +162,17 @@ es_MX:
     FROMFILESTORE: 'Desde el almacén de archivos'
     NOSOURCE: 'Por favor, seleccione un archivo fuente para adjuntarlo'
     REPLACE: 'Replace {type}'
+  FileIFrameField_iframe.ss:
+    TITLE: 'Subidor de imágenes por iFrame'
   Filesystem:
-    IMPORT_TAB_HEADER: Import
-    SEARCHLISTINGS: Search
     SYNCRESULTS: 'Sync complete: {createdcount} items created, {deletedcount} items deleted'
+  ForgotPasswordEmail.ss:
+    HELLO: Hey
+    TEXT1: 'Estás aquí'
+    TEXT2: 'vínculo para restablecer la contraseña'
+    TEXT3: para
   Form:
     FIELDISREQUIRED: '%s es obligatorio'
-    TITLE: 'Subidor de imágenes por iFrame'
     VALIDATIONCREDITNUMBER: 'Please ensure you have entered the {number} credit card number correctly'
     VALIDATIONNOTUNIQUE: 'El valor ingresado no es único'
     VALIDATIONPASSWORDSDONTMATCH: 'Las contraeñas no son iguales'
@@ -187,37 +203,26 @@ es_MX:
     ResetFilter: Resetear
   GridFieldAction_Delete:
     DeletePermissionsFailure: 'No borrar permisos'
-    NEXT: Siguiente
-    PREVIOUS: Anterior
   GridFieldDetailForm:
     Create: Create
     Delete: Delete
     DeletePermissionsFailure: 'No delete permissions'
     Deleted: 'Deleted %s %s'
-    HELLO: Hey
     Save: Save
     Saved: 'Saved %s %s'
-    TEXT1: 'Estás aquí'
+  GridFieldItemEditView.ss: null
-    TEXT2: 'vínculo para restablecer la contraseña'
-    TEXT3: para
   Group:
     AddRole: 'Agrega un rol para este grupo'
-    CHANGEPASSWORDTEXT1: 'Usted ha cambiado su contraseña'
-    CHANGEPASSWORDTEXT2: 'Ahora puedes utilizar las siguientes credenciales para ingresar:'
     Code: 'Código del grupo'
     DefaultGroupTitleAdministrators: Administradores
     DefaultGroupTitleContentAuthors: 'Autores de Contenido'
     Description: Descripción
-    EMAIL: 'Correo Electrónico'
     GroupReminder: 'Si eliges el grupo superior, este grupo tomará todos sus roles'
-    HELLO: Hey
     Locked: '¿Bloqueado?'
     NoRoles: 'No se encontraron roles'
-    PASSWORD: Contraseña
     Parent: 'Grupo ascendente'
     RolesAddEditLink: 'Agregar/modificar roles'
     Sort: 'Orden de Clasificación'
-    TITLE: 'Subiendo Imagen Iframe'
     has_many_Permissions: Permisos
     many_many_Members: Miembros
   GroupImportForm:
@@ -275,10 +280,9 @@ es_MX:
     UpdateMEDIA: 'Update Media'
   ImageField:
     IMAGE: Imagen
-  Image_iframe.ss: 'ChangePasswordEmail.ss:  BackLink_Button.ss:  CMSLoadingScreen.ss:  RelationComplexTableField.ss:  ForgotPasswordEmail.ss:    APPLY FILTER: "Filtro"  GridFieldItemEditView.ss:    Go back: "Volver"  ModelSidebar.ss:  TableListField_PageControls.ss:  ModelAdmin_Tools.ss:  ComplexTableField_popup.ss:  TableField.ss:  FileIFrameField_iframe.ss:  ComplexTableField.ss:  TableListField.ss:  ModelAdmin_ImportSpec.ss:  LeftAndMain_Menu.ss:'
+  Image_iframe.ss:
+    TITLE: 'Subiendo Imagen Iframe'
   LeftAndMain:
-    ADD: 'Agregar un nuevo renglón'
-    ADDITEM: 'Add %s'
     CANT_REORGANISE: 'You do not have permission to alter Top level pages. Your change was not saved.'
     DELETED: Deleted.
     DropdownBatchActionsDefault: Acciones
@@ -292,6 +296,9 @@ es_MX:
     REORGANISATIONSUCCESSFUL: 'Reorganised the site tree successfully.'
     SAVEDUP: Saved.
     VersionUnknown: desconocido
+  LeftAndMain_Menu.ss:
+    Hello: Hi
+    LOGOUT: 'Log out'
   LoginAttempt:
     Email: 'Dirección de Correo Electrónico'
     IP: 'Dirección IP'
@@ -368,6 +375,7 @@ es_MX:
     ResultUpdated: 'Updated {count} members'
   MemberTableField: null
   ModelAdmin:
+    'APPLY FILTER': Filtro
     DELETE: Eliminar
     DELETEDRECORDS: 'Borrados {count} registros'
     IMPORT: 'Importar desde CSV'
@@ -377,6 +385,17 @@ es_MX:
     RESET: Reiniciar
     Title: 'Modelo de datos'
     UPDATEDRECORDS: 'Actualizados {count} registros'
+  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
   MoneyField:
     FIELDLABELAMOUNT: Importe
     FIELDLABELCURRENCY: Moneda
@@ -389,10 +408,6 @@ es_MX:
     CMS_ACCESS_CATEGORY: 'Acceder al CMS'
     FULLADMINRIGHTS: 'Privilegios administrativos completos'
     FULLADMINRIGHTS_HELP: 'Implica y anula todos los demás permisos asignados.'
-    IMPORTSPECFIELDS: 'Database columns'
-    IMPORTSPECLINK: 'Show Specification for %s'
-    IMPORTSPECRELATIONS: Relations
-    IMPORTSPECTITLE: 'Specification for %s'
   PermissionCheckboxSetField:
     AssignedTo: 'assigned to "{title}"'
     FromGroup: 'inherited from group "{title}"'
@@ -401,8 +416,11 @@ es_MX:
   Permissions:
     PERMISSIONS_CATEGORY: 'Roles y permisos de acceso'
   PhoneNumberField:
-    Back: Volver
     VALIDATION: 'Por favor ingresa un número telefónico válido'
+  RelationComplexTableField.ss:
+    ADD: Agregar
+    CSVEXPORT: 'Export to CSV'
+    NOTFOUND: 'No items found'
   Security:
     ALREADYLOGGEDIN: 'Usted no tiene acceso a esta página. Si tiene otra cuenta que pueda tener acceso a ésta página, puede <a href="%s">abrir una sesión abajo</a>.'
     BUTTONSEND: 'Envíame enlace para restablecer contraseña'
@@ -439,31 +457,33 @@ es_MX:
     BtnImport: Importar
     FileFieldLabel: 'Archivo CSV <small>(Extensiones permitidas: *.csv)'
   SilverStripeNavigator:
-    DISPLAYING: Displaying
     Edit: Edit
-    FILTER: Filter
+  SimpleImageField:
-    IMPORT: Import
+    NOUPLOAD: 'No subió la Imagen'
+  SiteTree:
+    TABMAIN: Principal
+  TableField:
+    ISREQUIRED: 'In %s ''%s'' is required'
+  TableField.ss:
+    ADD: 'Agregar un nuevo renglón'
+    ADDITEM: 'Add %s'
+  TableListField:
+    CSVEXPORT: 'Exportar a CSV'
+    PRINT: Imprimir
+    Print: Print
+    SELECT: 'Seleccione:'
+  TableListField.ss:
+    NOITEMSFOUND: 'No items found'
+    SORTASC: 'Organizar en orden ascendente'
+    SORTDESC: 'Organizar en orden descendente'
+  TableListField_PageControls.ss:
+    DISPLAYING: Displaying
     OF: of
     TO: to
     VIEWFIRST: 'Ver primero'
     VIEWLAST: 'Ver último'
     VIEWNEXT: 'Ver siguiente'
     VIEWPREVIOUS: 'Ver anterior'
-  SimpleImageField:
-    NOUPLOAD: 'No subió la Imagen'
-  SiteTree:
-    TABMAIN: Principal
-  TableField:
-    ADDITEM: 'Add %s'
-    ISREQUIRED: 'In %s ''%s'' is required'
-    NOITEMSFOUND: 'No items found'
-    SORTASC: 'Organizar en orden ascendente'
-    SORTDESC: 'Organizar en orden descendente'
-  TableListField:
-    CSVEXPORT: 'Exportar a CSV'
-    PRINT: Imprimir
-    Print: Print
-    SELECT: 'Seleccione:'
   TimeField:
     VALIDATEFORMAT: 'Por favor ingresar un formato válido de fecha ({format})'
   ToggleField:

lang/et_EE.yml

@@ -50,6 +50,8 @@ et_EE:
     UNORDERED: 'Järjestamata nimekiri'
     UNORDEREDDESCRIPTION: 'Järjestamata nimekiri'
     UNORDEREDEXAMPLE1: 'Järjestamata asi 1'
+  BackLink_Button.ss:
+    Back: Back
   BasicAuth:
     ENTERINFO: 'Palun sisesta kasutajanimi ja parool.'
     ERRORNOTADMIN: 'Antud kasutaja ei ole administraator.'
@@ -57,9 +59,10 @@ et_EE:
   Boolean:
     0: 'False'
     ANY: Any
-    Hello: Hi
-    LOGOUT: 'Log out'
     1: 'True'
+  CMSLoadingScreen.ss:
+    LOADING: Loading...
+    REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
   CMSMain:
     ACCESS: 'Access to ''{title}'' section'
     ACCESSALLINTERFACES: 'Ligipääs kõigile Sisuhalduse kasutajaliidestele'
@@ -67,6 +70,12 @@ et_EE:
     SAVE: Salvesta
   CMSProfileController:
     MENUTITLE: CMSProfileController
+  ChangePasswordEmail.ss:
+    CHANGEPASSWORDTEXT1: 'Vahetasid oma parooli lehel'
+    CHANGEPASSWORDTEXT2: 'Nüüd võid kasutada sisse logimiseks järgnevaid andmeid:'
+    EMAIL: E-post
+    HELLO: Tere
+    PASSWORD: Parool
   CheckboxField:
     - 'False'
     - 'True'
@@ -74,6 +83,14 @@ et_EE:
     CLOSEPOPUP: 'Sulge hüpikaken'
     SUCCESSADD2: 'Added {name}'
     SUCCESSEDIT: 'Salvestatud %s %s %s'
+  ComplexTableField.ss:
+    ADDITEM: 'Add %s'
+    NOITEMSFOUND: 'No items found'
+    SORTASC: 'Sorteeri kasvavalt'
+    SORTDESC: 'Sorteeri kahanevalt'
+  ComplexTableField_popup.ss:
+    NEXT: Eelmine
+    PREVIOUS: Järgmine
   ConfirmedPasswordField:
     ATLEAST: 'Passwords must be at least {min} characters long.'
     BETWEEN: 'Passwords must be {min} to {max} characters long.'
@@ -111,10 +128,7 @@ et_EE:
     VALIDDATEMAXDATE: 'Your date has to be older or matching the maximum allowed date ({date})'
     VALIDDATEMINDATE: 'Your date has to be newer or matching the minimum allowed date ({date})'
   Director:
-    ADD: Lisa
-    CSVEXPORT: 'Export to CSV'
     INVALID_REQUEST: 'Invalid request'
-    NOTFOUND: 'No items found'
   DropdownField:
     CHOOSE: (Vali)
   EmailField:
@@ -124,8 +138,6 @@ et_EE:
     SINGULARNAME: 'Email Bounce Record'
   Enum:
     ANY: Any
-    LOADING: Loading...
-    REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
   File:
     Content: Sisu
     Filename: Failinimi
@@ -150,13 +162,17 @@ et_EE:
     FROMFILESTORE: 'From the File Store'
     NOSOURCE: 'Please select a source file to attach'
     REPLACE: 'Replace {type}'
+  FileIFrameField_iframe.ss:
+    TITLE: 'Image Uploading Iframe'
   Filesystem:
-    IMPORT_TAB_HEADER: Import
-    SEARCHLISTINGS: Search
     SYNCRESULTS: 'Sync complete: {createdcount} items created, {deletedcount} items deleted'
+  ForgotPasswordEmail.ss:
+    HELLO: Tere
+    TEXT1: 'Siin on sinu'
+    TEXT2: 'Parooli tühistus link'
+    TEXT3: -
   Form:
     FIELDISREQUIRED: '%s on vajalik'
-    TITLE: 'Image Uploading Iframe'
     VALIDATIONCREDITNUMBER: 'Please ensure you have entered the {number} credit card number correctly'
     VALIDATIONNOTUNIQUE: 'Sisestatud väärtus ei ole unikaalne'
     VALIDATIONPASSWORDSDONTMATCH: 'Paroolid ei katu'
@@ -187,37 +203,26 @@ et_EE:
     ResetFilter: Reset
   GridFieldAction_Delete:
     DeletePermissionsFailure: 'No delete permissions'
-    NEXT: Eelmine
-    PREVIOUS: Järgmine
   GridFieldDetailForm:
     Create: Create
     Delete: Delete
     DeletePermissionsFailure: 'No delete permissions'
     Deleted: 'Deleted %s %s'
-    HELLO: Tere
     Save: Save
     Saved: 'Saved %s %s'
-    TEXT1: 'Siin on sinu'
+  GridFieldItemEditView.ss: null
-    TEXT2: 'Parooli tühistus link'
-    TEXT3: -
   Group:
     AddRole: 'Add a role for this group'
-    CHANGEPASSWORDTEXT1: 'Vahetasid oma parooli lehel'
-    CHANGEPASSWORDTEXT2: 'Nüüd võid kasutada sisse logimiseks järgnevaid andmeid:'
     Code: 'Grupi kood'
     DefaultGroupTitleAdministrators: Administrators
     DefaultGroupTitleContentAuthors: 'Content Authors'
     Description: Kirjeldus
-    EMAIL: E-post
     GroupReminder: 'If you choose a parent group, this group will take all it''s roles'
-    HELLO: Tere
     Locked: 'Lukus?'
     NoRoles: 'No roles found'
-    PASSWORD: Parool
     Parent: 'Vanem grupp'
     RolesAddEditLink: 'Manage roles'
     Sort: Järjesta
-    TITLE: 'Pildi üleslaadimise Iframe'
     has_many_Permissions: Õigused
     many_many_Members: Liikmed
   GroupImportForm:
@@ -275,10 +280,9 @@ et_EE:
     UpdateMEDIA: 'Update Media'
   ImageField:
     IMAGE: Image
-  Image_iframe.ss: 'ChangePasswordEmail.ss:  BackLink_Button.ss:  CMSLoadingScreen.ss:  RelationComplexTableField.ss:  ForgotPasswordEmail.ss:    APPLY FILTER: "Apply Filter"  GridFieldItemEditView.ss:    Go back: "Go back"  ModelSidebar.ss:  TableListField_PageControls.ss:  ModelAdmin_Tools.ss:  ComplexTableField_popup.ss:  TableField.ss:  FileIFrameField_iframe.ss:  ComplexTableField.ss:  TableListField.ss:  ModelAdmin_ImportSpec.ss:  LeftAndMain_Menu.ss:'
+  Image_iframe.ss:
+    TITLE: 'Pildi üleslaadimise Iframe'
   LeftAndMain:
-    ADD: 'Lisa uus rida'
-    ADDITEM: 'Add %s'
     CANT_REORGANISE: 'You do not have permission to alter Top level pages. Your change was not saved.'
     DELETED: Deleted.
     DropdownBatchActionsDefault: Actions
@@ -292,6 +296,9 @@ et_EE:
     REORGANISATIONSUCCESSFUL: 'Reorganised the site tree successfully.'
     SAVEDUP: Saved.
     VersionUnknown: unknown
+  LeftAndMain_Menu.ss:
+    Hello: Hi
+    LOGOUT: 'Log out'
   LoginAttempt:
     Email: 'E-posti aadress'
     IP: 'IP Aadress'
@@ -368,6 +375,7 @@ et_EE:
     ResultUpdated: 'Updated {count} members'
   MemberTableField: null
   ModelAdmin:
+    'APPLY FILTER': 'Apply Filter'
     DELETE: Kustuta
     DELETEDRECORDS: 'Deleted {count} records.'
     IMPORT: 'Impordi CSV failist'
@@ -377,6 +385,17 @@ et_EE:
     RESET: Reset
     Title: 'Data Models'
     UPDATEDRECORDS: 'Updated {count} records.'
+  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
   MoneyField:
     FIELDLABELAMOUNT: Amount
     FIELDLABELCURRENCY: Currency
@@ -389,10 +408,6 @@ et_EE:
     CMS_ACCESS_CATEGORY: 'CMS Access'
     FULLADMINRIGHTS: 'Täis administraatori õigused'
     FULLADMINRIGHTS_HELP: 'Implies and overrules all other assigned permissions.'
-    IMPORTSPECFIELDS: 'Database columns'
-    IMPORTSPECLINK: 'Show Specification for %s'
-    IMPORTSPECRELATIONS: Relations
-    IMPORTSPECTITLE: 'Specification for %s'
   PermissionCheckboxSetField:
     AssignedTo: 'assigned to "{title}"'
     FromGroup: 'inherited from group "{title}"'
@@ -401,8 +416,11 @@ et_EE:
   Permissions:
     PERMISSIONS_CATEGORY: 'Roles and access permissions'
   PhoneNumberField:
-    Back: Back
     VALIDATION: 'Palun sisesta kehtiv telefoninumber'
+  RelationComplexTableField.ss:
+    ADD: Lisa
+    CSVEXPORT: 'Export to CSV'
+    NOTFOUND: 'No items found'
   Security:
     ALREADYLOGGEDIN: 'Sul puudub õigus sellele lehele pääsemiseks. Kui sul on teine konto, millega siia sisse logida, võid <a href="%s">uuesti sisse logida</a>.'
     BUTTONSEND: 'Saada parooli tühistamise link'
@@ -439,31 +457,33 @@ et_EE:
     BtnImport: 'Import from CSV'
     FileFieldLabel: 'CSV File <small>(Allowed extensions: *.csv)</small>'
   SilverStripeNavigator:
-    DISPLAYING: Displaying
     Edit: Edit
-    FILTER: Filter
+  SimpleImageField:
-    IMPORT: Import
+    NOUPLOAD: 'Pilte pole üles laaditud'
+  SiteTree:
+    TABMAIN: Avaleht
+  TableField:
+    ISREQUIRED: 'In %s ''%s'' is required'
+  TableField.ss:
+    ADD: 'Lisa uus rida'
+    ADDITEM: 'Add %s'
+  TableListField:
+    CSVEXPORT: 'Ekspordi CSV-sse'
+    PRINT: Prindi
+    Print: Print
+    SELECT: 'Select:'
+  TableListField.ss:
+    NOITEMSFOUND: 'No items found'
+    SORTASC: 'Sort in ascending order'
+    SORTDESC: 'Sort in descending order'
+  TableListField_PageControls.ss:
+    DISPLAYING: Displaying
     OF: of
     TO: to
     VIEWFIRST: 'Vaata esimest'
     VIEWLAST: 'Vaata viimast'
     VIEWNEXT: 'Vaata järgmist'
     VIEWPREVIOUS: 'Vaata eelmist'
-  SimpleImageField:
-    NOUPLOAD: 'Pilte pole üles laaditud'
-  SiteTree:
-    TABMAIN: Avaleht
-  TableField:
-    ADDITEM: 'Add %s'
-    ISREQUIRED: 'In %s ''%s'' is required'
-    NOITEMSFOUND: 'No items found'
-    SORTASC: 'Sort in ascending order'
-    SORTDESC: 'Sort in descending order'
-  TableListField:
-    CSVEXPORT: 'Ekspordi CSV-sse'
-    PRINT: Prindi
-    Print: Print
-    SELECT: 'Select:'
   TimeField:
     VALIDATEFORMAT: 'Please enter a valid time format ({format})'
   ToggleField:

lang/fa_IR.yml

@@ -8,7 +8,7 @@ fa_IR:
     FOLDER: Folder
     LASTEDIT: 'آخرین تغییرات'
     OWNER: دارنده
-    SIZE: حجم
+    SIZE: 'حجم'
     TITLE: عنوان
     TYPE: نوع
     URL: نشانی
@@ -50,6 +50,8 @@ fa_IR:
     UNORDERED: 'Unordered list'
     UNORDEREDDESCRIPTION: 'Unordered list'
     UNORDEREDEXAMPLE1: 'unordered item 1'
+  BackLink_Button.ss:
+    Back: Back
   BasicAuth:
     ENTERINFO: 'Please enter a username and password.'
     ERRORNOTADMIN: 'That user is not an administrator.'
@@ -57,9 +59,10 @@ fa_IR:
   Boolean:
     0: نه
     ANY: هر
-    Hello: Hi
-    LOGOUT: 'Log out'
     1: آری
+  CMSLoadingScreen.ss:
+    LOADING: Loading...
+    REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
   CMSMain:
     ACCESS: 'Access to ''{title}'' section'
     ACCESSALLINTERFACES: 'Access to all CMS sections'
@@ -67,6 +70,12 @@ fa_IR:
     SAVE: نگاهداری
   CMSProfileController:
     MENUTITLE: CMSProfileController
+  ChangePasswordEmail.ss:
+    CHANGEPASSWORDTEXT1: 'شما گذرواژه تان را دگرگون کردید برای'
+    CHANGEPASSWORDTEXT2: 'You can now use the following credentials to log in:'
+    EMAIL: 'ايميل'
+    HELLO: درود
+    PASSWORD: 'كلمه عبور'
   CheckboxField:
     - نه
     - آری
@@ -74,6 +83,14 @@ fa_IR:
     CLOSEPOPUP: 'بستن چنجره'
     SUCCESSADD2: 'Added {name}'
     SUCCESSEDIT: '%s %s %s ذخيره شد'
+  ComplexTableField.ss:
+    ADDITEM: 'Add %s'
+    NOITEMSFOUND: 'No items found'
+    SORTASC: 'Sort ascending'
+    SORTDESC: 'Sort descending'
+  ComplexTableField_popup.ss:
+    NEXT: بعدی
+    PREVIOUS: قبلی
   ConfirmedPasswordField:
     ATLEAST: 'Passwords must be at least {min} characters long.'
     BETWEEN: 'Passwords must be {min} to {max} characters long.'
@@ -81,9 +98,9 @@ fa_IR:
     SHOWONCLICKTITLE: 'تغيير كلمه عبور'
   CreditCardField:
     FIRST: نخست
-    FOURTH: چهارم
+    FOURTH: 'چهارم'
-    SECOND: دوم
+    SECOND: 'دوم'
-    THIRD: سوم
+    THIRD: 'سوم'
   CurrencyField:
     CURRENCYSYMBOL: $
   DataObject:
@@ -96,7 +113,7 @@ fa_IR:
     HOURS: ساعت
     MIN: دقیقه
     MINS: دقیقه
-    MONTH: ماه
+    MONTH: 'ماه'
     MONTHS: 'ماه ها'
     SEC: ثانیه
     SECS: ثانیه
@@ -106,15 +123,12 @@ fa_IR:
     YEARS: سال
   DateField:
     NOTSET: 'not set'
-    TODAY: امروز
+    TODAY: 'امروز'
     VALIDDATEFORMAT2: 'Please enter a valid date format ({format})'
     VALIDDATEMAXDATE: 'Your date has to be older or matching the maximum allowed date ({date})'
     VALIDDATEMINDATE: 'Your date has to be newer or matching the minimum allowed date ({date})'
   Director:
-    ADD: افزودن
-    CSVEXPORT: 'Export to CSV'
     INVALID_REQUEST: 'Invalid request'
-    NOTFOUND: 'No items found'
   DropdownField:
     CHOOSE: (گزینش)
   EmailField:
@@ -124,16 +138,14 @@ fa_IR:
     SINGULARNAME: 'Email Bounce Record'
   Enum:
     ANY: Any
-    LOADING: Loading...
-    REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
   File:
-    Content: محتوا
+    Content: 'محتوا'
     Filename: 'نام پرونده'
     INVALIDEXTENSION: 'Extension is not allowed (valid: {extensions})'
     INVALIDEXTENSIONSHORT: 'Extension is not allowed'
     NOFILESIZE: 'Filesize is zero bytes.'
     NOVALIDUPLOAD: 'File is not a valid upload'
-    Name: نام
+    Name: 'نام'
     PLURALNAME: 'فايل ها'
     SINGULARNAME: فايل
     TOOLARGE: 'Filesize is too large, maximum {size} allowed'
@@ -150,13 +162,17 @@ fa_IR:
     FROMFILESTORE: 'From the File Store'
     NOSOURCE: 'لطفا محل یک فایل را جهت پیوست انتخاب کنید'
     REPLACE: 'Replace {type}'
+  FileIFrameField_iframe.ss:
+    TITLE: 'Image Uploading Iframe'
   Filesystem:
-    IMPORT_TAB_HEADER: Import
-    SEARCHLISTINGS: Search
     SYNCRESULTS: 'Sync complete: {createdcount} items created, {deletedcount} items deleted'
+  ForgotPasswordEmail.ss:
+    HELLO: درود
+    TEXT1: 'Here is your'
+    TEXT2: 'password reset link'
+    TEXT3: برای
   Form:
     FIELDISREQUIRED: '%s نیاز است.'
-    TITLE: 'Image Uploading Iframe'
     VALIDATIONCREDITNUMBER: 'Please ensure you have entered the {number} credit card number correctly'
     VALIDATIONNOTUNIQUE: 'The value entered is not unique'
     VALIDATIONPASSWORDSDONTMATCH: 'گذرواژه‌ها همانند هم نیستند'
@@ -187,38 +203,27 @@ fa_IR:
     ResetFilter: Reset
   GridFieldAction_Delete:
     DeletePermissionsFailure: 'No delete permissions'
-    NEXT: بعدی
-    PREVIOUS: قبلی
   GridFieldDetailForm:
     Create: Create
     Delete: Delete
     DeletePermissionsFailure: 'No delete permissions'
     Deleted: 'Deleted %s %s'
-    HELLO: درود
     Save: Save
     Saved: 'Saved %s %s'
-    TEXT1: 'Here is your'
+  GridFieldItemEditView.ss: null
-    TEXT2: 'password reset link'
-    TEXT3: برای
   Group:
     AddRole: 'Add a role for this group'
-    CHANGEPASSWORDTEXT1: 'شما گذرواژه تان را دگرگون کردید برای'
-    CHANGEPASSWORDTEXT2: 'You can now use the following credentials to log in:'
     Code: 'كد گروه'
     DefaultGroupTitleAdministrators: 'مدیران کل'
     DefaultGroupTitleContentAuthors: 'نویسندگان مطالب'
     Description: توضحیات
-    EMAIL: ايميل
     GroupReminder: 'If you choose a parent group, this group will take all it''s roles'
-    HELLO: درود
     Locked: 'بسته شده است؟'
     NoRoles: 'No roles found'
-    PASSWORD: 'كلمه عبور'
     Parent: 'گروه مادر'
     RolesAddEditLink: 'اضافه/ویرایش وظیفه'
     Sort: 'تربیت چیدن'
-    TITLE: 'Image Uploading Iframe'
+    has_many_Permissions: 'مجوز‌ها'
-    has_many_Permissions: مجوز‌ها
     many_many_Members: اعضاء
   GroupImportForm:
     Help1: '<p>Import one or more groups in <em>CSV</em> format (comma-separated values). <small><a href="#" class="toggle-advanced">Show advanced usage</a></small></p>'
@@ -275,14 +280,13 @@ fa_IR:
     UpdateMEDIA: 'Update Media'
   ImageField:
     IMAGE: Image
-  Image_iframe.ss: 'ChangePasswordEmail.ss:  BackLink_Button.ss:  CMSLoadingScreen.ss:  RelationComplexTableField.ss:  ForgotPasswordEmail.ss:    APPLY FILTER: "Apply Filter"  GridFieldItemEditView.ss:    Go back: "Go back"  ModelSidebar.ss:  TableListField_PageControls.ss:  ModelAdmin_Tools.ss:  ComplexTableField_popup.ss:  TableField.ss:  FileIFrameField_iframe.ss:  ComplexTableField.ss:  TableListField.ss:  ModelAdmin_ImportSpec.ss:  LeftAndMain_Menu.ss:'
+  Image_iframe.ss:
+    TITLE: 'Image Uploading Iframe'
   LeftAndMain:
-    ADD: 'افزودن ردیف تازه'
-    ADDITEM: 'Add %s'
     CANT_REORGANISE: 'You do not have permission to alter Top level pages. Your change was not saved.'
     DELETED: Deleted.
     DropdownBatchActionsDefault: Actions
-    HELP: کمک
+    HELP: 'کمک'
     PAGETYPE: 'نوع صفحه'
     PERMAGAIN: 'شما از سیستم مدیریت محتوا خارج شده اید.اگر میخواهید دوباره وارد شوید نام کاربری و رمز عبور خود را در قسمت زیر وارد کنید'
     PERMALREADY: 'من متاسفم، شما نمی توانید به آن قسمت از سیستم مدیریت محتوا دسترسی پیدا کنید. اگر میخواهید به عنوان شخص دیگری وارد شوید از قسمت زیر تلاش کنید'
@@ -292,6 +296,9 @@ fa_IR:
     REORGANISATIONSUCCESSFUL: 'Reorganised the site tree successfully.'
     SAVEDUP: Saved.
     VersionUnknown: unknown
+  LeftAndMain_Menu.ss:
+    Hello: Hi
+    LOGOUT: 'Log out'
   LoginAttempt:
     Email: 'آدرس های ایمیل'
     IP: 'IP Address'
@@ -313,7 +320,7 @@ fa_IR:
     ERRORNEWPASSWORD: 'You have entered your new password differently, try again'
     ERRORPASSWORDNOTMATCH: 'Your current password does not match, please try again'
     ERRORWRONGCRED: 'That doesn''t seem to be the right e-mail address or password. Please try again.'
-    FIRSTNAME: نام
+    FIRSTNAME: 'نام'
     INTERFACELANG: 'زبان برنامه'
     INVALIDNEWPASSWORD: 'We couldn''t accept that password: {password}'
     LOGGEDINAS: 'You''re logged in as {name}.'
@@ -368,6 +375,7 @@ fa_IR:
     ResultUpdated: 'Updated {count} members'
   MemberTableField: null
   ModelAdmin:
+    'APPLY FILTER': 'Apply Filter'
     DELETE: حذف
     DELETEDRECORDS: 'Deleted {count} records.'
     IMPORT: 'Import from CSV'
@@ -377,6 +385,17 @@ fa_IR:
     RESET: Reset
     Title: 'Data Models'
     UPDATEDRECORDS: 'Updated {count} records.'
+  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
   MoneyField:
     FIELDLABELAMOUNT: Amount
     FIELDLABELCURRENCY: Currency
@@ -389,10 +408,6 @@ fa_IR:
     CMS_ACCESS_CATEGORY: 'CMS Access'
     FULLADMINRIGHTS: 'توانایی‌های کامل مدیریتی:'
     FULLADMINRIGHTS_HELP: 'Implies and overrules all other assigned permissions.'
-    IMPORTSPECFIELDS: 'Database columns'
-    IMPORTSPECLINK: 'Show Specification for %s'
-    IMPORTSPECRELATIONS: Relations
-    IMPORTSPECTITLE: 'Specification for %s'
   PermissionCheckboxSetField:
     AssignedTo: 'assigned to "{title}"'
     FromGroup: 'inherited from group "{title}"'
@@ -401,8 +416,11 @@ fa_IR:
   Permissions:
     PERMISSIONS_CATEGORY: 'مجوز دسترسی ها و وظایف'
   PhoneNumberField:
-    Back: Back
     VALIDATION: 'لطفاً شماره تلفن معتبر وارد کنید'
+  RelationComplexTableField.ss:
+    ADD: افزودن
+    CSVEXPORT: 'Export to CSV'
+    NOTFOUND: 'No items found'
   Security:
     ALREADYLOGGEDIN: 'شما به این صفحه دسترسی ندارید. اگر حساب کاربری دیگری دارید که به این صفحه دسترسی دارد، شما میتوانید <a href="%s">دوباره وارد شوید.</a>.'
     BUTTONSEND: 'Send me the password reset link'
@@ -439,31 +457,33 @@ fa_IR:
     BtnImport: 'وارد کردن'
     FileFieldLabel: 'CSV File <small>(Allowed extensions: *.csv)</small>'
   SilverStripeNavigator:
-    DISPLAYING: Displaying
     Edit: Edit
-    FILTER: Filter
+  SimpleImageField:
-    IMPORT: Import
+    NOUPLOAD: 'No Image Uploaded'
+  SiteTree:
+    TABMAIN: اصلی
+  TableField:
+    ISREQUIRED: 'In %s ''%s'' is required'
+  TableField.ss:
+    ADD: 'افزودن ردیف تازه'
+    ADDITEM: 'Add %s'
+  TableListField:
+    CSVEXPORT: 'Export to CSV'
+    PRINT: چاپ
+    Print: Print
+    SELECT: انتخاب
+  TableListField.ss:
+    NOITEMSFOUND: 'No items found'
+    SORTASC: 'چینش صعودی'
+    SORTDESC: 'چینش نزولی'
+  TableListField_PageControls.ss:
+    DISPLAYING: Displaying
     OF: of
     TO: to
     VIEWFIRST: 'مشاهده اولی'
     VIEWLAST: 'مشاهده آخری'
     VIEWNEXT: 'مشاهده بعدی'
     VIEWPREVIOUS: 'مشاهده قبلی'
-  SimpleImageField:
-    NOUPLOAD: 'No Image Uploaded'
-  SiteTree:
-    TABMAIN: اصلی
-  TableField:
-    ADDITEM: 'Add %s'
-    ISREQUIRED: 'In %s ''%s'' is required'
-    NOITEMSFOUND: 'No items found'
-    SORTASC: 'چینش صعودی'
-    SORTDESC: 'چینش نزولی'
-  TableListField:
-    CSVEXPORT: 'Export to CSV'
-    PRINT: چاپ
-    Print: Print
-    SELECT: انتخاب
   TimeField:
     VALIDATEFORMAT: 'Please enter a valid time format ({format})'
   ToggleField:

lang/fi.yml

@@ -50,6 +50,8 @@ fi:
     UNORDERED: 'Järjestämätön lista'
     UNORDEREDDESCRIPTION: 'Järjestämätön lista'
     UNORDEREDEXAMPLE1: 'järjestämätön lista 1'
+  BackLink_Button.ss:
+    Back: Takaisin
   BasicAuth:
     ENTERINFO: 'Anna käyttäjänimi ja salasana'
     ERRORNOTADMIN: 'Tämä käyttäjä ei ole ylläpitäjä'
@@ -57,9 +59,10 @@ fi:
   Boolean:
     0: Ei
     ANY: Yhtään
-    Hello: Hei
-    LOGOUT: 'Kirjaudu ulos'
     1: Kyllä
+  CMSLoadingScreen.ss:
+    LOADING: Ladataan...
+    REQUIREJS: 'CMS-järjestelmä vaatii, että selaimessasi on JavaSkriptit päällä.'
   CMSMain:
     ACCESS: 'Pääsy ''{title}'' -osioon'
     ACCESSALLINTERFACES: 'Pääsy kaikkiin CMS-osioihin'
@@ -67,6 +70,12 @@ fi:
     SAVE: Tallenna
   CMSProfileController:
     MENUTITLE: 'CMS-profiili kontrolleri'
+  ChangePasswordEmail.ss:
+    CHANGEPASSWORDTEXT1: 'Vaihdoit salasanasi osoitteelle'
+    CHANGEPASSWORDTEXT2: 'Kirjautuaksesi sisään voit käyttää seuraavia tietoja:'
+    EMAIL: Sähköposti
+    HELLO: Hei
+    PASSWORD: Salasana
   CheckboxField:
     - Ei
     - Kyllä
@@ -74,6 +83,14 @@ fi:
     CLOSEPOPUP: 'Sulje ponnahdusikkuna'
     SUCCESSADD2: 'Lisättiin {name}'
     SUCCESSEDIT: 'Tallennettu %s %s %s'
+  ComplexTableField.ss:
+    ADDITEM: 'Lisää %s'
+    NOITEMSFOUND: 'Merkintöjä ei löytynyt'
+    SORTASC: 'Nouseva järjestys'
+    SORTDESC: 'Laskeva järjestys'
+  ComplexTableField_popup.ss:
+    NEXT: Seuraava
+    PREVIOUS: Edellinen
   ConfirmedPasswordField:
     ATLEAST: 'Salasanan on oltava vähintään {min} merkkiä pitkä.'
     BETWEEN: 'Salasanan on oltava väh. {min} ja enintään {max} merkkiä pitkä.'
@@ -111,10 +128,7 @@ fi:
     VALIDDATEMAXDATE: 'Päivämäärän on oltava vanhempi tai sovittava asetettuun maksimiin ({date})'
     VALIDDATEMINDATE: 'Päivämäärän on oltava uudempi tai sovittava vähintään asetettuun minimiin ({date})'
   Director:
-    ADD: Lisää
-    CSVEXPORT: 'Vie CSV:nä'
     INVALID_REQUEST: 'Pyyntö on virheellinen'
-    NOTFOUND: 'Merkintöjä ei löytynyt'
   DropdownField:
     CHOOSE: (Valitse)
   EmailField:
@@ -124,8 +138,6 @@ fi:
     SINGULARNAME: 'Palautettu sähköpostiviesti'
   Enum:
     ANY: Yhtään
-    LOADING: Ladataan...
-    REQUIREJS: 'CMS-järjestelmä vaatii, että selaimessasi on JavaSkriptit päällä.'
   File:
     Content: Sisältö
     Filename: Tiedostonimi
@@ -150,13 +162,17 @@ fi:
     FROMFILESTORE: Tiedostovarastosta
     NOSOURCE: 'Valitse lähdetiedosto liitettäväksi'
     REPLACE: 'Korvaa {type}'
+  FileIFrameField_iframe.ss:
+    TITLE: 'Kuvansiirtoikkuna (iFrame)'
   Filesystem:
-    IMPORT_TAB_HEADER: Tuo
-    SEARCHLISTINGS: Etsi
     SYNCRESULTS: 'Synkronointi valmis:  {createdcount} kohdetta luotu, {deletedcount} kohdetta poistettu'
+  ForgotPasswordEmail.ss:
+    HELLO: Hei
+    TEXT1: 'Tässä on sinun'
+    TEXT2: 'salasanan tyhjäys -linkki'
+    TEXT3: henkilölle
   Form:
     FIELDISREQUIRED: '%s on pakollinen.'
-    TITLE: 'Kuvansiirtoikkuna (iFrame)'
     VALIDATIONCREDITNUMBER: 'Tarkista, ovatko antamasi luottokortin numerot ({number}) oikein'
     VALIDATIONNOTUNIQUE: 'Syötetty arvo ei ole yksilöllinen'
     VALIDATIONPASSWORDSDONTMATCH: 'Salasanat eivät täsmää'
@@ -187,37 +203,26 @@ fi:
     ResetFilter: Nollaa
   GridFieldAction_Delete:
     DeletePermissionsFailure: 'Ei oikeuksia poistamiseen'
-    NEXT: Seuraava
-    PREVIOUS: Edellinen
   GridFieldDetailForm:
     Create: Luo
     Delete: Poista
     DeletePermissionsFailure: 'Ei oikeuksia poistamiseen'
     Deleted: 'Poistettiin %s %s'
-    HELLO: Hei
     Save: Tallenna
     Saved: 'Tallennettu %s %s'
-    TEXT1: 'Tässä on sinun'
+  GridFieldItemEditView.ss: null
-    TEXT2: 'salasanan tyhjäys -linkki'
-    TEXT3: henkilölle
   Group:
     AddRole: 'Lisää ryhmälle rooli'
-    CHANGEPASSWORDTEXT1: 'Vaihdoit salasanasi osoitteelle'
-    CHANGEPASSWORDTEXT2: 'Kirjautuaksesi sisään voit käyttää seuraavia tietoja:'
     Code: 'Ryhmän koodi'
     DefaultGroupTitleAdministrators: Järjestelmänvalvojat
     DefaultGroupTitleContentAuthors: Sisällöntuottajat
     Description: Kuvaus
-    EMAIL: Sähköposti
     GroupReminder: 'Valitessasi isäntäryhmän, roolit periytyvät tähän ryhmään'
-    HELLO: Hei
     Locked: 'Lukittu?'
     NoRoles: 'Rooleja ei löytynyt'
-    PASSWORD: Salasana
     Parent: Yliryhmä
     RolesAddEditLink: 'Lisää/muokkaa rooleja'
     Sort: Järjestys
-    TITLE: 'Kuvansiirto ikkuna (iFrame)'
     has_many_Permissions: Luvat
     many_many_Members: Jäsenet
   GroupImportForm:
@@ -275,10 +280,9 @@ fi:
     UpdateMEDIA: 'Päivitä media'
   ImageField:
     IMAGE: Kuva
-  Image_iframe.ss: 'ChangePasswordEmail.ss:  BackLink_Button.ss:  CMSLoadingScreen.ss:  RelationComplexTableField.ss:  ForgotPasswordEmail.ss:    APPLY FILTER: "Suodata"  GridFieldItemEditView.ss:    Go back: "Takaisin"  ModelSidebar.ss:  TableListField_PageControls.ss:  ModelAdmin_Tools.ss:  ComplexTableField_popup.ss:  TableField.ss:  FileIFrameField_iframe.ss:  ComplexTableField.ss:  TableListField.ss:  ModelAdmin_ImportSpec.ss:  LeftAndMain_Menu.ss:'
+  Image_iframe.ss:
+    TITLE: 'Kuvansiirto ikkuna (iFrame)'
   LeftAndMain:
-    ADD: 'Lisää uusi rivi'
-    ADDITEM: 'Lisää %s'
     CANT_REORGANISE: 'Sinulla ei ole oikeuksia mennä ylemmän tason sivuille. Muutoksiasi ei tallennettu.'
     DELETED: Poistettu.
     DropdownBatchActionsDefault: Toimenpiteet
@@ -292,6 +296,9 @@ fi:
     REORGANISATIONSUCCESSFUL: 'Hakemistopuu järjestettiin uudelleen onnistuneesti.'
     SAVEDUP: Tallennettu.
     VersionUnknown: tuntematon
+  LeftAndMain_Menu.ss:
+    Hello: Hei
+    LOGOUT: 'Kirjaudu ulos'
   LoginAttempt:
     Email: Sähköpostiosoite
     IP: IP-osoite
@@ -368,6 +375,7 @@ fi:
     ResultUpdated: 'Päivitettiin {count} käyttäjä(ä)'
   MemberTableField: null
   ModelAdmin:
+    'APPLY FILTER': Suodata
     DELETE: Poista
     DELETEDRECORDS: 'Poistettiin {count} tietuetta'
     IMPORT: 'Tuo CSV:stä'
@@ -377,6 +385,17 @@ fi:
     RESET: Nollaa
     Title: Datamallit
     UPDATEDRECORDS: 'Päivitettiin {count} tietuetta'
+  ModelAdmin_ImportSpec.ss:
+    IMPORTSPECFIELDS: 'Tietokannan sarakkeet'
+    IMPORTSPECLINK: 'Näytä erittely kohteelle %s'
+    IMPORTSPECRELATIONS: Yhteydet
+    IMPORTSPECTITLE: 'Erittely kohteelle %s'
+  ModelAdmin_Tools.ss:
+    FILTER: Suodin
+    IMPORT: Tuo
+  ModelSidebar.ss:
+    IMPORT_TAB_HEADER: Tuo
+    SEARCHLISTINGS: Etsi
   MoneyField:
     FIELDLABELAMOUNT: Määrä
     FIELDLABELCURRENCY: Valuutta
@@ -389,10 +408,6 @@ fi:
     CMS_ACCESS_CATEGORY: CMS-pääsy
     FULLADMINRIGHTS: 'Täydet ylläpitäjän oikeudet'
     FULLADMINRIGHTS_HELP: 'Merkitsee ja ohittaa kaikki muut määritellyt käyttöoikeudet.'
-    IMPORTSPECFIELDS: 'Tietokannan sarakkeet'
-    IMPORTSPECLINK: 'Näytä erittely kohteelle %s'
-    IMPORTSPECRELATIONS: Yhteydet
-    IMPORTSPECTITLE: 'Erittely kohteelle %s'
   PermissionCheckboxSetField:
     AssignedTo: 'valittiin "{title}"'
     FromGroup: 'periytyivät ryhmästä "{title}"'
@@ -401,8 +416,11 @@ fi:
   Permissions:
     PERMISSIONS_CATEGORY: 'Roolit ja käyttöoikeudet'
   PhoneNumberField:
-    Back: Takaisin
     VALIDATION: 'Kirjoita pätevä puhelinnumero'
+  RelationComplexTableField.ss:
+    ADD: Lisää
+    CSVEXPORT: 'Vie CSV:nä'
+    NOTFOUND: 'Merkintöjä ei löytynyt'
   Security:
     ALREADYLOGGEDIN: 'Sinulla ei ole oikeuksia tälle sivulle. Jos sinulla on toinen tili, jolla on oikeudet tälle sivulle, voit kirjautua niillä sisään.'
     BUTTONSEND: 'Lähetä minulle salasanan palautuslinkki'
@@ -439,31 +457,33 @@ fi:
     BtnImport: Tuonti
     FileFieldLabel: 'CSV-tiedosto <small>(Sallitut päätteet: *.csv)</small>'
   SilverStripeNavigator:
-    DISPLAYING: Näytetään
     Edit: Muokkaa
-    FILTER: Suodin
+  SimpleImageField:
-    IMPORT: Tuo
+    NOUPLOAD: 'Kuvaa ei kopioitu palvelimelle'
+  SiteTree:
+    TABMAIN: Yleiset
+  TableField:
+    ISREQUIRED: 'Kohteessa %s on ''%s'' pakollinen'
+  TableField.ss:
+    ADD: 'Lisää uusi rivi'
+    ADDITEM: 'Lisää %s'
+  TableListField:
+    CSVEXPORT: 'Vie CSV:nä'
+    PRINT: Tulosta
+    Print: Tulosta
+    SELECT: 'Valitse:'
+  TableListField.ss:
+    NOITEMSFOUND: 'Merkintöjä ei löytynyt'
+    SORTASC: 'Järjestä nousevasti'
+    SORTDESC: 'Järjestä laskevasti'
+  TableListField_PageControls.ss:
+    DISPLAYING: Näytetään
     OF: /
     TO: listalle
     VIEWFIRST: 'Näytä ensimmäinen'
     VIEWLAST: 'Näytä viimeinen'
     VIEWNEXT: 'Näytä seuraava'
     VIEWPREVIOUS: 'Näytä edellinen'
-  SimpleImageField:
-    NOUPLOAD: 'Kuvaa ei kopioitu palvelimelle'
-  SiteTree:
-    TABMAIN: Yleiset
-  TableField:
-    ADDITEM: 'Lisää %s'
-    ISREQUIRED: 'Kohteessa %s on ''%s'' pakollinen'
-    NOITEMSFOUND: 'Merkintöjä ei löytynyt'
-    SORTASC: 'Järjestä nousevasti'
-    SORTDESC: 'Järjestä laskevasti'
-  TableListField:
-    CSVEXPORT: 'Vie CSV:nä'
-    PRINT: Tulosta
-    Print: Print
-    SELECT: 'Valitse:'
   TimeField:
     VALIDATEFORMAT: 'Ole hyvä ja kirjaa päivämäärä sallitussa muodossa ({format})'
   ToggleField:

lang/fo.yml

@@ -50,6 +50,8 @@ fo:
     UNORDERED: 'Unordered list'
     UNORDEREDDESCRIPTION: 'Unordered list'
     UNORDEREDEXAMPLE1: 'unordered item 1'
+  BackLink_Button.ss:
+    Back: Back
   BasicAuth:
     ENTERINFO: 'Vinarliga inntøppa eitt brúkaranavn og loyniorð.'
     ERRORNOTADMIN: 'Hasin brúkarin er ikki ein fyrisitari.'
@@ -57,9 +59,10 @@ fo:
   Boolean:
     0: 'False'
     ANY: Any
-    Hello: Hi
-    LOGOUT: 'Log out'
     1: 'True'
+  CMSLoadingScreen.ss:
+    LOADING: Loading...
+    REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
   CMSMain:
     ACCESS: 'Access to ''{title}'' section'
     ACCESSALLINTERFACES: 'Access to all CMS sections'
@@ -67,6 +70,12 @@ fo:
     SAVE: Goym
   CMSProfileController:
     MENUTITLE: CMSProfileController
+  ChangePasswordEmail.ss:
+    CHANGEPASSWORDTEXT1: 'Tú broytti loyniorðið hjá'
+    CHANGEPASSWORDTEXT2: 'You can now use the following credentials to log in:'
+    EMAIL: Teldupostur
+    HELLO: Hey
+    PASSWORD: Loyniorð
   CheckboxField:
     - 'False'
     - 'True'
@@ -74,6 +83,14 @@ fo:
     CLOSEPOPUP: 'Lat glugga aftur'
     SUCCESSADD2: 'Added {name}'
     SUCCESSEDIT: 'Saved %s %s %s'
+  ComplexTableField.ss:
+    ADDITEM: 'Add %s'
+    NOITEMSFOUND: 'No items found'
+    SORTASC: 'Raða hækkandi'
+    SORTDESC: 'Raða lækkandi'
+  ComplexTableField_popup.ss:
+    NEXT: Næsta
+    PREVIOUS: Fyrra
   ConfirmedPasswordField:
     ATLEAST: 'Passwords must be at least {min} characters long.'
     BETWEEN: 'Passwords must be {min} to {max} characters long.'
@@ -111,10 +128,7 @@ fo:
     VALIDDATEMAXDATE: 'Your date has to be older or matching the maximum allowed date ({date})'
     VALIDDATEMINDATE: 'Your date has to be newer or matching the minimum allowed date ({date})'
   Director:
-    ADD: Stovna
-    CSVEXPORT: 'Export to CSV'
     INVALID_REQUEST: 'Invalid request'
-    NOTFOUND: 'No items found'
   DropdownField:
     CHOOSE: (Áset)
   EmailField:
@@ -124,8 +138,6 @@ fo:
     SINGULARNAME: 'Email Bounce Record'
   Enum:
     ANY: Any
-    LOADING: Loading...
-    REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
   File:
     Content: Innihald
     Filename: Fílunavn
@@ -150,13 +162,17 @@ fo:
     FROMFILESTORE: 'From the File Store'
     NOSOURCE: 'Please select a source file to attach'
     REPLACE: 'Replace {type}'
+  FileIFrameField_iframe.ss:
+    TITLE: 'Image Uploading Iframe'
   Filesystem:
-    IMPORT_TAB_HEADER: Import
-    SEARCHLISTINGS: Search
     SYNCRESULTS: 'Sync complete: {createdcount} items created, {deletedcount} items deleted'
+  ForgotPasswordEmail.ss:
+    HELLO: Hey
+    TEXT1: 'Her er títt'
+    TEXT2: 'password reset link'
+    TEXT3: for
   Form:
     FIELDISREQUIRED: '%s er kravt'
-    TITLE: 'Image Uploading Iframe'
     VALIDATIONCREDITNUMBER: 'Please ensure you have entered the {number} credit card number correctly'
     VALIDATIONNOTUNIQUE: 'Virðið sum bleiv inntøppað er ikki eintýðugt'
     VALIDATIONPASSWORDSDONTMATCH: 'Loyniorð samsvara ikki'
@@ -187,37 +203,26 @@ fo:
     ResetFilter: Reset
   GridFieldAction_Delete:
     DeletePermissionsFailure: 'No delete permissions'
-    NEXT: Næsta
-    PREVIOUS: Fyrra
   GridFieldDetailForm:
     Create: Create
     Delete: Delete
     DeletePermissionsFailure: 'No delete permissions'
     Deleted: 'Deleted %s %s'
-    HELLO: Hey
     Save: Save
     Saved: 'Saved %s %s'
-    TEXT1: 'Her er títt'
+  GridFieldItemEditView.ss: null
-    TEXT2: 'password reset link'
-    TEXT3: for
   Group:
     AddRole: 'Add a role for this group'
-    CHANGEPASSWORDTEXT1: 'Tú broytti loyniorðið hjá'
-    CHANGEPASSWORDTEXT2: 'You can now use the following credentials to log in:'
     Code: 'Bólka kota'
     DefaultGroupTitleAdministrators: Administrators
     DefaultGroupTitleContentAuthors: 'Content Authors'
     Description: Frágreiðing
-    EMAIL: Teldupostur
     GroupReminder: 'If you choose a parent group, this group will take all it''s roles'
-    HELLO: Hey
     Locked: 'Læst?'
     NoRoles: 'No roles found'
-    PASSWORD: Loyniorð
     Parent: Yvirbólkur
     RolesAddEditLink: 'Manage roles'
     Sort: 'Raða eftir'
-    TITLE: 'Image Uploading Iframe'
     has_many_Permissions: Loyvir
     many_many_Members: Limir
   GroupImportForm:
@@ -275,10 +280,9 @@ fo:
     UpdateMEDIA: 'Update Media'
   ImageField:
     IMAGE: Image
-  Image_iframe.ss: 'ChangePasswordEmail.ss:  BackLink_Button.ss:  CMSLoadingScreen.ss:  RelationComplexTableField.ss:  ForgotPasswordEmail.ss:    APPLY FILTER: "Apply Filter"  GridFieldItemEditView.ss:    Go back: "Go back"  ModelSidebar.ss:  TableListField_PageControls.ss:  ModelAdmin_Tools.ss:  ComplexTableField_popup.ss:  TableField.ss:  FileIFrameField_iframe.ss:  ComplexTableField.ss:  TableListField.ss:  ModelAdmin_ImportSpec.ss:  LeftAndMain_Menu.ss:'
+  Image_iframe.ss:
+    TITLE: 'Image Uploading Iframe'
   LeftAndMain:
-    ADD: 'Add a new row'
-    ADDITEM: 'Add %s'
     CANT_REORGANISE: 'You do not have permission to alter Top level pages. Your change was not saved.'
     DELETED: Deleted.
     DropdownBatchActionsDefault: Actions
@@ -292,6 +296,9 @@ fo:
     REORGANISATIONSUCCESSFUL: 'Reorganised the site tree successfully.'
     SAVEDUP: Saved.
     VersionUnknown: unknown
+  LeftAndMain_Menu.ss:
+    Hello: Hi
+    LOGOUT: 'Log out'
   LoginAttempt:
     Email: Teldupostur
     IP: 'IP adressa'
@@ -368,6 +375,7 @@ fo:
     ResultUpdated: 'Updated {count} members'
   MemberTableField: null
   ModelAdmin:
+    'APPLY FILTER': 'Apply Filter'
     DELETE: Strika
     DELETEDRECORDS: 'Deleted {count} records.'
     IMPORT: 'Innles frá CSV'
@@ -377,6 +385,17 @@ fo:
     RESET: Reset
     Title: 'Data Models'
     UPDATEDRECORDS: 'Updated {count} records.'
+  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
   MoneyField:
     FIELDLABELAMOUNT: Amount
     FIELDLABELCURRENCY: Currency
@@ -389,10 +408,6 @@ fo:
     CMS_ACCESS_CATEGORY: 'CMS Access'
     FULLADMINRIGHTS: 'Full administrative rights'
     FULLADMINRIGHTS_HELP: 'Implies and overrules all other assigned permissions.'
-    IMPORTSPECFIELDS: 'Database columns'
-    IMPORTSPECLINK: 'Show Specification for %s'
-    IMPORTSPECRELATIONS: Relations
-    IMPORTSPECTITLE: 'Specification for %s'
   PermissionCheckboxSetField:
     AssignedTo: 'assigned to "{title}"'
     FromGroup: 'inherited from group "{title}"'
@@ -401,8 +416,11 @@ fo:
   Permissions:
     PERMISSIONS_CATEGORY: 'Roles and access permissions'
   PhoneNumberField:
-    Back: Back
     VALIDATION: 'Vinarliga inntøppa eitt galdandi telefonnummar'
+  RelationComplexTableField.ss:
+    ADD: Stovna
+    CSVEXPORT: 'Export to CSV'
+    NOTFOUND: 'No items found'
   Security:
     ALREADYLOGGEDIN: 'You don''t have access to this page.  If you have another account that can access that page, you can log in again below.'
     BUTTONSEND: 'Send mær leinkuna til at nullstilla mítt loyniorð'
@@ -439,31 +457,33 @@ fo:
     BtnImport: 'Import from CSV'
     FileFieldLabel: 'CSV File <small>(Allowed extensions: *.csv)</small>'
   SilverStripeNavigator:
-    DISPLAYING: Displaying
     Edit: Edit
-    FILTER: Filter
+  SimpleImageField:
-    IMPORT: Import
+    NOUPLOAD: 'No Image Uploaded'
+  SiteTree:
+    TABMAIN: Alment
+  TableField:
+    ISREQUIRED: 'In %s ''%s'' is required'
+  TableField.ss:
+    ADD: 'Add a new row'
+    ADDITEM: 'Add %s'
+  TableListField:
+    CSVEXPORT: 'Útles til CSV'
+    PRINT: Prenta
+    Print: Print
+    SELECT: 'Select:'
+  TableListField.ss:
+    NOITEMSFOUND: 'No items found'
+    SORTASC: 'Sort in ascending order'
+    SORTDESC: 'Sort in descending order'
+  TableListField_PageControls.ss:
+    DISPLAYING: Displaying
     OF: of
     TO: to
     VIEWFIRST: 'Vís fyrstu'
     VIEWLAST: 'Vís seinastu'
     VIEWNEXT: 'Vís næstu'
     VIEWPREVIOUS: 'Vís fyrru'
-  SimpleImageField:
-    NOUPLOAD: 'No Image Uploaded'
-  SiteTree:
-    TABMAIN: Alment
-  TableField:
-    ADDITEM: 'Add %s'
-    ISREQUIRED: 'In %s ''%s'' is required'
-    NOITEMSFOUND: 'No items found'
-    SORTASC: 'Sort in ascending order'
-    SORTDESC: 'Sort in descending order'
-  TableListField:
-    CSVEXPORT: 'Útles til CSV'
-    PRINT: Prenta
-    Print: Print
-    SELECT: 'Select:'
   TimeField:
     VALIDATEFORMAT: 'Please enter a valid time format ({format})'
   ToggleField:

lang/fr.yml

@@ -50,6 +50,8 @@ fr:
     UNORDERED: 'Liste non ordonnée'
     UNORDEREDDESCRIPTION: 'Liste non ordonnée'
     UNORDEREDEXAMPLE1: 'élément non ordonné 1'
+  BackLink_Button.ss:
+    Back: Retour
   BasicAuth:
     ENTERINFO: 'Entrer un identifiant et un mot de passe s''il vous plaît.'
     ERRORNOTADMIN: 'Cet utilisateur n''est pas un administrateur.'
@@ -57,9 +59,10 @@ fr:
   Boolean:
     0: Non
     ANY: Tout
-    Hello: Hi
-    LOGOUT: 'Log out'
     1: Oui
+  CMSLoadingScreen.ss:
+    LOADING: Chargement...
+    REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
   CMSMain:
     ACCESS: 'Access to ''{title}'' section'
     ACCESSALLINTERFACES: 'Accès à toutes les sections du CMS'
@@ -67,6 +70,12 @@ fr:
     SAVE: Enregistrer
   CMSProfileController:
     MENUTITLE: CMSProfileController
+  ChangePasswordEmail.ss:
+    CHANGEPASSWORDTEXT1: 'Vous avez modifié votre mot de passe pour'
+    CHANGEPASSWORDTEXT2: 'Vous pouvez maintenant utiliser les identifiants suivants pour vous connecter :'
+    EMAIL: Email
+    HELLO: Salut
+    PASSWORD: 'Mot de passe'
   CheckboxField:
     - Non
     - Oui
@@ -74,6 +83,14 @@ fr:
     CLOSEPOPUP: 'Ferme Popup'
     SUCCESSADD2: '{name} ajouté'
     SUCCESSEDIT: 'Sauvegardé %s %s %s'
+  ComplexTableField.ss:
+    ADDITEM: 'Add %s'
+    NOITEMSFOUND: 'No items found'
+    SORTASC: 'Tri croissant'
+    SORTDESC: 'Tri décroissant'
+  ComplexTableField_popup.ss:
+    NEXT: Suivant
+    PREVIOUS: Précédent
   ConfirmedPasswordField:
     ATLEAST: 'Passwords must be at least {min} characters long.'
     BETWEEN: 'Passwords must be {min} to {max} characters long.'
@@ -111,10 +128,7 @@ fr:
     VALIDDATEMAXDATE: 'La date doit être antérieure ou égale à celle qui a été autorisée ({date})'
     VALIDDATEMINDATE: 'La date doit être plus récente ou égale à celle qui a été autorisée ({date})'
   Director:
-    ADD: Ajouter
-    CSVEXPORT: 'Export to CSV'
     INVALID_REQUEST: 'Requête non valide'
-    NOTFOUND: 'No items found'
   DropdownField:
     CHOOSE: (Choisir)
   EmailField:
@@ -124,8 +138,6 @@ fr:
     SINGULARNAME: 'Enregistrement de Email rejeté'
   Enum:
     ANY: Tous
-    LOADING: Chargement...
-    REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
   File:
     Content: Contenu
     Filename: 'Nom du fichier'
@@ -150,13 +162,17 @@ fr:
     FROMFILESTORE: 'Depuis le magasin de fichier'
     NOSOURCE: 'Choisir un fichier à attacher'
     REPLACE: 'Replace {type}'
+  FileIFrameField_iframe.ss:
+    TITLE: 'Iframe de chargement d’images'
   Filesystem:
-    IMPORT_TAB_HEADER: Importer
-    SEARCHLISTINGS: Rechercher
     SYNCRESULTS: 'Synchronisation terminée : {createdcount} éléments créés, {deletedcount} éléments supprimés '
+  ForgotPasswordEmail.ss:
+    HELLO: Salut
+    TEXT1: 'Voici votre'
+    TEXT2: 'lien de réinitialisation de mot de passe'
+    TEXT3: pour
   Form:
     FIELDISREQUIRED: '%s est requis'
-    TITLE: 'Iframe de chargement d’images'
     VALIDATIONCREDITNUMBER: 'Please ensure you have entered the {number} credit card number correctly'
     VALIDATIONNOTUNIQUE: 'La valeur entrée n''est pas unique'
     VALIDATIONPASSWORDSDONTMATCH: 'Les mots de passe ne correspondent pas'
@@ -187,37 +203,26 @@ fr:
     ResetFilter: Réinitialiser
   GridFieldAction_Delete:
     DeletePermissionsFailure: 'Vous n’avez pas les autorisations pour supprimer'
-    NEXT: Suivant
-    PREVIOUS: Précédent
   GridFieldDetailForm:
     Create: Créer
     Delete: Supprimer
     DeletePermissionsFailure: 'Vous n’avez pas les autorisations pour supprimer'
     Deleted: '%s %s supprimés'
-    HELLO: Salut
     Save: Enregistrer
     Saved: '%s %s sauvegardés'
-    TEXT1: 'Voici votre'
+  GridFieldItemEditView.ss: null
-    TEXT2: 'lien de réinitialisation de mot de passe'
-    TEXT3: pour
   Group:
     AddRole: 'Ajouter un rôle à ce groupe '
-    CHANGEPASSWORDTEXT1: 'Vous avez modifié votre mot de passe pour'
-    CHANGEPASSWORDTEXT2: 'Vous pouvez maintenant utiliser les identifiants suivants pour vous connecter :'
     Code: 'Code de groupe'
     DefaultGroupTitleAdministrators: Administrateur
     DefaultGroupTitleContentAuthors: 'Auteurs du contenu'
     Description: Description
-    EMAIL: Email
     GroupReminder: 'Si vous choisissez un groupe parent, le groupe actuel héritera de tous ses rôles'
-    HELLO: Salut
     Locked: 'Verrouillé?'
     NoRoles: 'Aucun rôle n’a été trouvé'
-    PASSWORD: 'Mot de passe'
     Parent: 'Groupe parent'
     RolesAddEditLink: 'Ajouter/éditer les rôles'
     Sort: 'Ordre de tri'
-    TITLE: 'Fenêtre de chargement d''images'
     has_many_Permissions: Autorisations
     many_many_Members: Membres
   GroupImportForm:
@@ -275,10 +280,9 @@ fr:
     UpdateMEDIA: 'Mettre à jour le support audiovisuel'
   ImageField:
     IMAGE: Image
-  Image_iframe.ss: 'ChangePasswordEmail.ss:  BackLink_Button.ss:  CMSLoadingScreen.ss:  RelationComplexTableField.ss:  ForgotPasswordEmail.ss:    APPLY FILTER: "Appliquer le filtre"  GridFieldItemEditView.ss:    Go back: "Revenir en arrière"  ModelSidebar.ss:  TableListField_PageControls.ss:  ModelAdmin_Tools.ss:  ComplexTableField_popup.ss:  TableField.ss:  FileIFrameField_iframe.ss:  ComplexTableField.ss:  TableListField.ss:  ModelAdmin_ImportSpec.ss:  LeftAndMain_Menu.ss:'
+  Image_iframe.ss:
+    TITLE: 'Fenêtre de chargement d''images'
   LeftAndMain:
-    ADD: 'Ajouter une nouvelle ligne'
-    ADDITEM: 'Add %s'
     CANT_REORGANISE: 'Vous n’avez pas l’autorisation de modifier les pages de premier niveau. Vos modifications n’ont pas été enregistrées.'
     DELETED: Deleted.
     DropdownBatchActionsDefault: Actions
@@ -292,6 +296,9 @@ fr:
     REORGANISATIONSUCCESSFUL: 'Reorganised the site tree successfully.'
     SAVEDUP: Saved.
     VersionUnknown: inconnu
+  LeftAndMain_Menu.ss:
+    Hello: Hi
+    LOGOUT: 'Log out'
   LoginAttempt:
     Email: 'Adresse Email'
     IP: 'Adresse IP'
@@ -368,6 +375,7 @@ fr:
     ResultUpdated: 'Updated {count} members'
   MemberTableField: null
   ModelAdmin:
+    'APPLY FILTER': 'Appliquer le filtre'
     DELETE: Supprime
     DELETEDRECORDS: 'Deleted {count} records.'
     IMPORT: 'Importer de CSV'
@@ -377,6 +385,17 @@ fr:
     RESET: Réinitialiser
     Title: 'Data Models'
     UPDATEDRECORDS: 'Updated {count} records.'
+  ModelAdmin_ImportSpec.ss:
+    IMPORTSPECFIELDS: 'Database columns'
+    IMPORTSPECLINK: 'Show Specification for %s'
+    IMPORTSPECRELATIONS: Relations
+    IMPORTSPECTITLE: 'Specification for %s'
+  ModelAdmin_Tools.ss:
+    FILTER: Filtrer
+    IMPORT: Importer
+  ModelSidebar.ss:
+    IMPORT_TAB_HEADER: Importer
+    SEARCHLISTINGS: Rechercher
   MoneyField:
     FIELDLABELAMOUNT: Quantité
     FIELDLABELCURRENCY: Devise
@@ -389,10 +408,6 @@ fr:
     CMS_ACCESS_CATEGORY: 'Accès au CMS'
     FULLADMINRIGHTS: 'Droits d''administration complets'
     FULLADMINRIGHTS_HELP: 'Implique et prévaut sur toutes les autres autorisations assignées.'
-    IMPORTSPECFIELDS: 'Database columns'
-    IMPORTSPECLINK: 'Show Specification for %s'
-    IMPORTSPECRELATIONS: Relations
-    IMPORTSPECTITLE: 'Specification for %s'
   PermissionCheckboxSetField:
     AssignedTo: 'assignée au groupe « {title} »'
     FromGroup: 'hérité du groupe « {title} »'
@@ -401,8 +416,11 @@ fr:
   Permissions:
     PERMISSIONS_CATEGORY: 'Rôles et autorisations d’accès'
   PhoneNumberField:
-    Back: Retour
     VALIDATION: 'Entrer un numéro de téléphone valide'
+  RelationComplexTableField.ss:
+    ADD: Ajouter
+    CSVEXPORT: 'Export to CSV'
+    NOTFOUND: 'No items found'
   Security:
     ALREADYLOGGEDIN: 'Vous n''avez pas accès à cette page. Si vous avez un autre identifiant pouvant accéder à cette page, vous pouvez l''utiliser ci-dessous.'
     BUTTONSEND: 'Envoyer moi le lien pour modifier le mot de passe'
@@ -439,31 +457,33 @@ fr:
     BtnImport: Importer
     FileFieldLabel: 'Fichier CSV <small>(extension autorisée&nbsp;: *.csv)</small>'
   SilverStripeNavigator:
-    DISPLAYING: Displaying
     Edit: 'Tout modifier'
-    FILTER: Filtrer
+  SimpleImageField:
-    IMPORT: Importer
+    NOUPLOAD: 'Aucune image chargée'
+  SiteTree:
+    TABMAIN: Principal
+  TableField:
+    ISREQUIRED: 'In %s ''%s'' is required'
+  TableField.ss:
+    ADD: 'Ajouter une nouvelle ligne'
+    ADDITEM: 'Add %s'
+  TableListField:
+    CSVEXPORT: 'Exporter vers un fichier CSV'
+    PRINT: Imprimer
+    Print: Print
+    SELECT: 'Sélectionner&nbsp;:'
+  TableListField.ss:
+    NOITEMSFOUND: 'No items found'
+    SORTASC: 'Classer en ordre croissant'
+    SORTDESC: 'Classer en ordre décroissant'
+  TableListField_PageControls.ss:
+    DISPLAYING: Displaying
     OF: of
     TO: to
     VIEWFIRST: 'Voir premier'
     VIEWLAST: 'Voir dernier'
     VIEWNEXT: 'Voir suivant'
     VIEWPREVIOUS: 'Voir précédent'
-  SimpleImageField:
-    NOUPLOAD: 'Aucune image chargée'
-  SiteTree:
-    TABMAIN: Principal
-  TableField:
-    ADDITEM: 'Add %s'
-    ISREQUIRED: 'In %s ''%s'' is required'
-    NOITEMSFOUND: 'No items found'
-    SORTASC: 'Classer en ordre croissant'
-    SORTDESC: 'Classer en ordre décroissant'
-  TableListField:
-    CSVEXPORT: 'Exporter vers un fichier CSV'
-    PRINT: Imprimer
-    Print: Print
-    SELECT: 'Sélectionner&nbsp;:'
   TimeField:
     VALIDATEFORMAT: 'Saisissez l’heure au format valide ({format})'
   ToggleField:

lang/gl_ES.yml

@@ -50,6 +50,8 @@ gl_ES:
     UNORDERED: 'Lista desordenada'
     UNORDEREDDESCRIPTION: 'Lista desordenada'
     UNORDEREDEXAMPLE1: 'elemento desordenado 1'
+  BackLink_Button.ss:
+    Back: Back
   BasicAuth:
     ENTERINFO: 'Por favor insire un nome de usuario e contrasinal.'
     ERRORNOTADMIN: 'Ese usuario non é un administrador.'
@@ -57,9 +59,10 @@ gl_ES:
   Boolean:
     0: Falso
     ANY: Ningún
-    Hello: Hi
-    LOGOUT: 'Log out'
     1: Verdadeiro
+  CMSLoadingScreen.ss:
+    LOADING: Loading...
+    REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
   CMSMain:
     ACCESS: 'Access to ''{title}'' section'
     ACCESSALLINTERFACES: 'Acceder a todas as seccións do CMS'
@@ -67,6 +70,12 @@ gl_ES:
     SAVE: Gardar
   CMSProfileController:
     MENUTITLE: CMSProfileController
+  ChangePasswordEmail.ss:
+    CHANGEPASSWORDTEXT1: 'Mudaches o teu contrasinal por'
+    CHANGEPASSWORDTEXT2: 'Podes empregar agora as seguintes credenciais para iniciar sesión:'
+    EMAIL: Correo-e
+    HELLO: Ola
+    PASSWORD: Contrasinal
   CheckboxField:
     - Falso
     - Verdade
@@ -74,6 +83,14 @@ gl_ES:
     CLOSEPOPUP: 'Pechar Ventá Emerxente'
     SUCCESSADD2: 'Added {name}'
     SUCCESSEDIT: 'Gardado %s %s %s'
+  ComplexTableField.ss:
+    ADDITEM: 'Add %s'
+    NOITEMSFOUND: 'No items found'
+    SORTASC: 'Orde ascendente'
+    SORTDESC: 'Orde descendente'
+  ComplexTableField_popup.ss:
+    NEXT: Seguinte
+    PREVIOUS: Anterior
   ConfirmedPasswordField:
     ATLEAST: 'Passwords must be at least {min} characters long.'
     BETWEEN: 'Passwords must be {min} to {max} characters long.'
@@ -111,10 +128,7 @@ gl_ES:
     VALIDDATEMAXDATE: 'Your date has to be older or matching the maximum allowed date ({date})'
     VALIDDATEMINDATE: 'Your date has to be newer or matching the minimum allowed date ({date})'
   Director:
-    ADD: Engadir
-    CSVEXPORT: 'Export to CSV'
     INVALID_REQUEST: 'Invalid request'
-    NOTFOUND: 'No items found'
   DropdownField:
     CHOOSE: (Escoller)
   EmailField:
@@ -124,8 +138,6 @@ gl_ES:
     SINGULARNAME: 'Rexistro de Correo Rexeitado'
   Enum:
     ANY: Ningún
-    LOADING: Loading...
-    REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
   File:
     Content: Contido
     Filename: 'Nome ficheiro'
@@ -150,13 +162,17 @@ gl_ES:
     FROMFILESTORE: 'Dende o Almacén de Ficheiros'
     NOSOURCE: 'Por favor selecciona un ficheiro fonte para anexar'
     REPLACE: 'Replace {type}'
+  FileIFrameField_iframe.ss:
+    TITLE: 'Iframe subindo imaxe'
   Filesystem:
-    IMPORT_TAB_HEADER: Import
-    SEARCHLISTINGS: Search
     SYNCRESULTS: 'Sync complete: {createdcount} items created, {deletedcount} items deleted'
+  ForgotPasswordEmail.ss:
+    HELLO: Ola
+    TEXT1: 'Estás aquí'
+    TEXT2: 'ligazón de reinicio do contrasinal'
+    TEXT3: para
   Form:
     FIELDISREQUIRED: '%s é requirido'
-    TITLE: 'Iframe subindo imaxe'
     VALIDATIONCREDITNUMBER: 'Please ensure you have entered the {number} credit card number correctly'
     VALIDATIONNOTUNIQUE: 'O valor inserido non é único'
     VALIDATIONPASSWORDSDONTMATCH: 'Os contrasinais non emparellan'
@@ -187,37 +203,26 @@ gl_ES:
     ResetFilter: Reiniciar
   GridFieldAction_Delete:
     DeletePermissionsFailure: 'Non eliminar permisos'
-    NEXT: Seguinte
-    PREVIOUS: Anterior
   GridFieldDetailForm:
     Create: Create
     Delete: Delete
     DeletePermissionsFailure: 'No delete permissions'
     Deleted: 'Deleted %s %s'
-    HELLO: Ola
     Save: Save
     Saved: 'Saved %s %s'
-    TEXT1: 'Estás aquí'
+  GridFieldItemEditView.ss: null
-    TEXT2: 'ligazón de reinicio do contrasinal'
-    TEXT3: para
   Group:
     AddRole: 'Engadir un role para este grupo'
-    CHANGEPASSWORDTEXT1: 'Mudaches o teu contrasinal por'
-    CHANGEPASSWORDTEXT2: 'Podes empregar agora as seguintes credenciais para iniciar sesión:'
     Code: 'Código de Grupo'
     DefaultGroupTitleAdministrators: Administradores
     DefaultGroupTitleContentAuthors: 'Autores do Contido'
     Description: Descrición
-    EMAIL: Correo-e
     GroupReminder: 'Se escolles un grupo pai, este grupo collerá todos os seus roles'
-    HELLO: Ola
     Locked: 'Bloqueado?'
     NoRoles: 'Ningún rol atopado'
-    PASSWORD: Contrasinal
     Parent: 'Grupo Pai'
     RolesAddEditLink: 'Xestionar roles'
     Sort: 'Modo de ordenación'
-    TITLE: 'Iframe subindo imaxe'
     has_many_Permissions: Permisos
     many_many_Members: Membros
   GroupImportForm:
@@ -275,10 +280,9 @@ gl_ES:
     UpdateMEDIA: 'Update Media'
   ImageField:
     IMAGE: Imaxe
-  Image_iframe.ss: 'ChangePasswordEmail.ss:  BackLink_Button.ss:  CMSLoadingScreen.ss:  RelationComplexTableField.ss:  ForgotPasswordEmail.ss:    APPLY FILTER: "Aplicar Filtro"  GridFieldItemEditView.ss:    Go back: "Ir atrás"  ModelSidebar.ss:  TableListField_PageControls.ss:  ModelAdmin_Tools.ss:  ComplexTableField_popup.ss:  TableField.ss:  FileIFrameField_iframe.ss:  ComplexTableField.ss:  TableListField.ss:  ModelAdmin_ImportSpec.ss:  LeftAndMain_Menu.ss:'
+  Image_iframe.ss:
+    TITLE: 'Iframe subindo imaxe'
   LeftAndMain:
-    ADD: 'Engadir unha nova fila'
-    ADDITEM: 'Add %s'
     CANT_REORGANISE: 'You do not have permission to alter Top level pages. Your change was not saved.'
     DELETED: Deleted.
     DropdownBatchActionsDefault: Accións
@@ -292,6 +296,9 @@ gl_ES:
     REORGANISATIONSUCCESSFUL: 'Reorganised the site tree successfully.'
     SAVEDUP: Saved.
     VersionUnknown: descoñecido
+  LeftAndMain_Menu.ss:
+    Hello: Hi
+    LOGOUT: 'Log out'
   LoginAttempt:
     Email: 'Enderezo Correo-e'
     IP: 'Enderezo IP'
@@ -368,6 +375,7 @@ gl_ES:
     ResultUpdated: 'Updated {count} members'
   MemberTableField: null
   ModelAdmin:
+    'APPLY FILTER': 'Aplicar Filtro'
     DELETE: Eliminar
     DELETEDRECORDS: 'Deleted {count} records.'
     IMPORT: 'Importar dende CSV'
@@ -377,6 +385,17 @@ gl_ES:
     RESET: Reiniciar
     Title: 'Data Models'
     UPDATEDRECORDS: 'Updated {count} records.'
+  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
   MoneyField:
     FIELDLABELAMOUNT: Cantidade
     FIELDLABELCURRENCY: Moeda
@@ -389,10 +408,6 @@ gl_ES:
     CMS_ACCESS_CATEGORY: 'Acceso CMS'
     FULLADMINRIGHTS: 'Todos os dereitos administrativos'
     FULLADMINRIGHTS_HELP: 'Implica e anula todos os outros permisos asinados.'
-    IMPORTSPECFIELDS: 'Database columns'
-    IMPORTSPECLINK: 'Show Specification for %s'
-    IMPORTSPECRELATIONS: Relations
-    IMPORTSPECTITLE: 'Specification for %s'
   PermissionCheckboxSetField:
     AssignedTo: 'assigned to "{title}"'
     FromGroup: 'inherited from group "{title}"'
@@ -401,8 +416,11 @@ gl_ES:
   Permissions:
     PERMISSIONS_CATEGORY: 'Roles e permisos de acceso'
   PhoneNumberField:
-    Back: Back
     VALIDATION: 'Por favor insire un número de teléfono válido'
+  RelationComplexTableField.ss:
+    ADD: Engadir
+    CSVEXPORT: 'Export to CSV'
+    NOTFOUND: 'No items found'
   Security:
     ALREADYLOGGEDIN: 'Non tes acceso a esta páxina. Se tes outra conta que pode acceder a páxina, podes iniciar sesión a continuación.'
     BUTTONSEND: 'Enviarme a ligazón de restablecemento do contrasinal'
@@ -439,31 +457,33 @@ gl_ES:
     BtnImport: 'Importar dende CSV'
     FileFieldLabel: 'Ficheiro CSV <small>(Extensións permitidas: *.csv)</small>'
   SilverStripeNavigator:
-    DISPLAYING: Displaying
     Edit: Edit
-    FILTER: Filter
+  SimpleImageField:
-    IMPORT: Import
+    NOUPLOAD: 'Ningunha Imaxe Subida'
+  SiteTree:
+    TABMAIN: Principal
+  TableField:
+    ISREQUIRED: 'In %s ''%s'' is required'
+  TableField.ss:
+    ADD: 'Engadir unha nova fila'
+    ADDITEM: 'Add %s'
+  TableListField:
+    CSVEXPORT: 'Exportar a CSV'
+    PRINT: Imprimir
+    Print: Print
+    SELECT: 'Seleccionar:'
+  TableListField.ss:
+    NOITEMSFOUND: 'No items found'
+    SORTASC: 'Ordear ascendentemente'
+    SORTDESC: 'Ordear descendentemente'
+  TableListField_PageControls.ss:
+    DISPLAYING: Displaying
     OF: of
     TO: to
     VIEWFIRST: 'Ver primeiro'
     VIEWLAST: 'Ver último'
     VIEWNEXT: 'Ver seguinte'
     VIEWPREVIOUS: 'Ver anterior'
-  SimpleImageField:
-    NOUPLOAD: 'Ningunha Imaxe Subida'
-  SiteTree:
-    TABMAIN: Principal
-  TableField:
-    ADDITEM: 'Add %s'
-    ISREQUIRED: 'In %s ''%s'' is required'
-    NOITEMSFOUND: 'No items found'
-    SORTASC: 'Ordear ascendentemente'
-    SORTDESC: 'Ordear descendentemente'
-  TableListField:
-    CSVEXPORT: 'Exportar a CSV'
-    PRINT: Imprimir
-    Print: Print
-    SELECT: 'Seleccionar:'
   TimeField:
     VALIDATEFORMAT: 'Please enter a valid time format ({format})'
   ToggleField:

lang/he_IL.yml

@@ -50,6 +50,8 @@ he_IL:
     UNORDERED: 'Unordered list'
     UNORDEREDDESCRIPTION: 'Unordered list'
     UNORDEREDEXAMPLE1: 'unordered item 1'
+  BackLink_Button.ss:
+    Back: Back
   BasicAuth:
     ENTERINFO: 'נא הכנס שם משתמש וסיסמא'
     ERRORNOTADMIN: 'משתמש זה אינו מנהל'
@@ -57,9 +59,10 @@ he_IL:
   Boolean:
     0: 'False'
     ANY: Any
-    Hello: Hi
-    LOGOUT: 'Log out'
     1: 'True'
+  CMSLoadingScreen.ss:
+    LOADING: Loading...
+    REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
   CMSMain:
     ACCESS: 'Access to ''{title}'' section'
     ACCESSALLINTERFACES: 'גישה לכל ממשקי המערכת'
@@ -67,6 +70,12 @@ he_IL:
     SAVE: שמור
   CMSProfileController:
     MENUTITLE: CMSProfileController
+  ChangePasswordEmail.ss:
+    CHANGEPASSWORDTEXT1: 'שינית את הסיסמא עבור'
+    CHANGEPASSWORDTEXT2: 'כעת אתה יכול להשתמש בפרטים הבאים בכדי להתחבר:'
+    EMAIL: Email
+    HELLO: היי
+    PASSWORD: Password
   CheckboxField:
     - 'False'
     - 'True'
@@ -74,6 +83,14 @@ he_IL:
     CLOSEPOPUP: 'סגור חלון'
     SUCCESSADD2: 'Added {name}'
     SUCCESSEDIT: 'Saved %s %s %s'
+  ComplexTableField.ss:
+    ADDITEM: 'Add %s'
+    NOITEMSFOUND: 'No items found'
+    SORTASC: 'סדר בסדר עולה'
+    SORTDESC: 'סדר בסדר יורד'
+  ComplexTableField_popup.ss:
+    NEXT: הבא
+    PREVIOUS: הקודם
   ConfirmedPasswordField:
     ATLEAST: 'Passwords must be at least {min} characters long.'
     BETWEEN: 'Passwords must be {min} to {max} characters long.'
@@ -98,12 +115,12 @@ he_IL:
     MINS: דקות
     MONTH: חודש
     MONTHS: חודשים
-    SEC: שניה
+    SEC: 'שניה'
-    SECS: שניות
+    SECS: 'שניות'
     TIMEDIFFAGO: '{difference} ago'
     TIMEDIFFIN: 'in {difference}'
-    YEAR: שנה
+    YEAR: 'שנה'
-    YEARS: שנים
+    YEARS: 'שנים'
   DateField:
     NOTSET: 'not set'
     TODAY: today
@@ -111,10 +128,7 @@ he_IL:
     VALIDDATEMAXDATE: 'Your date has to be older or matching the maximum allowed date ({date})'
     VALIDDATEMINDATE: 'Your date has to be newer or matching the minimum allowed date ({date})'
   Director:
-    ADD: Add
-    CSVEXPORT: 'Export to CSV'
     INVALID_REQUEST: 'Invalid request'
-    NOTFOUND: 'No items found'
   DropdownField:
     CHOOSE: (בחר)
   EmailField:
@@ -124,8 +138,6 @@ he_IL:
     SINGULARNAME: 'Email Bounce Record'
   Enum:
     ANY: Any
-    LOADING: Loading...
-    REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
   File:
     Content: Content
     Filename: Filename
@@ -150,13 +162,17 @@ he_IL:
     FROMFILESTORE: 'From the File Store'
     NOSOURCE: 'Please select a source file to attach'
     REPLACE: 'Replace {type}'
+  FileIFrameField_iframe.ss:
+    TITLE: 'Image Uploading Iframe'
   Filesystem:
-    IMPORT_TAB_HEADER: Import
-    SEARCHLISTINGS: Search
     SYNCRESULTS: 'Sync complete: {createdcount} items created, {deletedcount} items deleted'
+  ForgotPasswordEmail.ss:
+    HELLO: היי
+    TEXT1: 'Here is your'
+    TEXT2: 'password reset link'
+    TEXT3: for
   Form:
     FIELDISREQUIRED: 'דרוש %s'
-    TITLE: 'Image Uploading Iframe'
     VALIDATIONCREDITNUMBER: 'Please ensure you have entered the {number} credit card number correctly'
     VALIDATIONNOTUNIQUE: 'הערך שהוקש אינו יחודי'
     VALIDATIONPASSWORDSDONTMATCH: 'הסיסמאות לא תואמות'
@@ -187,37 +203,26 @@ he_IL:
     ResetFilter: Reset
   GridFieldAction_Delete:
     DeletePermissionsFailure: 'No delete permissions'
-    NEXT: הבא
-    PREVIOUS: הקודם
   GridFieldDetailForm:
     Create: Create
     Delete: Delete
     DeletePermissionsFailure: 'No delete permissions'
     Deleted: 'Deleted %s %s'
-    HELLO: היי
     Save: Save
     Saved: 'Saved %s %s'
-    TEXT1: 'Here is your'
+  GridFieldItemEditView.ss: null
-    TEXT2: 'password reset link'
-    TEXT3: for
   Group:
     AddRole: 'Add a role for this group'
-    CHANGEPASSWORDTEXT1: 'שינית את הסיסמא עבור'
-    CHANGEPASSWORDTEXT2: 'כעת אתה יכול להשתמש בפרטים הבאים בכדי להתחבר:'
     Code: 'קוד קבוצה'
     DefaultGroupTitleAdministrators: Administrators
     DefaultGroupTitleContentAuthors: 'Content Authors'
     Description: Description
-    EMAIL: Email
     GroupReminder: 'If you choose a parent group, this group will take all it''s roles'
-    HELLO: היי
     Locked: 'נעול?'
     NoRoles: 'No roles found'
-    PASSWORD: Password
     Parent: 'קבוצת אב'
     RolesAddEditLink: 'Manage roles'
     Sort: 'Sort Order'
-    TITLE: 'מסגרת העלאת תמונה'
     has_many_Permissions: הרשאות
     many_many_Members: 'חברים רשומים'
   GroupImportForm:
@@ -237,7 +242,7 @@ he_IL:
     BUTTONREMOVELINK: 'הסר קישור'
     BUTTONUpdate: Update
     CAPTIONTEXT: 'Caption text'
-    CSSCLASS: יישור/סגנון
+    CSSCLASS: 'יישור/סגנון'
     CSSCLASSCENTER: 'ממורכז, ללא טקסט בצדדים.'
     CSSCLASSLEFT: 'לשמאל, עם טקסט מסודר מסביב.'
     CSSCLASSLEFTALONE: 'On the left, on its own.'
@@ -275,10 +280,9 @@ he_IL:
     UpdateMEDIA: 'Update Media'
   ImageField:
     IMAGE: Image
-  Image_iframe.ss: 'ChangePasswordEmail.ss:  BackLink_Button.ss:  CMSLoadingScreen.ss:  RelationComplexTableField.ss:  ForgotPasswordEmail.ss:    APPLY FILTER: "Apply Filter"  GridFieldItemEditView.ss:    Go back: "Go back"  ModelSidebar.ss:  TableListField_PageControls.ss:  ModelAdmin_Tools.ss:  ComplexTableField_popup.ss:  TableField.ss:  FileIFrameField_iframe.ss:  ComplexTableField.ss:  TableListField.ss:  ModelAdmin_ImportSpec.ss:  LeftAndMain_Menu.ss:'
+  Image_iframe.ss:
+    TITLE: 'מסגרת העלאת תמונה'
   LeftAndMain:
-    ADD: 'Add a new row'
-    ADDITEM: 'Add %s'
     CANT_REORGANISE: 'You do not have permission to alter Top level pages. Your change was not saved.'
     DELETED: Deleted.
     DropdownBatchActionsDefault: Actions
@@ -292,6 +296,9 @@ he_IL:
     REORGANISATIONSUCCESSFUL: 'Reorganised the site tree successfully.'
     SAVEDUP: Saved.
     VersionUnknown: unknown
+  LeftAndMain_Menu.ss:
+    Hello: Hi
+    LOGOUT: 'Log out'
   LoginAttempt:
     Email: 'Email Address'
     IP: 'IP Address'
@@ -368,6 +375,7 @@ he_IL:
     ResultUpdated: 'Updated {count} members'
   MemberTableField: null
   ModelAdmin:
+    'APPLY FILTER': 'Apply Filter'
     DELETE: מחק
     DELETEDRECORDS: 'Deleted {count} records.'
     IMPORT: 'ייבא מקובץ CSV'
@@ -377,6 +385,17 @@ he_IL:
     RESET: Reset
     Title: 'Data Models'
     UPDATEDRECORDS: 'Updated {count} records.'
+  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
   MoneyField:
     FIELDLABELAMOUNT: Amount
     FIELDLABELCURRENCY: Currency
@@ -389,10 +408,6 @@ he_IL:
     CMS_ACCESS_CATEGORY: 'CMS Access'
     FULLADMINRIGHTS: 'Full administrative rights'
     FULLADMINRIGHTS_HELP: 'Implies and overrules all other assigned permissions.'
-    IMPORTSPECFIELDS: 'Database columns'
-    IMPORTSPECLINK: 'Show Specification for %s'
-    IMPORTSPECRELATIONS: Relations
-    IMPORTSPECTITLE: 'Specification for %s'
   PermissionCheckboxSetField:
     AssignedTo: 'assigned to "{title}"'
     FromGroup: 'inherited from group "{title}"'
@@ -401,8 +416,11 @@ he_IL:
   Permissions:
     PERMISSIONS_CATEGORY: 'Roles and access permissions'
   PhoneNumberField:
-    Back: Back
     VALIDATION: 'יש להכניס מספר טלפון תקין'
+  RelationComplexTableField.ss:
+    ADD: Add
+    CSVEXPORT: 'Export to CSV'
+    NOTFOUND: 'No items found'
   Security:
     ALREADYLOGGEDIN: 'אין לך הרשאה לעמוד זה. אם ברשותך חשבון אחר עם גישה לעמוד זה את יכול להתחבר איתו.'
     BUTTONSEND: 'שלח לי קישור לאיפוס סיסמא'
@@ -439,31 +457,33 @@ he_IL:
     BtnImport: 'Import from CSV'
     FileFieldLabel: 'CSV File <small>(Allowed extensions: *.csv)</small>'
   SilverStripeNavigator:
-    DISPLAYING: Displaying
     Edit: Edit
-    FILTER: Filter
+  SimpleImageField:
-    IMPORT: Import
+    NOUPLOAD: 'לא הועלתה תמונה'
+  SiteTree:
+    TABMAIN: Main
+  TableField:
+    ISREQUIRED: 'In %s ''%s'' is required'
+  TableField.ss:
+    ADD: 'Add a new row'
+    ADDITEM: 'Add %s'
+  TableListField:
+    CSVEXPORT: 'Export to CSV'
+    PRINT: Print
+    Print: Print
+    SELECT: 'Select:'
+  TableListField.ss:
+    NOITEMSFOUND: 'No items found'
+    SORTASC: 'Sort in ascending order'
+    SORTDESC: 'Sort in descending order'
+  TableListField_PageControls.ss:
+    DISPLAYING: Displaying
     OF: of
     TO: to
     VIEWFIRST: 'הצג ראשון'
     VIEWLAST: 'הצג אחרון'
     VIEWNEXT: 'הצג את הבא'
     VIEWPREVIOUS: 'הצג את הקודם'
-  SimpleImageField:
-    NOUPLOAD: 'לא הועלתה תמונה'
-  SiteTree:
-    TABMAIN: Main
-  TableField:
-    ADDITEM: 'Add %s'
-    ISREQUIRED: 'In %s ''%s'' is required'
-    NOITEMSFOUND: 'No items found'
-    SORTASC: 'Sort in ascending order'
-    SORTDESC: 'Sort in descending order'
-  TableListField:
-    CSVEXPORT: 'Export to CSV'
-    PRINT: Print
-    Print: Print
-    SELECT: 'Select:'
   TimeField:
     VALIDATEFORMAT: 'Please enter a valid time format ({format})'
   ToggleField:

lang/hr.yml

@@ -50,6 +50,8 @@ hr:
     UNORDERED: 'Unordered list'
     UNORDEREDDESCRIPTION: 'Unordered list'
     UNORDEREDEXAMPLE1: 'unordered item 1'
+  BackLink_Button.ss:
+    Back: Back
   BasicAuth:
     ENTERINFO: 'Unesite korisničko ime i lozinu'
     ERRORNOTADMIN: 'Korisnik nije administrator'
@@ -57,9 +59,10 @@ hr:
   Boolean:
     0: 'False'
     ANY: Any
-    Hello: Hi
-    LOGOUT: 'Log out'
     1: 'True'
+  CMSLoadingScreen.ss:
+    LOADING: Loading...
+    REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
   CMSMain:
     ACCESS: 'Access to ''{title}'' section'
     ACCESSALLINTERFACES: 'Access to all CMS sections'
@@ -67,6 +70,12 @@ hr:
     SAVE: Snimi
   CMSProfileController:
     MENUTITLE: CMSProfileController
+  ChangePasswordEmail.ss:
+    CHANGEPASSWORDTEXT1: 'Promjenili ste lozinku za '
+    CHANGEPASSWORDTEXT2: 'Za prijavu koristite slijedeće podatke'
+    EMAIL: Email
+    HELLO: Pozdrav
+    PASSWORD: Password
   CheckboxField:
     - 'False'
     - 'True'
@@ -74,6 +83,14 @@ hr:
     CLOSEPOPUP: 'Close Popup'
     SUCCESSADD2: 'Added {name}'
     SUCCESSEDIT: 'Saved %s %s %s'
+  ComplexTableField.ss:
+    ADDITEM: 'Add %s'
+    NOITEMSFOUND: 'No items found'
+    SORTASC: 'Sortiraj (ascending)'
+    SORTDESC: 'Sortiraj (descending)'
+  ComplexTableField_popup.ss:
+    NEXT: Slijedeći
+    PREVIOUS: Prethodni
   ConfirmedPasswordField:
     ATLEAST: 'Passwords must be at least {min} characters long.'
     BETWEEN: 'Passwords must be {min} to {max} characters long.'
@@ -111,10 +128,7 @@ hr:
     VALIDDATEMAXDATE: 'Your date has to be older or matching the maximum allowed date ({date})'
     VALIDDATEMINDATE: 'Your date has to be newer or matching the minimum allowed date ({date})'
   Director:
-    ADD: Dodaj
-    CSVEXPORT: 'Export to CSV'
     INVALID_REQUEST: 'Invalid request'
-    NOTFOUND: 'No items found'
   DropdownField:
     CHOOSE: (Odaberi)
   EmailField:
@@ -124,8 +138,6 @@ hr:
     SINGULARNAME: 'Email Bounce Record'
   Enum:
     ANY: Any
-    LOADING: Loading...
-    REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
   File:
     Content: Content
     Filename: Filename
@@ -150,13 +162,17 @@ hr:
     FROMFILESTORE: 'From the File Store'
     NOSOURCE: 'Please select a source file to attach'
     REPLACE: 'Replace {type}'
+  FileIFrameField_iframe.ss:
+    TITLE: 'Image Uploading Iframe'
   Filesystem:
-    IMPORT_TAB_HEADER: Import
-    SEARCHLISTINGS: Search
     SYNCRESULTS: 'Sync complete: {createdcount} items created, {deletedcount} items deleted'
+  ForgotPasswordEmail.ss:
+    HELLO: Pozdrav
+    TEXT1: 'Ovdje je vaš'
+    TEXT2: 'link za resetiranje zaporke'
+    TEXT3: za
   Form:
     FIELDISREQUIRED: '%s je obavezan'
-    TITLE: 'Image Uploading Iframe'
     VALIDATIONCREDITNUMBER: 'Please ensure you have entered the {number} credit card number correctly'
     VALIDATIONNOTUNIQUE: 'Unesena vrijednost nije unikatna'
     VALIDATIONPASSWORDSDONTMATCH: 'Lozine se ne slažu'
@@ -187,37 +203,26 @@ hr:
     ResetFilter: Reset
   GridFieldAction_Delete:
     DeletePermissionsFailure: 'No delete permissions'
-    NEXT: Slijedeći
-    PREVIOUS: Prethodni
   GridFieldDetailForm:
     Create: Create
     Delete: Delete
     DeletePermissionsFailure: 'No delete permissions'
     Deleted: 'Deleted %s %s'
-    HELLO: Pozdrav
     Save: Save
     Saved: 'Saved %s %s'
-    TEXT1: 'Ovdje je vaš'
+  GridFieldItemEditView.ss: null
-    TEXT2: 'link za resetiranje zaporke'
-    TEXT3: za
   Group:
     AddRole: 'Add a role for this group'
-    CHANGEPASSWORDTEXT1: 'Promjenili ste lozinku za '
-    CHANGEPASSWORDTEXT2: 'Za prijavu koristite slijedeće podatke'
     Code: 'Krupni kod'
     DefaultGroupTitleAdministrators: Administrators
     DefaultGroupTitleContentAuthors: 'Content Authors'
     Description: Description
-    EMAIL: Email
     GroupReminder: 'If you choose a parent group, this group will take all it''s roles'
-    HELLO: Pozdrav
     Locked: 'Zaključano?'
     NoRoles: 'No roles found'
-    PASSWORD: Password
     Parent: 'Roditeljska grupa'
     RolesAddEditLink: 'Manage roles'
     Sort: 'Sort Order'
-    TITLE: 'Iframe za upload slike'
     has_many_Permissions: Dozvole
     many_many_Members: Članovi
   GroupImportForm:
@@ -258,7 +263,7 @@ hr:
     IMAGETITLE: 'Title text (tooltip) - for additional information about the image'
     IMAGETITLETEXT: 'Title text (tooltip)'
     IMAGETITLETEXTDESC: 'For additional information about the image'
-    IMAGEWIDTHPX: Širina
+    IMAGEWIDTHPX: 'Širina'
     INSERTMEDIA: 'Insert Media'
     LINK: 'Ubaci/editiraj link za označeni tekst'
     LINKANCHOR: 'Anchor on this page'
@@ -275,10 +280,9 @@ hr:
     UpdateMEDIA: 'Update Media'
   ImageField:
     IMAGE: Image
-  Image_iframe.ss: 'ChangePasswordEmail.ss:  BackLink_Button.ss:  CMSLoadingScreen.ss:  RelationComplexTableField.ss:  ForgotPasswordEmail.ss:    APPLY FILTER: "Apply Filter"  GridFieldItemEditView.ss:    Go back: "Go back"  ModelSidebar.ss:  TableListField_PageControls.ss:  ModelAdmin_Tools.ss:  ComplexTableField_popup.ss:  TableField.ss:  FileIFrameField_iframe.ss:  ComplexTableField.ss:  TableListField.ss:  ModelAdmin_ImportSpec.ss:  LeftAndMain_Menu.ss:'
+  Image_iframe.ss:
+    TITLE: 'Iframe za upload slike'
   LeftAndMain:
-    ADD: 'Dodaj novi redak'
-    ADDITEM: 'Add %s'
     CANT_REORGANISE: 'You do not have permission to alter Top level pages. Your change was not saved.'
     DELETED: Deleted.
     DropdownBatchActionsDefault: Actions
@@ -292,6 +296,9 @@ hr:
     REORGANISATIONSUCCESSFUL: 'Reorganised the site tree successfully.'
     SAVEDUP: Saved.
     VersionUnknown: unknown
+  LeftAndMain_Menu.ss:
+    Hello: Hi
+    LOGOUT: 'Log out'
   LoginAttempt:
     Email: 'Email Address'
     IP: 'IP Address'
@@ -368,6 +375,7 @@ hr:
     ResultUpdated: 'Updated {count} members'
   MemberTableField: null
   ModelAdmin:
+    'APPLY FILTER': 'Apply Filter'
     DELETE: Delete
     DELETEDRECORDS: 'Deleted {count} records.'
     IMPORT: 'Import from CSV'
@@ -377,6 +385,17 @@ hr:
     RESET: Reset
     Title: 'Data Models'
     UPDATEDRECORDS: 'Updated {count} records.'
+  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
   MoneyField:
     FIELDLABELAMOUNT: Amount
     FIELDLABELCURRENCY: Currency
@@ -389,10 +408,6 @@ hr:
     CMS_ACCESS_CATEGORY: 'CMS Access'
     FULLADMINRIGHTS: 'Full administrative rights'
     FULLADMINRIGHTS_HELP: 'Implies and overrules all other assigned permissions.'
-    IMPORTSPECFIELDS: 'Database columns'
-    IMPORTSPECLINK: 'Show Specification for %s'
-    IMPORTSPECRELATIONS: Relations
-    IMPORTSPECTITLE: 'Specification for %s'
   PermissionCheckboxSetField:
     AssignedTo: 'assigned to "{title}"'
     FromGroup: 'inherited from group "{title}"'
@@ -401,8 +416,11 @@ hr:
   Permissions:
     PERMISSIONS_CATEGORY: 'Roles and access permissions'
   PhoneNumberField:
-    Back: Back
     VALIDATION: 'Molim unesite ispravan telefonski broj'
+  RelationComplexTableField.ss:
+    ADD: Dodaj
+    CSVEXPORT: 'Export to CSV'
+    NOTFOUND: 'No items found'
   Security:
     ALREADYLOGGEDIN: 'Nemate pristup na ovu stranicu. Imate li drugi korisnički račun, koristite njega'
     BUTTONSEND: 'Pošalji mi link za reset lozinke'
@@ -439,31 +457,33 @@ hr:
     BtnImport: 'Import from CSV'
     FileFieldLabel: 'CSV File <small>(Allowed extensions: *.csv)</small>'
   SilverStripeNavigator:
-    DISPLAYING: Displaying
     Edit: Edit
-    FILTER: Filter
+  SimpleImageField:
-    IMPORT: Import
+    NOUPLOAD: 'Nema uploadanih slika'
+  SiteTree:
+    TABMAIN: '''Main'''
+  TableField:
+    ISREQUIRED: 'In %s ''%s'' is required'
+  TableField.ss:
+    ADD: 'Dodaj novi redak'
+    ADDITEM: 'Add %s'
+  TableListField:
+    CSVEXPORT: 'Export to CSV'
+    PRINT: Print
+    Print: Print
+    SELECT: 'Select:'
+  TableListField.ss:
+    NOITEMSFOUND: 'No items found'
+    SORTASC: 'Sort in ascending order'
+    SORTDESC: 'Sort in descending order'
+  TableListField_PageControls.ss:
+    DISPLAYING: Displaying
     OF: of
     TO: to
     VIEWFIRST: 'Pogledaj prvi'
     VIEWLAST: 'Pogledaj zadnji'
     VIEWNEXT: 'Pogledaj slijedeći'
     VIEWPREVIOUS: 'Pogledaj prethodni'
-  SimpleImageField:
-    NOUPLOAD: 'Nema uploadanih slika'
-  SiteTree:
-    TABMAIN: '''Main'''
-  TableField:
-    ADDITEM: 'Add %s'
-    ISREQUIRED: 'In %s ''%s'' is required'
-    NOITEMSFOUND: 'No items found'
-    SORTASC: 'Sort in ascending order'
-    SORTDESC: 'Sort in descending order'
-  TableListField:
-    CSVEXPORT: 'Export to CSV'
-    PRINT: Print
-    Print: Print
-    SELECT: 'Select:'
   TimeField:
     VALIDATEFORMAT: 'Please enter a valid time format ({format})'
   ToggleField:

lang/hu.yml

@@ -50,6 +50,8 @@ hu:
     UNORDERED: 'Unordered list'
     UNORDEREDDESCRIPTION: 'Unordered list'
     UNORDEREDEXAMPLE1: 'unordered item 1'
+  BackLink_Button.ss:
+    Back: Back
   BasicAuth:
     ENTERINFO: 'Kérünk, ajd meg egy felhasználónevet és jelszót.'
     ERRORNOTADMIN: 'Ez a felhasználó nem adminisztrátor. '
@@ -57,9 +59,10 @@ hu:
   Boolean:
     0: 'False'
     ANY: Any
-    Hello: Hi
-    LOGOUT: 'Log out'
     1: 'True'
+  CMSLoadingScreen.ss:
+    LOADING: Loading...
+    REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
   CMSMain:
     ACCESS: 'Access to ''{title}'' section'
     ACCESSALLINTERFACES: 'Elérés minden CMS interfészhez'
@@ -67,6 +70,12 @@ hu:
     SAVE: Mentés
   CMSProfileController:
     MENUTITLE: CMSProfileController
+  ChangePasswordEmail.ss:
+    CHANGEPASSWORDTEXT1: 'Megváltoztattad a jelszavad erre: '
+    CHANGEPASSWORDTEXT2: 'Mostantól a következő adatokat használhatod a bejelentkezéshez:'
+    EMAIL: Email
+    HELLO: Szia!
+    PASSWORD: Password
   CheckboxField:
     - 'False'
     - 'True'
@@ -74,6 +83,14 @@ hu:
     CLOSEPOPUP: 'Ablak bezárása'
     SUCCESSADD2: 'Added {name}'
     SUCCESSEDIT: 'Saved %s %s %s'
+  ComplexTableField.ss:
+    ADDITEM: 'Add %s'
+    NOITEMSFOUND: 'No items found'
+    SORTASC: 'Rendezés növekvő sorrendben'
+    SORTDESC: 'Rendezés csökkenő sorrendben'
+  ComplexTableField_popup.ss:
+    NEXT: Következő
+    PREVIOUS: Előző
   ConfirmedPasswordField:
     ATLEAST: 'Passwords must be at least {min} characters long.'
     BETWEEN: 'Passwords must be {min} to {max} characters long.'
@@ -111,10 +128,7 @@ hu:
     VALIDDATEMAXDATE: 'Your date has to be older or matching the maximum allowed date ({date})'
     VALIDDATEMINDATE: 'Your date has to be newer or matching the minimum allowed date ({date})'
   Director:
-    ADD: Add
-    CSVEXPORT: 'Export to CSV'
     INVALID_REQUEST: 'Invalid request'
-    NOTFOUND: 'No items found'
   DropdownField:
     CHOOSE: (Válassz)
   EmailField:
@@ -124,8 +138,6 @@ hu:
     SINGULARNAME: 'Email Bounce Record'
   Enum:
     ANY: Any
-    LOADING: Loading...
-    REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
   File:
     Content: Tartalom
     Filename: Fájlnév
@@ -150,13 +162,17 @@ hu:
     FROMFILESTORE: 'From the File Store'
     NOSOURCE: 'Please select a source file to attach'
     REPLACE: 'Replace {type}'
+  FileIFrameField_iframe.ss:
+    TITLE: 'Image Uploading Iframe'
   Filesystem:
-    IMPORT_TAB_HEADER: Import
-    SEARCHLISTINGS: Search
     SYNCRESULTS: 'Sync complete: {createdcount} items created, {deletedcount} items deleted'
+  ForgotPasswordEmail.ss:
+    HELLO: Szia
+    TEXT1: 'Here is your'
+    TEXT2: 'password reset link'
+    TEXT3: for
   Form:
     FIELDISREQUIRED: 'A %s szükséges'
-    TITLE: 'Image Uploading Iframe'
     VALIDATIONCREDITNUMBER: 'Please ensure you have entered the {number} credit card number correctly'
     VALIDATIONNOTUNIQUE: 'A beírt érték nem egyedi'
     VALIDATIONPASSWORDSDONTMATCH: 'A jelszavak nem egyeznek meg.'
@@ -187,37 +203,26 @@ hu:
     ResetFilter: Reset
   GridFieldAction_Delete:
     DeletePermissionsFailure: 'No delete permissions'
-    NEXT: Következő
-    PREVIOUS: Előző
   GridFieldDetailForm:
     Create: Create
     Delete: Delete
     DeletePermissionsFailure: 'No delete permissions'
     Deleted: 'Deleted %s %s'
-    HELLO: Szia
     Save: Save
     Saved: 'Saved %s %s'
-    TEXT1: 'Here is your'
+  GridFieldItemEditView.ss: null
-    TEXT2: 'password reset link'
-    TEXT3: for
   Group:
     AddRole: 'Add a role for this group'
-    CHANGEPASSWORDTEXT1: 'Megváltoztattad a jelszavad erre: '
-    CHANGEPASSWORDTEXT2: 'Mostantól a következő adatokat használhatod a bejelentkezéshez:'
     Code: 'Csoport Kód'
     DefaultGroupTitleAdministrators: Administrators
     DefaultGroupTitleContentAuthors: 'Content Authors'
     Description: Description
-    EMAIL: Email
     GroupReminder: 'If you choose a parent group, this group will take all it''s roles'
-    HELLO: Szia!
     Locked: 'Locked?'
     NoRoles: 'No roles found'
-    PASSWORD: Password
     Parent: 'Szülő csoport'
     RolesAddEditLink: 'Manage roles'
     Sort: 'Sort Order'
-    TITLE: 'Képfeltöltő iframe'
     has_many_Permissions: Jogosultságok
     many_many_Members: Tagok
   GroupImportForm:
@@ -275,10 +280,9 @@ hu:
     UpdateMEDIA: 'Update Media'
   ImageField:
     IMAGE: Image
-  Image_iframe.ss: 'ChangePasswordEmail.ss:  BackLink_Button.ss:  CMSLoadingScreen.ss:  RelationComplexTableField.ss:  ForgotPasswordEmail.ss:    APPLY FILTER: "Apply Filter"  GridFieldItemEditView.ss:    Go back: "Go back"  ModelSidebar.ss:  TableListField_PageControls.ss:  ModelAdmin_Tools.ss:  ComplexTableField_popup.ss:  TableField.ss:  FileIFrameField_iframe.ss:  ComplexTableField.ss:  TableListField.ss:  ModelAdmin_ImportSpec.ss:  LeftAndMain_Menu.ss:'
+  Image_iframe.ss:
+    TITLE: 'Képfeltöltő iframe'
   LeftAndMain:
-    ADD: 'Add a new row'
-    ADDITEM: 'Add %s'
     CANT_REORGANISE: 'You do not have permission to alter Top level pages. Your change was not saved.'
     DELETED: Deleted.
     DropdownBatchActionsDefault: Actions
@@ -292,6 +296,9 @@ hu:
     REORGANISATIONSUCCESSFUL: 'Reorganised the site tree successfully.'
     SAVEDUP: Saved.
     VersionUnknown: unknown
+  LeftAndMain_Menu.ss:
+    Hello: Hi
+    LOGOUT: 'Log out'
   LoginAttempt:
     Email: 'Email Address'
     IP: 'IP Address'
@@ -368,6 +375,7 @@ hu:
     ResultUpdated: 'Updated {count} members'
   MemberTableField: null
   ModelAdmin:
+    'APPLY FILTER': 'Apply Filter'
     DELETE: Törlés
     DELETEDRECORDS: 'Deleted {count} records.'
     IMPORT: 'Betöltés CSV-ből'
@@ -377,6 +385,17 @@ hu:
     RESET: Reset
     Title: 'Data Models'
     UPDATEDRECORDS: 'Updated {count} records.'
+  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
   MoneyField:
     FIELDLABELAMOUNT: Amount
     FIELDLABELCURRENCY: Currency
@@ -389,10 +408,6 @@ hu:
     CMS_ACCESS_CATEGORY: 'CMS Access'
     FULLADMINRIGHTS: 'Full administrative rights'
     FULLADMINRIGHTS_HELP: 'Implies and overrules all other assigned permissions.'
-    IMPORTSPECFIELDS: 'Database columns'
-    IMPORTSPECLINK: 'Show Specification for %s'
-    IMPORTSPECRELATIONS: Relations
-    IMPORTSPECTITLE: 'Specification for %s'
   PermissionCheckboxSetField:
     AssignedTo: 'assigned to "{title}"'
     FromGroup: 'inherited from group "{title}"'
@@ -401,8 +416,11 @@ hu:
   Permissions:
     PERMISSIONS_CATEGORY: 'Roles and access permissions'
   PhoneNumberField:
-    Back: Back
     VALIDATION: 'Kérünk, adj meg egy valós telefonszámot.'
+  RelationComplexTableField.ss:
+    ADD: Add
+    CSVEXPORT: 'Export to CSV'
+    NOTFOUND: 'No items found'
   Security:
     ALREADYLOGGEDIN: 'Nincs hozzáférésed ehhez az oldalhoz. Ha van egy másik azonosítód, mellyel hozzá tudsz férni ehhez az oldalhoz, alább bejelentkezhetsz.'
     BUTTONSEND: 'Új jelszót kérő link elküldése'
@@ -439,31 +457,33 @@ hu:
     BtnImport: 'Import from CSV'
     FileFieldLabel: 'CSV File <small>(Allowed extensions: *.csv)</small>'
   SilverStripeNavigator:
-    DISPLAYING: Displaying
     Edit: Edit
-    FILTER: Filter
+  SimpleImageField:
-    IMPORT: Import
+    NOUPLOAD: 'Nincs feltöltött kép'
+  SiteTree:
+    TABMAIN: Fő
+  TableField:
+    ISREQUIRED: 'In %s ''%s'' is required'
+  TableField.ss:
+    ADD: 'Add a new row'
+    ADDITEM: 'Add %s'
+  TableListField:
+    CSVEXPORT: 'Export to CSV'
+    PRINT: Print
+    Print: Print
+    SELECT: 'Select:'
+  TableListField.ss:
+    NOITEMSFOUND: 'No items found'
+    SORTASC: 'Sort in ascending order'
+    SORTDESC: 'Sort in descending order'
+  TableListField_PageControls.ss:
+    DISPLAYING: Displaying
     OF: of
     TO: to
     VIEWFIRST: 'Első mutatása'
     VIEWLAST: 'Utolsó mutatása'
     VIEWNEXT: 'Következő mutatása'
     VIEWPREVIOUS: 'Előző mutatása'
-  SimpleImageField:
-    NOUPLOAD: 'Nincs feltöltött kép'
-  SiteTree:
-    TABMAIN: Fő
-  TableField:
-    ADDITEM: 'Add %s'
-    ISREQUIRED: 'In %s ''%s'' is required'
-    NOITEMSFOUND: 'No items found'
-    SORTASC: 'Sort in ascending order'
-    SORTDESC: 'Sort in descending order'
-  TableListField:
-    CSVEXPORT: 'Export to CSV'
-    PRINT: Print
-    Print: Print
-    SELECT: 'Select:'
   TimeField:
     VALIDATEFORMAT: 'Please enter a valid time format ({format})'
   ToggleField:

lang/hy_AM.yml

@@ -50,6 +50,8 @@ hy_AM:
     UNORDERED: 'Unordered list'
     UNORDEREDDESCRIPTION: 'Unordered list'
     UNORDEREDEXAMPLE1: 'unordered item 1'
+  BackLink_Button.ss:
+    Back: Back
   BasicAuth:
     ENTERINFO: 'Please enter a username and password.'
     ERRORNOTADMIN: 'That user is not an administrator.'
@@ -57,9 +59,10 @@ hy_AM:
   Boolean:
     0: 'False'
     ANY: Any
-    Hello: Hi
-    LOGOUT: 'Log out'
     1: 'True'
+  CMSLoadingScreen.ss:
+    LOADING: Loading...
+    REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
   CMSMain:
     ACCESS: 'Access to ''{title}'' section'
     ACCESSALLINTERFACES: 'Access to all CMS sections'
@@ -67,6 +70,12 @@ hy_AM:
     SAVE: Save
   CMSProfileController:
     MENUTITLE: CMSProfileController
+  ChangePasswordEmail.ss:
+    CHANGEPASSWORDTEXT1: 'You changed your password for'
+    CHANGEPASSWORDTEXT2: 'You can now use the following credentials to log in:'
+    EMAIL: Email
+    HELLO: Hi
+    PASSWORD: Password
   CheckboxField:
     - 'False'
     - 'True'
@@ -74,6 +83,14 @@ hy_AM:
     CLOSEPOPUP: 'Close Popup'
     SUCCESSADD2: 'Added {name}'
     SUCCESSEDIT: 'Saved %s %s %s'
+  ComplexTableField.ss:
+    ADDITEM: 'Add %s'
+    NOITEMSFOUND: 'No items found'
+    SORTASC: 'Sort ascending'
+    SORTDESC: 'Sort descending'
+  ComplexTableField_popup.ss:
+    NEXT: Next
+    PREVIOUS: Previous
   ConfirmedPasswordField:
     ATLEAST: 'Passwords must be at least {min} characters long.'
     BETWEEN: 'Passwords must be {min} to {max} characters long.'
@@ -111,10 +128,7 @@ hy_AM:
     VALIDDATEMAXDATE: 'Your date has to be older or matching the maximum allowed date ({date})'
     VALIDDATEMINDATE: 'Your date has to be newer or matching the minimum allowed date ({date})'
   Director:
-    ADD: Add
-    CSVEXPORT: 'Export to CSV'
     INVALID_REQUEST: 'Invalid request'
-    NOTFOUND: 'No items found'
   DropdownField:
     CHOOSE: (Choose)
   EmailField:
@@ -124,8 +138,6 @@ hy_AM:
     SINGULARNAME: 'Email Bounce Record'
   Enum:
     ANY: Any
-    LOADING: Loading...
-    REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
   File:
     Content: Content
     Filename: Filename
@@ -150,13 +162,17 @@ hy_AM:
     FROMFILESTORE: 'From the File Store'
     NOSOURCE: 'Please select a source file to attach'
     REPLACE: 'Replace {type}'
+  FileIFrameField_iframe.ss:
+    TITLE: 'Image Uploading Iframe'
   Filesystem:
-    IMPORT_TAB_HEADER: Import
-    SEARCHLISTINGS: Search
     SYNCRESULTS: 'Sync complete: {createdcount} items created, {deletedcount} items deleted'
+  ForgotPasswordEmail.ss:
+    HELLO: Hi
+    TEXT1: 'Here is your'
+    TEXT2: 'password reset link'
+    TEXT3: for
   Form:
     FIELDISREQUIRED: '%s is required'
-    TITLE: 'Image Uploading Iframe'
     VALIDATIONCREDITNUMBER: 'Please ensure you have entered the {number} credit card number correctly'
     VALIDATIONNOTUNIQUE: 'The value entered is not unique'
     VALIDATIONPASSWORDSDONTMATCH: 'Passwords don''t match'
@@ -187,37 +203,26 @@ hy_AM:
     ResetFilter: Reset
   GridFieldAction_Delete:
     DeletePermissionsFailure: 'No delete permissions'
-    NEXT: Next
-    PREVIOUS: Previous
   GridFieldDetailForm:
     Create: Create
     Delete: Delete
     DeletePermissionsFailure: 'No delete permissions'
     Deleted: 'Deleted %s %s'
-    HELLO: Hi
     Save: Save
     Saved: 'Saved %s %s'
-    TEXT1: 'Here is your'
+  GridFieldItemEditView.ss: null
-    TEXT2: 'password reset link'
-    TEXT3: for
   Group:
     AddRole: 'Add a role for this group'
-    CHANGEPASSWORDTEXT1: 'You changed your password for'
-    CHANGEPASSWORDTEXT2: 'You can now use the following credentials to log in:'
     Code: 'Group Code'
     DefaultGroupTitleAdministrators: Administrators
     DefaultGroupTitleContentAuthors: 'Content Authors'
     Description: Description
-    EMAIL: Email
     GroupReminder: 'If you choose a parent group, this group will take all it''s roles'
-    HELLO: Hi
     Locked: 'Locked?'
     NoRoles: 'No roles found'
-    PASSWORD: Password
     Parent: 'Parent Group'
     RolesAddEditLink: 'Manage roles'
     Sort: 'Sort Order'
-    TITLE: 'Image Uploading Iframe'
     has_many_Permissions: Permissions
     many_many_Members: Members
   GroupImportForm:
@@ -275,10 +280,9 @@ hy_AM:
     UpdateMEDIA: 'Update Media'
   ImageField:
     IMAGE: Image
-  Image_iframe.ss: 'ChangePasswordEmail.ss:  BackLink_Button.ss:  CMSLoadingScreen.ss:  RelationComplexTableField.ss:  ForgotPasswordEmail.ss:    APPLY FILTER: "Apply Filter"  GridFieldItemEditView.ss:    Go back: "Go back"  ModelSidebar.ss:  TableListField_PageControls.ss:  ModelAdmin_Tools.ss:  ComplexTableField_popup.ss:  TableField.ss:  FileIFrameField_iframe.ss:  ComplexTableField.ss:  TableListField.ss:  ModelAdmin_ImportSpec.ss:  LeftAndMain_Menu.ss:'
+  Image_iframe.ss:
+    TITLE: 'Image Uploading Iframe'
   LeftAndMain:
-    ADD: 'Add a new row'
-    ADDITEM: 'Add %s'
     CANT_REORGANISE: 'You do not have permission to alter Top level pages. Your change was not saved.'
     DELETED: Deleted.
     DropdownBatchActionsDefault: Actions
@@ -292,6 +296,9 @@ hy_AM:
     REORGANISATIONSUCCESSFUL: 'Reorganised the site tree successfully.'
     SAVEDUP: Saved.
     VersionUnknown: unknown
+  LeftAndMain_Menu.ss:
+    Hello: Hi
+    LOGOUT: 'Log out'
   LoginAttempt:
     Email: 'Email Address'
     IP: 'IP Address'
@@ -368,6 +375,7 @@ hy_AM:
     ResultUpdated: 'Updated {count} members'
   MemberTableField: null
   ModelAdmin:
+    'APPLY FILTER': 'Apply Filter'
     DELETE: Delete
     DELETEDRECORDS: 'Deleted {count} records.'
     IMPORT: 'Import from CSV'
@@ -377,6 +385,17 @@ hy_AM:
     RESET: Reset
     Title: 'Data Models'
     UPDATEDRECORDS: 'Updated {count} records.'
+  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
   MoneyField:
     FIELDLABELAMOUNT: Amount
     FIELDLABELCURRENCY: Currency
@@ -389,10 +408,6 @@ hy_AM:
     CMS_ACCESS_CATEGORY: 'CMS Access'
     FULLADMINRIGHTS: 'Full administrative rights'
     FULLADMINRIGHTS_HELP: 'Implies and overrules all other assigned permissions.'
-    IMPORTSPECFIELDS: 'Database columns'
-    IMPORTSPECLINK: 'Show Specification for %s'
-    IMPORTSPECRELATIONS: Relations
-    IMPORTSPECTITLE: 'Specification for %s'
   PermissionCheckboxSetField:
     AssignedTo: 'assigned to "{title}"'
     FromGroup: 'inherited from group "{title}"'
@@ -401,8 +416,11 @@ hy_AM:
   Permissions:
     PERMISSIONS_CATEGORY: 'Roles and access permissions'
   PhoneNumberField:
-    Back: Back
     VALIDATION: 'Please enter a valid phone number'
+  RelationComplexTableField.ss:
+    ADD: Add
+    CSVEXPORT: 'Export to CSV'
+    NOTFOUND: 'No items found'
   Security:
     ALREADYLOGGEDIN: 'You don''t have access to this page.  If you have another account that can access that page, you can log in again below.'
     BUTTONSEND: 'Send me the password reset link'
@@ -439,31 +457,33 @@ hy_AM:
     BtnImport: 'Import from CSV'
     FileFieldLabel: 'CSV File <small>(Allowed extensions: *.csv)</small>'
   SilverStripeNavigator:
-    DISPLAYING: Displaying
     Edit: Edit
-    FILTER: Filter
+  SimpleImageField:
-    IMPORT: Import
+    NOUPLOAD: 'No Image Uploaded'
+  SiteTree:
+    TABMAIN: Main
+  TableField:
+    ISREQUIRED: 'In %s ''%s'' is required'
+  TableField.ss:
+    ADD: 'Add a new row'
+    ADDITEM: 'Add %s'
+  TableListField:
+    CSVEXPORT: 'Export to CSV'
+    PRINT: Print
+    Print: Print
+    SELECT: 'Select:'
+  TableListField.ss:
+    NOITEMSFOUND: 'No items found'
+    SORTASC: 'Sort in ascending order'
+    SORTDESC: 'Sort in descending order'
+  TableListField_PageControls.ss:
+    DISPLAYING: Displaying
     OF: of
     TO: to
     VIEWFIRST: 'View first'
     VIEWLAST: 'View last'
     VIEWNEXT: 'View next'
     VIEWPREVIOUS: 'View previous'
-  SimpleImageField:
-    NOUPLOAD: 'No Image Uploaded'
-  SiteTree:
-    TABMAIN: Main
-  TableField:
-    ADDITEM: 'Add %s'
-    ISREQUIRED: 'In %s ''%s'' is required'
-    NOITEMSFOUND: 'No items found'
-    SORTASC: 'Sort in ascending order'
-    SORTDESC: 'Sort in descending order'
-  TableListField:
-    CSVEXPORT: 'Export to CSV'
-    PRINT: Print
-    Print: Print
-    SELECT: 'Select:'
   TimeField:
     VALIDATEFORMAT: 'Please enter a valid time format ({format})'
   ToggleField:

lang/id.yml

@@ -50,6 +50,8 @@ id:
     UNORDERED: 'Daftar tak berurut'
     UNORDEREDDESCRIPTION: 'Daftar tak berurut'
     UNORDEREDEXAMPLE1: 'barang 1'
+  BackLink_Button.ss:
+    Back: Back
   BasicAuth:
     ENTERINFO: 'Harap masukkan username dan password.'
     ERRORNOTADMIN: 'User tersebut bukan administrator.'
@@ -57,9 +59,10 @@ id:
   Boolean:
     0: 'False'
     ANY: Any
-    Hello: Hi
-    LOGOUT: 'Log out'
     1: 'True'
+  CMSLoadingScreen.ss:
+    LOADING: Loading...
+    REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
   CMSMain:
     ACCESS: 'Access to ''{title}'' section'
     ACCESSALLINTERFACES: 'Access to all CMS sections'
@@ -67,6 +70,12 @@ id:
     SAVE: Simpan
   CMSProfileController:
     MENUTITLE: CMSProfileController
+  ChangePasswordEmail.ss:
+    CHANGEPASSWORDTEXT1: 'Anda merubah password anda untuk'
+    CHANGEPASSWORDTEXT2: 'Anda dapat menggunakan surat kepercayaan berikut untuk masuk:'
+    EMAIL: Email
+    HELLO: Hai
+    PASSWORD: Password
   CheckboxField:
     - 'False'
     - 'True'
@@ -74,6 +83,14 @@ id:
     CLOSEPOPUP: 'Tutup popup'
     SUCCESSADD2: 'Added {name}'
     SUCCESSEDIT: 'Telah menyimpan %s %s %s'
+  ComplexTableField.ss:
+    ADDITEM: 'Add %s'
+    NOITEMSFOUND: 'No items found'
+    SORTASC: 'Urut ascending'
+    SORTDESC: 'Urut descending'
+  ComplexTableField_popup.ss:
+    NEXT: Selanjutnya
+    PREVIOUS: Sebelumnya
   ConfirmedPasswordField:
     ATLEAST: 'Passwords must be at least {min} characters long.'
     BETWEEN: 'Passwords must be {min} to {max} characters long.'
@@ -111,10 +128,7 @@ id:
     VALIDDATEMAXDATE: 'Your date has to be older or matching the maximum allowed date ({date})'
     VALIDDATEMINDATE: 'Your date has to be newer or matching the minimum allowed date ({date})'
   Director:
-    ADD: Tambah
-    CSVEXPORT: 'Export to CSV'
     INVALID_REQUEST: 'Invalid request'
-    NOTFOUND: 'No items found'
   DropdownField:
     CHOOSE: (Pilih)
   EmailField:
@@ -124,8 +138,6 @@ id:
     SINGULARNAME: 'Email Bounce Record'
   Enum:
     ANY: Any
-    LOADING: Loading...
-    REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
   File:
     Content: Isi
     Filename: 'Nama File'
@@ -150,13 +162,17 @@ id:
     FROMFILESTORE: 'From the File Store'
     NOSOURCE: 'Please select a source file to attach'
     REPLACE: 'Replace {type}'
+  FileIFrameField_iframe.ss:
+    TITLE: 'Image Uploading Iframe'
   Filesystem:
-    IMPORT_TAB_HEADER: Import
-    SEARCHLISTINGS: Search
     SYNCRESULTS: 'Sync complete: {createdcount} items created, {deletedcount} items deleted'
+  ForgotPasswordEmail.ss:
+    HELLO: Hai
+    TEXT1: Inilah
+    TEXT2: 'link untuk mereset kata sandi'
+    TEXT3: untuk
   Form:
     FIELDISREQUIRED: '%s dibutuhkan'
-    TITLE: 'Image Uploading Iframe'
     VALIDATIONCREDITNUMBER: 'Please ensure you have entered the {number} credit card number correctly'
     VALIDATIONNOTUNIQUE: 'Harga yang dimasukkan tidak unik'
     VALIDATIONPASSWORDSDONTMATCH: 'Password tidak cocok'
@@ -187,37 +203,26 @@ id:
     ResetFilter: Reset
   GridFieldAction_Delete:
     DeletePermissionsFailure: 'No delete permissions'
-    NEXT: Selanjutnya
-    PREVIOUS: Sebelumnya
   GridFieldDetailForm:
     Create: Create
     Delete: Delete
     DeletePermissionsFailure: 'No delete permissions'
     Deleted: 'Deleted %s %s'
-    HELLO: Hai
     Save: Save
     Saved: 'Saved %s %s'
-    TEXT1: Inilah
+  GridFieldItemEditView.ss: null
-    TEXT2: 'link untuk mereset kata sandi'
-    TEXT3: untuk
   Group:
     AddRole: 'Add a role for this group'
-    CHANGEPASSWORDTEXT1: 'Anda merubah password anda untuk'
-    CHANGEPASSWORDTEXT2: 'Anda dapat menggunakan surat kepercayaan berikut untuk masuk:'
     Code: 'Kode Grup'
     DefaultGroupTitleAdministrators: Pengurus
     DefaultGroupTitleContentAuthors: 'Pencipta isi'
     Description: Deskripsi
-    EMAIL: Email
     GroupReminder: 'If you choose a parent group, this group will take all it''s roles'
-    HELLO: Hai
     Locked: 'Terkunci?'
     NoRoles: 'No roles found'
-    PASSWORD: Password
     Parent: 'Grup induk'
     RolesAddEditLink: 'Manage roles'
     Sort: 'Urutan Sortir'
-    TITLE: 'Iframe Meng-upload Gambar'
     has_many_Permissions: Ijin
     many_many_Members: Anggota-anggota
   GroupImportForm:
@@ -275,10 +280,9 @@ id:
     UpdateMEDIA: 'Update Media'
   ImageField:
     IMAGE: Image
-  Image_iframe.ss: 'ChangePasswordEmail.ss:  BackLink_Button.ss:  CMSLoadingScreen.ss:  RelationComplexTableField.ss:  ForgotPasswordEmail.ss:    APPLY FILTER: "Apply Filter"  GridFieldItemEditView.ss:    Go back: "Go back"  ModelSidebar.ss:  TableListField_PageControls.ss:  ModelAdmin_Tools.ss:  ComplexTableField_popup.ss:  TableField.ss:  FileIFrameField_iframe.ss:  ComplexTableField.ss:  TableListField.ss:  ModelAdmin_ImportSpec.ss:  LeftAndMain_Menu.ss:'
+  Image_iframe.ss:
+    TITLE: 'Iframe Meng-upload Gambar'
   LeftAndMain:
-    ADD: 'Tambah sebuah baris'
-    ADDITEM: 'Add %s'
     CANT_REORGANISE: 'You do not have permission to alter Top level pages. Your change was not saved.'
     DELETED: Deleted.
     DropdownBatchActionsDefault: Actions
@@ -292,6 +296,9 @@ id:
     REORGANISATIONSUCCESSFUL: 'Reorganised the site tree successfully.'
     SAVEDUP: Saved.
     VersionUnknown: unknown
+  LeftAndMain_Menu.ss:
+    Hello: Hi
+    LOGOUT: 'Log out'
   LoginAttempt:
     Email: 'Alamat Email'
     IP: 'Alamat IP'
@@ -368,6 +375,7 @@ id:
     ResultUpdated: 'Updated {count} members'
   MemberTableField: null
   ModelAdmin:
+    'APPLY FILTER': 'Apply Filter'
     DELETE: Delete
     DELETEDRECORDS: 'Deleted {count} records.'
     IMPORT: 'Import from CSV'
@@ -377,6 +385,17 @@ id:
     RESET: Reset
     Title: 'Data Models'
     UPDATEDRECORDS: 'Updated {count} records.'
+  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
   MoneyField:
     FIELDLABELAMOUNT: Jumlah
     FIELDLABELCURRENCY: 'Mata Uang'
@@ -389,10 +408,6 @@ id:
     CMS_ACCESS_CATEGORY: 'CMS Access'
     FULLADMINRIGHTS: 'Hak-hak administratif yang penuh'
     FULLADMINRIGHTS_HELP: 'Implies and overrules all other assigned permissions.'
-    IMPORTSPECFIELDS: 'Database columns'
-    IMPORTSPECLINK: 'Show Specification for %s'
-    IMPORTSPECRELATIONS: Relations
-    IMPORTSPECTITLE: 'Specification for %s'
   PermissionCheckboxSetField:
     AssignedTo: 'assigned to "{title}"'
     FromGroup: 'inherited from group "{title}"'
@@ -401,8 +416,11 @@ id:
   Permissions:
     PERMISSIONS_CATEGORY: 'Roles and access permissions'
   PhoneNumberField:
-    Back: Back
     VALIDATION: 'Harap masukkan nomor telepon yang valid'
+  RelationComplexTableField.ss:
+    ADD: Tambah
+    CSVEXPORT: 'Export to CSV'
+    NOTFOUND: 'No items found'
   Security:
     ALREADYLOGGEDIN: 'Anda tidak memiliki akses ke halaman ini. Jika anda memiliki keanggotaan yang dapat mengakses halaman ini, anda dapat masuk di bawah ini.'
     BUTTONSEND: 'Kirimi saya link untuk mengeset ulang password '
@@ -439,31 +457,33 @@ id:
     BtnImport: 'Import from CSV'
     FileFieldLabel: 'CSV File <small>(Allowed extensions: *.csv)</small>'
   SilverStripeNavigator:
-    DISPLAYING: Displaying
     Edit: Edit
-    FILTER: Filter
+  SimpleImageField:
-    IMPORT: Import
+    NOUPLOAD: 'Tidak Ada Gambar yang Di-upload'
+  SiteTree:
+    TABMAIN: Utama
+  TableField:
+    ISREQUIRED: 'In %s ''%s'' is required'
+  TableField.ss:
+    ADD: 'Tambah sebuah baris'
+    ADDITEM: 'Add %s'
+  TableListField:
+    CSVEXPORT: 'Ekspor ke CSV'
+    PRINT: Cetak
+    Print: Print
+    SELECT: 'Pilih:'
+  TableListField.ss:
+    NOITEMSFOUND: 'No items found'
+    SORTASC: 'Sort in ascending order'
+    SORTDESC: 'Sort in descending order'
+  TableListField_PageControls.ss:
+    DISPLAYING: Displaying
     OF: of
     TO: to
     VIEWFIRST: 'Tampil pertama'
     VIEWLAST: 'Tampil terakhir'
     VIEWNEXT: 'Tampil berikutnya'
     VIEWPREVIOUS: 'Tampil sebelumnya'
-  SimpleImageField:
-    NOUPLOAD: 'Tidak Ada Gambar yang Di-upload'
-  SiteTree:
-    TABMAIN: Utama
-  TableField:
-    ADDITEM: 'Add %s'
-    ISREQUIRED: 'In %s ''%s'' is required'
-    NOITEMSFOUND: 'No items found'
-    SORTASC: 'Sort in ascending order'
-    SORTDESC: 'Sort in descending order'
-  TableListField:
-    CSVEXPORT: 'Ekspor ke CSV'
-    PRINT: Cetak
-    Print: Print
-    SELECT: 'Pilih:'
   TimeField:
     VALIDATEFORMAT: 'Please enter a valid time format ({format})'
   ToggleField:

lang/is.yml

@@ -50,6 +50,8 @@ is:
     UNORDERED: 'Óraðaður listi'
     UNORDEREDDESCRIPTION: 'Óraðaður listi'
     UNORDEREDEXAMPLE1: 'Óraðaður hlutur 1'
+  BackLink_Button.ss:
+    Back: Back
   BasicAuth:
     ENTERINFO: 'Vinsamlegast sláðu inn notendanafn og lykilorð.'
     ERRORNOTADMIN: 'Þessi notandi er ekki stjórnandi'
@@ -57,9 +59,10 @@ is:
   Boolean:
     0: Nei
     ANY: Einhver
-    Hello: Hi
-    LOGOUT: 'Log out'
     1: Já
+  CMSLoadingScreen.ss:
+    LOADING: Loading...
+    REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
   CMSMain:
     ACCESS: 'Access to ''{title}'' section'
     ACCESSALLINTERFACES: 'Access to all CMS sections'
@@ -67,6 +70,12 @@ is:
     SAVE: Vista
   CMSProfileController:
     MENUTITLE: CMSProfileController
+  ChangePasswordEmail.ss:
+    CHANGEPASSWORDTEXT1: 'Þú breyttir þínu lykilorði vegna'
+    CHANGEPASSWORDTEXT2: 'Þú getur núna notað eftirfarandi auðkenni til að innskrá þig:'
+    EMAIL: Tölvupóstur
+    HELLO: Hæ
+    PASSWORD: Lykilorð
   CheckboxField:
     - Nei
     - Já
@@ -74,6 +83,14 @@ is:
     CLOSEPOPUP: 'Loka glugga'
     SUCCESSADD2: 'Added {name}'
     SUCCESSEDIT: 'Vitað %s %s %s'
+  ComplexTableField.ss:
+    ADDITEM: 'Add %s'
+    NOITEMSFOUND: 'No items found'
+    SORTASC: 'Raða í hækkandi röð'
+    SORTDESC: 'Raða í lækkandi röð'
+  ComplexTableField_popup.ss:
+    NEXT: Næsta
+    PREVIOUS: Fyrri
   ConfirmedPasswordField:
     ATLEAST: 'Passwords must be at least {min} characters long.'
     BETWEEN: 'Passwords must be {min} to {max} characters long.'
@@ -111,10 +128,7 @@ is:
     VALIDDATEMAXDATE: 'Your date has to be older or matching the maximum allowed date ({date})'
     VALIDDATEMINDATE: 'Your date has to be newer or matching the minimum allowed date ({date})'
   Director:
-    ADD: 'Bæta við'
-    CSVEXPORT: 'Export to CSV'
     INVALID_REQUEST: 'Invalid request'
-    NOTFOUND: 'No items found'
   DropdownField:
     CHOOSE: (Veldu)
   EmailField:
@@ -124,8 +138,6 @@ is:
     SINGULARNAME: 'Email Bounce Record'
   Enum:
     ANY: Einhver
-    LOADING: Loading...
-    REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
   File:
     Content: Efni
     Filename: Skráarnafn
@@ -150,13 +162,17 @@ is:
     FROMFILESTORE: 'Frá skrárgeymslu'
     NOSOURCE: 'Please select a source file to attach'
     REPLACE: 'Replace {type}'
+  FileIFrameField_iframe.ss:
+    TITLE: 'Image Uploading Iframe'
   Filesystem:
-    IMPORT_TAB_HEADER: Import
-    SEARCHLISTINGS: Search
     SYNCRESULTS: 'Sync complete: {createdcount} items created, {deletedcount} items deleted'
+  ForgotPasswordEmail.ss:
+    HELLO: Hæ
+    TEXT1: 'Hérna er þitt'
+    TEXT2: 'endursetja lykilorð'
+    TEXT3: fyrir
   Form:
     FIELDISREQUIRED: '%s er krafist'
-    TITLE: 'Image Uploading Iframe'
     VALIDATIONCREDITNUMBER: 'Please ensure you have entered the {number} credit card number correctly'
     VALIDATIONNOTUNIQUE: 'Gildið sem þú slóst inn er ekki einkvæmt'
     VALIDATIONPASSWORDSDONTMATCH: 'Lykilorðin stemma ekki'
@@ -187,37 +203,26 @@ is:
     ResetFilter: Reset
   GridFieldAction_Delete:
     DeletePermissionsFailure: 'No delete permissions'
-    NEXT: Næsta
-    PREVIOUS: Fyrri
   GridFieldDetailForm:
     Create: Create
     Delete: Delete
     DeletePermissionsFailure: 'No delete permissions'
     Deleted: 'Deleted %s %s'
-    HELLO: Hæ
     Save: Save
     Saved: 'Saved %s %s'
-    TEXT1: 'Hérna er þitt'
+  GridFieldItemEditView.ss: null
-    TEXT2: 'endursetja lykilorð'
-    TEXT3: fyrir
   Group:
     AddRole: 'Add a role for this group'
-    CHANGEPASSWORDTEXT1: 'Þú breyttir þínu lykilorði vegna'
-    CHANGEPASSWORDTEXT2: 'Þú getur núna notað eftirfarandi auðkenni til að innskrá þig:'
     Code: 'Hóp kóði'
     DefaultGroupTitleAdministrators: Administrators
     DefaultGroupTitleContentAuthors: 'Content Authors'
     Description: Lýsing
-    EMAIL: Tölvupóstur
     GroupReminder: 'If you choose a parent group, this group will take all it''s roles'
-    HELLO: Hæ
     Locked: 'Læst?'
     NoRoles: 'No roles found'
-    PASSWORD: Lykilorð
     Parent: 'Yfir hópur'
     RolesAddEditLink: 'Manage roles'
     Sort: Röðun
-    TITLE: 'Image Uploading Iframe'
     has_many_Permissions: Leyfi
     many_many_Members: Félagar
   GroupImportForm:
@@ -275,10 +280,9 @@ is:
     UpdateMEDIA: 'Update Media'
   ImageField:
     IMAGE: Mynd
-  Image_iframe.ss: 'ChangePasswordEmail.ss:  BackLink_Button.ss:  CMSLoadingScreen.ss:  RelationComplexTableField.ss:  ForgotPasswordEmail.ss:    APPLY FILTER: "Apply Filter"  GridFieldItemEditView.ss:    Go back: "Go back"  ModelSidebar.ss:  TableListField_PageControls.ss:  ModelAdmin_Tools.ss:  ComplexTableField_popup.ss:  TableField.ss:  FileIFrameField_iframe.ss:  ComplexTableField.ss:  TableListField.ss:  ModelAdmin_ImportSpec.ss:  LeftAndMain_Menu.ss:'
+  Image_iframe.ss:
+    TITLE: 'Image Uploading Iframe'
   LeftAndMain:
-    ADD: 'Bæta við nýrri röð'
-    ADDITEM: 'Add %s'
     CANT_REORGANISE: 'You do not have permission to alter Top level pages. Your change was not saved.'
     DELETED: Deleted.
     DropdownBatchActionsDefault: Actions
@@ -292,6 +296,9 @@ is:
     REORGANISATIONSUCCESSFUL: 'Reorganised the site tree successfully.'
     SAVEDUP: Saved.
     VersionUnknown: unknown
+  LeftAndMain_Menu.ss:
+    Hello: Hi
+    LOGOUT: 'Log out'
   LoginAttempt:
     Email: Tölvupóstfang
     IP: 'IP tala'
@@ -368,6 +375,7 @@ is:
     ResultUpdated: 'Updated {count} members'
   MemberTableField: null
   ModelAdmin:
+    'APPLY FILTER': 'Apply Filter'
     DELETE: Delete
     DELETEDRECORDS: 'Deleted {count} records.'
     IMPORT: 'Import from CSV'
@@ -377,6 +385,17 @@ is:
     RESET: Reset
     Title: 'Data Models'
     UPDATEDRECORDS: 'Updated {count} records.'
+  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
   MoneyField:
     FIELDLABELAMOUNT: Reikningur
     FIELDLABELCURRENCY: Gjaldmiðill
@@ -389,10 +408,6 @@ is:
     CMS_ACCESS_CATEGORY: 'CMS Access'
     FULLADMINRIGHTS: 'Full stjórnanda réttindi'
     FULLADMINRIGHTS_HELP: 'Implies and overrules all other assigned permissions.'
-    IMPORTSPECFIELDS: 'Database columns'
-    IMPORTSPECLINK: 'Show Specification for %s'
-    IMPORTSPECRELATIONS: Relations
-    IMPORTSPECTITLE: 'Specification for %s'
   PermissionCheckboxSetField:
     AssignedTo: 'assigned to "{title}"'
     FromGroup: 'inherited from group "{title}"'
@@ -401,8 +416,11 @@ is:
   Permissions:
     PERMISSIONS_CATEGORY: 'Roles and access permissions'
   PhoneNumberField:
-    Back: Back
     VALIDATION: 'Vinsamlegast sláðu inn gilt símanúmer'
+  RelationComplexTableField.ss:
+    ADD: 'Bæta við'
+    CSVEXPORT: 'Export to CSV'
+    NOTFOUND: 'No items found'
   Security:
     ALREADYLOGGEDIN: 'Þú hefur ekki aðgang að þessari síðu. Ef þú hefur annan reikning sem hefur aðgang að þessari síðu, þá getur þú innskráð þig fyrir neðan.'
     BUTTONSEND: 'Sendu mér hlekk til að endursetja lykilorðið'
@@ -439,31 +457,33 @@ is:
     BtnImport: 'Import from CSV'
     FileFieldLabel: 'CSV File <small>(Allowed extensions: *.csv)</small>'
   SilverStripeNavigator:
-    DISPLAYING: Displaying
     Edit: Edit
-    FILTER: Filter
+  SimpleImageField:
-    IMPORT: Import
+    NOUPLOAD: 'Engin mynd sótt'
+  SiteTree:
+    TABMAIN: Aðal
+  TableField:
+    ISREQUIRED: 'In %s ''%s'' is required'
+  TableField.ss:
+    ADD: 'Bæta við nýrri röð'
+    ADDITEM: 'Add %s'
+  TableListField:
+    CSVEXPORT: 'Flytja út í CSV'
+    PRINT: Prenta
+    Print: Print
+    SELECT: 'Veldu:'
+  TableListField.ss:
+    NOITEMSFOUND: 'No items found'
+    SORTASC: 'Sort in ascending order'
+    SORTDESC: 'Sort in descending order'
+  TableListField_PageControls.ss:
+    DISPLAYING: Displaying
     OF: of
     TO: to
     VIEWFIRST: 'Sýna first'
     VIEWLAST: 'Sýna síðast'
     VIEWNEXT: 'Sýna næsta'
     VIEWPREVIOUS: 'Sýna fyrri'
-  SimpleImageField:
-    NOUPLOAD: 'Engin mynd sótt'
-  SiteTree:
-    TABMAIN: Aðal
-  TableField:
-    ADDITEM: 'Add %s'
-    ISREQUIRED: 'In %s ''%s'' is required'
-    NOITEMSFOUND: 'No items found'
-    SORTASC: 'Sort in ascending order'
-    SORTDESC: 'Sort in descending order'
-  TableListField:
-    CSVEXPORT: 'Flytja út í CSV'
-    PRINT: Prenta
-    Print: Print
-    SELECT: 'Veldu:'
   TimeField:
     VALIDATEFORMAT: 'Please enter a valid time format ({format})'
   ToggleField:

lang/it.yml

@@ -50,6 +50,8 @@ it:
     UNORDERED: 'Lista non ordinata'
     UNORDEREDDESCRIPTION: 'Lista non ordinata'
     UNORDEREDEXAMPLE1: 'Argomento 1 non ordinato'
+  BackLink_Button.ss:
+    Back: Back
   BasicAuth:
     ENTERINFO: 'Per favore inserisci un nome utente e la password.'
     ERRORNOTADMIN: 'Questo utente non è amministratore.'
@@ -57,9 +59,10 @@ it:
   Boolean:
     0: NO
     ANY: Qualsiasi
-    Hello: Hi
-    LOGOUT: 'Log out'
     1: SI
+  CMSLoadingScreen.ss:
+    LOADING: Loading...
+    REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
   CMSMain:
     ACCESS: 'Access to ''{title}'' section'
     ACCESSALLINTERFACES: 'Accesso a tutte le interfaccia CMS'
@@ -67,6 +70,12 @@ it:
     SAVE: Salva
   CMSProfileController:
     MENUTITLE: CMSProfileController
+  ChangePasswordEmail.ss:
+    CHANGEPASSWORDTEXT1: 'Hai cambiato la password per'
+    CHANGEPASSWORDTEXT2: 'Puoi ora utilizzare le seguenti credenziali per accedere:'
+    EMAIL: Email
+    HELLO: Ciao
+    PASSWORD: Password
   CheckboxField:
     - No
     - Si
@@ -74,6 +83,14 @@ it:
     CLOSEPOPUP: 'Chiudi Finestra'
     SUCCESSADD2: 'Added {name}'
     SUCCESSEDIT: 'Salvato %s %s %s'
+  ComplexTableField.ss:
+    ADDITEM: 'Add %s'
+    NOITEMSFOUND: 'No items found'
+    SORTASC: 'Ordina in modo crescente'
+    SORTDESC: 'Ordina in modo decrescente'
+  ComplexTableField_popup.ss:
+    NEXT: Prossimo
+    PREVIOUS: Precedente
   ConfirmedPasswordField:
     ATLEAST: 'Passwords must be at least {min} characters long.'
     BETWEEN: 'Passwords must be {min} to {max} characters long.'
@@ -111,10 +128,7 @@ it:
     VALIDDATEMAXDATE: 'Your date has to be older or matching the maximum allowed date ({date})'
     VALIDDATEMINDATE: 'Your date has to be newer or matching the minimum allowed date ({date})'
   Director:
-    ADD: Aggiungi
-    CSVEXPORT: 'Export to CSV'
     INVALID_REQUEST: 'Invalid request'
-    NOTFOUND: 'No items found'
   DropdownField:
     CHOOSE: (Scegli)
   EmailField:
@@ -124,8 +138,6 @@ it:
     SINGULARNAME: 'Email Bounce Record'
   Enum:
     ANY: Qualsiasi
-    LOADING: Loading...
-    REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
   File:
     Content: Contenuto
     Filename: 'Nome del file'
@@ -150,13 +162,17 @@ it:
     FROMFILESTORE: 'From the File Store'
     NOSOURCE: 'Please select a source file to attach'
     REPLACE: 'Replace {type}'
+  FileIFrameField_iframe.ss:
+    TITLE: 'Image Uploading Iframe'
   Filesystem:
-    IMPORT_TAB_HEADER: Import
-    SEARCHLISTINGS: Search
     SYNCRESULTS: 'Sync complete: {createdcount} items created, {deletedcount} items deleted'
+  ForgotPasswordEmail.ss:
+    HELLO: Ciao
+    TEXT1: 'Questa è la tua'
+    TEXT2: 'Link per il reset della password'
+    TEXT3: per
   Form:
     FIELDISREQUIRED: '%s è richiesto'
-    TITLE: 'Image Uploading Iframe'
     VALIDATIONCREDITNUMBER: 'Please ensure you have entered the {number} credit card number correctly'
     VALIDATIONNOTUNIQUE: 'Il valore inserito non è unico'
     VALIDATIONPASSWORDSDONTMATCH: 'Le password non corrispondono'
@@ -187,37 +203,26 @@ it:
     ResetFilter: Reset
   GridFieldAction_Delete:
     DeletePermissionsFailure: 'No delete permissions'
-    NEXT: Prossimo
-    PREVIOUS: Precedente
   GridFieldDetailForm:
     Create: Create
     Delete: Delete
     DeletePermissionsFailure: 'No delete permissions'
     Deleted: 'Deleted %s %s'
-    HELLO: Ciao
     Save: Save
     Saved: 'Saved %s %s'
-    TEXT1: 'Questa è la tua'
+  GridFieldItemEditView.ss: null
-    TEXT2: 'Link per il reset della password'
-    TEXT3: per
   Group:
     AddRole: 'Add a role for this group'
-    CHANGEPASSWORDTEXT1: 'Hai cambiato la password per'
-    CHANGEPASSWORDTEXT2: 'Puoi ora utilizzare le seguenti credenziali per accedere:'
     Code: 'Codice gruppo'
     DefaultGroupTitleAdministrators: Administrators
     DefaultGroupTitleContentAuthors: 'Content Authors'
     Description: Descrizione
-    EMAIL: Email
     GroupReminder: 'If you choose a parent group, this group will take all it''s roles'
-    HELLO: Ciao
     Locked: 'Bloccato?'
     NoRoles: 'No roles found'
-    PASSWORD: Password
     Parent: 'Gruppo padre'
     RolesAddEditLink: 'Aggiungi/modifica ruoli'
     Sort: 'Tipo ordinamento'
-    TITLE: 'Iframe per l''inserimento dell''immagine'
     has_many_Permissions: Autorizzazioni
     many_many_Members: Membri
   GroupImportForm:
@@ -275,10 +280,9 @@ it:
     UpdateMEDIA: 'Update Media'
   ImageField:
     IMAGE: Immagine
-  Image_iframe.ss: 'ChangePasswordEmail.ss:  BackLink_Button.ss:  CMSLoadingScreen.ss:  RelationComplexTableField.ss:  ForgotPasswordEmail.ss:    APPLY FILTER: "Apply Filter"  GridFieldItemEditView.ss:    Go back: "Go back"  ModelSidebar.ss:  TableListField_PageControls.ss:  ModelAdmin_Tools.ss:  ComplexTableField_popup.ss:  TableField.ss:  FileIFrameField_iframe.ss:  ComplexTableField.ss:  TableListField.ss:  ModelAdmin_ImportSpec.ss:  LeftAndMain_Menu.ss:'
+  Image_iframe.ss:
+    TITLE: 'Iframe per l''inserimento dell''immagine'
   LeftAndMain:
-    ADD: 'Aggiungi una nuova riga'
-    ADDITEM: 'Add %s'
     CANT_REORGANISE: 'You do not have permission to alter Top level pages. Your change was not saved.'
     DELETED: Deleted.
     DropdownBatchActionsDefault: Actions
@@ -292,6 +296,9 @@ it:
     REORGANISATIONSUCCESSFUL: 'Reorganised the site tree successfully.'
     SAVEDUP: Saved.
     VersionUnknown: unknown
+  LeftAndMain_Menu.ss:
+    Hello: Hi
+    LOGOUT: 'Log out'
   LoginAttempt:
     Email: 'Indirizzo e-mail'
     IP: 'Indirizzo IP'
@@ -368,6 +375,7 @@ it:
     ResultUpdated: 'Updated {count} members'
   MemberTableField: null
   ModelAdmin:
+    'APPLY FILTER': 'Apply Filter'
     DELETE: Cancella
     DELETEDRECORDS: 'Deleted {count} records.'
     IMPORT: 'Importa da CSV'
@@ -377,6 +385,17 @@ it:
     RESET: Reset
     Title: 'Data Models'
     UPDATEDRECORDS: 'Updated {count} records.'
+  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
   MoneyField:
     FIELDLABELAMOUNT: Totale
     FIELDLABELCURRENCY: Valuta
@@ -389,10 +408,6 @@ it:
     CMS_ACCESS_CATEGORY: 'CMS Access'
     FULLADMINRIGHTS: 'Diritti di amministrazione'
     FULLADMINRIGHTS_HELP: 'Implies and overrules all other assigned permissions.'
-    IMPORTSPECFIELDS: 'Database columns'
-    IMPORTSPECLINK: 'Show Specification for %s'
-    IMPORTSPECRELATIONS: Relations
-    IMPORTSPECTITLE: 'Specification for %s'
   PermissionCheckboxSetField:
     AssignedTo: 'assigned to "{title}"'
     FromGroup: 'inherited from group "{title}"'
@@ -401,8 +416,11 @@ it:
   Permissions:
     PERMISSIONS_CATEGORY: 'Roles and access permissions'
   PhoneNumberField:
-    Back: Back
     VALIDATION: 'Per favore inserisci un numero di telefono valido'
+  RelationComplexTableField.ss:
+    ADD: Aggiungi
+    CSVEXPORT: 'Export to CSV'
+    NOTFOUND: 'No items found'
   Security:
     ALREADYLOGGEDIN: 'Non hai accesso a questa pagina. Se hai un altro account che può accederci, puoi autenticarti qui sotto.'
     BUTTONSEND: 'Inviami il link per reimpostare la password'
@@ -439,31 +457,33 @@ it:
     BtnImport: 'Import from CSV'
     FileFieldLabel: 'CSV File <small>(Allowed extensions: *.csv)</small>'
   SilverStripeNavigator:
-    DISPLAYING: Displaying
     Edit: Edit
-    FILTER: Filter
+  SimpleImageField:
-    IMPORT: Import
+    NOUPLOAD: 'Nessuna immagine caricata'
+  SiteTree:
+    TABMAIN: Principale
+  TableField:
+    ISREQUIRED: 'In %s ''%s'' is required'
+  TableField.ss:
+    ADD: 'Aggiungi una nuova riga'
+    ADDITEM: 'Add %s'
+  TableListField:
+    CSVEXPORT: 'Esporta come CSV'
+    PRINT: Stampa
+    Print: Print
+    SELECT: 'Select:'
+  TableListField.ss:
+    NOITEMSFOUND: 'No items found'
+    SORTASC: 'Sort in ascending order'
+    SORTDESC: 'Sort in descending order'
+  TableListField_PageControls.ss:
+    DISPLAYING: Displaying
     OF: of
     TO: to
     VIEWFIRST: 'Vedi prima'
     VIEWLAST: 'Vedi infine'
     VIEWNEXT: 'Vedi successivo'
     VIEWPREVIOUS: 'Vedi precedente'
-  SimpleImageField:
-    NOUPLOAD: 'Nessuna immagine caricata'
-  SiteTree:
-    TABMAIN: Principale
-  TableField:
-    ADDITEM: 'Add %s'
-    ISREQUIRED: 'In %s ''%s'' is required'
-    NOITEMSFOUND: 'No items found'
-    SORTASC: 'Sort in ascending order'
-    SORTDESC: 'Sort in descending order'
-  TableListField:
-    CSVEXPORT: 'Esporta come CSV'
-    PRINT: Stampa
-    Print: Print
-    SELECT: 'Select:'
   TimeField:
     VALIDATEFORMAT: 'Please enter a valid time format ({format})'
   ToggleField:

lang/ja_JP.yml

@@ -7,7 +7,7 @@ ja_JP:
     FILENAME: ファイル名
     FOLDER: フォルダ
     LASTEDIT: 最終更新日
-    OWNER: 所有者
+    OWNER: '所有者'
     SIZE: ファイルサイズ
     TITLE: タイトル
     TYPE: ファイルの種類
@@ -15,7 +15,7 @@ ja_JP:
   AssetUploadField:
     ChooseFiles: ファイルを選択
     DRAGFILESHERE: ここにファイルをドラッグ
-    DROPAREA: ドロップ領域
+    DROPAREA: 'ドロップ領域'
     EDITALL: すべて編集
     EDITANDORGANIZE: 編集と管理
     EDITINFO: ファイルを編集
@@ -23,7 +23,7 @@ ja_JP:
     FROMCOMPUTER: コンピュータからファイルを選択
     FROMCOMPUTERINFO: コンピュータからアップロード
     TOTAL: 合計
-    UPLOADINPROGRESS: しばらくお待ちください...アップロードは進行中です
+    UPLOADINPROGRESS: 'しばらくお待ちください...アップロードは進行中です'
     UPLOADOR: もしくは
   BBCodeParser:
     ALIGNEMENT: 整列
@@ -42,7 +42,7 @@ ja_JP:
     ITALIC: テキストを斜体にする
     ITALICEXAMPLE: 斜体
     LINK: ウェブサイトのリンク
-    LINKDESCRIPTION: 別のウェブサイトかURLにリンクしてください
+    LINKDESCRIPTION: '別のウェブサイトかURLにリンクしてください'
     STRUCK: テキストに取り消し線を引く
     STRUCKEXAMPLE: 取り消し線
     UNDERLINE: テキストに下線を引く
@@ -50,16 +50,19 @@ ja_JP:
     UNORDERED: 不規則なリストです
     UNORDEREDDESCRIPTION: 不規則なリストです
     UNORDEREDEXAMPLE1: '不規則なアイテム 1'
+  BackLink_Button.ss:
+    Back: 戻る
   BasicAuth:
-    ENTERINFO: ユーザー名とパスワードを入力してください
+    ENTERINFO: 'ユーザー名とパスワードを入力してください'
-    ERRORNOTADMIN: このユーザーは管理者（アドミニストレーター）ではありません
+    ERRORNOTADMIN: 'このユーザーは管理者（アドミニストレーター）ではありません'
     ERRORNOTREC: 'ユーザー名 / パスワードは認識されませんでした'
   Boolean:
     0: 偽
     ANY: 何でも
-    Hello: こんにちは！
-    LOGOUT: ログアウト
     1: 真
+  CMSLoadingScreen.ss:
+    LOADING: 読み込み中...
+    REQUIREJS: 'CMSを利用するにはJavascriptが有効化されている必要があります。'
   CMSMain:
     ACCESS: 'Access to ''{title}'' section'
     ACCESSALLINTERFACES: すべてのCMSのセクションへアクセス
@@ -67,6 +70,12 @@ ja_JP:
     SAVE: 保存
   CMSProfileController:
     MENUTITLE: CMSProfileController
+  ChangePasswordEmail.ss:
+    CHANGEPASSWORDTEXT1: このサイトのパスワードが変更されました。
+    CHANGEPASSWORDTEXT2: '貴方は現在以下の証明書を使ってログインしています:'
+    EMAIL: メールアドレス
+    HELLO: こんにちわ！
+    PASSWORD: パスワード
   CheckboxField:
     - いいえ
     - はい
@@ -74,6 +83,14 @@ ja_JP:
     CLOSEPOPUP: ポップアップを閉じる
     SUCCESSADD2: '{name}を追加しました'
     SUCCESSEDIT: '更新日時 %s %s %s'
+  ComplexTableField.ss:
+    ADDITEM: '%sを追加'
+    NOITEMSFOUND: '項目が見つかりませんでした'
+    SORTASC: '昇順'
+    SORTDESC: 'ソート（下順）'
+  ComplexTableField_popup.ss:
+    NEXT: 次へ
+    PREVIOUS: 前へ
   ConfirmedPasswordField:
     ATLEAST: 'Passwords must be at least {min} characters long.'
     BETWEEN: 'Passwords must be {min} to {max} characters long.'
@@ -111,23 +128,18 @@ ja_JP:
     VALIDDATEMAXDATE: '許可されている最も新しい日付{{date}}より古い日付か同じ日付である必要があります。'
     VALIDDATEMINDATE: '許可されている最も古い日付{{date}}より新しい日付か同じ日付である必要があります'
   Director:
-    ADD: 追加
-    CSVEXPORT: CSVへ書き出し
     INVALID_REQUEST: 不正なリクエスト
-    NOTFOUND: 項目が見つかりませんでした
   DropdownField:
     CHOOSE: (選択)
   EmailField:
-    VALIDATION: メールアドレスを入力してください
+    VALIDATION: 'メールアドレスを入力してください'
   Email_BounceRecord:
     PLURALNAME: 'Eメール 反応記録'
     SINGULARNAME: 'Eメール 反応記録'
   Enum:
     ANY: 何でも
-    LOADING: 読み込み中...
-    REQUIREJS: CMSを利用するにはJavascriptが有効化されている必要があります。
   File:
-    Content: 内容
+    Content: '内容'
     Filename: ファイル名
     INVALIDEXTENSION: 'Extension is not allowed (valid: {extensions})'
     INVALIDEXTENSIONSHORT: 'Extension is not allowed'
@@ -150,15 +162,19 @@ ja_JP:
     FROMFILESTORE: ファイルストレージから
     NOSOURCE: 'Please select a source file to attach'
     REPLACE: 'Replace {type}'
+  FileIFrameField_iframe.ss:
+    TITLE: イメージアップロード（Iframe）
   Filesystem:
-    IMPORT_TAB_HEADER: 取り込み
-    SEARCHLISTINGS: 検索
     SYNCRESULTS: '同期が完了しました: {createdcount}項目が作成され、{deletedcount}項目が削除されました。'
+  ForgotPasswordEmail.ss:
+    HELLO: こんにちわ！
+    TEXT1: 'ここ''貴方の'
+    TEXT2: パスワードリセットのリンク
+    TEXT3: は
   Form:
     FIELDISREQUIRED: '%s が必要です'
-    TITLE: イメージアップロード（Iframe）
     VALIDATIONCREDITNUMBER: 'Please ensure you have entered the {number} credit card number correctly'
-    VALIDATIONNOTUNIQUE: 入力された値はユニークではありません
+    VALIDATIONNOTUNIQUE: '入力された値はユニークではありません'
     VALIDATIONPASSWORDSDONTMATCH: パスワードが一致しません
     VALIDATIONPASSWORDSNOTEMPTY: パスワードが空欄です
     VALIDATIONSTRONGPASSWORD: 'Passwords must have at least one digit and one alphanumeric character'
@@ -178,7 +194,7 @@ ja_JP:
     LEVELUP: 'Level up'
     LinkExisting: 'Link Existing'
     NewRecord: 新しい%s
-    NoItemsFound: 項目が見つかりませんでした
+    NoItemsFound: '項目が見つかりませんでした'
     PRINTEDAT: 'Printed at'
     PRINTEDBY: 'Printed by'
     PlaceHolder: '{type}を探す'
@@ -187,37 +203,26 @@ ja_JP:
     ResetFilter: リセット
   GridFieldAction_Delete:
     DeletePermissionsFailure: 削除権限がありません
-    NEXT: 次へ
-    PREVIOUS: 前へ
   GridFieldDetailForm:
     Create: 作成
     Delete: 削除
     DeletePermissionsFailure: 削除権限がありません
     Deleted: '削除済み %s %s'
-    HELLO: こんにちわ！
     Save: 保存
     Saved: '保存済み %s %s'
-    TEXT1: 'ここ''貴方の'
+  GridFieldItemEditView.ss: null
-    TEXT2: パスワードリセットのリンク
-    TEXT3: は
   Group:
-    AddRole: このグループに役割を追加する
+    AddRole: 'このグループに役割を追加する'
-    CHANGEPASSWORDTEXT1: このサイトのパスワードが変更されました。
-    CHANGEPASSWORDTEXT2: '貴方は現在以下の証明書を使ってログインしています:'
     Code: グループコード
-    DefaultGroupTitleAdministrators: 管理者
+    DefaultGroupTitleAdministrators: '管理者'
-    DefaultGroupTitleContentAuthors: コンテンツの著者
+    DefaultGroupTitleContentAuthors: 'コンテンツの著者'
     Description: 説明文
-    EMAIL: メールアドレス
+    GroupReminder: '元グループを選択された場合、このグループはその役割をすべて受け継ぎます。'
-    GroupReminder: 元グループを選択された場合、このグループはその役割をすべて受け継ぎます。
-    HELLO: こんにちわ！
     Locked: ロックしますか？
     NoRoles: 役割が見つかりませんでした
-    PASSWORD: パスワード
+    Parent: '元グループ'
-    Parent: 元グループ
     RolesAddEditLink: 役割の管理
-    Sort: 並び順
+    Sort: '並び順'
-    TITLE: イメージアップロード（Iframe）
     has_many_Permissions: 承認
     many_many_Members: メンバー
   GroupImportForm:
@@ -229,19 +234,19 @@ ja_JP:
   Hierarchy:
     InfiniteLoopNotAllowed: 'Infinite loop found within the "{type}" hierarchy. Please change the parent to resolve this'
   HtmlEditorField:
-    ADDURL: URLを追加
+    ADDURL: 'URLを追加'
     ADJUSTDETAILSDIMENSIONS: 'Details & dimensions'
     ANCHORVALUE: アンカー
-    BUTTONINSERT: 追加
+    BUTTONINSERT: '追加'
-    BUTTONINSERTLINK: リンクを追加
+    BUTTONINSERTLINK: 'リンクを追加'
     BUTTONREMOVELINK: リンクを削除
     BUTTONUpdate: 更新
     CAPTIONTEXT: タイトル
     CSSCLASS: '調整 / スタイル'
     CSSCLASSCENTER: 中央はテキストのみ
-    CSSCLASSLEFT: 左側にテキストと一緒に処理してください
+    CSSCLASSLEFT: '左側にテキストと一緒に処理してください'
     CSSCLASSLEFTALONE: 中央はテキストのみ
-    CSSCLASSRIGHT: 右側にテキストと一緒に処理してください
+    CSSCLASSRIGHT: '右側にテキストと一緒に処理してください'
     DETAILS: 詳細
     EMAIL: メールアドレス
     FILE: ファイル
@@ -249,18 +254,18 @@ ja_JP:
     FROMCMS: CMSから
     FROMCOMPUTER: コンピュータから
     FROMWEB: Webから
-    FindInFolder: フォルダ内を探す
+    FindInFolder: 'フォルダ内を探す'
     IMAGEALT: 代替テキスト(Alt)
     IMAGEALTTEXT: '代替(Alt)テキスト - 画像が表示されなかった場合に表示されます'
-    IMAGEALTTEXTDESC: スクリーンリーダー利用者やイメージが表示されなかった場合に表示されます
+    IMAGEALTTEXTDESC: 'スクリーンリーダー利用者やイメージが表示されなかった場合に表示されます'
     IMAGEDIMENSIONS: サイズ
     IMAGEHEIGHTPX: Height
     IMAGETITLE: 'タイトル(ツールチップ)テキスト - 画像に対する追加的情報'
     IMAGETITLETEXT: タイトルテキスト(ツールチップ)
-    IMAGETITLETEXTDESC: 画像に関する追加情報
+    IMAGETITLETEXTDESC: '画像に関する追加情報'
     IMAGEWIDTHPX: Width
-    INSERTMEDIA: メディアを追加
+    INSERTMEDIA: 'メディアを追加'
-    LINK: ハイライトテキストへのリンクの挿入/削除
+    LINK: 'ハイライトテキストへのリンクの挿入/削除'
     LINKANCHOR: このページにアンカーを置く
     LINKDESCR: リンクの説明
     LINKEMAIL: メールアドレス
@@ -275,44 +280,46 @@ ja_JP:
     UpdateMEDIA: メディアを更新
   ImageField:
     IMAGE: 画像
-  Image_iframe.ss: 'ChangePasswordEmail.ss:  BackLink_Button.ss:  CMSLoadingScreen.ss:  RelationComplexTableField.ss:  ForgotPasswordEmail.ss:    APPLY FILTER: "フィルタを適用"  GridFieldItemEditView.ss:    Go back: "戻る"  ModelSidebar.ss:  TableListField_PageControls.ss:  ModelAdmin_Tools.ss:  ComplexTableField_popup.ss:  TableField.ss:  FileIFrameField_iframe.ss:  ComplexTableField.ss:  TableListField.ss:  ModelAdmin_ImportSpec.ss:  LeftAndMain_Menu.ss:'
+  Image_iframe.ss:
+    TITLE: イメージアップロード（Iframe）
   LeftAndMain:
-    ADD: 新しい行を追加
-    ADDITEM: '%sを追加'
     CANT_REORGANISE: 最上層のページを変更する権限がありません。あなたの変更は保存されませんでした。
     DELETED: 削除しました。
     DropdownBatchActionsDefault: アクション
     HELP: ヘルプ
     PAGETYPE: 'ページの種類:'
-    PERMAGAIN: ログアウトしました。再度ログインする場合は下にユーザー名とパスワードを入力してください。
+    PERMAGAIN: 'ログアウトしました。再度ログインする場合は下にユーザー名とパスワードを入力してください。'
-    PERMALREADY: 申し訳ございません。ご指定になられたCMSの箇所にはアクセスいただけません。別ユーザーとしてログインをされたい場合は、下記より行えます。
+    PERMALREADY: '申し訳ございません。ご指定になられたCMSの箇所にはアクセスいただけません。別ユーザーとしてログインをされたい場合は、下記より行えます。'
-    PERMDEFAULT: 認証方法を選択し、CMSにアクセスするために利用する認証情報を入力してください。
+    PERMDEFAULT: '認証方法を選択し、CMSにアクセスするために利用する認証情報を入力してください。'
     PLEASESAVE: '保存してください: 保存してないため更新できません。'
     PreviewButton: プレビュー
     REORGANISATIONSUCCESSFUL: サイトツリーの再編集に成功しました。
     SAVEDUP: 保存済み
     VersionUnknown: 不明
+  LeftAndMain_Menu.ss:
+    Hello: こんにちは！
+    LOGOUT: ログアウト
   LoginAttempt:
     Email: メールアドレス
     IP: IPアドレス
     Status: ステータス
   Member:
-    ADDGROUP: グループを追加
+    ADDGROUP: 'グループを追加'
     BUTTONCHANGEPASSWORD: パスワードの変更
     BUTTONLOGIN: ログイン
     BUTTONLOGINOTHER: 他の誰かとしてログイン
     BUTTONLOSTPASSWORD: パスワードを紛失
     CONFIRMNEWPASSWORD: 新しいパスワードを確認します
     CONFIRMPASSWORD: パスワード（確認のためもう一度）
-    DefaultAdminFirstname: 初期管理者
+    DefaultAdminFirstname: '初期管理者'
     DefaultDateTime: 初期設定
     EMAIL: メールアドレス
-    EMPTYNEWPASSWORD: パスワードが空です。もう一度入力して下さい。
+    EMPTYNEWPASSWORD: 'パスワードが空です。もう一度入力して下さい。'
-    ENTEREMAIL: パスワードをリセットするためにメールアドレスを入力してください。
+    ENTEREMAIL: 'パスワードをリセットするためにメールアドレスを入力してください。'
-    ERRORLOCKEDOUT: あなたのアカウントは何度もログインに失敗したため一時的に利用できなくなっています。20分後に試してください。
+    ERRORLOCKEDOUT: 'あなたのアカウントは何度もログインに失敗したため一時的に利用できなくなっています。20分後に試してください。'
-    ERRORNEWPASSWORD: 入力されたパスワードが一致しません。再度お試しください
+    ERRORNEWPASSWORD: '入力されたパスワードが一致しません。再度お試しください'
-    ERRORPASSWORDNOTMATCH: 登録されているパスワードと一致しません、もう一度入力し直してください
+    ERRORPASSWORDNOTMATCH: '登録されているパスワードと一致しません、もう一度入力し直してください'
-    ERRORWRONGCRED: メールアドレスまたはパスワードが正しくありません、もう一度入力し直してください
+    ERRORWRONGCRED: 'メールアドレスまたはパスワードが正しくありません、もう一度入力し直してください'
     FIRSTNAME: 名
     INTERFACELANG: 画面言語
     INVALIDNEWPASSWORD: '次のパスワードは受け付けることができません: {password}'
@@ -326,7 +333,7 @@ ja_JP:
     SUBJECTPASSWORDCHANGED: パスワードが変わりました。
     SUBJECTPASSWORDRESET: パスワード再発行
     SURNAME: 姓
-    VALIDATIONMEMBEREXISTS: 入力したメールアドレス（%s）は、他のメンバーにすでに使用されています。
+    VALIDATIONMEMBEREXISTS: '入力したメールアドレス（%s）は、他のメンバーにすでに使用されています。'
     ValidationIdentifierFailed: 'Can''t overwrite existing member #{id} with identical identifier ({name} = {value}))'
     WELCOMEBACK: '{firstname}さん、おかえりなさい'
     YOUROLDPASSWORD: 古いパスワード
@@ -334,7 +341,7 @@ ja_JP:
     db_LastVisited: 最終訪問日
     db_Locale: インターフェースの言語地域
     db_LockedOutUntil: DBロックがされています。
-    db_NumVisit: 訪問者数
+    db_NumVisit: '訪問者数'
     db_Password: パスワード
     db_PasswordExpiry: パスワードの有効期限
   MemberAuthenticator:
@@ -368,15 +375,27 @@ ja_JP:
     ResultUpdated: '{count}メンバーを更新しました'
   MemberTableField: null
   ModelAdmin:
+    'APPLY FILTER': フィルタを適用
     DELETE: 削除
     DELETEDRECORDS: '{count}レコードを削除しました。'
     IMPORT: CSVからインポート
     IMPORTEDRECORDS: '{count}レコードを取り込みました。'
-    NOCSVFILE: インポートするためのCSVファイルを参照してください
+    NOCSVFILE: 'インポートするためのCSVファイルを参照してください'
     NOIMPORT: インポートするものがありません。
     RESET: リセット
     Title: 'Data Models'
     UPDATEDRECORDS: '{count}レコードを更新しました。'
+  ModelAdmin_ImportSpec.ss:
+    IMPORTSPECFIELDS: 'データベースカラム'
+    IMPORTSPECLINK: 'Show Specification for %s'
+    IMPORTSPECRELATIONS: 関連
+    IMPORTSPECTITLE: 'Specification for %s'
+  ModelAdmin_Tools.ss:
+    FILTER: フィルタ
+    IMPORT: 取り込み
+  ModelSidebar.ss:
+    IMPORT_TAB_HEADER: 取り込み
+    SEARCHLISTINGS: 検索
   MoneyField:
     FIELDLABELAMOUNT: 総計
     FIELDLABELCURRENCY: 通貨
@@ -385,14 +404,10 @@ ja_JP:
   NumericField:
     VALIDATION: '''{value}''は数値ではありません。このフィールドには数値のみが入力できます。'
   Permission:
-    AdminGroup: 管理者
+    AdminGroup: '管理者'
     CMS_ACCESS_CATEGORY: 'CMS Access'
-    FULLADMINRIGHTS: 完全な管理権
+    FULLADMINRIGHTS: '完全な管理権'
     FULLADMINRIGHTS_HELP: 'Implies and overrules all other assigned permissions.'
-    IMPORTSPECFIELDS: データベースカラム
-    IMPORTSPECLINK: 'Show Specification for %s'
-    IMPORTSPECRELATIONS: 関連
-    IMPORTSPECTITLE: 'Specification for %s'
   PermissionCheckboxSetField:
     AssignedTo: 'assigned to "{title}"'
     FromGroup: 'グループ"{title}"から継承'
@@ -401,24 +416,27 @@ ja_JP:
   Permissions:
     PERMISSIONS_CATEGORY: 役割とアクセス権限
   PhoneNumberField:
-    Back: 戻る
+    VALIDATION: '電話番号を入力してください'
-    VALIDATION: 電話番号を入力してください
+  RelationComplexTableField.ss:
+    ADD: '追加'
+    CSVEXPORT: CSVへ書き出し
+    NOTFOUND: '項目が見つかりませんでした'
   Security:
     ALREADYLOGGEDIN: 'あなたはこのページにアクセスできません。別のアカウントを持っていたら <a href="%s">再ログイン</a>を行ってください。'
-    BUTTONSEND: パスワードリセットのリンクを送信してください
+    BUTTONSEND: 'パスワードリセットのリンクを送信してください'
     CHANGEPASSWORDBELOW: 以下のパスワードを変更できます
     CHANGEPASSWORDHEADER: パスワードを変更しました
-    ENTERNEWPASSWORD: 新しいパスワードを入力してください
+    ENTERNEWPASSWORD: '新しいパスワードを入力してください'
     ERRORPASSWORDPERMISSION: パスワードを変更する為に、ログインしなければなりません！
-    LOGGEDOUT: ログアウトしました。再度ログインする場合は証明書キーを入力してください
+    LOGGEDOUT: 'ログアウトしました。再度ログインする場合は証明書キーを入力してください'
     LOGIN: ログイン
-    NOTEPAGESECURED: このページはセキュリティで保護されております証明書キーを下記に入力してください。こちらからすぐに送信します
+    NOTEPAGESECURED: 'このページはセキュリティで保護されております証明書キーを下記に入力してください。こちらからすぐに送信します'
     NOTERESETLINKINVALID: '<p>The password reset link is invalid or expired.</p><p>You can request a new one <a href="{link1}">here</a> or change your password after you <a href="{link2}">logged in</a>.</p>'
-    NOTERESETPASSWORD: メールアドレスを入力してください、パスワードをリセットするURLを送信致します
+    NOTERESETPASSWORD: 'メールアドレスを入力してください、パスワードをリセットするURLを送信致します'
     PASSWORDSENTHEADER: 'Password reset link sent to ''{email}'''
     PASSWORDSENTTEXT: 'Thank you! A reset link has been sent to ''{email}'', provided an account exists for this email address.'
   SecurityAdmin:
-    ACCESS_HELP: ユーザを閲覧、追加、編集すること、及び、そのユーザに対して権限や役割を割り当てることを許可
+    ACCESS_HELP: 'ユーザを閲覧、追加、編集すること、及び、そのユーザに対して権限や役割を割り当てることを許可'
     APPLY_ROLES: 役割をグループへ適用
     APPLY_ROLES_HELP: 'Ability to edit the roles assigned to a group. Requires the "Access to ''Users'' section" permission.'
     EDITPERMISSIONS: グループの権限を編集
@@ -439,49 +457,51 @@ ja_JP:
     BtnImport: CSVから取り込み
     FileFieldLabel: 'CSVファイル <small>(利用可能な拡張子: *.csv)</small>'
   SilverStripeNavigator:
-    DISPLAYING: Displaying
     Edit: 編集
-    FILTER: フィルタ
+  SimpleImageField:
-    IMPORT: 取り込み
+    NOUPLOAD: 何も画像がアップロードされていません
+  SiteTree:
+    TABMAIN: メイン
+  TableField:
+    ISREQUIRED: 'In %s ''%s'' is required'
+  TableField.ss:
+    ADD: '新しい行を追加'
+    ADDITEM: '%sを追加'
+  TableListField:
+    CSVEXPORT: CSVにエクスポート
+    PRINT: 印刷
+    Print: Print
+    SELECT: 選択：
+  TableListField.ss:
+    NOITEMSFOUND: '項目が見つかりませんでした'
+    SORTASC: '昇順で並べ替え'
+    SORTDESC: '降順で並べ替え'
+  TableListField_PageControls.ss:
+    DISPLAYING: Displaying
     OF: of
     TO: to
     VIEWFIRST: 一番目を表示
     VIEWLAST: 最新を表示
     VIEWNEXT: 次を表示
     VIEWPREVIOUS: 前回を表示
-  SimpleImageField:
-    NOUPLOAD: 何も画像がアップロードされていません
-  SiteTree:
-    TABMAIN: メイン
-  TableField:
-    ADDITEM: '%sを追加'
-    ISREQUIRED: 'In %s ''%s'' is required'
-    NOITEMSFOUND: 項目が見つかりませんでした
-    SORTASC: 昇順で並べ替え
-    SORTDESC: 降順で並べ替え
-  TableListField:
-    CSVEXPORT: CSVにエクスポート
-    PRINT: 印刷
-    Print: Print
-    SELECT: 選択：
   TimeField:
     VALIDATEFORMAT: '正しい時間フォーマット{{format}}を入力してください'
   ToggleField:
     LESS: 減少
-    MORE: 増加
+    MORE: '増加'
   UploadField:
     ATTACHFILE: ファイルを添付
     ATTACHFILES: ファイルを添付
     AttachFile: ファイルを添付
     DELETE: 'Delete from files'
-    DELETEINFO: ファイルストレージから永久にこのファイルは削除されました
+    DELETEINFO: 'ファイルストレージから永久にこのファイルは削除されました'
     DOEDIT: 保存
     DROPFILE: ファイルをドロップ
     DROPFILES: ファイルをドロップ
     Dimensions: Dimensions
     EDIT: 編集
     EDITINFO: このファイルを編集
-    FIELDNOTSET: ファイル情報が見つかりませんでした
+    FIELDNOTSET: 'ファイル情報が見つかりませんでした'
     FROMCOMPUTER: コンピュータから
     FROMCOMPUTERINFO: ファイルから選択
     FROMFILES: ファイルから
@@ -489,7 +509,7 @@ ja_JP:
     MAXNUMBEROFFILESSHORT: '{count}ファイルしかアップロードすることができません'
     REMOVE: 削除
     REMOVEERROR: ファイルの削除におけるエラー
-    REMOVEINFO: ここからこのファイルを削除。ただし、ファイルのストレージからこのファイルの削除はしない。
+    REMOVEINFO: 'ここからこのファイルを削除。ただし、ファイルのストレージからこのファイルの削除はしない。'
     STARTALL: すべて開始
     STARTALLINFO: すべてのアップロードを開始
     Saved: 保存しました

lang/km.yml

@@ -50,6 +50,8 @@ km:
     UNORDERED: 'Unordered list'
     UNORDEREDDESCRIPTION: 'Unordered list'
     UNORDEREDEXAMPLE1: 'unordered item 1'
+  BackLink_Button.ss:
+    Back: Back
   BasicAuth:
     ENTERINFO: 'Please enter a username and password.'
     ERRORNOTADMIN: 'That user is not an administrator.'
@@ -57,9 +59,10 @@ km:
   Boolean:
     0: 'False'
     ANY: Any
-    Hello: Hi
-    LOGOUT: 'Log out'
     1: 'True'
+  CMSLoadingScreen.ss:
+    LOADING: Loading...
+    REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
   CMSMain:
     ACCESS: 'Access to ''{title}'' section'
     ACCESSALLINTERFACES: 'Access to all CMS sections'
@@ -67,6 +70,12 @@ km:
     SAVE: Save
   CMSProfileController:
     MENUTITLE: CMSProfileController
+  ChangePasswordEmail.ss:
+    CHANGEPASSWORDTEXT1: អ្នកបានផ្លាស់ប្តូរពាក្យសំងាត់សំរាប់
+    CHANGEPASSWORDTEXT2: 'You can now use the following credentials to log in:'
+    EMAIL: Email
+    HELLO: Hi
+    PASSWORD: Password
   CheckboxField:
     - 'False'
     - 'True'
@@ -74,6 +83,14 @@ km:
     CLOSEPOPUP: 'Close Popup'
     SUCCESSADD2: 'Added {name}'
     SUCCESSEDIT: 'Saved %s %s %s'
+  ComplexTableField.ss:
+    ADDITEM: 'Add %s'
+    NOITEMSFOUND: 'No items found'
+    SORTASC: 'Sort ascending'
+    SORTDESC: 'Sort descending'
+  ComplexTableField_popup.ss:
+    NEXT: Next
+    PREVIOUS: Previous
   ConfirmedPasswordField:
     ATLEAST: 'Passwords must be at least {min} characters long.'
     BETWEEN: 'Passwords must be {min} to {max} characters long.'
@@ -111,10 +128,7 @@ km:
     VALIDDATEMAXDATE: 'Your date has to be older or matching the maximum allowed date ({date})'
     VALIDDATEMINDATE: 'Your date has to be newer or matching the minimum allowed date ({date})'
   Director:
-    ADD: Add
-    CSVEXPORT: 'Export to CSV'
     INVALID_REQUEST: 'Invalid request'
-    NOTFOUND: 'No items found'
   DropdownField:
     CHOOSE: (ជ្រើសរើស)
   EmailField:
@@ -124,8 +138,6 @@ km:
     SINGULARNAME: 'Email Bounce Record'
   Enum:
     ANY: Any
-    LOADING: Loading...
-    REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
   File:
     Content: Content
     Filename: Filename
@@ -150,13 +162,17 @@ km:
     FROMFILESTORE: 'From the File Store'
     NOSOURCE: 'Please select a source file to attach'
     REPLACE: 'Replace {type}'
+  FileIFrameField_iframe.ss:
+    TITLE: 'Image Uploading Iframe'
   Filesystem:
-    IMPORT_TAB_HEADER: Import
-    SEARCHLISTINGS: Search
     SYNCRESULTS: 'Sync complete: {createdcount} items created, {deletedcount} items deleted'
+  ForgotPasswordEmail.ss:
+    HELLO: Hi
+    TEXT1: 'Here is your'
+    TEXT2: 'password reset link'
+    TEXT3: for
   Form:
     FIELDISREQUIRED: '%s is required'
-    TITLE: 'Image Uploading Iframe'
     VALIDATIONCREDITNUMBER: 'Please ensure you have entered the {number} credit card number correctly'
     VALIDATIONNOTUNIQUE: 'The value entered is not unique'
     VALIDATIONPASSWORDSDONTMATCH: 'Passwords don''t match'
@@ -187,37 +203,26 @@ km:
     ResetFilter: Reset
   GridFieldAction_Delete:
     DeletePermissionsFailure: 'No delete permissions'
-    NEXT: Next
-    PREVIOUS: Previous
   GridFieldDetailForm:
     Create: Create
     Delete: Delete
     DeletePermissionsFailure: 'No delete permissions'
     Deleted: 'Deleted %s %s'
-    HELLO: Hi
     Save: Save
     Saved: 'Saved %s %s'
-    TEXT1: 'Here is your'
+  GridFieldItemEditView.ss: null
-    TEXT2: 'password reset link'
-    TEXT3: for
   Group:
     AddRole: 'Add a role for this group'
-    CHANGEPASSWORDTEXT1: អ្នកបានផ្លាស់ប្តូរពាក្យសំងាត់សំរាប់
-    CHANGEPASSWORDTEXT2: 'You can now use the following credentials to log in:'
     Code: លេខកូដក្រុម
     DefaultGroupTitleAdministrators: Administrators
     DefaultGroupTitleContentAuthors: 'Content Authors'
     Description: Description
-    EMAIL: Email
     GroupReminder: 'If you choose a parent group, this group will take all it''s roles'
-    HELLO: Hi
+    Locked: 'មិនអាចប្រើ'
-    Locked: មិនអាចប្រើ
     NoRoles: 'No roles found'
-    PASSWORD: Password
+    Parent: 'ចំណាត់ក្រុមដើម'
-    Parent: ចំណាត់ក្រុមដើម
     RolesAddEditLink: 'Manage roles'
     Sort: 'Sort Order'
-    TITLE: 'Image Uploading Iframe'
     has_many_Permissions: ការអនុញ្ញាតិ្ត
     many_many_Members: សមាជិក
   GroupImportForm:
@@ -275,10 +280,9 @@ km:
     UpdateMEDIA: 'Update Media'
   ImageField:
     IMAGE: Image
-  Image_iframe.ss: 'ChangePasswordEmail.ss:  BackLink_Button.ss:  CMSLoadingScreen.ss:  RelationComplexTableField.ss:  ForgotPasswordEmail.ss:    APPLY FILTER: "Apply Filter"  GridFieldItemEditView.ss:    Go back: "Go back"  ModelSidebar.ss:  TableListField_PageControls.ss:  ModelAdmin_Tools.ss:  ComplexTableField_popup.ss:  TableField.ss:  FileIFrameField_iframe.ss:  ComplexTableField.ss:  TableListField.ss:  ModelAdmin_ImportSpec.ss:  LeftAndMain_Menu.ss:'
+  Image_iframe.ss:
+    TITLE: 'Image Uploading Iframe'
   LeftAndMain:
-    ADD: 'Add a new row'
-    ADDITEM: 'Add %s'
     CANT_REORGANISE: 'You do not have permission to alter Top level pages. Your change was not saved.'
     DELETED: Deleted.
     DropdownBatchActionsDefault: Actions
@@ -292,6 +296,9 @@ km:
     REORGANISATIONSUCCESSFUL: 'Reorganised the site tree successfully.'
     SAVEDUP: Saved.
     VersionUnknown: unknown
+  LeftAndMain_Menu.ss:
+    Hello: Hi
+    LOGOUT: 'Log out'
   LoginAttempt:
     Email: 'Email Address'
     IP: 'IP Address'
@@ -330,13 +337,13 @@ km:
     ValidationIdentifierFailed: 'Can''t overwrite existing member #{id} with identical identifier ({name} = {value}))'
     WELCOMEBACK: 'Welcome Back, {firstname}'
     YOUROLDPASSWORD: 'Your old password'
-    belongs_many_many_Groups: ចំណាត់ក្រុម
+    belongs_many_many_Groups: 'ចំណាត់ក្រុម'
     db_LastVisited: 'Last Visited Date'
     db_Locale: 'Interface Locale'
-    db_LockedOutUntil: ដោះចេញរហូតដល់
+    db_LockedOutUntil: 'ដោះចេញរហូតដល់'
     db_NumVisit: 'Number of Visits'
     db_Password: Password
-    db_PasswordExpiry: កាលបរិច្ឆេទផុតកំណត់ពាក្យសំងាត់
+    db_PasswordExpiry: 'កាលបរិច្ឆេទផុតកំណត់ពាក្យសំងាត់'
   MemberAuthenticator:
     TITLE: 'E-mail & Password'
   MemberDatetimeOptionsetField:
@@ -368,6 +375,7 @@ km:
     ResultUpdated: 'Updated {count} members'
   MemberTableField: null
   ModelAdmin:
+    'APPLY FILTER': 'Apply Filter'
     DELETE: Delete
     DELETEDRECORDS: 'Deleted {count} records.'
     IMPORT: 'Import from CSV'
@@ -377,6 +385,17 @@ km:
     RESET: Reset
     Title: 'Data Models'
     UPDATEDRECORDS: 'Updated {count} records.'
+  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
   MoneyField:
     FIELDLABELAMOUNT: Amount
     FIELDLABELCURRENCY: Currency
@@ -389,10 +408,6 @@ km:
     CMS_ACCESS_CATEGORY: 'CMS Access'
     FULLADMINRIGHTS: 'Full administrative rights'
     FULLADMINRIGHTS_HELP: 'Implies and overrules all other assigned permissions.'
-    IMPORTSPECFIELDS: 'Database columns'
-    IMPORTSPECLINK: 'Show Specification for %s'
-    IMPORTSPECRELATIONS: Relations
-    IMPORTSPECTITLE: 'Specification for %s'
   PermissionCheckboxSetField:
     AssignedTo: 'assigned to "{title}"'
     FromGroup: 'inherited from group "{title}"'
@@ -401,8 +416,11 @@ km:
   Permissions:
     PERMISSIONS_CATEGORY: 'Roles and access permissions'
   PhoneNumberField:
-    Back: Back
     VALIDATION: 'Please enter a valid phone number'
+  RelationComplexTableField.ss:
+    ADD: Add
+    CSVEXPORT: 'Export to CSV'
+    NOTFOUND: 'No items found'
   Security:
     ALREADYLOGGEDIN: 'អ្នកមិនអាចមើលទំព័រនេះបានទេ។ សូមប្រើប្រាស់ព័ត៌មានសំរាប់ថ្មី មួយទៀតសំរាប់ចូលមើល។ សូមចូលតាម <a href="%s">'
     BUTTONSEND: 'Send me the password reset link'
@@ -439,31 +457,33 @@ km:
     BtnImport: 'Import from CSV'
     FileFieldLabel: 'CSV File <small>(Allowed extensions: *.csv)</small>'
   SilverStripeNavigator:
-    DISPLAYING: Displaying
     Edit: Edit
-    FILTER: Filter
+  SimpleImageField:
-    IMPORT: Import
+    NOUPLOAD: 'No Image Uploaded'
+  SiteTree:
+    TABMAIN: Main
+  TableField:
+    ISREQUIRED: 'In %s ''%s'' is required'
+  TableField.ss:
+    ADD: 'Add a new row'
+    ADDITEM: 'Add %s'
+  TableListField:
+    CSVEXPORT: 'Export to CSV'
+    PRINT: Print
+    Print: Print
+    SELECT: 'Select:'
+  TableListField.ss:
+    NOITEMSFOUND: 'No items found'
+    SORTASC: 'Sort in ascending order'
+    SORTDESC: 'Sort in descending order'
+  TableListField_PageControls.ss:
+    DISPLAYING: Displaying
     OF: of
     TO: to
     VIEWFIRST: 'View first'
     VIEWLAST: 'View last'
     VIEWNEXT: 'View next'
     VIEWPREVIOUS: 'View previous'
-  SimpleImageField:
-    NOUPLOAD: 'No Image Uploaded'
-  SiteTree:
-    TABMAIN: Main
-  TableField:
-    ADDITEM: 'Add %s'
-    ISREQUIRED: 'In %s ''%s'' is required'
-    NOITEMSFOUND: 'No items found'
-    SORTASC: 'Sort in ascending order'
-    SORTDESC: 'Sort in descending order'
-  TableListField:
-    CSVEXPORT: 'Export to CSV'
-    PRINT: Print
-    Print: Print
-    SELECT: 'Select:'
   TimeField:
     VALIDATEFORMAT: 'Please enter a valid time format ({format})'
   ToggleField:

lang/lt.yml

@@ -50,6 +50,8 @@ lt:
     UNORDERED: 'Nerūšiuotas sąrašas'
     UNORDEREDDESCRIPTION: 'Nerūšiuotas sąrašas'
     UNORDEREDEXAMPLE1: 'nerūšiuota prekė 1'
+  BackLink_Button.ss:
+    Back: Back
   BasicAuth:
     ENTERINFO: 'Įveskite vartotojo vardą ir slaptažodį'
     ERRORNOTADMIN: 'Vartotojas nėra administratorius'
@@ -57,9 +59,10 @@ lt:
   Boolean:
     0: Ne
     ANY: 'Bet koks'
-    Hello: Hi
-    LOGOUT: 'Log out'
     1: Taip
+  CMSLoadingScreen.ss:
+    LOADING: Loading...
+    REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
   CMSMain:
     ACCESS: 'Access to ''{title}'' section'
     ACCESSALLINTERFACES: 'Access to all CMS sections'
@@ -67,6 +70,12 @@ lt:
     SAVE: Išsaugoti
   CMSProfileController:
     MENUTITLE: CMSProfileController
+  ChangePasswordEmail.ss:
+    CHANGEPASSWORDTEXT1: 'Jūs pakeitėte slaptažodį'
+    CHANGEPASSWORDTEXT2: 'Nuo šiol galite naudoti šiuos prisijungimo duomenis:'
+    EMAIL: 'E. paštas'
+    HELLO: Sveiki
+    PASSWORD: Slaptažodis
   CheckboxField:
     - Ne
     - Taip
@@ -74,6 +83,14 @@ lt:
     CLOSEPOPUP: Uždaryti
     SUCCESSADD2: 'Added {name}'
     SUCCESSEDIT: 'Išsaugota %s %s %s'
+  ComplexTableField.ss:
+    ADDITEM: 'Add %s'
+    NOITEMSFOUND: 'No items found'
+    SORTASC: 'Rūšiuoti A-Z'
+    SORTDESC: 'Rūšiuoti Z-A'
+  ComplexTableField_popup.ss:
+    NEXT: Sekantis
+    PREVIOUS: Ankstesnis
   ConfirmedPasswordField:
     ATLEAST: 'Passwords must be at least {min} characters long.'
     BETWEEN: 'Passwords must be {min} to {max} characters long.'
@@ -92,7 +109,7 @@ lt:
   Date:
     DAY: diena
     DAYS: dienas
-    HOUR: valandą
+    HOUR: 'valandą'
     HOURS: valandas
     MIN: minutę
     MINS: minutes
@@ -111,10 +128,7 @@ lt:
     VALIDDATEMAXDATE: 'Your date has to be older or matching the maximum allowed date ({date})'
     VALIDDATEMINDATE: 'Your date has to be newer or matching the minimum allowed date ({date})'
   Director:
-    ADD: Pridėti
-    CSVEXPORT: 'Export to CSV'
     INVALID_REQUEST: 'Invalid request'
-    NOTFOUND: 'No items found'
   DropdownField:
     CHOOSE: (Pasirinkti)
   EmailField:
@@ -124,8 +138,6 @@ lt:
     SINGULARNAME: 'El.Pašto persiuntimų įrašas'
   Enum:
     ANY: 'Bet koks'
-    LOADING: Loading...
-    REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
   File:
     Content: Turinys
     Filename: 'Bylos pavadinimas'
@@ -150,13 +162,17 @@ lt:
     FROMFILESTORE: 'Š failų saugyklos '
     NOSOURCE: 'Please select a source file to attach'
     REPLACE: 'Replace {type}'
+  FileIFrameField_iframe.ss:
+    TITLE: 'Image Uploading Iframe'
   Filesystem:
-    IMPORT_TAB_HEADER: Import
-    SEARCHLISTINGS: Search
     SYNCRESULTS: 'Sync complete: {createdcount} items created, {deletedcount} items deleted'
+  ForgotPasswordEmail.ss:
+    HELLO: Sveiki
+    TEXT1: 'Štai Jūsų'
+    TEXT2: 'slaptažodžio atstatymo nuoroda'
+    TEXT3: kam
   Form:
     FIELDISREQUIRED: '%s yra būtinas'
-    TITLE: 'Image Uploading Iframe'
     VALIDATIONCREDITNUMBER: 'Please ensure you have entered the {number} credit card number correctly'
     VALIDATIONNOTUNIQUE: 'Įvesta reikšmė nėra unikali'
     VALIDATIONPASSWORDSDONTMATCH: 'Nesutampa slaptažodžiai'
@@ -187,37 +203,26 @@ lt:
     ResetFilter: Reset
   GridFieldAction_Delete:
     DeletePermissionsFailure: 'No delete permissions'
-    NEXT: Sekantis
-    PREVIOUS: Ankstesnis
   GridFieldDetailForm:
     Create: Create
     Delete: Delete
     DeletePermissionsFailure: 'No delete permissions'
     Deleted: 'Deleted %s %s'
-    HELLO: Sveiki
     Save: Save
     Saved: 'Saved %s %s'
-    TEXT1: 'Štai Jūsų'
+  GridFieldItemEditView.ss: null
-    TEXT2: 'slaptažodžio atstatymo nuoroda'
-    TEXT3: kam
   Group:
     AddRole: 'Add a role for this group'
-    CHANGEPASSWORDTEXT1: 'Jūs pakeitėte slaptažodį'
-    CHANGEPASSWORDTEXT2: 'Nuo šiol galite naudoti šiuos prisijungimo duomenis:'
     Code: 'Grupės kodas'
     DefaultGroupTitleAdministrators: Administrators
     DefaultGroupTitleContentAuthors: 'Content Authors'
     Description: Aprašymas
-    EMAIL: 'E. paštas'
     GroupReminder: 'If you choose a parent group, this group will take all it''s roles'
-    HELLO: Sveiki
     Locked: 'Užrakinta?'
     NoRoles: 'No roles found'
-    PASSWORD: Slaptažodis
     Parent: 'Priklauso grupei'
     RolesAddEditLink: 'Manage roles'
     Sort: 'Rūšiavimo tvarka'
-    TITLE: 'Atvaizdo siuntimas iframe'
     has_many_Permissions: Leidimai
     many_many_Members: Nariai
   GroupImportForm:
@@ -275,10 +280,9 @@ lt:
     UpdateMEDIA: 'Update Media'
   ImageField:
     IMAGE: Paveikslėlis
-  Image_iframe.ss: 'ChangePasswordEmail.ss:  BackLink_Button.ss:  CMSLoadingScreen.ss:  RelationComplexTableField.ss:  ForgotPasswordEmail.ss:    APPLY FILTER: "Apply Filter"  GridFieldItemEditView.ss:    Go back: "Go back"  ModelSidebar.ss:  TableListField_PageControls.ss:  ModelAdmin_Tools.ss:  ComplexTableField_popup.ss:  TableField.ss:  FileIFrameField_iframe.ss:  ComplexTableField.ss:  TableListField.ss:  ModelAdmin_ImportSpec.ss:  LeftAndMain_Menu.ss:'
+  Image_iframe.ss:
+    TITLE: 'Atvaizdo siuntimas iframe'
   LeftAndMain:
-    ADD: 'Pridėti naują eilutę'
-    ADDITEM: 'Add %s'
     CANT_REORGANISE: 'You do not have permission to alter Top level pages. Your change was not saved.'
     DELETED: Deleted.
     DropdownBatchActionsDefault: Actions
@@ -292,6 +296,9 @@ lt:
     REORGANISATIONSUCCESSFUL: 'Reorganised the site tree successfully.'
     SAVEDUP: Saved.
     VersionUnknown: unknown
+  LeftAndMain_Menu.ss:
+    Hello: Hi
+    LOGOUT: 'Log out'
   LoginAttempt:
     Email: 'E. pašto adresas'
     IP: 'IP adresas'
@@ -368,6 +375,7 @@ lt:
     ResultUpdated: 'Updated {count} members'
   MemberTableField: null
   ModelAdmin:
+    'APPLY FILTER': 'Apply Filter'
     DELETE: Delete
     DELETEDRECORDS: 'Deleted {count} records.'
     IMPORT: 'Import from CSV'
@@ -377,6 +385,17 @@ lt:
     RESET: Reset
     Title: 'Data Models'
     UPDATEDRECORDS: 'Updated {count} records.'
+  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
   MoneyField:
     FIELDLABELAMOUNT: Kiekis
     FIELDLABELCURRENCY: Valiuta
@@ -389,10 +408,6 @@ lt:
     CMS_ACCESS_CATEGORY: 'CMS Access'
     FULLADMINRIGHTS: 'Pilnos administravimo teisės'
     FULLADMINRIGHTS_HELP: 'Implies and overrules all other assigned permissions.'
-    IMPORTSPECFIELDS: 'Database columns'
-    IMPORTSPECLINK: 'Show Specification for %s'
-    IMPORTSPECRELATIONS: Relations
-    IMPORTSPECTITLE: 'Specification for %s'
   PermissionCheckboxSetField:
     AssignedTo: 'assigned to "{title}"'
     FromGroup: 'inherited from group "{title}"'
@@ -401,8 +416,11 @@ lt:
   Permissions:
     PERMISSIONS_CATEGORY: 'Roles and access permissions'
   PhoneNumberField:
-    Back: Back
     VALIDATION: 'Įveskite teisingą telefono numerį'
+  RelationComplexTableField.ss:
+    ADD: Pridėti
+    CSVEXPORT: 'Export to CSV'
+    NOTFOUND: 'No items found'
   Security:
     ALREADYLOGGEDIN: 'Jūs neturite prieigos prie šio puslapio. Jeigu norite prisijungti kaip kitas vartotojas, <a href="%s">spauskite čia</a>.'
     BUTTONSEND: 'Atsiųsti slaptažodžio atstatymo nuorodą'
@@ -439,31 +457,33 @@ lt:
     BtnImport: 'Import from CSV'
     FileFieldLabel: 'CSV File <small>(Allowed extensions: *.csv)</small>'
   SilverStripeNavigator:
-    DISPLAYING: Displaying
     Edit: Edit
-    FILTER: Filter
+  SimpleImageField:
-    IMPORT: Import
+    NOUPLOAD: 'Neįkrauta jokių paveikslėlių'
+  SiteTree:
+    TABMAIN: Pagrindinis
+  TableField:
+    ISREQUIRED: 'In %s ''%s'' is required'
+  TableField.ss:
+    ADD: 'Pridėti naują eilutę'
+    ADDITEM: 'Add %s'
+  TableListField:
+    CSVEXPORT: 'Ekportuoti į CSV'
+    PRINT: Spausdinti
+    Print: Print
+    SELECT: 'Select:'
+  TableListField.ss:
+    NOITEMSFOUND: 'No items found'
+    SORTASC: 'Rūšiuoti didėjimo tvarka'
+    SORTDESC: 'Rūšiuoti mažėjimo tvarka'
+  TableListField_PageControls.ss:
+    DISPLAYING: Displaying
     OF: of
     TO: to
     VIEWFIRST: 'Žiūrėti pirmą'
     VIEWLAST: 'Žiūrėti paskutinį'
     VIEWNEXT: 'Žiūrėti sekantį'
     VIEWPREVIOUS: 'Žiūrėti ankstesnį'
-  SimpleImageField:
-    NOUPLOAD: 'Neįkrauta jokių paveikslėlių'
-  SiteTree:
-    TABMAIN: Pagrindinis
-  TableField:
-    ADDITEM: 'Add %s'
-    ISREQUIRED: 'In %s ''%s'' is required'
-    NOITEMSFOUND: 'No items found'
-    SORTASC: 'Rūšiuoti didėjimo tvarka'
-    SORTDESC: 'Rūšiuoti mažėjimo tvarka'
-  TableListField:
-    CSVEXPORT: 'Ekportuoti į CSV'
-    PRINT: Spausdinti
-    Print: Print
-    SELECT: 'Select:'
   TimeField:
     VALIDATEFORMAT: 'Please enter a valid time format ({format})'
   ToggleField:

lang/lv.yml

@@ -50,6 +50,8 @@ lv:
     UNORDERED: 'Nesakārtots saraksts'
     UNORDEREDDESCRIPTION: 'Nesakārtots saraksts'
     UNORDEREDEXAMPLE1: 'nesakārtots elements 1'
+  BackLink_Button.ss:
+    Back: Back
   BasicAuth:
     ENTERINFO: 'Lūdz ievadiet lietotājvārdu un paroli.'
     ERRORNOTADMIN: 'Šis lietotājs nav administrators.'
@@ -57,9 +59,10 @@ lv:
   Boolean:
     0: Nē
     ANY: Jebkurš
-    Hello: Hi
-    LOGOUT: 'Log out'
     1: Jā
+  CMSLoadingScreen.ss:
+    LOADING: Loading...
+    REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
   CMSMain:
     ACCESS: 'Access to ''{title}'' section'
     ACCESSALLINTERFACES: 'Access to all CMS sections'
@@ -67,6 +70,12 @@ lv:
     SAVE: Saglabāt
   CMSProfileController:
     MENUTITLE: CMSProfileController
+  ChangePasswordEmail.ss:
+    CHANGEPASSWORDTEXT1: 'Jūs nomainījāt savu paroli '
+    CHANGEPASSWORDTEXT2: 'Lai pieslēgtos, izmantojiet sekojošus datus:'
+    EMAIL: E-pasts
+    HELLO: Sveiki
+    PASSWORD: Parole
   CheckboxField:
     - Nē
     - Jā
@@ -74,6 +83,14 @@ lv:
     CLOSEPOPUP: 'Aizvērt izlēcošo logu'
     SUCCESSADD2: 'Added {name}'
     SUCCESSEDIT: 'Saglabāts %s %s %s'
+  ComplexTableField.ss:
+    ADDITEM: 'Add %s'
+    NOITEMSFOUND: 'No items found'
+    SORTASC: 'Kārtot augoši'
+    SORTDESC: 'Kārtot dilstoši'
+  ComplexTableField_popup.ss:
+    NEXT: Nākamais
+    PREVIOUS: Iepriekšējais
   ConfirmedPasswordField:
     ATLEAST: 'Passwords must be at least {min} characters long.'
     BETWEEN: 'Passwords must be {min} to {max} characters long.'
@@ -111,10 +128,7 @@ lv:
     VALIDDATEMAXDATE: 'Your date has to be older or matching the maximum allowed date ({date})'
     VALIDDATEMINDATE: 'Your date has to be newer or matching the minimum allowed date ({date})'
   Director:
-    ADD: Pievienot
-    CSVEXPORT: 'Export to CSV'
     INVALID_REQUEST: 'Invalid request'
-    NOTFOUND: 'No items found'
   DropdownField:
     CHOOSE: (Izvēlieties)
   EmailField:
@@ -124,8 +138,6 @@ lv:
     SINGULARNAME: 'Atgriezts e-pasta ieraksts'
   Enum:
     ANY: Jebkuru
-    LOADING: Loading...
-    REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
   File:
     Content: Saturs
     Filename: 'Faila nosaukums'
@@ -150,13 +162,17 @@ lv:
     FROMFILESTORE: 'No failu glabātuves'
     NOSOURCE: 'Lūdzu izvēlieties avota failu, kuru pievienot'
     REPLACE: 'Replace {type}'
+  FileIFrameField_iframe.ss:
+    TITLE: 'Image Uploading Iframe'
   Filesystem:
-    IMPORT_TAB_HEADER: Import
-    SEARCHLISTINGS: Search
     SYNCRESULTS: 'Sync complete: {createdcount} items created, {deletedcount} items deleted'
+  ForgotPasswordEmail.ss:
+    HELLO: Sveiki
+    TEXT1: 'Šeit ir Jūsu'
+    TEXT2: 'paroles atiestatīšanas saite'
+    TEXT3: ' '
   Form:
     FIELDISREQUIRED: '%s ir obligāti aizpildāms.'
-    TITLE: 'Image Uploading Iframe'
     VALIDATIONCREDITNUMBER: 'Please ensure you have entered the {number} credit card number correctly'
     VALIDATIONNOTUNIQUE: 'Ievadītā vērtība nav unikāla'
     VALIDATIONPASSWORDSDONTMATCH: 'Paroles nesakrīt'
@@ -187,37 +203,26 @@ lv:
     ResetFilter: Reset
   GridFieldAction_Delete:
     DeletePermissionsFailure: 'No delete permissions'
-    NEXT: Nākamais
-    PREVIOUS: Iepriekšējais
   GridFieldDetailForm:
     Create: Create
     Delete: Delete
     DeletePermissionsFailure: 'No delete permissions'
     Deleted: 'Deleted %s %s'
-    HELLO: Sveiki
     Save: Save
     Saved: 'Saved %s %s'
-    TEXT1: 'Šeit ir Jūsu'
+  GridFieldItemEditView.ss: null
-    TEXT2: 'paroles atiestatīšanas saite'
-    TEXT3: ' '
   Group:
     AddRole: 'Add a role for this group'
-    CHANGEPASSWORDTEXT1: 'Jūs nomainījāt savu paroli '
-    CHANGEPASSWORDTEXT2: 'Lai pieslēgtos, izmantojiet sekojošus datus:'
     Code: 'Grupas kods'
     DefaultGroupTitleAdministrators: Administratori
     DefaultGroupTitleContentAuthors: 'Satura autori'
     Description: Apraksts
-    EMAIL: E-pasts
     GroupReminder: 'If you choose a parent group, this group will take all it''s roles'
-    HELLO: Sveiki
     Locked: 'Slēgt?'
     NoRoles: 'No roles found'
-    PASSWORD: Parole
     Parent: 'Grupas vecāks'
     RolesAddEditLink: 'Manage roles'
     Sort: 'Kārtošanas secība'
-    TITLE: 'Attēla augšupielādes iframe bloks'
     has_many_Permissions: Atļaujas
     many_many_Members: Dalībnieki
   GroupImportForm:
@@ -275,10 +280,9 @@ lv:
     UpdateMEDIA: 'Update Media'
   ImageField:
     IMAGE: Attēls
-  Image_iframe.ss: 'ChangePasswordEmail.ss:  BackLink_Button.ss:  CMSLoadingScreen.ss:  RelationComplexTableField.ss:  ForgotPasswordEmail.ss:    APPLY FILTER: "Apply Filter"  GridFieldItemEditView.ss:    Go back: "Go back"  ModelSidebar.ss:  TableListField_PageControls.ss:  ModelAdmin_Tools.ss:  ComplexTableField_popup.ss:  TableField.ss:  FileIFrameField_iframe.ss:  ComplexTableField.ss:  TableListField.ss:  ModelAdmin_ImportSpec.ss:  LeftAndMain_Menu.ss:'
+  Image_iframe.ss:
+    TITLE: 'Attēla augšupielādes iframe bloks'
   LeftAndMain:
-    ADD: 'PIevienot jaunu rindu'
-    ADDITEM: 'Add %s'
     CANT_REORGANISE: 'You do not have permission to alter Top level pages. Your change was not saved.'
     DELETED: Deleted.
     DropdownBatchActionsDefault: Actions
@@ -292,6 +296,9 @@ lv:
     REORGANISATIONSUCCESSFUL: 'Reorganised the site tree successfully.'
     SAVEDUP: Saved.
     VersionUnknown: unknown
+  LeftAndMain_Menu.ss:
+    Hello: Hi
+    LOGOUT: 'Log out'
   LoginAttempt:
     Email: 'E-pasta adrese'
     IP: 'IP Adrese'
@@ -368,6 +375,7 @@ lv:
     ResultUpdated: 'Updated {count} members'
   MemberTableField: null
   ModelAdmin:
+    'APPLY FILTER': 'Apply Filter'
     DELETE: Delete
     DELETEDRECORDS: 'Deleted {count} records.'
     IMPORT: 'Import from CSV'
@@ -377,6 +385,17 @@ lv:
     RESET: Reset
     Title: 'Data Models'
     UPDATEDRECORDS: 'Updated {count} records.'
+  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
   MoneyField:
     FIELDLABELAMOUNT: Skaits
     FIELDLABELCURRENCY: Valūta
@@ -389,10 +408,6 @@ lv:
     CMS_ACCESS_CATEGORY: 'CMS Access'
     FULLADMINRIGHTS: 'Pilnas administratora tiesības'
     FULLADMINRIGHTS_HELP: 'Ietver un pārraksta visas pārējās piesaistītās atļaujas'
-    IMPORTSPECFIELDS: 'Database columns'
-    IMPORTSPECLINK: 'Show Specification for %s'
-    IMPORTSPECRELATIONS: Relations
-    IMPORTSPECTITLE: 'Specification for %s'
   PermissionCheckboxSetField:
     AssignedTo: 'assigned to "{title}"'
     FromGroup: 'inherited from group "{title}"'
@@ -401,8 +416,11 @@ lv:
   Permissions:
     PERMISSIONS_CATEGORY: 'Lomu un piekļuves atļaujas'
   PhoneNumberField:
-    Back: Back
     VALIDATION: 'Lūdzu ievadiet derīgu tālruņa numuru'
+  RelationComplexTableField.ss:
+    ADD: Pievienot
+    CSVEXPORT: 'Export to CSV'
+    NOTFOUND: 'No items found'
   Security:
     ALREADYLOGGEDIN: 'Jums nav piekļuves tiesību šai lapai. Ja jums ir izveidots cits konts ar kuru ir iespējams piekļūt šai lapai, tad jūs varat <a href="%s">atkārtoti pieslēgties</a>. '
     BUTTONSEND: 'Nosūtīt man paroles atiestatīšanas saiti'
@@ -439,31 +457,33 @@ lv:
     BtnImport: 'Import from CSV'
     FileFieldLabel: 'CSV File <small>(Allowed extensions: *.csv)</small>'
   SilverStripeNavigator:
-    DISPLAYING: Displaying
     Edit: Edit
-    FILTER: Filter
+  SimpleImageField:
-    IMPORT: Import
+    NOUPLOAD: 'Netika augšupielādēts neviens attēls'
+  SiteTree:
+    TABMAIN: Sākums
+  TableField:
+    ISREQUIRED: 'In %s ''%s'' is required'
+  TableField.ss:
+    ADD: 'PIevienot jaunu rindu'
+    ADDITEM: 'Add %s'
+  TableListField:
+    CSVEXPORT: 'Eksportēt uz CSV'
+    PRINT: Drukāt
+    Print: Print
+    SELECT: 'Izvēlēties:'
+  TableListField.ss:
+    NOITEMSFOUND: 'No items found'
+    SORTASC: 'Kārtot augošā secībā'
+    SORTDESC: 'Kārtot dilstošā secībā'
+  TableListField_PageControls.ss:
+    DISPLAYING: Displaying
     OF: of
     TO: to
     VIEWFIRST: 'Skatīt pirmo'
     VIEWLAST: 'Skatīt pēdējo'
     VIEWNEXT: 'Skatīt nākamo'
     VIEWPREVIOUS: 'Skatīt iepriekšējo'
-  SimpleImageField:
-    NOUPLOAD: 'Netika augšupielādēts neviens attēls'
-  SiteTree:
-    TABMAIN: Sākums
-  TableField:
-    ADDITEM: 'Add %s'
-    ISREQUIRED: 'In %s ''%s'' is required'
-    NOITEMSFOUND: 'No items found'
-    SORTASC: 'Kārtot augošā secībā'
-    SORTDESC: 'Kārtot dilstošā secībā'
-  TableListField:
-    CSVEXPORT: 'Eksportēt uz CSV'
-    PRINT: Drukāt
-    Print: Print
-    SELECT: 'Izvēlēties:'
   TimeField:
     VALIDATEFORMAT: 'Please enter a valid time format ({format})'
   ToggleField:

lang/mi_NZ.yml

@@ -50,6 +50,8 @@ mi_NZ:
     UNORDERED: 'Rārangi kāore i raupapatia'
     UNORDEREDDESCRIPTION: 'Rārangi kāore i raupapatia'
     UNORDEREDEXAMPLE1: 'tūemi 1 kāore i raupapatia'
+  BackLink_Button.ss:
+    Back: Hoki
   BasicAuth:
     ENTERINFO: 'Tāurua he ingoa kaiwhakamahi me te kupuhipa'
     ERRORNOTADMIN: 'Ehara tēnā kaiwhakamahi i te kaiwhakahaere'
@@ -57,9 +59,10 @@ mi_NZ:
   Boolean:
     0: Hē
     ANY: 'Ko tētahi'
-    Hello: 'Kia ora'
-    LOGOUT: Takiputa
     1: Pono
+  CMSLoadingScreen.ss:
+    LOADING: 'Uta ana...'
+    REQUIREJS: 'Ka hiahia te CMS kia whakahohea te JavaScript'
   CMSMain:
     ACCESS: 'Uru ki te wāhanga ''{title}'''
     ACCESSALLINTERFACES: 'Uru ki ngā wāhanga CMS katoa'
@@ -67,6 +70,12 @@ mi_NZ:
     SAVE: Tiaki
   CMSProfileController:
     MENUTITLE: PūwhakamanaKōtahaCMS
+  ChangePasswordEmail.ss:
+    CHANGEPASSWORDTEXT1: 'Kua hurihia tō kupuhipa mō'
+    CHANGEPASSWORDTEXT2: 'Ka taea te whakamahi i ēnei taipitopito tuakiri ināianei hei takiuru:'
+    EMAIL: Īmēra
+    HELLO: 'Kia ora'
+    PASSWORD: Kupuhipa
   CheckboxField:
     - Hē
     - Pono
@@ -74,6 +83,14 @@ mi_NZ:
     CLOSEPOPUP: 'Kati Pakū-Ake'
     SUCCESSADD2: 'Kua tāpiritia a  {name}'
     SUCCESSEDIT: 'I tiakina a %s %s %s'
+  ComplexTableField.ss:
+    ADDITEM: 'Tāpiri %s'
+    NOITEMSFOUND: 'Kāore i kitea he tūemi'
+    SORTASC: 'Kōmaka aupiki'
+    SORTDESC: 'Kōmaka auheke'
+  ComplexTableField_popup.ss:
+    NEXT: Panuku
+    PREVIOUS: Tōmua
   ConfirmedPasswordField:
     ATLEAST: 'Kia {min} pūāhua i te iti rawa te roa o ngā kupuhipa.'
     BETWEEN: 'Me noho te roa o ngā kupuhipa i waenga i te {min} ki te {max} ngā pūāhua'
@@ -111,10 +128,7 @@ mi_NZ:
     VALIDDATEMAXDATE: 'Me tawhito ake tō rā, kia ōrite rānei ki te rā mōrahi ({date}) kua whakaaetia'
     VALIDDATEMINDATE: 'Me hōu ake tō rā, kia ōrite rānei ki te rā moroiti ({date}) kua whakaaetia'
   Director:
-    ADD: Tāpiri
-    CSVEXPORT: 'Kaweatu ki CSV'
     INVALID_REQUEST: 'Tono muhu'
-    NOTFOUND: 'Kāore i kitea he tūemi'
   DropdownField:
     CHOOSE: (Kōwhiri)
   EmailField:
@@ -124,8 +138,6 @@ mi_NZ:
     SINGULARNAME: 'Pūrongo Tāwhana Īmēra'
   Enum:
     ANY: 'Ko tētahi'
-    LOADING: 'Uta ana...'
-    REQUIREJS: 'Ka hiahia te CMS kia whakahohea te JavaScript'
   File:
     Content: 'Ngā Ihirangi'
     Filename: 'Ingoa Kōnae'
@@ -150,13 +162,17 @@ mi_NZ:
     FROMFILESTORE: 'Mai i te pātaka kōnae'
     NOSOURCE: 'Kōwhiria he kōnae pūtake hei tāpiri'
     REPLACE: 'Whakakapi {type}'
+  FileIFrameField_iframe.ss:
+    TITLE: 'Iframe Tukuatu Atahanga'
   Filesystem:
-    IMPORT_TAB_HEADER: Kawemai
-    SEARCHLISTINGS: Rapu
     SYNCRESULTS: 'Kua oti te tukutahi: e {createdcount} ngā tūemi i hangaia, e {deletedcount} ngā tūemi i mukua'
+  ForgotPasswordEmail.ss:
+    HELLO: 'Kia ora'
+    TEXT1: 'Anei tō'
+    TEXT2: 'hono tautuhi kupuhipa anō'
+    TEXT3: mā
   Form:
     FIELDISREQUIRED: 'Ka hiahiatia a %s'
-    TITLE: 'Iframe Tukuatu Atahanga'
     VALIDATIONCREDITNUMBER: 'Tirohia kua tika tō tāuru i te tau kāri nama {number}'
     VALIDATIONNOTUNIQUE: 'Ehara te uara i tāurua i te ahurei'
     VALIDATIONPASSWORDSDONTMATCH: 'Kāore ngā kupuhipa i te ōrite'
@@ -187,37 +203,26 @@ mi_NZ:
     ResetFilter: 'Tautuhi anō'
   GridFieldAction_Delete:
     DeletePermissionsFailure: 'Kāore he muku whakaaetanga'
-    NEXT: Panuku
-    PREVIOUS: Tōmua
   GridFieldDetailForm:
     Create: Hanga
     Delete: Muku
     DeletePermissionsFailure: 'Kāore he whakaaetanga muku'
     Deleted: 'Kua mukua %s %s'
-    HELLO: 'Kia ora'
     Save: Tiaki
     Saved: 'I tiakina a %s %s'
-    TEXT1: 'Anei tō'
+  GridFieldItemEditView.ss: null
-    TEXT2: 'hono tautuhi kupuhipa anō'
-    TEXT3: mā
   Group:
     AddRole: 'Tāpiritia he tūnga mō tēnei rōpū'
-    CHANGEPASSWORDTEXT1: 'Kua hurihia tō kupuhipa mō'
-    CHANGEPASSWORDTEXT2: 'Ka taea te whakamahi i ēnei taipitopito tuakiri ināianei hei takiuru:'
     Code: 'Waehere Rōpū'
     DefaultGroupTitleAdministrators: 'Ngā Kaiwhakahaere'
     DefaultGroupTitleContentAuthors: 'Ngā Kaituhi Ihirangi'
     Description: Whakaahuatanga
-    EMAIL: Īmēra
     GroupReminder: 'Mēnā ka kōwhiri koe i tētahi rōpū matua, ka whiwhi tēnei rōpū i ōna tūnga katoa'
-    HELLO: 'Kia ora'
     Locked: 'Kua raka?'
     NoRoles: 'Kāore i kitea he tūnga'
-    PASSWORD: Kupuhipa
     Parent: 'Rōpū Matua'
     RolesAddEditLink: 'Whakahaere tūnga'
     Sort: 'Raupapa Kōmaka'
-    TITLE: 'Iframe Tukuatu Atahanga'
     has_many_Permissions: 'Ngā Whakaaetanga'
     many_many_Members: 'Ngā Mema'
   GroupImportForm:
@@ -275,10 +280,9 @@ mi_NZ:
     UpdateMEDIA: 'Whakahōu Pāpāho'
   ImageField:
     IMAGE: Atahanga
-  Image_iframe.ss: 'ChangePasswordEmail.ss:  BackLink_Button.ss:  CMSLoadingScreen.ss:  RelationComplexTableField.ss:  ForgotPasswordEmail.ss:    APPLY FILTER: "Hoatu Tātari"  GridFieldItemEditView.ss:    Go back: "Hoki"  ModelSidebar.ss:  TableListField_PageControls.ss:  ModelAdmin_Tools.ss:  ComplexTableField_popup.ss:  TableField.ss:  FileIFrameField_iframe.ss:  ComplexTableField.ss:  TableListField.ss:  ModelAdmin_ImportSpec.ss:  LeftAndMain_Menu.ss:'
+  Image_iframe.ss:
+    TITLE: 'Iframe Tukuatu Atahanga'
   LeftAndMain:
-    ADD: 'Tāpiri haupae hōu'
-    ADDITEM: 'Tāpiri %s'
     CANT_REORGANISE: 'Kāore tō mana whakakē i ngā whārangi taumata Matua. Kāore tō huringa i tiakina.'
     DELETED: 'I mukua'
     DropdownBatchActionsDefault: 'Ngā Mahi'
@@ -292,6 +296,9 @@ mi_NZ:
     REORGANISATIONSUCCESSFUL: 'Kua momoho te whakaraupapa anō i te rākau pae'
     SAVEDUP: 'Kua Tiakina'
     VersionUnknown: 'tē mōhiotia'
+  LeftAndMain_Menu.ss:
+    Hello: 'Kia ora'
+    LOGOUT: Takiputa
   LoginAttempt:
     Email: 'Wāhitau Īmēra'
     IP: 'Wāhitau KI'
@@ -368,6 +375,7 @@ mi_NZ:
     ResultUpdated: 'I whakahōutia e {count} mhā mema'
   MemberTableField: null
   ModelAdmin:
+    'APPLY FILTER': 'Hoatu Tātari'
     DELETE: Muku
     DELETEDRECORDS: 'I mukua e {count} ngā pūkete.'
     IMPORT: 'Kawemai i CSV'
@@ -377,6 +385,17 @@ mi_NZ:
     RESET: 'Tautuhi Anō'
     Title: 'Ngā Tauira Raraunga'
     UPDATEDRECORDS: 'I whakahōutia e {count} ngā pūkete.'
+  ModelAdmin_ImportSpec.ss:
+    IMPORTSPECFIELDS: 'Ngā tīwae pātengi raraunga'
+    IMPORTSPECLINK: 'Whakaatu Whakapūtātanga mō %s'
+    IMPORTSPECRELATIONS: 'Ngā Pānga'
+    IMPORTSPECTITLE: 'Whakapūtātanga mō %s'
+  ModelAdmin_Tools.ss:
+    FILTER: Tātari
+    IMPORT: Kawemai
+  ModelSidebar.ss:
+    IMPORT_TAB_HEADER: Kawemai
+    SEARCHLISTINGS: Rapu
   MoneyField:
     FIELDLABELAMOUNT: Rahinga
     FIELDLABELCURRENCY: Moni
@@ -389,10 +408,6 @@ mi_NZ:
     CMS_ACCESS_CATEGORY: 'Uru CMS'
     FULLADMINRIGHTS: 'Ngā motika kaiwhakahaere katoa'
     FULLADMINRIGHTS_HELP: 'Ka whakapae me te takahi i ērā atu whakaaetanga katoa kua tautapatia.'
-    IMPORTSPECFIELDS: 'Ngā tīwae pātengi raraunga'
-    IMPORTSPECLINK: 'Whakaatu Whakapūtātanga mō %s'
-    IMPORTSPECRELATIONS: 'Ngā Pānga'
-    IMPORTSPECTITLE: 'Whakapūtātanga mō %s'
   PermissionCheckboxSetField:
     AssignedTo: 'kua tautapatia ki  "{title}"'
     FromGroup: 'I tukuna iho i te rōpū "{title}"'
@@ -401,8 +416,11 @@ mi_NZ:
   Permissions:
     PERMISSIONS_CATEGORY: 'Ngā tūnga me ngā whakaaetanga uru'
   PhoneNumberField:
-    Back: Hoki
     VALIDATION: 'Tāurua he tau waea tika'
+  RelationComplexTableField.ss:
+    ADD: Tāpiri
+    CSVEXPORT: 'Kaweatu ki CSV'
+    NOTFOUND: 'Kāore i kitea he tūemi'
   Security:
     ALREADYLOGGEDIN: 'Kāore i te whakaaetia kia uru koe ki tēnei whārangi. Mēnā he pūkete anō tōu e taea ai te uru ki tēnā whārangi, ka taea te takiuru anō i raro.'
     BUTTONSEND: 'Tukuna mai te hono tautuhi kupuhipa anō'
@@ -439,31 +457,33 @@ mi_NZ:
     BtnImport: 'Kawemai i CSV'
     FileFieldLabel: 'Kōnae CSV <small>(Ngā toronga ka whakaaetia: *.csv)</small>'
   SilverStripeNavigator:
-    DISPLAYING: 'Whakaatu ana'
     Edit: Whakatika
-    FILTER: Tātari
+  SimpleImageField:
-    IMPORT: Kawemai
+    NOUPLOAD: 'Kāore He Atahanga Tukuatu'
+  SiteTree:
+    TABMAIN: Matua
+  TableField:
+    ISREQUIRED: 'Ka hiahiatia te %s i te ''%s'' '
+  TableField.ss:
+    ADD: 'Tāpiri haupae hōu'
+    ADDITEM: 'Tāpiri %s'
+  TableListField:
+    CSVEXPORT: 'Kaweake ki CSV'
+    PRINT: Tā
+    Print: Tā
+    SELECT: 'Tīpako:'
+  TableListField.ss:
+    NOITEMSFOUND: 'Kāore i kitea he tūemi'
+    SORTASC: 'Kōmakatia ki te raupapa aupiki'
+    SORTDESC: 'Kōmakatia ki te raupapa auheke'
+  TableListField_PageControls.ss:
+    DISPLAYING: 'Whakaatu ana'
     OF: o
     TO: ki
     VIEWFIRST: 'Tirohia te tuatahi'
     VIEWLAST: 'Tirohia te whakamutunga'
     VIEWNEXT: 'Tiro panuku'
     VIEWPREVIOUS: 'Tiro tōmua'
-  SimpleImageField:
-    NOUPLOAD: 'Kāore He Atahanga Tukuatu'
-  SiteTree:
-    TABMAIN: Matua
-  TableField:
-    ADDITEM: 'Tāpiri %s'
-    ISREQUIRED: 'Ka hiahiatia te %s i te ''%s'' '
-    NOITEMSFOUND: 'Kāore i kitea he tūemi'
-    SORTASC: 'Kōmakatia ki te raupapa aupiki'
-    SORTDESC: 'Kōmakatia ki te raupapa auheke'
-  TableListField:
-    CSVEXPORT: 'Kaweake ki CSV'
-    PRINT: Tā
-    Print: Tā
-    SELECT: 'Tīpako:'
   TimeField:
     VALIDATEFORMAT: 'Tāurua he hōputu wā tika ({format})'
   ToggleField:

lang/ms.yml

@@ -50,6 +50,8 @@ ms:
     UNORDERED: 'Unordered list'
     UNORDEREDDESCRIPTION: 'Unordered list'
     UNORDEREDEXAMPLE1: 'unordered item 1'
+  BackLink_Button.ss:
+    Back: Back
   BasicAuth:
     ENTERINFO: 'Maukkan ID pengguna dan katalaluan'
     ERRORNOTADMIN: 'Pengguna ini bukan pentadbir.'
@@ -57,9 +59,10 @@ ms:
   Boolean:
     0: 'False'
     ANY: Any
-    Hello: Hi
-    LOGOUT: 'Log out'
     1: 'True'
+  CMSLoadingScreen.ss:
+    LOADING: Loading...
+    REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
   CMSMain:
     ACCESS: 'Access to ''{title}'' section'
     ACCESSALLINTERFACES: 'Access to all CMS sections'
@@ -67,6 +70,12 @@ ms:
     SAVE: Save
   CMSProfileController:
     MENUTITLE: CMSProfileController
+  ChangePasswordEmail.ss:
+    CHANGEPASSWORDTEXT1: 'Anda telah mengubah kata lalaun untuk'
+    CHANGEPASSWORDTEXT2: 'Sila gunakan maklumat di bawah untuk mendaftar masuk:'
+    EMAIL: Emel
+    HELLO: Hi
+    PASSWORD: 'Kata Laluan'
   CheckboxField:
     - 'False'
     - 'True'
@@ -74,6 +83,14 @@ ms:
     CLOSEPOPUP: 'Close Popup'
     SUCCESSADD2: 'Added {name}'
     SUCCESSEDIT: 'Saved %s %s %s'
+  ComplexTableField.ss:
+    ADDITEM: 'Add %s'
+    NOITEMSFOUND: 'No items found'
+    SORTASC: 'Susun secara menaik'
+    SORTDESC: 'Susun secara menurun'
+  ComplexTableField_popup.ss:
+    NEXT: Berikut
+    PREVIOUS: Dahulu
   ConfirmedPasswordField:
     ATLEAST: 'Passwords must be at least {min} characters long.'
     BETWEEN: 'Passwords must be {min} to {max} characters long.'
@@ -111,10 +128,7 @@ ms:
     VALIDDATEMAXDATE: 'Your date has to be older or matching the maximum allowed date ({date})'
     VALIDDATEMINDATE: 'Your date has to be newer or matching the minimum allowed date ({date})'
   Director:
-    ADD: Tambah
-    CSVEXPORT: 'Export to CSV'
     INVALID_REQUEST: 'Invalid request'
-    NOTFOUND: 'No items found'
   DropdownField:
     CHOOSE: (Pilih)
   EmailField:
@@ -124,8 +138,6 @@ ms:
     SINGULARNAME: 'Email Bounce Record'
   Enum:
     ANY: Any
-    LOADING: Loading...
-    REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
   File:
     Content: Content
     Filename: Filename
@@ -150,13 +162,17 @@ ms:
     FROMFILESTORE: 'From the File Store'
     NOSOURCE: 'Please select a source file to attach'
     REPLACE: 'Replace {type}'
+  FileIFrameField_iframe.ss:
+    TITLE: 'Image Uploading Iframe'
   Filesystem:
-    IMPORT_TAB_HEADER: Import
-    SEARCHLISTINGS: Search
     SYNCRESULTS: 'Sync complete: {createdcount} items created, {deletedcount} items deleted'
+  ForgotPasswordEmail.ss:
+    HELLO: Hi
+    TEXT1: 'Here is your'
+    TEXT2: 'password reset link'
+    TEXT3: for
   Form:
     FIELDISREQUIRED: '%s dipelukan'
-    TITLE: 'Image Uploading Iframe'
     VALIDATIONCREDITNUMBER: 'Please ensure you have entered the {number} credit card number correctly'
     VALIDATIONNOTUNIQUE: 'Nilai yang dimasukkan tidak unik'
     VALIDATIONPASSWORDSDONTMATCH: 'Kata-kata laluan tidak sepadan'
@@ -187,37 +203,26 @@ ms:
     ResetFilter: Reset
   GridFieldAction_Delete:
     DeletePermissionsFailure: 'No delete permissions'
-    NEXT: Berikut
-    PREVIOUS: Dahulu
   GridFieldDetailForm:
     Create: Create
     Delete: Delete
     DeletePermissionsFailure: 'No delete permissions'
     Deleted: 'Deleted %s %s'
-    HELLO: Hi
     Save: Save
     Saved: 'Saved %s %s'
-    TEXT1: 'Here is your'
+  GridFieldItemEditView.ss: null
-    TEXT2: 'password reset link'
-    TEXT3: for
   Group:
     AddRole: 'Add a role for this group'
-    CHANGEPASSWORDTEXT1: 'Anda telah mengubah kata lalaun untuk'
-    CHANGEPASSWORDTEXT2: 'Sila gunakan maklumat di bawah untuk mendaftar masuk:'
     Code: 'Kod Kumpulan'
     DefaultGroupTitleAdministrators: Administrators
     DefaultGroupTitleContentAuthors: 'Content Authors'
     Description: Description
-    EMAIL: Emel
     GroupReminder: 'If you choose a parent group, this group will take all it''s roles'
-    HELLO: Hi
     Locked: 'Dikuncikan?'
     NoRoles: 'No roles found'
-    PASSWORD: 'Kata Laluan'
     Parent: 'Kumpulan Induk'
     RolesAddEditLink: 'Manage roles'
     Sort: 'Sort Order'
-    TITLE: 'Iframe untuk memuatnaik imej'
     has_many_Permissions: Keizinan
     many_many_Members: Ahli-ahli
   GroupImportForm:
@@ -275,10 +280,9 @@ ms:
     UpdateMEDIA: 'Update Media'
   ImageField:
     IMAGE: Image
-  Image_iframe.ss: 'ChangePasswordEmail.ss:  BackLink_Button.ss:  CMSLoadingScreen.ss:  RelationComplexTableField.ss:  ForgotPasswordEmail.ss:    APPLY FILTER: "Apply Filter"  GridFieldItemEditView.ss:    Go back: "Go back"  ModelSidebar.ss:  TableListField_PageControls.ss:  ModelAdmin_Tools.ss:  ComplexTableField_popup.ss:  TableField.ss:  FileIFrameField_iframe.ss:  ComplexTableField.ss:  TableListField.ss:  ModelAdmin_ImportSpec.ss:  LeftAndMain_Menu.ss:'
+  Image_iframe.ss:
+    TITLE: 'Iframe untuk memuatnaik imej'
   LeftAndMain:
-    ADD: 'Add a new row'
-    ADDITEM: 'Add %s'
     CANT_REORGANISE: 'You do not have permission to alter Top level pages. Your change was not saved.'
     DELETED: Deleted.
     DropdownBatchActionsDefault: Actions
@@ -292,6 +296,9 @@ ms:
     REORGANISATIONSUCCESSFUL: 'Reorganised the site tree successfully.'
     SAVEDUP: Saved.
     VersionUnknown: unknown
+  LeftAndMain_Menu.ss:
+    Hello: Hi
+    LOGOUT: 'Log out'
   LoginAttempt:
     Email: 'Alamat Emel'
     IP: 'IP Address'
@@ -368,6 +375,7 @@ ms:
     ResultUpdated: 'Updated {count} members'
   MemberTableField: null
   ModelAdmin:
+    'APPLY FILTER': 'Apply Filter'
     DELETE: Delete
     DELETEDRECORDS: 'Deleted {count} records.'
     IMPORT: 'Import from CSV'
@@ -377,6 +385,17 @@ ms:
     RESET: Reset
     Title: 'Data Models'
     UPDATEDRECORDS: 'Updated {count} records.'
+  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
   MoneyField:
     FIELDLABELAMOUNT: Amount
     FIELDLABELCURRENCY: Currency
@@ -389,10 +408,6 @@ ms:
     CMS_ACCESS_CATEGORY: 'CMS Access'
     FULLADMINRIGHTS: 'Hak mutlah pentadbiran'
     FULLADMINRIGHTS_HELP: 'Implies and overrules all other assigned permissions.'
-    IMPORTSPECFIELDS: 'Database columns'
-    IMPORTSPECLINK: 'Show Specification for %s'
-    IMPORTSPECRELATIONS: Relations
-    IMPORTSPECTITLE: 'Specification for %s'
   PermissionCheckboxSetField:
     AssignedTo: 'assigned to "{title}"'
     FromGroup: 'inherited from group "{title}"'
@@ -401,8 +416,11 @@ ms:
   Permissions:
     PERMISSIONS_CATEGORY: 'Roles and access permissions'
   PhoneNumberField:
-    Back: Back
     VALIDATION: 'Sila isikan nombor telefon yang sah'
+  RelationComplexTableField.ss:
+    ADD: Tambah
+    CSVEXPORT: 'Export to CSV'
+    NOTFOUND: 'No items found'
   Security:
     ALREADYLOGGEDIN: 'Anda tidak mempunyai kebenaran untuk mencapai mukasurat ini. Jika anda mempunyai akaun lain dengan kebenaran yang deperlukan, sila daftar masuk di bawah.'
     BUTTONSEND: 'Hantar pautan penukaran katalaluan kepada saya'
@@ -439,31 +457,33 @@ ms:
     BtnImport: 'Import from CSV'
     FileFieldLabel: 'CSV File <small>(Allowed extensions: *.csv)</small>'
   SilverStripeNavigator:
-    DISPLAYING: Displaying
     Edit: Edit
-    FILTER: Filter
+  SimpleImageField:
-    IMPORT: Import
+    NOUPLOAD: 'Tiada imej dimuat naikkan'
+  SiteTree:
+    TABMAIN: Utama
+  TableField:
+    ISREQUIRED: 'In %s ''%s'' is required'
+  TableField.ss:
+    ADD: 'Add a new row'
+    ADDITEM: 'Add %s'
+  TableListField:
+    CSVEXPORT: 'Export to CSV'
+    PRINT: Print
+    Print: Print
+    SELECT: 'Select:'
+  TableListField.ss:
+    NOITEMSFOUND: 'No items found'
+    SORTASC: 'Sort in ascending order'
+    SORTDESC: 'Sort in descending order'
+  TableListField_PageControls.ss:
+    DISPLAYING: Displaying
     OF: of
     TO: to
     VIEWFIRST: 'Lihat pertama'
     VIEWLAST: 'Lihat terakhir'
     VIEWNEXT: 'Lihat berikut'
     VIEWPREVIOUS: 'Lihat dahulu'
-  SimpleImageField:
-    NOUPLOAD: 'Tiada imej dimuat naikkan'
-  SiteTree:
-    TABMAIN: Utama
-  TableField:
-    ADDITEM: 'Add %s'
-    ISREQUIRED: 'In %s ''%s'' is required'
-    NOITEMSFOUND: 'No items found'
-    SORTASC: 'Sort in ascending order'
-    SORTDESC: 'Sort in descending order'
-  TableListField:
-    CSVEXPORT: 'Export to CSV'
-    PRINT: Print
-    Print: Print
-    SELECT: 'Select:'
   TimeField:
     VALIDATEFORMAT: 'Please enter a valid time format ({format})'
   ToggleField:

lang/nb.yml

@@ -50,6 +50,8 @@ nb:
     UNORDERED: Punktliste
     UNORDEREDDESCRIPTION: Punktliste
     UNORDEREDEXAMPLE1: 'punkt 1'
+  BackLink_Button.ss:
+    Back: Tilbake
   BasicAuth:
     ENTERINFO: 'Vennligst tast inn et brukernavn og passord'
     ERRORNOTADMIN: 'Denne brukeren er ikke administrator.'
@@ -57,16 +59,23 @@ nb:
   Boolean:
     0: Usant
     ANY: Any
-    Hello: Hi
-    LOGOUT: 'Logg ut'
     1: Sant
+  CMSLoadingScreen.ss:
+    LOADING: 'Laster ...'
+    REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
   CMSMain:
     ACCESS: 'Access to ''{title}'' section'
-    ACCESSALLINTERFACES: 'Access to all CMS sections'
+    ACCESSALLINTERFACES: 'Adgang til alle CMS-seksjoner'
-    ACCESSALLINTERFACESHELP: 'Overrules more specific access settings.'
+    ACCESSALLINTERFACESHELP: 'Overstyrer mer spesifikke adgangsinnstillinger'
     SAVE: Lagre
   CMSProfileController:
     MENUTITLE: CMSProfileController
+  ChangePasswordEmail.ss:
+    CHANGEPASSWORDTEXT1: 'Du har byttet passordet for'
+    CHANGEPASSWORDTEXT2: 'Du kan nå bruke følgende informasjon for å logge deg inn:'
+    EMAIL: Epost
+    HELLO: Hei
+    PASSWORD: Passord
   CheckboxField:
     - 'False'
     - 'True'
@@ -74,6 +83,14 @@ nb:
     CLOSEPOPUP: 'Lukk Popup'
     SUCCESSADD2: 'Lagt til {name}'
     SUCCESSEDIT: 'Lagret %s %s %s'
+  ComplexTableField.ss:
+    ADDITEM: 'Add %s'
+    NOITEMSFOUND: 'No items found'
+    SORTASC: 'Sorter stigende'
+    SORTDESC: 'Sorter fallende'
+  ComplexTableField_popup.ss:
+    NEXT: Neste
+    PREVIOUS: Forrige
   ConfirmedPasswordField:
     ATLEAST: 'Passordet må inneholde minst {min} skrifttegn'
     BETWEEN: 'Passord må inneholde {min} til {max} skrifttegn'
@@ -100,21 +117,18 @@ nb:
     MONTHS: måneder
     SEC: sekund
     SECS: sekunder
-    TIMEDIFFAGO: '{difference} ago'
+    TIMEDIFFAGO: '{difference} siden'
-    TIMEDIFFIN: 'in {difference}'
+    TIMEDIFFIN: 'i {difference}'
     YEAR: år
     YEARS: år
   DateField:
     NOTSET: mangler
     TODAY: 'i dag'
     VALIDDATEFORMAT2: 'Vennligst skriv inn et gyldig datoformat ({format})'
-    VALIDDATEMAXDATE: 'Your date has to be older or matching the maximum allowed date ({date})'
+    VALIDDATEMAXDATE: 'Din dato må være eldre eller i samsvar med maksimum tillatte dato ({date})'
-    VALIDDATEMINDATE: 'Your date has to be newer or matching the minimum allowed date ({date})'
+    VALIDDATEMINDATE: 'Din dato må være nyere eller i samsvar med minimum tillatte dato ({date})'
   Director:
-    ADD: 'Legg til'
-    CSVEXPORT: 'Export to CSV'
     INVALID_REQUEST: 'Ugyldig forespørsel'
-    NOTFOUND: 'No items found'
   DropdownField:
     CHOOSE: (Velg)
   EmailField:
@@ -124,15 +138,13 @@ nb:
     SINGULARNAME: 'Email Bounce Record'
   Enum:
     ANY: Any
-    LOADING: 'Laster ...'
-    REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
   File:
     Content: Innhold
     Filename: Filnavn
     INVALIDEXTENSION: 'Extension is not allowed (valid: {extensions})'
     INVALIDEXTENSIONSHORT: 'Extension is not allowed'
     NOFILESIZE: 'Filstørrelsen var 0 bytes.'
-    NOVALIDUPLOAD: 'File is not a valid upload'
+    NOVALIDUPLOAD: 'Filen er ikke en gyldig opplasting'
     Name: Navn
     PLURALNAME: Filer
     SINGULARNAME: Fil
@@ -141,22 +153,26 @@ nb:
     Title: Tittel
   FileIFrameField:
     ATTACH: 'Legg ved {type}'
-    ATTACHONCESAVED: '{type}s can be attached once you have saved the record for the first time.'
+    ATTACHONCESAVED: '{type}er kan legges til når du har lagret oppføringen for første gang.'
-    ATTACHONCESAVED2: 'Files can be attached once you have saved the record for the first time.'
+    ATTACHONCESAVED2: 'Filer kan legges til så snart du har lagret oppføringen for første gang.'
     DELETE: 'Slett {type}'
     DISALLOWEDFILETYPE: 'Det er ikke tillatt å laste opp denne filtypen'
     FILE: Fil
     FROMCOMPUTER: 'Fra din pc'
     FROMFILESTORE: 'Fra filarkivet'
-    NOSOURCE: 'Please select a source file to attach'
+    NOSOURCE: 'Vennligst legg til en valgt kildefil'
     REPLACE: 'Replace {type}'
+  FileIFrameField_iframe.ss:
+    TITLE: 'Bildeopplastnings ramme'
   Filesystem:
-    IMPORT_TAB_HEADER: Importer
-    SEARCHLISTINGS: Søk
     SYNCRESULTS: 'Sync complete: {createdcount} items created, {deletedcount} items deleted'
+  ForgotPasswordEmail.ss:
+    HELLO: Hei
+    TEXT1: 'Her er din'
+    TEXT2: 'passord resett link'
+    TEXT3: for
   Form:
     FIELDISREQUIRED: 'mangler %s'
-    TITLE: 'Bildeopplastnings ramme'
     VALIDATIONCREDITNUMBER: 'Vennligst sjekk at du har skrevet inn {number} korrekt kortnummer'
     VALIDATIONNOTUNIQUE: 'Den spesifiserte verdien er ikke unik'
     VALIDATIONPASSWORDSDONTMATCH: 'Passordene passer ikke med hverandre'
@@ -174,58 +190,47 @@ nb:
     Add: 'Legg til {name}'
     Filter: Filter
     FilterBy: 'Filter by '
-    Find: Find
+    Find: Finn
     LEVELUP: 'Level up'
-    LinkExisting: 'Link Existing'
+    LinkExisting: 'Eksisterende lenke'
     NewRecord: 'New %s'
     NoItemsFound: 'No items found'
     PRINTEDAT: 'Printed at'
     PRINTEDBY: 'Printed by'
-    PlaceHolder: 'Find {type}'
+    PlaceHolder: 'Finn {type}'
     PlaceHolderWithLabels: 'Find {type} by {name}'
     RelationSearch: 'Relation search'
     ResetFilter: Tilbakestille
   GridFieldAction_Delete:
-    DeletePermissionsFailure: 'No delete permissions'
+    DeletePermissionsFailure: 'Ikke tillatt å slette'
-    NEXT: Neste
-    PREVIOUS: Forrige
   GridFieldDetailForm:
     Create: Create
     Delete: Slett
-    DeletePermissionsFailure: 'No delete permissions'
+    DeletePermissionsFailure: 'Ikke tillatt å slette'
-    Deleted: 'Deleted %s %s'
+    Deleted: 'Slettet %s %s'
-    HELLO: Hei
     Save: Lagre
     Saved: 'Lagret %s %s'
-    TEXT1: 'Her er din'
+  GridFieldItemEditView.ss: null
-    TEXT2: 'passord resett link'
-    TEXT3: for
   Group:
     AddRole: 'Legg en rolle til denne gruppen'
-    CHANGEPASSWORDTEXT1: 'Du har byttet passordet for'
-    CHANGEPASSWORDTEXT2: 'Du kan nå bruke følgende informasjon for å logge deg inn:'
     Code: 'Gruppe Kode'
     DefaultGroupTitleAdministrators: Administratorer
     DefaultGroupTitleContentAuthors: Innholdsforfattere
     Description: Beskrivelse
-    EMAIL: Epost
     GroupReminder: 'Hvis du velger en overordnet gruppe, vil denne gruppen arve alle rollene'
-    HELLO: Hei
     Locked: 'Låst?'
     NoRoles: 'Ingen roller funnet'
-    PASSWORD: Passord
     Parent: 'Foreldre Gruppe'
     RolesAddEditLink: 'Administrer roller'
     Sort: Sorteringsrekkefølge
-    TITLE: 'Bildeopplasnings ramme'
     has_many_Permissions: Tillatelser
     many_many_Members: Medlemmer
   GroupImportForm:
     Help1: '<p>Import one or more groups in <em>CSV</em> format (comma-separated values). <small><a href="#" class="toggle-advanced">Show advanced usage</a></small></p>'
     Help2: '<div class="advanced">	<h4>Advanced usage</h4>	<ul>	<li>Allowed columns: <em>%s</em></li>	<li>Existing groups are matched by their unique <em>Code</em> value, and updated with any new values from the imported file</li>	<li>Group hierarchies can be created by using a <em>ParentCode</em> column.</li>	<li>Permission codes can be assigned by the <em>PermissionCode</em> column. Existing permission codes are not cleared.</li>	</ul></div>'
     ResultCreated: 'Created {count} groups'
-    ResultDeleted: 'Deleted %d groups'
+    ResultDeleted: 'Slettede %d grupper'
-    ResultUpdated: 'Updated %d groups'
+    ResultUpdated: 'Oppdaterte %d grupper'
   Hierarchy:
     InfiniteLoopNotAllowed: 'Infinite loop found within the "{type}" hierarchy. Please change the parent to resolve this'
   HtmlEditorField:
@@ -246,20 +251,20 @@ nb:
     EMAIL: 'Epost adresse'
     FILE: Fil
     FOLDER: Mappe
-    FROMCMS: 'From the CMS'
+    FROMCMS: 'Fra CMS'
-    FROMCOMPUTER: 'From your computer'
+    FROMCOMPUTER: 'Fra din pc'
     FROMWEB: 'From the web'
     FindInFolder: 'Finn i mappe'
     IMAGEALT: 'Alternativ tekst (alt)'
-    IMAGEALTTEXT: 'Alternative text (alt) - shown if image cannot be displayed'
+    IMAGEALTTEXT: 'Alternativ tekst (alt) - vist hvis bilde ikke kan vises'
     IMAGEALTTEXTDESC: 'Shown to screen readers or if image can not be displayed'
     IMAGEDIMENSIONS: Dimensjoner
     IMAGEHEIGHTPX: Høyde
-    IMAGETITLE: 'Title text (tooltip) - for additional information about the image'
+    IMAGETITLE: 'Titteltekst (tooltip) - for tilleggsinformasjon om bildet'
-    IMAGETITLETEXT: 'Title text (tooltip)'
+    IMAGETITLETEXT: 'Titteltekst (tooltip)'
     IMAGETITLETEXTDESC: 'For tilleggsinformasjon om bilde'
     IMAGEWIDTHPX: Bredde
-    INSERTMEDIA: 'Insert Media'
+    INSERTMEDIA: 'Sett inn Media'
     LINK: 'Sett inn/rediger lenke i fremhevet tekst'
     LINKANCHOR: 'Lenke på denne siden'
     LINKDESCR: 'Lenke beskrivelse'
@@ -272,18 +277,17 @@ nb:
     PAGE: Side
     URL: URL
     URLNOTANOEMBEDRESOURCE: 'The URL ''{url}'' could not be turned into a media resource.'
-    UpdateMEDIA: 'Update Media'
+    UpdateMEDIA: 'Oppdater Media'
   ImageField:
     IMAGE: Bilde
-  Image_iframe.ss: 'ChangePasswordEmail.ss:  BackLink_Button.ss:  CMSLoadingScreen.ss:  RelationComplexTableField.ss:  ForgotPasswordEmail.ss:    APPLY FILTER: "Apply Filter"  GridFieldItemEditView.ss:    Go back: "Gå tilbake"  ModelSidebar.ss:  TableListField_PageControls.ss:  ModelAdmin_Tools.ss:  ComplexTableField_popup.ss:  TableField.ss:  FileIFrameField_iframe.ss:  ComplexTableField.ss:  TableListField.ss:  ModelAdmin_ImportSpec.ss:  LeftAndMain_Menu.ss:'
+  Image_iframe.ss:
+    TITLE: 'Bildeopplasnings ramme'
   LeftAndMain:
-    ADD: 'Legg til en rad'
-    ADDITEM: 'Add %s'
     CANT_REORGANISE: 'You do not have permission to alter Top level pages. Your change was not saved.'
     DELETED: Slettet.
-    DropdownBatchActionsDefault: Actions
+    DropdownBatchActionsDefault: Handlinger
     HELP: Hjelp
-    PAGETYPE: 'Page type: '
+    PAGETYPE: Side-type
     PERMAGAIN: 'Du har blitt logget ut av CMS. Hvis du vil logge deg på igjen, skriv inn brukernavn og passord under.'
     PERMALREADY: 'Beklager, men du har ikke tilgang til denne delen av CMS. Hvis du vil logge inn som en annen bruker, gjør det nedenfor.'
     PERMDEFAULT: 'Vennligst velg en autentiseringsmetode og skriv inn brukernavn og passord for å få tilgang til CMS.'
@@ -292,6 +296,9 @@ nb:
     REORGANISATIONSUCCESSFUL: 'Omorganisering av sidetreet vellykket'
     SAVEDUP: Lagret.
     VersionUnknown: Ukjent
+  LeftAndMain_Menu.ss:
+    Hello: Hi
+    LOGOUT: 'Logg ut'
   LoginAttempt:
     Email: Epostadresse
     IP: 'IP adresse'
@@ -327,7 +334,7 @@ nb:
     SUBJECTPASSWORDRESET: 'Link til passordannulering'
     SURNAME: Etternavn
     VALIDATIONMEMBEREXISTS: 'Det eksisterer allerede et medlem med denne epost-kontoen.'
-    ValidationIdentifierFailed: 'Can''t overwrite existing member #{id} with identical identifier ({name} = {value}))'
+    ValidationIdentifierFailed: 'Kan ikke overskrive eksisterende medlem #{id} med identisk identifikator ({name})={value}))'
     WELCOMEBACK: 'Velkommen tilbake, {firstname}'
     YOUROLDPASSWORD: 'Ditt gamle passord'
     belongs_many_many_Groups: Grupper
@@ -343,31 +350,32 @@ nb:
     AMORPM: 'AM (Ante meridiem) or PM (Post meridiem)'
     Custom: Custom
     DATEFORMATBAD: 'Datoformat er ugyldig'
-    DAYNOLEADING: 'Day of month without leading zero'
+    DAYNOLEADING: 'Dag i måneden uten ledende null'
-    DIGITSDECFRACTIONSECOND: 'One or more digits representing a decimal fraction of a second'
+    DIGITSDECFRACTIONSECOND: 'Ett eller flere siffer som representerer en desimlbrøkdel av et sekund'
     FOURDIGITYEAR: 'Firesifret årstall'
     FULLNAMEMONTH: 'Fullt navn på måned (eks. juni)'
-    HOURNOLEADING: 'Hour without leading zero'
+    HOURNOLEADING: 'Time uten ledende null'
-    MINUTENOLEADING: 'Minute without leading zero'
+    MINUTENOLEADING: 'Minutt uten ledende null'
-    MONTHNOLEADING: 'Month digit without leading zero'
+    MONTHNOLEADING: 'Månedssiffer uten ledende null'
     Preview: Forhåndsvisning
     SHORTMONTH: 'Forkortelse av måned (f.eks. jun)'
     TOGGLEHELP: 'Vis/skjul formateringshjelp'
     TWODIGITDAY: 'Tosifret månedstall'
-    TWODIGITHOUR: 'Two digits of hour (00 through 23)'
+    TWODIGITHOUR: 'Tosifret timetall (00 til 23)'
-    TWODIGITMINUTE: 'Two digits of minute (00 through 59)'
+    TWODIGITMINUTE: 'Tosifret minuttstall (00 til 59)'
     TWODIGITMONTH: 'Tosifret måned (01=Januar, etc.)'
-    TWODIGITSECOND: 'Two digits of second (00 through 59)'
+    TWODIGITSECOND: 'Tosifret sekundtall (00 til 59)'
     TWODIGITYEAR: 'Tosifret årstall'
   MemberImportForm:
     Help1: '<p>Import users in <em>CSV format</em> (comma-separated values). <small><a href="#" class="toggle-advanced">Show advanced usage</a></small></p>'
     Help2: '<div class="advanced">	<h4>Advanced usage</h4>	<ul>	<li>Allowed columns: <em>%s</em></li>	<li>Existing users are matched by their unique <em>Code</em> property, and updated with any new values from the imported file.</li>	<li>Groups can be assigned by the <em>Groups</em> column. Groups are identified by their <em>Code</em> property, multiple groups can be separated by comma. Existing group memberships are not cleared.</li>	</ul></div>'
     ResultCreated: 'Created {count} members'
-    ResultDeleted: 'Deleted %d members'
+    ResultDeleted: 'Slettet %d medlemmer'
     ResultNone: 'Ingen endringer'
     ResultUpdated: 'Updated {count} members'
   MemberTableField: null
   ModelAdmin:
+    'APPLY FILTER': 'Legg til filter'
     DELETE: Slett
     DELETEDRECORDS: 'Deleted {count} records.'
     IMPORT: 'Importer fra CSV'
@@ -377,6 +385,17 @@ nb:
     RESET: Tilbakestille
     Title: 'Data Models'
     UPDATEDRECORDS: 'Updated {count} records.'
+  ModelAdmin_ImportSpec.ss:
+    IMPORTSPECFIELDS: 'Database columns'
+    IMPORTSPECLINK: 'Show Specification for %s'
+    IMPORTSPECRELATIONS: Relations
+    IMPORTSPECTITLE: 'Specification for %s'
+  ModelAdmin_Tools.ss:
+    FILTER: Filter
+    IMPORT: Importer
+  ModelSidebar.ss:
+    IMPORT_TAB_HEADER: Importer
+    SEARCHLISTINGS: Søk
   MoneyField:
     FIELDLABELAMOUNT: Mengde
     FIELDLABELCURRENCY: Currency
@@ -386,23 +405,22 @@ nb:
     VALIDATION: '''{value}'' er ikke et tall, kun tall aksepteres i dette feltet'
   Permission:
     AdminGroup: Administrator
-    CMS_ACCESS_CATEGORY: 'CMS Access'
+    CMS_ACCESS_CATEGORY: CMS-tilgang
     FULLADMINRIGHTS: 'Fulle administrative rettigheter'
     FULLADMINRIGHTS_HELP: 'Implies and overrules all other assigned permissions.'
-    IMPORTSPECFIELDS: 'Database columns'
-    IMPORTSPECLINK: 'Show Specification for %s'
-    IMPORTSPECRELATIONS: Relations
-    IMPORTSPECTITLE: 'Specification for %s'
   PermissionCheckboxSetField:
-    AssignedTo: 'assigned to "{title}"'
+    AssignedTo: 'tilordnet "{title}"'
-    FromGroup: 'inherited from group "{title}"'
+    FromGroup: 'Arvet fra gruppe "{title}"'
-    FromRole: 'inherited from role "{title}"'
+    FromRole: 'arvet fra rolle "{title}"'
     FromRoleOnGroup: 'inherited from role "%s" on group "%s"'
   Permissions:
-    PERMISSIONS_CATEGORY: 'Roles and access permissions'
+    PERMISSIONS_CATEGORY: 'Rolle- og tilgangstillatelser'
   PhoneNumberField:
-    Back: Tilbake
     VALIDATION: 'Vennligst skriv inn et gyldig tlf nummer'
+  RelationComplexTableField.ss:
+    ADD: 'Legg til'
+    CSVEXPORT: 'Export to CSV'
+    NOTFOUND: 'No items found'
   Security:
     ALREADYLOGGEDIN: 'Du har ikke adgang til denne siden. Hvis du har en annen konto som har adgang til denne siden, kan du logge inn med den under.'
     BUTTONSEND: 'Send meg lenke for å gi nytt passord'
@@ -416,9 +434,9 @@ nb:
     NOTERESETLINKINVALID: '<p>The password reset link is invalid or expired.</p><p>You can request a new one <a href="{link1}">here</a> or change your password after you <a href="{link2}">logged in</a>.</p>'
     NOTERESETPASSWORD: 'Skriv inn din epost adresse og vi vil sende deg en lenke som resetter passordet ditt.'
     PASSWORDSENTHEADER: 'Password reset link sent to ''{email}'''
-    PASSWORDSENTTEXT: 'Thank you! A reset link has been sent to ''{email}'', provided an account exists for this email address.'
+    PASSWORDSENTTEXT: 'Takk! En lenke for å lage nytt passord er sendt til ''{email}'', forutsatt at det eksisterer en konto for denne epostadressen.'
   SecurityAdmin:
-    ACCESS_HELP: 'Allow viewing, adding and editing users, as well as assigning permissions and roles to them.'
+    ACCESS_HELP: 'Tillat visning, tilføying og redigering av brukere, samt tildele adganger og roller til dem.'
     APPLY_ROLES: 'Legg til roller til grupper'
     APPLY_ROLES_HELP: 'Ability to edit the roles assigned to a group. Requires the "Access to ''Users'' section" permission.'
     EDITPERMISSIONS: 'Administrer tillatelser for grupper'
@@ -439,31 +457,33 @@ nb:
     BtnImport: 'Importer fra CSV'
     FileFieldLabel: 'CSV File <small>(Allowed extensions: *.csv)</small>'
   SilverStripeNavigator:
-    DISPLAYING: Displaying
     Edit: Rediger
-    FILTER: Filter
+  SimpleImageField:
-    IMPORT: Importer
+    NOUPLOAD: 'Ingen Bilder Lastet Opp'
+  SiteTree:
+    TABMAIN: Hovedinnstillinger
+  TableField:
+    ISREQUIRED: 'In %s ''%s'' is required'
+  TableField.ss:
+    ADD: 'Legg til en rad'
+    ADDITEM: 'Add %s'
+  TableListField:
+    CSVEXPORT: 'Eksporter til CSV'
+    PRINT: 'Skriv ut'
+    Print: Print
+    SELECT: 'Velg:'
+  TableListField.ss:
+    NOITEMSFOUND: 'No items found'
+    SORTASC: 'Sorter i stigende rekkefølge'
+    SORTDESC: 'Sorter i synkende rekkefølge'
+  TableListField_PageControls.ss:
+    DISPLAYING: Displaying
     OF: of
     TO: til
     VIEWFIRST: 'Se første'
     VIEWLAST: 'Se siste'
     VIEWNEXT: 'Se neste'
     VIEWPREVIOUS: 'Se forrige'
-  SimpleImageField:
-    NOUPLOAD: 'Ingen Bilder Lastet Opp'
-  SiteTree:
-    TABMAIN: Hovedinnstillinger
-  TableField:
-    ADDITEM: 'Add %s'
-    ISREQUIRED: 'In %s ''%s'' is required'
-    NOITEMSFOUND: 'No items found'
-    SORTASC: 'Sorter i stigende rekkefølge'
-    SORTDESC: 'Sorter i synkende rekkefølge'
-  TableListField:
-    CSVEXPORT: 'Eksporter til CSV'
-    PRINT: 'Skriv ut'
-    Print: Print
-    SELECT: 'Velg:'
   TimeField:
     VALIDATEFORMAT: 'Vennligst skriv inn et gyldig tidsformat ({format}]'
   ToggleField:
@@ -490,7 +510,7 @@ nb:
     REMOVE: Fjern
     REMOVEERROR: 'Feil ved fjerning av fil'
     REMOVEINFO: 'Fjern filen herfra, men ikke slett den fra filarkivet'
-    STARTALL: 'Start all'
+    STARTALL: 'Start alle'
     STARTALLINFO: 'Start alle opplastinger'
     Saved: Lagret
   Versioned:

lang/ne.yml

@@ -50,6 +50,8 @@ ne:
     UNORDERED: 'Unordered list'
     UNORDEREDDESCRIPTION: 'Unordered list'
     UNORDEREDEXAMPLE1: 'unordered item 1'
+  BackLink_Button.ss:
+    Back: Back
   BasicAuth:
     ENTERINFO: 'कृपया एउता प्रयोगकता नाम र पासओड हल्नुहोस्'
     ERRORNOTADMIN: 'यो प्रयोगकता मुख्य प्रयोगकता होइन'
@@ -57,9 +59,10 @@ ne:
   Boolean:
     0: 'False'
     ANY: Any
-    Hello: Hi
-    LOGOUT: 'Log out'
     1: 'True'
+  CMSLoadingScreen.ss:
+    LOADING: Loading...
+    REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
   CMSMain:
     ACCESS: 'Access to ''{title}'' section'
     ACCESSALLINTERFACES: 'Access to all CMS sections'
@@ -67,6 +70,12 @@ ne:
     SAVE: Save
   CMSProfileController:
     MENUTITLE: CMSProfileController
+  ChangePasswordEmail.ss:
+    CHANGEPASSWORDTEXT1: 'तपाईंले आफनो पासओड  यसका लागि परिवतन गर्नु भयो '
+    CHANGEPASSWORDTEXT2: 'दिएको विवरण अनुसार भित्र जान सक्नुहुन्छ :'
+    EMAIL: Email
+    HELLO: हाई
+    PASSWORD: Password
   CheckboxField:
     - 'False'
     - 'True'
@@ -74,6 +83,14 @@ ne:
     CLOSEPOPUP: 'Close Popup'
     SUCCESSADD2: 'Added {name}'
     SUCCESSEDIT: 'Saved %s %s %s'
+  ComplexTableField.ss:
+    ADDITEM: 'Add %s'
+    NOITEMSFOUND: 'No items found'
+    SORTASC: 'बढ्दो क्रमाङ्कन '
+    SORTDESC: 'घट्दो क्रमाङ्कन '
+  ComplexTableField_popup.ss:
+    NEXT: पछीको
+    PREVIOUS: पहिलाको
   ConfirmedPasswordField:
     ATLEAST: 'Passwords must be at least {min} characters long.'
     BETWEEN: 'Passwords must be {min} to {max} characters long.'
@@ -111,10 +128,7 @@ ne:
     VALIDDATEMAXDATE: 'Your date has to be older or matching the maximum allowed date ({date})'
     VALIDDATEMINDATE: 'Your date has to be newer or matching the minimum allowed date ({date})'
   Director:
-    ADD: Add
-    CSVEXPORT: 'Export to CSV'
     INVALID_REQUEST: 'Invalid request'
-    NOTFOUND: 'No items found'
   DropdownField:
     CHOOSE: (छान्)
   EmailField:
@@ -124,8 +138,6 @@ ne:
     SINGULARNAME: 'Email Bounce Record'
   Enum:
     ANY: Any
-    LOADING: Loading...
-    REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
   File:
     Content: Content
     Filename: Filename
@@ -150,13 +162,17 @@ ne:
     FROMFILESTORE: 'From the File Store'
     NOSOURCE: 'Please select a source file to attach'
     REPLACE: 'Replace {type}'
+  FileIFrameField_iframe.ss:
+    TITLE: 'Image Uploading Iframe'
   Filesystem:
-    IMPORT_TAB_HEADER: Import
-    SEARCHLISTINGS: Search
     SYNCRESULTS: 'Sync complete: {createdcount} items created, {deletedcount} items deleted'
+  ForgotPasswordEmail.ss:
+    HELLO: हाई
+    TEXT1: 'Here is your'
+    TEXT2: 'password reset link'
+    TEXT3: for
   Form:
     FIELDISREQUIRED: '%s चाहिन्छ'
-    TITLE: 'Image Uploading Iframe'
     VALIDATIONCREDITNUMBER: 'Please ensure you have entered the {number} credit card number correctly'
     VALIDATIONNOTUNIQUE: 'लेखिएको मान भिन्न छैन '
     VALIDATIONPASSWORDSDONTMATCH: 'पासओडहरु मिल्दैन्नन'
@@ -187,37 +203,26 @@ ne:
     ResetFilter: Reset
   GridFieldAction_Delete:
     DeletePermissionsFailure: 'No delete permissions'
-    NEXT: पछीको
-    PREVIOUS: पहिलाको
   GridFieldDetailForm:
     Create: Create
     Delete: Delete
     DeletePermissionsFailure: 'No delete permissions'
     Deleted: 'Deleted %s %s'
-    HELLO: हाई
     Save: Save
     Saved: 'Saved %s %s'
-    TEXT1: 'Here is your'
+  GridFieldItemEditView.ss: null
-    TEXT2: 'password reset link'
-    TEXT3: for
   Group:
     AddRole: 'Add a role for this group'
-    CHANGEPASSWORDTEXT1: 'तपाईंले आफनो पासओड  यसका लागि परिवतन गर्नु भयो '
-    CHANGEPASSWORDTEXT2: 'दिएको विवरण अनुसार भित्र जान सक्नुहुन्छ :'
     Code: 'Group Code'
     DefaultGroupTitleAdministrators: Administrators
     DefaultGroupTitleContentAuthors: 'Content Authors'
     Description: Description
-    EMAIL: Email
     GroupReminder: 'If you choose a parent group, this group will take all it''s roles'
-    HELLO: हाई
     Locked: 'Locked?'
     NoRoles: 'No roles found'
-    PASSWORD: Password
     Parent: 'Parent Group'
     RolesAddEditLink: 'Manage roles'
     Sort: 'Sort Order'
-    TITLE: 'तस्बिर उप्लोओद गर्ने Iफ्रमे'
     has_many_Permissions: Permissions
     many_many_Members: Members
   GroupImportForm:
@@ -275,10 +280,9 @@ ne:
     UpdateMEDIA: 'Update Media'
   ImageField:
     IMAGE: Image
-  Image_iframe.ss: 'ChangePasswordEmail.ss:  BackLink_Button.ss:  CMSLoadingScreen.ss:  RelationComplexTableField.ss:  ForgotPasswordEmail.ss:    APPLY FILTER: "Apply Filter"  GridFieldItemEditView.ss:    Go back: "Go back"  ModelSidebar.ss:  TableListField_PageControls.ss:  ModelAdmin_Tools.ss:  ComplexTableField_popup.ss:  TableField.ss:  FileIFrameField_iframe.ss:  ComplexTableField.ss:  TableListField.ss:  ModelAdmin_ImportSpec.ss:  LeftAndMain_Menu.ss:'
+  Image_iframe.ss:
+    TITLE: 'तस्बिर उप्लोओद गर्ने Iफ्रमे'
   LeftAndMain:
-    ADD: 'Add a new row'
-    ADDITEM: 'Add %s'
     CANT_REORGANISE: 'You do not have permission to alter Top level pages. Your change was not saved.'
     DELETED: Deleted.
     DropdownBatchActionsDefault: Actions
@@ -292,6 +296,9 @@ ne:
     REORGANISATIONSUCCESSFUL: 'Reorganised the site tree successfully.'
     SAVEDUP: Saved.
     VersionUnknown: unknown
+  LeftAndMain_Menu.ss:
+    Hello: Hi
+    LOGOUT: 'Log out'
   LoginAttempt:
     Email: 'Email Address'
     IP: 'IP Address'
@@ -368,6 +375,7 @@ ne:
     ResultUpdated: 'Updated {count} members'
   MemberTableField: null
   ModelAdmin:
+    'APPLY FILTER': 'Apply Filter'
     DELETE: Delete
     DELETEDRECORDS: 'Deleted {count} records.'
     IMPORT: 'Import from CSV'
@@ -377,6 +385,17 @@ ne:
     RESET: Reset
     Title: 'Data Models'
     UPDATEDRECORDS: 'Updated {count} records.'
+  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
   MoneyField:
     FIELDLABELAMOUNT: Amount
     FIELDLABELCURRENCY: Currency
@@ -389,10 +408,6 @@ ne:
     CMS_ACCESS_CATEGORY: 'CMS Access'
     FULLADMINRIGHTS: 'Full administrative rights'
     FULLADMINRIGHTS_HELP: 'Implies and overrules all other assigned permissions.'
-    IMPORTSPECFIELDS: 'Database columns'
-    IMPORTSPECLINK: 'Show Specification for %s'
-    IMPORTSPECRELATIONS: Relations
-    IMPORTSPECTITLE: 'Specification for %s'
   PermissionCheckboxSetField:
     AssignedTo: 'assigned to "{title}"'
     FromGroup: 'inherited from group "{title}"'
@@ -401,8 +416,11 @@ ne:
   Permissions:
     PERMISSIONS_CATEGORY: 'Roles and access permissions'
   PhoneNumberField:
-    Back: Back
     VALIDATION: 'कृपया मिल्ने फोन नम्बर हाल्नुहोस् '
+  RelationComplexTableField.ss:
+    ADD: Add
+    CSVEXPORT: 'Export to CSV'
+    NOTFOUND: 'No items found'
   Security:
     ALREADYLOGGEDIN: 'तपाईंसँग भित्र जाने आधिकार छैन । यदि तपाईंसँग अरुकुनै अकाउन्ट छ जस्ले पेज भित्र जान मिल्छ, भने त्यो अकाउन्टले भित्र जानुस् ।       '
     BUTTONSEND: 'मलाई पासओड पुनर्स्थापना लिक पठाउ'
@@ -439,31 +457,33 @@ ne:
     BtnImport: 'Import from CSV'
     FileFieldLabel: 'CSV File <small>(Allowed extensions: *.csv)</small>'
   SilverStripeNavigator:
-    DISPLAYING: Displaying
     Edit: Edit
-    FILTER: Filter
+  SimpleImageField:
-    IMPORT: Import
+    NOUPLOAD: 'कुनै पनि तस्बिर उप्लोओद गरिएको छैन '
+  SiteTree:
+    TABMAIN: मुख्य
+  TableField:
+    ISREQUIRED: 'In %s ''%s'' is required'
+  TableField.ss:
+    ADD: 'Add a new row'
+    ADDITEM: 'Add %s'
+  TableListField:
+    CSVEXPORT: 'Export to CSV'
+    PRINT: Print
+    Print: Print
+    SELECT: 'Select:'
+  TableListField.ss:
+    NOITEMSFOUND: 'No items found'
+    SORTASC: 'Sort in ascending order'
+    SORTDESC: 'Sort in descending order'
+  TableListField_PageControls.ss:
+    DISPLAYING: Displaying
     OF: of
     TO: to
     VIEWFIRST: 'View first'
     VIEWLAST: 'View last'
     VIEWNEXT: 'View next'
     VIEWPREVIOUS: 'View previous'
-  SimpleImageField:
-    NOUPLOAD: 'कुनै पनि तस्बिर उप्लोओद गरिएको छैन '
-  SiteTree:
-    TABMAIN: मुख्य
-  TableField:
-    ADDITEM: 'Add %s'
-    ISREQUIRED: 'In %s ''%s'' is required'
-    NOITEMSFOUND: 'No items found'
-    SORTASC: 'Sort in ascending order'
-    SORTDESC: 'Sort in descending order'
-  TableListField:
-    CSVEXPORT: 'Export to CSV'
-    PRINT: Print
-    Print: Print
-    SELECT: 'Select:'
   TimeField:
     VALIDATEFORMAT: 'Please enter a valid time format ({format})'
   ToggleField:

lang/nl.yml

@@ -50,6 +50,8 @@ nl:
     UNORDERED: 'Ongesorteerde lijst'
     UNORDEREDDESCRIPTION: 'Ongesorteerde lijst'
     UNORDEREDEXAMPLE1: 'ongesorteerd item 1'
+  BackLink_Button.ss:
+    Back: Back
   BasicAuth:
     ENTERINFO: 'Voer een gebruikers naam en wachtwoord in.'
     ERRORNOTADMIN: 'Die gebruiker is geen beheerder.'
@@ -57,9 +59,10 @@ nl:
   Boolean:
     0: Nee
     ANY: Elke
-    Hello: Hi
-    LOGOUT: 'Log out'
     1: Ja
+  CMSLoadingScreen.ss:
+    LOADING: Loading...
+    REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
   CMSMain:
     ACCESS: 'Access to ''{title}'' section'
     ACCESSALLINTERFACES: 'Toegang tot alle CMS onderdelen'
@@ -67,6 +70,12 @@ nl:
     SAVE: Bewaar
   CMSProfileController:
     MENUTITLE: CMSProfileController
+  ChangePasswordEmail.ss:
+    CHANGEPASSWORDTEXT1: 'U heeft het wachtwoord veranderd voor'
+    CHANGEPASSWORDTEXT2: 'U kunt nu onderstaande gegevens gebruiken om in te loggen:'
+    EMAIL: E-mail
+    HELLO: Hallo
+    PASSWORD: Wachtwoord
   CheckboxField:
     - Nee
     - Ja
@@ -74,6 +83,14 @@ nl:
     CLOSEPOPUP: 'Sluit Popup'
     SUCCESSADD2: 'Toegevoegd {name}'
     SUCCESSEDIT: '%s %s %s Opgeslagen'
+  ComplexTableField.ss:
+    ADDITEM: 'Add %s'
+    NOITEMSFOUND: 'No items found'
+    SORTASC: 'Sorteer oplopend'
+    SORTDESC: 'Sorteer aflopend'
+  ComplexTableField_popup.ss:
+    NEXT: Volgende
+    PREVIOUS: Vorige
   ConfirmedPasswordField:
     ATLEAST: 'Passwords must be at least {min} characters long.'
     BETWEEN: 'Passwords must be {min} to {max} characters long.'
@@ -111,10 +128,7 @@ nl:
     VALIDDATEMAXDATE: 'Your date has to be older or matching the maximum allowed date ({date})'
     VALIDDATEMINDATE: 'Your date has to be newer or matching the minimum allowed date ({date})'
   Director:
-    ADD: Toevoegen
-    CSVEXPORT: 'Export to CSV'
     INVALID_REQUEST: 'Invalid request'
-    NOTFOUND: 'No items found'
   DropdownField:
     CHOOSE: (Kies)
   EmailField:
@@ -124,8 +138,6 @@ nl:
     SINGULARNAME: 'Onbezorgbare email'
   Enum:
     ANY: Elke
-    LOADING: Loading...
-    REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
   File:
     Content: Inhoud
     Filename: 'Bestandsnaam '
@@ -150,13 +162,17 @@ nl:
     FROMFILESTORE: 'Vanaf de website''s bestandsopslag'
     NOSOURCE: 'Selecteer een bron bestand om toe te voegen'
     REPLACE: 'Replace {type}'
+  FileIFrameField_iframe.ss:
+    TITLE: 'Afbeelding uploaden'
   Filesystem:
-    IMPORT_TAB_HEADER: Importeer
-    SEARCHLISTINGS: Zoeken
     SYNCRESULTS: 'Synchroniseren compleet: {createdcount} bestanden aangemaakt, {deletedcount} bestanden verwijderd.'
+  ForgotPasswordEmail.ss:
+    HELLO: Hallo
+    TEXT1: 'Hier is uw'
+    TEXT2: 'wachtwoord reset link'
+    TEXT3: voor
   Form:
     FIELDISREQUIRED: '%s is verplicht'
-    TITLE: 'Afbeelding uploaden'
     VALIDATIONCREDITNUMBER: 'Please ensure you have entered the {number} credit card number correctly'
     VALIDATIONNOTUNIQUE: 'De ingevoerde waarde is niet uniek'
     VALIDATIONPASSWORDSDONTMATCH: 'Wachtwoorden komen niet overeen'
@@ -187,37 +203,26 @@ nl:
     ResetFilter: Reset
   GridFieldAction_Delete:
     DeletePermissionsFailure: 'Onvoldoende rechten om te verwijderen'
-    NEXT: Volgende
-    PREVIOUS: Vorige
   GridFieldDetailForm:
     Create: Create
     Delete: Verwijder
     DeletePermissionsFailure: 'No delete permissions'
     Deleted: 'Deleted %s %s'
-    HELLO: Hallo
     Save: Opslaan
     Saved: '%s %s %s Opgeslagen'
-    TEXT1: 'Hier is uw'
+  GridFieldItemEditView.ss: null
-    TEXT2: 'wachtwoord reset link'
-    TEXT3: voor
   Group:
     AddRole: 'Voeg een rol toe aan deze groep'
-    CHANGEPASSWORDTEXT1: 'U heeft het wachtwoord veranderd voor'
-    CHANGEPASSWORDTEXT2: 'U kunt nu onderstaande gegevens gebruiken om in te loggen:'
     Code: 'Groep code'
     DefaultGroupTitleAdministrators: Beheerders
     DefaultGroupTitleContentAuthors: 'Inhoud Auteurs'
     Description: 'Omschrijving '
-    EMAIL: E-mail
     GroupReminder: 'Als je de bovenliggende groep selecteert, neemt deze groep alle rollen over'
-    HELLO: Hallo
     Locked: 'Gesloten?'
     NoRoles: 'Geen rollen gevonden'
-    PASSWORD: Wachtwoord
     Parent: 'Bovenliggende groep'
     RolesAddEditLink: 'Toevoegen/wijzigingen rollen'
     Sort: Sorteer-richting
-    TITLE: 'Afbeelding uploaden'
     has_many_Permissions: Rechten
     many_many_Members: Lid
   GroupImportForm:
@@ -275,10 +280,9 @@ nl:
     UpdateMEDIA: 'Update Media'
   ImageField:
     IMAGE: Afbeelding
-  Image_iframe.ss: 'ChangePasswordEmail.ss:  BackLink_Button.ss:  CMSLoadingScreen.ss:  RelationComplexTableField.ss:  ForgotPasswordEmail.ss:    APPLY FILTER: "Filter toepassen"  GridFieldItemEditView.ss:    Go back: "Ga terug"  ModelSidebar.ss:  TableListField_PageControls.ss:  ModelAdmin_Tools.ss:  ComplexTableField_popup.ss:  TableField.ss:  FileIFrameField_iframe.ss:  ComplexTableField.ss:  TableListField.ss:  ModelAdmin_ImportSpec.ss:  LeftAndMain_Menu.ss:'
+  Image_iframe.ss:
+    TITLE: 'Afbeelding uploaden'
   LeftAndMain:
-    ADD: 'Nieuwe rij toevoegen'
-    ADDITEM: 'Add %s'
     CANT_REORGANISE: 'You do not have permission to alter Top level pages. Your change was not saved.'
     DELETED: Deleted.
     DropdownBatchActionsDefault: Acties
@@ -292,6 +296,9 @@ nl:
     REORGANISATIONSUCCESSFUL: 'Reorganised the site tree successfully.'
     SAVEDUP: Saved.
     VersionUnknown: onbekend
+  LeftAndMain_Menu.ss:
+    Hello: Hi
+    LOGOUT: 'Log out'
   LoginAttempt:
     Email: 'Email adres '
     IP: 'IP Adres'
@@ -368,6 +375,7 @@ nl:
     ResultUpdated: 'Updated {count} members'
   MemberTableField: null
   ModelAdmin:
+    'APPLY FILTER': 'Filter toepassen'
     DELETE: Verwijderen
     DELETEDRECORDS: 'Deleted {count} records.'
     IMPORT: 'Importeren vanuit CSV'
@@ -377,6 +385,17 @@ nl:
     RESET: Reset
     Title: 'Data Models'
     UPDATEDRECORDS: 'Updated {count} records.'
+  ModelAdmin_ImportSpec.ss:
+    IMPORTSPECFIELDS: 'Database columns'
+    IMPORTSPECLINK: 'Show Specification for %s'
+    IMPORTSPECRELATIONS: Relations
+    IMPORTSPECTITLE: 'Specification for %s'
+  ModelAdmin_Tools.ss:
+    FILTER: Filter
+    IMPORT: Importeer
+  ModelSidebar.ss:
+    IMPORT_TAB_HEADER: Importeer
+    SEARCHLISTINGS: Zoeken
   MoneyField:
     FIELDLABELAMOUNT: Aantal
     FIELDLABELCURRENCY: Valuta
@@ -389,10 +408,6 @@ nl:
     CMS_ACCESS_CATEGORY: 'CMS Toegang'
     FULLADMINRIGHTS: 'Volledige admin rechten'
     FULLADMINRIGHTS_HELP: 'Impliceert en overstemt alle andere toegewezen rechten.'
-    IMPORTSPECFIELDS: 'Database columns'
-    IMPORTSPECLINK: 'Show Specification for %s'
-    IMPORTSPECRELATIONS: Relations
-    IMPORTSPECTITLE: 'Specification for %s'
   PermissionCheckboxSetField:
     AssignedTo: 'assigned to "{title}"'
     FromGroup: 'inherited from group "{title}"'
@@ -401,8 +416,11 @@ nl:
   Permissions:
     PERMISSIONS_CATEGORY: 'Rollen en toegangsrechten'
   PhoneNumberField:
-    Back: Back
     VALIDATION: 'Voer een geldig telefoonnummer in'
+  RelationComplexTableField.ss:
+    ADD: Toevoegen
+    CSVEXPORT: 'Export to CSV'
+    NOTFOUND: 'No items found'
   Security:
     ALREADYLOGGEDIN: 'Je hebt niet de juiste rechten, om deze pagina te kunnen bekijken.  Als je een ander account met de juiste rechten hebt, kun je hier <a href="%s">opnieuw inloggen</a>.'
     BUTTONSEND: 'Zend mij de link om mijn wachtwoord opnieuw aan te maken'
@@ -439,31 +457,33 @@ nl:
     BtnImport: Importeer
     FileFieldLabel: 'CSV Bestand <small>(Toegestane extensies: *.csv)</small>'
   SilverStripeNavigator:
-    DISPLAYING: Displaying
     Edit: Bewerken
-    FILTER: Filter
+  SimpleImageField:
-    IMPORT: Importeer
+    NOUPLOAD: 'Geen afbeeldingen ontvangen'
+  SiteTree:
+    TABMAIN: Hoofdgedeelte
+  TableField:
+    ISREQUIRED: 'In %s ''%s'' is required'
+  TableField.ss:
+    ADD: 'Nieuwe rij toevoegen'
+    ADDITEM: 'Add %s'
+  TableListField:
+    CSVEXPORT: 'Exporteer naar CSV'
+    PRINT: Afdrukken
+    Print: Print
+    SELECT: 'Selecteer:'
+  TableListField.ss:
+    NOITEMSFOUND: 'No items found'
+    SORTASC: 'Sorteer in oplopende volgorde'
+    SORTDESC: 'Sorteer in aflopende volgorde'
+  TableListField_PageControls.ss:
+    DISPLAYING: Displaying
     OF: of
     TO: to
     VIEWFIRST: 'Bekijk eerste'
     VIEWLAST: 'Bekijk laatste'
     VIEWNEXT: 'Bekijk volgende'
     VIEWPREVIOUS: 'Bekijk vorige'
-  SimpleImageField:
-    NOUPLOAD: 'Geen afbeeldingen ontvangen'
-  SiteTree:
-    TABMAIN: Hoofdgedeelte
-  TableField:
-    ADDITEM: 'Add %s'
-    ISREQUIRED: 'In %s ''%s'' is required'
-    NOITEMSFOUND: 'No items found'
-    SORTASC: 'Sorteer in oplopende volgorde'
-    SORTDESC: 'Sorteer in aflopende volgorde'
-  TableListField:
-    CSVEXPORT: 'Exporteer naar CSV'
-    PRINT: Afdrukken
-    Print: Print
-    SELECT: 'Selecteer:'
   TimeField:
     VALIDATEFORMAT: 'Please enter a valid time format ({format})'
   ToggleField:

lang/pa.yml

@@ -50,6 +50,8 @@ pa:
     UNORDERED: 'Unordered list'
     UNORDEREDDESCRIPTION: 'Unordered list'
     UNORDEREDEXAMPLE1: 'unordered item 1'
+  BackLink_Button.ss:
+    Back: Back
   BasicAuth:
     ENTERINFO: 'ਿਕ੍ਰਪਾ ਕਰਕੇ ਇੱਕ username ਅਤੇ password ਪਾਉ'
     ERRORNOTADMIN: 'ਇਹ user ਪ੍ਰਬੰਧਕ ਨਹੀ ਹੈ।'
@@ -57,9 +59,10 @@ pa:
   Boolean:
     0: 'False'
     ANY: Any
-    Hello: Hi
-    LOGOUT: 'Log out'
     1: 'True'
+  CMSLoadingScreen.ss:
+    LOADING: Loading...
+    REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
   CMSMain:
     ACCESS: 'Access to ''{title}'' section'
     ACCESSALLINTERFACES: 'Access to all CMS sections'
@@ -67,6 +70,12 @@ pa:
     SAVE: Save
   CMSProfileController:
     MENUTITLE: CMSProfileController
+  ChangePasswordEmail.ss:
+    CHANGEPASSWORDTEXT1: 'ਤੁਸੀ ਆਪਣਾ ਪਾਸਵਰਡ ਬਦਲਿਆ ਖਾਤਰ'
+    CHANGEPASSWORDTEXT2: 'You can now use the following credentials to log in:'
+    EMAIL: Email
+    HELLO: ਹਾਏ
+    PASSWORD: Password
   CheckboxField:
     - 'False'
     - 'True'
@@ -74,6 +83,14 @@ pa:
     CLOSEPOPUP: 'Close Popup'
     SUCCESSADD2: 'Added {name}'
     SUCCESSEDIT: 'Saved %s %s %s'
+  ComplexTableField.ss:
+    ADDITEM: 'Add %s'
+    NOITEMSFOUND: 'No items found'
+    SORTASC: 'Sort ascending'
+    SORTDESC: 'Sort descending'
+  ComplexTableField_popup.ss:
+    NEXT: 'ਅਗਲਾ'
+    PREVIOUS: ਪਿਛਲਾ
   ConfirmedPasswordField:
     ATLEAST: 'Passwords must be at least {min} characters long.'
     BETWEEN: 'Passwords must be {min} to {max} characters long.'
@@ -111,10 +128,7 @@ pa:
     VALIDDATEMAXDATE: 'Your date has to be older or matching the maximum allowed date ({date})'
     VALIDDATEMINDATE: 'Your date has to be newer or matching the minimum allowed date ({date})'
   Director:
-    ADD: Add
-    CSVEXPORT: 'Export to CSV'
     INVALID_REQUEST: 'Invalid request'
-    NOTFOUND: 'No items found'
   DropdownField:
     CHOOSE: '( ਚੁਣੋ )'
   EmailField:
@@ -124,8 +138,6 @@ pa:
     SINGULARNAME: 'Email Bounce Record'
   Enum:
     ANY: Any
-    LOADING: Loading...
-    REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
   File:
     Content: Content
     Filename: Filename
@@ -150,13 +162,17 @@ pa:
     FROMFILESTORE: 'From the File Store'
     NOSOURCE: 'Please select a source file to attach'
     REPLACE: 'Replace {type}'
+  FileIFrameField_iframe.ss:
+    TITLE: 'Image Uploading Iframe'
   Filesystem:
-    IMPORT_TAB_HEADER: Import
-    SEARCHLISTINGS: Search
     SYNCRESULTS: 'Sync complete: {createdcount} items created, {deletedcount} items deleted'
+  ForgotPasswordEmail.ss:
+    HELLO: ਹਾਏ
+    TEXT1: 'Here is your'
+    TEXT2: 'password reset link'
+    TEXT3: for
   Form:
     FIELDISREQUIRED: '%s ਚਾਹੀਦਾ ਹੈ'
-    TITLE: 'Image Uploading Iframe'
     VALIDATIONCREDITNUMBER: 'Please ensure you have entered the {number} credit card number correctly'
     VALIDATIONNOTUNIQUE: 'The value entered is not unique'
     VALIDATIONPASSWORDSDONTMATCH: 'Passwords ਮੇਲ ਨਹੀ ਖਾਦੇ '
@@ -187,37 +203,26 @@ pa:
     ResetFilter: Reset
   GridFieldAction_Delete:
     DeletePermissionsFailure: 'No delete permissions'
-    NEXT: ਅਗਲਾ
-    PREVIOUS: ਪਿਛਲਾ
   GridFieldDetailForm:
     Create: Create
     Delete: Delete
     DeletePermissionsFailure: 'No delete permissions'
     Deleted: 'Deleted %s %s'
-    HELLO: ਹਾਏ
     Save: Save
     Saved: 'Saved %s %s'
-    TEXT1: 'Here is your'
+  GridFieldItemEditView.ss: null
-    TEXT2: 'password reset link'
-    TEXT3: for
   Group:
     AddRole: 'Add a role for this group'
-    CHANGEPASSWORDTEXT1: 'ਤੁਸੀ ਆਪਣਾ ਪਾਸਵਰਡ ਬਦਲਿਆ ਖਾਤਰ'
-    CHANGEPASSWORDTEXT2: 'You can now use the following credentials to log in:'
     Code: 'Group Code'
     DefaultGroupTitleAdministrators: Administrators
     DefaultGroupTitleContentAuthors: 'Content Authors'
     Description: Description
-    EMAIL: Email
     GroupReminder: 'If you choose a parent group, this group will take all it''s roles'
-    HELLO: ਹਾਏ
     Locked: 'Locked?'
     NoRoles: 'No roles found'
-    PASSWORD: Password
     Parent: 'Parent Group'
     RolesAddEditLink: 'Manage roles'
     Sort: 'Sort Order'
-    TITLE: 'Image Uploading Iframe'
     has_many_Permissions: Permissions
     many_many_Members: Members
   GroupImportForm:
@@ -275,10 +280,9 @@ pa:
     UpdateMEDIA: 'Update Media'
   ImageField:
     IMAGE: Image
-  Image_iframe.ss: 'ChangePasswordEmail.ss:  BackLink_Button.ss:  CMSLoadingScreen.ss:  RelationComplexTableField.ss:  ForgotPasswordEmail.ss:    APPLY FILTER: "Apply Filter"  GridFieldItemEditView.ss:    Go back: "Go back"  ModelSidebar.ss:  TableListField_PageControls.ss:  ModelAdmin_Tools.ss:  ComplexTableField_popup.ss:  TableField.ss:  FileIFrameField_iframe.ss:  ComplexTableField.ss:  TableListField.ss:  ModelAdmin_ImportSpec.ss:  LeftAndMain_Menu.ss:'
+  Image_iframe.ss:
+    TITLE: 'Image Uploading Iframe'
   LeftAndMain:
-    ADD: 'Add a new row'
-    ADDITEM: 'Add %s'
     CANT_REORGANISE: 'You do not have permission to alter Top level pages. Your change was not saved.'
     DELETED: Deleted.
     DropdownBatchActionsDefault: Actions
@@ -292,6 +296,9 @@ pa:
     REORGANISATIONSUCCESSFUL: 'Reorganised the site tree successfully.'
     SAVEDUP: Saved.
     VersionUnknown: unknown
+  LeftAndMain_Menu.ss:
+    Hello: Hi
+    LOGOUT: 'Log out'
   LoginAttempt:
     Email: 'Email Address'
     IP: 'IP Address'
@@ -368,6 +375,7 @@ pa:
     ResultUpdated: 'Updated {count} members'
   MemberTableField: null
   ModelAdmin:
+    'APPLY FILTER': 'Apply Filter'
     DELETE: Delete
     DELETEDRECORDS: 'Deleted {count} records.'
     IMPORT: 'Import from CSV'
@@ -377,6 +385,17 @@ pa:
     RESET: Reset
     Title: 'Data Models'
     UPDATEDRECORDS: 'Updated {count} records.'
+  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
   MoneyField:
     FIELDLABELAMOUNT: Amount
     FIELDLABELCURRENCY: Currency
@@ -389,10 +408,6 @@ pa:
     CMS_ACCESS_CATEGORY: 'CMS Access'
     FULLADMINRIGHTS: 'Full administrative rights'
     FULLADMINRIGHTS_HELP: 'Implies and overrules all other assigned permissions.'
-    IMPORTSPECFIELDS: 'Database columns'
-    IMPORTSPECLINK: 'Show Specification for %s'
-    IMPORTSPECRELATIONS: Relations
-    IMPORTSPECTITLE: 'Specification for %s'
   PermissionCheckboxSetField:
     AssignedTo: 'assigned to "{title}"'
     FromGroup: 'inherited from group "{title}"'
@@ -401,8 +416,11 @@ pa:
   Permissions:
     PERMISSIONS_CATEGORY: 'Roles and access permissions'
   PhoneNumberField:
-    Back: Back
     VALIDATION: 'ਿਕ੍ਰਪਾ ਕਰਕੇ ਇੱਕ ਸਹੀ ਫ਼ੋਨ ਨੰਬਰ ਪਾਉ'
+  RelationComplexTableField.ss:
+    ADD: Add
+    CSVEXPORT: 'Export to CSV'
+    NOTFOUND: 'No items found'
   Security:
     ALREADYLOGGEDIN: 'You don''t have access to this page. If you have another account that can access that page, you can log in below.'
     BUTTONSEND: 'Send me the password reset link'
@@ -439,31 +457,33 @@ pa:
     BtnImport: 'Import from CSV'
     FileFieldLabel: 'CSV File <small>(Allowed extensions: *.csv)</small>'
   SilverStripeNavigator:
-    DISPLAYING: Displaying
     Edit: Edit
-    FILTER: Filter
+  SimpleImageField:
-    IMPORT: Import
+    NOUPLOAD: 'ਕੋਈ ਫੋਟੋ ਅੱਪਲੋਡ ਨਹੀ ਹੋਈ'
+  SiteTree:
+    TABMAIN: 'ਮੁੱਖ	'
+  TableField:
+    ISREQUIRED: 'In %s ''%s'' is required'
+  TableField.ss:
+    ADD: 'Add a new row'
+    ADDITEM: 'Add %s'
+  TableListField:
+    CSVEXPORT: 'Export to CSV'
+    PRINT: Print
+    Print: Print
+    SELECT: 'Select:'
+  TableListField.ss:
+    NOITEMSFOUND: 'No items found'
+    SORTASC: 'Sort in ascending order'
+    SORTDESC: 'Sort in descending order'
+  TableListField_PageControls.ss:
+    DISPLAYING: Displaying
     OF: of
     TO: to
     VIEWFIRST: 'View first'
     VIEWLAST: 'View last'
     VIEWNEXT: 'View next'
     VIEWPREVIOUS: 'View previous'
-  SimpleImageField:
-    NOUPLOAD: 'ਕੋਈ ਫੋਟੋ ਅੱਪਲੋਡ ਨਹੀ ਹੋਈ'
-  SiteTree:
-    TABMAIN: 'ਮੁੱਖ	'
-  TableField:
-    ADDITEM: 'Add %s'
-    ISREQUIRED: 'In %s ''%s'' is required'
-    NOITEMSFOUND: 'No items found'
-    SORTASC: 'Sort in ascending order'
-    SORTDESC: 'Sort in descending order'
-  TableListField:
-    CSVEXPORT: 'Export to CSV'
-    PRINT: Print
-    Print: Print
-    SELECT: 'Select:'
   TimeField:
     VALIDATEFORMAT: 'Please enter a valid time format ({format})'
   ToggleField:

lang/pl.yml

@@ -50,6 +50,8 @@ pl:
     UNORDERED: 'Nienumerowana lista'
     UNORDEREDDESCRIPTION: 'Nienumerowana lista'
     UNORDEREDEXAMPLE1: 'nienumerowany element 1'
+  BackLink_Button.ss:
+    Back: Wstecz
   BasicAuth:
     ENTERINFO: 'Wprowadź username i hasło'
     ERRORNOTADMIN: 'Ten użytkownik nie jest administratorem'
@@ -57,9 +59,10 @@ pl:
   Boolean:
     0: Nie
     ANY: Jakikolwiek
-    Hello: Hi
-    LOGOUT: 'Wyloguj się'
     1: Tak
+  CMSLoadingScreen.ss:
+    LOADING: Wczytywanie...
+    REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
   CMSMain:
     ACCESS: 'Dostęp do sekcji ''{title}'''
     ACCESSALLINTERFACES: 'Dostęp do wszystkich sekcji CMSa'
@@ -67,6 +70,12 @@ pl:
     SAVE: Zapisz
   CMSProfileController:
     MENUTITLE: CMSProfileController
+  ChangePasswordEmail.ss:
+    CHANGEPASSWORDTEXT1: 'Zmieniłeś hasło na'
+    CHANGEPASSWORDTEXT2: 'Teraz możesz używać następujących danych do logowania się:'
+    EMAIL: Email
+    HELLO: Cześć
+    PASSWORD: Hasło
   CheckboxField:
     - Nie
     - Tak
@@ -74,6 +83,14 @@ pl:
     CLOSEPOPUP: 'Zamknij Okienko'
     SUCCESSADD2: 'Dodano {name}'
     SUCCESSEDIT: 'Zapisano %s %s %s'
+  ComplexTableField.ss:
+    ADDITEM: 'Add %s'
+    NOITEMSFOUND: 'No items found'
+    SORTASC: 'Sortuj rosnąco'
+    SORTDESC: 'Sortuj malejąco'
+  ComplexTableField_popup.ss:
+    NEXT: Następny
+    PREVIOUS: Poprzedni
   ConfirmedPasswordField:
     ATLEAST: 'Hasła muszą mieć przynajmniej {min} znaków.'
     BETWEEN: 'Hasła muszą mieć długość pomiędzy {min} a {max} znaków.'
@@ -96,8 +113,8 @@ pl:
     HOURS: godziny
     MIN: min
     MINS: minuty
-    MONTH: miesiąc
+    MONTH: 'miesiąc'
-    MONTHS: miesiące
+    MONTHS: 'miesiące'
     SEC: sekunda
     SECS: sekundy
     TIMEDIFFAGO: '{difference} temu'
@@ -111,10 +128,7 @@ pl:
     VALIDDATEMAXDATE: 'Twoja data musi być wcześniejsza lub taka sama, jak maksymalna dozwolona data ({date})'
     VALIDDATEMINDATE: 'Twoja data musi być późniejsza lub taka sama, jak minimalna dozwolona data ({date})'
   Director:
-    ADD: Dodaj
-    CSVEXPORT: 'Export to CSV'
     INVALID_REQUEST: 'Nieprawidłowe żądanie'
-    NOTFOUND: 'No items found'
   DropdownField:
     CHOOSE: (wybierz)
   EmailField:
@@ -124,8 +138,6 @@ pl:
     SINGULARNAME: 'Odrzucony e-mail'
   Enum:
     ANY: Jakikolwiek
-    LOADING: Wczytywanie...
-    REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
   File:
     Content: Zawartość
     Filename: 'Nazwa pliku'
@@ -150,13 +162,17 @@ pl:
     FROMFILESTORE: 'Ze Składnicy Plików'
     NOSOURCE: 'Wybierz źródło pliku do załaczenia'
     REPLACE: 'Zastąp {type}'
+  FileIFrameField_iframe.ss:
+    TITLE: 'Iframe wgrywania zdjęć'
   Filesystem:
-    IMPORT_TAB_HEADER: Import
-    SEARCHLISTINGS: Znajdź
     SYNCRESULTS: 'Synchronizacja zakończona: stworzono {createdcount} i usunięto {deletedcount} pozycji'
+  ForgotPasswordEmail.ss:
+    HELLO: Cześć
+    TEXT1: 'Oto twój'
+    TEXT2: 'link zmiany hasła'
+    TEXT3: dla
   Form:
     FIELDISREQUIRED: '%s jest wymagane'
-    TITLE: 'Iframe wgrywania zdjęć'
     VALIDATIONCREDITNUMBER: 'Proszę upewnij się, że wprowadzony numer karty kredytowej {number} jest prawidłowy'
     VALIDATIONNOTUNIQUE: 'Wprowadzona wartość nie jest unikalna'
     VALIDATIONPASSWORDSDONTMATCH: 'Hasła nie są takie same'
@@ -187,37 +203,26 @@ pl:
     ResetFilter: Resetuj
   GridFieldAction_Delete:
     DeletePermissionsFailure: 'Brak uprawnień do usuwania'
-    NEXT: Następny
-    PREVIOUS: Poprzedni
   GridFieldDetailForm:
     Create: Stwórz
     Delete: Usuń
     DeletePermissionsFailure: 'Brak uprawnień do usuwania'
     Deleted: 'Usunięto %s %s'
-    HELLO: Cześć
     Save: Zapisz
     Saved: 'Zapisano %s %s'
-    TEXT1: 'Oto twój'
+  GridFieldItemEditView.ss: null
-    TEXT2: 'link zmiany hasła'
-    TEXT3: dla
   Group:
     AddRole: 'Dodaj rolę dla tej grupy'
-    CHANGEPASSWORDTEXT1: 'Zmieniłeś hasło na'
-    CHANGEPASSWORDTEXT2: 'Teraz możesz używać następujących danych do logowania się:'
     Code: 'Kod Grupy'
     DefaultGroupTitleAdministrators: Administratorzy
     DefaultGroupTitleContentAuthors: 'Autor treści'
     Description: Opis
-    EMAIL: Email
     GroupReminder: 'Jeśli wybierzesz nadrzędną grupę, ta grupa otrzyma wszystkie jej role'
-    HELLO: Cześć
     Locked: 'Zablokowana?'
     NoRoles: 'Nie znaleziono ról'
-    PASSWORD: Hasło
     Parent: 'Grupa nadrzędna'
     RolesAddEditLink: 'Zarządzaj rolami'
     Sort: 'Kolejność Sortowania'
-    TITLE: 'Ładowanie Zdjęć (Iframe)'
     has_many_Permissions: Zezwolenia
     many_many_Members: Członkowie
   GroupImportForm:
@@ -275,10 +280,9 @@ pl:
     UpdateMEDIA: 'Zaktualizuj Media'
   ImageField:
     IMAGE: Obraz
-  Image_iframe.ss: 'ChangePasswordEmail.ss:  BackLink_Button.ss:  CMSLoadingScreen.ss:  RelationComplexTableField.ss:  ForgotPasswordEmail.ss:    APPLY FILTER: "Zastosuj filtr"  GridFieldItemEditView.ss:    Go back: "Wstecz"  ModelSidebar.ss:  TableListField_PageControls.ss:  ModelAdmin_Tools.ss:  ComplexTableField_popup.ss:  TableField.ss:  FileIFrameField_iframe.ss:  ComplexTableField.ss:  TableListField.ss:  ModelAdmin_ImportSpec.ss:  LeftAndMain_Menu.ss:'
+  Image_iframe.ss:
+    TITLE: 'Ładowanie Zdjęć (Iframe)'
   LeftAndMain:
-    ADD: 'Dodaj nowy rząd'
-    ADDITEM: 'Add %s'
     CANT_REORGANISE: 'Nie masz uprawnień by zmieniać strony na najwyższym poziomie. Twoje zmiany nie zostały zapisane.'
     DELETED: Usunięto.
     DropdownBatchActionsDefault: Akcje
@@ -288,10 +292,13 @@ pl:
     PERMALREADY: 'Niestety nie masz dostępu do tej części CMS. Jeśli chcesz zalogować się jako ktoś inny, zrób to poniżej'
     PERMDEFAULT: 'Proszę wybrać metodę identyfikacji i wpisać swoje dane, aby uruchomić CMSa.'
     PLEASESAVE: 'Proszę Zapisz Stronę: Ta strona nie mogła zostać uaktualniona ponieważ nie została jeszcze zapisana.'
-    PreviewButton: Podgląd
+    PreviewButton: 'Podgląd'
     REORGANISATIONSUCCESSFUL: 'Pomyślnie zreorganizowano drzewo serwisu.'
     SAVEDUP: Zapisano.
     VersionUnknown: nieznany
+  LeftAndMain_Menu.ss:
+    Hello: Hi
+    LOGOUT: 'Wyloguj się'
   LoginAttempt:
     Email: 'Adres E-mail'
     IP: 'Adres IP'
@@ -350,7 +357,7 @@ pl:
     HOURNOLEADING: 'Godzina bez wiodącego zera'
     MINUTENOLEADING: 'Minuta bez wiodącego zera'
     MONTHNOLEADING: 'Miesiąc bez wiodącego zera'
-    Preview: Podgląd
+    Preview: 'Podgląd'
     SHORTMONTH: 'Skrócona nazwa miesiąca (np. Cze)'
     TOGGLEHELP: 'Przełącz pomoc formatowania'
     TWODIGITDAY: 'Dwucyfrowy dzień miesiąca'
@@ -368,6 +375,7 @@ pl:
     ResultUpdated: 'Zaktualizowano członków: {count}'
   MemberTableField: null
   ModelAdmin:
+    'APPLY FILTER': 'Zastosuj filtr'
     DELETE: Usuń
     DELETEDRECORDS: 'Usunięto rekordów: {count}'
     IMPORT: 'Import z CSV'
@@ -377,6 +385,17 @@ pl:
     RESET: Zresetuj
     Title: 'Modele danych'
     UPDATEDRECORDS: 'Zaktualizowano {count} rekordów.'
+  ModelAdmin_ImportSpec.ss:
+    IMPORTSPECFIELDS: 'Kolumny bazy danych'
+    IMPORTSPECLINK: 'Show Specification for %s'
+    IMPORTSPECRELATIONS: Relacje
+    IMPORTSPECTITLE: 'Specification for %s'
+  ModelAdmin_Tools.ss:
+    FILTER: Filtr
+    IMPORT: Import
+  ModelSidebar.ss:
+    IMPORT_TAB_HEADER: Import
+    SEARCHLISTINGS: Znajdź
   MoneyField:
     FIELDLABELAMOUNT: Ilość
     FIELDLABELCURRENCY: waluta
@@ -389,10 +408,6 @@ pl:
     CMS_ACCESS_CATEGORY: 'Dostęp do CMSa'
     FULLADMINRIGHTS: 'Pełne prawa administracyjne'
     FULLADMINRIGHTS_HELP: 'Zatwierdza i nadpisuje wszystkie istniejące uprawnienia'
-    IMPORTSPECFIELDS: 'Kolumny bazy danych'
-    IMPORTSPECLINK: 'Show Specification for %s'
-    IMPORTSPECRELATIONS: Relacje
-    IMPORTSPECTITLE: 'Specification for %s'
   PermissionCheckboxSetField:
     AssignedTo: 'przypisany do "{title}"'
     FromGroup: 'odziedziczone z grupy "{title}"'
@@ -401,8 +416,11 @@ pl:
   Permissions:
     PERMISSIONS_CATEGORY: 'Uprawnienia ról i dostępu'
   PhoneNumberField:
-    Back: Wstecz
     VALIDATION: 'Wprowadź poprawny numer telefonu'
+  RelationComplexTableField.ss:
+    ADD: Dodaj
+    CSVEXPORT: 'Export to CSV'
+    NOTFOUND: 'No items found'
   Security:
     ALREADYLOGGEDIN: 'Nie masz dostępu do tej strony. Jeśli posiadasz inne konto, które umożliwi Ci dostęp do tej strony, możesz się zalogować poniżej'
     BUTTONSEND: 'Wyślij mi link do zresetowania hasła'
@@ -439,31 +457,33 @@ pl:
     BtnImport: 'Import z CSV'
     FileFieldLabel: 'Plik CSV <small>(Dozwolone rozszerzenia: *.csv)</small>'
   SilverStripeNavigator:
-    DISPLAYING: Displaying
     Edit: Edycja
-    FILTER: Filtr
+  SimpleImageField:
-    IMPORT: Import
+    NOUPLOAD: 'Nie wgrano zdjęć'
+  SiteTree:
+    TABMAIN: Główny
+  TableField:
+    ISREQUIRED: 'W %s ''%s'' jest wymagany'
+  TableField.ss:
+    ADD: 'Dodaj nowy rząd'
+    ADDITEM: 'Add %s'
+  TableListField:
+    CSVEXPORT: 'Eksportuj do CSV'
+    PRINT: Drukuj
+    Print: Print
+    SELECT: 'Wybierz:'
+  TableListField.ss:
+    NOITEMSFOUND: 'No items found'
+    SORTASC: 'Sortuj w porządku rosnącym'
+    SORTDESC: 'Sortuj w porządku malejącym'
+  TableListField_PageControls.ss:
+    DISPLAYING: Displaying
     OF: of
     TO: to
     VIEWFIRST: 'Zobacz pierwsze'
     VIEWLAST: 'Zobacz ostatnie'
     VIEWNEXT: 'Zobacz następne'
     VIEWPREVIOUS: 'Zobacz poprzednie'
-  SimpleImageField:
-    NOUPLOAD: 'Nie wgrano zdjęć'
-  SiteTree:
-    TABMAIN: Główny
-  TableField:
-    ADDITEM: 'Add %s'
-    ISREQUIRED: 'W %s ''%s'' jest wymagany'
-    NOITEMSFOUND: 'No items found'
-    SORTASC: 'Sortuj w porządku rosnącym'
-    SORTDESC: 'Sortuj w porządku malejącym'
-  TableListField:
-    CSVEXPORT: 'Eksportuj do CSV'
-    PRINT: Drukuj
-    Print: Print
-    SELECT: 'Wybierz:'
   TimeField:
     VALIDATEFORMAT: 'Proszę wprowadź prawidłowy format czasu ({format})'
   ToggleField:

lang/pt.yml

@@ -50,6 +50,8 @@ pt:
     UNORDERED: 'Unordered list'
     UNORDEREDDESCRIPTION: 'Lista não ordenada'
     UNORDEREDEXAMPLE1: 'item não ordenado 1'
+  BackLink_Button.ss:
+    Back: Back
   BasicAuth:
     ENTERINFO: 'Por favor insira um nome de utilizador e password.'
     ERRORNOTADMIN: 'Esse utilizador não é um administrador.'
@@ -57,9 +59,10 @@ pt:
   Boolean:
     0: Não
     ANY: Qualquer
-    Hello: Hi
-    LOGOUT: 'Log out'
     1: Sim
+  CMSLoadingScreen.ss:
+    LOADING: Loading...
+    REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
   CMSMain:
     ACCESS: 'Access to ''{title}'' section'
     ACCESSALLINTERFACES: 'Access to all CMS sections'
@@ -67,6 +70,12 @@ pt:
     SAVE: Guardar
   CMSProfileController:
     MENUTITLE: CMSProfileController
+  ChangePasswordEmail.ss:
+    CHANGEPASSWORDTEXT1: 'Modificou a sua password para'
+    CHANGEPASSWORDTEXT2: 'Pode utilizar agora as seguintes credenciais para se autenticar:'
+    EMAIL: Email
+    HELLO: Olá
+    PASSWORD: Palavra-chave
   CheckboxField:
     - Não
     - Sim
@@ -74,6 +83,14 @@ pt:
     CLOSEPOPUP: 'Fechar Janela'
     SUCCESSADD2: 'Added {name}'
     SUCCESSEDIT: 'Guardado  %s %s %s'
+  ComplexTableField.ss:
+    ADDITEM: 'Add %s'
+    NOITEMSFOUND: 'No items found'
+    SORTASC: 'Ordenar ascendente'
+    SORTDESC: 'Ordenar descendente'
+  ComplexTableField_popup.ss:
+    NEXT: Próximo
+    PREVIOUS: Anterior
   ConfirmedPasswordField:
     ATLEAST: 'Passwords must be at least {min} characters long.'
     BETWEEN: 'Passwords must be {min} to {max} characters long.'
@@ -111,10 +128,7 @@ pt:
     VALIDDATEMAXDATE: 'Your date has to be older or matching the maximum allowed date ({date})'
     VALIDDATEMINDATE: 'Your date has to be newer or matching the minimum allowed date ({date})'
   Director:
-    ADD: Adicionar
-    CSVEXPORT: 'Export to CSV'
     INVALID_REQUEST: 'Invalid request'
-    NOTFOUND: 'No items found'
   DropdownField:
     CHOOSE: (Escolha)
   EmailField:
@@ -124,8 +138,6 @@ pt:
     SINGULARNAME: 'Email Bounce Record'
   Enum:
     ANY: Qualquer
-    LOADING: Loading...
-    REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
   File:
     Content: Conteúdo
     Filename: 'Nome do ficheiro'
@@ -150,13 +162,17 @@ pt:
     FROMFILESTORE: 'Do Sistema de Ficheiros'
     NOSOURCE: 'Please select a source file to attach'
     REPLACE: 'Replace {type}'
+  FileIFrameField_iframe.ss:
+    TITLE: 'Image Uploading Iframe'
   Filesystem:
-    IMPORT_TAB_HEADER: Import
-    SEARCHLISTINGS: Search
     SYNCRESULTS: 'Sync complete: {createdcount} items created, {deletedcount} items deleted'
+  ForgotPasswordEmail.ss:
+    HELLO: Olá
+    TEXT1: 'Este é o seu'
+    TEXT2: 'link para alterar password'
+    TEXT3: para
   Form:
     FIELDISREQUIRED: '%s é de preenchimento obrigatório'
-    TITLE: 'Image Uploading Iframe'
     VALIDATIONCREDITNUMBER: 'Please ensure you have entered the {number} credit card number correctly'
     VALIDATIONNOTUNIQUE: 'O valor inserido não é único'
     VALIDATIONPASSWORDSDONTMATCH: 'Passwords não coincidem'
@@ -187,37 +203,26 @@ pt:
     ResetFilter: Reset
   GridFieldAction_Delete:
     DeletePermissionsFailure: 'No delete permissions'
-    NEXT: Próximo
-    PREVIOUS: Anterior
   GridFieldDetailForm:
     Create: Create
     Delete: Delete
     DeletePermissionsFailure: 'No delete permissions'
     Deleted: 'Deleted %s %s'
-    HELLO: Olá
     Save: Save
     Saved: 'Saved %s %s'
-    TEXT1: 'Este é o seu'
+  GridFieldItemEditView.ss: null
-    TEXT2: 'link para alterar password'
-    TEXT3: para
   Group:
     AddRole: 'Add a role for this group'
-    CHANGEPASSWORDTEXT1: 'Modificou a sua password para'
-    CHANGEPASSWORDTEXT2: 'Pode utilizar agora as seguintes credenciais para se autenticar:'
     Code: 'Grupo de código'
     DefaultGroupTitleAdministrators: Administradores
     DefaultGroupTitleContentAuthors: 'Autores de Conteúdo'
     Description: Descrição
-    EMAIL: Email
     GroupReminder: 'If you choose a parent group, this group will take all it''s roles'
-    HELLO: Olá
     Locked: 'Fechado?'
     NoRoles: 'No roles found'
-    PASSWORD: Palavra-chave
     Parent: 'Grupo pai'
     RolesAddEditLink: 'Manage roles'
     Sort: 'Ordem de ordenação'
-    TITLE: 'Iframe de envio de Imagem'
     has_many_Permissions: Permissões
     many_many_Members: Membros
   GroupImportForm:
@@ -275,10 +280,9 @@ pt:
     UpdateMEDIA: 'Update Media'
   ImageField:
     IMAGE: Image
-  Image_iframe.ss: 'ChangePasswordEmail.ss:  BackLink_Button.ss:  CMSLoadingScreen.ss:  RelationComplexTableField.ss:  ForgotPasswordEmail.ss:    APPLY FILTER: "Apply Filter"  GridFieldItemEditView.ss:    Go back: "Go back"  ModelSidebar.ss:  TableListField_PageControls.ss:  ModelAdmin_Tools.ss:  ComplexTableField_popup.ss:  TableField.ss:  FileIFrameField_iframe.ss:  ComplexTableField.ss:  TableListField.ss:  ModelAdmin_ImportSpec.ss:  LeftAndMain_Menu.ss:'
+  Image_iframe.ss:
+    TITLE: 'Iframe de envio de Imagem'
   LeftAndMain:
-    ADD: 'Adicionar nova linha'
-    ADDITEM: 'Add %s'
     CANT_REORGANISE: 'You do not have permission to alter Top level pages. Your change was not saved.'
     DELETED: Deleted.
     DropdownBatchActionsDefault: Actions
@@ -292,6 +296,9 @@ pt:
     REORGANISATIONSUCCESSFUL: 'Reorganised the site tree successfully.'
     SAVEDUP: Saved.
     VersionUnknown: unknown
+  LeftAndMain_Menu.ss:
+    Hello: Hi
+    LOGOUT: 'Log out'
   LoginAttempt:
     Email: 'Endereço de Email'
     IP: 'Endereço IP'
@@ -368,6 +375,7 @@ pt:
     ResultUpdated: 'Updated {count} members'
   MemberTableField: null
   ModelAdmin:
+    'APPLY FILTER': 'Apply Filter'
     DELETE: Delete
     DELETEDRECORDS: 'Deleted {count} records.'
     IMPORT: 'Import from CSV'
@@ -377,6 +385,17 @@ pt:
     RESET: Reset
     Title: 'Data Models'
     UPDATEDRECORDS: 'Updated {count} records.'
+  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
   MoneyField:
     FIELDLABELAMOUNT: Amount
     FIELDLABELCURRENCY: Currency
@@ -389,10 +408,6 @@ pt:
     CMS_ACCESS_CATEGORY: 'CMS Access'
     FULLADMINRIGHTS: 'Direitos de Administrador'
     FULLADMINRIGHTS_HELP: 'Implies and overrules all other assigned permissions.'
-    IMPORTSPECFIELDS: 'Database columns'
-    IMPORTSPECLINK: 'Show Specification for %s'
-    IMPORTSPECRELATIONS: Relations
-    IMPORTSPECTITLE: 'Specification for %s'
   PermissionCheckboxSetField:
     AssignedTo: 'assigned to "{title}"'
     FromGroup: 'inherited from group "{title}"'
@@ -401,8 +416,11 @@ pt:
   Permissions:
     PERMISSIONS_CATEGORY: 'Regras e permissões de acesso'
   PhoneNumberField:
-    Back: Back
     VALIDATION: 'Por favor insira um número de telefone válido'
+  RelationComplexTableField.ss:
+    ADD: Adicionar
+    CSVEXPORT: 'Export to CSV'
+    NOTFOUND: 'No items found'
   Security:
     ALREADYLOGGEDIN: 'Não tem acesso a esta página. Se tem outras credenciais que lhe permitem aceder a esta página, pode-se autenticar abaixo.'
     BUTTONSEND: 'Enviar o link para recuperar a password'
@@ -439,31 +457,33 @@ pt:
     BtnImport: 'Import from CSV'
     FileFieldLabel: 'CSV File <small>(Allowed extensions: *.csv)</small>'
   SilverStripeNavigator:
-    DISPLAYING: Displaying
     Edit: Edit
-    FILTER: Filter
+  SimpleImageField:
-    IMPORT: Import
+    NOUPLOAD: 'Nenhuma imagem enviada'
+  SiteTree:
+    TABMAIN: Principal
+  TableField:
+    ISREQUIRED: 'In %s ''%s'' is required'
+  TableField.ss:
+    ADD: 'Adicionar nova linha'
+    ADDITEM: 'Add %s'
+  TableListField:
+    CSVEXPORT: 'Exportar para CSV'
+    PRINT: Imprimir
+    Print: Print
+    SELECT: 'Escolha:'
+  TableListField.ss:
+    NOITEMSFOUND: 'No items found'
+    SORTASC: 'Ordenar por ordem crescente'
+    SORTDESC: 'Ordenar por ordem decrescente'
+  TableListField_PageControls.ss:
+    DISPLAYING: Displaying
     OF: of
     TO: to
     VIEWFIRST: 'Ver o primeiro'
     VIEWLAST: 'Ver o último'
     VIEWNEXT: 'Ver o próximo'
     VIEWPREVIOUS: 'Ver o anterior'
-  SimpleImageField:
-    NOUPLOAD: 'Nenhuma imagem enviada'
-  SiteTree:
-    TABMAIN: Principal
-  TableField:
-    ADDITEM: 'Add %s'
-    ISREQUIRED: 'In %s ''%s'' is required'
-    NOITEMSFOUND: 'No items found'
-    SORTASC: 'Ordenar por ordem crescente'
-    SORTDESC: 'Ordenar por ordem decrescente'
-  TableListField:
-    CSVEXPORT: 'Exportar para CSV'
-    PRINT: Imprimir
-    Print: Print
-    SELECT: 'Escolha:'
   TimeField:
     VALIDATEFORMAT: 'Please enter a valid time format ({format})'
   ToggleField:

lang/pt_BR.yml

@@ -50,6 +50,8 @@ pt_BR:
     UNORDERED: Marcadores
     UNORDEREDDESCRIPTION: Marcadores
     UNORDEREDEXAMPLE1: 'Item não ordenado 1'
+  BackLink_Button.ss:
+    Back: Back
   BasicAuth:
     ENTERINFO: 'Por favor entre nome de usuário e senha.'
     ERRORNOTADMIN: 'Este usuário não é um administrador'
@@ -57,9 +59,10 @@ pt_BR:
   Boolean:
     0: 'False'
     ANY: Any
-    Hello: Hi
-    LOGOUT: 'Log out'
     1: 'True'
+  CMSLoadingScreen.ss:
+    LOADING: Loading...
+    REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
   CMSMain:
     ACCESS: 'Access to ''{title}'' section'
     ACCESSALLINTERFACES: 'Acessar todas as interfaces do CMS'
@@ -67,6 +70,12 @@ pt_BR:
     SAVE: Salvar
   CMSProfileController:
     MENUTITLE: CMSProfileController
+  ChangePasswordEmail.ss:
+    CHANGEPASSWORDTEXT1: 'Você alterou sua senha para'
+    CHANGEPASSWORDTEXT2: 'Agora, você pode usar as seguintes credenciais para realizar o login:'
+    EMAIL: Email
+    HELLO: Olá
+    PASSWORD: Senha
   CheckboxField:
     - 'False'
     - 'True'
@@ -74,6 +83,14 @@ pt_BR:
     CLOSEPOPUP: 'Fechar janela'
     SUCCESSADD2: 'Added {name}'
     SUCCESSEDIT: '%s %s %s salvo(s)'
+  ComplexTableField.ss:
+    ADDITEM: 'Add %s'
+    NOITEMSFOUND: 'No items found'
+    SORTASC: 'Ordenar ascendente'
+    SORTDESC: 'Ordenar descendente'
+  ComplexTableField_popup.ss:
+    NEXT: Próximo
+    PREVIOUS: Anterior
   ConfirmedPasswordField:
     ATLEAST: 'Passwords must be at least {min} characters long.'
     BETWEEN: 'Passwords must be {min} to {max} characters long.'
@@ -111,10 +128,7 @@ pt_BR:
     VALIDDATEMAXDATE: 'Your date has to be older or matching the maximum allowed date ({date})'
     VALIDDATEMINDATE: 'Your date has to be newer or matching the minimum allowed date ({date})'
   Director:
-    ADD: Incluir
-    CSVEXPORT: 'Export to CSV'
     INVALID_REQUEST: 'Invalid request'
-    NOTFOUND: 'No items found'
   DropdownField:
     CHOOSE: Selecione
   EmailField:
@@ -124,8 +138,6 @@ pt_BR:
     SINGULARNAME: 'Email Bounce Record'
   Enum:
     ANY: Any
-    LOADING: Loading...
-    REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
   File:
     Content: Conteudo
     Filename: 'Nome do Arquivo'
@@ -150,13 +162,17 @@ pt_BR:
     FROMFILESTORE: 'From the File Store'
     NOSOURCE: 'Please select a source file to attach'
     REPLACE: 'Replace {type}'
+  FileIFrameField_iframe.ss:
+    TITLE: 'Image Uploading Iframe'
   Filesystem:
-    IMPORT_TAB_HEADER: Import
-    SEARCHLISTINGS: Search
     SYNCRESULTS: 'Sync complete: {createdcount} items created, {deletedcount} items deleted'
+  ForgotPasswordEmail.ss:
+    HELLO: Olá
+    TEXT1: 'Este é seu'
+    TEXT2: 'link para reiniciar sua senha'
+    TEXT3: para
   Form:
     FIELDISREQUIRED: '%s é requerido'
-    TITLE: 'Image Uploading Iframe'
     VALIDATIONCREDITNUMBER: 'Please ensure you have entered the {number} credit card number correctly'
     VALIDATIONNOTUNIQUE: 'O valor inserido não é exclusivo'
     VALIDATIONPASSWORDSDONTMATCH: 'Senha não confere'
@@ -187,37 +203,26 @@ pt_BR:
     ResetFilter: Reset
   GridFieldAction_Delete:
     DeletePermissionsFailure: 'No delete permissions'
-    NEXT: Próximo
-    PREVIOUS: Anterior
   GridFieldDetailForm:
     Create: Create
     Delete: Delete
     DeletePermissionsFailure: 'No delete permissions'
     Deleted: 'Deleted %s %s'
-    HELLO: Olá
     Save: Save
     Saved: 'Saved %s %s'
-    TEXT1: 'Este é seu'
+  GridFieldItemEditView.ss: null
-    TEXT2: 'link para reiniciar sua senha'
-    TEXT3: para
   Group:
     AddRole: 'Add a role for this group'
-    CHANGEPASSWORDTEXT1: 'Você alterou sua senha para'
-    CHANGEPASSWORDTEXT2: 'Agora, você pode usar as seguintes credenciais para realizar o login:'
     Code: 'Grupo de código'
     DefaultGroupTitleAdministrators: Administrators
     DefaultGroupTitleContentAuthors: 'Content Authors'
     Description: Descrição
-    EMAIL: Email
     GroupReminder: 'If you choose a parent group, this group will take all it''s roles'
-    HELLO: Olá
     Locked: 'Travado?'
     NoRoles: 'No roles found'
-    PASSWORD: Senha
     Parent: 'Grupo pai'
     RolesAddEditLink: 'Manage roles'
     Sort: Ordenação
-    TITLE: 'Upload de imagem'
     has_many_Permissions: Permissões
     many_many_Members: Membros
   GroupImportForm:
@@ -275,10 +280,9 @@ pt_BR:
     UpdateMEDIA: 'Update Media'
   ImageField:
     IMAGE: Image
-  Image_iframe.ss: 'ChangePasswordEmail.ss:  BackLink_Button.ss:  CMSLoadingScreen.ss:  RelationComplexTableField.ss:  ForgotPasswordEmail.ss:    APPLY FILTER: "Apply Filter"  GridFieldItemEditView.ss:    Go back: "Go back"  ModelSidebar.ss:  TableListField_PageControls.ss:  ModelAdmin_Tools.ss:  ComplexTableField_popup.ss:  TableField.ss:  FileIFrameField_iframe.ss:  ComplexTableField.ss:  TableListField.ss:  ModelAdmin_ImportSpec.ss:  LeftAndMain_Menu.ss:'
+  Image_iframe.ss:
+    TITLE: 'Upload de imagem'
   LeftAndMain:
-    ADD: 'Incluir nova linha'
-    ADDITEM: 'Add %s'
     CANT_REORGANISE: 'You do not have permission to alter Top level pages. Your change was not saved.'
     DELETED: Deleted.
     DropdownBatchActionsDefault: Actions
@@ -292,6 +296,9 @@ pt_BR:
     REORGANISATIONSUCCESSFUL: 'Reorganised the site tree successfully.'
     SAVEDUP: Saved.
     VersionUnknown: unknown
+  LeftAndMain_Menu.ss:
+    Hello: Hi
+    LOGOUT: 'Log out'
   LoginAttempt:
     Email: 'Endereço de E-mail'
     IP: 'Endereço IP'
@@ -368,6 +375,7 @@ pt_BR:
     ResultUpdated: 'Updated {count} members'
   MemberTableField: null
   ModelAdmin:
+    'APPLY FILTER': 'Apply Filter'
     DELETE: Excluir
     DELETEDRECORDS: 'Deleted {count} records.'
     IMPORT: 'importar do CSV'
@@ -377,6 +385,17 @@ pt_BR:
     RESET: Reset
     Title: 'Data Models'
     UPDATEDRECORDS: 'Updated {count} records.'
+  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
   MoneyField:
     FIELDLABELAMOUNT: Amount
     FIELDLABELCURRENCY: Currency
@@ -389,10 +408,6 @@ pt_BR:
     CMS_ACCESS_CATEGORY: 'CMS Access'
     FULLADMINRIGHTS: 'Todos os direitos administrativos'
     FULLADMINRIGHTS_HELP: 'Implies and overrules all other assigned permissions.'
-    IMPORTSPECFIELDS: 'Database columns'
-    IMPORTSPECLINK: 'Show Specification for %s'
-    IMPORTSPECRELATIONS: Relations
-    IMPORTSPECTITLE: 'Specification for %s'
   PermissionCheckboxSetField:
     AssignedTo: 'assigned to "{title}"'
     FromGroup: 'inherited from group "{title}"'
@@ -401,8 +416,11 @@ pt_BR:
   Permissions:
     PERMISSIONS_CATEGORY: 'Roles and access permissions'
   PhoneNumberField:
-    Back: Back
     VALIDATION: 'Por favor digite um número de telefone válido'
+  RelationComplexTableField.ss:
+    ADD: Incluir
+    CSVEXPORT: 'Export to CSV'
+    NOTFOUND: 'No items found'
   Security:
     ALREADYLOGGEDIN: 'Você não tem acesso a esta página. Se você tem outra conta que pode acessar esta página, você pode efetuar o login abaixo.'
     BUTTONSEND: 'Envie-me o link para resetar a senha'
@@ -439,31 +457,33 @@ pt_BR:
     BtnImport: 'Import from CSV'
     FileFieldLabel: 'CSV File <small>(Allowed extensions: *.csv)</small>'
   SilverStripeNavigator:
-    DISPLAYING: Displaying
     Edit: Edit
-    FILTER: Filter
+  SimpleImageField:
-    IMPORT: Import
+    NOUPLOAD: 'Não foi feito o upload de nenhuma imagem'
+  SiteTree:
+    TABMAIN: Principal
+  TableField:
+    ISREQUIRED: 'In %s ''%s'' is required'
+  TableField.ss:
+    ADD: 'Incluir nova linha'
+    ADDITEM: 'Add %s'
+  TableListField:
+    CSVEXPORT: 'Exportar para CSV'
+    PRINT: Imprimir
+    Print: Print
+    SELECT: 'Select:'
+  TableListField.ss:
+    NOITEMSFOUND: 'No items found'
+    SORTASC: 'Sort in ascending order'
+    SORTDESC: 'Sort in descending order'
+  TableListField_PageControls.ss:
+    DISPLAYING: Displaying
     OF: of
     TO: to
     VIEWFIRST: 'Ver o Primeiro'
     VIEWLAST: 'Ver o Ultimo'
     VIEWNEXT: 'Ver o próximo'
     VIEWPREVIOUS: 'Ver o anterior'
-  SimpleImageField:
-    NOUPLOAD: 'Não foi feito o upload de nenhuma imagem'
-  SiteTree:
-    TABMAIN: Principal
-  TableField:
-    ADDITEM: 'Add %s'
-    ISREQUIRED: 'In %s ''%s'' is required'
-    NOITEMSFOUND: 'No items found'
-    SORTASC: 'Sort in ascending order'
-    SORTDESC: 'Sort in descending order'
-  TableListField:
-    CSVEXPORT: 'Exportar para CSV'
-    PRINT: Imprimir
-    Print: Print
-    SELECT: 'Select:'
   TimeField:
     VALIDATEFORMAT: 'Please enter a valid time format ({format})'
   ToggleField:

lang/ro.yml

@@ -50,6 +50,8 @@ ro:
     UNORDERED: 'Unordered list'
     UNORDEREDDESCRIPTION: 'Unordered list'
     UNORDEREDEXAMPLE1: 'unordered item 1'
+  BackLink_Button.ss:
+    Back: Back
   BasicAuth:
     ENTERINFO: 'Va rugam introduceţi un user si o parolă.'
     ERRORNOTADMIN: 'Acest utilizator nu este un administrator.'
@@ -57,9 +59,10 @@ ro:
   Boolean:
     0: 'False'
     ANY: Any
-    Hello: Hi
-    LOGOUT: 'Log out'
     1: 'True'
+  CMSLoadingScreen.ss:
+    LOADING: Loading...
+    REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
   CMSMain:
     ACCESS: 'Access to ''{title}'' section'
     ACCESSALLINTERFACES: 'Access to all CMS sections'
@@ -67,6 +70,12 @@ ro:
     SAVE: Save
   CMSProfileController:
     MENUTITLE: CMSProfileController
+  ChangePasswordEmail.ss:
+    CHANGEPASSWORDTEXT1: 'Ti-ai schimbat parola in'
+    CHANGEPASSWORDTEXT2: 'You can now use the following credentials to log in:'
+    EMAIL: Email
+    HELLO: Salut
+    PASSWORD: Parola
   CheckboxField:
     - 'False'
     - 'True'
@@ -74,6 +83,14 @@ ro:
     CLOSEPOPUP: 'Close Popup'
     SUCCESSADD2: 'Added {name}'
     SUCCESSEDIT: 'Saved %s %s %s'
+  ComplexTableField.ss:
+    ADDITEM: 'Add %s'
+    NOITEMSFOUND: 'No items found'
+    SORTASC: 'Sortează ascendent'
+    SORTDESC: 'Sortează descendent'
+  ComplexTableField_popup.ss:
+    NEXT: Urmatorul
+    PREVIOUS: Anteriorul
   ConfirmedPasswordField:
     ATLEAST: 'Passwords must be at least {min} characters long.'
     BETWEEN: 'Passwords must be {min} to {max} characters long.'
@@ -111,10 +128,7 @@ ro:
     VALIDDATEMAXDATE: 'Your date has to be older or matching the maximum allowed date ({date})'
     VALIDDATEMINDATE: 'Your date has to be newer or matching the minimum allowed date ({date})'
   Director:
-    ADD: Adauga
-    CSVEXPORT: 'Export to CSV'
     INVALID_REQUEST: 'Invalid request'
-    NOTFOUND: 'No items found'
   DropdownField:
     CHOOSE: (Alege)
   EmailField:
@@ -124,8 +138,6 @@ ro:
     SINGULARNAME: 'Email Bounce Record'
   Enum:
     ANY: Oricare
-    LOADING: Loading...
-    REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
   File:
     Content: Content
     Filename: Filename
@@ -150,13 +162,17 @@ ro:
     FROMFILESTORE: 'From the File Store'
     NOSOURCE: 'Please select a source file to attach'
     REPLACE: 'Replace {type}'
+  FileIFrameField_iframe.ss:
+    TITLE: 'Image Uploading Iframe'
   Filesystem:
-    IMPORT_TAB_HEADER: Import
-    SEARCHLISTINGS: Search
     SYNCRESULTS: 'Sync complete: {createdcount} items created, {deletedcount} items deleted'
+  ForgotPasswordEmail.ss:
+    HELLO: Salut
+    TEXT1: 'Here is your'
+    TEXT2: 'link de resetare a parolei'
+    TEXT3: pentru
   Form:
     FIELDISREQUIRED: '%s is required'
-    TITLE: 'Image Uploading Iframe'
     VALIDATIONCREDITNUMBER: 'Please ensure you have entered the {number} credit card number correctly'
     VALIDATIONNOTUNIQUE: 'Valoarea introdusă nu este unică'
     VALIDATIONPASSWORDSDONTMATCH: 'Passwords don''t match'
@@ -187,37 +203,26 @@ ro:
     ResetFilter: Reseteaza
   GridFieldAction_Delete:
     DeletePermissionsFailure: 'No delete permissions'
-    NEXT: Urmatorul
-    PREVIOUS: Anteriorul
   GridFieldDetailForm:
     Create: Create
     Delete: Delete
     DeletePermissionsFailure: 'No delete permissions'
     Deleted: 'Deleted %s %s'
-    HELLO: Salut
     Save: Save
     Saved: 'Saved %s %s'
-    TEXT1: 'Here is your'
+  GridFieldItemEditView.ss: null
-    TEXT2: 'link de resetare a parolei'
-    TEXT3: pentru
   Group:
     AddRole: 'Add a role for this group'
-    CHANGEPASSWORDTEXT1: 'Ti-ai schimbat parola in'
-    CHANGEPASSWORDTEXT2: 'You can now use the following credentials to log in:'
     Code: 'Cod Grup'
     DefaultGroupTitleAdministrators: Administratori
     DefaultGroupTitleContentAuthors: 'Content Authors'
     Description: Descriere
-    EMAIL: Email
     GroupReminder: 'If you choose a parent group, this group will take all it''s roles'
-    HELLO: Salut
     Locked: 'Blocat?'
     NoRoles: 'No roles found'
-    PASSWORD: Parola
     Parent: 'Grup de Baza'
     RolesAddEditLink: 'Manage roles'
     Sort: 'Ordine de sortare'
-    TITLE: 'Image Uploading Iframe'
     has_many_Permissions: Permisiuni
     many_many_Members: Membri
   GroupImportForm:
@@ -275,10 +280,9 @@ ro:
     UpdateMEDIA: 'Update Media'
   ImageField:
     IMAGE: Imagine
-  Image_iframe.ss: 'ChangePasswordEmail.ss:  BackLink_Button.ss:  CMSLoadingScreen.ss:  RelationComplexTableField.ss:  ForgotPasswordEmail.ss:    APPLY FILTER: "Aplica filtru"  GridFieldItemEditView.ss:    Go back: "Go back"  ModelSidebar.ss:  TableListField_PageControls.ss:  ModelAdmin_Tools.ss:  ComplexTableField_popup.ss:  TableField.ss:  FileIFrameField_iframe.ss:  ComplexTableField.ss:  TableListField.ss:  ModelAdmin_ImportSpec.ss:  LeftAndMain_Menu.ss:'
+  Image_iframe.ss:
+    TITLE: 'Image Uploading Iframe'
   LeftAndMain:
-    ADD: 'Add a new row'
-    ADDITEM: 'Add %s'
     CANT_REORGANISE: 'You do not have permission to alter Top level pages. Your change was not saved.'
     DELETED: Deleted.
     DropdownBatchActionsDefault: Actions
@@ -292,6 +296,9 @@ ro:
     REORGANISATIONSUCCESSFUL: 'Reorganised the site tree successfully.'
     SAVEDUP: Saved.
     VersionUnknown: unknown
+  LeftAndMain_Menu.ss:
+    Hello: Hi
+    LOGOUT: 'Log out'
   LoginAttempt:
     Email: 'Email Address'
     IP: 'Adresa IP'
@@ -368,6 +375,7 @@ ro:
     ResultUpdated: 'Updated {count} members'
   MemberTableField: null
   ModelAdmin:
+    'APPLY FILTER': 'Aplica filtru'
     DELETE: Delete
     DELETEDRECORDS: 'Deleted {count} records.'
     IMPORT: 'Import from CSV'
@@ -377,6 +385,17 @@ ro:
     RESET: Reset
     Title: 'Data Models'
     UPDATEDRECORDS: 'Updated {count} records.'
+  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
   MoneyField:
     FIELDLABELAMOUNT: Amount
     FIELDLABELCURRENCY: Currency
@@ -389,10 +408,6 @@ ro:
     CMS_ACCESS_CATEGORY: 'CMS Access'
     FULLADMINRIGHTS: 'Full administrative rights'
     FULLADMINRIGHTS_HELP: 'Implies and overrules all other assigned permissions.'
-    IMPORTSPECFIELDS: 'Database columns'
-    IMPORTSPECLINK: 'Show Specification for %s'
-    IMPORTSPECRELATIONS: Relations
-    IMPORTSPECTITLE: 'Specification for %s'
   PermissionCheckboxSetField:
     AssignedTo: 'assigned to "{title}"'
     FromGroup: 'inherited from group "{title}"'
@@ -401,8 +416,11 @@ ro:
   Permissions:
     PERMISSIONS_CATEGORY: 'Roles and access permissions'
   PhoneNumberField:
-    Back: Back
     VALIDATION: 'Please enter a valid phone number'
+  RelationComplexTableField.ss:
+    ADD: Adauga
+    CSVEXPORT: 'Export to CSV'
+    NOTFOUND: 'No items found'
   Security:
     ALREADYLOGGEDIN: 'You don''t have access to this page.  If you have another account that can access that page, you can log in again below.'
     BUTTONSEND: 'Send me the password reset link'
@@ -439,31 +457,33 @@ ro:
     BtnImport: 'Import from CSV'
     FileFieldLabel: 'CSV File <small>(Allowed extensions: *.csv)</small>'
   SilverStripeNavigator:
-    DISPLAYING: Displaying
     Edit: Edit
-    FILTER: Filter
+  SimpleImageField:
-    IMPORT: Import
+    NOUPLOAD: 'Nici o imagine incarcata'
+  SiteTree:
+    TABMAIN: Pincipal
+  TableField:
+    ISREQUIRED: 'In %s ''%s'' is required'
+  TableField.ss:
+    ADD: 'Add a new row'
+    ADDITEM: 'Add %s'
+  TableListField:
+    CSVEXPORT: 'Exportati ca CSV'
+    PRINT: Imprima
+    Print: Print
+    SELECT: Selecteaza
+  TableListField.ss:
+    NOITEMSFOUND: 'No items found'
+    SORTASC: 'Sort in ascending order'
+    SORTDESC: 'Sort in descending order'
+  TableListField_PageControls.ss:
+    DISPLAYING: Displaying
     OF: of
     TO: to
     VIEWFIRST: 'Vezi primul'
     VIEWLAST: 'Vezi ultimul'
     VIEWNEXT: 'Vezi urmator'
     VIEWPREVIOUS: 'Vezi anterior'
-  SimpleImageField:
-    NOUPLOAD: 'Nici o imagine incarcata'
-  SiteTree:
-    TABMAIN: Pincipal
-  TableField:
-    ADDITEM: 'Add %s'
-    ISREQUIRED: 'In %s ''%s'' is required'
-    NOITEMSFOUND: 'No items found'
-    SORTASC: 'Sort in ascending order'
-    SORTDESC: 'Sort in descending order'
-  TableListField:
-    CSVEXPORT: 'Exportati ca CSV'
-    PRINT: Imprima
-    Print: Print
-    SELECT: Selecteaza
   TimeField:
     VALIDATEFORMAT: 'Please enter a valid time format ({format})'
   ToggleField:

lang/ru.yml

@@ -3,12 +3,12 @@ ru:
     NEWFOLDER: 'Новая папка'
   AssetTableField:
     CREATED: 'Первая загрузка'
-    DIM: Размеры
+    DIM: 'Размеры'
     FILENAME: 'Имя файла'
     FOLDER: Folder
     LASTEDIT: 'Последнее изменение'
     OWNER: Владелец
-    SIZE: Размер
+    SIZE: 'Размер'
     TITLE: Название
     TYPE: Тип
     URL: URL
@@ -50,6 +50,8 @@ ru:
     UNORDERED: 'Ненумерованный список'
     UNORDEREDDESCRIPTION: 'Ненумерованный список'
     UNORDEREDEXAMPLE1: 'ненумерованный элемент 1'
+  BackLink_Button.ss:
+    Back: Back
   BasicAuth:
     ENTERINFO: 'Пожалуйста, введите имя пользователя и пароль.'
     ERRORNOTADMIN: 'Такой пользователь не является администратором.'
@@ -57,16 +59,23 @@ ru:
   Boolean:
     0: 'False'
     ANY: Any
-    Hello: Hi
-    LOGOUT: 'Log out'
     1: 'True'
+  CMSLoadingScreen.ss:
+    LOADING: Loading...
+    REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
   CMSMain:
     ACCESS: 'Access to ''{title}'' section'
     ACCESSALLINTERFACES: 'Доступ ко всему интерфейсу CMS'
     ACCESSALLINTERFACESHELP: 'Overrules more specific access settings.'
-    SAVE: Сохранить
+    SAVE: 'Сохранить'
   CMSProfileController:
     MENUTITLE: CMSProfileController
+  ChangePasswordEmail.ss:
+    CHANGEPASSWORDTEXT1: 'Вы изменили свой пароль на'
+    CHANGEPASSWORDTEXT2: 'Для того, чтобы войти, используйте сейчас следующие учетные данные:'
+    EMAIL: Email
+    HELLO: Здравствуйте
+    PASSWORD: Пароль
   CheckboxField:
     - 'False'
     - 'True'
@@ -74,6 +83,14 @@ ru:
     CLOSEPOPUP: 'Закрыть всплывающее окно'
     SUCCESSADD2: 'Added {name}'
     SUCCESSEDIT: 'Сохранено %s %s %s'
+  ComplexTableField.ss:
+    ADDITEM: 'Add %s'
+    NOITEMSFOUND: 'No items found'
+    SORTASC: 'Сортировать по возрастанию'
+    SORTDESC: 'Сортировать по убыванию'
+  ComplexTableField_popup.ss:
+    NEXT: Следующ.
+    PREVIOUS: Предыдущ.
   ConfirmedPasswordField:
     ATLEAST: 'Passwords must be at least {min} characters long.'
     BETWEEN: 'Passwords must be {min} to {max} characters long.'
@@ -111,10 +128,7 @@ ru:
     VALIDDATEMAXDATE: 'Your date has to be older or matching the maximum allowed date ({date})'
     VALIDDATEMINDATE: 'Your date has to be newer or matching the minimum allowed date ({date})'
   Director:
-    ADD: Добавить
-    CSVEXPORT: 'Export to CSV'
     INVALID_REQUEST: 'Invalid request'
-    NOTFOUND: 'No items found'
   DropdownField:
     CHOOSE: (Выберите)
   EmailField:
@@ -124,8 +138,6 @@ ru:
     SINGULARNAME: 'Email Bounce Record'
   Enum:
     ANY: Any
-    LOADING: Loading...
-    REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
   File:
     Content: Содержание
     Filename: 'Имя файла'
@@ -150,13 +162,17 @@ ru:
     FROMFILESTORE: 'From the File Store'
     NOSOURCE: 'Please select a source file to attach'
     REPLACE: 'Replace {type}'
+  FileIFrameField_iframe.ss:
+    TITLE: 'Image Uploading Iframe'
   Filesystem:
-    IMPORT_TAB_HEADER: Import
-    SEARCHLISTINGS: Search
     SYNCRESULTS: 'Sync complete: {createdcount} items created, {deletedcount} items deleted'
+  ForgotPasswordEmail.ss:
+    HELLO: Здравствуйте
+    TEXT1: 'Это ваша'
+    TEXT2: 'ссылка переустановки пароля'
+    TEXT3: для
   Form:
     FIELDISREQUIRED: 'Поле %s является обязательным'
-    TITLE: 'Image Uploading Iframe'
     VALIDATIONCREDITNUMBER: 'Please ensure you have entered the {number} credit card number correctly'
     VALIDATIONNOTUNIQUE: 'Введенное значение не уникально'
     VALIDATIONPASSWORDSDONTMATCH: 'Пароли не совпадают'
@@ -187,37 +203,26 @@ ru:
     ResetFilter: Reset
   GridFieldAction_Delete:
     DeletePermissionsFailure: 'No delete permissions'
-    NEXT: Следующ.
-    PREVIOUS: Предыдущ.
   GridFieldDetailForm:
     Create: Create
     Delete: Delete
     DeletePermissionsFailure: 'No delete permissions'
     Deleted: 'Deleted %s %s'
-    HELLO: Здравствуйте
     Save: Save
     Saved: 'Saved %s %s'
-    TEXT1: 'Это ваша'
+  GridFieldItemEditView.ss: null
-    TEXT2: 'ссылка переустановки пароля'
-    TEXT3: для
   Group:
     AddRole: 'Add a role for this group'
-    CHANGEPASSWORDTEXT1: 'Вы изменили свой пароль на'
-    CHANGEPASSWORDTEXT2: 'Для того, чтобы войти, используйте сейчас следующие учетные данные:'
     Code: 'Код группы'
     DefaultGroupTitleAdministrators: Administrators
     DefaultGroupTitleContentAuthors: 'Content Authors'
     Description: Описание
-    EMAIL: Email
     GroupReminder: 'If you choose a parent group, this group will take all it''s roles'
-    HELLO: Здравствуйте
     Locked: 'Блокировано?'
     NoRoles: 'No roles found'
-    PASSWORD: Пароль
     Parent: 'Родительская группа'
     RolesAddEditLink: 'Добавить/редактировать роли'
     Sort: 'Порядок сортировки'
-    TITLE: 'Iframe загрузки изображений'
     has_many_Permissions: 'Права групп пользователей'
     many_many_Members: 'Члены группы'
   GroupImportForm:
@@ -253,7 +258,7 @@ ru:
     IMAGEALT: 'Alternative text (alt)'
     IMAGEALTTEXT: 'Alternative text (alt) - shown if image cannot be displayed'
     IMAGEALTTEXTDESC: 'Shown to screen readers or if image can not be displayed'
-    IMAGEDIMENSIONS: Размеры
+    IMAGEDIMENSIONS: 'Размеры'
     IMAGEHEIGHTPX: Высота
     IMAGETITLE: 'Title text (tooltip) - for additional information about the image'
     IMAGETITLETEXT: 'Title text (tooltip)'
@@ -275,10 +280,9 @@ ru:
     UpdateMEDIA: 'Update Media'
   ImageField:
     IMAGE: Image
-  Image_iframe.ss: 'ChangePasswordEmail.ss:  BackLink_Button.ss:  CMSLoadingScreen.ss:  RelationComplexTableField.ss:  ForgotPasswordEmail.ss:    APPLY FILTER: "Apply Filter"  GridFieldItemEditView.ss:    Go back: "Go back"  ModelSidebar.ss:  TableListField_PageControls.ss:  ModelAdmin_Tools.ss:  ComplexTableField_popup.ss:  TableField.ss:  FileIFrameField_iframe.ss:  ComplexTableField.ss:  TableListField.ss:  ModelAdmin_ImportSpec.ss:  LeftAndMain_Menu.ss:'
+  Image_iframe.ss:
+    TITLE: 'Iframe загрузки изображений'
   LeftAndMain:
-    ADD: 'Добавить новый ряд'
-    ADDITEM: 'Add %s'
     CANT_REORGANISE: 'You do not have permission to alter Top level pages. Your change was not saved.'
     DELETED: Deleted.
     DropdownBatchActionsDefault: Actions
@@ -292,6 +296,9 @@ ru:
     REORGANISATIONSUCCESSFUL: 'Reorganised the site tree successfully.'
     SAVEDUP: Saved.
     VersionUnknown: unknown
+  LeftAndMain_Menu.ss:
+    Hello: Hi
+    LOGOUT: 'Log out'
   LoginAttempt:
     Email: Email
     IP: IP-адрес
@@ -368,6 +375,7 @@ ru:
     ResultUpdated: 'Updated {count} members'
   MemberTableField: null
   ModelAdmin:
+    'APPLY FILTER': 'Apply Filter'
     DELETE: Удалить
     DELETEDRECORDS: 'Deleted {count} records.'
     IMPORT: 'Импорт из CSV'
@@ -377,6 +385,17 @@ ru:
     RESET: Reset
     Title: 'Data Models'
     UPDATEDRECORDS: 'Updated {count} records.'
+  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
   MoneyField:
     FIELDLABELAMOUNT: Amount
     FIELDLABELCURRENCY: Currency
@@ -389,10 +408,6 @@ ru:
     CMS_ACCESS_CATEGORY: 'CMS Access'
     FULLADMINRIGHTS: 'Все права администратора'
     FULLADMINRIGHTS_HELP: 'Implies and overrules all other assigned permissions.'
-    IMPORTSPECFIELDS: 'Database columns'
-    IMPORTSPECLINK: 'Show Specification for %s'
-    IMPORTSPECRELATIONS: Relations
-    IMPORTSPECTITLE: 'Specification for %s'
   PermissionCheckboxSetField:
     AssignedTo: 'assigned to "{title}"'
     FromGroup: 'inherited from group "{title}"'
@@ -401,8 +416,11 @@ ru:
   Permissions:
     PERMISSIONS_CATEGORY: 'Roles and access permissions'
   PhoneNumberField:
-    Back: Back
     VALIDATION: 'Пожалуйста, введите верный номер телефона'
+  RelationComplexTableField.ss:
+    ADD: Добавить
+    CSVEXPORT: 'Export to CSV'
+    NOTFOUND: 'No items found'
   Security:
     ALREADYLOGGEDIN: 'У Вас нет доступа к этой странице. Если у вас имеется другая учетная запись, имеющая доступ к этой странице, введите ее данные ниже.'
     BUTTONSEND: 'Отправить мне ссылку переустановки пароля'
@@ -411,7 +429,7 @@ ru:
     ENTERNEWPASSWORD: 'Пожалуйста, введите новый пароль.'
     ERRORPASSWORDPERMISSION: 'Вы должны войти в систему, чтобы изменить Ваш пароль!'
     LOGGEDOUT: 'Вы вышли. Если Вы хотите войти снова, введите ваши учетные данные ниже.'
-    LOGIN: Вход
+    LOGIN: 'Вход'
     NOTEPAGESECURED: 'Эта страница защищена. Пожалуйста, введите свои учетные данные для входа.'
     NOTERESETLINKINVALID: '<p>The password reset link is invalid or expired.</p><p>You can request a new one <a href="{link1}">here</a> or change your password after you <a href="{link2}">logged in</a>.</p>'
     NOTERESETPASSWORD: 'Введите Ваш адрес email, и Вам будет отправлена ссылка, по которой Вы сможете переустановить свой пароль'
@@ -439,31 +457,33 @@ ru:
     BtnImport: 'Import from CSV'
     FileFieldLabel: 'CSV File <small>(Allowed extensions: *.csv)</small>'
   SilverStripeNavigator:
-    DISPLAYING: Displaying
     Edit: Edit
-    FILTER: Filter
+  SimpleImageField:
-    IMPORT: Import
+    NOUPLOAD: 'Не загружено ни одного изображения'
+  SiteTree:
+    TABMAIN: Основное
+  TableField:
+    ISREQUIRED: 'In %s ''%s'' is required'
+  TableField.ss:
+    ADD: 'Добавить новый ряд'
+    ADDITEM: 'Add %s'
+  TableListField:
+    CSVEXPORT: 'Экспорт в CSV'
+    PRINT: Печать
+    Print: Print
+    SELECT: 'Select:'
+  TableListField.ss:
+    NOITEMSFOUND: 'No items found'
+    SORTASC: 'По возрастанию'
+    SORTDESC: 'По убыванию'
+  TableListField_PageControls.ss:
+    DISPLAYING: Displaying
     OF: of
     TO: to
     VIEWFIRST: Первый
     VIEWLAST: Последний
     VIEWNEXT: Следующий
     VIEWPREVIOUS: Предыдущий
-  SimpleImageField:
-    NOUPLOAD: 'Не загружено ни одного изображения'
-  SiteTree:
-    TABMAIN: Основное
-  TableField:
-    ADDITEM: 'Add %s'
-    ISREQUIRED: 'In %s ''%s'' is required'
-    NOITEMSFOUND: 'No items found'
-    SORTASC: 'По возрастанию'
-    SORTDESC: 'По убыванию'
-  TableListField:
-    CSVEXPORT: 'Экспорт в CSV'
-    PRINT: Печать
-    Print: Print
-    SELECT: 'Select:'
   TimeField:
     VALIDATEFORMAT: 'Please enter a valid time format ({format})'
   ToggleField:

lang/si.yml

@@ -50,6 +50,8 @@ si:
     UNORDERED: 'Unordered list'
     UNORDEREDDESCRIPTION: 'Unordered list'
     UNORDEREDEXAMPLE1: 'unordered item 1'
+  BackLink_Button.ss:
+    Back: Back
   BasicAuth:
     ENTERINFO: 'නම හා මුර පදය ඇතුල් කරන්න'
     ERRORNOTADMIN: 'ඵම පරිශීලකයා නියමුවෙකු නොවේ'
@@ -57,9 +59,10 @@ si:
   Boolean:
     0: 'False'
     ANY: Any
-    Hello: Hi
-    LOGOUT: 'Log out'
     1: 'True'
+  CMSLoadingScreen.ss:
+    LOADING: Loading...
+    REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
   CMSMain:
     ACCESS: 'Access to ''{title}'' section'
     ACCESSALLINTERFACES: 'Access to all CMS sections'
@@ -67,6 +70,12 @@ si:
     SAVE: 'සේවි කරන්න'
   CMSProfileController:
     MENUTITLE: CMSProfileController
+  ChangePasswordEmail.ss:
+    CHANGEPASSWORDTEXT1: 'අලුත් මුර පදය'
+    CHANGEPASSWORDTEXT2: 'ප්රවිශ්ට වීමට පහත දත්ත යොදාගන්න'
+    EMAIL: Email
+    HELLO: කොහොමද
+    PASSWORD: Password
   CheckboxField:
     - 'False'
     - 'True'
@@ -74,13 +83,21 @@ si:
     CLOSEPOPUP: 'Close Popup'
     SUCCESSADD2: 'Added {name}'
     SUCCESSEDIT: 'Saved %s %s %s'
+  ComplexTableField.ss:
+    ADDITEM: 'Add %s'
+    NOITEMSFOUND: 'No items found'
+    SORTASC: 'ආරෝහන පිළිවෙලට'
+    SORTDESC: 'ආවරෝහන පිළිවෙලට'
+  ComplexTableField_popup.ss:
+    NEXT: පසු
+    PREVIOUS: පෙර
   ConfirmedPasswordField:
     ATLEAST: 'Passwords must be at least {min} characters long.'
     BETWEEN: 'Passwords must be {min} to {max} characters long.'
     MAXIMUM: 'Passwords must be at most {max} characters long.'
     SHOWONCLICKTITLE: 'මුර පදය වෙනස් කිරීම'
   CreditCardField:
-    FIRST: පළමු
+    FIRST: 'පළමු'
     FOURTH: fourth
     SECOND: දෙවන
     THIRD: third
@@ -102,8 +119,8 @@ si:
     SECS: 'තත්පර '
     TIMEDIFFAGO: '{difference} ago'
     TIMEDIFFIN: 'in {difference}'
-    YEAR: අවුරුද්ද
+    YEAR: 'අවුරුද්ද'
-    YEARS: අවුරුදු
+    YEARS: 'අවුරුදු'
   DateField:
     NOTSET: 'not set'
     TODAY: today
@@ -111,10 +128,7 @@ si:
     VALIDDATEMAXDATE: 'Your date has to be older or matching the maximum allowed date ({date})'
     VALIDDATEMINDATE: 'Your date has to be newer or matching the minimum allowed date ({date})'
   Director:
-    ADD: 'එකතු කරන්න'
-    CSVEXPORT: 'Export to CSV'
     INVALID_REQUEST: 'Invalid request'
-    NOTFOUND: 'No items found'
   DropdownField:
     CHOOSE: (තොරන්න)
   EmailField:
@@ -124,8 +138,6 @@ si:
     SINGULARNAME: 'Email Bounce Record'
   Enum:
     ANY: Any
-    LOADING: Loading...
-    REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
   File:
     Content: Content
     Filename: Filename
@@ -150,13 +162,17 @@ si:
     FROMFILESTORE: 'From the File Store'
     NOSOURCE: 'Please select a source file to attach'
     REPLACE: 'Replace {type}'
+  FileIFrameField_iframe.ss:
+    TITLE: 'Image Uploading Iframe'
   Filesystem:
-    IMPORT_TAB_HEADER: Import
-    SEARCHLISTINGS: Search
     SYNCRESULTS: 'Sync complete: {createdcount} items created, {deletedcount} items deleted'
+  ForgotPasswordEmail.ss:
+    HELLO: කොහොමද
+    TEXT1: 'මෙය ඔබගේ'
+    TEXT2: 'password reset link'
+    TEXT3: සඳහා
   Form:
     FIELDISREQUIRED: '%s අවශ්යයි'
-    TITLE: 'Image Uploading Iframe'
     VALIDATIONCREDITNUMBER: 'Please ensure you have entered the {number} credit card number correctly'
     VALIDATIONNOTUNIQUE: 'අගය අද්විතීය නොවේ'
     VALIDATIONPASSWORDSDONTMATCH: 'මුර පද අසමානය'
@@ -187,38 +203,27 @@ si:
     ResetFilter: Reset
   GridFieldAction_Delete:
     DeletePermissionsFailure: 'No delete permissions'
-    NEXT: පසු
-    PREVIOUS: පෙර
   GridFieldDetailForm:
     Create: Create
     Delete: Delete
     DeletePermissionsFailure: 'No delete permissions'
     Deleted: 'Deleted %s %s'
-    HELLO: කොහොමද
     Save: Save
     Saved: 'Saved %s %s'
-    TEXT1: 'මෙය ඔබගේ'
+  GridFieldItemEditView.ss: null
-    TEXT2: 'password reset link'
-    TEXT3: සඳහා
   Group:
     AddRole: 'Add a role for this group'
-    CHANGEPASSWORDTEXT1: 'අලුත් මුර පදය'
-    CHANGEPASSWORDTEXT2: 'ප්රවිශ්ට වීමට පහත දත්ත යොදාගන්න'
     Code: 'කාන්ඩ සංකේතය'
     DefaultGroupTitleAdministrators: Administrators
     DefaultGroupTitleContentAuthors: 'Content Authors'
     Description: Description
-    EMAIL: Email
     GroupReminder: 'If you choose a parent group, this group will take all it''s roles'
-    HELLO: කොහොමද
     Locked: 'අගුලුලාද?'
     NoRoles: 'No roles found'
-    PASSWORD: Password
     Parent: 'මවු කාන්ඩය'
     RolesAddEditLink: 'Manage roles'
     Sort: 'Sort Order'
-    TITLE: 'පිංතූර අප්ලෝඩ් කරන Iframe ඵක'
+    has_many_Permissions: 'අවසර'
-    has_many_Permissions: අවසර
     many_many_Members: සාමාජිකයින්
   GroupImportForm:
     Help1: '<p>Import one or more groups in <em>CSV</em> format (comma-separated values). <small><a href="#" class="toggle-advanced">Show advanced usage</a></small></p>'
@@ -275,10 +280,9 @@ si:
     UpdateMEDIA: 'Update Media'
   ImageField:
     IMAGE: Image
-  Image_iframe.ss: 'ChangePasswordEmail.ss:  BackLink_Button.ss:  CMSLoadingScreen.ss:  RelationComplexTableField.ss:  ForgotPasswordEmail.ss:    APPLY FILTER: "Apply Filter"  GridFieldItemEditView.ss:    Go back: "Go back"  ModelSidebar.ss:  TableListField_PageControls.ss:  ModelAdmin_Tools.ss:  ComplexTableField_popup.ss:  TableField.ss:  FileIFrameField_iframe.ss:  ComplexTableField.ss:  TableListField.ss:  ModelAdmin_ImportSpec.ss:  LeftAndMain_Menu.ss:'
+  Image_iframe.ss:
+    TITLE: 'පිංතූර අප්ලෝඩ් කරන Iframe ඵක'
   LeftAndMain:
-    ADD: 'නව පෙළක් එකතුකරන්න'
-    ADDITEM: 'Add %s'
     CANT_REORGANISE: 'You do not have permission to alter Top level pages. Your change was not saved.'
     DELETED: Deleted.
     DropdownBatchActionsDefault: Actions
@@ -292,6 +296,9 @@ si:
     REORGANISATIONSUCCESSFUL: 'Reorganised the site tree successfully.'
     SAVEDUP: Saved.
     VersionUnknown: unknown
+  LeftAndMain_Menu.ss:
+    Hello: Hi
+    LOGOUT: 'Log out'
   LoginAttempt:
     Email: 'Email Address'
     IP: 'IP Address'
@@ -368,6 +375,7 @@ si:
     ResultUpdated: 'Updated {count} members'
   MemberTableField: null
   ModelAdmin:
+    'APPLY FILTER': 'Apply Filter'
     DELETE: Delete
     DELETEDRECORDS: 'Deleted {count} records.'
     IMPORT: 'Import from CSV'
@@ -377,6 +385,17 @@ si:
     RESET: Reset
     Title: 'Data Models'
     UPDATEDRECORDS: 'Updated {count} records.'
+  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
   MoneyField:
     FIELDLABELAMOUNT: Amount
     FIELDLABELCURRENCY: Currency
@@ -389,10 +408,6 @@ si:
     CMS_ACCESS_CATEGORY: 'CMS Access'
     FULLADMINRIGHTS: 'Full administrative rights'
     FULLADMINRIGHTS_HELP: 'Implies and overrules all other assigned permissions.'
-    IMPORTSPECFIELDS: 'Database columns'
-    IMPORTSPECLINK: 'Show Specification for %s'
-    IMPORTSPECRELATIONS: Relations
-    IMPORTSPECTITLE: 'Specification for %s'
   PermissionCheckboxSetField:
     AssignedTo: 'assigned to "{title}"'
     FromGroup: 'inherited from group "{title}"'
@@ -401,8 +416,11 @@ si:
   Permissions:
     PERMISSIONS_CATEGORY: 'Roles and access permissions'
   PhoneNumberField:
-    Back: Back
     VALIDATION: 'නිවැරදි දුරකතන අ0කයක් යොදන්න'
+  RelationComplexTableField.ss:
+    ADD: 'එකතු කරන්න'
+    CSVEXPORT: 'Export to CSV'
+    NOTFOUND: 'No items found'
   Security:
     ALREADYLOGGEDIN: 'මෙම පිටුවට ඇතුල්වීමට ඹබට අවසර නැත, වෙනත් නමකින් ඇතුල් වීමට පහතින් නම හා මුරපදය යොදන්න'
     BUTTONSEND: 'මුරපදය වෙනස් කරන ලිපිනය ඵවන්න'
@@ -439,35 +457,37 @@ si:
     BtnImport: 'Import from CSV'
     FileFieldLabel: 'CSV File <small>(Allowed extensions: *.csv)</small>'
   SilverStripeNavigator:
-    DISPLAYING: Displaying
     Edit: Edit
-    FILTER: Filter
+  SimpleImageField:
-    IMPORT: Import
+    NOUPLOAD: 'පි0තුර අප්ලෝඩ් කර නැත'
+  SiteTree:
+    TABMAIN: ප්‍රදාන
+  TableField:
+    ISREQUIRED: 'In %s ''%s'' is required'
+  TableField.ss:
+    ADD: 'නව පෙළක් එකතුකරන්න'
+    ADDITEM: 'Add %s'
+  TableListField:
+    CSVEXPORT: 'Export to CSV'
+    PRINT: 'මුද්රණය කරන්න'
+    Print: Print
+    SELECT: 'Select:'
+  TableListField.ss:
+    NOITEMSFOUND: 'No items found'
+    SORTASC: 'Sort in ascending order'
+    SORTDESC: 'Sort in descending order'
+  TableListField_PageControls.ss:
+    DISPLAYING: Displaying
     OF: of
     TO: to
     VIEWFIRST: 'පළමු එක පෙන්වන්න'
     VIEWLAST: 'අවසානය පෙන්වන්න'
     VIEWNEXT: 'ඊළඟ එක පෙන්වන්න'
     VIEWPREVIOUS: 'පෙර පෙන්වන්න'
-  SimpleImageField:
-    NOUPLOAD: 'පි0තුර අප්ලෝඩ් කර නැත'
-  SiteTree:
-    TABMAIN: ප්‍රදාන
-  TableField:
-    ADDITEM: 'Add %s'
-    ISREQUIRED: 'In %s ''%s'' is required'
-    NOITEMSFOUND: 'No items found'
-    SORTASC: 'Sort in ascending order'
-    SORTDESC: 'Sort in descending order'
-  TableListField:
-    CSVEXPORT: 'Export to CSV'
-    PRINT: 'මුද්රණය කරන්න'
-    Print: Print
-    SELECT: 'Select:'
   TimeField:
     VALIDATEFORMAT: 'Please enter a valid time format ({format})'
   ToggleField:
-    LESS: අඩු
+    LESS: 'අඩු'
     MORE: වැඩි
   UploadField:
     ATTACHFILE: 'Attach a file'

lang/sk.yml

@@ -50,6 +50,8 @@ sk:
     UNORDERED: 'neočíslovaný zoznam'
     UNORDEREDDESCRIPTION: 'neočíslovaný zoznam'
     UNORDEREDEXAMPLE1: 'neočíslovaná položka 1'
+  BackLink_Button.ss:
+    Back: Back
   BasicAuth:
     ENTERINFO: 'Prosím zadajte používateľské meno a heslo.'
     ERRORNOTADMIN: 'Tento používateľ nie je administrátor.'
@@ -57,9 +59,10 @@ sk:
   Boolean:
     0: Nie
     ANY: Ktorýkoľvek
-    Hello: Hi
-    LOGOUT: 'Log out'
     1: Áno
+  CMSLoadingScreen.ss:
+    LOADING: Loading...
+    REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
   CMSMain:
     ACCESS: 'Access to ''{title}'' section'
     ACCESSALLINTERFACES: 'Pristup do všetkých častí CMS.'
@@ -67,6 +70,12 @@ sk:
     SAVE: Uložiť
   CMSProfileController:
     MENUTITLE: CMSProfileController
+  ChangePasswordEmail.ss:
+    CHANGEPASSWORDTEXT1: 'Vaše heslo bolo zmenené pre'
+    CHANGEPASSWORDTEXT2: 'Teraz môžete použiť nasledujúce prihlasovacie údaje na prihlásenie:'
+    EMAIL: Email
+    HELLO: 'Dobrý deň'
+    PASSWORD: Heslo
   CheckboxField:
     - Nie
     - Áno
@@ -74,6 +83,14 @@ sk:
     CLOSEPOPUP: 'Zatvoriť okno'
     SUCCESSADD2: 'Added {name}'
     SUCCESSEDIT: 'Uložené %s %s %s'
+  ComplexTableField.ss:
+    ADDITEM: 'Add %s'
+    NOITEMSFOUND: 'No items found'
+    SORTASC: 'Zoradiť vzostupne'
+    SORTDESC: 'Zoradiť zostupne'
+  ComplexTableField_popup.ss:
+    NEXT: Ďalší
+    PREVIOUS: Predchádzajúci
   ConfirmedPasswordField:
     ATLEAST: 'Passwords must be at least {min} characters long.'
     BETWEEN: 'Passwords must be {min} to {max} characters long.'
@@ -111,10 +128,7 @@ sk:
     VALIDDATEMAXDATE: 'Your date has to be older or matching the maximum allowed date ({date})'
     VALIDDATEMINDATE: 'Your date has to be newer or matching the minimum allowed date ({date})'
   Director:
-    ADD: Pridať
-    CSVEXPORT: 'Export to CSV'
     INVALID_REQUEST: 'Invalid request'
-    NOTFOUND: 'No items found'
   DropdownField:
     CHOOSE: '(Vyberte si)'
   EmailField:
@@ -124,8 +138,6 @@ sk:
     SINGULARNAME: 'Záznam o odskočených e-mailoch'
   Enum:
     ANY: Každý
-    LOADING: Loading...
-    REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
   File:
     Content: Obsah
     Filename: 'Meno súboru'
@@ -150,13 +162,17 @@ sk:
     FROMFILESTORE: 'Z úložiska súborov'
     NOSOURCE: 'Prosím zvolte zdrojový súbor pre priloženie'
     REPLACE: 'Replace {type}'
+  FileIFrameField_iframe.ss:
+    TITLE: 'Image Uploading Iframe'
   Filesystem:
-    IMPORT_TAB_HEADER: Import
-    SEARCHLISTINGS: Search
     SYNCRESULTS: 'Sync complete: {createdcount} items created, {deletedcount} items deleted'
+  ForgotPasswordEmail.ss:
+    HELLO: 'Dobrý deň'
+    TEXT1: 'Tu je váš'
+    TEXT2: 'odkaz na resetovanie hesla'
+    TEXT3: pre
   Form:
     FIELDISREQUIRED: '%s je požadované'
-    TITLE: 'Image Uploading Iframe'
     VALIDATIONCREDITNUMBER: 'Please ensure you have entered the {number} credit card number correctly'
     VALIDATIONNOTUNIQUE: 'Zadaná hodnota nie je unikátna'
     VALIDATIONPASSWORDSDONTMATCH: 'Hesla sa nezhodujú'
@@ -187,37 +203,26 @@ sk:
     ResetFilter: Reset
   GridFieldAction_Delete:
     DeletePermissionsFailure: 'No delete permissions'
-    NEXT: Ďalší
-    PREVIOUS: Predchádzajúci
   GridFieldDetailForm:
     Create: Create
     Delete: Delete
     DeletePermissionsFailure: 'No delete permissions'
     Deleted: 'Deleted %s %s'
-    HELLO: 'Dobrý deň'
     Save: Save
     Saved: 'Saved %s %s'
-    TEXT1: 'Tu je váš'
+  GridFieldItemEditView.ss: null
-    TEXT2: 'odkaz na resetovanie hesla'
-    TEXT3: pre
   Group:
     AddRole: 'Pridať novú úlohu pre túto skupinu'
-    CHANGEPASSWORDTEXT1: 'Vaše heslo bolo zmenené pre'
-    CHANGEPASSWORDTEXT2: 'Teraz môžete použiť nasledujúce prihlasovacie údaje na prihlásenie:'
     Code: 'Kód skupiny'
     DefaultGroupTitleAdministrators: Administratori
     DefaultGroupTitleContentAuthors: 'Autori obsahu'
     Description: Popis
-    EMAIL: Email
     GroupReminder: 'If you choose a parent group, this group will take all it''s roles'
-    HELLO: 'Dobrý deň'
     Locked: 'Zamknuté?'
     NoRoles: 'Nenašli sa žiadne úlohy'
-    PASSWORD: Heslo
     Parent: 'Nadradená skupina'
     RolesAddEditLink: 'Pridať/upraviť úlohy'
     Sort: 'Zoradiť podľa'
-    TITLE: 'Rámec pre nahranie obrázku'
     has_many_Permissions: Právomoci
     many_many_Members: Uživatelia
   GroupImportForm:
@@ -258,7 +263,7 @@ sk:
     IMAGETITLE: 'Text titulky (tooltip) - pre doplňujúce informácie o obrázku'
     IMAGETITLETEXT: 'Title text (tooltip)'
     IMAGETITLETEXTDESC: 'For additional information about the image'
-    IMAGEWIDTHPX: Šírka
+    IMAGEWIDTHPX: 'Šírka'
     INSERTMEDIA: 'Insert Media'
     LINK: 'Vložiť/upraviť odkaz na zvýraznený text'
     LINKANCHOR: 'Odkaz na tejto stranke'
@@ -275,10 +280,9 @@ sk:
     UpdateMEDIA: 'Update Media'
   ImageField:
     IMAGE: Obrázok
-  Image_iframe.ss: 'ChangePasswordEmail.ss:  BackLink_Button.ss:  CMSLoadingScreen.ss:  RelationComplexTableField.ss:  ForgotPasswordEmail.ss:    APPLY FILTER: "Použiť filter"  GridFieldItemEditView.ss:    Go back: "Go back"  ModelSidebar.ss:  TableListField_PageControls.ss:  ModelAdmin_Tools.ss:  ComplexTableField_popup.ss:  TableField.ss:  FileIFrameField_iframe.ss:  ComplexTableField.ss:  TableListField.ss:  ModelAdmin_ImportSpec.ss:  LeftAndMain_Menu.ss:'
+  Image_iframe.ss:
+    TITLE: 'Rámec pre nahranie obrázku'
   LeftAndMain:
-    ADD: 'Pridať nový riadok'
-    ADDITEM: 'Add %s'
     CANT_REORGANISE: 'You do not have permission to alter Top level pages. Your change was not saved.'
     DELETED: Deleted.
     DropdownBatchActionsDefault: Actions
@@ -292,6 +296,9 @@ sk:
     REORGANISATIONSUCCESSFUL: 'Reorganised the site tree successfully.'
     SAVEDUP: Saved.
     VersionUnknown: unknown
+  LeftAndMain_Menu.ss:
+    Hello: Hi
+    LOGOUT: 'Log out'
   LoginAttempt:
     Email: 'Emailová adresa'
     IP: 'IP adreasa'
@@ -368,6 +375,7 @@ sk:
     ResultUpdated: 'Updated {count} members'
   MemberTableField: null
   ModelAdmin:
+    'APPLY FILTER': 'Použiť filter'
     DELETE: Vymazať
     DELETEDRECORDS: 'Deleted {count} records.'
     IMPORT: 'Importovať z CSV'
@@ -377,6 +385,17 @@ sk:
     RESET: Reset
     Title: 'Data Models'
     UPDATEDRECORDS: 'Updated {count} records.'
+  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
   MoneyField:
     FIELDLABELAMOUNT: Množstvo
     FIELDLABELCURRENCY: Mena
@@ -389,10 +408,6 @@ sk:
     CMS_ACCESS_CATEGORY: 'Prístup do CMS'
     FULLADMINRIGHTS: 'Plné administrátorské práva'
     FULLADMINRIGHTS_HELP: 'Ma prednosť pred všetkými ostatnými prideleniami a právomocami.'
-    IMPORTSPECFIELDS: 'Database columns'
-    IMPORTSPECLINK: 'Show Specification for %s'
-    IMPORTSPECRELATIONS: Relations
-    IMPORTSPECTITLE: 'Specification for %s'
   PermissionCheckboxSetField:
     AssignedTo: 'assigned to "{title}"'
     FromGroup: 'inherited from group "{title}"'
@@ -401,8 +416,11 @@ sk:
   Permissions:
     PERMISSIONS_CATEGORY: 'Úlohy a prístupové práva'
   PhoneNumberField:
-    Back: Back
     VALIDATION: 'Prosím zadajte platné telefónne číslo'
+  RelationComplexTableField.ss:
+    ADD: Pridať
+    CSVEXPORT: 'Export to CSV'
+    NOTFOUND: 'No items found'
   Security:
     ALREADYLOGGEDIN: 'K tejto stránke nemáte prístup. Ak máte iný účet, ktorý k nej má prístup, môžete sa <a href="%s">prihlásiť</a>.'
     BUTTONSEND: 'Pošlite mi odkaz na resetovanie hesla'
@@ -439,31 +457,33 @@ sk:
     BtnImport: Importovať
     FileFieldLabel: 'CSV súbor <small>(Povoléné koncovki súborov: *.csv)</small>'
   SilverStripeNavigator:
-    DISPLAYING: Displaying
     Edit: Edit
-    FILTER: Filter
+  SimpleImageField:
-    IMPORT: Import
+    NOUPLOAD: 'Nebol nahraný žiaden obrázok'
+  SiteTree:
+    TABMAIN: Hlavné
+  TableField:
+    ISREQUIRED: 'In %s ''%s'' is required'
+  TableField.ss:
+    ADD: 'Pridať nový riadok'
+    ADDITEM: 'Add %s'
+  TableListField:
+    CSVEXPORT: 'Exportovať do CSV'
+    PRINT: Vytlačiť
+    Print: Print
+    SELECT: 'Vyberte:'
+  TableListField.ss:
+    NOITEMSFOUND: 'No items found'
+    SORTASC: 'Zoradiť vzostupne'
+    SORTDESC: 'Zoradiť zostupne'
+  TableListField_PageControls.ss:
+    DISPLAYING: Displaying
     OF: of
     TO: to
     VIEWFIRST: 'Zobraziť prvé'
     VIEWLAST: 'Zobraziť posledné'
     VIEWNEXT: 'Zobraziť nasledujúce'
     VIEWPREVIOUS: 'Zobraziť predchádzajúce'
-  SimpleImageField:
-    NOUPLOAD: 'Nebol nahraný žiaden obrázok'
-  SiteTree:
-    TABMAIN: Hlavné
-  TableField:
-    ADDITEM: 'Add %s'
-    ISREQUIRED: 'In %s ''%s'' is required'
-    NOITEMSFOUND: 'No items found'
-    SORTASC: 'Zoradiť vzostupne'
-    SORTDESC: 'Zoradiť zostupne'
-  TableListField:
-    CSVEXPORT: 'Exportovať do CSV'
-    PRINT: Vytlačiť
-    Print: Print
-    SELECT: 'Vyberte:'
   TimeField:
     VALIDATEFORMAT: 'Please enter a valid time format ({format})'
   ToggleField:

lang/sl.yml

@@ -50,6 +50,8 @@ sl:
     UNORDERED: 'Neurejen seznam'
     UNORDEREDDESCRIPTION: 'Neurejen seznam'
     UNORDEREDEXAMPLE1: 'alineja na neurejenem seznamu'
+  BackLink_Button.ss:
+    Back: Back
   BasicAuth:
     ENTERINFO: 'Vpišite uporabniško ime in geslo.'
     ERRORNOTADMIN: 'Uporabnik ni administrator tega spletnega mesta.'
@@ -57,9 +59,10 @@ sl:
   Boolean:
     0: Ne
     ANY: Katerikoli
-    Hello: Hi
-    LOGOUT: 'Log out'
     1: Da
+  CMSLoadingScreen.ss:
+    LOADING: Loading...
+    REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
   CMSMain:
     ACCESS: 'Access to ''{title}'' section'
     ACCESSALLINTERFACES: 'Dostop do vseh sklopov CMS'
@@ -67,6 +70,12 @@ sl:
     SAVE: Shrani
   CMSProfileController:
     MENUTITLE: CMSProfileController
+  ChangePasswordEmail.ss:
+    CHANGEPASSWORDTEXT1: 'Geslo ste spremenili v'
+    CHANGEPASSWORDTEXT2: 'Za prijavo lahko odslej uporabite naslednje podatke:'
+    EMAIL: E-naslov
+    HELLO: 'Pozdravljeni,'
+    PASSWORD: Geslo
   CheckboxField:
     - Ne
     - Da
@@ -74,6 +83,14 @@ sl:
     CLOSEPOPUP: 'Zapri okno'
     SUCCESSADD2: 'Added {name}'
     SUCCESSEDIT: 'Shranjeno: %s %s %s'
+  ComplexTableField.ss:
+    ADDITEM: 'Add %s'
+    NOITEMSFOUND: 'No items found'
+    SORTASC: 'Razvrsti naraščajoče'
+    SORTDESC: 'Razvrsti padajoče'
+  ComplexTableField_popup.ss:
+    NEXT: Naprej
+    PREVIOUS: Nazaj
   ConfirmedPasswordField:
     ATLEAST: 'Passwords must be at least {min} characters long.'
     BETWEEN: 'Passwords must be {min} to {max} characters long.'
@@ -111,10 +128,7 @@ sl:
     VALIDDATEMAXDATE: 'Your date has to be older or matching the maximum allowed date ({date})'
     VALIDDATEMINDATE: 'Your date has to be newer or matching the minimum allowed date ({date})'
   Director:
-    ADD: Dodaj
-    CSVEXPORT: 'Export to CSV'
     INVALID_REQUEST: 'Invalid request'
-    NOTFOUND: 'No items found'
   DropdownField:
     CHOOSE: (Izberi)
   EmailField:
@@ -124,8 +138,6 @@ sl:
     SINGULARNAME: 'Zavrnjeno e-sporočilo'
   Enum:
     ANY: Katerikoli
-    LOADING: Loading...
-    REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
   File:
     Content: Vsebina
     Filename: 'Ime datoteke'
@@ -150,13 +162,17 @@ sl:
     FROMFILESTORE: 'Iz knjižnice datotek'
     NOSOURCE: 'Izberite datoteko, ki jo boste pripeli.'
     REPLACE: 'Replace {type}'
+  FileIFrameField_iframe.ss:
+    TITLE: 'Image Uploading Iframe'
   Filesystem:
-    IMPORT_TAB_HEADER: Import
-    SEARCHLISTINGS: Search
     SYNCRESULTS: 'Sync complete: {createdcount} items created, {deletedcount} items deleted'
+  ForgotPasswordEmail.ss:
+    HELLO: 'Pozdravljeni,'
+    TEXT1: 'Tukaj je vaša'
+    TEXT2: 'povezava za ponastavitev gesla'
+    TEXT3: za
   Form:
     FIELDISREQUIRED: 'Vpišite %s (obvezen podatek).'
-    TITLE: 'Image Uploading Iframe'
     VALIDATIONCREDITNUMBER: 'Please ensure you have entered the {number} credit card number correctly'
     VALIDATIONNOTUNIQUE: 'Vpisana vrednost ni unikatna'
     VALIDATIONPASSWORDSDONTMATCH: 'Vpisani gesli se ne ujemata'
@@ -187,37 +203,26 @@ sl:
     ResetFilter: Reset
   GridFieldAction_Delete:
     DeletePermissionsFailure: 'No delete permissions'
-    NEXT: Naprej
-    PREVIOUS: Nazaj
   GridFieldDetailForm:
     Create: Create
     Delete: Delete
     DeletePermissionsFailure: 'No delete permissions'
     Deleted: 'Deleted %s %s'
-    HELLO: 'Pozdravljeni,'
     Save: Save
     Saved: 'Saved %s %s'
-    TEXT1: 'Tukaj je vaša'
+  GridFieldItemEditView.ss: null
-    TEXT2: 'povezava za ponastavitev gesla'
-    TEXT3: za
   Group:
     AddRole: 'Add a role for this group'
-    CHANGEPASSWORDTEXT1: 'Geslo ste spremenili v'
-    CHANGEPASSWORDTEXT2: 'Za prijavo lahko odslej uporabite naslednje podatke:'
     Code: 'Koda skupine'
     DefaultGroupTitleAdministrators: Administratorji
     DefaultGroupTitleContentAuthors: 'Avtorji vsebine'
     Description: Opis
-    EMAIL: E-naslov
     GroupReminder: 'If you choose a parent group, this group will take all it''s roles'
-    HELLO: 'Pozdravljeni,'
     Locked: 'Zaklenjeno za urejanje?'
     NoRoles: 'No roles found'
-    PASSWORD: Geslo
     Parent: 'Nadrejena skupina'
     RolesAddEditLink: 'Dodaj in uredi vloge'
     Sort: 'Način razvrščanja'
-    TITLE: 'Slika "uploading iframe"'
     has_many_Permissions: Dovoljenja
     many_many_Members: Uporabniki
   GroupImportForm:
@@ -258,7 +263,7 @@ sl:
     IMAGETITLE: 'Naslov (tooltip)  bo izpisan kot dopolnitev k vsebini slike'
     IMAGETITLETEXT: 'Title text (tooltip)'
     IMAGETITLETEXTDESC: 'For additional information about the image'
-    IMAGEWIDTHPX: Širina
+    IMAGEWIDTHPX: 'Širina'
     INSERTMEDIA: 'Insert Media'
     LINK: Povezava
     LINKANCHOR: 'Sidro na tej strani'
@@ -275,10 +280,9 @@ sl:
     UpdateMEDIA: 'Update Media'
   ImageField:
     IMAGE: Slika
-  Image_iframe.ss: 'ChangePasswordEmail.ss:  BackLink_Button.ss:  CMSLoadingScreen.ss:  RelationComplexTableField.ss:  ForgotPasswordEmail.ss:    APPLY FILTER: "Apply Filter"  GridFieldItemEditView.ss:    Go back: "Go back"  ModelSidebar.ss:  TableListField_PageControls.ss:  ModelAdmin_Tools.ss:  ComplexTableField_popup.ss:  TableField.ss:  FileIFrameField_iframe.ss:  ComplexTableField.ss:  TableListField.ss:  ModelAdmin_ImportSpec.ss:  LeftAndMain_Menu.ss:'
+  Image_iframe.ss:
+    TITLE: 'Slika "uploading iframe"'
   LeftAndMain:
-    ADD: 'Dodaj vrstico'
-    ADDITEM: 'Add %s'
     CANT_REORGANISE: 'You do not have permission to alter Top level pages. Your change was not saved.'
     DELETED: Deleted.
     DropdownBatchActionsDefault: Actions
@@ -292,6 +296,9 @@ sl:
     REORGANISATIONSUCCESSFUL: 'Reorganised the site tree successfully.'
     SAVEDUP: Saved.
     VersionUnknown: unknown
+  LeftAndMain_Menu.ss:
+    Hello: Hi
+    LOGOUT: 'Log out'
   LoginAttempt:
     Email: E-naslov
     IP: IP-naslov
@@ -368,6 +375,7 @@ sl:
     ResultUpdated: 'Updated {count} members'
   MemberTableField: null
   ModelAdmin:
+    'APPLY FILTER': 'Apply Filter'
     DELETE: Izbriši
     DELETEDRECORDS: 'Deleted {count} records.'
     IMPORT: 'Uvozi CSV-datoteko'
@@ -377,6 +385,17 @@ sl:
     RESET: Reset
     Title: 'Data Models'
     UPDATEDRECORDS: 'Updated {count} records.'
+  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
   MoneyField:
     FIELDLABELAMOUNT: Znesek
     FIELDLABELCURRENCY: Valuta
@@ -389,10 +408,6 @@ sl:
     CMS_ACCESS_CATEGORY: 'Dostop do CMS-vmesnika'
     FULLADMINRIGHTS: 'Popolne administratorske pravice'
     FULLADMINRIGHTS_HELP: 'Lahko izniči oziroma upravlja z vsemi drugimi dovoljenji.'
-    IMPORTSPECFIELDS: 'Database columns'
-    IMPORTSPECLINK: 'Show Specification for %s'
-    IMPORTSPECRELATIONS: Relations
-    IMPORTSPECTITLE: 'Specification for %s'
   PermissionCheckboxSetField:
     AssignedTo: 'assigned to "{title}"'
     FromGroup: 'inherited from group "{title}"'
@@ -401,8 +416,11 @@ sl:
   Permissions:
     PERMISSIONS_CATEGORY: 'Vloge in dovoljenja za dostop'
   PhoneNumberField:
-    Back: Back
     VALIDATION: 'Vpišite veljavno telefonsko številko'
+  RelationComplexTableField.ss:
+    ADD: Dodaj
+    CSVEXPORT: 'Export to CSV'
+    NOTFOUND: 'No items found'
   Security:
     ALREADYLOGGEDIN: 'Nimate dovoljenja za dostop do te strani. Če imate uporabniško ime z večimi pravicami, se lahko <a href="%s">ponovno prijavite</a>.'
     BUTTONSEND: 'Pošlji povezavo za ponastavitev gesla'
@@ -439,31 +457,33 @@ sl:
     BtnImport: Uvozi
     FileFieldLabel: 'CSV-datoteka <small>(Samo končnica: *.csv)</small>'
   SilverStripeNavigator:
-    DISPLAYING: Displaying
     Edit: Edit
-    FILTER: Filter
+  SimpleImageField:
-    IMPORT: Import
+    NOUPLOAD: 'Slika ni naložena'
+  SiteTree:
+    TABMAIN: Domov
+  TableField:
+    ISREQUIRED: 'In %s ''%s'' is required'
+  TableField.ss:
+    ADD: 'Dodaj vrstico'
+    ADDITEM: 'Add %s'
+  TableListField:
+    CSVEXPORT: 'Izvozi kot CSV-datoteko'
+    PRINT: Natisni
+    Print: Print
+    SELECT: 'Izberi:'
+  TableListField.ss:
+    NOITEMSFOUND: 'No items found'
+    SORTASC: 'Razvrsti naraščajoče'
+    SORTDESC: 'Razvrsti padajoče'
+  TableListField_PageControls.ss:
+    DISPLAYING: Displaying
     OF: of
     TO: to
     VIEWFIRST: 'Na začetek'
     VIEWLAST: 'Na konec'
     VIEWNEXT: Naslednja
     VIEWPREVIOUS: Prejšnja
-  SimpleImageField:
-    NOUPLOAD: 'Slika ni naložena'
-  SiteTree:
-    TABMAIN: Domov
-  TableField:
-    ADDITEM: 'Add %s'
-    ISREQUIRED: 'In %s ''%s'' is required'
-    NOITEMSFOUND: 'No items found'
-    SORTASC: 'Razvrsti naraščajoče'
-    SORTDESC: 'Razvrsti padajoče'
-  TableListField:
-    CSVEXPORT: 'Izvozi kot CSV-datoteko'
-    PRINT: Natisni
-    Print: Print
-    SELECT: 'Izberi:'
   TimeField:
     VALIDATEFORMAT: 'Please enter a valid time format ({format})'
   ToggleField:

lang/sr.yml

@@ -50,6 +50,8 @@ sr:
     UNORDERED: 'Неуређена листа'
     UNORDEREDDESCRIPTION: 'Неуређена листа'
     UNORDEREDEXAMPLE1: 'неуређена ставка 1'
+  BackLink_Button.ss:
+    Back: Back
   BasicAuth:
     ENTERINFO: 'Унесите корисничко име и лозинку.'
     ERRORNOTADMIN: 'Овај корисник није администратор.'
@@ -57,9 +59,10 @@ sr:
   Boolean:
     0: 'False'
     ANY: Any
-    Hello: Hi
-    LOGOUT: 'Log out'
     1: 'True'
+  CMSLoadingScreen.ss:
+    LOADING: Loading...
+    REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
   CMSMain:
     ACCESS: 'Access to ''{title}'' section'
     ACCESSALLINTERFACES: 'Access to all CMS sections'
@@ -67,6 +70,12 @@ sr:
     SAVE: Сачувај
   CMSProfileController:
     MENUTITLE: CMSProfileController
+  ChangePasswordEmail.ss:
+    CHANGEPASSWORDTEXT1: 'Променили сте своју лозинку за '
+    CHANGEPASSWORDTEXT2: 'Сада можете да користите следеће податке за пријављивање:'
+    EMAIL: Email
+    HELLO: Здраво
+    PASSWORD: Password
   CheckboxField:
     - 'False'
     - 'True'
@@ -74,6 +83,14 @@ sr:
     CLOSEPOPUP: 'Close Popup'
     SUCCESSADD2: 'Added {name}'
     SUCCESSEDIT: 'Saved %s %s %s'
+  ComplexTableField.ss:
+    ADDITEM: 'Add %s'
+    NOITEMSFOUND: 'No items found'
+    SORTASC: 'Сортирај у растућем поретку'
+    SORTDESC: 'Сортирају у опадајућем поретку'
+  ComplexTableField_popup.ss:
+    NEXT: Следеће
+    PREVIOUS: 'Претходно'
   ConfirmedPasswordField:
     ATLEAST: 'Passwords must be at least {min} characters long.'
     BETWEEN: 'Passwords must be {min} to {max} characters long.'
@@ -111,10 +128,7 @@ sr:
     VALIDDATEMAXDATE: 'Your date has to be older or matching the maximum allowed date ({date})'
     VALIDDATEMINDATE: 'Your date has to be newer or matching the minimum allowed date ({date})'
   Director:
-    ADD: Додај
-    CSVEXPORT: 'Export to CSV'
     INVALID_REQUEST: 'Invalid request'
-    NOTFOUND: 'No items found'
   DropdownField:
     CHOOSE: (изаберите)
   EmailField:
@@ -124,8 +138,6 @@ sr:
     SINGULARNAME: 'Email Bounce Record'
   Enum:
     ANY: Any
-    LOADING: Loading...
-    REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
   File:
     Content: Content
     Filename: Filename
@@ -150,13 +162,17 @@ sr:
     FROMFILESTORE: 'From the File Store'
     NOSOURCE: 'Please select a source file to attach'
     REPLACE: 'Replace {type}'
+  FileIFrameField_iframe.ss:
+    TITLE: 'Image Uploading Iframe'
   Filesystem:
-    IMPORT_TAB_HEADER: Import
-    SEARCHLISTINGS: Search
     SYNCRESULTS: 'Sync complete: {createdcount} items created, {deletedcount} items deleted'
+  ForgotPasswordEmail.ss:
+    HELLO: Здраво
+    TEXT1: 'Here is your'
+    TEXT2: 'password reset link'
+    TEXT3: for
   Form:
     FIELDISREQUIRED: '%s је захтевано'
-    TITLE: 'Image Uploading Iframe'
     VALIDATIONCREDITNUMBER: 'Please ensure you have entered the {number} credit card number correctly'
     VALIDATIONNOTUNIQUE: 'Унета вредност није јединствена'
     VALIDATIONPASSWORDSDONTMATCH: 'Лозинке се не поклапају'
@@ -187,37 +203,26 @@ sr:
     ResetFilter: Reset
   GridFieldAction_Delete:
     DeletePermissionsFailure: 'No delete permissions'
-    NEXT: Следеће
-    PREVIOUS: Претходно
   GridFieldDetailForm:
     Create: Create
     Delete: Delete
     DeletePermissionsFailure: 'No delete permissions'
     Deleted: 'Deleted %s %s'
-    HELLO: Здраво
     Save: Save
     Saved: 'Saved %s %s'
-    TEXT1: 'Here is your'
+  GridFieldItemEditView.ss: null
-    TEXT2: 'password reset link'
-    TEXT3: for
   Group:
     AddRole: 'Add a role for this group'
-    CHANGEPASSWORDTEXT1: 'Променили сте своју лозинку за '
-    CHANGEPASSWORDTEXT2: 'Сада можете да користите следеће податке за пријављивање:'
     Code: 'Grupni Kod'
     DefaultGroupTitleAdministrators: Administrators
     DefaultGroupTitleContentAuthors: 'Content Authors'
     Description: Description
-    EMAIL: Email
     GroupReminder: 'If you choose a parent group, this group will take all it''s roles'
-    HELLO: Здраво
     Locked: 'Zakljucano?'
     NoRoles: 'No roles found'
-    PASSWORD: Password
     Parent: 'Parent Group'
     RolesAddEditLink: 'Manage roles'
     Sort: 'Sort Order'
-    TITLE: 'Iframe за достављање слика'
     has_many_Permissions: Ovlašcenja
     many_many_Members: članovi
   GroupImportForm:
@@ -275,10 +280,9 @@ sr:
     UpdateMEDIA: 'Update Media'
   ImageField:
     IMAGE: Image
-  Image_iframe.ss: 'ChangePasswordEmail.ss:  BackLink_Button.ss:  CMSLoadingScreen.ss:  RelationComplexTableField.ss:  ForgotPasswordEmail.ss:    APPLY FILTER: "Apply Filter"  GridFieldItemEditView.ss:    Go back: "Go back"  ModelSidebar.ss:  TableListField_PageControls.ss:  ModelAdmin_Tools.ss:  ComplexTableField_popup.ss:  TableField.ss:  FileIFrameField_iframe.ss:  ComplexTableField.ss:  TableListField.ss:  ModelAdmin_ImportSpec.ss:  LeftAndMain_Menu.ss:'
+  Image_iframe.ss:
+    TITLE: 'Iframe за достављање слика'
   LeftAndMain:
-    ADD: 'Додај нов ред'
-    ADDITEM: 'Add %s'
     CANT_REORGANISE: 'You do not have permission to alter Top level pages. Your change was not saved.'
     DELETED: Deleted.
     DropdownBatchActionsDefault: Actions
@@ -292,6 +296,9 @@ sr:
     REORGANISATIONSUCCESSFUL: 'Reorganised the site tree successfully.'
     SAVEDUP: Saved.
     VersionUnknown: unknown
+  LeftAndMain_Menu.ss:
+    Hello: Hi
+    LOGOUT: 'Log out'
   LoginAttempt:
     Email: 'Email Address'
     IP: 'IP Address'
@@ -368,6 +375,7 @@ sr:
     ResultUpdated: 'Updated {count} members'
   MemberTableField: null
   ModelAdmin:
+    'APPLY FILTER': 'Apply Filter'
     DELETE: Delete
     DELETEDRECORDS: 'Deleted {count} records.'
     IMPORT: 'Import from CSV'
@@ -377,6 +385,17 @@ sr:
     RESET: Reset
     Title: 'Data Models'
     UPDATEDRECORDS: 'Updated {count} records.'
+  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
   MoneyField:
     FIELDLABELAMOUNT: Amount
     FIELDLABELCURRENCY: Currency
@@ -389,10 +408,6 @@ sr:
     CMS_ACCESS_CATEGORY: 'CMS Access'
     FULLADMINRIGHTS: 'Full administrative rights'
     FULLADMINRIGHTS_HELP: 'Implies and overrules all other assigned permissions.'
-    IMPORTSPECFIELDS: 'Database columns'
-    IMPORTSPECLINK: 'Show Specification for %s'
-    IMPORTSPECRELATIONS: Relations
-    IMPORTSPECTITLE: 'Specification for %s'
   PermissionCheckboxSetField:
     AssignedTo: 'assigned to "{title}"'
     FromGroup: 'inherited from group "{title}"'
@@ -401,8 +416,11 @@ sr:
   Permissions:
     PERMISSIONS_CATEGORY: 'Roles and access permissions'
   PhoneNumberField:
-    Back: Back
     VALIDATION: 'Унесите исправан број телефона'
+  RelationComplexTableField.ss:
+    ADD: Додај
+    CSVEXPORT: 'Export to CSV'
+    NOTFOUND: 'No items found'
   Security:
     ALREADYLOGGEDIN: 'Немате дозволу за приступ овој страни. Уколико имате други налог којим можете да приступите овој страни, пријавите се.'
     BUTTONSEND: 'Пошаљи ми линк за ресетовање лозинке'
@@ -439,31 +457,33 @@ sr:
     BtnImport: 'Import from CSV'
     FileFieldLabel: 'CSV File <small>(Allowed extensions: *.csv)</small>'
   SilverStripeNavigator:
-    DISPLAYING: Displaying
     Edit: Edit
-    FILTER: Filter
+  SimpleImageField:
-    IMPORT: Import
+    NOUPLOAD: 'Ниједна слика није достављена'
+  SiteTree:
+    TABMAIN: Главно
+  TableField:
+    ISREQUIRED: 'In %s ''%s'' is required'
+  TableField.ss:
+    ADD: 'Додај нов ред'
+    ADDITEM: 'Add %s'
+  TableListField:
+    CSVEXPORT: 'Извези у CSV'
+    PRINT: Штампај
+    Print: Print
+    SELECT: 'Select:'
+  TableListField.ss:
+    NOITEMSFOUND: 'No items found'
+    SORTASC: 'Sort in ascending order'
+    SORTDESC: 'Sort in descending order'
+  TableListField_PageControls.ss:
+    DISPLAYING: Displaying
     OF: of
     TO: to
     VIEWFIRST: 'View first'
     VIEWLAST: 'View last'
     VIEWNEXT: 'Погледај следеће'
     VIEWPREVIOUS: 'Погледај претходно'
-  SimpleImageField:
-    NOUPLOAD: 'Ниједна слика није достављена'
-  SiteTree:
-    TABMAIN: Главно
-  TableField:
-    ADDITEM: 'Add %s'
-    ISREQUIRED: 'In %s ''%s'' is required'
-    NOITEMSFOUND: 'No items found'
-    SORTASC: 'Sort in ascending order'
-    SORTDESC: 'Sort in descending order'
-  TableListField:
-    CSVEXPORT: 'Извези у CSV'
-    PRINT: Штампај
-    Print: Print
-    SELECT: 'Select:'
   TimeField:
     VALIDATEFORMAT: 'Please enter a valid time format ({format})'
   ToggleField:

lang/sv.yml

@@ -50,6 +50,8 @@ sv:
     UNORDERED: 'Oordnad lista'
     UNORDEREDDESCRIPTION: 'Oordnad lista'
     UNORDEREDEXAMPLE1: 'oordnad artikel 1'
+  BackLink_Button.ss:
+    Back: Tillbaka
   BasicAuth:
     ENTERINFO: 'Var god ange användarnamn och lösenord'
     ERRORNOTADMIN: 'Den användaren är inte administratör'
@@ -57,9 +59,10 @@ sv:
   Boolean:
     0: Falskt
     ANY: 'Vilken som helst'
-    Hello: Hej
-    LOGOUT: 'Logga ut'
     1: Sant
+  CMSLoadingScreen.ss:
+    LOADING: Laddar...
+    REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
   CMSMain:
     ACCESS: 'Tillgång till sektionen ''{title}'''
     ACCESSALLINTERFACES: 'Tillgång till alla CMS-sektioner'
@@ -67,6 +70,12 @@ sv:
     SAVE: Spara
   CMSProfileController:
     MENUTITLE: CMSProfileController
+  ChangePasswordEmail.ss:
+    CHANGEPASSWORDTEXT1: 'Du har ändrat ditt lösenord för'
+    CHANGEPASSWORDTEXT2: 'Du kan nu använda följande uppgifter för att logga in:'
+    EMAIL: E-post
+    HELLO: Hej
+    PASSWORD: Lösenord
   CheckboxField:
     - Falskt
     - Sant
@@ -74,6 +83,14 @@ sv:
     CLOSEPOPUP: 'Stäng popup'
     SUCCESSADD2: 'Lade till {name}'
     SUCCESSEDIT: 'Sparade %s %s %s'
+  ComplexTableField.ss:
+    ADDITEM: 'Add %s'
+    NOITEMSFOUND: 'No items found'
+    SORTASC: 'Sortera stigande'
+    SORTDESC: 'Sortera fallande'
+  ComplexTableField_popup.ss:
+    NEXT: Nästa
+    PREVIOUS: Föregående
   ConfirmedPasswordField:
     ATLEAST: 'Lösenord måste vara minst {min} tecken långa.'
     BETWEEN: 'Lösenord måste vara {min} till {max} tecken långa.'
@@ -111,10 +128,7 @@ sv:
     VALIDDATEMAXDATE: 'Angivet datum måste vara tidigare eller samma som det senaste godkända datumet ({date})'
     VALIDDATEMINDATE: 'Angivet datum måste vara senare eller samma som det tidigaste godkända datumet ({date})'
   Director:
-    ADD: 'Lägg till'
-    CSVEXPORT: 'Export to CSV'
     INVALID_REQUEST: 'Ogiltig förfrågan'
-    NOTFOUND: 'No items found'
   DropdownField:
     CHOOSE: (Välj)
   EmailField:
@@ -124,8 +138,6 @@ sv:
     SINGULARNAME: 'Studsade e-brev'
   Enum:
     ANY: 'Vilken som helst'
-    LOADING: Laddar...
-    REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
   File:
     Content: Innehåll
     Filename: Filnamn
@@ -150,13 +162,17 @@ sv:
     FROMFILESTORE: 'Från filarkivet'
     NOSOURCE: 'Välj filen du vill bifoga'
     REPLACE: 'Ersätt {type}'
+  FileIFrameField_iframe.ss:
+    TITLE: 'Iframe för uppladdning av bild'
   Filesystem:
-    IMPORT_TAB_HEADER: Importera
-    SEARCHLISTINGS: Sök
     SYNCRESULTS: 'Synk genomförd: {createdcount} objekt skapades, {deletedcount} objekt raderades'
+  ForgotPasswordEmail.ss:
+    HELLO: Hej
+    TEXT1: 'Här är din'
+    TEXT2: 'Återställningslänk för lösenord'
+    TEXT3: för
   Form:
     FIELDISREQUIRED: '%s är obligatorisk'
-    TITLE: 'Iframe för uppladdning av bild'
     VALIDATIONCREDITNUMBER: 'Kontrollera att du angav kortnummret {number} rätt'
     VALIDATIONNOTUNIQUE: 'Det angivna värdet är inte unikt'
     VALIDATIONPASSWORDSDONTMATCH: 'Lösenorden stämmer inte överrens '
@@ -187,37 +203,26 @@ sv:
     ResetFilter: Rensa
   GridFieldAction_Delete:
     DeletePermissionsFailure: 'Rättighet för att radera saknas'
-    NEXT: Nästa
-    PREVIOUS: Föregående
   GridFieldDetailForm:
     Create: Skapa
     Delete: Radera
     DeletePermissionsFailure: 'Rättighet för att radera saknas'
     Deleted: 'Raderade %s %s'
-    HELLO: Hej
     Save: Spara
     Saved: 'Sparade %s %s'
-    TEXT1: 'Här är din'
+  GridFieldItemEditView.ss: null
-    TEXT2: 'Återställningslänk för lösenord'
-    TEXT3: för
   Group:
     AddRole: 'Lägg till roll för den här gruppen'
-    CHANGEPASSWORDTEXT1: 'Du har ändrat ditt lösenord för'
-    CHANGEPASSWORDTEXT2: 'Du kan nu använda följande uppgifter för att logga in:'
     Code: Gruppkod
     DefaultGroupTitleAdministrators: Administratörer
     DefaultGroupTitleContentAuthors: Författare
     Description: Beskrivning
-    EMAIL: E-post
     GroupReminder: 'Om du väljer en förälder till gruppen så kommer gruppen ärva alla förälderns roller'
-    HELLO: Hej
     Locked: 'Låst?'
     NoRoles: 'Inga roller funna'
-    PASSWORD: Lösenord
     Parent: Föräldragrupp
     RolesAddEditLink: 'Hantera roller'
     Sort: Sorteringsordning
-    TITLE: 'Iframe för uppladdning av bild'
     has_many_Permissions: Tillstånd
     many_many_Members: Medlemmar
   GroupImportForm:
@@ -275,13 +280,12 @@ sv:
     UpdateMEDIA: 'Uppdatera media'
   ImageField:
     IMAGE: Bild
-  Image_iframe.ss: 'ChangePasswordEmail.ss:  BackLink_Button.ss:  CMSLoadingScreen.ss:  RelationComplexTableField.ss:  ForgotPasswordEmail.ss:    APPLY FILTER: "Använd filter"  GridFieldItemEditView.ss:    Go back: "Gå tillbaka"  ModelSidebar.ss:  TableListField_PageControls.ss:  ModelAdmin_Tools.ss:  ComplexTableField_popup.ss:  TableField.ss:  FileIFrameField_iframe.ss:  ComplexTableField.ss:  TableListField.ss:  ModelAdmin_ImportSpec.ss:  LeftAndMain_Menu.ss:'
+  Image_iframe.ss:
+    TITLE: 'Iframe för uppladdning av bild'
   LeftAndMain:
-    ADD: 'Lägg till ny rad'
-    ADDITEM: 'Lägg till %s'
     CANT_REORGANISE: 'Du har inte tillstånd att ändra sidor på toppnivå. Dina ändringar har inte sparats.'
     DELETED: Raderad
-    DropdownBatchActionsDefault: Åtgärder
+    DropdownBatchActionsDefault: 'Åtgärder'
     HELP: Hjälp
     PAGETYPE: Sidtyp
     PERMAGAIN: 'Du har blivit utloggad. Om du vill logga in igen anger du dina uppgifter nedan.'
@@ -292,6 +296,9 @@ sv:
     REORGANISATIONSUCCESSFUL: 'Omorganisationen av sidträdet luyckades.'
     SAVEDUP: Sparad.
     VersionUnknown: okänd
+  LeftAndMain_Menu.ss:
+    Hello: Hej
+    LOGOUT: 'Logga ut'
   LoginAttempt:
     Email: E-postadress
     IP: IP-adress
@@ -368,6 +375,7 @@ sv:
     ResultUpdated: 'Uppdaterade {count} medlemmar'
   MemberTableField: null
   ModelAdmin:
+    'APPLY FILTER': 'Använd filter'
     DELETE: Radera
     DELETEDRECORDS: 'Deleted {count} records.'
     IMPORT: 'Importera från CSV'
@@ -377,6 +385,17 @@ sv:
     RESET: Rensa
     Title: Datamodeller
     UPDATEDRECORDS: 'Updated {count} records.'
+  ModelAdmin_ImportSpec.ss:
+    IMPORTSPECFIELDS: Databaskolumner
+    IMPORTSPECLINK: 'Show Specification for %s'
+    IMPORTSPECRELATIONS: Relationer
+    IMPORTSPECTITLE: 'Specification for %s'
+  ModelAdmin_Tools.ss:
+    FILTER: 'Filtrera på'
+    IMPORT: Importera
+  ModelSidebar.ss:
+    IMPORT_TAB_HEADER: Importera
+    SEARCHLISTINGS: Sök
   MoneyField:
     FIELDLABELAMOUNT: Belopp
     FIELDLABELCURRENCY: Valuta
@@ -389,10 +408,6 @@ sv:
     CMS_ACCESS_CATEGORY: CMS-tillgång
     FULLADMINRIGHTS: 'Fulla administrativa rättigheter'
     FULLADMINRIGHTS_HELP: 'Implicerar och gäller över alla andra tillskrivna rättigheter.'
-    IMPORTSPECFIELDS: Databaskolumner
-    IMPORTSPECLINK: 'Show Specification for %s'
-    IMPORTSPECRELATIONS: Relationer
-    IMPORTSPECTITLE: 'Specification for %s'
   PermissionCheckboxSetField:
     AssignedTo: 'tilldelad till "{title}"'
     FromGroup: 'ärvde från grupp "{title}"'
@@ -401,8 +416,11 @@ sv:
   Permissions:
     PERMISSIONS_CATEGORY: 'Roller och tillgångsinställningar'
   PhoneNumberField:
-    Back: Tillbaka
     VALIDATION: 'Var god ange ett giltigt telefonnummer'
+  RelationComplexTableField.ss:
+    ADD: 'Lägg till'
+    CSVEXPORT: 'Export to CSV'
+    NOTFOUND: 'No items found'
   Security:
     ALREADYLOGGEDIN: 'Du har inte tillträde till den här sidan. Om du har ett annat konto som har rätt behörighet kan du logga in igen nedan.'
     BUTTONSEND: 'Skicka återställningslänk'
@@ -439,31 +457,33 @@ sv:
     BtnImport: 'Importera från CSV'
     FileFieldLabel: 'CSV-fil <small>(Tillåtna filtyper: *.csv)</small>'
   SilverStripeNavigator:
-    DISPLAYING: Displaying
     Edit: Ändra
-    FILTER: 'Filtrera på'
+  SimpleImageField:
-    IMPORT: Importera
+    NOUPLOAD: 'Ingen bild uppladdad'
+  SiteTree:
+    TABMAIN: Huvudsaklig
+  TableField:
+    ISREQUIRED: 'För %s är ''%s'' obligatoriskt'
+  TableField.ss:
+    ADD: 'Lägg till ny rad'
+    ADDITEM: 'Lägg till %s'
+  TableListField:
+    CSVEXPORT: 'Exportera till CSV'
+    PRINT: 'Skriv ut'
+    Print: Print
+    SELECT: 'Välj:'
+  TableListField.ss:
+    NOITEMSFOUND: 'No items found'
+    SORTASC: 'Sortera i stigande ordning'
+    SORTDESC: 'Sortera i fallande ordning'
+  TableListField_PageControls.ss:
+    DISPLAYING: Displaying
     OF: av
     TO: to
     VIEWFIRST: 'Visa första'
     VIEWLAST: 'Visa sista'
     VIEWNEXT: 'Visa nästa'
     VIEWPREVIOUS: 'Visa föregående'
-  SimpleImageField:
-    NOUPLOAD: 'Ingen bild uppladdad'
-  SiteTree:
-    TABMAIN: Huvudsaklig
-  TableField:
-    ADDITEM: 'Add %s'
-    ISREQUIRED: 'För %s är ''%s'' obligatoriskt'
-    NOITEMSFOUND: 'No items found'
-    SORTASC: 'Sortera i stigande ordning'
-    SORTDESC: 'Sortera i fallande ordning'
-  TableListField:
-    CSVEXPORT: 'Exportera till CSV'
-    PRINT: 'Skriv ut'
-    Print: Print
-    SELECT: 'Välj:'
   TimeField:
     VALIDATEFORMAT: 'Var god att ange tid i ett giltigt format ({format})'
   ToggleField:

lang/th.yml

@@ -37,8 +37,8 @@ th:
     COLOREDEXAMPLE: 'blue text'
     EMAILLINK: 'Email link'
     EMAILLINKDESCRIPTION: สร้างลิงค์ให้กับที่อยู่อีเมล์
-    IMAGE: รูปภาพ
+    IMAGE: 'รูปภาพ'
-    IMAGEDESCRIPTION: แสดงรูปภาพในหน้าบทความของคุณ
+    IMAGEDESCRIPTION: 'แสดงรูปภาพในหน้าบทความของคุณ'
     ITALIC: 'Italic Text'
     ITALICEXAMPLE: Italics
     LINK: 'Website link'
@@ -50,6 +50,8 @@ th:
     UNORDERED: 'Unordered list'
     UNORDEREDDESCRIPTION: 'Unordered list'
     UNORDEREDEXAMPLE1: 'unordered item 1'
+  BackLink_Button.ss:
+    Back: Back
   BasicAuth:
     ENTERINFO: กรุณากรอกชื่อผู้ใช้และรหัสผ่าน
     ERRORNOTADMIN: ผู้ใช้งานรายดังกล่าวไม่ใช่ผู้ดูแลระบบ
@@ -57,9 +59,10 @@ th:
   Boolean:
     0: ไม่ตกลง
     ANY: Any
-    Hello: Hi
-    LOGOUT: 'Log out'
     1: ตกลง
+  CMSLoadingScreen.ss:
+    LOADING: Loading...
+    REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
   CMSMain:
     ACCESS: 'Access to ''{title}'' section'
     ACCESSALLINTERFACES: 'เข้าถึงพื้นที่ในส่วนของ CMS ทั้งหมด'
@@ -67,6 +70,12 @@ th:
     SAVE: บันทึก
   CMSProfileController:
     MENUTITLE: CMSProfileController
+  ChangePasswordEmail.ss:
+    CHANGEPASSWORDTEXT1: คุณได้เปลี่ยนรหัสผ่านสำหรับ
+    CHANGEPASSWORDTEXT2: 'You can now use the following credentials to log in:'
+    EMAIL: อีเมล
+    HELLO: สวัสดี
+    PASSWORD: รหัสผ่าน
   CheckboxField:
     - ไม่ตกลง
     - ตกลง
@@ -74,6 +83,14 @@ th:
     CLOSEPOPUP: ปิดหน้าต่างป๊อปอัพ
     SUCCESSADD2: 'Added {name}'
     SUCCESSEDIT: 'บันทึกแล้ว %s %s %s'
+  ComplexTableField.ss:
+    ADDITEM: 'Add %s'
+    NOITEMSFOUND: 'No items found'
+    SORTASC: จัดเรียงจากน้อยมามาก
+    SORTDESC: จัดเรียงจากมากไปน้อย
+  ComplexTableField_popup.ss:
+    NEXT: ถัดไป
+    PREVIOUS: ก่อนหน้า
   ConfirmedPasswordField:
     ATLEAST: 'Passwords must be at least {min} characters long.'
     BETWEEN: 'Passwords must be {min} to {max} characters long.'
@@ -111,10 +128,7 @@ th:
     VALIDDATEMAXDATE: 'Your date has to be older or matching the maximum allowed date ({date})'
     VALIDDATEMINDATE: 'Your date has to be newer or matching the minimum allowed date ({date})'
   Director:
-    ADD: เพิ่ม
-    CSVEXPORT: 'Export to CSV'
     INVALID_REQUEST: 'Invalid request'
-    NOTFOUND: 'No items found'
   DropdownField:
     CHOOSE: (เลือก)
   EmailField:
@@ -124,8 +138,6 @@ th:
     SINGULARNAME: 'Email Bounce Record'
   Enum:
     ANY: Any
-    LOADING: Loading...
-    REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
   File:
     Content: เนื้อหา
     Filename: ชื่อไฟล์
@@ -150,13 +162,17 @@ th:
     FROMFILESTORE: 'From the File Store'
     NOSOURCE: 'Please select a source file to attach'
     REPLACE: 'Replace {type}'
+  FileIFrameField_iframe.ss:
+    TITLE: 'Image Uploading Iframe'
   Filesystem:
-    IMPORT_TAB_HEADER: Import
-    SEARCHLISTINGS: Search
     SYNCRESULTS: 'Sync complete: {createdcount} items created, {deletedcount} items deleted'
+  ForgotPasswordEmail.ss:
+    HELLO: สวัสดี
+    TEXT1: นี่คือ
+    TEXT2: ลิงค์รีเซ็ตรหัสผ่าน
+    TEXT3: สำหรับ
   Form:
     FIELDISREQUIRED: '%s is required'
-    TITLE: 'Image Uploading Iframe'
     VALIDATIONCREDITNUMBER: 'Please ensure you have entered the {number} credit card number correctly'
     VALIDATIONNOTUNIQUE: 'The value entered is not unique'
     VALIDATIONPASSWORDSDONTMATCH: รหัสผ่านไม่ตรงกัน
@@ -187,37 +203,26 @@ th:
     ResetFilter: Reset
   GridFieldAction_Delete:
     DeletePermissionsFailure: 'No delete permissions'
-    NEXT: ถัดไป
-    PREVIOUS: ก่อนหน้า
   GridFieldDetailForm:
     Create: Create
     Delete: Delete
     DeletePermissionsFailure: 'No delete permissions'
     Deleted: 'Deleted %s %s'
-    HELLO: สวัสดี
     Save: Save
     Saved: 'Saved %s %s'
-    TEXT1: นี่คือ
+  GridFieldItemEditView.ss: null
-    TEXT2: ลิงค์รีเซ็ตรหัสผ่าน
-    TEXT3: สำหรับ
   Group:
     AddRole: 'Add a role for this group'
-    CHANGEPASSWORDTEXT1: คุณได้เปลี่ยนรหัสผ่านสำหรับ
-    CHANGEPASSWORDTEXT2: 'You can now use the following credentials to log in:'
     Code: รหัสกลุ่ม
     DefaultGroupTitleAdministrators: ผู้ดูและระบบ
     DefaultGroupTitleContentAuthors: ผู้แต่งเนื้อหา
     Description: คำอธิบาย
-    EMAIL: อีเมล
     GroupReminder: 'If you choose a parent group, this group will take all it''s roles'
-    HELLO: สวัสดี
     Locked: 'ล็อค?'
     NoRoles: 'No roles found'
-    PASSWORD: รหัสผ่าน
     Parent: กลุ่มหลักต้นทาง
     RolesAddEditLink: เพิ่ม/แก้ไขบทบาท
     Sort: จัดลำดับ
-    TITLE: 'Image Uploading Iframe'
     has_many_Permissions: สิทธิ์
     many_many_Members: สมาชิก
   GroupImportForm:
@@ -236,7 +241,7 @@ th:
     BUTTONINSERTLINK: แทรกลิงค์
     BUTTONREMOVELINK: ลบลิงค์
     BUTTONUpdate: Update
-    CAPTIONTEXT: ข้อความคำอธิบายใต้ภาพ
+    CAPTIONTEXT: 'ข้อความคำอธิบายใต้ภาพ'
     CSSCLASS: 'การจัดวาง / รูปแบบ'
     CSSCLASSCENTER: 'Centered, on its own.'
     CSSCLASSLEFT: 'On the left, with text wrapping around.'
@@ -274,11 +279,10 @@ th:
     URLNOTANOEMBEDRESOURCE: 'The URL ''{url}'' could not be turned into a media resource.'
     UpdateMEDIA: 'Update Media'
   ImageField:
-    IMAGE: รูปภาพ
+    IMAGE: 'รูปภาพ'
-  Image_iframe.ss: 'ChangePasswordEmail.ss:  BackLink_Button.ss:  CMSLoadingScreen.ss:  RelationComplexTableField.ss:  ForgotPasswordEmail.ss:    APPLY FILTER: "Apply Filter"  GridFieldItemEditView.ss:    Go back: "Go back"  ModelSidebar.ss:  TableListField_PageControls.ss:  ModelAdmin_Tools.ss:  ComplexTableField_popup.ss:  TableField.ss:  FileIFrameField_iframe.ss:  ComplexTableField.ss:  TableListField.ss:  ModelAdmin_ImportSpec.ss:  LeftAndMain_Menu.ss:'
+  Image_iframe.ss:
+    TITLE: 'Image Uploading Iframe'
   LeftAndMain:
-    ADD: เพิ่มแถวใหม่
-    ADDITEM: 'Add %s'
     CANT_REORGANISE: 'You do not have permission to alter Top level pages. Your change was not saved.'
     DELETED: Deleted.
     DropdownBatchActionsDefault: Actions
@@ -292,6 +296,9 @@ th:
     REORGANISATIONSUCCESSFUL: 'Reorganised the site tree successfully.'
     SAVEDUP: Saved.
     VersionUnknown: unknown
+  LeftAndMain_Menu.ss:
+    Hello: Hi
+    LOGOUT: 'Log out'
   LoginAttempt:
     Email: ที่อยู่อีเมล
     IP: ไอพีเครื่อง
@@ -314,7 +321,7 @@ th:
     ERRORPASSWORDNOTMATCH: 'Your current password does not match, please try again'
     ERRORWRONGCRED: 'That doesn''t seem to be the right e-mail address or password. Please try again.'
     FIRSTNAME: ชื่อจริง
-    INTERFACELANG: ภาษาสำหรับหน้าจอติดต่อผู้ใช้
+    INTERFACELANG: 'ภาษาสำหรับหน้าจอติดต่อผู้ใช้'
     INVALIDNEWPASSWORD: 'We couldn''t accept that password: {password}'
     LOGGEDINAS: 'You''re logged in as {name}.'
     NEWPASSWORD: รหัสผ่านใหม่
@@ -332,7 +339,7 @@ th:
     YOUROLDPASSWORD: รหัสผ่านเก่าของคุณ
     belongs_many_many_Groups: กลุ่ม
     db_LastVisited: วันที่เยี่ยมชมล่าสุด
-    db_Locale: ภาษาสำหรับส่วนอินเทอร์เฟซ
+    db_Locale: 'ภาษาสำหรับส่วนอินเทอร์เฟซ'
     db_LockedOutUntil: 'Locked out until'
     db_NumVisit: จำนวนการเข้าชม
     db_Password: รหัสผ่าน
@@ -368,6 +375,7 @@ th:
     ResultUpdated: 'Updated {count} members'
   MemberTableField: null
   ModelAdmin:
+    'APPLY FILTER': 'Apply Filter'
     DELETE: ลบ
     DELETEDRECORDS: 'Deleted {count} records.'
     IMPORT: 'นำเข้าจากไฟล์ CSV'
@@ -377,6 +385,17 @@ th:
     RESET: Reset
     Title: 'Data Models'
     UPDATEDRECORDS: 'Updated {count} records.'
+  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
   MoneyField:
     FIELDLABELAMOUNT: จำนวน
     FIELDLABELCURRENCY: สกุลเงิน
@@ -389,10 +408,6 @@ th:
     CMS_ACCESS_CATEGORY: 'การเข้าถึง CMS'
     FULLADMINRIGHTS: 'Full administrative rights'
     FULLADMINRIGHTS_HELP: 'Implies and overrules all other assigned permissions.'
-    IMPORTSPECFIELDS: 'Database columns'
-    IMPORTSPECLINK: 'Show Specification for %s'
-    IMPORTSPECRELATIONS: Relations
-    IMPORTSPECTITLE: 'Specification for %s'
   PermissionCheckboxSetField:
     AssignedTo: 'assigned to "{title}"'
     FromGroup: 'inherited from group "{title}"'
@@ -401,8 +416,11 @@ th:
   Permissions:
     PERMISSIONS_CATEGORY: 'Roles and access permissions'
   PhoneNumberField:
-    Back: Back
     VALIDATION: 'Please enter a valid phone number'
+  RelationComplexTableField.ss:
+    ADD: เพิ่ม
+    CSVEXPORT: 'Export to CSV'
+    NOTFOUND: 'No items found'
   Security:
     ALREADYLOGGEDIN: 'คุณไม่จำเป็นต้องเข้ามาที่หน้าเว็บนี้. หากคุณมีบัญชีอื่นๆที่สามารถเข้าถึงหน้าเว็บนี้ได้อยู่แล้ว คุณสามารถ <a href="%s">เข้าสู่ระบบอีกครั้ง</a>'
     BUTTONSEND: ส่งลิงค์รีเซ็ตรหัสผ่านให้กับฉัน
@@ -439,31 +457,33 @@ th:
     BtnImport: นำเข้า
     FileFieldLabel: 'CSV File <small>(Allowed extensions: *.csv)</small>'
   SilverStripeNavigator:
-    DISPLAYING: Displaying
     Edit: Edit
-    FILTER: Filter
+  SimpleImageField:
-    IMPORT: Import
+    NOUPLOAD: 'ยังไม่มีรูปภาพที่ถูกอัพโหลด'
+  SiteTree:
+    TABMAIN: หลัก
+  TableField:
+    ISREQUIRED: 'In %s ''%s'' is required'
+  TableField.ss:
+    ADD: เพิ่มแถวใหม่
+    ADDITEM: 'Add %s'
+  TableListField:
+    CSVEXPORT: 'ส่งข้อมูลออกเป็น CSV'
+    PRINT: สั่งพิมพ์
+    Print: Print
+    SELECT: เลือก
+  TableListField.ss:
+    NOITEMSFOUND: 'No items found'
+    SORTASC: จัดเรียงลำดับจากน้อยมามาก
+    SORTDESC: จัดเรียงลำดับจากมากมาน้อย
+  TableListField_PageControls.ss:
+    DISPLAYING: Displaying
     OF: of
     TO: to
     VIEWFIRST: ดูหน้าแรก
     VIEWLAST: เปิดดูหน้าสุดท้าย
     VIEWNEXT: เปิดดูหน้าเว็บถัดไป
     VIEWPREVIOUS: เปิดดูหน้าเว็บก่อนหน้า
-  SimpleImageField:
-    NOUPLOAD: ยังไม่มีรูปภาพที่ถูกอัพโหลด
-  SiteTree:
-    TABMAIN: หลัก
-  TableField:
-    ADDITEM: 'Add %s'
-    ISREQUIRED: 'In %s ''%s'' is required'
-    NOITEMSFOUND: 'No items found'
-    SORTASC: จัดเรียงลำดับจากน้อยมามาก
-    SORTDESC: จัดเรียงลำดับจากมากมาน้อย
-  TableListField:
-    CSVEXPORT: 'ส่งข้อมูลออกเป็น CSV'
-    PRINT: สั่งพิมพ์
-    Print: Print
-    SELECT: เลือก
   TimeField:
     VALIDATEFORMAT: 'Please enter a valid time format ({format})'
   ToggleField:

lang/tr.yml

@@ -50,6 +50,8 @@ tr:
     UNORDERED: 'Sıralanmamış liste'
     UNORDEREDDESCRIPTION: 'Sıralanmamış liste'
     UNORDEREDEXAMPLE1: 'sıralanmamış madde 1'
+  BackLink_Button.ss:
+    Back: Back
   BasicAuth:
     ENTERINFO: 'Lütfen kullanıcı adı ve şifrenizi giriniz.'
     ERRORNOTADMIN: 'O kullanıcı, yönetici değildir'
@@ -57,9 +59,10 @@ tr:
   Boolean:
     0: Yanlış
     ANY: Herhangi
-    Hello: Hi
-    LOGOUT: 'Log out'
     1: Doğru
+  CMSLoadingScreen.ss:
+    LOADING: Loading...
+    REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
   CMSMain:
     ACCESS: 'Access to ''{title}'' section'
     ACCESSALLINTERFACES: 'Tüm İYS arayüzlerine erişim'
@@ -67,6 +70,12 @@ tr:
     SAVE: Kaydet
   CMSProfileController:
     MENUTITLE: CMSProfileController
+  ChangePasswordEmail.ss:
+    CHANGEPASSWORDTEXT1: 'Parolanız değiştirildi:'
+    CHANGEPASSWORDTEXT2: 'Sisteme giriş yapabilmek için aşağıdaki kullanıcı bilgilerinizi kullanabilirsiniz:'
+    EMAIL: E-Posta
+    HELLO: Merhaba
+    PASSWORD: Parola
   CheckboxField:
     - Yanlış
     - Doğru
@@ -74,6 +83,14 @@ tr:
     CLOSEPOPUP: 'Açılır Pancereyi Kapat'
     SUCCESSADD2: 'Added {name}'
     SUCCESSEDIT: 'Kaydedildi %s %s %s'
+  ComplexTableField.ss:
+    ADDITEM: 'Add %s'
+    NOITEMSFOUND: 'No items found'
+    SORTASC: 'Sırala (artan)'
+    SORTDESC: 'Sırala (azalan)'
+  ComplexTableField_popup.ss:
+    NEXT: Sonraki
+    PREVIOUS: Önceki
   ConfirmedPasswordField:
     ATLEAST: 'Passwords must be at least {min} characters long.'
     BETWEEN: 'Passwords must be {min} to {max} characters long.'
@@ -111,10 +128,7 @@ tr:
     VALIDDATEMAXDATE: 'Your date has to be older or matching the maximum allowed date ({date})'
     VALIDDATEMINDATE: 'Your date has to be newer or matching the minimum allowed date ({date})'
   Director:
-    ADD: Ekle
-    CSVEXPORT: 'Export to CSV'
     INVALID_REQUEST: 'Invalid request'
-    NOTFOUND: 'No items found'
   DropdownField:
     CHOOSE: (Seçiniz)
   EmailField:
@@ -124,8 +138,6 @@ tr:
     SINGULARNAME: 'Eposta Geri-dönüş Kaydı'
   Enum:
     ANY: Any
-    LOADING: Loading...
-    REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
   File:
     Content: İçerik
     Filename: 'Dosya adı'
@@ -150,13 +162,17 @@ tr:
     FROMFILESTORE: 'From the File Store'
     NOSOURCE: 'Please select a source file to attach'
     REPLACE: 'Replace {type}'
+  FileIFrameField_iframe.ss:
+    TITLE: 'Image Uploading Iframe'
   Filesystem:
-    IMPORT_TAB_HEADER: Import
-    SEARCHLISTINGS: Search
     SYNCRESULTS: 'Sync complete: {createdcount} items created, {deletedcount} items deleted'
+  ForgotPasswordEmail.ss:
+    HELLO: Merhaba
+    TEXT1: 'Profilinize ait'
+    TEXT2: 'şifre sıfırlama linki'
+    TEXT3: için
   Form:
     FIELDISREQUIRED: '%s alanının girilmesi zorunludur'
-    TITLE: 'Image Uploading Iframe'
     VALIDATIONCREDITNUMBER: 'Please ensure you have entered the {number} credit card number correctly'
     VALIDATIONNOTUNIQUE: 'Girilen değer benzersiz olmalıdır'
     VALIDATIONPASSWORDSDONTMATCH: 'Şifre tekrarı hatalı'
@@ -187,37 +203,26 @@ tr:
     ResetFilter: Reset
   GridFieldAction_Delete:
     DeletePermissionsFailure: 'No delete permissions'
-    NEXT: Sonraki
-    PREVIOUS: Önceki
   GridFieldDetailForm:
     Create: Create
     Delete: Delete
     DeletePermissionsFailure: 'No delete permissions'
     Deleted: 'Deleted %s %s'
-    HELLO: Merhaba
     Save: Save
     Saved: 'Saved %s %s'
-    TEXT1: 'Profilinize ait'
+  GridFieldItemEditView.ss: null
-    TEXT2: 'şifre sıfırlama linki'
-    TEXT3: için
   Group:
     AddRole: 'Bu gruba rol ekleyin'
-    CHANGEPASSWORDTEXT1: 'Parolanız değiştirildi:'
-    CHANGEPASSWORDTEXT2: 'Sisteme giriş yapabilmek için aşağıdaki kullanıcı bilgilerinizi kullanabilirsiniz:'
     Code: 'Grup Kodu'
     DefaultGroupTitleAdministrators: Yöneticiler
     DefaultGroupTitleContentAuthors: 'İçerik Editörleri'
     Description: Açıklama
-    EMAIL: E-Posta
     GroupReminder: 'If you choose a parent group, this group will take all it''s roles'
-    HELLO: Merhaba
     Locked: 'Kilitli?'
     NoRoles: 'Rol bulunamadı'
-    PASSWORD: Parola
     Parent: 'Ana Grup'
     RolesAddEditLink: 'Rolleri yönet'
     Sort: Sırala
-    TITLE: 'Resim göndermek için gerekli IFrame'
     has_many_Permissions: İzinler
     many_many_Members: Üyeler
   GroupImportForm:
@@ -275,10 +280,9 @@ tr:
     UpdateMEDIA: 'Update Media'
   ImageField:
     IMAGE: Image
-  Image_iframe.ss: 'ChangePasswordEmail.ss:  BackLink_Button.ss:  CMSLoadingScreen.ss:  RelationComplexTableField.ss:  ForgotPasswordEmail.ss:    APPLY FILTER: "Apply Filter"  GridFieldItemEditView.ss:    Go back: "Go back"  ModelSidebar.ss:  TableListField_PageControls.ss:  ModelAdmin_Tools.ss:  ComplexTableField_popup.ss:  TableField.ss:  FileIFrameField_iframe.ss:  ComplexTableField.ss:  TableListField.ss:  ModelAdmin_ImportSpec.ss:  LeftAndMain_Menu.ss:'
+  Image_iframe.ss:
+    TITLE: 'Resim göndermek için gerekli IFrame'
   LeftAndMain:
-    ADD: 'Yeni bir satır ekle'
-    ADDITEM: 'Add %s'
     CANT_REORGANISE: 'You do not have permission to alter Top level pages. Your change was not saved.'
     DELETED: Deleted.
     DropdownBatchActionsDefault: Actions
@@ -292,6 +296,9 @@ tr:
     REORGANISATIONSUCCESSFUL: 'Reorganised the site tree successfully.'
     SAVEDUP: Saved.
     VersionUnknown: unknown
+  LeftAndMain_Menu.ss:
+    Hello: Hi
+    LOGOUT: 'Log out'
   LoginAttempt:
     Email: 'Eposta Adresi'
     IP: 'IP Adresi'
@@ -368,6 +375,7 @@ tr:
     ResultUpdated: 'Updated {count} members'
   MemberTableField: null
   ModelAdmin:
+    'APPLY FILTER': 'Apply Filter'
     DELETE: Sil
     DELETEDRECORDS: 'Deleted {count} records.'
     IMPORT: 'CSV''den içer aktar'
@@ -377,6 +385,17 @@ tr:
     RESET: Sıfırla
     Title: 'Data Models'
     UPDATEDRECORDS: 'Updated {count} records.'
+  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
   MoneyField:
     FIELDLABELAMOUNT: Amount
     FIELDLABELCURRENCY: Currency
@@ -389,10 +408,6 @@ tr:
     CMS_ACCESS_CATEGORY: 'CMS Access'
     FULLADMINRIGHTS: 'Tüm yönetici(administrator) hakları'
     FULLADMINRIGHTS_HELP: 'Implies and overrules all other assigned permissions.'
-    IMPORTSPECFIELDS: 'Database columns'
-    IMPORTSPECLINK: 'Show Specification for %s'
-    IMPORTSPECRELATIONS: Relations
-    IMPORTSPECTITLE: 'Specification for %s'
   PermissionCheckboxSetField:
     AssignedTo: 'assigned to "{title}"'
     FromGroup: 'inherited from group "{title}"'
@@ -401,8 +416,11 @@ tr:
   Permissions:
     PERMISSIONS_CATEGORY: 'Roles and access permissions'
   PhoneNumberField:
-    Back: Back
     VALIDATION: 'Lütfen geçerli bir telefon numarası giriniz'
+  RelationComplexTableField.ss:
+    ADD: Ekle
+    CSVEXPORT: 'Export to CSV'
+    NOTFOUND: 'No items found'
   Security:
     ALREADYLOGGEDIN: 'Bu sayfaya erişim hakkınız yoktur. Eğer o sayfaya erişim hakkı olan başka bir hesabınız varsa, aşağıdaki formu kullanarak giriş yapınız.'
     BUTTONSEND: Gönder
@@ -439,31 +457,33 @@ tr:
     BtnImport: Aktar
     FileFieldLabel: 'CSV File <small>(Allowed extensions: *.csv)</small>'
   SilverStripeNavigator:
-    DISPLAYING: Displaying
     Edit: Edit
-    FILTER: Filter
+  SimpleImageField:
-    IMPORT: Import
+    NOUPLOAD: 'Henüz Resim Yüklenmemiş'
+  SiteTree:
+    TABMAIN: 'Ana (Esas)'
+  TableField:
+    ISREQUIRED: 'In %s ''%s'' is required'
+  TableField.ss:
+    ADD: 'Yeni bir satır ekle'
+    ADDITEM: 'Add %s'
+  TableListField:
+    CSVEXPORT: 'CSV olarak kaydet'
+    PRINT: Yazdır
+    Print: Print
+    SELECT: Seç
+  TableListField.ss:
+    NOITEMSFOUND: 'No items found'
+    SORTASC: 'Artan olarak sırala'
+    SORTDESC: 'Azalan olarak sırala'
+  TableListField_PageControls.ss:
+    DISPLAYING: Displaying
     OF: of
     TO: to
     VIEWFIRST: 'İlkini görüntüle'
     VIEWLAST: 'Sonuncuyu görüntüle'
     VIEWNEXT: 'Sonrakini görüntüle'
     VIEWPREVIOUS: 'Öncekini görüntüle'
-  SimpleImageField:
-    NOUPLOAD: 'Henüz Resim Yüklenmemiş'
-  SiteTree:
-    TABMAIN: 'Ana (Esas)'
-  TableField:
-    ADDITEM: 'Add %s'
-    ISREQUIRED: 'In %s ''%s'' is required'
-    NOITEMSFOUND: 'No items found'
-    SORTASC: 'Artan olarak sırala'
-    SORTDESC: 'Azalan olarak sırala'
-  TableListField:
-    CSVEXPORT: 'CSV olarak kaydet'
-    PRINT: Yazdır
-    Print: Print
-    SELECT: Seç
   TimeField:
     VALIDATEFORMAT: 'Please enter a valid time format ({format})'
   ToggleField:

lang/uk.yml

@@ -8,7 +8,7 @@ uk:
     FOLDER: Folder
     LASTEDIT: 'Востаннє змінено'
     OWNER: Власник
-    SIZE: Розмір
+    SIZE: 'Розмір'
     TITLE: Назва
     TYPE: Тип
     URL: URL
@@ -50,6 +50,8 @@ uk:
     UNORDERED: 'Unordered list'
     UNORDEREDDESCRIPTION: 'Unordered list'
     UNORDEREDEXAMPLE1: 'unordered item 1'
+  BackLink_Button.ss:
+    Back: Back
   BasicAuth:
     ENTERINFO: 'Будь ласка, введіть ім''я користувача та пароль.'
     ERRORNOTADMIN: 'Цей користувач не є адміністратором.'
@@ -57,9 +59,10 @@ uk:
   Boolean:
     0: 'False'
     ANY: Any
-    Hello: Hi
-    LOGOUT: 'Log out'
     1: 'True'
+  CMSLoadingScreen.ss:
+    LOADING: Loading...
+    REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
   CMSMain:
     ACCESS: 'Access to ''{title}'' section'
     ACCESSALLINTERFACES: 'Access to all CMS sections'
@@ -67,6 +70,12 @@ uk:
     SAVE: Зберегти
   CMSProfileController:
     MENUTITLE: CMSProfileController
+  ChangePasswordEmail.ss:
+    CHANGEPASSWORDTEXT1: 'Ви змінили свій пароль для'
+    CHANGEPASSWORDTEXT2: 'Тепер Ви можете використовувати наступні дані для входу:'
+    EMAIL: Email
+    HELLO: Привіт
+    PASSWORD: Password
   CheckboxField:
     - 'False'
     - 'True'
@@ -74,6 +83,14 @@ uk:
     CLOSEPOPUP: 'Закрити Popup'
     SUCCESSADD2: 'Added {name}'
     SUCCESSEDIT: 'Saved %s %s %s'
+  ComplexTableField.ss:
+    ADDITEM: 'Add %s'
+    NOITEMSFOUND: 'No items found'
+    SORTASC: 'За зростанням'
+    SORTDESC: 'За спаданням'
+  ComplexTableField_popup.ss:
+    NEXT: Наступна
+    PREVIOUS: Попередня
   ConfirmedPasswordField:
     ATLEAST: 'Passwords must be at least {min} characters long.'
     BETWEEN: 'Passwords must be {min} to {max} characters long.'
@@ -94,8 +111,8 @@ uk:
     DAYS: дні
     HOUR: година
     HOURS: годин
-    MIN: хв
+    MIN: 'хв'
-    MINS: хв
+    MINS: 'хв'
     MONTH: місяць
     MONTHS: місяці
     SEC: сек
@@ -111,10 +128,7 @@ uk:
     VALIDDATEMAXDATE: 'Your date has to be older or matching the maximum allowed date ({date})'
     VALIDDATEMINDATE: 'Your date has to be newer or matching the minimum allowed date ({date})'
   Director:
-    ADD: Add
-    CSVEXPORT: 'Export to CSV'
     INVALID_REQUEST: 'Invalid request'
-    NOTFOUND: 'No items found'
   DropdownField:
     CHOOSE: (Оберіть)
   EmailField:
@@ -124,8 +138,6 @@ uk:
     SINGULARNAME: 'Email Bounce Record'
   Enum:
     ANY: Будь-який
-    LOADING: Loading...
-    REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
   File:
     Content: Content
     Filename: Filename
@@ -150,13 +162,17 @@ uk:
     FROMFILESTORE: 'З сервера'
     NOSOURCE: 'Please select a source file to attach'
     REPLACE: 'Replace {type}'
+  FileIFrameField_iframe.ss:
+    TITLE: 'Image Uploading Iframe'
   Filesystem:
-    IMPORT_TAB_HEADER: Import
-    SEARCHLISTINGS: Search
     SYNCRESULTS: 'Sync complete: {createdcount} items created, {deletedcount} items deleted'
+  ForgotPasswordEmail.ss:
+    HELLO: Привіт
+    TEXT1: 'Here is your'
+    TEXT2: 'password reset link'
+    TEXT3: for
   Form:
     FIELDISREQUIRED: '%s є необхідним'
-    TITLE: 'Image Uploading Iframe'
     VALIDATIONCREDITNUMBER: 'Please ensure you have entered the {number} credit card number correctly'
     VALIDATIONNOTUNIQUE: 'Введене значання не унікальне'
     VALIDATIONPASSWORDSDONTMATCH: 'Паролі не збігаються'
@@ -187,37 +203,26 @@ uk:
     ResetFilter: Reset
   GridFieldAction_Delete:
     DeletePermissionsFailure: 'No delete permissions'
-    NEXT: Наступна
-    PREVIOUS: Попередня
   GridFieldDetailForm:
     Create: Create
     Delete: Delete
     DeletePermissionsFailure: 'No delete permissions'
     Deleted: 'Deleted %s %s'
-    HELLO: Привіт
     Save: Save
     Saved: 'Saved %s %s'
-    TEXT1: 'Here is your'
+  GridFieldItemEditView.ss: null
-    TEXT2: 'password reset link'
-    TEXT3: for
   Group:
     AddRole: 'Add a role for this group'
-    CHANGEPASSWORDTEXT1: 'Ви змінили свій пароль для'
-    CHANGEPASSWORDTEXT2: 'Тепер Ви можете використовувати наступні дані для входу:'
     Code: 'Код групи'
     DefaultGroupTitleAdministrators: Адміністратори
     DefaultGroupTitleContentAuthors: 'Content Authors'
     Description: Опис
-    EMAIL: Email
     GroupReminder: 'If you choose a parent group, this group will take all it''s roles'
-    HELLO: Привіт
     Locked: 'Заблокувати?'
     NoRoles: 'Ролі не знайдені'
-    PASSWORD: Password
     Parent: 'Батьківська група'
     RolesAddEditLink: 'Manage roles'
     Sort: 'Порядок сортування'
-    TITLE: 'АйФрейм завантаження зображення'
     has_many_Permissions: Права
     many_many_Members: Члени
   GroupImportForm:
@@ -253,7 +258,7 @@ uk:
     IMAGEALT: 'Alternative text (alt)'
     IMAGEALTTEXT: 'Альтернативний текст (alt) - відображається якщо зображення не відображається'
     IMAGEALTTEXTDESC: 'Shown to screen readers or if image can not be displayed'
-    IMAGEDIMENSIONS: Розміри
+    IMAGEDIMENSIONS: 'Розміри'
     IMAGEHEIGHTPX: Висота
     IMAGETITLE: 'Текст заголовку (tooltip) - для додаткової інформації про зображення'
     IMAGETITLETEXT: 'Title text (tooltip)'
@@ -275,10 +280,9 @@ uk:
     UpdateMEDIA: 'Update Media'
   ImageField:
     IMAGE: Зображення
-  Image_iframe.ss: 'ChangePasswordEmail.ss:  BackLink_Button.ss:  CMSLoadingScreen.ss:  RelationComplexTableField.ss:  ForgotPasswordEmail.ss:    APPLY FILTER: "Apply Filter"  GridFieldItemEditView.ss:    Go back: "Go back"  ModelSidebar.ss:  TableListField_PageControls.ss:  ModelAdmin_Tools.ss:  ComplexTableField_popup.ss:  TableField.ss:  FileIFrameField_iframe.ss:  ComplexTableField.ss:  TableListField.ss:  ModelAdmin_ImportSpec.ss:  LeftAndMain_Menu.ss:'
+  Image_iframe.ss:
+    TITLE: 'АйФрейм завантаження зображення'
   LeftAndMain:
-    ADD: 'Add a new row'
-    ADDITEM: 'Add %s'
     CANT_REORGANISE: 'You do not have permission to alter Top level pages. Your change was not saved.'
     DELETED: Deleted.
     DropdownBatchActionsDefault: Actions
@@ -292,6 +296,9 @@ uk:
     REORGANISATIONSUCCESSFUL: 'Reorganised the site tree successfully.'
     SAVEDUP: Saved.
     VersionUnknown: unknown
+  LeftAndMain_Menu.ss:
+    Hello: Hi
+    LOGOUT: 'Log out'
   LoginAttempt:
     Email: 'Email Address'
     IP: 'IP Address'
@@ -368,6 +375,7 @@ uk:
     ResultUpdated: 'Updated {count} members'
   MemberTableField: null
   ModelAdmin:
+    'APPLY FILTER': 'Apply Filter'
     DELETE: Delete
     DELETEDRECORDS: 'Deleted {count} records.'
     IMPORT: 'Імпортувати з CSV'
@@ -377,6 +385,17 @@ uk:
     RESET: Reset
     Title: 'Data Models'
     UPDATEDRECORDS: 'Updated {count} records.'
+  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
   MoneyField:
     FIELDLABELAMOUNT: Кількість
     FIELDLABELCURRENCY: Валюта
@@ -389,10 +408,6 @@ uk:
     CMS_ACCESS_CATEGORY: 'CMS Access'
     FULLADMINRIGHTS: 'Full administrative rights'
     FULLADMINRIGHTS_HELP: 'Implies and overrules all other assigned permissions.'
-    IMPORTSPECFIELDS: 'Database columns'
-    IMPORTSPECLINK: 'Show Specification for %s'
-    IMPORTSPECRELATIONS: Relations
-    IMPORTSPECTITLE: 'Specification for %s'
   PermissionCheckboxSetField:
     AssignedTo: 'assigned to "{title}"'
     FromGroup: 'inherited from group "{title}"'
@@ -401,8 +416,11 @@ uk:
   Permissions:
     PERMISSIONS_CATEGORY: 'Roles and access permissions'
   PhoneNumberField:
-    Back: Back
     VALIDATION: 'Будь ласка, введіть дійсний номер телефону'
+  RelationComplexTableField.ss:
+    ADD: Add
+    CSVEXPORT: 'Export to CSV'
+    NOTFOUND: 'No items found'
   Security:
     ALREADYLOGGEDIN: 'Ви не маєте доступу до цієї сторінки. Якщо Ви володієте іншим рахунком, який має доступ до цієї сторінки, Ви можете увійти до системи нижче.'
     BUTTONSEND: 'Надішліть мені посилання для відновлення паролю'
@@ -431,39 +449,41 @@ uk:
     MemberListCaution: 'Caution: Removing members from this list will remove them from all groups and the database'
     NEWGROUP: 'Нова Група'
     PERMISSIONS: Дозволи
-    ROLES: Ролі
+    ROLES: 'Ролі'
     ROLESDESCRIPTION: 'Roles are predefined sets of permissions, and can be assigned to groups.<br />They are inherited from parent groups if required.'
-    TABROLES: Ролі
+    TABROLES: 'Ролі'
     Users: Користувачі
   SecurityAdmin_MemberImportForm:
     BtnImport: 'Import from CSV'
     FileFieldLabel: 'CSV File <small>(Allowed extensions: *.csv)</small>'
   SilverStripeNavigator:
-    DISPLAYING: Displaying
     Edit: Edit
-    FILTER: Filter
+  SimpleImageField:
-    IMPORT: Import
+    NOUPLOAD: 'Не завантажено жодного зображення'
+  SiteTree:
+    TABMAIN: Головна
+  TableField:
+    ISREQUIRED: 'In %s ''%s'' is required'
+  TableField.ss:
+    ADD: 'Add a new row'
+    ADDITEM: 'Add %s'
+  TableListField:
+    CSVEXPORT: 'Експортувати в CSV'
+    PRINT: Друкувати
+    Print: Print
+    SELECT: 'Вибрати:'
+  TableListField.ss:
+    NOITEMSFOUND: 'No items found'
+    SORTASC: 'Sort in ascending order'
+    SORTDESC: 'Sort in descending order'
+  TableListField_PageControls.ss:
+    DISPLAYING: Displaying
     OF: of
     TO: to
     VIEWFIRST: 'View first'
     VIEWLAST: 'View last'
     VIEWNEXT: 'View next'
     VIEWPREVIOUS: 'View previous'
-  SimpleImageField:
-    NOUPLOAD: 'Не завантажено жодного зображення'
-  SiteTree:
-    TABMAIN: Головна
-  TableField:
-    ADDITEM: 'Add %s'
-    ISREQUIRED: 'In %s ''%s'' is required'
-    NOITEMSFOUND: 'No items found'
-    SORTASC: 'Sort in ascending order'
-    SORTDESC: 'Sort in descending order'
-  TableListField:
-    CSVEXPORT: 'Експортувати в CSV'
-    PRINT: Друкувати
-    Print: Print
-    SELECT: 'Вибрати:'
   TimeField:
     VALIDATEFORMAT: 'Please enter a valid time format ({format})'
   ToggleField:

lang/uz.yml

@@ -50,6 +50,8 @@ uz:
     UNORDERED: 'Unordered list'
     UNORDEREDDESCRIPTION: 'Unordered list'
     UNORDEREDEXAMPLE1: 'unordered item 1'
+  BackLink_Button.ss:
+    Back: Back
   BasicAuth:
     ENTERINFO: 'Please enter a username and password.'
     ERRORNOTADMIN: 'That user is not an administrator.'
@@ -57,9 +59,10 @@ uz:
   Boolean:
     0: 'False'
     ANY: Any
-    Hello: Hi
-    LOGOUT: 'Log out'
     1: 'True'
+  CMSLoadingScreen.ss:
+    LOADING: Loading...
+    REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
   CMSMain:
     ACCESS: 'Access to ''{title}'' section'
     ACCESSALLINTERFACES: 'Access to all CMS sections'
@@ -67,6 +70,12 @@ uz:
     SAVE: Saqlash
   CMSProfileController:
     MENUTITLE: CMSProfileController
+  ChangePasswordEmail.ss:
+    CHANGEPASSWORDTEXT1: 'You changed your password for'
+    CHANGEPASSWORDTEXT2: 'You can now use the following credentials to log in:'
+    EMAIL: Email
+    HELLO: Hi
+    PASSWORD: Password
   CheckboxField:
     - 'False'
     - 'True'
@@ -74,6 +83,14 @@ uz:
     CLOSEPOPUP: 'Close Popup'
     SUCCESSADD2: 'Added {name}'
     SUCCESSEDIT: 'Saved %s %s %s'
+  ComplexTableField.ss:
+    ADDITEM: 'Add %s'
+    NOITEMSFOUND: 'No items found'
+    SORTASC: 'Sort ascending'
+    SORTDESC: 'Sort descending'
+  ComplexTableField_popup.ss:
+    NEXT: Next
+    PREVIOUS: Previous
   ConfirmedPasswordField:
     ATLEAST: 'Passwords must be at least {min} characters long.'
     BETWEEN: 'Passwords must be {min} to {max} characters long.'
@@ -111,10 +128,7 @@ uz:
     VALIDDATEMAXDATE: 'Your date has to be older or matching the maximum allowed date ({date})'
     VALIDDATEMINDATE: 'Your date has to be newer or matching the minimum allowed date ({date})'
   Director:
-    ADD: Add
-    CSVEXPORT: 'Export to CSV'
     INVALID_REQUEST: 'Invalid request'
-    NOTFOUND: 'No items found'
   DropdownField:
     CHOOSE: (Choose)
   EmailField:
@@ -124,8 +138,6 @@ uz:
     SINGULARNAME: 'Email Bounce Record'
   Enum:
     ANY: Any
-    LOADING: Loading...
-    REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
   File:
     Content: Content
     Filename: Filename
@@ -150,13 +162,17 @@ uz:
     FROMFILESTORE: 'From the File Store'
     NOSOURCE: 'Please select a source file to attach'
     REPLACE: 'Replace {type}'
+  FileIFrameField_iframe.ss:
+    TITLE: 'Image Uploading Iframe'
   Filesystem:
-    IMPORT_TAB_HEADER: Import
-    SEARCHLISTINGS: Search
     SYNCRESULTS: 'Sync complete: {createdcount} items created, {deletedcount} items deleted'
+  ForgotPasswordEmail.ss:
+    HELLO: Hi
+    TEXT1: 'Here is your'
+    TEXT2: 'password reset link'
+    TEXT3: for
   Form:
     FIELDISREQUIRED: '%s is required'
-    TITLE: 'Image Uploading Iframe'
     VALIDATIONCREDITNUMBER: 'Please ensure you have entered the {number} credit card number correctly'
     VALIDATIONNOTUNIQUE: 'The value entered is not unique'
     VALIDATIONPASSWORDSDONTMATCH: 'Passwords don''t match'
@@ -187,37 +203,26 @@ uz:
     ResetFilter: Reset
   GridFieldAction_Delete:
     DeletePermissionsFailure: 'No delete permissions'
-    NEXT: Next
-    PREVIOUS: Previous
   GridFieldDetailForm:
     Create: Create
     Delete: Delete
     DeletePermissionsFailure: 'No delete permissions'
     Deleted: 'Deleted %s %s'
-    HELLO: Hi
     Save: Save
     Saved: 'Saved %s %s'
-    TEXT1: 'Here is your'
+  GridFieldItemEditView.ss: null
-    TEXT2: 'password reset link'
-    TEXT3: for
   Group:
     AddRole: 'Add a role for this group'
-    CHANGEPASSWORDTEXT1: 'You changed your password for'
-    CHANGEPASSWORDTEXT2: 'You can now use the following credentials to log in:'
     Code: 'Group Code'
     DefaultGroupTitleAdministrators: Administrators
     DefaultGroupTitleContentAuthors: 'Content Authors'
     Description: Description
-    EMAIL: Email
     GroupReminder: 'If you choose a parent group, this group will take all it''s roles'
-    HELLO: Hi
     Locked: 'Locked?'
     NoRoles: 'No roles found'
-    PASSWORD: Password
     Parent: 'Parent Group'
     RolesAddEditLink: 'Manage roles'
     Sort: 'Sort Order'
-    TITLE: 'Image Uploading Iframe'
     has_many_Permissions: Permissions
     many_many_Members: Members
   GroupImportForm:
@@ -275,10 +280,9 @@ uz:
     UpdateMEDIA: 'Update Media'
   ImageField:
     IMAGE: Image
-  Image_iframe.ss: 'ChangePasswordEmail.ss:  BackLink_Button.ss:  CMSLoadingScreen.ss:  RelationComplexTableField.ss:  ForgotPasswordEmail.ss:    APPLY FILTER: "Apply Filter"  GridFieldItemEditView.ss:    Go back: "Go back"  ModelSidebar.ss:  TableListField_PageControls.ss:  ModelAdmin_Tools.ss:  ComplexTableField_popup.ss:  TableField.ss:  FileIFrameField_iframe.ss:  ComplexTableField.ss:  TableListField.ss:  ModelAdmin_ImportSpec.ss:  LeftAndMain_Menu.ss:'
+  Image_iframe.ss:
+    TITLE: 'Image Uploading Iframe'
   LeftAndMain:
-    ADD: 'Add a new row'
-    ADDITEM: 'Add %s'
     CANT_REORGANISE: 'You do not have permission to alter Top level pages. Your change was not saved.'
     DELETED: Deleted.
     DropdownBatchActionsDefault: Actions
@@ -292,6 +296,9 @@ uz:
     REORGANISATIONSUCCESSFUL: 'Reorganised the site tree successfully.'
     SAVEDUP: Saved.
     VersionUnknown: unknown
+  LeftAndMain_Menu.ss:
+    Hello: Hi
+    LOGOUT: 'Log out'
   LoginAttempt:
     Email: 'Email Address'
     IP: 'IP Address'
@@ -368,6 +375,7 @@ uz:
     ResultUpdated: 'Updated {count} members'
   MemberTableField: null
   ModelAdmin:
+    'APPLY FILTER': 'Apply Filter'
     DELETE: Delete
     DELETEDRECORDS: 'Deleted {count} records.'
     IMPORT: 'Import from CSV'
@@ -377,6 +385,17 @@ uz:
     RESET: Reset
     Title: 'Data Models'
     UPDATEDRECORDS: 'Updated {count} records.'
+  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
   MoneyField:
     FIELDLABELAMOUNT: Amount
     FIELDLABELCURRENCY: Currency
@@ -389,10 +408,6 @@ uz:
     CMS_ACCESS_CATEGORY: 'CMS Access'
     FULLADMINRIGHTS: 'Full administrative rights'
     FULLADMINRIGHTS_HELP: 'Implies and overrules all other assigned permissions.'
-    IMPORTSPECFIELDS: 'Database columns'
-    IMPORTSPECLINK: 'Show Specification for %s'
-    IMPORTSPECRELATIONS: Relations
-    IMPORTSPECTITLE: 'Specification for %s'
   PermissionCheckboxSetField:
     AssignedTo: 'assigned to "{title}"'
     FromGroup: 'inherited from group "{title}"'
@@ -401,8 +416,11 @@ uz:
   Permissions:
     PERMISSIONS_CATEGORY: 'Roles and access permissions'
   PhoneNumberField:
-    Back: Back
     VALIDATION: 'Please enter a valid phone number'
+  RelationComplexTableField.ss:
+    ADD: Add
+    CSVEXPORT: 'Export to CSV'
+    NOTFOUND: 'No items found'
   Security:
     ALREADYLOGGEDIN: 'You don''t have access to this page.  If you have another account that can access that page, you can log in again below.'
     BUTTONSEND: 'Send me the password reset link'
@@ -439,31 +457,33 @@ uz:
     BtnImport: 'Import from CSV'
     FileFieldLabel: 'CSV File <small>(Allowed extensions: *.csv)</small>'
   SilverStripeNavigator:
-    DISPLAYING: Displaying
     Edit: Edit
-    FILTER: Filter
+  SimpleImageField:
-    IMPORT: Import
+    NOUPLOAD: 'No Image Uploaded'
+  SiteTree:
+    TABMAIN: Main
+  TableField:
+    ISREQUIRED: 'In %s ''%s'' is required'
+  TableField.ss:
+    ADD: 'Add a new row'
+    ADDITEM: 'Add %s'
+  TableListField:
+    CSVEXPORT: 'Export to CSV'
+    PRINT: Print
+    Print: Print
+    SELECT: 'Select:'
+  TableListField.ss:
+    NOITEMSFOUND: 'No items found'
+    SORTASC: 'Sort in ascending order'
+    SORTDESC: 'Sort in descending order'
+  TableListField_PageControls.ss:
+    DISPLAYING: Displaying
     OF: of
     TO: to
     VIEWFIRST: 'View first'
     VIEWLAST: 'View last'
     VIEWNEXT: 'View next'
     VIEWPREVIOUS: 'View previous'
-  SimpleImageField:
-    NOUPLOAD: 'No Image Uploaded'
-  SiteTree:
-    TABMAIN: Main
-  TableField:
-    ADDITEM: 'Add %s'
-    ISREQUIRED: 'In %s ''%s'' is required'
-    NOITEMSFOUND: 'No items found'
-    SORTASC: 'Sort in ascending order'
-    SORTDESC: 'Sort in descending order'
-  TableListField:
-    CSVEXPORT: 'Export to CSV'
-    PRINT: Print
-    Print: Print
-    SELECT: 'Select:'
   TimeField:
     VALIDATEFORMAT: 'Please enter a valid time format ({format})'
   ToggleField:

lang/vi_VN.yml

@@ -50,6 +50,8 @@ vi_VN:
     UNORDERED: 'Unordered list'
     UNORDEREDDESCRIPTION: 'Unordered list'
     UNORDEREDEXAMPLE1: 'unordered item 1'
+  BackLink_Button.ss:
+    Back: Back
   BasicAuth:
     ENTERINFO: 'Please enter a username and password.'
     ERRORNOTADMIN: 'That user is not an administrator.'
@@ -57,9 +59,10 @@ vi_VN:
   Boolean:
     0: 'False'
     ANY: Any
-    Hello: Hi
-    LOGOUT: 'Log out'
     1: 'True'
+  CMSLoadingScreen.ss:
+    LOADING: Loading...
+    REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
   CMSMain:
     ACCESS: 'Access to ''{title}'' section'
     ACCESSALLINTERFACES: 'Access to all CMS sections'
@@ -67,6 +70,12 @@ vi_VN:
     SAVE: Lưu
   CMSProfileController:
     MENUTITLE: CMSProfileController
+  ChangePasswordEmail.ss:
+    CHANGEPASSWORDTEXT1: 'Bạn có thể thay đổi mật khẩu tại'
+    CHANGEPASSWORDTEXT2: 'You can now use the following credentials to log in:'
+    EMAIL: Email
+    HELLO: Hi
+    PASSWORD: Password
   CheckboxField:
     - 'False'
     - 'True'
@@ -74,6 +83,14 @@ vi_VN:
     CLOSEPOPUP: 'Close Popup'
     SUCCESSADD2: 'Added {name}'
     SUCCESSEDIT: 'Saved %s %s %s'
+  ComplexTableField.ss:
+    ADDITEM: 'Add %s'
+    NOITEMSFOUND: 'No items found'
+    SORTASC: 'Sort ascending'
+    SORTDESC: 'Sort descending'
+  ComplexTableField_popup.ss:
+    NEXT: Next
+    PREVIOUS: Previous
   ConfirmedPasswordField:
     ATLEAST: 'Passwords must be at least {min} characters long.'
     BETWEEN: 'Passwords must be {min} to {max} characters long.'
@@ -90,8 +107,8 @@ vi_VN:
     PLURALNAME: 'Data Objects'
     SINGULARNAME: 'Data Object'
   Date:
-    DAY: ngày
+    DAY: 'ngày'
-    DAYS: ngày
+    DAYS: 'ngày'
     HOUR: giờ
     HOURS: giờ
     MIN: phút
@@ -111,10 +128,7 @@ vi_VN:
     VALIDDATEMAXDATE: 'Your date has to be older or matching the maximum allowed date ({date})'
     VALIDDATEMINDATE: 'Your date has to be newer or matching the minimum allowed date ({date})'
   Director:
-    ADD: Add
-    CSVEXPORT: 'Export to CSV'
     INVALID_REQUEST: 'Invalid request'
-    NOTFOUND: 'No items found'
   DropdownField:
     CHOOSE: (chọn)
   EmailField:
@@ -124,8 +138,6 @@ vi_VN:
     SINGULARNAME: 'Email Bounce Record'
   Enum:
     ANY: Any
-    LOADING: Loading...
-    REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
   File:
     Content: Content
     Filename: Filename
@@ -150,13 +162,17 @@ vi_VN:
     FROMFILESTORE: 'From the File Store'
     NOSOURCE: 'Please select a source file to attach'
     REPLACE: 'Replace {type}'
+  FileIFrameField_iframe.ss:
+    TITLE: 'Image Uploading Iframe'
   Filesystem:
-    IMPORT_TAB_HEADER: Import
-    SEARCHLISTINGS: Search
     SYNCRESULTS: 'Sync complete: {createdcount} items created, {deletedcount} items deleted'
+  ForgotPasswordEmail.ss:
+    HELLO: Hi
+    TEXT1: 'Here is your'
+    TEXT2: 'password reset link'
+    TEXT3: for
   Form:
     FIELDISREQUIRED: '%s is required'
-    TITLE: 'Image Uploading Iframe'
     VALIDATIONCREDITNUMBER: 'Please ensure you have entered the {number} credit card number correctly'
     VALIDATIONNOTUNIQUE: 'The value entered is not unique'
     VALIDATIONPASSWORDSDONTMATCH: 'Passwords don''t match'
@@ -187,37 +203,26 @@ vi_VN:
     ResetFilter: Reset
   GridFieldAction_Delete:
     DeletePermissionsFailure: 'No delete permissions'
-    NEXT: Next
-    PREVIOUS: Previous
   GridFieldDetailForm:
     Create: Create
     Delete: Delete
     DeletePermissionsFailure: 'No delete permissions'
     Deleted: 'Deleted %s %s'
-    HELLO: Hi
     Save: Save
     Saved: 'Saved %s %s'
-    TEXT1: 'Here is your'
+  GridFieldItemEditView.ss: null
-    TEXT2: 'password reset link'
-    TEXT3: for
   Group:
     AddRole: 'Add a role for this group'
-    CHANGEPASSWORDTEXT1: 'Bạn có thể thay đổi mật khẩu tại'
-    CHANGEPASSWORDTEXT2: 'You can now use the following credentials to log in:'
     Code: 'Group Code'
     DefaultGroupTitleAdministrators: Administrators
     DefaultGroupTitleContentAuthors: 'Content Authors'
     Description: Description
-    EMAIL: Email
     GroupReminder: 'If you choose a parent group, this group will take all it''s roles'
-    HELLO: Hi
     Locked: 'Locked?'
     NoRoles: 'No roles found'
-    PASSWORD: Password
     Parent: 'Parent Group'
     RolesAddEditLink: 'Manage roles'
     Sort: 'Sort Order'
-    TITLE: 'Image Uploading Iframe'
     has_many_Permissions: Permissions
     many_many_Members: Members
   GroupImportForm:
@@ -275,10 +280,9 @@ vi_VN:
     UpdateMEDIA: 'Update Media'
   ImageField:
     IMAGE: Image
-  Image_iframe.ss: 'ChangePasswordEmail.ss:  BackLink_Button.ss:  CMSLoadingScreen.ss:  RelationComplexTableField.ss:  ForgotPasswordEmail.ss:    APPLY FILTER: "Apply Filter"  GridFieldItemEditView.ss:    Go back: "Go back"  ModelSidebar.ss:  TableListField_PageControls.ss:  ModelAdmin_Tools.ss:  ComplexTableField_popup.ss:  TableField.ss:  FileIFrameField_iframe.ss:  ComplexTableField.ss:  TableListField.ss:  ModelAdmin_ImportSpec.ss:  LeftAndMain_Menu.ss:'
+  Image_iframe.ss:
+    TITLE: 'Image Uploading Iframe'
   LeftAndMain:
-    ADD: 'Add a new row'
-    ADDITEM: 'Add %s'
     CANT_REORGANISE: 'You do not have permission to alter Top level pages. Your change was not saved.'
     DELETED: Deleted.
     DropdownBatchActionsDefault: Actions
@@ -292,6 +296,9 @@ vi_VN:
     REORGANISATIONSUCCESSFUL: 'Reorganised the site tree successfully.'
     SAVEDUP: Saved.
     VersionUnknown: unknown
+  LeftAndMain_Menu.ss:
+    Hello: Hi
+    LOGOUT: 'Log out'
   LoginAttempt:
     Email: 'Email Address'
     IP: 'IP Address'
@@ -368,6 +375,7 @@ vi_VN:
     ResultUpdated: 'Updated {count} members'
   MemberTableField: null
   ModelAdmin:
+    'APPLY FILTER': 'Apply Filter'
     DELETE: Delete
     DELETEDRECORDS: 'Deleted {count} records.'
     IMPORT: 'Import from CSV'
@@ -377,6 +385,17 @@ vi_VN:
     RESET: Reset
     Title: 'Data Models'
     UPDATEDRECORDS: 'Updated {count} records.'
+  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
   MoneyField:
     FIELDLABELAMOUNT: Amount
     FIELDLABELCURRENCY: Currency
@@ -389,10 +408,6 @@ vi_VN:
     CMS_ACCESS_CATEGORY: 'CMS Access'
     FULLADMINRIGHTS: 'Full administrative rights'
     FULLADMINRIGHTS_HELP: 'Implies and overrules all other assigned permissions.'
-    IMPORTSPECFIELDS: 'Database columns'
-    IMPORTSPECLINK: 'Show Specification for %s'
-    IMPORTSPECRELATIONS: Relations
-    IMPORTSPECTITLE: 'Specification for %s'
   PermissionCheckboxSetField:
     AssignedTo: 'assigned to "{title}"'
     FromGroup: 'inherited from group "{title}"'
@@ -401,8 +416,11 @@ vi_VN:
   Permissions:
     PERMISSIONS_CATEGORY: 'Roles and access permissions'
   PhoneNumberField:
-    Back: Back
     VALIDATION: 'Please enter a valid phone number'
+  RelationComplexTableField.ss:
+    ADD: Add
+    CSVEXPORT: 'Export to CSV'
+    NOTFOUND: 'No items found'
   Security:
     ALREADYLOGGEDIN: 'You don''t have access to this page.  If you have another account that can access that page, you can log in again below.'
     BUTTONSEND: 'Send me the password reset link'
@@ -439,31 +457,33 @@ vi_VN:
     BtnImport: 'Import from CSV'
     FileFieldLabel: 'CSV File <small>(Allowed extensions: *.csv)</small>'
   SilverStripeNavigator:
-    DISPLAYING: Displaying
     Edit: Edit
-    FILTER: Filter
+  SimpleImageField:
-    IMPORT: Import
+    NOUPLOAD: 'No Image Uploaded'
+  SiteTree:
+    TABMAIN: 'Nội dung'
+  TableField:
+    ISREQUIRED: 'In %s ''%s'' is required'
+  TableField.ss:
+    ADD: 'Add a new row'
+    ADDITEM: 'Add %s'
+  TableListField:
+    CSVEXPORT: 'Export to CSV'
+    PRINT: Print
+    Print: Print
+    SELECT: 'Select:'
+  TableListField.ss:
+    NOITEMSFOUND: 'No items found'
+    SORTASC: 'Sort in ascending order'
+    SORTDESC: 'Sort in descending order'
+  TableListField_PageControls.ss:
+    DISPLAYING: Displaying
     OF: of
     TO: to
     VIEWFIRST: 'View first'
     VIEWLAST: 'View last'
     VIEWNEXT: 'View next'
     VIEWPREVIOUS: 'View previous'
-  SimpleImageField:
-    NOUPLOAD: 'No Image Uploaded'
-  SiteTree:
-    TABMAIN: 'Nội dung'
-  TableField:
-    ADDITEM: 'Add %s'
-    ISREQUIRED: 'In %s ''%s'' is required'
-    NOITEMSFOUND: 'No items found'
-    SORTASC: 'Sort in ascending order'
-    SORTDESC: 'Sort in descending order'
-  TableListField:
-    CSVEXPORT: 'Export to CSV'
-    PRINT: Print
-    Print: Print
-    SELECT: 'Select:'
   TimeField:
     VALIDATEFORMAT: 'Please enter a valid time format ({format})'
   ToggleField:

lang/zh_CN.yml

@@ -2,12 +2,12 @@ zh_CN:
   AssetAdmin:
     NEWFOLDER: 新建文件夹
   AssetTableField:
-    CREATED: 第一次被上传
+    CREATED: '第一次被上传'
     DIM: 尺寸
     FILENAME: 文件名
     FOLDER: Folder
     LASTEDIT: 上一次被更改
-    OWNER: 拥有者
+    OWNER: '拥有者'
     SIZE: 大小
     TITLE: 文件名称
     TYPE: 类型
@@ -50,16 +50,19 @@ zh_CN:
     UNORDERED: 'Unordered list'
     UNORDEREDDESCRIPTION: 'Unordered list'
     UNORDEREDEXAMPLE1: 'unordered item 1'
+  BackLink_Button.ss:
+    Back: Back
   BasicAuth:
-    ENTERINFO: 请输入用户名和密码
+    ENTERINFO: '请输入用户名和密码'
     ERRORNOTADMIN: 此用户没有管理员权限。
-    ERRORNOTREC: 没有找到此用户名/密码
+    ERRORNOTREC: '没有找到此用户名/密码'
   Boolean:
     0: 'False'
     ANY: Any
-    Hello: Hi
-    LOGOUT: 'Log out'
     1: 'True'
+  CMSLoadingScreen.ss:
+    LOADING: Loading...
+    REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
   CMSMain:
     ACCESS: 'Access to ''{title}'' section'
     ACCESSALLINTERFACES: 'Access to all CMS sections'
@@ -67,6 +70,12 @@ zh_CN:
     SAVE: 保存
   CMSProfileController:
     MENUTITLE: CMSProfileController
+  ChangePasswordEmail.ss:
+    CHANGEPASSWORDTEXT1: '您已更改了登陆%s的密码'
+    CHANGEPASSWORDTEXT2: 您现在可以用下列权限信息进行登路：
+    EMAIL: Email
+    HELLO: 嗨
+    PASSWORD: Password
   CheckboxField:
     - 'False'
     - 'True'
@@ -74,11 +83,19 @@ zh_CN:
     CLOSEPOPUP: 'Close Popup'
     SUCCESSADD2: 'Added {name}'
     SUCCESSEDIT: 'Saved %s %s %s'
+  ComplexTableField.ss:
+    ADDITEM: 'Add %s'
+    NOITEMSFOUND: 'No items found'
+    SORTASC: 正序排列
+    SORTDESC: 倒序排列
+  ComplexTableField_popup.ss:
+    NEXT: 下一页
+    PREVIOUS: 上一页
   ConfirmedPasswordField:
     ATLEAST: 'Passwords must be at least {min} characters long.'
     BETWEEN: 'Passwords must be {min} to {max} characters long.'
     MAXIMUM: 'Passwords must be at most {max} characters long.'
-    SHOWONCLICKTITLE: 更改密码
+    SHOWONCLICKTITLE: '更改密码'
   CreditCardField:
     FIRST: first
     FOURTH: fourth
@@ -111,10 +128,7 @@ zh_CN:
     VALIDDATEMAXDATE: 'Your date has to be older or matching the maximum allowed date ({date})'
     VALIDDATEMINDATE: 'Your date has to be newer or matching the minimum allowed date ({date})'
   Director:
-    ADD: Add
-    CSVEXPORT: 'Export to CSV'
     INVALID_REQUEST: 'Invalid request'
-    NOTFOUND: 'No items found'
   DropdownField:
     CHOOSE: （选择）
   EmailField:
@@ -124,8 +138,6 @@ zh_CN:
     SINGULARNAME: 'Email Bounce Record'
   Enum:
     ANY: Any
-    LOADING: Loading...
-    REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
   File:
     Content: Content
     Filename: Filename
@@ -150,17 +162,21 @@ zh_CN:
     FROMFILESTORE: 'From the File Store'
     NOSOURCE: 'Please select a source file to attach'
     REPLACE: 'Replace {type}'
+  FileIFrameField_iframe.ss:
+    TITLE: 'Image Uploading Iframe'
   Filesystem:
-    IMPORT_TAB_HEADER: Import
-    SEARCHLISTINGS: Search
     SYNCRESULTS: 'Sync complete: {createdcount} items created, {deletedcount} items deleted'
+  ForgotPasswordEmail.ss:
+    HELLO: 嗨
+    TEXT1: 'Here is your'
+    TEXT2: 'password reset link'
+    TEXT3: for
   Form:
     FIELDISREQUIRED: '%s是必需填写的'
-    TITLE: 'Image Uploading Iframe'
     VALIDATIONCREDITNUMBER: 'Please ensure you have entered the {number} credit card number correctly'
-    VALIDATIONNOTUNIQUE: 输入值已被他人占用
+    VALIDATIONNOTUNIQUE: '输入值已被他人占用'
-    VALIDATIONPASSWORDSDONTMATCH: （密码相互不匹配）
+    VALIDATIONPASSWORDSDONTMATCH: '（密码相互不匹配）'
-    VALIDATIONPASSWORDSNOTEMPTY: 密码不能空白
+    VALIDATIONPASSWORDSNOTEMPTY: '密码不能空白'
     VALIDATIONSTRONGPASSWORD: 'Passwords must have at least one digit and one alphanumeric character'
     VALIDATOR: Validator
     VALIDCURRENCY: 'Please enter a valid currency'
@@ -187,37 +203,26 @@ zh_CN:
     ResetFilter: Reset
   GridFieldAction_Delete:
     DeletePermissionsFailure: 'No delete permissions'
-    NEXT: 下一页
-    PREVIOUS: 上一页
   GridFieldDetailForm:
     Create: Create
     Delete: Delete
     DeletePermissionsFailure: 'No delete permissions'
     Deleted: 'Deleted %s %s'
-    HELLO: 嗨
     Save: Save
     Saved: 'Saved %s %s'
-    TEXT1: 'Here is your'
+  GridFieldItemEditView.ss: null
-    TEXT2: 'password reset link'
-    TEXT3: for
   Group:
     AddRole: 'Add a role for this group'
-    CHANGEPASSWORDTEXT1: 您已更改了登陆%s的密码
+    Code: '团队代码'
-    CHANGEPASSWORDTEXT2: 您现在可以用下列权限信息进行登路：
-    Code: 团队代码
     DefaultGroupTitleAdministrators: Administrators
     DefaultGroupTitleContentAuthors: 'Content Authors'
     Description: Description
-    EMAIL: Email
     GroupReminder: 'If you choose a parent group, this group will take all it''s roles'
-    HELLO: 嗨
     Locked: 锁定？
     NoRoles: 'No roles found'
-    PASSWORD: Password
     Parent: 主团队
     RolesAddEditLink: 'Manage roles'
     Sort: 'Sort Order'
-    TITLE: 图象上传内嵌框架（Iframe）
     has_many_Permissions: 权限
     many_many_Members: 成员
   GroupImportForm:
@@ -233,12 +238,12 @@ zh_CN:
     ADJUSTDETAILSDIMENSIONS: 'Details & dimensions'
     ANCHORVALUE: Anchor
     BUTTONINSERT: Insert
-    BUTTONINSERTLINK: 插入链接
+    BUTTONINSERTLINK: '插入链接'
-    BUTTONREMOVELINK: 删除链接
+    BUTTONREMOVELINK: '删除链接'
     BUTTONUpdate: Update
     CAPTIONTEXT: 'Caption text'
-    CSSCLASS: 对齐/样式
+    CSSCLASS: '对齐/样式'
-    CSSCLASSCENTER: 自居中
+    CSSCLASSCENTER: '自居中'
     CSSCLASSLEFT: 左端自动换行
     CSSCLASSLEFTALONE: 'On the left, on its own.'
     CSSCLASSRIGHT: 右端自动换行
@@ -254,17 +259,17 @@ zh_CN:
     IMAGEALTTEXT: 'Alternative text (alt) - shown if image cannot be displayed'
     IMAGEALTTEXTDESC: 'Shown to screen readers or if image can not be displayed'
     IMAGEDIMENSIONS: 尺寸
-    IMAGEHEIGHTPX: 高（像素）
+    IMAGEHEIGHTPX: '高（像素）'
     IMAGETITLE: 'Title text (tooltip) - for additional information about the image'
     IMAGETITLETEXT: 'Title text (tooltip)'
     IMAGETITLETEXTDESC: 'For additional information about the image'
-    IMAGEWIDTHPX: 宽（像素）
+    IMAGEWIDTHPX: '宽（像素）'
     INSERTMEDIA: 'Insert Media'
-    LINK: 对所选文字插入/编辑链接
+    LINK: '对所选文字插入/编辑链接'
     LINKANCHOR: 'Anchor on this page'
     LINKDESCR: 链接描述
     LINKEMAIL: 电子邮件地址
-    LINKEXTERNAL: 其它网站
+    LINKEXTERNAL: '其它网站'
     LINKFILE: 下载文件
     LINKINTERNAL: 本站网页
     LINKOPENNEWWIN: 在新窗口打开链接？
@@ -275,70 +280,72 @@ zh_CN:
     UpdateMEDIA: 'Update Media'
   ImageField:
     IMAGE: Image
-  Image_iframe.ss: 'ChangePasswordEmail.ss:  BackLink_Button.ss:  CMSLoadingScreen.ss:  RelationComplexTableField.ss:  ForgotPasswordEmail.ss:    APPLY FILTER: "Apply Filter"  GridFieldItemEditView.ss:    Go back: "Go back"  ModelSidebar.ss:  TableListField_PageControls.ss:  ModelAdmin_Tools.ss:  ComplexTableField_popup.ss:  TableField.ss:  FileIFrameField_iframe.ss:  ComplexTableField.ss:  TableListField.ss:  ModelAdmin_ImportSpec.ss:  LeftAndMain_Menu.ss:'
+  Image_iframe.ss:
+    TITLE: '图象上传内嵌框架（Iframe）'
   LeftAndMain:
-    ADD: 'Add a new row'
-    ADDITEM: 'Add %s'
     CANT_REORGANISE: 'You do not have permission to alter Top level pages. Your change was not saved.'
     DELETED: Deleted.
     DropdownBatchActionsDefault: Actions
     HELP: 帮助
     PAGETYPE: 网页类型
-    PERMAGAIN: 您于CMS的登录已被注销，请在下面输入用户名和密码重新登录。
+    PERMAGAIN: '您于CMS的登录已被注销，请在下面输入用户名和密码重新登录。'
-    PERMALREADY: 对不起，您无权登录CMS的这一部分。如果您要用另外的帐号，请在下面登录。
+    PERMALREADY: '对不起，您无权登录CMS的这一部分。如果您要用另外的帐号，请在下面登录。'
-    PERMDEFAULT: 请先选择一种验证方法并输入您的权限信息，以登录CMS。
+    PERMDEFAULT: '请先选择一种验证方法并输入您的权限信息，以登录CMS。'
-    PLEASESAVE: 请先保存：因为该网页还未保存，所以该页无法更新。
+    PLEASESAVE: '请先保存：因为该网页还未保存，所以该页无法更新。'
     PreviewButton: Preview
     REORGANISATIONSUCCESSFUL: 'Reorganised the site tree successfully.'
     SAVEDUP: Saved.
     VersionUnknown: unknown
+  LeftAndMain_Menu.ss:
+    Hello: Hi
+    LOGOUT: 'Log out'
   LoginAttempt:
     Email: 'Email Address'
     IP: 'IP Address'
     Status: Status
   Member:
     ADDGROUP: 'Add group'
-    BUTTONCHANGEPASSWORD: 更改密码
+    BUTTONCHANGEPASSWORD: '更改密码'
     BUTTONLOGIN: 登录
-    BUTTONLOGINOTHER: 使用其他帐户登录
+    BUTTONLOGINOTHER: '使用其他帐户登录'
-    BUTTONLOSTPASSWORD: 忘记密码
+    BUTTONLOSTPASSWORD: '忘记密码'
-    CONFIRMNEWPASSWORD: 确认新密码
+    CONFIRMNEWPASSWORD: '确认新密码'
-    CONFIRMPASSWORD: 确认密码
+    CONFIRMPASSWORD: '确认密码'
     DefaultAdminFirstname: 'Default Admin'
     DefaultDateTime: default
     EMAIL: 电子邮件
     EMPTYNEWPASSWORD: 'The new password can''t be empty, please try again'
     ENTEREMAIL: 'Please enter an email address to get a password reset link.'
     ERRORLOCKEDOUT: 'Your account has been temporarily disabled because of too many failed attempts at logging in. Please try again in 20 minutes.'
-    ERRORNEWPASSWORD: 您输入了一个不同的新密码，请重新输入
+    ERRORNEWPASSWORD: '您输入了一个不同的新密码，请重新输入'
-    ERRORPASSWORDNOTMATCH: 您当前的密码不正确，请再次输入
+    ERRORPASSWORDNOTMATCH: '您当前的密码不正确，请再次输入'
-    ERRORWRONGCRED: 电邮地址或密码似乎不对。请重新输入。
+    ERRORWRONGCRED: '电邮地址或密码似乎不对。请重新输入。'
     FIRSTNAME: 名
     INTERFACELANG: 界面语言
     INVALIDNEWPASSWORD: 'We couldn''t accept that password: {password}'
     LOGGEDINAS: 'You''re logged in as {name}.'
-    NEWPASSWORD: 新密码
+    NEWPASSWORD: '新密码'
-    PASSWORD: 密码
+    PASSWORD: '密码'
     PLURALNAME: 成员
     PROFILESAVESUCCESS: 'Successfully saved.'
     REMEMBERME: 记住我的信息？
     SINGULARNAME: 成员
-    SUBJECTPASSWORDCHANGED: 您的密码已更改
+    SUBJECTPASSWORDCHANGED: '您的密码已更改'
-    SUBJECTPASSWORDRESET: 重设您的密码链接
+    SUBJECTPASSWORDRESET: '重设您的密码链接'
     SURNAME: 姓
     VALIDATIONMEMBEREXISTS: 已经存在用这个电子邮件的会员
     ValidationIdentifierFailed: 'Can''t overwrite existing member #{id} with identical identifier ({name} = {value}))'
     WELCOMEBACK: 'Welcome Back, {firstname}'
-    YOUROLDPASSWORD: 您的旧密码
+    YOUROLDPASSWORD: '您的旧密码'
     belongs_many_many_Groups: 团队
     db_LastVisited: 'Last Visited Date'
     db_Locale: 'Interface Locale'
     db_LockedOutUntil: 禁止直至
     db_NumVisit: 'Number of Visits'
     db_Password: Password
-    db_PasswordExpiry: 密码过期日期
+    db_PasswordExpiry: '密码过期日期'
   MemberAuthenticator:
-    TITLE: 电邮地址和密码
+    TITLE: '电邮地址和密码'
   MemberDatetimeOptionsetField:
     AMORPM: 'AM (Ante meridiem) or PM (Post meridiem)'
     Custom: Custom
@@ -368,7 +375,8 @@ zh_CN:
     ResultUpdated: 'Updated {count} members'
   MemberTableField: null
   ModelAdmin:
-    DELETE: 删除
+    'APPLY FILTER': 'Apply Filter'
+    DELETE: '删除'
     DELETEDRECORDS: 'Deleted {count} records.'
     IMPORT: 'Import from CSV'
     IMPORTEDRECORDS: 'Imported {count} records.'
@@ -377,6 +385,17 @@ zh_CN:
     RESET: Reset
     Title: 'Data Models'
     UPDATEDRECORDS: 'Updated {count} records.'
+  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
   MoneyField:
     FIELDLABELAMOUNT: Amount
     FIELDLABELCURRENCY: Currency
@@ -389,10 +408,6 @@ zh_CN:
     CMS_ACCESS_CATEGORY: 'CMS Access'
     FULLADMINRIGHTS: 'Full administrative rights'
     FULLADMINRIGHTS_HELP: 'Implies and overrules all other assigned permissions.'
-    IMPORTSPECFIELDS: 'Database columns'
-    IMPORTSPECLINK: 'Show Specification for %s'
-    IMPORTSPECRELATIONS: Relations
-    IMPORTSPECTITLE: 'Specification for %s'
   PermissionCheckboxSetField:
     AssignedTo: 'assigned to "{title}"'
     FromGroup: 'inherited from group "{title}"'
@@ -401,20 +416,23 @@ zh_CN:
   Permissions:
     PERMISSIONS_CATEGORY: 'Roles and access permissions'
   PhoneNumberField:
-    Back: Back
+    VALIDATION: '请输入有效电话号码'
-    VALIDATION: 请输入有效电话号码
+  RelationComplexTableField.ss:
+    ADD: Add
+    CSVEXPORT: 'Export to CSV'
+    NOTFOUND: 'No items found'
   Security:
-    ALREADYLOGGEDIN: 您无访问此页的权限。如果您拥有另一个可访问次页的帐户，请在下面登录。
+    ALREADYLOGGEDIN: '您无访问此页的权限。如果您拥有另一个可访问次页的帐户，请在下面登录。'
-    BUTTONSEND: 给我发送密码重设链接
+    BUTTONSEND: '给我发送密码重设链接'
-    CHANGEPASSWORDBELOW: 您可在下面更改您的密码
+    CHANGEPASSWORDBELOW: '您可在下面更改您的密码'
-    CHANGEPASSWORDHEADER: 更改您的密码
+    CHANGEPASSWORDHEADER: '更改您的密码'
-    ENTERNEWPASSWORD: 请输入新密码
+    ENTERNEWPASSWORD: '请输入新密码'
-    ERRORPASSWORDPERMISSION: 您必需登录以更改您的密码
+    ERRORPASSWORDPERMISSION: '您必需登录以更改您的密码'
-    LOGGEDOUT: 您已被撤消登录。如果您想再次登录，在下面输入您的登录信息。
+    LOGGEDOUT: '您已被撤消登录。如果您想再次登录，在下面输入您的登录信息。'
     LOGIN: 'Log in'
-    NOTEPAGESECURED: 此页是受安全保护的。输入您的登录信息，我们会将您送达。
+    NOTEPAGESECURED: '此页是受安全保护的。输入您的登录信息，我们会将您送达。'
     NOTERESETLINKINVALID: '<p>The password reset link is invalid or expired.</p><p>You can request a new one <a href="{link1}">here</a> or change your password after you <a href="{link2}">logged in</a>.</p>'
-    NOTERESETPASSWORD: 输入您的电邮地址，我们会给您发送一个您可重设密码的链接
+    NOTERESETPASSWORD: '输入您的电邮地址，我们会给您发送一个您可重设密码的链接'
     PASSWORDSENTHEADER: 'Password reset link sent to ''{email}'''
     PASSWORDSENTTEXT: 'Thank you! A reset link has been sent to ''{email}'', provided an account exists for this email address.'
   SecurityAdmin:
@@ -439,31 +457,33 @@ zh_CN:
     BtnImport: 'Import from CSV'
     FileFieldLabel: 'CSV File <small>(Allowed extensions: *.csv)</small>'
   SilverStripeNavigator:
-    DISPLAYING: Displaying
     Edit: Edit
-    FILTER: Filter
+  SimpleImageField:
-    IMPORT: Import
+    NOUPLOAD: '没有上传的图像'
+  SiteTree:
+    TABMAIN: 主要部分
+  TableField:
+    ISREQUIRED: 'In %s ''%s'' is required'
+  TableField.ss:
+    ADD: 'Add a new row'
+    ADDITEM: 'Add %s'
+  TableListField:
+    CSVEXPORT: 'Export to CSV'
+    PRINT: Print
+    Print: Print
+    SELECT: 'Select:'
+  TableListField.ss:
+    NOITEMSFOUND: 'No items found'
+    SORTASC: 'Sort in ascending order'
+    SORTDESC: 'Sort in descending order'
+  TableListField_PageControls.ss:
+    DISPLAYING: Displaying
     OF: of
     TO: to
     VIEWFIRST: 'View first'
     VIEWLAST: 'View last'
     VIEWNEXT: 'View next'
     VIEWPREVIOUS: 'View previous'
-  SimpleImageField:
-    NOUPLOAD: 没有上传的图像
-  SiteTree:
-    TABMAIN: 主要部分
-  TableField:
-    ADDITEM: 'Add %s'
-    ISREQUIRED: 'In %s ''%s'' is required'
-    NOITEMSFOUND: 'No items found'
-    SORTASC: 'Sort in ascending order'
-    SORTDESC: 'Sort in descending order'
-  TableListField:
-    CSVEXPORT: 'Export to CSV'
-    PRINT: Print
-    Print: Print
-    SELECT: 'Select:'
   TimeField:
     VALIDATEFORMAT: 'Please enter a valid time format ({format})'
   ToggleField:

lang/zh_TW.yml

@@ -7,7 +7,7 @@ zh_TW:
     FILENAME: 檔案名稱
     FOLDER: Folder
     LASTEDIT: 最後一次更新
-    OWNER: 擁有者
+    OWNER: '擁有者'
     SIZE: 大小
     TITLE: 標題
     TYPE: 類型
@@ -50,16 +50,19 @@ zh_TW:
     UNORDERED: 'Unordered list'
     UNORDEREDDESCRIPTION: 'Unordered list'
     UNORDEREDEXAMPLE1: 'unordered item 1'
+  BackLink_Button.ss:
+    Back: Back
   BasicAuth:
-    ENTERINFO: 請輸入帳號密碼。
+    ENTERINFO: '請輸入帳號密碼。'
-    ERRORNOTADMIN: 那個使用者不是管理員。
+    ERRORNOTADMIN: '那個使用者不是管理員。'
     ERRORNOTREC: 那組帳號密碼不對。
   Boolean:
     0: 'False'
     ANY: Any
-    Hello: Hi
-    LOGOUT: 'Log out'
     1: 'True'
+  CMSLoadingScreen.ss:
+    LOADING: Loading...
+    REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
   CMSMain:
     ACCESS: 'Access to ''{title}'' section'
     ACCESSALLINTERFACES: 'Access to all CMS sections'
@@ -67,6 +70,12 @@ zh_TW:
     SAVE: 儲存
   CMSProfileController:
     MENUTITLE: CMSProfileController
+  ChangePasswordEmail.ss:
+    CHANGEPASSWORDTEXT1: 您為這個帳戶改密碼：
+    CHANGEPASSWORDTEXT2: '您可以用下列的帳號密碼登入：'
+    EMAIL: Email
+    HELLO: 您好
+    PASSWORD: Password
   CheckboxField:
     - 'False'
     - 'True'
@@ -74,6 +83,14 @@ zh_TW:
     CLOSEPOPUP: 'Close Popup'
     SUCCESSADD2: 'Added {name}'
     SUCCESSEDIT: 'Saved %s %s %s'
+  ComplexTableField.ss:
+    ADDITEM: 'Add %s'
+    NOITEMSFOUND: 'No items found'
+    SORTASC: 向上排序
+    SORTDESC: 向下排序
+  ComplexTableField_popup.ss:
+    NEXT: 下一個
+    PREVIOUS: 上一個
   ConfirmedPasswordField:
     ATLEAST: 'Passwords must be at least {min} characters long.'
     BETWEEN: 'Passwords must be {min} to {max} characters long.'
@@ -111,10 +128,7 @@ zh_TW:
     VALIDDATEMAXDATE: 'Your date has to be older or matching the maximum allowed date ({date})'
     VALIDDATEMINDATE: 'Your date has to be newer or matching the minimum allowed date ({date})'
   Director:
-    ADD: Add
-    CSVEXPORT: 'Export to CSV'
     INVALID_REQUEST: 'Invalid request'
-    NOTFOUND: 'No items found'
   DropdownField:
     CHOOSE: (選擇)
   EmailField:
@@ -124,8 +138,6 @@ zh_TW:
     SINGULARNAME: 'Email Bounce Record'
   Enum:
     ANY: Any
-    LOADING: Loading...
-    REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
   File:
     Content: Content
     Filename: Filename
@@ -150,16 +162,20 @@ zh_TW:
     FROMFILESTORE: 'From the File Store'
     NOSOURCE: 'Please select a source file to attach'
     REPLACE: 'Replace {type}'
+  FileIFrameField_iframe.ss:
+    TITLE: 'Image Uploading Iframe'
   Filesystem:
-    IMPORT_TAB_HEADER: Import
-    SEARCHLISTINGS: Search
     SYNCRESULTS: 'Sync complete: {createdcount} items created, {deletedcount} items deleted'
+  ForgotPasswordEmail.ss:
+    HELLO: 您好
+    TEXT1: 'Here is your'
+    TEXT2: 'password reset link'
+    TEXT3: for
   Form:
     FIELDISREQUIRED: '必須要填 %s'
-    TITLE: 'Image Uploading Iframe'
     VALIDATIONCREDITNUMBER: 'Please ensure you have entered the {number} credit card number correctly'
-    VALIDATIONNOTUNIQUE: 您輸入的數值並不是獨特的。
+    VALIDATIONNOTUNIQUE: '您輸入的數值並不是獨特的。'
-    VALIDATIONPASSWORDSDONTMATCH: 密碼不相配
+    VALIDATIONPASSWORDSDONTMATCH: '密碼不相配'
     VALIDATIONPASSWORDSNOTEMPTY: 密碼不能是空的
     VALIDATIONSTRONGPASSWORD: 'Passwords must have at least one digit and one alphanumeric character'
     VALIDATOR: Validator
@@ -187,37 +203,26 @@ zh_TW:
     ResetFilter: Reset
   GridFieldAction_Delete:
     DeletePermissionsFailure: 'No delete permissions'
-    NEXT: 下一個
-    PREVIOUS: 上一個
   GridFieldDetailForm:
     Create: Create
     Delete: Delete
     DeletePermissionsFailure: 'No delete permissions'
     Deleted: 'Deleted %s %s'
-    HELLO: 您好
     Save: Save
     Saved: 'Saved %s %s'
-    TEXT1: 'Here is your'
+  GridFieldItemEditView.ss: null
-    TEXT2: 'password reset link'
-    TEXT3: for
   Group:
     AddRole: 'Add a role for this group'
-    CHANGEPASSWORDTEXT1: 您為這個帳戶改密碼：
-    CHANGEPASSWORDTEXT2: 您可以用下列的帳號密碼登入：
     Code: 'Group Code'
     DefaultGroupTitleAdministrators: Administrators
     DefaultGroupTitleContentAuthors: 'Content Authors'
     Description: Description
-    EMAIL: Email
     GroupReminder: 'If you choose a parent group, this group will take all it''s roles'
-    HELLO: 您好
     Locked: 'Locked?'
     NoRoles: 'No roles found'
-    PASSWORD: Password
     Parent: 'Parent Group'
     RolesAddEditLink: 'Manage roles'
     Sort: 'Sort Order'
-    TITLE: 圖片上載iFrame
     has_many_Permissions: Permissions
     many_many_Members: Members
   GroupImportForm:
@@ -233,15 +238,15 @@ zh_TW:
     ADJUSTDETAILSDIMENSIONS: 'Details & dimensions'
     ANCHORVALUE: Anchor
     BUTTONINSERT: Insert
-    BUTTONINSERTLINK: 插入連結
+    BUTTONINSERTLINK: '插入連結'
     BUTTONREMOVELINK: 移除連結
     BUTTONUpdate: Update
     CAPTIONTEXT: 'Caption text'
     CSSCLASS: 對齊/樣式
     CSSCLASSCENTER: 獨立置中
-    CSSCLASSLEFT: 靠左被字包圍。
+    CSSCLASSLEFT: '靠左被字包圍。'
     CSSCLASSLEFTALONE: 'On the left, on its own.'
-    CSSCLASSRIGHT: 靠右被字包圍。
+    CSSCLASSRIGHT: '靠右被字包圍。'
     DETAILS: Details
     EMAIL: 電子郵件地址
     FILE: 檔案
@@ -260,7 +265,7 @@ zh_TW:
     IMAGETITLETEXTDESC: 'For additional information about the image'
     IMAGEWIDTHPX: 寬
     INSERTMEDIA: 'Insert Media'
-    LINK: 插入或編輯選取的連結
+    LINK: '插入或編輯選取的連結'
     LINKANCHOR: 'Anchor on this page'
     LINKDESCR: 連結敘述
     LINKEMAIL: 電子郵件地址
@@ -269,29 +274,31 @@ zh_TW:
     LINKINTERNAL: 此網站
     LINKOPENNEWWIN: 在新視窗打開連結
     LINKTO: 連結至
-    PAGE: 網頁
+    PAGE: '網頁'
     URL: 網址
     URLNOTANOEMBEDRESOURCE: 'The URL ''{url}'' could not be turned into a media resource.'
     UpdateMEDIA: 'Update Media'
   ImageField:
     IMAGE: Image
-  Image_iframe.ss: 'ChangePasswordEmail.ss:  BackLink_Button.ss:  CMSLoadingScreen.ss:  RelationComplexTableField.ss:  ForgotPasswordEmail.ss:    APPLY FILTER: "Apply Filter"  GridFieldItemEditView.ss:    Go back: "Go back"  ModelSidebar.ss:  TableListField_PageControls.ss:  ModelAdmin_Tools.ss:  ComplexTableField_popup.ss:  TableField.ss:  FileIFrameField_iframe.ss:  ComplexTableField.ss:  TableListField.ss:  ModelAdmin_ImportSpec.ss:  LeftAndMain_Menu.ss:'
+  Image_iframe.ss:
+    TITLE: 圖片上載iFrame
   LeftAndMain:
-    ADD: 'Add a new row'
-    ADDITEM: 'Add %s'
     CANT_REORGANISE: 'You do not have permission to alter Top level pages. Your change was not saved.'
     DELETED: Deleted.
     DropdownBatchActionsDefault: Actions
     HELP: 說明
-    PAGETYPE: 網頁類型：
+    PAGETYPE: '網頁類型：'
-    PERMAGAIN: 您已被登出，請在下面重新登入。
+    PERMAGAIN: '您已被登出，請在下面重新登入。'
-    PERMALREADY: 抱歉，您沒有權力使用這個部分。您可以用別的帳號登入。
+    PERMALREADY: '抱歉，您沒有權力使用這個部分。您可以用別的帳號登入。'
-    PERMDEFAULT: 請選擇一個認證方法並登入。
+    PERMDEFAULT: '請選擇一個認證方法並登入。'
-    PLEASESAVE: 請儲存：這個網頁沒有被更新因為尚未被儲存。
+    PLEASESAVE: '請儲存：這個網頁沒有被更新因為尚未被儲存。'
     PreviewButton: Preview
     REORGANISATIONSUCCESSFUL: 'Reorganised the site tree successfully.'
     SAVEDUP: Saved.
     VersionUnknown: unknown
+  LeftAndMain_Menu.ss:
+    Hello: Hi
+    LOGOUT: 'Log out'
   LoginAttempt:
     Email: 'Email Address'
     IP: 'IP Address'
@@ -299,8 +306,8 @@ zh_TW:
   Member:
     ADDGROUP: 'Add group'
     BUTTONCHANGEPASSWORD: 更改密碼
-    BUTTONLOGIN: 登入
+    BUTTONLOGIN: '登入'
-    BUTTONLOGINOTHER: 用別的帳戶登入
+    BUTTONLOGINOTHER: '用別的帳戶登入'
     BUTTONLOSTPASSWORD: 忘記密碼
     CONFIRMNEWPASSWORD: 確認新密碼
     CONFIRMPASSWORD: 確認密碼
@@ -310,7 +317,7 @@ zh_TW:
     EMPTYNEWPASSWORD: 'The new password can''t be empty, please try again'
     ENTEREMAIL: 'Please enter an email address to get a password reset link.'
     ERRORLOCKEDOUT: 'Your account has been temporarily disabled because of too many failed attempts at logging in. Please try again in 20 minutes.'
-    ERRORNEWPASSWORD: 新密碼不相配，請再試一次。
+    ERRORNEWPASSWORD: '新密碼不相配，請再試一次。'
     ERRORPASSWORDNOTMATCH: 舊密碼不對，請再試一次。
     ERRORWRONGCRED: 密碼或電子郵件地址錯誤。請再是一次。
     FIRSTNAME: 名
@@ -368,6 +375,7 @@ zh_TW:
     ResultUpdated: 'Updated {count} members'
   MemberTableField: null
   ModelAdmin:
+    'APPLY FILTER': 'Apply Filter'
     DELETE: Delete
     DELETEDRECORDS: 'Deleted {count} records.'
     IMPORT: 'Import from CSV'
@@ -377,6 +385,17 @@ zh_TW:
     RESET: Reset
     Title: 'Data Models'
     UPDATEDRECORDS: 'Updated {count} records.'
+  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
   MoneyField:
     FIELDLABELAMOUNT: Amount
     FIELDLABELCURRENCY: Currency
@@ -389,10 +408,6 @@ zh_TW:
     CMS_ACCESS_CATEGORY: 'CMS Access'
     FULLADMINRIGHTS: 'Full administrative rights'
     FULLADMINRIGHTS_HELP: 'Implies and overrules all other assigned permissions.'
-    IMPORTSPECFIELDS: 'Database columns'
-    IMPORTSPECLINK: 'Show Specification for %s'
-    IMPORTSPECRELATIONS: Relations
-    IMPORTSPECTITLE: 'Specification for %s'
   PermissionCheckboxSetField:
     AssignedTo: 'assigned to "{title}"'
     FromGroup: 'inherited from group "{title}"'
@@ -401,20 +416,23 @@ zh_TW:
   Permissions:
     PERMISSIONS_CATEGORY: 'Roles and access permissions'
   PhoneNumberField:
-    Back: Back
+    VALIDATION: '請輸入有效的電話號碼'
-    VALIDATION: 請輸入有效的電話號碼
+  RelationComplexTableField.ss:
+    ADD: Add
+    CSVEXPORT: 'Export to CSV'
+    NOTFOUND: 'No items found'
   Security:
-    ALREADYLOGGEDIN: 你不能瀏覽此頁。請用別的帳戶登入。
+    ALREADYLOGGEDIN: '你不能瀏覽此頁。請用別的帳戶登入。'
     BUTTONSEND: 寄給我密碼重設網址。
     CHANGEPASSWORDBELOW: 請在下面更改密碼。
     CHANGEPASSWORDHEADER: 更改密碼
-    ENTERNEWPASSWORD: 請輸入新的密碼。
+    ENTERNEWPASSWORD: '請輸入新的密碼。'
-    ERRORPASSWORDPERMISSION: 你必須先登入才能改密碼！
+    ERRORPASSWORDPERMISSION: '你必須先登入才能改密碼！'
-    LOGGEDOUT: 你已登出。您在下面再登入一次。
+    LOGGEDOUT: '你已登出。您在下面再登入一次。'
     LOGIN: 'Log in'
-    NOTEPAGESECURED: 那的網頁是被保護的。請先登入。
+    NOTEPAGESECURED: '那的網頁是被保護的。請先登入。'
     NOTERESETLINKINVALID: '<p>The password reset link is invalid or expired.</p><p>You can request a new one <a href="{link1}">here</a> or change your password after you <a href="{link2}">logged in</a>.</p>'
-    NOTERESETPASSWORD: 請輸入您的電子郵件。我們將寄給你重設密媽的網址。
+    NOTERESETPASSWORD: '請輸入您的電子郵件。我們將寄給你重設密媽的網址。'
     PASSWORDSENTHEADER: 'Password reset link sent to ''{email}'''
     PASSWORDSENTTEXT: 'Thank you! A reset link has been sent to ''{email}'', provided an account exists for this email address.'
   SecurityAdmin:
@@ -439,31 +457,33 @@ zh_TW:
     BtnImport: 'Import from CSV'
     FileFieldLabel: 'CSV File <small>(Allowed extensions: *.csv)</small>'
   SilverStripeNavigator:
-    DISPLAYING: Displaying
     Edit: Edit
-    FILTER: Filter
+  SimpleImageField:
-    IMPORT: Import
+    NOUPLOAD: 沒有上傳圖片
+  SiteTree:
+    TABMAIN: 主要
+  TableField:
+    ISREQUIRED: 'In %s ''%s'' is required'
+  TableField.ss:
+    ADD: 'Add a new row'
+    ADDITEM: 'Add %s'
+  TableListField:
+    CSVEXPORT: 'Export to CSV'
+    PRINT: Print
+    Print: Print
+    SELECT: 'Select:'
+  TableListField.ss:
+    NOITEMSFOUND: 'No items found'
+    SORTASC: 'Sort in ascending order'
+    SORTDESC: 'Sort in descending order'
+  TableListField_PageControls.ss:
+    DISPLAYING: Displaying
     OF: of
     TO: to
     VIEWFIRST: 'View first'
     VIEWLAST: 'View last'
     VIEWNEXT: 'View next'
     VIEWPREVIOUS: 'View previous'
-  SimpleImageField:
-    NOUPLOAD: 沒有上傳圖片
-  SiteTree:
-    TABMAIN: 主要
-  TableField:
-    ADDITEM: 'Add %s'
-    ISREQUIRED: 'In %s ''%s'' is required'
-    NOITEMSFOUND: 'No items found'
-    SORTASC: 'Sort in ascending order'
-    SORTDESC: 'Sort in descending order'
-  TableListField:
-    CSVEXPORT: 'Export to CSV'
-    PRINT: Print
-    Print: Print
-    SELECT: 'Select:'
   TimeField:
     VALIDATEFORMAT: 'Please enter a valid time format ({format})'
   ToggleField:

model/fieldtypes/DBField.php

@@ -65,7 +65,7 @@ abstract class DBField extends ViewableData {
 	
 
 	static function create() {
-		Deprecation::notice('3.0', 'DBField::create_field() is deprecated as it clashes with Object::create(). Use DBField::create_field() instead.');
+		Deprecation::notice('3.0', 'DBField::create() is deprecated as it clashes with Object::create(). Use DBField::create_field() instead.');
 
 		return call_user_func_array(array('DBField', 'create_field'), func_get_args());
 	}

templates/ComplexTableField.ss

@@ -17,9 +17,9 @@
 						<span class="sortLink <% if SortBy %><% else %>sortLinkHidden<% end_if %>">
 							<a href="$SortLink">
 								<% if SortDirection = desc %>
-								<img src="$ModulePath(framework)/images/bullet_arrow_up.png" alt="<% _t('SORTASC', 'Sort ascending') %>" />
+								<img src="$ModulePath(framework)/images/bullet_arrow_up.png" alt="<% _t('ComplexTableField.ss.SORTASC', 'Sort ascending') %>" />
 								<% else %>
-								<img src="$ModulePath(framework)/images/bullet_arrow_down.png" alt="<% _t('SORTDESC', 'Sort descending') %>" />
+								<img src="$ModulePath(framework)/images/bullet_arrow_down.png" alt="<% _t('ComplexTableField.ss.SORTDESC', 'Sort descending') %>" />
 								<% end_if %>
 							</a>
 							&nbsp;
@@ -49,7 +49,7 @@
 				<td colspan="$ItemCount">
 					<input type="hidden" id="{$id}_PopupHeight" value="$PopupHeight" disabled="disabled">
 					<input type="hidden" id="{$id}_PopupWidth" value="$PopupWidth" disabled="disabled">
-					<a class="popuplink addlink" href="$AddLink" alt="add"><img src="$ModulePath(framework)/images/add.gif" alt="<% _t('ADDITEM', 'add') %>" />
+					<a class="popuplink addlink" href="$AddLink" alt="add"><img src="$ModulePath(framework)/images/add.gif" alt="<% _t('ComplexTableField.ss.ADDITEM', 'add') %>" />
 						<% sprintf(_t('ADDITEM', 'Add %s', 'Add [name]'),$Title) %>
 					</a>
 				</td>
@@ -65,7 +65,7 @@
 			<% else %>
 				<tr class="notfound">
 					<% if Markable %><th width="18">&nbsp;</th><% end_if %>
-					<td colspan="$Headings.Count"><i><% _t('NOITEMSFOUND', 'No items found') %></i></td>
+					<td colspan="$Headings.Count"><i><% _t('ComplexTableField.ss.NOITEMSFOUND', 'No items found') %></i></td>
 					<% loop Actions %><td width="18">&nbsp;</td><% end_loop %>
 				</tr>
 			<% end_if %>

templates/ComplexTableField_popup.ss

@@ -15,7 +15,7 @@
 				<tr>
 					<% if Paginator.PrevLink %>
 						<td id="ComplexTableField_Pagination_Previous">
-							<a href="$Paginator.PrevLink"><img src="$ModulePath(framework)/images/pagination/record-prev.png" /><% _t('PREVIOUS', 'Previous') %></a>
+							<a href="$Paginator.PrevLink"><img src="$ModulePath(framework)/images/pagination/record-prev.png" /><% _t('ComplexTableField_popup.ss.PREVIOUS', 'Previous') %></a>
 						</td>
 					<% end_if %>
 					<% if xdsfdsf %>
@@ -32,7 +32,7 @@
 					<% end_if %>
 					<% if Paginator.NextLink %>
 						<td id="ComplexTableField_Pagination_Next">
-							<a href="$Paginator.NextLink"><% _t('NEXT', 'Next') %><img src="$ModulePath(framework)/images/pagination/record-next.png" /></a>
+							<a href="$Paginator.NextLink"><% _t('ComplexTableField_popup.ss.NEXT', 'Next') %><img src="$ModulePath(framework)/images/pagination/record-next.png" /></a>
 						</td>
 					<% end_if %>
 				</tr>

templates/FileIFrameField_iframe.ss

@@ -4,7 +4,7 @@
 		<meta http-equiv="X-UA-Compatible" content="IE=EmulateIE7" />
 		<% base_tag %>
 		
-		<title><% _t('TITLE', 'Image Uploading Iframe') %></title>
+		<title><% _t('FileIFrameField_iframe.ss.TITLE', 'Image Uploading Iframe') %></title>
 	</head>
 	
 	<body>

templates/Image_iframe.ss

@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" >
 	<head>
 		<% base_tag %>
-		<title><% _t('TITLE', 'Image Uploading Iframe') %></title>
+		<title><% _t('Image_iframe.ss.TITLE', 'Image Uploading Iframe') %></title>
 		<meta http-equiv="X-UA-Compatible" content="IE=EmulateIE7">
 	</head>
 

templates/Includes/TableListField_PageControls.ss

@@ -1,17 +1,17 @@
 <% if ShowPagination %>
 	<% if TotalCount %>
 	<div class="PageControls">
-		<% if FirstLink %><a class="First" href="$FirstLink" title="<% _t('VIEWFIRST', 'View first') %> $PageSize"><img src="$ModulePath(framework)/images/pagination/record-first.png" alt="<% _t('VIEWFIRST', 'View first') %> $PageSize" /></a>
+		<% if FirstLink %><a class="First" href="$FirstLink" title="<% _t('TableListField_PageControls.ss.VIEWFIRST', 'View first') %> $PageSize"><img src="$ModulePath(framework)/images/pagination/record-first.png" alt="<% _t('TableListField_PageControls.ss.VIEWFIRST', 'View first') %> $PageSize" /></a>
-		<% else %><span class="First"><img src="$ModulePath(framework)/images/pagination/record-first-g.png" alt="<% _t('VIEWFIRST', 'View first') %> $PageSize" /></span><% end_if %>
+		<% else %><span class="First"><img src="$ModulePath(framework)/images/pagination/record-first-g.png" alt="<% _t('TableListField_PageControls.ss.VIEWFIRST', 'View first') %> $PageSize" /></span><% end_if %>
-		<% if PrevLink %><a class="Prev" href="$PrevLink" title="<% _t('VIEWPREVIOUS', 'View previous') %> $PageSize"><img src="$ModulePath(framework)/images/pagination/record-prev.png" alt="<% _t('VIEWPREVIOUS', 'View previous') %> $PageSize" /></a>
+		<% if PrevLink %><a class="Prev" href="$PrevLink" title="<% _t('TableListField_PageControls.ss.VIEWPREVIOUS', 'View previous') %> $PageSize"><img src="$ModulePath(framework)/images/pagination/record-prev.png" alt="<% _t('TableListField_PageControls.ss.VIEWPREVIOUS', 'View previous') %> $PageSize" /></a>
-		<% else %><img class="Prev" src="$ModulePath(framework)/images/pagination/record-prev-g.png" alt="<% _t('VIEWPREVIOUS', 'View previous') %> $PageSize" /><% end_if %>
+		<% else %><img class="Prev" src="$ModulePath(framework)/images/pagination/record-prev-g.png" alt="<% _t('TableListField_PageControls.ss.VIEWPREVIOUS', 'View previous') %> $PageSize" /><% end_if %>
 		<span class="Count">
-			<% _t('DISPLAYING', 'Displaying') %> $FirstItem <% _t('TO', 'to') %> $LastItem <% _t('OF', 'of') %> $TotalCount
+			<% _t('DISPLAYING', 'Displaying') %> $FirstItem <% _t('TableListField_PageControls.ss.TO', 'to') %> $LastItem <% _t('TableListField_PageControls.ss.OF', 'of') %> $TotalCount
 		</span>
-		<% if NextLink %><a class="Next" href="$NextLink" title="<% _t('VIEWNEXT', 'View next') %> $PageSize"><img src="$ModulePath(framework)/images/pagination/record-next.png" alt="<% _t('VIEWNEXT', 'View next') %> $PageSize" /></a>
+		<% if NextLink %><a class="Next" href="$NextLink" title="<% _t('TableListField_PageControls.ss.VIEWNEXT', 'View next') %> $PageSize"><img src="$ModulePath(framework)/images/pagination/record-next.png" alt="<% _t('TableListField_PageControls.ss.VIEWNEXT', 'View next') %> $PageSize" /></a>
-		<% else %><img class="Next" src="$ModulePath(framework)/images/pagination/record-next-g.png" alt="<% _t('VIEWNEXT', 'View next') %> $PageSize" /><% end_if %>
+		<% else %><img class="Next" src="$ModulePath(framework)/images/pagination/record-next-g.png" alt="<% _t('TableListField_PageControls.ss.VIEWNEXT', 'View next') %> $PageSize" /><% end_if %>
-		<% if LastLink %><a class="Last" href="$LastLink" title="<% _t('VIEWLAST', 'View last') %> $PageSize"><img src="$ModulePath(framework)/images/pagination/record-last.png" alt="<% _t('VIEWLAST', 'View last') %> $PageSize" /></a>
+		<% if LastLink %><a class="Last" href="$LastLink" title="<% _t('TableListField_PageControls.ss.VIEWLAST', 'View last') %> $PageSize"><img src="$ModulePath(framework)/images/pagination/record-last.png" alt="<% _t('TableListField_PageControls.ss.VIEWLAST', 'View last') %> $PageSize" /></a>
-		<% else %><span class="Last"><img src="$ModulePath(framework)/images/pagination/record-last-g.png" alt="<% _t('VIEWLAST', 'View last') %> $PageSize" /></span><% end_if %>
+		<% else %><span class="Last"><img src="$ModulePath(framework)/images/pagination/record-last-g.png" alt="<% _t('TableListField_PageControls.ss.VIEWLAST', 'View last') %> $PageSize" /></span><% end_if %>
 		
 	</div>
 	<% end_if %>

templates/RelationComplexTableField.ss

@@ -34,7 +34,7 @@
 				<td colspan="$ItemCount">
 					<input type="hidden" id="{$id}_PopupHeight" value="$PopupHeight" disabled="disabled">
 					<input type="hidden" id="{$id}_PopupWidth" value="$PopupWidth" disabled="disabled">
-					<a class="popuplink addlink" href="$AddLink" alt="<% _t('ADD', 'Add') %>"><img src="$ModulePath(framework)/images/add.gif" alt="<% _t('ADD', 'Add') %>" /><% _t('ADD', 'Add') %> $Title</a>
+					<a class="popuplink addlink" href="$AddLink" alt="<% _t('RelationComplexTableField.ss.ADD', 'Add') %>"><img src="$ModulePath(framework)/images/add.gif" alt="<% _t('ADD', 'Add') %>" /><% _t('RelationComplexTableField.ss.ADD', 'Add') %> $Title</a>
 				</td>
 				<% if Can(show) %><td width="18">&nbsp;</td><% end_if %>
 				<% if Can(edit) %><td width="18">&nbsp;</td><% end_if %>
@@ -50,7 +50,7 @@
 			<% else %>
 				<tr class="notfound">
 					<% if Markable %><th width="18">&nbsp;</th><% end_if %>
-					<td colspan="$Headings.Count"><i><% _t('NOTFOUND', 'No items found') %></i></td>
+					<td colspan="$Headings.Count"><i><% _t('RelationComplexTableField.ss.NOTFOUND', 'No items found') %></i></td>
 					<% if Can(show) %><td width="18">&nbsp;</td><% end_if %>
 					<% if Can(edit) %><td width="18">&nbsp;</td><% end_if %>
 					<% if Can(delete) %><td width="18">&nbsp;</td><% end_if %>
@@ -61,7 +61,7 @@
 	$ExtraData
 	<div class="utility">
 		<% if Can(export) %>
-			<a href="$ExportLink" target="_blank"><% _t('CSVEXPORT', 'Export to CSV' ) %></a>
+			<a href="$ExportLink" target="_blank"><% _t('RelationComplexTableField.ss.CSVEXPORT', 'Export to CSV' ) %></a>
 		<% end_if %>
 	</div>
 </div>

templates/TableField.ss

@@ -30,8 +30,8 @@
 		<% if Can(add) %>
 			<tr>
 				<td colspan="$ItemCount">
-					<a href="#" class="addrow" title="<% _t('ADD', 'Add a new row') %>"><img src="$ModulePath(framework)/images/add.gif" alt="<% _t('ADD','Add a new row') %>" />
+					<a href="#" class="addrow" title="<% _t('TableField.ss.ADD', 'Add a new row') %>"><img src="$ModulePath(framework)/images/add.gif" alt="<% _t('TableField.ss.ADD','Add a new row') %>" />
-						<% sprintf(_t('ADDITEM','Add %s'),$Title) %>
+						<% sprintf(_t('TableField.ss.ADDITEM','Add %s'),$Title) %>
 					</a>
 				</td>
 				<td style="display: none"></td>
@@ -47,13 +47,13 @@
 						<td class="$FieldClass $extraClass $ClassName $Title tablecolumn">$Field</td>
 					<% end_loop %>
 					<td style="display: none">$ExtraData</td>
-					<% if Can(delete) %><td width="18"><a class="deletelink" href="$DeleteLink" title="<% _t('DELETEROW') %>"><img src="$ModulePath(framework)/images/delete.gif" alt="<% _t('DELETE') %>" /></a></td><% end_if %>
+					<% if Can(delete) %><td width="18"><a class="deletelink" href="$DeleteLink" title="<% _t('TableField.ss.DELETEROW') %>"><img src="$ModulePath(framework)/images/delete.gif" alt="<% _t('TableField.ss.DELETE') %>" /></a></td><% end_if %>
 				</tr>
 			<% end_loop %>
 			<% else %>
 				<tr class="notfound">
 					<% if Markable %><th width="18">&nbsp;</th><% end_if %>
-					<td colspan="$Headings.Count"><i><% _t('NOITEMSFOUND') %></i></td>
+					<td colspan="$Headings.Count"><i><% _t('TableField.ss.NOITEMSFOUND') %></i></td>
 					<% if Can(delete) %><td width="18">&nbsp;</td><% end_if %>
 				</tr>
 			<% end_if %>

templates/TableListField.ss

@@ -24,9 +24,9 @@
 					</span>
 					<span class="sortLink <% if SortBy %><% else %>sortLinkHidden<% end_if %>">
 					<% if SortDirection = desc %>
-						<a href="$SortLink"><img src="$ModulePath(framework)/images/bullet_arrow_up.png" alt="<% _t('SORTDESC', 'Sort in descending order') %>" /></a>
+						<a href="$SortLink"><img src="$ModulePath(framework)/images/bullet_arrow_up.png" alt="<% _t('TableListField.ss.SORTDESC', 'Sort in descending order') %>" /></a>
 					<% else %>
-						<a href="$SortLink"><img src="$ModulePath(framework)/images/bullet_arrow_down.png" alt="<% _t('SORTASC', 'Sort in ascending order') %>" /></a>
+						<a href="$SortLink"><img src="$ModulePath(framework)/images/bullet_arrow_down.png" alt="<% _t('TableListField.ss.SORTASC', 'Sort in ascending order') %>" /></a>
 					<% end_if %>
 						</a>
 						&nbsp;
@@ -67,7 +67,7 @@
 				<% else %>
 					<tr class="notfound">
 						<% if Markable %><th width="18">&nbsp;</th><% end_if %>
-						<td colspan="$Headings.Count"><i><% _t('NOITEMSFOUND','No items found') %></i></td>
+						<td colspan="$Headings.Count"><i><% _t('TableListField.ss.NOITEMSFOUND','No items found') %></i></td>
 						<% if Can(delete) %><td width="18">&nbsp;</td><% end_if %>
 					</tr>
 				<% end_if %>

templates/email/ChangePasswordEmail.ss

@@ -1,11 +1,11 @@
-<p><% _t('HELLO', 'Hi') %> $FirstName,</p>
+<p><% _t('ChangePasswordEmail.ss.HELLO', 'Hi') %> $FirstName,</p>
 
 <p>
-	<% _t('CHANGEPASSWORDTEXT1', 'You changed your password for', 'for a url') %> $AbsoluteBaseURL.<br />
+	<% _t('ChangePasswordEmail.ss.CHANGEPASSWORDTEXT1', 'You changed your password for', 'for a url') %> $AbsoluteBaseURL.<br />
-	<% _t('CHANGEPASSWORDTEXT2', 'You can now use the following credentials to log in:') %>
+	<% _t('ChangePasswordEmail.ss.CHANGEPASSWORDTEXT2', 'You can now use the following credentials to log in:') %>
 </p>
 
 <p>
-	<% _t('EMAIL', 'Email') %>: $Email<br />
+	<% _t('ChangePasswordEmail.ss.EMAIL', 'Email') %>: $Email<br />
-	<% _t('PASSWORD', 'Password') %>: $CleartextPassword
+	<% _t('ChangePasswordEmail.ss.PASSWORD', 'Password') %>: $CleartextPassword
 </p>

templates/email/ForgotPasswordEmail.ss

@@ -1,4 +1,4 @@
-<p><% _t('HELLO', 'Hi') %> $FirstName,</p>
+<p><% _t('ForgotPasswordEmail.ss.HELLO', 'Hi') %> $FirstName,</p>
 
-<p><% _t('TEXT1', 'Here is your') %> <a href="$PasswordResetLink"><% _t('TEXT2', 'password reset link') %></a> <% _t('TEXT3', 'for') %> $AbsoluteBaseURL.</p>
+<p><% _t('ForgotPasswordEmail.ss.TEXT1', 'Here is your') %> <a href="$PasswordResetLink"><% _t('ForgotPasswordEmail.ss.TEXT2', 'password reset link') %></a> <% _t('ForgotPasswordEmail.ss.TEXT3', 'for') %> $AbsoluteBaseURL.</p>