Merge branch '3.0'

admin/code/LeftAndMain.php

@@ -402,6 +402,7 @@ class LeftAndMain extends Controller implements PermissionProvider {
 	 * This is used in the CMS.
 	 */
 	public function ping() {
+		Requirements::clear();
 		return 1;
 	}
 	
@@ -753,7 +754,7 @@ class LeftAndMain extends Controller implements PermissionProvider {
 				$treeTitle = $customTreeTitle;
 			} elseif(class_exists('SiteConfig')) {
 				$siteConfig = SiteConfig::current_site_config();
-				$treeTitle =  $siteConfig->Title;
+				$treeTitle =  Convert::raw2xml($siteConfig->Title);
 			} else {
 				$treeTitle = '...';
 			}
@@ -1090,7 +1091,9 @@ class LeftAndMain extends Controller implements PermissionProvider {
 			$form->setAttribute('data-pjax-fragment', 'CurrentForm');
 			
 			// Set this if you want to split up tabs into a separate header row
-			// if($form->Fields()->hasTabset()) $form->Fields()->findOrMakeTab('Root')->setTemplate('CMSTabSet');
+			// if($form->Fields()->hasTabset()) {
+			// 	$form->Fields()->findOrMakeTab('Root')->setTemplate('CMSTabSet');
+			// }
 			
 			// Add a default or custom validator.
 			// @todo Currently the default Validator.js implementation

admin/code/SecurityAdmin.php

@@ -127,7 +127,8 @@ class SecurityAdmin extends LeftAndMain implements PermissionProvider {
 			// necessary for tree node selection in LeftAndMain.EditForm.js
 			new HiddenField('ID', false, 0)
 		);
-		
+
+		// Tab nav in CMS is rendered through separate template		
 		$root->setTemplate('CMSTabSet');
 		
 		// Add roles editing interface
@@ -161,7 +162,10 @@ class SecurityAdmin extends LeftAndMain implements PermissionProvider {
 		);
 		$form->addExtraClass('cms-edit-form');
 		$form->setTemplate($this->getTemplatesWithSuffix('_EditForm'));
-		if($form->Fields()->hasTabset()) $form->Fields()->findOrMakeTab('Root')->setTemplate('CMSTabSet');
+		// Tab nav in CMS is rendered through separate template
+		if($form->Fields()->hasTabset()) {
+			$form->Fields()->findOrMakeTab('Root')->setTemplate('CMSTabSet');
+		}
 		$form->addExtraClass('center ss-tabset cms-tabset ' . $this->BaseCSSClasses());
 		$form->setAttribute('data-pjax-fragment', 'CurrentForm');
 

admin/css/screen.css

@@ -422,8 +422,17 @@ body.cms { overflow: hidden; }
 
 /**  CMS Batch actions */
 .cms-content-batchactions { float: left; position: relative; display: block; margin-left: 8px; }
+.cms-content-batchactions .view-mode-batchactions-wrapper { float: left; padding: 4px 6px; border: 1px solid #aaa; margin-bottom: 8px; background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjUwJSIgeTE9IjAlIiB4Mj0iNTAlIiB5Mj0iMTAwJSI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2ZmZmZmZiIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iI2Q5ZDlkOSIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background-size: 100%; background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #ffffff), color-stop(100%, #d9d9d9)); background-image: -webkit-linear-gradient(top, #ffffff, #d9d9d9); background-image: -moz-linear-gradient(top, #ffffff, #d9d9d9); background-image: -o-linear-gradient(top, #ffffff, #d9d9d9); background-image: linear-gradient(top, #ffffff, #d9d9d9); border-top-left-radius: 4px; border-bottom-left-radius: 4px; }
+.cms-content-batchactions .view-mode-batchactions-wrapper label { display: none; }
+.cms-content-batchactions .view-mode-batchactions-wrapper fieldset, .cms-content-batchactions .view-mode-batchactions-wrapper .Actions { display: inline-block; }
+.cms-content-batchactions.inactive .view-mode-batchactions-wrapper { border-radius: 4px; }
+.cms-content-batchactions.inactive .view-mode-batchactions-wrapper label { display: inline; }
 .cms-content-batchactions form > * { display: block; float: left; }
 .cms-content-batchactions form.cms-batch-actions { float: left; }
+.cms-content-batchactions.inactive form { display: none; }
+.cms-content-batchactions .chzn-container-single .chzn-single { margin-left: -1px; border-radius: 0; background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjUwJSIgeTE9IjAlIiB4Mj0iNTAlIiB5Mj0iMTAwJSI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2ZmZmZmZiIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iI2Q5ZDlkOSIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background-size: 100%; background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #ffffff), color-stop(100%, #d9d9d9)); background-image: -webkit-linear-gradient(top, #ffffff, #d9d9d9); background-image: -moz-linear-gradient(top, #ffffff, #d9d9d9); background-image: -o-linear-gradient(top, #ffffff, #d9d9d9); background-image: linear-gradient(top, #ffffff, #d9d9d9); }
+.cms-content-batchactions .cms-batch-actions .Actions .ss-ui-button { margin-left: -1px; border-top-left-radius: 0; border-bottom-left-radius: 0; }
+.cms-content-batchactions .cms-batch-actions .Actions .ss-ui-button.ui-state-disabled { opacity: 1; color: #ccc; }
 
 #Form_BatchActionsForm select { width: 200px; }
 

admin/javascript/LeftAndMain.BatchActions.js

@@ -47,15 +47,17 @@
 				this._super();
 			},
 
-			'from .cms-tree-view-modes :input[name=view-mode]': {
+			'from .cms-content-batchactions :input[name=view-mode-batchactions]': {
 				onclick: function(e){
-					var val = $(e.target).val(), dropdown = this.find(':input[name=Action]'), tree = this.getTree();
+					var checkbox = $(e.target), dropdown = this.find(':input[name=Action]'), tree = this.getTree();
 
-					if(val == 'multiselect') {
+					if(checkbox.is(':checked')) {
 						tree.addClass('multiple');
+						tree.removeClass('draggable');
 						this.serializeFromTree();
 					} else {
 						tree.removeClass('multiple');
+						tree.addClass('draggable');
 					}
 
 					this._updateStateFromViewMode();
@@ -66,12 +68,21 @@
 			 * Updates the select box state according to the current view mode.
 			 */
 			_updateStateFromViewMode: function() {
-				var viewMode = $('.cms-tree-view-modes :input[name=view-mode]:checked').val();
+				var viewMode = $('.cms-content-batchactions :input[name=view-mode-batchactions]');
+				var batchactions = $('.cms-content-batchactions');
 				var dropdown = this.find(':input[name=Action]');
 
 				// Batch actions only make sense when multiselect is enabled.
-				if(viewMode == 'multiselect') dropdown.removeAttr('disabled').trigger("liszt:updated");
+				if(viewMode.is(':checked')) {
-				else dropdown.attr('disabled', true).trigger("liszt:updated");
+					dropdown.trigger("liszt:updated");
+					batchactions.removeClass('inactive');
+				}
+				else {
+					dropdown.trigger("liszt:updated");
+					// Used timeout to make sure when it shows up you won't see
+					// the native dropdown
+					setTimeout(function() { batchactions.addClass('inactive'); }, 100);
+				}
 			},
 
 			/**

admin/javascript/LeftAndMain.Ping.js

@@ -40,6 +40,7 @@
 					$.ajax({
 						url: 'admin/security/ping',
 						global: false,
+						type: 'POST',
 						complete: onSessionLost
 					});
 				}, this.getPingIntervalSeconds() * 1000);

admin/javascript/LeftAndMain.Tree.js

@@ -454,7 +454,7 @@
 			}
 		});
 		
-		$('.cms-tree-view-modes input.view-mode').entwine({
+		$('.cms-content-batchactions input[name=view-mode-batchactions]').entwine({
 			onmatch: function() {
 				// set active by default
 				this.redraw();
@@ -470,8 +470,8 @@
 				if(window.debug) console.log('redraw', this.attr('class'), this.get(0));
 				
 				$('.cms-tree')
-					.toggleClass('draggable', this.val() == 'draggable')
+					.toggleClass('draggable', !this.is(':checked'))
-					.toggleClass('multiple', this.val() == 'multiselect');
+					.toggleClass('multiple', this.is(':checked'));
 			}
 		});
 	});

admin/scss/_style.scss

@@ -778,6 +778,32 @@ body.cms {
 	position:  relative;
 	display: block;
 	margin-left: 8px;
+
+	.view-mode-batchactions-wrapper {
+		float: left;
+		padding: 4px 6px;
+		border: 1px solid #aaa;
+		margin-bottom: 8px;
+		@include background-image(linear-gradient(top, #fff, #D9D9D9));
+		border-top-left-radius: 4px;
+		border-bottom-left-radius: 4px;	
+
+		label {
+			display: none;
+		}
+
+		fieldset, .Actions {
+			display: inline-block;
+		}
+	}
+
+		&.inactive .view-mode-batchactions-wrapper {
+			border-radius: 4px;		
+
+			label {
+				display: inline;
+			}
+		}
 	
 	form > * {
 		display: block;
@@ -787,6 +813,27 @@ body.cms {
 	form.cms-batch-actions {
 		float:  left;
 	}
+
+	&.inactive form {
+		display: none;
+	}
+
+	.chzn-container-single .chzn-single {
+		margin-left: -1px;
+		border-radius: 0;
+		@include background-image(linear-gradient(top, #fff, #D9D9D9));
+	}
+
+	.cms-batch-actions .Actions .ss-ui-button {
+		margin-left: -1px;
+		border-top-left-radius: 0;
+		border-bottom-left-radius: 0;
+
+		&.ui-state-disabled {
+			opacity: 1;
+			color: #ccc;
+		}
+	}
 }
 
 #Form_BatchActionsForm select {

admin/templates/CMSTabSet.ss

@@ -1,6 +1,10 @@
-<div $AttributesHTML>
+<%-- Exclude ".ss-tabset" class to avoid inheriting behaviour --%>
-	<%-- Tab nav is rendered in CMSEditForm.ss --%>
+<%-- The ".cms-tabset" class needs to be manually applied to a container elment, --%>
+<%-- above the level where the tab navigation is placed. --%>
+<%-- Tab navigation is rendered through various templates, --%>
+<%-- e.g. through LeftAndMain_EditForm.ss. --%>
 
+<div $AttributesHTML>
 	<% loop Tabs %>
 		<% if Tabs %>
 			$FieldHolder

api/JSONDataFormatter.php

@@ -135,7 +135,10 @@ class JSONDataFormatter extends DataFormatter {
 	 */
 	public function convertDataObjectSet(SS_List $set, $fields = null) {
 		$items = array();
-		foreach ($set as $do) $items[] = $this->convertDataObjectToJSONObject($do, $fields);
+		foreach($set as $do) {
+			if(!$do->canView()) continue;
+			$items[] = $this->convertDataObjectToJSONObject($do, $fields);
+		}
 
 		$serobj = ArrayData::array_to_object(array(
 			"totalSize" => (is_numeric($this->totalSize)) ? $this->totalSize : null,

core/Core.php

@@ -186,13 +186,13 @@ define('ASSETS_PATH', BASE_PATH . '/' . ASSETS_DIR);
 // INCLUDES
 
 if(defined('CUSTOM_INCLUDE_PATH')) {
-	$includePath = CUSTOM_INCLUDE_PATH . PATH_SEPARATOR
+	$includePath = '.' . PATH_SEPARATOR . CUSTOM_INCLUDE_PATH . PATH_SEPARATOR
 		. FRAMEWORK_PATH . PATH_SEPARATOR
 		. FRAMEWORK_PATH . '/parsers' . PATH_SEPARATOR
 		. THIRDPARTY_PATH . PATH_SEPARATOR
 		. get_include_path();
 } else {
-	$includePath = FRAMEWORK_PATH . PATH_SEPARATOR
+	$includePath = '.' . PATH_SEPARATOR . FRAMEWORK_PATH . PATH_SEPARATOR
 		. FRAMEWORK_PATH . '/parsers' . PATH_SEPARATOR
 		. THIRDPARTY_PATH . PATH_SEPARATOR
 		. get_include_path();

css/GridField.css

@@ -34,9 +34,8 @@
 .cms table.ss-gridfield-table thead tr:first-child th:last-child { -moz-border-radius-topright: 5px; -webkit-border-top-right-radius: 5px; border-top-right-radius: 5px; }
 .cms table.ss-gridfield-table tbody { background: #FFF; }
 .cms table.ss-gridfield-table tbody tr { cursor: pointer; }
-.cms table.ss-gridfield-table tbody td { width: auto; white-space: nowrap; }
+.cms table.ss-gridfield-table tbody td { width: auto; max-width: 500px; word-wrap: break-word; }
 .cms table.ss-gridfield-table tbody td.col-buttons { width: 40px; padding: 0 8px; text-align: left; }
-.cms table.ss-gridfield-table tbody td.col-description { width: auto; }
 .cms table.ss-gridfield-table tbody td.col-listChildrenLink { width: 16px; border-right: none; text-indent: -9999em; padding: 0; }
 .cms table.ss-gridfield-table tbody td.col-listChildrenLink .list-children-link { background: transparent url(../images/sitetree_ss_default_icons.png) no-repeat 3px -4px; display: block; }
 .cms table.ss-gridfield-table tbody td.col-getTreeTitle span.item { color: #1556b2; }

docs/en/changelogs/3.0.0.md

@@ -61,7 +61,7 @@ which points to the framework directory, and in the templates you can use `$Modu
 
 ### GridField: Replacement for TableListField and ComplexTableField [gridfield]###
 
-We have a new component for managing lists of objects: The `[GridField](/topics/grid-field)`.
+We have a new component for managing lists of objects: The `[GridField](/reference/grid-field)`.
 It's a substantial rewrite of the features previously captured by `TableListField`,
 `ComplexTableField`, `HasManyComplexTableField` and `ManyManyComplexTableField`.
 
@@ -97,7 +97,7 @@ Upgrade example: Relationship editing
 	// after
 	$field = new GridField('MyRelation', null, $myRecord->MyRelation(), GridFieldConfig_RelationEditor::create());
 
-More information is available in the [GridField documentation](/topics/grid-field).
+More information is available in the [GridField documentation](/reference/grid-field).
 
 ### Object static functions replaced with new Config class {#new-config}
 Static functions for getting a static variable on the `Object` class have been deprecated,

docs/en/changelogs/alpha/3.0.0-alpha2.md

@@ -34,7 +34,7 @@ For more information see documentation at [/topics/datamodel](../../topics/datam
 GridField has changed since 3.0.0-alpha1 to be more flexible. Any previous implementation are broken
 and need to be changed according to the new API.
 
-For implementation details see documentation at [/topics/grid-field](../../topics/grid-field).
+For implementation details see documentation at [/reference/grid-field](../../reference/grid-field).
 
 ## Upgrading ##
 

docs/en/installation/composer.md

@@ -0,0 +1,91 @@
+<div markdown='1' style="float: right; margin-left: 20px">
+![](../_images/composer.png)
+</div>
+
+# Installing and Upgrading SilverStipe with Composer
+
+Composer is a package management tool for PHP that lets you install and upgrade SilverStripe and its modules.  Although installing Composer is one extra step, it will give you much more flexibility than just downloading the file from silverstripe.org. This is our recommended way of downloading SilverStripe and managing your code.
+
+For more information about Composer, visit [its website](http://getcomposer.org/).
+
+## Installing composer
+
+To install Composer, run the following command from your command-line.
+
+	curl -s https://getcomposer.org/installer | php
+
+Or [download composer.phar](http://getcomposer.org/composer.phar) manually.
+
+You can then run Composer commands by calling `php composer.phar`.  For example:
+
+	php composer.phar help
+	
+## Create a site from the default installer template
+
+Composer can create a new project for you, using the installer as a template.  To do so, run this:
+
+	php composer.phar create-project silverstripe/installer ./my/website/folder 3.0.2.1
+
+`./my/website/folder` should be the root directory where your site will live.  For example, on OS X, you might use a subdirectory of `~/Sites`.
+
+As long as your web server is up and running, this will get all the code that you need.  Now visit the site in your web
+browser, and the installation process will be completed.
+
+**Note:** The version, 3.0.2.1, is the first version that we've released that has Composer support.  Shortly, this will be replaced with 3.0.3.  Note that [a planned improvement to Composer](https://github.com/composer/composer/issues/957) would make it choose the latest stable version by default; once this has happened, we will update this document.
+
+## Adding modules to your project
+
+Composer isn't only used to download SilverStripe CMS: it can also be used to manage all the modules.  In the root of your project, there will be a file called `composer.json`.  If you open it up, the contents will look something like this:
+
+	{
+	        "name": "silverstripe/installer",
+	        "description": "The SilverStripe Framework Installer",
+	        "require": {
+	                "php": ">=5.3.2",
+	                "silverstripe/cms": "3.0.3",
+	                "silverstripe/framework": "3.0.3",
+	                "silverstripe-themes/simple": "*"
+	        },
+	        "require-dev": {
+	                "silverstripe/compass": "*",
+	                "silverstripe/docsviewer": "*"
+	        },
+	}
+	
+	
+To add modules, you should add more entries into the `"require"` section.  For example, we might add the blog and forum modules.  Be careful with the commas at the end of the lines!
+
+	{
+	        "name": "silverstripe/installer",
+	        "description": "The SilverStripe Framework Installer",
+	        "require": {
+	                "php": ">=5.3.2",
+	                "silverstripe/cms": "3.0.3",
+	                "silverstripe/framework": "3.0.3",
+	                "silverstripe-themes/simple": "*",
+	
+	                "silverstripe/blog": "*",
+	                "silverstripe/forum": "*"
+	        },
+	        "require-dev": {
+	                "silverstripe/compass": "*",
+	                "silverstripe/docsviewer": "*"
+	        },
+	}
+
+Save your file, and then run the following command:
+
+	php composer.phar update
+	
+We currently use [Packagist](https://packagist.org/) to download manage modules, as this is Composer's default repository.  You can find other modules by searching for "SilverStripe" on Packagist.
+
+## Preparing your project for working on SilverStripe
+
+So you want to contribute to SilverStripe? Fantastic! There are a couple modules that are helpful
+
+ * The `compass` module will regenerate CSS if you update the SCSS files
+ * The `docsviewer` module will let you preview changes to the project documentation
+
+By default, these modules aren't installed, but you can install them with a special version of composer's update command:
+
+	php composer.phar update --dev

docs/en/installation/index.md

@@ -5,24 +5,47 @@
 SilverStripe is a web application. This means that you will need to have a webserver and database meeting its 
 [requirements](server-requirements). We will take you through the setup of the server environment as well the application itself.
 
-You can [download](http://silverstripe.org/download) SilverStripe as an archive or from [version control](from-source).
+<div markdown='1' style="float: right; margin-left: 20px">
+![](../_images/composer.png)
+</div>
 
-If you already have an installed version of SilverStripe, please see our [upgrading](upgrading) guide.
+## Getting the code
 
-## Linux/Unix
+The best way to get SilverStripe is with [Composer](composer). Composer is a package management tool for PHP that
+lets you install and upgrade SilverStripe and its modules.  Although installing Composer is one extra step, it will give you much more flexibility than just downloading the file from silverstripe.org.
+
+Other ways to get SilverStripe:
+
+ * If you just want to get the code as quickly as possible, you can [download SilverStripe from our website](http://silverstripe.org/download).
+ * If you like doing things yourself, you can [download SilverStripe from source](from-source) manually.
+ * If you already have an installed version of SilverStripe, and you haven't used Composer to get it, please see our [upgrading](upgrading) guide.  Note that [Composer](composer) provides its own tools for upgrading.
+
+## Setting up a server
+
+### Linux/Unix
+
+To run SilverStripe on Linux/Unix, set up one of the following web servers: 
 
 *  [Install using Apache](webserver) - our preferred platform
 *  [Install using Lighttpd](lighttpd) - fast, but a bit tricker to get going
 *  [Install using Nginx](nginx) - Super fast at serving static files. Great for large traffic sites.
 
-## Windows
+### Windows
 
-We recommend that you use the free [Microsoft Web Platform installer](windows-pi).  
+The most straightforward way to get SilverStripe running on Windows is with the [Microsoft Web Platform installer](windows-pi).  You can skip the "getting the code" step.
-The more technically inclined can [install using IIS](windows-manual-iis) or [install using Apache/WAMP](windows-wamp).
 
-## Mac OS X
+For more flexibility, you can set up either of the following web servers, and use Composer to get the code:
 
-Mac OS X comes with a built-in webserver, but you can also use MAMP [install using MAMP](mac-osx) or using MacPorts.
+ * [Install using IIS](windows-manual-iis)
+ * [Install using Apache/WAMP](windows-wamp)
+
+### Mac OS X
+
+Mac OS X comes with a built-in webserver, but there are a number of other options:
+
+ * [Install using MAMP](mac-osx)
+ * Install using the built-in webserver (no docs yet)
+ * Install using MacPorts (no docs yet)
 
 ## Troubleshooting
 

docs/en/reference/complextablefield.md

@@ -3,7 +3,7 @@
 ## Introduction
 
 <div class="warning" markdown="1">
-	This field is deprecated in favour of the new [GridField](/topics/grid-field) API.
+	This field is deprecated in favour of the new [GridField](/reference/grid-field) API.
 </div>
 
 Shows a group of DataObjects as a (readonly) tabular list (similiar to `[api:TableListField]`.)

docs/en/reference/form-field-types.md

@@ -59,7 +59,7 @@ doesn't necessarily have any visible styling.
  * `[api:TableField]`: In-place editing of tabular data.
  * `[api:TreeDropdownField]`: Dropdown-like field that allows you to select an item from a hierarchical AJAX-expandable tree.
  * `[api:TreeMultiselectField]`: Represents many-many joins using a tree selector shown in a dropdown-like element
- * `[api:GridField](/topics/grid-field)`: Displays a `[api:SS_List]` in a tabular format. Versatile base class which can be configured to allow editing, sorting, etc.
+ * `[api:GridField](/reference/grid-field)`: Displays a `[api:SS_List]` in a tabular format. Versatile base class which can be configured to allow editing, sorting, etc.
  * `[api:ListboxField]`: Multi-line listbox field, through `<select multiple>`.
 
 

docs/en/reference/index.md

@@ -5,6 +5,7 @@ Reference articles complement our auto-generated [API docs](http://api.silverstr
 * [Advanced templates](advanced-templates): Advanced SilverStripe template syntax
 * [BBCode](bbcode): Extensible shortcode syntax
 * [ComplexTableField](complextablefield): Manage records and their relations inside the CMS
+* [GridField](grid-field): The GridField is a flexible form field for creating tables of data.
 * [Database Structure](database-structure): Conventions and best practices for database tables and fields
 * [DataObject](dataobject): Base class for database records
 * [DataExtension](dataextension): A "mixin" system allowing to extend core classes

docs/en/reference/modeladmin.md

@@ -9,7 +9,7 @@ It uses the framework's knowledge about the model to provide sensible defaults,
 allowing you to get started in a couple of lines of code,
 while still providing a solid base for customization.
 
-The interface is mainly powered by the `[GridField](/topics/grid-field)` class,
+The interface is mainly powered by the `[GridField](/reference/grid-field)` class,
 which can also be used in other CMS areas (e.g. to manage a relation on a `SiteTree`
 record in the standard CMS interface).
 
@@ -69,7 +69,7 @@ for the search form, override `[api:DataObject->getCustomSearchContext()]` on yo
 
 ## Result Columns
 
-The results are shown in a tabular listing, powered by the `[GridField](/topics/grid-field)`,
+The results are shown in a tabular listing, powered by the `[GridField](/reference/grid-field)`,
 more specifically the `[api:GridFieldDataColumns]` component.
 It looks for a `[api:DataObject::$summary_fields]` static on your model class,
 where you can add or remove columns, or change their title.
@@ -136,7 +136,7 @@ Has-one relationships are simply implemented as a `[api:DropdownField]` by defau
 Consider replacing it with a more powerful interface in case you have many records
 (through customizing `[api:DataObject->getCMSFields]`).
 
-Has-many and many-many relationships are usually handled via the `[GridField](/topics/grid-field)` class,
+Has-many and many-many relationships are usually handled via the `[GridField](/reference/grid-field)` class,
 more specifically the `[api:GridFieldAddExistingAutocompleter]` and `[api:GridFieldRelationDelete]` components.
 They provide a list/detail interface within a single record edited in your ModelAdmin.
 
@@ -217,7 +217,7 @@ For an introduction how to customize the CMS templates, see our [CMS Architectur
 
 ## Related
 
-* [/topics/grid-field](GridField): The UI component powering ModelAdmin
+* [/reference/grid-field](GridField): The UI component powering ModelAdmin
 * [/tutorials/5-dataobject-relationship-management](Tutorial 5: Dataobject Relationship Management)
 *  `[api:SearchContext]`
 * [genericviews Module](http://silverstripe.org/generic-views-module)

docs/en/reference/tablelistfield.md

@@ -3,7 +3,7 @@
 ## Introduction
 
 <div class="warning" markdown="1">
-	This field is deprecated in favour of the new [GridField](/topics/grid-field) API.
+	This field is deprecated in favour of the new [GridField](/reference/grid-field) API.
 </div>
 
 Form field that embeds a list of `[api:DataObject]`s into a form, such as a member list or a file list.

docs/en/topics/forms.md

@@ -1,32 +1,98 @@
 # Forms
 
-## Introduction
+HTML forms are in practice the most used way to communicate with a browser. SilverStripe provides classes to generate 
+and handle the actions and data from a form.
+
+## Overview
+
+A fully implemented form in SilverStripe includes a couple of classes that individually have separate concerns.
+
+ * Controller - Takes care of assemble the form and recieving data from it.
+ * Form - Holds sets of fields, actions and validators.
+ * FormField  - Fields that recieves data or displays them, e.g input fields.
+ * FormActions - Often submit buttons that executes actions.
+ * Validators - Validates the whole form, see [Form validation](form-validation.md) topic for more information.
+
+Depending on your needs you can customize and override any of the above classes, however the defaults are often 
+sufficient.
+
+## The Controller
+
+Forms start at the controller. Here is an simple example on how to set up a form in a controller.
+
+**Page.php**
+
+	:::php
+	class Page_Controller extends ContentController {
+		
+		public static $allowed_actions = array(
+			'HelloForm',
+		);
+		
+		// Template method
+		public function HelloForm() {
+			$fields = new FieldList();
+			$actions = new FieldList(
+				FormAction::create("doSayHello")->setTitle("Say hello")
+			);
+			$form = new Form($this, 'HelloForm', $fields, $actions);
+			// Load the form with previously sent data
+			$form->loadDataFrom($this->request->postVars());
+			return $form;
+		}
+		
+		public function doSayHello(array $data, Form $form) {
+			// Do something with $data
+			return $this->render();
+		}
+	}
+	
+**Page.ss**
+
+	:::ss
+	<!-- place where you would like the form to show up -->
+	<div>$HelloForm</div>
+
+<div class="warning" markdown='1'>
+	Be sure to add the Form name 'HelloForm' to the Controller::$allowed_actions() to be sure that form submissions 
+	get through to the correct action. 
+</div>
+
+<div class="notice" markdown='1'>
+You'll notice that we've used a new notation for creating form fields, using `create()` instead of the `new` operator. 
+These are functionally equivalent, but allows PHP to chain operations like `setTitle()` without assigning the field 
+instance to a temporary variable. For in-depth information on the create syntax, see the [Injector](/reference/injector) 
+documentation or the API documentation for `[api:Object]`::create().
+</div>
+
+## The Form
 
 Form is the base class of all forms in a SilverStripe application. Forms in your application can be created either by
 instantiating the Form class itself, or by subclassing it. 
 
-## Instantiating a form
+### Instantiating a form
 
-Creating a form is a matter of defining a method to represent that form.  This method should return a form object.  The
+Creating a form is a matter of defining a method to represent that form. This method should return a form object. The
 constructor takes the following arguments:
 
-*  `$controller`: This must be the controller that contains the form.
+*  `$controller`: This must be and instance of the controller that contains the form, often `$this`.
 *  `$name`: This must be the name of the method on that controller that is called to return the form.  The first two
 fields allow the form object to be re-created after submission.  **It's vital that they are properly set - if you ever
 have problems with form action handler not working, check that these values are correct.**
 *  `$fields`: A `[api:FieldList]` containing `[api:FormField]` instances make up fields in the form.
 *  `$actions`: A `[api:FieldList]` containing the `[api:FormAction]` objects - the buttons at the bottom.
-*  `$validator`: An optional `[api:Validator]` for more information.
+*  `$validator`: An optional `[api:Validator]` for validation of the form.
 
 Example: 
 
 	:::php
+	// Controller action
 	public function MyCustomForm() {
 		$fields = new FieldList(
-			new EmailField("Email"),
+			EmailField::create("Email"),
-			new EncryptField("Password")
+			PasswordField::create("Password")
 		);
-		$actions = new FieldList(new FormAction("login", "Log in"));
+		$actions = new FieldList(FormAction::create("login")->setTitle("Log in"));
 		return new Form($this, "MyCustomForm", $fields, $actions);
 	}
 
@@ -45,44 +111,75 @@ $name must be passed - their values depend on where the form is instantiated.
 	class MyForm extends Form {
 		public function __construct($controller, $name) {
 			$fields = new FieldList(
-				new EmailField("Email"),
+				EmailField::create("Email"),
-				new EncryptedField("Password")
+				PasswordField::create("Password")
 			);
-			$actions = new FieldList(new FormAction("login", "Log in"));
+			$actions = new FieldList(FormAction::create("login")->setTitle("Log in"));
 			
 			parent::__construct($controller, $name, $fields, $actions);
 		}
 	}
 
 
-The real difference, however, is that you can then define your controller methods within the form class itself.
+The real difference, however, is that you can then define your controller methods within the form class itself. This 
+means that the form takes responsibilities from the controller and manage how to parse and use the form 
+data.
 
+**Page.php**
 
-## Form Field Types
+	:::php
+	class Page_Controller extends ContentController {
+		
+		public static $allowed_actions = array(
+			'HelloForm',
+		);
+		
+		// Template method
+		public function HelloForm() {
+			return new MyForm($this, 'MyCustomForm');
+		}
+	}
 
-There are many classes extending `[api:FormField]`,
+**MyForm.php**
-there's a full overview at [form-field-types](/reference/form-field-types)
+
+	:::php
+	class MyForm extends Form {
+	
+		public function __construct($controller, $name) {
+			$fields = new FieldList(
+				EmailField::create("Email"),
+				PasswordField::create("Password")
+			);
+			$actions = new FieldList(FormAction::create("login")->setTitle("Log in"));
+			
+			parent::__construct($controller, $name, $fields, $actions);
+		}
+		
+		public function login(array $data, Form $form) {
+			// Authenticate the user and redirect the user somewhere
+			Controller::curr()->redirectBack();
+		}
+	}
+
+## The FormField classes
+
+There are many classes extending `[api:FormField]`. There is a full overview at 
+[form field types](/reference/form-field-types).
 
 
 ### Using Form Fields
 
-To get these fields automatically rendered into a form element, 
+To get these fields automatically rendered into a form element, all you need to do is create a new instance of the
-all you need to do is create a new instance of the
+class, and add it to the fieldlist of the form.
-class, and add it to the fieldlist of the form. 
 
 	:::php
 	$form = new Form(
 		$this, // controller
 		"SignupForm", // form name
 		new FieldList( // fields
-			TextField::create("FirstName")
+			TextField::create("FirstName")->setTitle('First name'),
-				->setTitle('First name'),
+			TextField::create("Surname")->setTitle('Last name')->setMaxLength(50),
-			TextField::create("Surname")
+			EmailField::create("Email")->setTitle("Email address")->setAttribute('type', 'email')
-				->setTitle('Last name')
-				->setMaxLength(50),
-			EmailField::create("Email")
-				->setTitle("Email address")
-				->setAttribute('type', 'email')
 		), 
 		new FieldList( // actions
 			FormAction::create("signup")->setTitle("Sign up")
@@ -92,13 +189,11 @@ class, and add it to the fieldlist of the form.
 		)
 	);
 
-You'll notice that we've used a new notation for creating form fields,
-using `create()` instead of the `new` operator. These are functionally equivalent,
-but allows PHP to chain operations like `setTitle()` without assigning
-the field instance to a temporary variable.
-
 ##  Readonly
 
+You can turn a form or individual fields into a readonly version. This is handy in the case of confirmation pages or 
+when certain fields can be edited due to permissions.
+
 Readonly on a Form
 
 	:::php
@@ -131,96 +226,102 @@ First of all, you need to create your form on it's own class, that way you can d
 	:::php
 	class MyForm extends Form {
 	
-		 public function __construct($controller, $name) {
+		public function __construct($controller, $name) {
-				$fields = new FieldList(
+			$fields = new FieldList(
-					 new TextField('FirstName', 'First name'),
+				EmailField::create("Email"),
-					 new EmailField('Email', 'Email address')
+				PasswordField::create("Password")
-				);
+			);
-	
+			$actions = new FieldList(FormAction::create("login")->setTitle("Log in"));
-				$actions = new FieldList(
+			parent::__construct($controller, $name, $fields, $actions);
-					 new FormAction('submit', 'Submit')
+		}
-				);
+		
-	
+		public function login(array $data, Form $form) {
-				parent::__construct($controller, $name, $fields, $actions);
+			// Do something with $data
-		 }
+			Controller::curr()->redirectBack();
-	
+		}
-		 public function forTemplate() {
+		
-				return $this->renderWith(array(
+		public function forTemplate() {
-					 $this->class,
+			return $this->renderWith(array($this->class, 'Form'));
-					 'Form'
+		}
-				));
-		 }
-	
-		 public function submit($data, $form) {
-				// do stuff here
-		 }
-	
 	}
-
+	
-`forTemplate()` tells the `[api:Form]` class to render with a template of return value of `$this->class`, which in this case
+`MyForm->forTemplate()` tells the `[api:Form]` class to render with a template of return value of `$this->class`, which in this case
-is *MyForm*, the name of the class. If the template doesn't exist, then it falls back to using Form.ss.
+is *MyForm*. If the template doesn't exist, then it falls back to using Form.ss.
 
 *MyForm.ss* should then be placed into your *templates/Includes* directory for your project. Here is an example of
 basic customisation:
 
 	:::ss
 	<form $FormAttributes>
-		 <% if Message %>
+		<% if Message %>
-				<p id="{$FormName}_error" class="message $MessageType">$Message</p>
+			<p id="{$FormName}_error" class="message $MessageType">$Message</p>
-		 <% else %>
+		<% else %>
-				<p id="{$FormName}_error" class="message $MessageType" style="display: none"></p>
+			<p id="{$FormName}_error" class="message $MessageType" style="display: none"></p>
-		 <% end_if %>
+		<% end_if %>
-		 
+		
-		 <fieldset>
+		<fieldset>
-				<div id="FirstName" class="field text">
+			<div id="Email" class="field email">
-					 <label class="left" for="{$FormName}_FirstName">First name</label>
+				<label class="left" for="{$FormName}_Email">Email</label>
-					 $dataFieldByName(FirstName)
+				$Fields.dataFieldByName(Email)
-				</div>
+			</div>
-	
+			
-				<div id="Email" class="field email">
+			<div id="Email" class="field password">
-					 <label class="left" for="{$FormName}_Email">Email</label>
+				<label class="left" for="{$FormName}_Password">Password</label>
-					 $dataFieldByName(Email)
+				$Fields.dataFieldByName(Password)
-				</div>
+			</div>
-	
+			
-				$dataFieldByName(SecurityID)
+			$Fields.dataFieldByName(SecurityID)
-		 </fieldset>
+		</fieldset>
-	
+		
-		 <% if Actions %>
+		<% if Actions %>
-				<div class="Actions">
+		<div class="Actions">
-					 <% loop Actions %>$Field<% end_loop %>
+			<% loop Actions %>$Field<% end_loop %>
-				</div>
+		</div>
-		 <% end_if %>
+		<% end_if %>
 	</form>
 
- `$dataFieldByName(FirstName)` will return the form control contents of `Field()` for the particular field object, in
+`$Fields.dataFieldByName(FirstName)` will return the form control contents of `Field()` for the particular field object,
-this case `TextField->Field()` or `EmailField->Field()` which returns an `<input>` element with specific markup
+in this case `EmailField->Field()` or `PasswordField->Field()` which returns an `<input>` element with specific markup 
-for the type of field. Pass in the name of the field as the first parameter, as done above, to render it into the
+for the type of field. Pass in the name of the field as the first parameter, as done above, to render it into the 
 template.
 
-To find more methods, have a look at the `[api:Form]` class, as there is a lot of different methods of customising the form
+To find more methods, have a look at the `[api:Form]` class and `[api:FieldList]` class as there is a lot of different 
-templates, for example, you could use `<% loop Fields %>` instead of specifying each field manually, as we've done
+methods of customising the form templates. An example is that you could use `<% loop Fields %>` instead of specifying 
-above.
+each field manually, as we've done above.
 
 ### Custom form field templates
 
 The easiest way to customize form fields is adding CSS classes and additional attributes.
 
 	:::php
-	$field = new TextField('MyText');
+	$field = TextField::create('MyText')
-	$field->addExtraClass('largeText');
+		->addExtraClass('largeText');
-	$field->setAttribute('data-validation-regex', '[\d]*');
+		->setAttribute('data-validation-regex', '[\d]*');
 
-	// Field() renders as:
+Will be rendered as:
-	// <input type="text" class="largeText" id="Form_Form_TextField" name="TextField" data-validation-regex="[\d]*">
 
-Each form field is rendered into a form via the `[FieldHolder()](api:FormField->FieldHolder())` method,
+	:::html
-which includes a container `<div>` as well as a `<label>` element (if applicable).
+	<input type="text" name="MyText" class="text largeText" id="MyForm_MyCustomForm_MyText" data-validation-regex="[\d]*">
-You can also render each field without these structural elements through the `[Field()](api:FormField->Field())` method.
+
-In order to influence the form rendering, overloading these two methods is a good start.
+Each form field is rendered into a form via the `[FormField->FieldHolder()](api:FormField)` method, which includes 
+a container `<div>` as well as a `<label>` element (if applicable).
+
+You can also render each field without these structural elements through the `[FormField->Field()](api:FormField)` 
+method. In order to influence the form rendering, overloading these two methods is a good start.
+
+In addition, most form fields are rendered through SilverStripe templates, e.g. `TextareaField` is rendered via 
+`framework/templates/forms/TextareaField.ss`.
 
-In addition, most form fields are rendered through SilverStripe templates, e.g. `TextareaField` is rendered via `framework/templates/forms/TextareaField.ss`.
 These templates can be overwritten globally by placing a template with the same name in your `mysite` directory,
-or set on a form field instance via `[setTemplate()](api:FormField->setTemplate())` and `[setFieldHolderTemplate()](api:FormField->setFieldHolderTemplate())`.
+or set on a form field instance via anyone of these methods:
+
+ - FormField->setTemplate()
+ - FormField->setFieldHolderTemplate()
+ - FormField->getSmallFieldHolderTemplate()
+ 
+<div class="hint" markdown='1'>
+	Caution: Not all FormFields consistently uses templates set by the above methods.
+</div>
 
 ### Securing forms against Cross-Site Request Forgery (CSRF)
 
@@ -237,10 +338,10 @@ If you want to remove certain fields from your subclass:
 			parent::__construct($controller, $name);
 			
 			// remove a normal field
-			$this->fields->removeByName('MyFieldName');
+			$this->Fields()->removeByName('MyFieldName');
 			
 			// remove a field from a tab
-			$this->fields->removeFieldFromTab('TabName', 'MyFieldName');
+			$this->Fields()->removeFieldFromTab('TabName', 'MyFieldName');
 		}
 	}
 
@@ -250,9 +351,7 @@ If you want to remove certain fields from your subclass:
 Adds a new text field called FavouriteColour next to the Content field in the CMS
 
 	:::php
-	$fields->addFieldToTab('Root.Content', new TextField('FavouriteColour'), 'Content');
+	$this->Fields()->addFieldToTab('Root.Content', new TextField('FavouriteColour'), 'Content');
-
-
 
 ## Related
 

docs/en/topics/index.md

@@ -18,7 +18,6 @@ It is where most documentation should live, and is the natural "second step" aft
  * [Files and Images](files): File and Image management in the database and how to manipulate images
  * [Form Validation](form-validation): Built-in validation on form fields, and how to extend it
  * [Forms](forms): Create your own form, add fields and create your own form template using the existing `Form` class
- * [GridField](grid-field): The GridField is a flexible form field for creating tables of data.
  * [Internationalization (i18n)](i18n): Displaying templates and PHP code in different languages using i18n
  * [Javascript](javascript): Best practices for developing with JavaScript in SilverStripe
  * [Module Development](module-development): Creating a module (also known as "extension" or "plugin") to contain reusable functionality

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

@@ -114,7 +114,7 @@ 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)`.
+We do this through a powerful field called `[GridField](/reference/grid-field)`.
 All customization to fields for a page type are managed through a method called
 `getCMSFields()`, so let's add it there:
 

filesystem/FileNameFilter.php

@@ -41,7 +41,7 @@ class FileNameFilter extends Object {
 		'/_/' => '-', // underscores to dashes
 		'/[^A-Za-z0-9+.-]+/' => '', // remove non-ASCII chars, only allow alphanumeric plus dash and dot
 		'/[\-]{2,}/' => '-', // remove duplicate dashes
-		'/^[\.\-_]/' => '', // Remove all leading dots, dashes or underscores
+		'/^[\.\-_]+/' => '', // Remove all leading dots, dashes or underscores
 	);
 	
 	/**

forms/FormField.php

@@ -321,9 +321,9 @@ class FormField extends RequestHandler {
 	 * @param $class String
 	 */
 	public function removeExtraClass($class) {
-		if(isset($this->extraClasses) && array_key_exists($class, $this->extraClasses)) {
+		$pos = array_search($class, $this->extraClasses);
-			unset($this->extraClasses[$class]);
+		if($pos !== false) unset($this->extraClasses[$pos]);
-		}
+
 		return $this;
 	}
 

forms/TabSet.php

@@ -108,7 +108,7 @@ class TabSet extends CompositeField {
 			$this->attributes,
 			array(
 				'id' => $this->id(),
-				'class' => 'ss-tabset ' . $this->extraClass()
+				'class' => $this->extraClass()
 			)
 		);
 	}

forms/gridfield/GridFieldDetailForm.php

@@ -340,7 +340,7 @@ class GridFieldDetailForm_ItemRequest extends RequestHandler {
 			$form->setAttribute('data-pjax-fragment', 'CurrentForm Content');
 			if($form->Fields()->hasTabset()) {
 				$form->Fields()->findOrMakeTab('Root')->setTemplate('CMSTabSet');
-				$form->addExtraClass('ss-tabset cms-tabset');
+				$form->addExtraClass('cms-tabset');
 			}
 
 			$form->Backlink = $this->getBackLink();

javascript/UploadField.js

@@ -156,10 +156,10 @@
 						acceptFileTypes: new RegExp(config.acceptFileTypes, 'i')
 					}
 				));
+
 				if (this.data('fileupload')._isXHRUpload({multipart: true})) {
 					$('.ss-uploadfield-item-uploador').show();
-					dropZone.show(); // drag&drop avaliable
+					dropZone.hide().show();
-					
 				}
 
 				

lang/af.yml

@@ -1,7 +1,6 @@
 af:
   AssetAdmin:
-    ADDFILES: 'Add files'
+    ALLOWEDEXTS: 'Allowed extensions'
-    EditOrgMenu: 'Edit & organize'
     NEWFOLDER: NewFolder
   AssetTableField:
     CREATED: 'First uploaded'
@@ -21,7 +20,7 @@ af:
     EDITALL: 'Edit all'
     EDITANDORGANIZE: 'Edit & organize'
     EDITINFO: 'Edit files'
-    FILES: Lêers
+    FILES: Files
     FROMCOMPUTER: 'Choose files from your computer'
     FROMCOMPUTERINFO: 'Upload from your computer'
     TOTAL: Total
@@ -72,9 +71,9 @@ af:
     ACCESSALLINTERFACESHELP: 'Overrules more specific access settings.'
     SAVE: Save
   CMSProfileController:
-    MENUTITLE: CMSProfileController
+    MENUTITLE: 'My Profile'
   ChangePasswordEmail.ss:
-    CHANGEPASSWORDTEXT1: 'You changed your password for'
+    CHANGEPASSWORDTEXT1: 'U het die wagwoord vir'
     CHANGEPASSWORDTEXT2: 'You can now use the following credentials to log in:'
     EMAIL: Email
     HELLO: Hi
@@ -87,7 +86,7 @@ af:
     SUCCESSADD2: 'Added {name}'
     SUCCESSEDIT: 'Saved %s %s %s'
   ComplexTableField.ss:
-    ADDITEM: 'Add %s'
+    ADDITEM: 'Byvoeg %s'
     NOITEMSFOUND: 'No items found'
     SORTASC: 'Sort ascending'
     SORTDESC: 'Sort descending'
@@ -195,9 +194,9 @@ af:
     SINGULARNAME: Folder
   ForgotPasswordEmail.ss:
     HELLO: Hi
-    TEXT1: 'Here is your'
+    TEXT1: 'Hier is u'
-    TEXT2: 'password reset link'
+    TEXT2: 'wagwoord herstel skakel'
-    TEXT3: for
+    TEXT3: vir
   Form:
     FIELDISREQUIRED: '%s word benodig.'
     SubmitBtnLabel: Go
@@ -258,7 +257,7 @@ af:
     many_many_Members: Lidde
   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>'
+    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'
     ResultUpdated: 'Updated %d groups'
@@ -348,6 +347,7 @@ af:
     BUTTONLOGIN: 'Log in'
     BUTTONLOGINOTHER: 'Log in as someone else'
     BUTTONLOSTPASSWORD: 'I''ve lost my password'
+    CANTEDIT: 'You don''t have permission to do that'
     CONFIRMNEWPASSWORD: 'Bevestig Nuwe Wagwoord'
     CONFIRMPASSWORD: 'Bevestig wagwoord'
     DATEFORMAT: 'Date format'
@@ -367,7 +367,6 @@ af:
     NEWPASSWORD: 'Nuwe wagwoord'
     PASSWORD: Password
     PLURALNAME: Lidde
-    PROFILESAVESUCCESS: 'Successfully saved.'
     REMEMBERME: 'Remember me next time?'
     SINGULARNAME: Lid
     SUBJECTPASSWORDCHANGED: 'U wagwoord het verander.'
@@ -410,7 +409,7 @@ af:
     TWODIGITYEAR: 'Two-digit year'
   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>'
+    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: 'Het %d lede verwyder'
     ResultNone: 'Geen veranderinge'
@@ -422,6 +421,7 @@ af:
   ModelAdmin:
     DELETE: Delete
     DELETEDRECORDS: 'Deleted {count} records.'
+    EMPTYBEFOREIMPORT: 'Clear Database before import'
     IMPORT: 'Import from CSV'
     IMPORTEDRECORDS: 'Imported {count} records.'
     NOCSVFILE: 'Please browse for a CSV file to import'
@@ -472,10 +472,11 @@ af:
     SINGULARNAME: 'Permission Role Code'
   Permissions:
     PERMISSIONS_CATEGORY: 'Rolle en toegang permissies'
+    UserPermissionsIntro: 'Assigning groups to this user will adjust the permissions they have. See the groups section for details of permissions on individual groups.'
   PhoneNumberField:
     VALIDATION: 'Please enter a valid phone number'
   RelationComplexTableField.ss:
-    ADD: Add
+    ADD: 'Voeg by'
     CSVEXPORT: 'Export to CSV'
     NOTFOUND: 'No items found'
   Security:
@@ -522,12 +523,12 @@ af:
   TableField:
     ISREQUIRED: 'In %s ''%s'' is required'
   TableField.ss:
-    ADD: 'Add a new row'
+    ADD: 'Voeg nuwe ry by'
     ADDITEM: 'Add %s'
   TableListField:
     CSVEXPORT: 'Export to CSV'
     PRINT: Druk
-    Print: Druk
+    Print: Print
     SELECT: 'Select:'
   TableListField.ss:
     NOITEMSFOUND: 'No items found'
@@ -549,7 +550,7 @@ af:
   UploadField:
     ATTACHFILE: 'Attach a file'
     ATTACHFILES: 'Attach files'
-    AttachFile: 'Attach a file'
+    AttachFile: 'Attach file(s)'
     DELETE: 'Delete from files'
     DELETEINFO: 'Permanently delete this file from the file store'
     DOEDIT: Save

lang/ar.yml

@@ -1,7 +1,6 @@
 ar:
   AssetAdmin:
-    ADDFILES: 'Add files'
+    ALLOWEDEXTS: 'Allowed extensions'
-    EditOrgMenu: 'Edit & organize'
     NEWFOLDER: 'مجلد جديد'
   AssetTableField:
     CREATED: 'أول المرفوعات'
@@ -21,7 +20,7 @@ ar:
     EDITALL: 'Edit all'
     EDITANDORGANIZE: 'Edit & organize'
     EDITINFO: 'Edit files'
-    FILES: الملفات
+    FILES: Files
     FROMCOMPUTER: 'Choose files from your computer'
     FROMCOMPUTERINFO: 'Upload from your computer'
     TOTAL: Total
@@ -60,9 +59,9 @@ ar:
     ERRORNOTADMIN: 'هذا المستخدم لا يملك صلاحيات الإدارة'
     ERRORNOTREC: 'اسم المستخدم أو الرقم السري غير صحيح'
   Boolean:
-    0: 'False'
+    0: لا
     ANY: أي
-    1: 'True'
+    1: نعم
   CMSLoadingScreen.ss:
     LOADING: Loading...
     REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
@@ -72,28 +71,28 @@ ar:
     ACCESSALLINTERFACESHELP: 'ينقض أكثر من توصيف الوصول المحدد'
     SAVE: حفظ
   CMSProfileController:
-    MENUTITLE: CMSProfileController
+    MENUTITLE: 'My Profile'
   ChangePasswordEmail.ss:
-    CHANGEPASSWORDTEXT1: 'You changed your password for'
+    CHANGEPASSWORDTEXT1: 'تم تغيير كلمة المرور لـ'
-    CHANGEPASSWORDTEXT2: 'You can now use the following credentials to log in:'
+    CHANGEPASSWORDTEXT2: 'يمكنك الآن استخدام هذه البيانات للدخول إلى حسابك'
     EMAIL: 'البريد الإلكتروني'
-    HELLO: Hi
+    HELLO: أهلاً
     PASSWORD: 'الرقم السري'
   CheckboxField:
-    - 'False'
+    - لا
-    - 'True'
+    - نعم
   ComplexTableField:
     CLOSEPOPUP: 'إغلاق النافذة'
     SUCCESSADD2: 'Added {name}'
     SUCCESSEDIT: 'حفظ %s %s %s'
   ComplexTableField.ss:
-    ADDITEM: 'Add %s'
+    ADDITEM: أضف
     NOITEMSFOUND: 'No items found'
-    SORTASC: 'Sort ascending'
+    SORTASC: 'ترتيب تصاعدي'
-    SORTDESC: 'Sort descending'
+    SORTDESC: 'ترتيب تنازلي'
   ComplexTableField_popup.ss:
-    NEXT: Next
+    NEXT: التالي
-    PREVIOUS: Previous
+    PREVIOUS: السابق
   ConfirmedPasswordField:
     ATLEAST: 'Passwords must be at least {min} characters long.'
     BETWEEN: 'Passwords must be {min} to {max} characters long.'
@@ -194,10 +193,10 @@ ar:
     PLURALNAME: Folders
     SINGULARNAME: Folder
   ForgotPasswordEmail.ss:
-    HELLO: Hi
+    HELLO: أهلاً
-    TEXT1: 'Here is your'
+    TEXT1: هنا
-    TEXT2: 'password reset link'
+    TEXT2: 'رابط إعادة تعيين كلمة المرور'
-    TEXT3: for
+    TEXT3: لـ
   Form:
     FIELDISREQUIRED: '%s مطلوب'
     SubmitBtnLabel: Go
@@ -234,7 +233,7 @@ ar:
   GridFieldDetailForm:
     CancelBtn: Cancel
     Create: Create
-    Delete: حذف
+    Delete: Delete
     DeletePermissionsFailure: 'No delete permissions'
     Deleted: 'Deleted %s %s'
     Save: Save
@@ -258,7 +257,7 @@ ar:
     many_many_Members: الأعضاء
   GroupImportForm:
     Help1: '<p>استيراد واحد أو أكثر من المجموعات في <em>CSV</em>تهيئة (قيم مفصولة بفواصل) <small><ahref="#" class="toggle-advanced">إظهار استخدام المتقدم</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>'
+    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: 'حذف مجموعات %d'
     ResultUpdated: 'تحديث مجموعات %d '
@@ -318,7 +317,7 @@ ar:
     PLURALNAME: Files
     SINGULARNAME: File
   Image_iframe.ss:
-    TITLE: 'Image Uploading Iframe'
+    TITLE: 'إطار تحميل الصور'
   LeftAndMain:
     CANT_REORGANISE: 'You do not have permission to alter Top level pages. Your change was not saved.'
     DELETED: Deleted.
@@ -348,6 +347,7 @@ ar:
     BUTTONLOGIN: دخول
     BUTTONLOGINOTHER: 'الدخول بحساب آخر'
     BUTTONLOSTPASSWORD: 'فقدت كلمة المرور'
+    CANTEDIT: 'You don''t have permission to do that'
     CONFIRMNEWPASSWORD: 'تأكيد رقم المرور الجديد'
     CONFIRMPASSWORD: 'تأكيد رقم المرور'
     DATEFORMAT: 'Date format'
@@ -367,7 +367,6 @@ ar:
     NEWPASSWORD: 'رقم المرور الجديد'
     PASSWORD: 'رقم المرور'
     PLURALNAME: الأعضاء
-    PROFILESAVESUCCESS: 'تم الحفظ بنجاح'
     REMEMBERME: 'تذكرني في المرة القادمة ؟'
     SINGULARNAME: العضو
     SUBJECTPASSWORDCHANGED: 'تم تغيير كلمة المرور'
@@ -410,7 +409,7 @@ ar:
     TWODIGITYEAR: 'Two-digit year'
   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>'
+    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: 'حذف %d أعضاء'
     ResultNone: 'بدون تغيير'
@@ -422,6 +421,7 @@ ar:
   ModelAdmin:
     DELETE: حذف
     DELETEDRECORDS: 'Deleted {count} records.'
+    EMPTYBEFOREIMPORT: 'Clear Database before import'
     IMPORT: 'استيراد من CSV'
     IMPORTEDRECORDS: 'Imported {count} records.'
     NOCSVFILE: 'فضلاً استعرض ملف CSV للاستيراد'
@@ -472,10 +472,11 @@ ar:
     SINGULARNAME: 'Permission Role Code'
   Permissions:
     PERMISSIONS_CATEGORY: 'تصاريح القاعدة والوصول'
+    UserPermissionsIntro: 'Assigning groups to this user will adjust the permissions they have. See the groups section for details of permissions on individual groups.'
   PhoneNumberField:
     VALIDATION: 'فضلاً أدخل رقم هاتف صحيح'
   RelationComplexTableField.ss:
-    ADD: Add
+    ADD: إضافة
     CSVEXPORT: 'Export to CSV'
     NOTFOUND: 'No items found'
   Security:
@@ -522,12 +523,12 @@ ar:
   TableField:
     ISREQUIRED: 'In %s ''%s'' is required'
   TableField.ss:
-    ADD: 'Add a new row'
+    ADD: 'إضافة صف جديد'
     ADDITEM: 'Add %s'
   TableListField:
     CSVEXPORT: 'تصدير إلى CSV'
     PRINT: طباعة
-    Print: طباعة
+    Print: Print
     SELECT: اختيار
   TableListField.ss:
     NOITEMSFOUND: 'No items found'
@@ -549,7 +550,7 @@ ar:
   UploadField:
     ATTACHFILE: 'Attach a file'
     ATTACHFILES: 'Attach files'
-    AttachFile: 'Attach a file'
+    AttachFile: 'Attach file(s)'
     DELETE: 'Delete from files'
     DELETEINFO: 'Permanently delete this file from the file store'
     DOEDIT: Save

lang/ast.yml

@@ -1,7 +1,6 @@
 ast:
   AssetAdmin:
-    ADDFILES: 'Add files'
+    ALLOWEDEXTS: 'Allowed extensions'
-    EditOrgMenu: 'Edit & organize'
     NEWFOLDER: NewFolder
   AssetTableField:
     CREATED: 'First uploaded'
@@ -21,7 +20,7 @@ ast:
     EDITALL: 'Edit all'
     EDITANDORGANIZE: 'Edit & organize'
     EDITINFO: 'Edit files'
-    FILES: Ficheros
+    FILES: Files
     FROMCOMPUTER: 'Choose files from your computer'
     FROMCOMPUTERINFO: 'Upload from your computer'
     TOTAL: Total
@@ -72,9 +71,9 @@ ast:
     ACCESSALLINTERFACESHELP: 'Overrules more specific access settings.'
     SAVE: Save
   CMSProfileController:
-    MENUTITLE: CMSProfileController
+    MENUTITLE: 'My Profile'
   ChangePasswordEmail.ss:
-    CHANGEPASSWORDTEXT1: 'You changed your password for'
+    CHANGEPASSWORDTEXT1: 'Camudasti la contraseña pa'
     CHANGEPASSWORDTEXT2: 'You can now use the following credentials to log in:'
     EMAIL: Email
     HELLO: Hi
@@ -87,7 +86,7 @@ ast:
     SUCCESSADD2: 'Added {name}'
     SUCCESSEDIT: 'Saved %s %s %s'
   ComplexTableField.ss:
-    ADDITEM: 'Add %s'
+    ADDITEM: 'Amestar %s'
     NOITEMSFOUND: 'No items found'
     SORTASC: 'Sort ascending'
     SORTDESC: 'Sort descending'
@@ -258,7 +257,7 @@ ast:
     many_many_Members: Miembros
   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>'
+    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'
     ResultUpdated: 'Updated %d groups'
@@ -348,6 +347,7 @@ ast:
     BUTTONLOGIN: 'Log in'
     BUTTONLOGINOTHER: 'Log in as someone else'
     BUTTONLOSTPASSWORD: 'I''ve lost my password'
+    CANTEDIT: 'You don''t have permission to do that'
     CONFIRMNEWPASSWORD: 'Confirm New Password'
     CONFIRMPASSWORD: 'Confirm Password'
     DATEFORMAT: 'Date format'
@@ -367,7 +367,6 @@ ast:
     NEWPASSWORD: 'New Password'
     PASSWORD: Password
     PLURALNAME: Miembros
-    PROFILESAVESUCCESS: 'Successfully saved.'
     REMEMBERME: 'Remember me next time?'
     SINGULARNAME: Miembru
     SUBJECTPASSWORDCHANGED: 'Se camudó la to contraseña'
@@ -410,7 +409,7 @@ ast:
     TWODIGITYEAR: 'Two-digit year'
   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>'
+    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'
     ResultNone: 'No changes'
@@ -422,6 +421,7 @@ ast:
   ModelAdmin:
     DELETE: Delete
     DELETEDRECORDS: 'Deleted {count} records.'
+    EMPTYBEFOREIMPORT: 'Clear Database before import'
     IMPORT: 'Import from CSV'
     IMPORTEDRECORDS: 'Imported {count} records.'
     NOCSVFILE: 'Please browse for a CSV file to import'
@@ -472,6 +472,7 @@ ast:
     SINGULARNAME: 'Permission Role Code'
   Permissions:
     PERMISSIONS_CATEGORY: 'Roles and access permissions'
+    UserPermissionsIntro: 'Assigning groups to this user will adjust the permissions they have. See the groups section for details of permissions on individual groups.'
   PhoneNumberField:
     VALIDATION: 'Please enter a valid phone number'
   RelationComplexTableField.ss:
@@ -549,7 +550,7 @@ ast:
   UploadField:
     ATTACHFILE: 'Attach a file'
     ATTACHFILES: 'Attach files'
-    AttachFile: 'Attach a file'
+    AttachFile: 'Attach file(s)'
     DELETE: 'Delete from files'
     DELETEINFO: 'Permanently delete this file from the file store'
     DOEDIT: Save

lang/az.yml

@@ -1,7 +1,6 @@
 az:
   AssetAdmin:
-    ADDFILES: 'Add files'
+    ALLOWEDEXTS: 'Allowed extensions'
-    EditOrgMenu: 'Edit & organize'
     NEWFOLDER: NewFolder
   AssetTableField:
     CREATED: 'First uploaded'
@@ -21,7 +20,7 @@ az:
     EDITALL: 'Edit all'
     EDITANDORGANIZE: 'Edit & organize'
     EDITINFO: 'Edit files'
-    FILES: Fayllar
+    FILES: Files
     FROMCOMPUTER: 'Choose files from your computer'
     FROMCOMPUTERINFO: 'Upload from your computer'
     TOTAL: Total
@@ -60,9 +59,9 @@ az:
     ERRORNOTADMIN: 'İstifadəçi administrator deyil'
     ERRORNOTREC: 'Belə istifadəçi adı və ya parol tanınmadı'
   Boolean:
-    0: 'False'
+    0: Yox
     ANY: İstənilən
-    1: 'True'
+    1: Bəli
   CMSLoadingScreen.ss:
     LOADING: Loading...
     REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
@@ -72,28 +71,28 @@ az:
     ACCESSALLINTERFACESHELP: 'Overrules more specific access settings.'
     SAVE: 'Yadda saxla'
   CMSProfileController:
-    MENUTITLE: CMSProfileController
+    MENUTITLE: 'My Profile'
   ChangePasswordEmail.ss:
-    CHANGEPASSWORDTEXT1: 'You changed your password for'
+    CHANGEPASSWORDTEXT1: 'Siz parolu bu url üçün dəyişdiniz'
-    CHANGEPASSWORDTEXT2: 'You can now use the following credentials to log in:'
+    CHANGEPASSWORDTEXT2: 'Siz aşağıdakilarla daxil ola bilərsiniz.'
     EMAIL: E-poçt
-    HELLO: Hi
+    HELLO: Salam
     PASSWORD: Parol
   CheckboxField:
-    - 'False'
+    - Yox
-    - 'True'
+    - Bəli
   ComplexTableField:
     CLOSEPOPUP: Bağla
     SUCCESSADD2: 'Added {name}'
     SUCCESSEDIT: '%s %s %s yadda saxlanıldı'
   ComplexTableField.ss:
-    ADDITEM: 'Add %s'
+    ADDITEM: '%s əlavə et'
     NOITEMSFOUND: 'No items found'
-    SORTASC: 'Sort ascending'
+    SORTASC: 'Artma ilə sırala'
-    SORTDESC: 'Sort descending'
+    SORTDESC: 'Azalma ilə sırala'
   ComplexTableField_popup.ss:
-    NEXT: Next
+    NEXT: Sonrakı
-    PREVIOUS: Previous
+    PREVIOUS: Əvvəlki
   ConfirmedPasswordField:
     ATLEAST: 'Passwords must be at least {min} characters long.'
     BETWEEN: 'Passwords must be {min} to {max} characters long.'
@@ -194,10 +193,10 @@ az:
     PLURALNAME: Folders
     SINGULARNAME: Folder
   ForgotPasswordEmail.ss:
-    HELLO: Hi
+    HELLO: Salam
-    TEXT1: 'Here is your'
+    TEXT1: 'Burada sizin'
-    TEXT2: 'password reset link'
+    TEXT2: 'parolu sıfırlma linki'
-    TEXT3: for
+    TEXT3: üçün
   Form:
     FIELDISREQUIRED: '%s tələb olunur.'
     SubmitBtnLabel: Go
@@ -258,7 +257,7 @@ az:
     many_many_Members: Üzvlər
   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>'
+    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'
     ResultUpdated: 'Updated %d groups'
@@ -348,6 +347,7 @@ az:
     BUTTONLOGIN: 'Daxil ol'
     BUTTONLOGINOTHER: 'Başqa adla daxil ol'
     BUTTONLOSTPASSWORD: 'Parol yaddan çıxıb.'
+    CANTEDIT: 'You don''t have permission to do that'
     CONFIRMNEWPASSWORD: 'Yeni parolun təsdiqi'
     CONFIRMPASSWORD: 'Parolu təsdiqlə'
     DATEFORMAT: 'Date format'
@@ -367,7 +367,6 @@ az:
     NEWPASSWORD: 'Yeni parol'
     PASSWORD: Parol
     PLURALNAME: Üzvlər
-    PROFILESAVESUCCESS: 'Uğurla yadda saxlanıldı.'
     REMEMBERME: 'Yadda saxla?'
     SINGULARNAME: Üzv
     SUBJECTPASSWORDCHANGED: 'Sizin parolunuz dəyişildi'
@@ -410,7 +409,7 @@ az:
     TWODIGITYEAR: 'Two-digit year'
   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>'
+    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'
     ResultNone: 'No changes'
@@ -422,6 +421,7 @@ az:
   ModelAdmin:
     DELETE: Delete
     DELETEDRECORDS: 'Deleted {count} records.'
+    EMPTYBEFOREIMPORT: 'Clear Database before import'
     IMPORT: 'Import from CSV'
     IMPORTEDRECORDS: 'Imported {count} records.'
     NOCSVFILE: 'Please browse for a CSV file to import'
@@ -472,10 +472,11 @@ az:
     SINGULARNAME: 'Permission Role Code'
   Permissions:
     PERMISSIONS_CATEGORY: İcazələr
+    UserPermissionsIntro: 'Assigning groups to this user will adjust the permissions they have. See the groups section for details of permissions on individual groups.'
   PhoneNumberField:
     VALIDATION: 'Düzgün telefon nömrəsi daxil et.'
   RelationComplexTableField.ss:
-    ADD: Add
+    ADD: 'Əlavə et'
     CSVEXPORT: 'Export to CSV'
     NOTFOUND: 'No items found'
   Security:
@@ -522,12 +523,12 @@ az:
   TableField:
     ISREQUIRED: 'In %s ''%s'' is required'
   TableField.ss:
-    ADD: 'Add a new row'
+    ADD: 'Yeni sətir əlavə et'
     ADDITEM: 'Add %s'
   TableListField:
     CSVEXPORT: 'CSV-yə ixrac et'
     PRINT: 'Çap et'
-    Print: 'Çap et'
+    Print: Print
     SELECT: 'Seç:'
   TableListField.ss:
     NOITEMSFOUND: 'No items found'
@@ -549,7 +550,7 @@ az:
   UploadField:
     ATTACHFILE: 'Attach a file'
     ATTACHFILES: 'Attach files'
-    AttachFile: 'Attach a file'
+    AttachFile: 'Attach file(s)'
     DELETE: 'Delete from files'
     DELETEINFO: 'Permanently delete this file from the file store'
     DOEDIT: Save

lang/bg.yml

@@ -1,33 +1,32 @@
 bg:
   AssetAdmin:
-    ADDFILES: 'Add files'
+    ALLOWEDEXTS: 'Allowed extensions'
-    EditOrgMenu: 'Edit & organize'
     NEWFOLDER: NewFolder
   AssetTableField:
-    CREATED: 'First uploaded'
+    CREATED: Създаден
-    DIM: Dimensions
+    DIM: Размери
-    FILENAME: Filename
+    FILENAME: 'Име на файл'
-    FOLDER: Folder
+    FOLDER: Папка
-    LASTEDIT: 'Last changed'
+    LASTEDIT: 'Последна промяна'
-    OWNER: Owner
+    OWNER: Собственик
-    SIZE: 'File size'
+    SIZE: 'Големина на файла'
     TITLE: Title
     TYPE: 'Тип на файла'
     URL: URL
   AssetUploadField:
-    ChooseFiles: 'Choose files'
+    ChooseFiles: 'Избери файлове'
-    DRAGFILESHERE: 'Drag files here'
+    DRAGFILESHERE: 'Завлечете файловете тук'
     DROPAREA: 'Drop Area'
-    EDITALL: 'Edit all'
+    EDITALL: 'Редакция на всички'
-    EDITANDORGANIZE: 'Edit & organize'
+    EDITANDORGANIZE: 'Редактиране и подреждане'
     EDITINFO: 'Edit files'
     FILES: Файлове
     FROMCOMPUTER: 'Choose files from your computer'
     FROMCOMPUTERINFO: 'Upload from your computer'
-    TOTAL: Total
+    TOTAL: Общо
     TOUPLOAD: 'Choose files to upload...'
-    UPLOADINPROGRESS: 'Please wait… upload in progress'
+    UPLOADINPROGRESS: 'Моля, изчакайте... файловете се качват'
-    UPLOADOR: OR
+    UPLOADOR: ИЛИ
   BBCodeParser:
     ALIGNEMENT: Подреждане
     ALIGNEMENTEXAMPLE: 'подреди в дясно'
@@ -64,36 +63,36 @@ bg:
     ANY: Any
     1: 'True'
   CMSLoadingScreen.ss:
-    LOADING: Loading...
+    LOADING: 'Зареждане ...'
     REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
   CMSMain:
     ACCESS: 'Access to ''{title}'' section'
-    ACCESSALLINTERFACES: 'Access to all CMS sections'
+    ACCESSALLINTERFACES: 'Достъп до всички секции на CMS'
     ACCESSALLINTERFACESHELP: 'Overrules more specific access settings.'
     SAVE: Запис
   CMSProfileController:
-    MENUTITLE: CMSProfileController
+    MENUTITLE: 'My Profile'
   ChangePasswordEmail.ss:
-    CHANGEPASSWORDTEXT1: 'You changed your password for'
+    CHANGEPASSWORDTEXT1: 'Вие сменихте вашата парола за'
-    CHANGEPASSWORDTEXT2: 'You can now use the following credentials to log in:'
+    CHANGEPASSWORDTEXT2: 'Вече можете да ползвате следните данни за вход:'
     EMAIL: Email
-    HELLO: Hi
+    HELLO: Здравей!
     PASSWORD: Парола
   CheckboxField:
     - 'False'
     - 'True'
   ComplexTableField:
     CLOSEPOPUP: 'Close Popup'
-    SUCCESSADD2: 'Added {name}'
+    SUCCESSADD2: 'Беше добавен {name}'
     SUCCESSEDIT: 'Съхранено %s %s %s'
   ComplexTableField.ss:
-    ADDITEM: 'Add %s'
+    ADDITEM: 'Добави %s'
     NOITEMSFOUND: 'No items found'
-    SORTASC: 'Sort ascending'
+    SORTASC: Възходящ
-    SORTDESC: 'Sort descending'
+    SORTDESC: Низходящ
   ComplexTableField_popup.ss:
-    NEXT: Next
+    NEXT: Следващо
-    PREVIOUS: Previous
+    PREVIOUS: Предишно
   ConfirmedPasswordField:
     ATLEAST: 'Passwords must be at least {min} characters long.'
     BETWEEN: 'Passwords must be {min} to {max} characters long.'
@@ -107,8 +106,8 @@ bg:
   CurrencyField:
     CURRENCYSYMBOL: $
   DataObject:
-    PLURALNAME: 'Data Objects'
+    PLURALNAME: 'Обекти с данни'
-    SINGULARNAME: 'Data Object'
+    SINGULARNAME: 'Обект с данни'
   Date:
     DAY: ден
     DAYS: дни
@@ -120,24 +119,24 @@ bg:
     MONTHS: месеци
     SEC: секунда
     SECS: секунди
-    TIMEDIFFAGO: '{difference} ago'
+    TIMEDIFFAGO: 'преди {difference}'
-    TIMEDIFFIN: 'in {difference}'
+    TIMEDIFFIN: 'за {difference}'
     YEAR: година
     YEARS: години
   DateField:
     NOTSET: 'Не нагласено'
     TODAY: днес
-    VALIDDATEFORMAT2: 'Please enter a valid date format ({format})'
+    VALIDDATEFORMAT2: 'Моля, въведете валиден формат за дата ({format})'
-    VALIDDATEMAXDATE: 'Your date has to be older or matching the maximum allowed date ({date})'
+    VALIDDATEMAXDATE: 'Датата трябва да бъде същата или преди ({date})'
-    VALIDDATEMINDATE: 'Your date has to be newer or matching the minimum allowed date ({date})'
+    VALIDDATEMINDATE: 'Датата трябва да бъде същата или след ({date})'
   DatetimeField:
     NOTSET: 'Not set'
   Director:
-    INVALID_REQUEST: 'Invalid request'
+    INVALID_REQUEST: 'Грешна заявка'
   DropdownField:
     CHOOSE: (Избери)
   EmailField:
-    VALIDATION: 'Please enter an email address'
+    VALIDATION: 'Моля, въведете имейл адрес'
   Email_BounceRecord:
     PLURALNAME: 'Email Bounce Records'
     SINGULARNAME: 'Email Bounce Record'
@@ -149,7 +148,7 @@ bg:
     CssType: 'CSS file'
     DmgType: 'Apple disk image'
     DocType: 'Word document'
-    Filename: Filename
+    Filename: 'Име на файл'
     GifType: 'GIF image - good for diagrams'
     GzType: 'GZIP compressed file'
     HtlType: 'HTML file'
@@ -163,7 +162,7 @@ bg:
     MpgType: 'MPEG video file'
     NOFILESIZE: 'Размер на файла е нула байта.'
     NOVALIDUPLOAD: 'File is not a valid upload'
-    Name: Name
+    Name: Име
     PLURALNAME: Файлове
     PdfType: 'Adobe Acrobat PDF file'
     PngType: 'PNG image - good general-purpose format'
@@ -180,24 +179,24 @@ bg:
     ATTACHONCESAVED: '{type}s can be attached once you have saved the record for the first time.'
     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'
+    DISALLOWEDFILETYPE: 'Не може да бъде качен файл от този тип'
     FILE: Файл
-    FROMCOMPUTER: 'From your Computer'
+    FROMCOMPUTER: 'От компютъра'
-    FROMFILESTORE: 'From the File Store'
+    FROMFILESTORE: 'От Файлове и Изображения'
     NOSOURCE: 'Please select a source file to attach'
     REPLACE: 'Replace {type}'
   FileIFrameField_iframe.ss:
-    TITLE: 'Image Uploading Iframe'
+    TITLE: 'Iframe за качване на изображение'
   Filesystem:
-    SYNCRESULTS: 'Sync complete: {createdcount} items created, {deletedcount} items deleted'
+    SYNCRESULTS: 'Синхронизацията завърши: бяха създадени {createdcount} елемента, бяха изтрити {deletedcount} елемента'
   Folder:
     PLURALNAME: Folders
     SINGULARNAME: Folder
   ForgotPasswordEmail.ss:
-    HELLO: Hi
+    HELLO: Здравей!
-    TEXT1: 'Here is your'
+    TEXT1: 'Ето вашият'
-    TEXT2: 'password reset link'
+    TEXT2: 'адрес за рестартирване на парола'
-    TEXT3: for
+    TEXT3: за
   Form:
     FIELDISREQUIRED: 'нужно е %s'
     SubmitBtnLabel: Go
@@ -209,70 +208,70 @@ bg:
     VALIDATOR: Валидатор
     VALIDCURRENCY: 'Please enter a valid currency'
   FormField:
-    NONE: никой
+    NONE: нищо
   GridAction:
     DELETE_DESCRIPTION: Delete
     Delete: Delete
-    UnlinkRelation: Unlink
+    UnlinkRelation: Откачане
   GridField:
-    Add: 'Add {name}'
+    Add: 'Добави {name}'
     Filter: Филтър
     FilterBy: 'Филтриране по'
     Find: Find
-    LEVELUP: 'Level up'
+    LEVELUP: 'Ниво нагоре'
     LinkExisting: 'Link Existing'
-    NewRecord: 'New %s'
+    NewRecord: 'Нов %s'
-    NoItemsFound: 'No items found'
+    NoItemsFound: 'Няма намерени елементи'
     PRINTEDAT: 'Printed at'
     PRINTEDBY: 'Printed by'
-    PlaceHolder: 'Find {type}'
+    PlaceHolder: 'Намери {type}'
-    PlaceHolderWithLabels: 'Find {type} by {name}'
+    PlaceHolderWithLabels: 'Намери {type} по {name}'
     RelationSearch: 'Relation search'
     ResetFilter: Reset
   GridFieldAction_Delete:
-    DeletePermissionsFailure: 'No delete permissions'
+    DeletePermissionsFailure: 'Изтриването не е разрешено'
   GridFieldDetailForm:
     CancelBtn: Cancel
     Create: Създай
     Delete: Изтрий
     DeletePermissionsFailure: 'Изтриването не е разрешено'
-    Deleted: 'Deleted %s %s'
+    Deleted: 'Изтрити %s %s'
-    Save: Save
+    Save: Запис
-    Saved: 'Saved %s %s'
+    Saved: 'Съхранени %s %s'
   GridFieldItemEditView.ss: null
   Group:
-    AddRole: 'Add a role for this group'
+    AddRole: 'Добавяне на роля към групата'
     Code: 'Group Code'
     DefaultGroupTitleAdministrators: Администратори
     DefaultGroupTitleContentAuthors: 'Редактори на съдържание'
     Description: Описание
     GroupReminder: 'If you choose a parent group, this group will take all it''s roles'
     Locked: 'Заключена?'
-    NoRoles: 'No roles found'
+    NoRoles: 'Няма намерени роли'
     PLURALNAME: Groups
     Parent: 'Parent Group'
-    RolesAddEditLink: 'Manage roles'
+    RolesAddEditLink: 'Управление на ролите'
     SINGULARNAME: Group
     Sort: Сортиране
     has_many_Permissions: Разрешения
-    many_many_Members: Членове
+    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>'
-    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>'
+    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'
     ResultUpdated: 'Updated %d groups'
   Hierarchy:
     InfiniteLoopNotAllowed: 'Infinite loop found within the "{type}" hierarchy. Please change the parent to resolve this'
   HtmlEditorField:
-    ADDURL: 'Add URL'
+    ADDURL: 'Добави URL'
-    ADJUSTDETAILSDIMENSIONS: 'Details &amp; dimensions'
+    ADJUSTDETAILSDIMENSIONS: 'Детайли и размери'
     ANCHORVALUE: Котва
-    BUTTONINSERT: Insert
+    BUTTONINSERT: Вмъкни
     BUTTONINSERTLINK: 'Вмъкни препратка'
     BUTTONREMOVELINK: 'Премахни препратка'
-    BUTTONUpdate: Update
+    BUTTONUpdate: Актуализация
-    CAPTIONTEXT: 'Caption text'
+    CAPTIONTEXT: 'Описание (под снимката)'
     CSSCLASS: 'Подравняване / стил'
     CSSCLASSCENTER: Центрирано
     CSSCLASSLEFT: 'В ляво, с текст който да се нанася около него'
@@ -282,20 +281,20 @@ bg:
     EMAIL: 'email адрес'
     FILE: Файл
     FOLDER: Папка
-    FROMCMS: 'From the CMS'
+    FROMCMS: 'От CMS'
-    FROMCOMPUTER: 'From your computer'
+    FROMCOMPUTER: 'От компютъра'
-    FROMWEB: 'From the web'
+    FROMWEB: 'От интернет'
-    FindInFolder: 'Find in Folder'
+    FindInFolder: 'Прегледай папка'
-    IMAGEALT: 'Alternative text (alt)'
+    IMAGEALT: 'Алтернативен текст (alt)'
-    IMAGEALTTEXT: 'Alternative text (alt) - shown if image cannot be displayed'
+    IMAGEALTTEXT: 'Алтернативен текст (alt) - показва се ако изображението не е заредено'
     IMAGEALTTEXTDESC: 'Shown to screen readers or if image can not be displayed'
     IMAGEDIMENSIONS: Размери
     IMAGEHEIGHTPX: Височина
-    IMAGETITLE: 'Title text (tooltip) - for additional information about the image'
+    IMAGETITLE: 'Описание (tooltip) - за допълнителна информация към изображението'
-    IMAGETITLETEXT: 'Title text (tooltip)'
+    IMAGETITLETEXT: 'Описание (tooltip)'
-    IMAGETITLETEXTDESC: 'For additional information about the image'
+    IMAGETITLETEXTDESC: 'Допълнителна информация към изображението'
     IMAGEWIDTHPX: Широчина
-    INSERTMEDIA: 'Insert Media'
+    INSERTMEDIA: 'Вмъкване на медиа'
     LINK: Връзка
     LINKANCHOR: 'Котва на тази страница'
     LINKDESCR: 'Описание на препратка'
@@ -308,7 +307,7 @@ bg:
     PAGE: Страница
     URL: URL
     URLNOTANOEMBEDRESOURCE: 'The URL ''{url}'' could not be turned into a media resource.'
-    UpdateMEDIA: 'Update Media'
+    UpdateMEDIA: 'Актуализация на медиа'
   Image:
     PLURALNAME: Files
     SINGULARNAME: File
@@ -318,44 +317,45 @@ bg:
     PLURALNAME: Files
     SINGULARNAME: File
   Image_iframe.ss:
-    TITLE: 'Image Uploading Iframe'
+    TITLE: 'Iframe за качване на изображение'
   LeftAndMain:
     CANT_REORGANISE: 'You do not have permission to alter Top level pages. Your change was not saved.'
     DELETED: Изтрит
-    DropdownBatchActionsDefault: Actions
+    DropdownBatchActionsDefault: Действия
     HELP: Help
     PAGETYPE: 'Page type: '
-    PERMAGAIN: 'You have been logged out of the CMS.  If you would like to log in again, enter a username and password below.'
+    PERMAGAIN: 'Вие излязохте от CMS. Ако искате да влезете отново, моля, въведете потребителско име и парола.'
-    PERMALREADY: 'I''m sorry, but you can''t access that part of the CMS.  If you want to log in as someone else, do so below'
+    PERMALREADY: 'Съжалявам, но нямате достъп до тази част от CMS. Ако искате да влезете с друго потребителско име, моля, направете го по-долу'
-    PERMDEFAULT: 'Please choose an authentication method and enter your credentials to access the CMS.'
+    PERMDEFAULT: 'Въведете имейл адреса и паролата си, за да влезете в CMS.'
     PLEASESAVE: 'Please Save Page: This page could not be upated because it hasn''t been saved yet.'
     PreviewButton: Преглед
     REORGANISATIONSUCCESSFUL: 'Reorganised the site tree successfully.'
     SAVEDUP: Записано
     VersionUnknown: непозната
   LeftAndMain_Menu.ss:
-    Hello: Hi
+    Hello: Здравей
     LOGOUT: 'Log out'
   LoginAttempt:
     Email: 'Email Address'
-    IP: 'IP Address'
+    IP: 'IP адрес'
     PLURALNAME: 'Login Attempts'
     SINGULARNAME: 'Login Attempt'
     Status: Status
   Member:
-    ADDGROUP: 'Add group'
+    ADDGROUP: 'Добави група'
     BUTTONCHANGEPASSWORD: 'Променете паролата'
     BUTTONLOGIN: Влез
     BUTTONLOGINOTHER: 'Влез като някой друг'
     BUTTONLOSTPASSWORD: 'Загубих си паролата'
+    CANTEDIT: 'You don''t have permission to do that'
     CONFIRMNEWPASSWORD: 'Потвърдете новата парола'
     CONFIRMPASSWORD: 'Потвърдете паролата'
     DATEFORMAT: 'Date format'
     DefaultAdminFirstname: 'Default Admin'
     DefaultDateTime: 'по подразбиране'
     EMAIL: Еmail
-    EMPTYNEWPASSWORD: 'The new password can''t be empty, please try again'
+    EMPTYNEWPASSWORD: 'Не е въведена нова парола'
-    ENTEREMAIL: 'Please enter an email address to get a password reset link.'
+    ENTEREMAIL: 'Връзка за анулиране на парола'
     ERRORLOCKEDOUT: 'Вашата сметка бе изключена временно защото имаше много неуспешни опити за влизане. Моля опитайте отново след 20 минути.'
     ERRORNEWPASSWORD: 'Въвели сте новата парола различно, моля опитайте пак'
     ERRORPASSWORDNOTMATCH: 'Вашата текуща парола не съвпада, моля опитайте пак'
@@ -363,11 +363,10 @@ bg:
     FIRSTNAME: Име
     INTERFACELANG: Език
     INVALIDNEWPASSWORD: 'We couldn''t accept that password: {password}'
-    LOGGEDINAS: 'You''re logged in as {name}.'
+    LOGGEDINAS: 'Вие сте влезли като {name}.'
     NEWPASSWORD: 'Нова парола'
     PASSWORD: Парола
     PLURALNAME: Членове
-    PROFILESAVESUCCESS: 'Successfully saved.'
     REMEMBERME: 'Запомни ме за следващия път?'
     SINGULARNAME: Член
     SUBJECTPASSWORDCHANGED: 'Вашата парола беше променена'
@@ -376,56 +375,57 @@ bg:
     TIMEFORMAT: 'Time format'
     VALIDATIONMEMBEREXISTS: 'Вече съществува потребител с този email'
     ValidationIdentifierFailed: 'Can''t overwrite existing member #{id} with identical identifier ({name} = {value}))'
-    WELCOMEBACK: 'Welcome Back, {firstname}'
+    WELCOMEBACK: 'Добре дошли отново, {firstname}'
     YOUROLDPASSWORD: 'Вашата стара парола'
     belongs_many_many_Groups: Групи
-    db_LastVisited: 'Last Visited Date'
+    db_LastVisited: 'Дата на последно посещение'
     db_Locale: 'Език на интерфейса'
     db_LockedOutUntil: 'Заключен до'
     db_NumVisit: 'Брой посещения'
-    db_Password: Password
+    db_Password: Парола
     db_PasswordExpiry: 'Дата на изтичане валидността на паролата'
   MemberAuthenticator:
     TITLE: 'email и парола'
   MemberDatetimeOptionsetField:
-    AMORPM: 'AM (Ante meridiem) or PM (Post meridiem)'
+    AMORPM: 'АМ (преди обед) или РМ (следобед)'
     'APPLY FILTER': 'Приложи филтър'
     Custom: Custom
-    DATEFORMATBAD: 'Date format is invalid'
+    DATEFORMATBAD: 'Невалиден формат на датата'
-    DAYNOLEADING: 'Day of month without leading zero'
+    DAYNOLEADING: 'Ден от месеца без водеща нула'
     DIGITSDECFRACTIONSECOND: 'One or more digits representing a decimal fraction of a second'
-    FOURDIGITYEAR: 'Four-digit year'
+    FOURDIGITYEAR: 'Четирицифрена година'
-    FULLNAMEMONTH: 'Full name of month (e.g. June)'
+    FULLNAMEMONTH: 'Пълно наименование на месец (напр. Януари)'
-    HOURNOLEADING: 'Hour without leading zero'
+    HOURNOLEADING: 'Час без водеща нула'
-    MINUTENOLEADING: 'Minute without leading zero'
+    MINUTENOLEADING: 'Минути без водеща нула'
-    MONTHNOLEADING: 'Month digit without leading zero'
+    MONTHNOLEADING: 'Месец без водеща нула'
-    Preview: Preview
+    Preview: Преглед
-    SHORTMONTH: 'Short name of month (e.g. Jun)'
+    SHORTMONTH: 'Кратко изписване на месеца (напр. Яну)'
-    TOGGLEHELP: 'Toggle formatting help'
+    TOGGLEHELP: 'Помощ за форматирането'
-    TWODIGITDAY: 'Two-digit day of month'
+    TWODIGITDAY: 'Двуцифрен ден от месеца'
-    TWODIGITHOUR: 'Two digits of hour (00 through 23)'
+    TWODIGITHOUR: 'Час с водеща нула (00 до 23)'
-    TWODIGITMINUTE: 'Two digits of minute (00 through 59)'
+    TWODIGITMINUTE: 'Минути с водеща нула (00 до 59)'
-    TWODIGITMONTH: 'Two-digit month (01=January, etc.)'
+    TWODIGITMONTH: 'Месец с водеща нула (01=Януари, и т.н.)'
-    TWODIGITSECOND: 'Two digits of second (00 through 59)'
+    TWODIGITSECOND: 'Секунди с водеща нула (00 до 59)'
-    TWODIGITYEAR: 'Two-digit year'
+    TWODIGITYEAR: 'Двуцифрена година'
   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>'
+    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'
+    ResultCreated: 'Бяха добавени {count} потребители'
     ResultDeleted: 'Deleted %d members'
     ResultNone: 'No changes'
-    ResultUpdated: 'Updated {count} members'
+    ResultUpdated: 'Бяха актуализирани {count} потребители'
   MemberPassword:
     PLURALNAME: 'Member Passwords'
     SINGULARNAME: 'Member Password'
   MemberTableField: null
   ModelAdmin:
-    DELETE: Delete
+    DELETE: Изтрий
     DELETEDRECORDS: 'Deleted {count} records.'
+    EMPTYBEFOREIMPORT: 'Clear Database before import'
     IMPORT: 'Import from CSV'
     IMPORTEDRECORDS: 'Imported {count} records.'
-    NOCSVFILE: 'Please browse for a CSV file to import'
+    NOCSVFILE: 'Преглед на CSV файл за внасяне'
-    NOIMPORT: 'Nothing to import'
+    NOIMPORT: 'Нищо за внасяне'
     RESET: Reset
     Title: 'Data Models'
     UPDATEDRECORDS: 'Updated {count} records.'
@@ -436,32 +436,32 @@ bg:
     IMPORTSPECTITLE: 'Specification for %s'
   ModelAdmin_Tools.ss:
     FILTER: Филтър
-    IMPORT: Import
+    IMPORT: Внасяне
   ModelSidebar.ss:
-    IMPORT_TAB_HEADER: Import
+    IMPORT_TAB_HEADER: Внасяне
     SEARCHLISTINGS: Търсене
   MoneyField:
-    FIELDLABELAMOUNT: Amount
+    FIELDLABELAMOUNT: Сума
-    FIELDLABELCURRENCY: Currency
+    FIELDLABELCURRENCY: Валута
   NullableField:
     IsNullLabel: 'Is Null'
   NumericField:
-    VALIDATION: '''{value}'' is not a number, only numbers can be accepted for this field'
+    VALIDATION: '''{value}'' не е число, само числа могат да се въвеждат в това поле'
   Pagination:
     Page: Page
     View: View
   Permission:
-    AdminGroup: Administrator
+    AdminGroup: Администратор
     CMS_ACCESS_CATEGORY: 'Достъп до CMS'
     FULLADMINRIGHTS: 'Пълни административни права'
     FULLADMINRIGHTS_HELP: 'Implies and overrules all other assigned permissions.'
     PLURALNAME: Permissions
     SINGULARNAME: Permission
   PermissionCheckboxSetField:
-    AssignedTo: 'assigned to "{title}"'
+    AssignedTo: 'приписана на "{title}"'
-    FromGroup: 'inherited from group "{title}"'
+    FromGroup: 'унаследена от група "{title}"'
-    FromRole: 'inherited from role "{title}"'
+    FromRole: 'унаследена от роля "{title}"'
-    FromRoleOnGroup: 'inherited from role "%s" on group "%s"'
+    FromRoleOnGroup: 'унаследено от роля "%s" на група "%s"'
   PermissionRole:
     OnlyAdminCanApply: 'Only admin can apply'
     PLURALNAME: Roles
@@ -472,10 +472,11 @@ bg:
     SINGULARNAME: 'Permission Role Code'
   Permissions:
     PERMISSIONS_CATEGORY: 'Роли и разрешения за достъп'
+    UserPermissionsIntro: 'Assigning groups to this user will adjust the permissions they have. See the groups section for details of permissions on individual groups.'
   PhoneNumberField:
     VALIDATION: 'Моля, въведете валиден телефонен номер'
   RelationComplexTableField.ss:
-    ADD: Add
+    ADD: Добави
     CSVEXPORT: 'Export to CSV'
     NOTFOUND: 'No items found'
   Security:
@@ -485,18 +486,18 @@ bg:
     CHANGEPASSWORDHEADER: 'Сменете вашата парола'
     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: 'Въведете вашият email адрес и ще ви изпратим линк с който ще можете да смените паролата си'
+    NOTERESETPASSWORD: 'Въведете вашият email адрес и ще ви изпратим линк, с който ще можете да смените паролата си'
     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: 'Позволява преглед, добавяне и редактиране на потребители, както и задаване на разрешения и роли за тях.'
     APPLY_ROLES: 'Задаване роли на групи'
     APPLY_ROLES_HELP: 'Възможност за редактиране на ролите, възложени на група. Необходим е достъп до раздел "Потребители".'
-    EDITPERMISSIONS: 'Manage permissions for groups'
+    EDITPERMISSIONS: 'Управление на разрешенията на групите'
     EDITPERMISSIONS_HELP: 'Възможност за редактиране на Разрешенията и IP адресите за група. Необходим е достъп до раздел "Сигурност".'
     GROUPNAME: 'Име на група'
     IMPORTGROUPS: 'Внасяне на файл с групи'
@@ -504,17 +505,17 @@ bg:
     MEMBERS: Потребители
     MENUTITLE: Security
     MemberListCaution: 'Внимание: изтривайки потребители от този списък, ще ги премахне от всички групи и от базата данни.'
-    NEWGROUP: 'New Group'
+    NEWGROUP: 'Нова група'
     PERMISSIONS: Разрешения
     ROLES: Роли
     ROLESDESCRIPTION: 'Ролите са предварително зададени сетове от разрешения и могат да бъдат присвоявани на групи.<br />Ако е нужно, те се наследяват от родителските групи.'
     TABROLES: Роли
-    Users: Users
+    Users: Потребители
   SecurityAdmin_MemberImportForm:
-    BtnImport: 'Import from CSV'
+    BtnImport: 'Внасяне от CSV'
-    FileFieldLabel: 'CSV File <small>(Allowed extensions: *.csv)</small>'
+    FileFieldLabel: 'CSV файл <small>(разширение: *.csv)</small>'
   SilverStripeNavigator:
-    Edit: Edit
+    Edit: Редакция
   SimpleImageField:
     NOUPLOAD: 'Няма качени изображения'
   SiteTree:
@@ -522,12 +523,12 @@ bg:
   TableField:
     ISREQUIRED: 'In %s ''%s'' is required'
   TableField.ss:
-    ADD: 'Add a new row'
+    ADD: 'Добави нов ред'
     ADDITEM: 'Add %s'
   TableListField:
     CSVEXPORT: 'Експортирай на CSV'
     PRINT: Принтирай
-    Print: Принтирай
+    Print: Print
     SELECT: 'Избери:'
   TableListField.ss:
     NOITEMSFOUND: 'No items found'
@@ -542,34 +543,34 @@ bg:
     VIEWNEXT: 'Преглед на следващото'
     VIEWPREVIOUS: 'Преглед на предишното'
   TimeField:
-    VALIDATEFORMAT: 'Please enter a valid time format ({format})'
+    VALIDATEFORMAT: 'Моля, въведете валиден формат за дата ({format})'
   ToggleField:
     LESS: по-малко
     MORE: повече
   UploadField:
-    ATTACHFILE: 'Attach a file'
+    ATTACHFILE: 'Прикачване на файл'
-    ATTACHFILES: 'Attach files'
+    ATTACHFILES: 'Прикачване на файлове'
-    AttachFile: 'Attach a file'
+    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
+    Dimensions: Размери
     EDIT: Edit
-    EDITINFO: 'Edit this file'
+    EDITINFO: 'Редактирай този файл'
     FIELDNOTSET: 'File information not found'
     FROMCOMPUTER: 'От компютъра'
     FROMCOMPUTERINFO: 'Select from files'
     FROMFILES: 'From files'
     HOTLINKINFO: 'Info: This image will be hotlinked. Please ensure you have permissions from the original site creator to do so.'
-    MAXNUMBEROFFILES: 'Max number of {count} file(s) exceeded.'
+    MAXNUMBEROFFILES: 'Максималния брой файлове ({count}) е надхвърлен.'
-    MAXNUMBEROFFILESSHORT: 'Can only upload {count} files'
+    MAXNUMBEROFFILESSHORT: 'Максималният брой файлове за качване е {count}'
-    REMOVE: 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

@@ -1,7 +1,6 @@
 bs:
   AssetAdmin:
-    ADDFILES: 'Add files'
+    ALLOWEDEXTS: 'Allowed extensions'
-    EditOrgMenu: 'Edit & organize'
     NEWFOLDER: NoviDirektorij
   AssetTableField:
     CREATED: 'Prvo postavljeno'
@@ -72,12 +71,12 @@ bs:
     ACCESSALLINTERFACESHELP: 'Overrules more specific access settings.'
     SAVE: Snimi
   CMSProfileController:
-    MENUTITLE: CMSProfileController
+    MENUTITLE: 'My Profile'
   ChangePasswordEmail.ss:
-    CHANGEPASSWORDTEXT1: 'You changed your password for'
+    CHANGEPASSWORDTEXT1: 'Promijenili ste svoju šifru za'
-    CHANGEPASSWORDTEXT2: 'You can now use the following credentials to log in:'
+    CHANGEPASSWORDTEXT2: 'Možete koristiti slijedeće podatke za prijavu:'
     EMAIL: Email
-    HELLO: Hi
+    HELLO: Pozdrav
     PASSWORD: Password
   CheckboxField:
     - 'False'
@@ -87,13 +86,13 @@ bs:
     SUCCESSADD2: 'Added {name}'
     SUCCESSEDIT: 'Saved %s %s %s'
   ComplexTableField.ss:
-    ADDITEM: 'Add %s'
+    ADDITEM: 'Dodaj %S'
     NOITEMSFOUND: 'No items found'
-    SORTASC: 'Sort ascending'
+    SORTASC: 'Uzlazno raszvrstavanje'
-    SORTDESC: 'Sort descending'
+    SORTDESC: 'Silazno razvrstavanje'
   ComplexTableField_popup.ss:
-    NEXT: Next
+    NEXT: Slijedeći
-    PREVIOUS: Previous
+    PREVIOUS: Prethodni
   ConfirmedPasswordField:
     ATLEAST: 'Passwords must be at least {min} characters long.'
     BETWEEN: 'Passwords must be {min} to {max} characters long.'
@@ -181,7 +180,7 @@ bs:
     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: Datoteka
+    FILE: File
     FROMCOMPUTER: 'From your Computer'
     FROMFILESTORE: 'From the File Store'
     NOSOURCE: 'Please select a source file to attach'
@@ -194,10 +193,10 @@ bs:
     PLURALNAME: Folders
     SINGULARNAME: Folder
   ForgotPasswordEmail.ss:
-    HELLO: Hi
+    HELLO: Pozdrav
-    TEXT1: 'Here is your'
+    TEXT1: 'Ovo je Vaš'
-    TEXT2: 'password reset link'
+    TEXT2: 'link za ponovno podešavanje šifre'
-    TEXT3: for
+    TEXT3: za
   Form:
     FIELDISREQUIRED: '%s je obavezno'
     SubmitBtnLabel: Go
@@ -258,7 +257,7 @@ bs:
     many_many_Members: 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>'
-    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>'
+    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'
     ResultUpdated: 'Updated %d groups'
@@ -318,7 +317,7 @@ bs:
     PLURALNAME: Files
     SINGULARNAME: File
   Image_iframe.ss:
-    TITLE: 'Image Uploading Iframe'
+    TITLE: 'Iframe za postavljanje slika'
   LeftAndMain:
     CANT_REORGANISE: 'You do not have permission to alter Top level pages. Your change was not saved.'
     DELETED: Deleted.
@@ -348,6 +347,7 @@ bs:
     BUTTONLOGIN: Prijava
     BUTTONLOGINOTHER: 'Prijavite se sa drugim korisnikom'
     BUTTONLOSTPASSWORD: 'Zaboravio sam šifru'
+    CANTEDIT: 'You don''t have permission to do that'
     CONFIRMNEWPASSWORD: 'Potvrdite novu šifru'
     CONFIRMPASSWORD: 'Potvrdite šifru'
     DATEFORMAT: 'Date format'
@@ -367,7 +367,6 @@ bs:
     NEWPASSWORD: 'Nova šifra'
     PASSWORD: Šifra
     PLURALNAME: Members
-    PROFILESAVESUCCESS: 'Successfully saved.'
     REMEMBERME: 'Zapamti me slijedeći put'
     SINGULARNAME: Member
     SUBJECTPASSWORDCHANGED: 'Vaša šifra je promijenjena'
@@ -410,7 +409,7 @@ bs:
     TWODIGITYEAR: 'Two-digit year'
   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>'
+    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'
     ResultNone: 'No changes'
@@ -422,6 +421,7 @@ bs:
   ModelAdmin:
     DELETE: Delete
     DELETEDRECORDS: 'Deleted {count} records.'
+    EMPTYBEFOREIMPORT: 'Clear Database before import'
     IMPORT: 'Import from CSV'
     IMPORTEDRECORDS: 'Imported {count} records.'
     NOCSVFILE: 'Please browse for a CSV file to import'
@@ -472,10 +472,11 @@ bs:
     SINGULARNAME: 'Permission Role Code'
   Permissions:
     PERMISSIONS_CATEGORY: 'Roles and access permissions'
+    UserPermissionsIntro: 'Assigning groups to this user will adjust the permissions they have. See the groups section for details of permissions on individual groups.'
   PhoneNumberField:
     VALIDATION: 'Molimo, unesite ispravan broj telefona'
   RelationComplexTableField.ss:
-    ADD: Add
+    ADD: Dodaj
     CSVEXPORT: 'Export to CSV'
     NOTFOUND: 'No items found'
   Security:
@@ -522,12 +523,12 @@ bs:
   TableField:
     ISREQUIRED: 'In %s ''%s'' is required'
   TableField.ss:
-    ADD: 'Add a new row'
+    ADD: 'Dodaj novi red'
     ADDITEM: 'Add %s'
   TableListField:
     CSVEXPORT: 'Izvezi u CSV'
     PRINT: Štampaj
-    Print: Štampaj
+    Print: Print
     SELECT: 'Select:'
   TableListField.ss:
     NOITEMSFOUND: 'No items found'
@@ -549,7 +550,7 @@ bs:
   UploadField:
     ATTACHFILE: 'Attach a file'
     ATTACHFILES: 'Attach files'
-    AttachFile: 'Attach a file'
+    AttachFile: 'Attach file(s)'
     DELETE: 'Delete from files'
     DELETEINFO: 'Permanently delete this file from the file store'
     DOEDIT: Save

lang/ca.yml

@@ -1,7 +1,6 @@
 ca:
   AssetAdmin:
-    ADDFILES: 'Add files'
+    ALLOWEDEXTS: 'Allowed extensions'
-    EditOrgMenu: 'Edit & organize'
     NEWFOLDER: NovaCarpeta
   AssetTableField:
     CREATED: 'Carregat per primer cop'
@@ -21,7 +20,7 @@ ca:
     EDITALL: 'Edit all'
     EDITANDORGANIZE: 'Edit & organize'
     EDITINFO: 'Edit files'
-    FILES: Fitxers
+    FILES: Files
     FROMCOMPUTER: 'Choose files from your computer'
     FROMCOMPUTERINFO: 'Upload from your computer'
     TOTAL: Total
@@ -72,12 +71,12 @@ ca:
     ACCESSALLINTERFACESHELP: 'Overrules more specific access settings.'
     SAVE: Desa
   CMSProfileController:
-    MENUTITLE: CMSProfileController
+    MENUTITLE: 'My Profile'
   ChangePasswordEmail.ss:
-    CHANGEPASSWORDTEXT1: 'You changed your password for'
+    CHANGEPASSWORDTEXT1: 'Heu canviat la vostra contrasenya per'
-    CHANGEPASSWORDTEXT2: 'You can now use the following credentials to log in:'
+    CHANGEPASSWORDTEXT2: 'Podeu usar ara les següents credencials per a entrar:'
     EMAIL: 'Correu electrònic'
-    HELLO: Hi
+    HELLO: Hola
     PASSWORD: Contrasenya
   CheckboxField:
     - 'False'
@@ -87,13 +86,13 @@ ca:
     SUCCESSADD2: 'Added {name}'
     SUCCESSEDIT: 'S''ha desat %s %s %s'
   ComplexTableField.ss:
-    ADDITEM: 'Add %s'
+    ADDITEM: 'Afegir %s'
     NOITEMSFOUND: 'No items found'
-    SORTASC: 'Sort ascending'
+    SORTASC: 'Ordena ascendentment'
-    SORTDESC: 'Sort descending'
+    SORTDESC: 'Ordena descendentment'
   ComplexTableField_popup.ss:
-    NEXT: Next
+    NEXT: Següent
-    PREVIOUS: Previous
+    PREVIOUS: Anterior
   ConfirmedPasswordField:
     ATLEAST: 'Passwords must be at least {min} characters long.'
     BETWEEN: 'Passwords must be {min} to {max} characters long.'
@@ -181,7 +180,7 @@ ca:
     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: Fitxer
+    FILE: File
     FROMCOMPUTER: 'From your Computer'
     FROMFILESTORE: 'From the File Store'
     NOSOURCE: 'Please select a source file to attach'
@@ -194,10 +193,10 @@ ca:
     PLURALNAME: Folders
     SINGULARNAME: Folder
   ForgotPasswordEmail.ss:
-    HELLO: Hi
+    HELLO: Hola
-    TEXT1: 'Here is your'
+    TEXT1: 'Aquí teniu el vostre'
-    TEXT2: 'password reset link'
+    TEXT2: 'enllaç de reinici de la contrasenya'
-    TEXT3: for
+    TEXT3: per
   Form:
     FIELDISREQUIRED: 'Es requereix %s'
     SubmitBtnLabel: Go
@@ -234,7 +233,7 @@ ca:
   GridFieldDetailForm:
     CancelBtn: Cancel
     Create: Create
-    Delete: Suprimeix
+    Delete: Delete
     DeletePermissionsFailure: 'No delete permissions'
     Deleted: 'Deleted %s %s'
     Save: Save
@@ -258,7 +257,7 @@ ca:
     many_many_Members: Membres
   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>'
+    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'
     ResultUpdated: 'Updated %d groups'
@@ -318,7 +317,7 @@ ca:
     PLURALNAME: Files
     SINGULARNAME: File
   Image_iframe.ss:
-    TITLE: 'Image Uploading Iframe'
+    TITLE: 'Iframe Carregador d''imatge'
   LeftAndMain:
     CANT_REORGANISE: 'You do not have permission to alter Top level pages. Your change was not saved.'
     DELETED: Deleted.
@@ -348,6 +347,7 @@ ca:
     BUTTONLOGIN: Entrar
     BUTTONLOGINOTHER: 'Entreu com a algú diferent'
     BUTTONLOSTPASSWORD: 'He perdut la meva contrasenya'
+    CANTEDIT: 'You don''t have permission to do that'
     CONFIRMNEWPASSWORD: 'Confirmeu la nova contrasenya'
     CONFIRMPASSWORD: 'Confirmeu la contrasenya'
     DATEFORMAT: 'Date format'
@@ -367,7 +367,6 @@ ca:
     NEWPASSWORD: 'Nova contrasenya'
     PASSWORD: Contrasenya
     PLURALNAME: Membres
-    PROFILESAVESUCCESS: 'S''ha desat amb èxit.'
     REMEMBERME: 'Recorda''m el proper cop'
     SINGULARNAME: Membre
     SUBJECTPASSWORDCHANGED: 'La vostra contrasenya s''ha canviat'
@@ -410,7 +409,7 @@ ca:
     TWODIGITYEAR: 'Two-digit year'
   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>'
+    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'
     ResultNone: 'No changes'
@@ -422,6 +421,7 @@ ca:
   ModelAdmin:
     DELETE: Suprimeix
     DELETEDRECORDS: 'Deleted {count} records.'
+    EMPTYBEFOREIMPORT: 'Clear Database before import'
     IMPORT: 'Importa de CSV'
     IMPORTEDRECORDS: 'Imported {count} records.'
     NOCSVFILE: 'Si us plau, cerqueu el fitxer CSV per a importar'
@@ -472,10 +472,11 @@ ca:
     SINGULARNAME: 'Permission Role Code'
   Permissions:
     PERMISSIONS_CATEGORY: 'Roles and access permissions'
+    UserPermissionsIntro: 'Assigning groups to this user will adjust the permissions they have. See the groups section for details of permissions on individual groups.'
   PhoneNumberField:
     VALIDATION: 'Si us plau, introduïu un número de telèfon vàlid'
   RelationComplexTableField.ss:
-    ADD: Add
+    ADD: Afegeix
     CSVEXPORT: 'Export to CSV'
     NOTFOUND: 'No items found'
   Security:
@@ -522,12 +523,12 @@ ca:
   TableField:
     ISREQUIRED: 'In %s ''%s'' is required'
   TableField.ss:
-    ADD: 'Add a new row'
+    ADD: 'Afegeix una nova fila'
     ADDITEM: 'Add %s'
   TableListField:
     CSVEXPORT: 'Exporta a CSV'
     PRINT: Imprimeix
-    Print: Imprimeix
+    Print: Print
     SELECT: 'Select:'
   TableListField.ss:
     NOITEMSFOUND: 'No items found'
@@ -549,7 +550,7 @@ ca:
   UploadField:
     ATTACHFILE: 'Attach a file'
     ATTACHFILES: 'Attach files'
-    AttachFile: 'Attach a file'
+    AttachFile: 'Attach file(s)'
     DELETE: 'Delete from files'
     DELETEINFO: 'Permanently delete this file from the file store'
     DOEDIT: Save

lang/cs.yml

@@ -1,7 +1,6 @@
 cs:
   AssetAdmin:
-    ADDFILES: 'Přidat soubory'
+    ALLOWEDEXTS: 'Allowed extensions'
-    EditOrgMenu: 'Editovat & organizovat'
     NEWFOLDER: 'Nová složka'
   AssetTableField:
     CREATED: 'Poprvé nahráno'
@@ -17,7 +16,7 @@ cs:
   AssetUploadField:
     ChooseFiles: 'Vyberte soubory'
     DRAGFILESHERE: 'Táhni soubory sem'
-    DROPAREA: 'Oblast táhni (Drop)'
+    DROPAREA: 'Oblast upustění'
     EDITALL: 'Editovat vše'
     EDITANDORGANIZE: 'Editovat & organizovat'
     EDITINFO: 'Editovat soubory'
@@ -26,7 +25,7 @@ cs:
     FROMCOMPUTERINFO: 'Nahrát z vašeho počítače'
     TOTAL: Celkem
     TOUPLOAD: 'Vyberte soubory k nahrání...'
-    UPLOADINPROGRESS: 'Please wait… upload in progress'
+    UPLOADINPROGRESS: 'Prosím čekejte... probíhá nahrávání'
     UPLOADOR: NEBO
   BBCodeParser:
     ALIGNEMENT: Zarovnání
@@ -60,28 +59,28 @@ cs:
     ERRORNOTADMIN: 'Tento uživatel není administrátor.'
     ERRORNOTREC: 'Toto uživatelské jméno / heslo nebylo rozpoznáno'
   Boolean:
-    0: Nepravda
+    0: Ne
     ANY: Jakkýkoliv
-    1: Pravda
+    1: Ano
   CMSLoadingScreen.ss:
-    LOADING: 'Nahrávání ...'
+    LOADING: Nahrávání...
-    REQUIREJS: 'CMS vyžaduje, aby jste měli JavaScript povolen.'
+    REQUIREJS: 'CMS vyžaduje, aby jste měli JavaScript zapnut.'
   CMSMain:
     ACCESS: 'Přístup k ''{title}'' sekci'
     ACCESSALLINTERFACES: 'Přístup ke všem sekcím CMS'
     ACCESSALLINTERFACESHELP: 'Prepíše více specifické nastavení přístupu.'
     SAVE: Uložit
   CMSProfileController:
-    MENUTITLE: CMSProfileController
+    MENUTITLE: 'Můj profil'
   ChangePasswordEmail.ss:
-    CHANGEPASSWORDTEXT1: 'Změnil/a jste své heslo na'
+    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: Ahoj
+    HELLO: 'Dobrý den'
     PASSWORD: Heslo
   CheckboxField:
-    - Nepravda
+    - Ne
-    - Pravda
+    - Ano
   ComplexTableField:
     CLOSEPOPUP: Zavřít
     SUCCESSADD2: 'Přidáno {name}'
@@ -89,8 +88,8 @@ cs:
   ComplexTableField.ss:
     ADDITEM: 'Přidat %s'
     NOITEMSFOUND: 'Žádné položky'
-    SORTASC: 'Třídit vzestupně'
+    SORTASC: 'Řadit vzestupně'
-    SORTDESC: 'Třídit sestupně'
+    SORTDESC: 'Řadit sestupně'
   ComplexTableField_popup.ss:
     NEXT: Další
     PREVIOUS: Předchozí
@@ -128,7 +127,7 @@ cs:
     NOTSET: nenastaveno
     TODAY: dnes
     VALIDDATEFORMAT2: 'Prosím zadejte platný formát datumu ({format})'
-    VALIDDATEMAXDATE: 'Váš datum musí být starší nebo odpovídající miximu povoleného datumu ({date})'
+    VALIDDATEMAXDATE: 'Váš datum musí být starší nebo odpovídající maximu povoleného datumu ({date})'
     VALIDDATEMINDATE: 'Váš datum musí být novější nebo odpovídající minimu povoleného datumu ({date})'
   DatetimeField:
     NOTSET: Nenastaveno
@@ -137,7 +136,7 @@ cs:
   DropdownField:
     CHOOSE: (Vyberte)
   EmailField:
-    VALIDATION: 'Prosím zadejte email adresu'
+    VALIDATION: 'Prosím zadejte e-mailovou adresu'
   Email_BounceRecord:
     PLURALNAME: 'Záznamy vrácené pošty'
     SINGULARNAME: 'Záznam vrácené pošty'
@@ -178,7 +177,7 @@ cs:
   FileIFrameField:
     ATTACH: 'Připojit {type}'
     ATTACHONCESAVED: '{type} je možné připojit až budete mít nejdříve uložen záznam.'
-    ATTACHONCESAVED2: 'Soubor je možné připojit až budete mít nejdříve uložen záznam.'
+    ATTACHONCESAVED2: 'Soubory je možné připojit až budete mít nejdříve uložen záznam.'
     DELETE: 'Smazat {type}'
     DISALLOWEDFILETYPE: 'Tento typ souboru není povoleno náhrát'
     FILE: Soubor
@@ -194,9 +193,9 @@ cs:
     PLURALNAME: Složky
     SINGULARNAME: Složka
   ForgotPasswordEmail.ss:
-    HELLO: Ahoj
+    HELLO: 'Dobrý den'
-    TEXT1: 'Zde je váš'
+    TEXT1: 'Zde je Váš'
-    TEXT2: 'Odkaz pro resetování hesla'
+    TEXT2: 'odkaz na reset hesla'
     TEXT3: pro
   Form:
     FIELDISREQUIRED: '%s je požadováno.'
@@ -205,7 +204,7 @@ cs:
     VALIDATIONNOTUNIQUE: 'Zadaná hodnota není unikátní'
     VALIDATIONPASSWORDSDONTMATCH: 'Hesla se neshodují'
     VALIDATIONPASSWORDSNOTEMPTY: 'Hesla nemohou být prázdná'
-    VALIDATIONSTRONGPASSWORD: 'Hesla musí obsahovat nejméně jednu číslici a jeden alfanumerický znak.'
+    VALIDATIONSTRONGPASSWORD: 'Hesla musí obsahovat alespoň jednu číslici a jedno písmeno.'
     VALIDATOR: Validátor
     VALIDCURRENCY: 'Prosím zadejte platnou měnu'
   FormField:
@@ -213,7 +212,7 @@ cs:
   GridAction:
     DELETE_DESCRIPTION: Smazat
     Delete: Smazat
-    UnlinkRelation: Rozpojit
+    UnlinkRelation: Odpojit
   GridField:
     Add: 'Přidat {name}'
     Filter: Filtr
@@ -258,7 +257,7 @@ cs:
     many_many_Members: Členové
   GroupImportForm:
     Help1: '<p>Import jedné nebo více skupin v <em>CSV</em> formátu (čárkou-oddělené hodnoty). <small><a href="#" class="toggle-advanced">Zobrazit rozšířené použití</a></small></p>'
-    Help2: "<div class=\"advanced\">\\n<h4>Pokročilé použití</h4>\\n<ul>\\n<li>Povolené sloupce: <em>%s</em></li>\\n<li>Existující skupiny jsou porovnávány jejich unikátní hodnotou <em>Code</em>, a aktualizovány novými hodnotami z importovaného souboru.</li>\\n<li>Hierarchie skupin mohou být vytvořeny použitím sloupce <em>ParentCode</em>.</li>\\n<li>Kódy práv mohou být připojeny sloupcem <em>PermissionCode</em>. Existující kódy práv nejsou vymazány.</li>\\n</ul>\\n</div>"
+    Help2: "<div class=\"advanced\">\\n<h4>Pokročilé použití</h4>\\n<ul>\\n<li>Povolené sloupce: <em>%s</em></li>\\n<li>Existující skupiny jsou porovnány jejich unikátní vlastností <em>Code</em>, a aktualizovány s novými hodnotami z\\nimportovaného souboru.</li>\\n<li>Hierarchie skupin může být tvořena použitím sloupce <em>ParentCode</em>.</li>\\n<li>Kódy oprávnění mohou být přiřazeny sloupcem <em>PermissionCode</em>. Existující oprávnění nejsou smazána.</li>\\n</ul>\\n</div>"
     ResultCreated: 'Vytvořeno {count} skupin'
     ResultDeleted: 'Smazáno %d skupin'
     ResultUpdated: 'Aktualizováno %d skupin'
@@ -283,7 +282,7 @@ cs:
     FILE: Soubor
     FOLDER: Složka
     FROMCMS: 'Z CMS'
-    FROMCOMPUTER: 'Z vašeho počítače'
+    FROMCOMPUTER: 'Z tvého počítače'
     FROMWEB: 'Z webu'
     FindInFolder: 'Hledat ve složce'
     IMAGEALT: 'Alternativní text (alt)'
@@ -292,7 +291,7 @@ cs:
     IMAGEDIMENSIONS: Rozměry
     IMAGEHEIGHTPX: Výška
     IMAGETITLE: 'Titul text (tooltip) - další informace o obrázku'
-    IMAGETITLETEXT: 'Text titulku (tooltip)'
+    IMAGETITLETEXT: 'Titulek textu (tooltip)'
     IMAGETITLETEXTDESC: 'Pro další informace o obrázku'
     IMAGEWIDTHPX: Šířka
     INSERTMEDIA: 'Vložit média'
@@ -322,7 +321,7 @@ cs:
   LeftAndMain:
     CANT_REORGANISE: 'Nemáte oprávnění měnit stránky nejvyšší úrovně. Vaše změna nebyla uložena.'
     DELETED: Smazáno.
-    DropdownBatchActionsDefault: Akce
+    DropdownBatchActionsDefault: Akcie
     HELP: Nápověda
     PAGETYPE: 'Typ stránky:'
     PERMAGAIN: 'Byli jste odhlášeni z CMS. Pokud se chcete znovu přihlásit, zadejte níže své uživatelské jméno a heslo.'
@@ -332,27 +331,28 @@ cs:
     PreviewButton: Náhled
     REORGANISATIONSUCCESSFUL: 'Strom webu reorganizován úspěšně.'
     SAVEDUP: Uloženo.
-    VersionUnknown: neznámé
+    VersionUnknown: neznáme
   LeftAndMain_Menu.ss:
     Hello: Ahoj
-    LOGOUT: Odhlášení
+    LOGOUT: 'Odhlásit se'
   LoginAttempt:
     Email: 'Emailové adresy'
     IP: 'IP adresy'
     PLURALNAME: 'Pokusy přihlášení'
     SINGULARNAME: 'Pokus přihlášení'
-    Status: Stav
+    Status: Status
   Member:
     ADDGROUP: 'Přidat skupinu'
     BUTTONCHANGEPASSWORD: 'Změnit heslo'
     BUTTONLOGIN: 'Přihlásit se'
     BUTTONLOGINOTHER: 'Přihlásit se jako někdo jiný'
     BUTTONLOSTPASSWORD: 'Zapomněl jsem heslo'
+    CANTEDIT: 'Nemáte oprávnění toto vykonat'
     CONFIRMNEWPASSWORD: 'Potvrďte nové heslo'
     CONFIRMPASSWORD: 'Potvrďte heslo'
     DATEFORMAT: 'Formát datumu'
     DefaultAdminFirstname: 'Implicitní Admin'
-    DefaultDateTime: implicitní
+    DefaultDateTime: výchozí
     EMAIL: Email
     EMPTYNEWPASSWORD: 'Nové heslo nesmí být prázdné, zkuste to znovu'
     ENTEREMAIL: 'Zadejte e-mailovou adresu pro získání odkazu na restart hesla.'
@@ -367,7 +367,6 @@ cs:
     NEWPASSWORD: 'Nové heslo'
     PASSWORD: Heslo
     PLURALNAME: Členové
-    PROFILESAVESUCCESS: 'Úspěšně uloženo'
     REMEMBERME: 'Zapamatovat si mě pro příště?'
     SINGULARNAME: Člen
     SUBJECTPASSWORDCHANGED: 'Vaše heslo bylo změněno'
@@ -390,8 +389,8 @@ cs:
   MemberDatetimeOptionsetField:
     AMORPM: 'AM (před polednem) nebo PM (odpoledne)'
     'APPLY FILTER': 'Použít filtr'
-    Custom: Vlastní
+    Custom: Uživatelské
-    DATEFORMATBAD: 'Formát datumu není platný'
+    DATEFORMATBAD: 'Formát datumu je neplatný'
     DAYNOLEADING: 'Den měsíce bez úvodní nuly'
     DIGITSDECFRACTIONSECOND: 'Jedna nebo více číslic zastupující desetinný zlomek vteřiny'
     FOURDIGITYEAR: 'Čtyřčíslí roku'
@@ -405,29 +404,30 @@ cs:
     TWODIGITDAY: 'Dvojčíslí dne měsíce'
     TWODIGITHOUR: 'Dvojčíslí hodiny (00 až 23)'
     TWODIGITMINUTE: 'Dvojčíslí minuty (00 až 59)'
-    TWODIGITMONTH: 'Dvojčíslí měséce (01=Leden, atď.)'
+    TWODIGITMONTH: 'Dvojčíslí měsíce (01=Leden, atď.)'
     TWODIGITSECOND: 'Dvojčíslí vteřiny (00 až 59)'
     TWODIGITYEAR: 'Dvojčíslí roku'
   MemberImportForm:
     Help1: '<p>Import členů v <em>CSV formátu</em> (čárkou-oddělené hodnoty). <small><a href="#" class="toggle-advanced">Zobrazit rozšířené použití</a></small></p>'
-    Help2: "<div class=\"advanced\">\\n<h4>Pokročilé použití</h4>\\n<ul>\\n<li>Povolené sloupce: <em>%s</em></li>\\n<li>Existující uživatelé jsou porovnáváni podle jejich unikátní hodnoty <em>Code</em>y, a aktualizováni novými hodnotami z importovaného souboru.</li>\\n<li>Skupiny mohou být připojeny ze sloupce <em>Groups</em>. Skupiny jsou identifikovány jejich honotou <em>Code</em>, vícero skupin může být odděleno čárkou. Existující skupinové členství nejsou vymazány.</li>\\n</ul>\\n</div>"
+    Help2: "<div class=\"advanced\">\\n<h4>Pokročilé použití</h4>\\n<ul>\\n<li>Povolené sloupce: <em>%s</em></li>\\n<li>Existující uživatelé jsou porovnáni jejich unikátní vlastností <em>Code</em>, a aktualizováni s novými hodnotami z importovaného souboru.</li>\\n<li>Skupiny mohou být přiřazeny sloupcem <em>Groups</em>. Skupiny jsou identifikovány svojí vlastností <em>Code</em>, více skupin může být odděleno čárkou. Existující členství ve skupině nejsou smazána.</li>\\n</ul>\\n</div>"
     ResultCreated: 'Vytvořeno {count} členů'
     ResultDeleted: 'Smazáno %d členů'
     ResultNone: 'Žádné změny'
     ResultUpdated: 'Aktualizováno {count} členů'
   MemberPassword:
-    PLURALNAME: 'Členské hesla'
+    PLURALNAME: 'Členská hesla'
     SINGULARNAME: 'Členské heslo'
   MemberTableField: null
   ModelAdmin:
     DELETE: Smazat
     DELETEDRECORDS: 'Smazáno {count} záznamů.'
+    EMPTYBEFOREIMPORT: 'Vyčistit databázi před importováním'
     IMPORT: 'Importovat ze souboru CSV'
     IMPORTEDRECORDS: 'Importováno {count} záznamů.'
     NOCSVFILE: 'Prosím, vyhledejte soubor CSV pro import'
     NOIMPORT: 'Nic k importu'
     RESET: Resetovat
-    Title: 'Modely dat'
+    Title: 'Datové modely'
     UPDATEDRECORDS: 'Aktualizováno {count} záznamů.'
   ModelAdmin_ImportSpec.ss:
     IMPORTSPECFIELDS: 'Sloupce databáze'
@@ -435,11 +435,11 @@ cs:
     IMPORTSPECRELATIONS: Relace
     IMPORTSPECTITLE: 'Specifikace pro %s'
   ModelAdmin_Tools.ss:
-    FILTER: Filtr
+    FILTER: Filtrovat
     IMPORT: Importovat
   ModelSidebar.ss:
     IMPORT_TAB_HEADER: Importovat
-    SEARCHLISTINGS: Vyhledat
+    SEARCHLISTINGS: Hledat
   MoneyField:
     FIELDLABELAMOUNT: Částka
     FIELDLABELCURRENCY: Měna
@@ -454,12 +454,12 @@ cs:
     AdminGroup: Administrátor
     CMS_ACCESS_CATEGORY: 'Přístup CMS'
     FULLADMINRIGHTS: 'Plná administrátorská práva'
-    FULLADMINRIGHTS_HELP: 'Znamená, a přepíše všechny ostatní přidělená oprávnění.'
+    FULLADMINRIGHTS_HELP: 'Znamená, a přepíše všechna ostatní přidělená oprávnění.'
     PLURALNAME: Oprávnění
     SINGULARNAME: Oprávnění
   PermissionCheckboxSetField:
-    AssignedTo: 'přiděleno "{title}"'
+    AssignedTo: 'přiděleno k "{title}"'
-    FromGroup: 'zděděno ze skupiny "{title}"'
+    FromGroup: 'zdědeno ze skupiny "{title}"'
     FromRole: 'zdědeno z role "{title}"'
     FromRoleOnGroup: 'děděno z role "%s" ve skupině "%s"'
   PermissionRole:
@@ -468,10 +468,11 @@ cs:
     SINGULARNAME: Role
     Title: Název
   PermissionRoleCode:
-    PLURALNAME: 'Kódy oprávnění role'
+    PLURALNAME: 'Kódy role oprávnění'
-    SINGULARNAME: 'Kód oprávnění role'
+    SINGULARNAME: 'Kód role oprávnění'
   Permissions:
     PERMISSIONS_CATEGORY: 'Role a přístupová práva'
+    UserPermissionsIntro: 'Přiřazení skupin tomuto uživatelovi upraví oprávnění, které má. Podívejte se sekcie skupiny pro podrobnosti o oprávněních k jednotlivým skupinám.'
   PhoneNumberField:
     VALIDATION: 'Prosím zadejte platné telefonní číslo'
   RelationComplexTableField.ss:
@@ -499,10 +500,10 @@ cs:
     EDITPERMISSIONS: 'Upravit oprávnění pro skupiny'
     EDITPERMISSIONS_HELP: 'Možnost editovat oprávnění a IP adresy pro skupinu. Vyžaduje oprávnění  pro "Přístup do sekce ''Bezpečnost''".'
     GROUPNAME: 'Jméno skupiny'
-    IMPORTGROUPS: 'Import skupin'
+    IMPORTGROUPS: 'Importovat skupiny'
-    IMPORTUSERS: 'Import uživatelů'
+    IMPORTUSERS: 'Importovat uživaté'
     MEMBERS: Členové
-    MENUTITLE: Zabezpečení
+    MENUTITLE: Bezbečnost
     MemberListCaution: 'Varování: Odstranění členů z tohoto seznamu způsobí, že členové budou odtraněni ze všech skupin a databáze'
     NEWGROUP: 'Nová skupina'
     PERMISSIONS: Práva
@@ -520,14 +521,14 @@ cs:
   SiteTree:
     TABMAIN: Hlavní
   TableField:
-    ISREQUIRED: 'V %s ''%s'' je požadováno'
+    ISREQUIRED: 'V %s ''%s je požadováno'
   TableField.ss:
     ADD: 'Přidat nový řádek'
     ADDITEM: 'Přidat %s'
   TableListField:
     CSVEXPORT: 'Exportovat do souboru CSV'
     PRINT: Vytisknout
-    Print: Vytisknout
+    Print: Tisk
     SELECT: 'Vybrat:'
   TableListField.ss:
     NOITEMSFOUND: 'Žádné položky'
@@ -549,7 +550,7 @@ cs:
   UploadField:
     ATTACHFILE: 'Připojit soubor'
     ATTACHFILES: 'Připojit soubory'
-    AttachFile: 'Attach a file'
+    AttachFile: 'Připojit soubor(y)'
     DELETE: 'Smazat ze souborů'
     DELETEINFO: 'Trvale odstranit tento soubor z úložiště souborů'
     DOEDIT: Uložit
@@ -567,7 +568,7 @@ cs:
     MAXNUMBEROFFILESSHORT: 'Můžete nahrát pouze {count} souborů'
     REMOVE: Odstranit
     REMOVEERROR: 'Chyba odstranění souboru'
-    REMOVEINFO: 'Odtranit tento soubor odsud, ale nesmazat ho z ůložiště souborů'
+    REMOVEINFO: 'Odtranit tento soubor odsud, ale nesmazat ho z úložiště souborů'
     STARTALL: 'Začni vše'
     STARTALLINFO: 'Začni vše nahrávat'
     Saved: Uloženo

lang/da.yml

@@ -1,7 +1,6 @@
 da:
   AssetAdmin:
-    ADDFILES: 'Add files'
+    ALLOWEDEXTS: 'Allowed extensions'
-    EditOrgMenu: 'Edit & organize'
     NEWFOLDER: 'Ny mappe'
   AssetTableField:
     CREATED: 'Først uploadet'
@@ -72,7 +71,7 @@ da:
     ACCESSALLINTERFACESHELP: 'Overrules more specific access settings.'
     SAVE: Gem
   CMSProfileController:
-    MENUTITLE: CMSProfileController
+    MENUTITLE: 'My Profile'
   ChangePasswordEmail.ss:
     CHANGEPASSWORDTEXT1: 'You changed your password for'
     CHANGEPASSWORDTEXT2: 'You can now use the following credentials to log in:'
@@ -234,7 +233,7 @@ da:
   GridFieldDetailForm:
     CancelBtn: Cancel
     Create: Create
-    Delete: Slet
+    Delete: Delete
     DeletePermissionsFailure: 'No delete permissions'
     Deleted: 'Deleted %s %s'
     Save: Save
@@ -258,7 +257,7 @@ da:
     many_many_Members: 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>'
-    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>'
+    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'
     ResultUpdated: 'Updated %d groups'
@@ -348,6 +347,7 @@ da:
     BUTTONLOGIN: 'Log in'
     BUTTONLOGINOTHER: 'Log in as someone else'
     BUTTONLOSTPASSWORD: 'I''ve lost my password'
+    CANTEDIT: 'You don''t have permission to do that'
     CONFIRMNEWPASSWORD: 'Confirm New Password'
     CONFIRMPASSWORD: 'Confirm Password'
     DATEFORMAT: 'Date format'
@@ -367,7 +367,6 @@ da:
     NEWPASSWORD: 'New Password'
     PASSWORD: Password
     PLURALNAME: Members
-    PROFILESAVESUCCESS: 'Successfully saved.'
     REMEMBERME: 'Remember me next time?'
     SINGULARNAME: Member
     SUBJECTPASSWORDCHANGED: 'Your password has been changed'
@@ -410,7 +409,7 @@ da:
     TWODIGITYEAR: 'Two-digit year'
   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>'
+    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'
     ResultNone: 'No changes'
@@ -422,6 +421,7 @@ da:
   ModelAdmin:
     DELETE: Slet
     DELETEDRECORDS: 'Deleted {count} records.'
+    EMPTYBEFOREIMPORT: 'Clear Database before import'
     IMPORT: 'Importer fra CSV'
     IMPORTEDRECORDS: 'Imported {count} records.'
     NOCSVFILE: 'Tryk p&aring; Gennemse for at v&aelig;lge en CSVfil til importering'
@@ -472,6 +472,7 @@ da:
     SINGULARNAME: 'Permission Role Code'
   Permissions:
     PERMISSIONS_CATEGORY: 'Roles and access permissions'
+    UserPermissionsIntro: 'Assigning groups to this user will adjust the permissions they have. See the groups section for details of permissions on individual groups.'
   PhoneNumberField:
     VALIDATION: 'Please enter a valid phone number'
   RelationComplexTableField.ss:
@@ -549,7 +550,7 @@ da:
   UploadField:
     ATTACHFILE: 'Attach a file'
     ATTACHFILES: 'Attach files'
-    AttachFile: 'Attach a file'
+    AttachFile: 'Attach file(s)'
     DELETE: 'Delete from files'
     DELETEINFO: 'Permanently delete this file from the file store'
     DOEDIT: Save

lang/de.yml

@@ -1,7 +1,6 @@
 de:
   AssetAdmin:
-    ADDFILES: 'Dateien hinzufügen'
+    ALLOWEDEXTS: 'Allowed extensions'
-    EditOrgMenu: 'Bearbeiten und organisieren'
     NEWFOLDER: 'Neuer Ordner'
   AssetTableField:
     CREATED: 'Erstmalig hochgeladen'
@@ -23,7 +22,7 @@ de:
     EDITINFO: 'Dateien bearbeiten'
     FILES: Dateien
     FROMCOMPUTER: 'Dateien auf Ihrem Computer auswählen'
-    FROMCOMPUTERINFO: 'Von ihrem Computer hochladen'
+    FROMCOMPUTERINFO: 'Von Ihrem Computer hochladen'
     TOTAL: Gesamt
     TOUPLOAD: 'Dateien für den Upload wählen...'
     UPLOADINPROGRESS: 'Bitte warten sie... Upload im Gang'
@@ -60,9 +59,9 @@ de:
     ERRORNOTADMIN: 'Dieser Nutzer ist kein Administrator'
     ERRORNOTREC: 'Dieser/s  Nutzername/Passwort wurde nicht erkannt'
   Boolean:
-    0: Falsch
+    0: Nein
     ANY: alle
-    1: Wahr
+    1: Ja
   CMSLoadingScreen.ss:
     LOADING: 'Lade Daten ...'
     REQUIREJS: 'Für die Benutzung des CMS wird JavaScript benötigt.'
@@ -72,7 +71,7 @@ de:
     ACCESSALLINTERFACESHELP: 'Hebt alle bereichspezifischen Berechtigungen auf.'
     SAVE: Speichern
   CMSProfileController:
-    MENUTITLE: CMSProfileController
+    MENUTITLE: 'Mein Profil'
   ChangePasswordEmail.ss:
     CHANGEPASSWORDTEXT1: 'Sie haben Ihr Passwort geändert für'
     CHANGEPASSWORDTEXT2: 'Sie können nun folgende Angaben benutzen um sich einzuloggen'
@@ -80,8 +79,8 @@ de:
     HELLO: Hi
     PASSWORD: Passwort
   CheckboxField:
-    - Falsch
+    - Nein
-    - Wahr
+    - Ja
   ComplexTableField:
     CLOSEPOPUP: 'Popup schließen'
     SUCCESSADD2: '{name} hinzugefügt'
@@ -163,7 +162,7 @@ de:
     MpgType: 'MPEG Videodatei'
     NOFILESIZE: 'Dateigröße ist 0 bytes'
     NOVALIDUPLOAD: 'Datei ist kein gültiger Upload'
-    Name: Dateiname
+    Name: Name
     PLURALNAME: Dateien
     PdfType: 'Adobe Acrobat PDF Datei'
     PngType: 'PNG Bild - vielseitig einsetzbar'
@@ -191,8 +190,8 @@ de:
   Filesystem:
     SYNCRESULTS: 'Synchronisation beendet: {createdcount} Objekte erstellt, {deletedcount} Objekte gelöscht'
   Folder:
-    PLURALNAME: Ordner
+    PLURALNAME: Folders
-    SINGULARNAME: 'In Ordner suchen'
+    SINGULARNAME: Ordner
   ForgotPasswordEmail.ss:
     HELLO: Hallo
     TEXT1: 'Hier ist Ihr'
@@ -235,7 +234,7 @@ de:
     CancelBtn: Abbrechen
     Create: Erstellen
     Delete: Löschen
-    DeletePermissionsFailure: 'Keine Berechtigung zum Löschen'
+    DeletePermissionsFailure: 'Keine Berechtigungen zum löschen'
     Deleted: 'Gelöscht %s %s'
     Save: Speichern
     Saved: 'Gespeichert %s %s'
@@ -249,16 +248,16 @@ de:
     GroupReminder: 'Bei Zuweisung einer Übergruppe werden alle ihre Rollen übernommen'
     Locked: 'Gesperrt?'
     NoRoles: 'Keine Rollen gefunden'
-    PLURALNAME: 'Gruppen importieren'
+    PLURALNAME: Gruppen
     Parent: Elterngruppe
     RolesAddEditLink: 'Rollen hinzufügen/editieren'
-    SINGULARNAME: 'Gruppen Code'
+    SINGULARNAME: Gruppe
     Sort: Sortierreihenfolge
     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>'
+    Help2: "<div class=\"advanced\">\\n<h4>Erweiterte Benutzung</h4>\\n<ul>\\n<li>Gültige Spalten: <em>%s</em></li>\\n<li>Bereits existierende Gruppen werden anhand ihres eindeutigen <em>Code</em> identifiziert und um neue Einträge aus der Importdatei erweitert.</li>\\n<li>Berechtigungen können in der Spalte <em>PermissioinCode</em> hinzugefügt werden.  Schon zugewiesene Berechtigungen werden nicht entfernt.</li>\\n</ul>\\n</div>"
     ResultCreated: '{count} Gruppe(n) wurden erstellt'
     ResultDeleted: '%d Gruppen gelöscht'
     ResultUpdated: '%d Gruppen aktualisiert'
@@ -310,13 +309,13 @@ de:
     URLNOTANOEMBEDRESOURCE: 'Die URL ''{url}'' konnte nicht in eine Medienquelle umgewandelt werden'
     UpdateMEDIA: 'Medienobjekt aktualisieren'
   Image:
-    PLURALNAME: 'Von "Dateien"'
+    PLURALNAME: Dateien
     SINGULARNAME: Datei
   ImageField:
     IMAGE: Bild
   Image_Cached:
-    PLURALNAME: 'Von "Dateien"'
+    PLURALNAME: Dateien
-    SINGULARNAME: 'Datei anhängen'
+    SINGULARNAME: Datei
   Image_iframe.ss:
     TITLE: 'Iframe Bilder hochladen'
   LeftAndMain:
@@ -334,7 +333,7 @@ de:
     SAVEDUP: Gespeichert.
     VersionUnknown: Unbekannt
   LeftAndMain_Menu.ss:
-    Hello: Hallo
+    Hello: Hi
     LOGOUT: Ausloggen
   LoginAttempt:
     Email: E-Mail-Adresse
@@ -348,6 +347,7 @@ de:
     BUTTONLOGIN: Einloggen
     BUTTONLOGINOTHER: 'Als jemand anders einloggen'
     BUTTONLOSTPASSWORD: 'Ich habe mein Passwort vergessen'
+    CANTEDIT: 'You don''t have permission to do that'
     CONFIRMNEWPASSWORD: 'Neues Passwort bestätigen'
     CONFIRMPASSWORD: 'Passwort bestätigen'
     DATEFORMAT: 'Bitte geben sie das Datum im korrekten Format ein ({format})'
@@ -367,7 +367,6 @@ de:
     NEWPASSWORD: 'Neues Passwort'
     PASSWORD: Passwort
     PLURALNAME: Benutzer
-    PROFILESAVESUCCESS: 'Erfolgreich gespeichert.'
     REMEMBERME: 'Für das nächste Mal merken?'
     SINGULARNAME: Benutzer
     SUBJECTPASSWORDCHANGED: 'Ihr Passwort wurde geändert'
@@ -410,7 +409,7 @@ de:
     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>'
+    Help2: "<div class=\"advanced\">\\n<h4>Erweiterte Benutzung</h4>\\n<ul>\\n<li>Gültige Spalten: <em>%s</em></li>\\n<li>Bereits existierende Benutzer werden anhand ihres eindeutigen <em>Code</em> identifiziert und um neue Einträge aus der Importdatei erweitert.</li>\\n<li>Gruppen können in der Spalte <em>Gruppen</em> hinzugefügt werden. Gruppen werden anhand ihres <em>Code</em> erkannt. Mehrere Gruppen werden Komma-separiert eingetragen. Schon zugewiesene Gruppen werden nicht entfernt.</li>\\n</ul>\\n</div>"
     ResultCreated: '{count} Mitglied(er) wurden erstellt'
     ResultDeleted: '%d Mitglieder gelöscht'
     ResultNone: 'Keine Änderungen'
@@ -422,6 +421,7 @@ de:
   ModelAdmin:
     DELETE: Löschen
     DELETEDRECORDS: '{count} Datensätze wurden gelöscht.'
+    EMPTYBEFOREIMPORT: 'Datenbank vor Import leeren'
     IMPORT: 'CSV Import'
     IMPORTEDRECORDS: '{count} Datensätze wurden importiert.'
     NOCSVFILE: 'Wählen Sie eine CSV-Datei zum Importieren'
@@ -431,9 +431,9 @@ de:
     UPDATEDRECORDS: '{count} Datensätze wurden aktualisiert.'
   ModelAdmin_ImportSpec.ss:
     IMPORTSPECFIELDS: Datenbankspalten
-    IMPORTSPECLINK: 'Spezifikation von %s anzeigen'
+    IMPORTSPECLINK: 'Beschreibung von %s anzeigen'
     IMPORTSPECRELATIONS: Relationen
-    IMPORTSPECTITLE: 'Spezifikation von %s'
+    IMPORTSPECTITLE: 'Beschreibung von %s'
   ModelAdmin_Tools.ss:
     FILTER: Filter
     IMPORT: Importieren
@@ -449,14 +449,14 @@ de:
     VALIDATION: '''{value}'' ist kein numerischer Wert, nur nummerische Werte sind in diesem Feld erlaubt'
   Pagination:
     Page: Seite
-    View: Anzeige
+    View: Anzeigen
   Permission:
     AdminGroup: Administrator
     CMS_ACCESS_CATEGORY: 'CMS Zugriff'
     FULLADMINRIGHTS: 'Unbeschränkte Administratorenrechte'
     FULLADMINRIGHTS_HELP: 'Schließt alle anderen verfügbaren Berechtigungen ein'
     PLURALNAME: Berechtigungen
-    SINGULARNAME: Berechtigung
+    SINGULARNAME: Zugriffsberechtigung
   PermissionCheckboxSetField:
     AssignedTo: 'Zugewiesen an "{title}"'
     FromGroup: 'abgeleited von Gruppe "{title}"'
@@ -464,7 +464,7 @@ de:
     FromRoleOnGroup: 'geerbt von Rolle "%s" für die Gruppe "%s"'
   PermissionRole:
     OnlyAdminCanApply: 'Nur Adminstratoren können beitreten'
-    PLURALNAME: 'Keine Rollen gefunden'
+    PLURALNAME: Rollen
     SINGULARNAME: Rolle
     Title: Titel
   PermissionRoleCode:
@@ -472,12 +472,13 @@ de:
     SINGULARNAME: Berechtigungsrollencode
   Permissions:
     PERMISSIONS_CATEGORY: 'Rollen und Zugriffsberechtigungen'
+    UserPermissionsIntro: 'Durch das Hinzufügen von Benutzern zu Gruppen, werden dessen Rechte angepasst. Mehr Informationen über die Berechtigungen der einzelnen Gruppen erhältst Du im Abschnitt Gruppen.'
   PhoneNumberField:
     VALIDATION: 'Bitte geben Sie eine gültige Telefonnummer ein'
   RelationComplexTableField.ss:
     ADD: Hinzufügen
     CSVEXPORT: 'Als CSV exportieren'
-    NOTFOUND: 'Keine Elemente gefunden.'
+    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'

lang/el.yml

@@ -1,7 +1,6 @@
 el:
   AssetAdmin:
-    ADDFILES: 'Add files'
+    ALLOWEDEXTS: 'Allowed extensions'
-    EditOrgMenu: 'Edit & organize'
     NEWFOLDER: NewFolder
   AssetTableField:
     CREATED: 'First uploaded'
@@ -72,7 +71,7 @@ el:
     ACCESSALLINTERFACESHELP: 'Overrules more specific access settings.'
     SAVE: Αποθήκευση
   CMSProfileController:
-    MENUTITLE: CMSProfileController
+    MENUTITLE: 'My Profile'
   ChangePasswordEmail.ss:
     CHANGEPASSWORDTEXT1: 'You changed your password for'
     CHANGEPASSWORDTEXT2: 'You can now use the following credentials to log in:'
@@ -258,7 +257,7 @@ el:
     many_many_Members: 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>'
-    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>'
+    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'
     ResultUpdated: 'Updated %d groups'
@@ -348,6 +347,7 @@ el:
     BUTTONLOGIN: 'Log in'
     BUTTONLOGINOTHER: 'Log in as someone else'
     BUTTONLOSTPASSWORD: 'I''ve lost my password'
+    CANTEDIT: 'You don''t have permission to do that'
     CONFIRMNEWPASSWORD: 'Confirm New Password'
     CONFIRMPASSWORD: 'Confirm Password'
     DATEFORMAT: 'Date format'
@@ -367,7 +367,6 @@ el:
     NEWPASSWORD: 'New Password'
     PASSWORD: Password
     PLURALNAME: Members
-    PROFILESAVESUCCESS: 'Successfully saved.'
     REMEMBERME: 'Remember me next time?'
     SINGULARNAME: Member
     SUBJECTPASSWORDCHANGED: 'Your password has been changed'
@@ -410,7 +409,7 @@ el:
     TWODIGITYEAR: 'Two-digit year'
   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>'
+    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'
     ResultNone: 'No changes'
@@ -422,6 +421,7 @@ el:
   ModelAdmin:
     DELETE: Delete
     DELETEDRECORDS: 'Deleted {count} records.'
+    EMPTYBEFOREIMPORT: 'Clear Database before import'
     IMPORT: 'Import from CSV'
     IMPORTEDRECORDS: 'Imported {count} records.'
     NOCSVFILE: 'Please browse for a CSV file to import'
@@ -472,6 +472,7 @@ el:
     SINGULARNAME: 'Permission Role Code'
   Permissions:
     PERMISSIONS_CATEGORY: 'Roles and access permissions'
+    UserPermissionsIntro: 'Assigning groups to this user will adjust the permissions they have. See the groups section for details of permissions on individual groups.'
   PhoneNumberField:
     VALIDATION: 'Please enter a valid phone number'
   RelationComplexTableField.ss:
@@ -549,7 +550,7 @@ el:
   UploadField:
     ATTACHFILE: 'Attach a file'
     ATTACHFILES: 'Attach files'
-    AttachFile: 'Attach a file'
+    AttachFile: 'Attach file(s)'
     DELETE: 'Delete from files'
     DELETEINFO: 'Permanently delete this file from the file store'
     DOEDIT: Save

lang/en.yml

@@ -1,7 +1,6 @@
 en:
   AssetAdmin:
-    ADDFILES: 'Add files'
+    ALLOWEDEXTS: 'Allowed extensions'
-    EditOrgMenu: 'Edit & organize'
     NEWFOLDER: NewFolder
   AssetTableField:
     CREATED: 'First uploaded'
@@ -349,6 +348,7 @@ en:
     BUTTONLOGIN: 'Log in'
     BUTTONLOGINOTHER: 'Log in as someone else'
     BUTTONLOSTPASSWORD: 'I''ve lost my password'
+    CANTEDIT: 'You don''t have permission to do that'
     CONFIRMNEWPASSWORD: 'Confirm New Password'
     CONFIRMPASSWORD: 'Confirm Password'
     DATEFORMAT: 'Date format'
@@ -368,7 +368,6 @@ en:
     NEWPASSWORD: 'New Password'
     PASSWORD: Password
     PLURALNAME: Members
-    PROFILESAVESUCCESS: 'Successfully saved.'
     REMEMBERME: 'Remember me next time?'
     SINGULARNAME: Member
     SUBJECTPASSWORDCHANGED: 'Your password has been changed'

lang/en_GB.yml

@@ -1,7 +1,6 @@
 en_GB:
   AssetAdmin:
-    ADDFILES: 'Add files'
+    ALLOWEDEXTS: 'Allowed extensions'
-    EditOrgMenu: 'Edit & organize'
     NEWFOLDER: NewFolder
   AssetTableField:
     CREATED: 'First uploaded'
@@ -72,7 +71,7 @@ en_GB:
     ACCESSALLINTERFACESHELP: 'Overrules more specific access settings.'
     SAVE: Save
   CMSProfileController:
-    MENUTITLE: CMSProfileController
+    MENUTITLE: 'My Profile'
   ChangePasswordEmail.ss:
     CHANGEPASSWORDTEXT1: 'You changed your password for'
     CHANGEPASSWORDTEXT2: 'You can now use the following credentials to log in:'
@@ -258,7 +257,7 @@ en_GB:
     many_many_Members: 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>'
-    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>'
+    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'
     ResultUpdated: 'Updated %d groups'
@@ -348,6 +347,7 @@ en_GB:
     BUTTONLOGIN: 'Log in'
     BUTTONLOGINOTHER: 'Log in as someone else'
     BUTTONLOSTPASSWORD: 'I''ve lost my password'
+    CANTEDIT: 'You don''t have permission to do that'
     CONFIRMNEWPASSWORD: 'Confirm New Password'
     CONFIRMPASSWORD: 'Confirm Password'
     DATEFORMAT: 'Date format'
@@ -367,7 +367,6 @@ en_GB:
     NEWPASSWORD: 'New Password'
     PASSWORD: Password
     PLURALNAME: Members
-    PROFILESAVESUCCESS: 'Successfully saved.'
     REMEMBERME: 'Remember me next time?'
     SINGULARNAME: Member
     SUBJECTPASSWORDCHANGED: 'Your password has been changed'
@@ -410,7 +409,7 @@ en_GB:
     TWODIGITYEAR: 'Two-digit year'
   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>'
+    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'
     ResultNone: 'No changes'
@@ -422,6 +421,7 @@ en_GB:
   ModelAdmin:
     DELETE: Delete
     DELETEDRECORDS: 'Deleted {count} records.'
+    EMPTYBEFOREIMPORT: 'Clear Database before import'
     IMPORT: 'Import from CSV'
     IMPORTEDRECORDS: 'Imported {count} records.'
     NOCSVFILE: 'Please browse for a CSV file to import'
@@ -472,6 +472,7 @@ en_GB:
     SINGULARNAME: 'Permission Role Code'
   Permissions:
     PERMISSIONS_CATEGORY: 'Roles and access permissions'
+    UserPermissionsIntro: 'Assigning groups to this user will adjust the permissions they have. See the groups section for details of permissions on individual groups.'
   PhoneNumberField:
     VALIDATION: 'Please enter a valid phone number'
   RelationComplexTableField.ss:

lang/eo.yml

@@ -1,7 +1,6 @@
 eo:
   AssetAdmin:
-    ADDFILES: 'Add files'
+    ALLOWEDEXTS: 'Allowed extensions'
-    EditOrgMenu: 'Edit & organize'
     NEWFOLDER: NewFolder
   AssetTableField:
     CREATED: 'Unue alŝutita'
@@ -21,7 +20,7 @@ eo:
     EDITALL: 'Edit all'
     EDITANDORGANIZE: 'Edit & organize'
     EDITINFO: 'Edit files'
-    FILES: Dosieroj
+    FILES: Files
     FROMCOMPUTER: 'Choose files from your computer'
     FROMCOMPUTERINFO: 'Upload from your computer'
     TOTAL: Total
@@ -60,9 +59,9 @@ eo:
     ERRORNOTADMIN: 'Tiu uzanto ne estas administranto.'
     ERRORNOTREC: 'Kiuj salutnomo / pasvorto ne estas rekonebla'
   Boolean:
-    0: 'False'
+    0: Ne
     ANY: Ajna
-    1: 'True'
+    1: Jes
   CMSLoadingScreen.ss:
     LOADING: Loading...
     REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
@@ -72,28 +71,28 @@ eo:
     ACCESSALLINTERFACESHELP: 'Nuligas pli specifajn alirajn agordojn.'
     SAVE: Konservi
   CMSProfileController:
-    MENUTITLE: CMSProfileController
+    MENUTITLE: 'My Profile'
   ChangePasswordEmail.ss:
-    CHANGEPASSWORDTEXT1: 'You changed your password for'
+    CHANGEPASSWORDTEXT1: 'Vi ŝanĝis vian pasvorton por'
-    CHANGEPASSWORDTEXT2: 'You can now use the following credentials to log in:'
+    CHANGEPASSWORDTEXT2: 'Nun vi povas uzi la jenan legitimaĵon por ensaluti:'
     EMAIL: Retpoŝto
-    HELLO: Hi
+    HELLO: Saluton
     PASSWORD: Pasvorto
   CheckboxField:
-    - 'False'
+    - Ne
-    - 'True'
+    - Jes
   ComplexTableField:
     CLOSEPOPUP: 'Fermi Ŝprucfenestron'
     SUCCESSADD2: 'Added {name}'
     SUCCESSEDIT: 'Konservita %s %s %s'
   ComplexTableField.ss:
-    ADDITEM: 'Add %s'
+    ADDITEM: 'Almeti je %s'
     NOITEMSFOUND: 'No items found'
-    SORTASC: 'Sort ascending'
+    SORTASC: 'Ordigi kreske'
-    SORTDESC: 'Sort descending'
+    SORTDESC: 'Ordigi malkreske'
   ComplexTableField_popup.ss:
-    NEXT: Next
+    NEXT: Sekva
-    PREVIOUS: Previous
+    PREVIOUS: Antaŭa
   ConfirmedPasswordField:
     ATLEAST: 'Passwords must be at least {min} characters long.'
     BETWEEN: 'Passwords must be {min} to {max} characters long.'
@@ -194,10 +193,10 @@ eo:
     PLURALNAME: Folders
     SINGULARNAME: Folder
   ForgotPasswordEmail.ss:
-    HELLO: Hi
+    HELLO: Saluton
-    TEXT1: 'Here is your'
+    TEXT1: 'Jen via'
-    TEXT2: 'password reset link'
+    TEXT2: 'pasvorta reagorda ligilo'
-    TEXT3: for
+    TEXT3: por
   Form:
     FIELDISREQUIRED: '%s estas postulita'
     SubmitBtnLabel: Go
@@ -234,7 +233,7 @@ eo:
   GridFieldDetailForm:
     CancelBtn: Cancel
     Create: Create
-    Delete: Forigi
+    Delete: Delete
     DeletePermissionsFailure: 'No delete permissions'
     Deleted: 'Deleted %s %s'
     Save: Save
@@ -258,7 +257,7 @@ eo:
     many_many_Members: Membroj
   GroupImportForm:
     Help1: '<p>Importi unu aŭ pliaj grupojn en formato <em>CSV</em> (perkome disigitaj valoroj values). <small><a href="#" class="toggle-advanced">Vidigi spertulan uzadon</a></small></p>'
-    Help2: '<div class="advanced"><h4>Spertula uzado</h4><ul><li>Permesitaj kolumnoj: <em>%s</em></li><li>Ekzistantaj grupoj estas kongrueblaj laŭ ili unika <em>Koda</em> valoro, kaj aktualigeblaj per eventualaj novaj valoroj el la importita dosiero</li><li>Grupaj hierarkioj estas kreeblaj per kolumno <em>PatroKodo</em>.</li><li>Permkodoj estas agordeblaj per kolumno <em>PermisKodo</em>. Ekzistantaj permiskodoj ne vakiĝos.</li></ul></div>'
+    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: 'Forigis %d grupojn'
     ResultUpdated: 'Aktualigis %d grupojn'
@@ -318,7 +317,7 @@ eo:
     PLURALNAME: Files
     SINGULARNAME: File
   Image_iframe.ss:
-    TITLE: 'Image Uploading Iframe'
+    TITLE: 'Iframe por alŝuti bildon'
   LeftAndMain:
     CANT_REORGANISE: 'You do not have permission to alter Top level pages. Your change was not saved.'
     DELETED: Deleted.
@@ -348,6 +347,7 @@ eo:
     BUTTONLOGIN: Ensaluti
     BUTTONLOGINOTHER: 'Ensaluti kiel alia homo'
     BUTTONLOSTPASSWORD: 'Mi perdis mian pasvorton'
+    CANTEDIT: 'You don''t have permission to do that'
     CONFIRMNEWPASSWORD: 'Konfirmu novan pasvorton'
     CONFIRMPASSWORD: 'Konfirmu pasvorton'
     DATEFORMAT: 'Date format'
@@ -367,7 +367,6 @@ eo:
     NEWPASSWORD: 'Novan pasvorton'
     PASSWORD: Pasvorto
     PLURALNAME: Membroj
-    PROFILESAVESUCCESS: 'Sukcese konservis.'
     REMEMBERME: 'Memoru min je la sekva fojo?'
     SINGULARNAME: Membro
     SUBJECTPASSWORDCHANGED: 'Via pasvorto estas ŝanĝita'
@@ -410,7 +409,7 @@ eo:
     TWODIGITYEAR: 'Two-digit year'
   MemberImportForm:
     Help1: '<p>Gravaj membroj en <em>CSV-formato</em> (perkome disigitaj valoroj ). <small><a href="#" class="toggle-advanced">Vidigi spertulan uzadon</a></small></p>'
-    Help2: '<div class="advanced"><h4>Spertula uzado</h4><ul><li>Permesitaj kolumnoj: <em>%s</em></li><li>Kongruas ekzistantajn membrojn laŭ ilia unika agordo <em>Kodo</em>, kaj aktualigas ilin laŭ eventualaj novaj valoroj el la importita dosiero.</li><li>Povas agordi grupojn laŭ la kolumno <em>Grupoj</em>. Identigas grupojn laŭ ilia agordo <em>Kodo</em>, povas apartigi pluroblan grupon per komoj. Ne vakigas ekzistantajn grupojn.</li></ul></div>'
+    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: 'Forigis %d membrojn'
     ResultNone: 'Neniu ŝanĝo'
@@ -422,6 +421,7 @@ eo:
   ModelAdmin:
     DELETE: Forigi
     DELETEDRECORDS: 'Deleted {count} records.'
+    EMPTYBEFOREIMPORT: 'Clear Database before import'
     IMPORT: 'Importi el CSV'
     IMPORTEDRECORDS: 'Imported {count} records.'
     NOCSVFILE: 'Bonvolu foliumi por CSV-dosiero importota'
@@ -472,10 +472,11 @@ eo:
     SINGULARNAME: 'Permission Role Code'
   Permissions:
     PERMISSIONS_CATEGORY: 'Roloj kaj aliraj permesoj'
+    UserPermissionsIntro: 'Assigning groups to this user will adjust the permissions they have. See the groups section for details of permissions on individual groups.'
   PhoneNumberField:
     VALIDATION: 'Bonvolu enigi validan telefonnumeron'
   RelationComplexTableField.ss:
-    ADD: Add
+    ADD: Enmeti
     CSVEXPORT: 'Export to CSV'
     NOTFOUND: 'No items found'
   Security:
@@ -522,12 +523,12 @@ eo:
   TableField:
     ISREQUIRED: 'In %s ''%s'' is required'
   TableField.ss:
-    ADD: 'Add a new row'
+    ADD: 'Enmeti novan vicon'
     ADDITEM: 'Add %s'
   TableListField:
     CSVEXPORT: 'Eksporti al CSV'
     PRINT: Presi
-    Print: Presi
+    Print: Print
     SELECT: 'Select:'
   TableListField.ss:
     NOITEMSFOUND: 'No items found'
@@ -549,7 +550,7 @@ eo:
   UploadField:
     ATTACHFILE: 'Attach a file'
     ATTACHFILES: 'Attach files'
-    AttachFile: 'Attach a file'
+    AttachFile: 'Attach file(s)'
     DELETE: 'Delete from files'
     DELETEINFO: 'Permanently delete this file from the file store'
     DOEDIT: Save

lang/es.yml

@@ -1,7 +1,6 @@
 es:
   AssetAdmin:
-    ADDFILES: 'Add files'
+    ALLOWEDEXTS: 'Allowed extensions'
-    EditOrgMenu: 'Edit & organize'
     NEWFOLDER: NuevaCarpeta
   AssetTableField:
     CREATED: 'Agregado por primera vez'
@@ -21,7 +20,7 @@ es:
     EDITALL: 'Edit all'
     EDITANDORGANIZE: 'Edit & organize'
     EDITINFO: 'Edit files'
-    FILES: Archivos
+    FILES: Files
     FROMCOMPUTER: 'Choose files from your computer'
     FROMCOMPUTERINFO: 'Upload from your computer'
     TOTAL: Total
@@ -72,7 +71,7 @@ es:
     ACCESSALLINTERFACESHELP: 'Overrules more specific access settings.'
     SAVE: Guardar
   CMSProfileController:
-    MENUTITLE: CMSProfileController
+    MENUTITLE: 'My Profile'
   ChangePasswordEmail.ss:
     CHANGEPASSWORDTEXT1: 'Has cambiado tu contraseña por'
     CHANGEPASSWORDTEXT2: 'Ahora puede utilizar los siguientes datos de acreditación para iniciar sesión:'
@@ -87,7 +86,7 @@ es:
     SUCCESSADD2: 'Added {name}'
     SUCCESSEDIT: 'Guardado %s %s %s'
   ComplexTableField.ss:
-    ADDITEM: 'Add %s'
+    ADDITEM: 'Agregar %s'
     NOITEMSFOUND: 'No items found'
     SORTASC: 'Orden Ascendente'
     SORTDESC: 'Orden Descendente'
@@ -181,7 +180,7 @@ es:
     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: Archivo
+    FILE: File
     FROMCOMPUTER: 'From your Computer'
     FROMFILESTORE: 'From the File Store'
     NOSOURCE: 'Please select a source file to attach'
@@ -234,7 +233,7 @@ es:
   GridFieldDetailForm:
     CancelBtn: Cancel
     Create: Create
-    Delete: Eliminar
+    Delete: Delete
     DeletePermissionsFailure: 'No delete permissions'
     Deleted: 'Deleted %s %s'
     Save: Save
@@ -258,7 +257,7 @@ es:
     many_many_Members: Miembros
   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>'
+    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: 'Se eliminaron %d grupos'
     ResultUpdated: 'Updated %d groups'
@@ -348,6 +347,7 @@ es:
     BUTTONLOGIN: 'Inicie Sesión'
     BUTTONLOGINOTHER: 'Inicie sesión como otra persona'
     BUTTONLOSTPASSWORD: 'He perdido mi contraseña'
+    CANTEDIT: 'You don''t have permission to do that'
     CONFIRMNEWPASSWORD: 'Confirmar Nueva Contraseña'
     CONFIRMPASSWORD: 'Confirmar Contraseña'
     DATEFORMAT: 'Date format'
@@ -367,7 +367,6 @@ es:
     NEWPASSWORD: 'Nueva Contraseña'
     PASSWORD: Contraseña
     PLURALNAME: Miembros
-    PROFILESAVESUCCESS: 'Guardado correctamente.'
     REMEMBERME: '¿Recordarme la próxima vez?'
     SINGULARNAME: Miembro
     SUBJECTPASSWORDCHANGED: 'Su contraseña ha sido cambiada'
@@ -410,7 +409,7 @@ es:
     TWODIGITYEAR: 'Two-digit year'
   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>'
+    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: 'Se eliminaron %d miembros'
     ResultNone: 'No changes'
@@ -422,6 +421,7 @@ es:
   ModelAdmin:
     DELETE: Eliminar
     DELETEDRECORDS: 'Deleted {count} records.'
+    EMPTYBEFOREIMPORT: 'Clear Database before import'
     IMPORT: 'Importar desde CSV'
     IMPORTEDRECORDS: 'Imported {count} records.'
     NOCSVFILE: 'Por favor, selecciona un archivo CSV para importar'
@@ -472,6 +472,7 @@ es:
     SINGULARNAME: 'Permission Role Code'
   Permissions:
     PERMISSIONS_CATEGORY: 'Roles and access permissions'
+    UserPermissionsIntro: 'Assigning groups to this user will adjust the permissions they have. See the groups section for details of permissions on individual groups.'
   PhoneNumberField:
     VALIDATION: 'Por favor introduzca un número de teléfono válido'
   RelationComplexTableField.ss:

lang/es_AR.yml

@@ -1,7 +1,6 @@
 es_AR:
   AssetAdmin:
-    ADDFILES: 'Add files'
+    ALLOWEDEXTS: 'Allowed extensions'
-    EditOrgMenu: 'Edit & organize'
     NEWFOLDER: 'Nueva Carpeta'
   AssetTableField:
     CREATED: 'Agregado por primera vez'
@@ -21,7 +20,7 @@ es_AR:
     EDITALL: 'Edit all'
     EDITANDORGANIZE: 'Edit & organize'
     EDITINFO: 'Edit files'
-    FILES: Archivos
+    FILES: Files
     FROMCOMPUTER: 'Choose files from your computer'
     FROMCOMPUTERINFO: 'Upload from your computer'
     TOTAL: Total
@@ -60,9 +59,9 @@ es_AR:
     ERRORNOTADMIN: 'El usuario no es administrador.'
     ERRORNOTREC: 'No se reconoce el nombre de usuario / contraseña'
   Boolean:
-    0: 'False'
+    0: No
     ANY: Cualquiera
-    1: 'True'
+    1: Sí
   CMSLoadingScreen.ss:
     LOADING: Loading...
     REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
@@ -72,7 +71,7 @@ es_AR:
     ACCESSALLINTERFACESHELP: 'Overrules more specific access settings.'
     SAVE: Guardar
   CMSProfileController:
-    MENUTITLE: CMSProfileController
+    MENUTITLE: 'My Profile'
   ChangePasswordEmail.ss:
     CHANGEPASSWORDTEXT1: 'Haz cambiado tu contraseña por'
     CHANGEPASSWORDTEXT2: 'Ahora puedes utilizar las siguientes credenciales para ingresar:'
@@ -80,14 +79,14 @@ es_AR:
     HELLO: Hola
     PASSWORD: Contraseña
   CheckboxField:
-    - 'False'
+    - No
-    - 'True'
+    - No
   ComplexTableField:
     CLOSEPOPUP: 'Cerrar Ventana Emergente'
     SUCCESSADD2: 'Added {name}'
     SUCCESSEDIT: 'Guardado %s %s %s'
   ComplexTableField.ss:
-    ADDITEM: 'Add %s'
+    ADDITEM: 'Agregar %s'
     NOITEMSFOUND: 'No items found'
     SORTASC: 'Ordenar ascendente'
     SORTDESC: 'Ordenar descendente'
@@ -234,7 +233,7 @@ es_AR:
   GridFieldDetailForm:
     CancelBtn: Cancel
     Create: Create
-    Delete: Eliminar
+    Delete: Delete
     DeletePermissionsFailure: 'No delete permissions'
     Deleted: 'Deleted %s %s'
     Save: Save
@@ -258,7 +257,7 @@ es_AR:
     many_many_Members: Miembros
   GroupImportForm:
     Help1: '<p>Importar uno o más grupos en <em>formato CSV</em> (valores separados por comas). <small><a href="#" class="toggle-advanced">Mostrar uso avanzado</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>'
+    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: 'Se eliminaron %d grupos'
     ResultUpdated: 'Se actualizaron %d grupos'
@@ -348,6 +347,7 @@ es_AR:
     BUTTONLOGIN: Acceder
     BUTTONLOGINOTHER: 'Ingresar como otra persona'
     BUTTONLOSTPASSWORD: 'He perdido mi contraseña'
+    CANTEDIT: 'You don''t have permission to do that'
     CONFIRMNEWPASSWORD: 'Confirmar Nueva Contraseña'
     CONFIRMPASSWORD: 'Confirmar Contraseña'
     DATEFORMAT: 'Date format'
@@ -367,7 +367,6 @@ es_AR:
     NEWPASSWORD: 'Nueva contraseña'
     PASSWORD: Contraseña
     PLURALNAME: Miembros
-    PROFILESAVESUCCESS: 'Guardado con éxito.'
     REMEMBERME: '¿Recordarme la siguiente vez?'
     SINGULARNAME: Miembro
     SUBJECTPASSWORDCHANGED: 'Tu contraseña ha sido cambiada'
@@ -410,7 +409,7 @@ es_AR:
     TWODIGITYEAR: 'Two-digit year'
   MemberImportForm:
     Help1: '<p>Importar miembros en <em>formato CSV</em> (valores separados por comas). <small><a href="#" class="toggle-advanced">Mostrar uso avanzado</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>'
+    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: 'Se eliminaron %d miembros'
     ResultNone: 'Sin cambios'
@@ -422,6 +421,7 @@ es_AR:
   ModelAdmin:
     DELETE: Eliminar
     DELETEDRECORDS: 'Deleted {count} records.'
+    EMPTYBEFOREIMPORT: 'Clear Database before import'
     IMPORT: 'Importar desde CSV'
     IMPORTEDRECORDS: 'Imported {count} records.'
     NOCSVFILE: 'Por favor explorar por un archivo CVS para importar'
@@ -472,6 +472,7 @@ es_AR:
     SINGULARNAME: 'Permission Role Code'
   Permissions:
     PERMISSIONS_CATEGORY: 'Roles y permisos de acceso'
+    UserPermissionsIntro: 'Assigning groups to this user will adjust the permissions they have. See the groups section for details of permissions on individual groups.'
   PhoneNumberField:
     VALIDATION: 'Por favor ingresa un número telefónico válido'
   RelationComplexTableField.ss:

lang/es_MX.yml

@@ -1,7 +1,6 @@
 es_MX:
   AssetAdmin:
-    ADDFILES: 'Add files'
+    ALLOWEDEXTS: 'Allowed extensions'
-    EditOrgMenu: 'Edit & organize'
     NEWFOLDER: 'Nueva Carpeta'
   AssetTableField:
     CREATED: 'Agregado por primera vez'
@@ -60,9 +59,9 @@ es_MX:
     ERRORNOTADMIN: 'El usuario no es administrador.'
     ERRORNOTREC: 'No se reconoce el nombre de usuario / contraseña'
   Boolean:
-    0: 'False'
+    0: No
     ANY: Cualquiera
-    1: 'True'
+    1: Sí
   CMSLoadingScreen.ss:
     LOADING: Cargando...
     REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
@@ -72,7 +71,7 @@ es_MX:
     ACCESSALLINTERFACESHELP: 'Anula la configuració de acceso más específica.'
     SAVE: Guardar
   CMSProfileController:
-    MENUTITLE: 'Controladores de perfil del CMS'
+    MENUTITLE: 'My Profile'
   ChangePasswordEmail.ss:
     CHANGEPASSWORDTEXT1: 'Usted ha cambiado su contraseña'
     CHANGEPASSWORDTEXT2: 'Ahora puedes utilizar las siguientes credenciales para ingresar:'
@@ -80,14 +79,14 @@ es_MX:
     HELLO: Hey
     PASSWORD: Contraseña
   CheckboxField:
-    - 'False'
+    - No
-    - 'True'
+    - Sí
   ComplexTableField:
     CLOSEPOPUP: 'Cerrar Mensaje Emergente'
     SUCCESSADD2: 'Added {name}'
     SUCCESSEDIT: 'Se guardaron %s %s %s'
   ComplexTableField.ss:
-    ADDITEM: 'Add %s'
+    ADDITEM: 'Agregar %s'
     NOITEMSFOUND: 'No items found'
     SORTASC: 'Orden ascendente'
     SORTDESC: 'Orden descendente'
@@ -211,7 +210,7 @@ es_MX:
   FormField:
     NONE: ninguno
   GridAction:
-    DELETE_DESCRIPTION: Eliminar
+    DELETE_DESCRIPTION: Delete
     Delete: Eliminar
     UnlinkRelation: Desvincular
   GridField:
@@ -234,8 +233,8 @@ es_MX:
   GridFieldDetailForm:
     CancelBtn: Cancel
     Create: Create
-    Delete: Eliminar
+    Delete: Delete
-    DeletePermissionsFailure: 'No borrar permisos'
+    DeletePermissionsFailure: 'No delete permissions'
     Deleted: 'Deleted %s %s'
     Save: Save
     Saved: 'Saved %s %s'
@@ -258,7 +257,7 @@ es_MX:
     many_many_Members: Miembros
   GroupImportForm:
     Help1: "<p>Importar usuarios en <em>formato CSV</em> (valores separados por comas). <small><a href=\"#\" class=\"toggle-advanced\">Mostrar uso avanzado</a></small></p>\\n"
-    Help2: '<div class="advanced"><h4>Uso Avanzado</h4><ul><li>Columnas permitidas: <em>%s</em></li><li>Usuarios existents son relacionados por su <em>Código</em> único, y actualizados con cualquier valor nuevo desde el archivo importado.</li><li>Grupos pueden see asignados por la columna Grupos. Los grupos son identificados por su <em>código</em>, multiples grupos pueden ser separados por comas. Grupos existentes no son eliminados.</li></ul></div>'
+    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: '%d grupos eliminados'
     ResultUpdated: '%d grupos actualizados'
@@ -348,6 +347,7 @@ es_MX:
     BUTTONLOGIN: Ingresar
     BUTTONLOGINOTHER: 'Ingresar como alguien más'
     BUTTONLOSTPASSWORD: 'Olvidé mi contraseña'
+    CANTEDIT: 'You don''t have permission to do that'
     CONFIRMNEWPASSWORD: 'Confirmar Nueva Contraseña'
     CONFIRMPASSWORD: 'Confirmar contraseña'
     DATEFORMAT: 'Date format'
@@ -367,7 +367,6 @@ es_MX:
     NEWPASSWORD: 'Nueva contraseña'
     PASSWORD: Contraseña
     PLURALNAME: Miembros
-    PROFILESAVESUCCESS: 'Guardado satisfactoriamente.'
     REMEMBERME: '¿Recordarme la siguiente vez?'
     SINGULARNAME: Miembro
     SUBJECTPASSWORDCHANGED: 'Su contraseña se ha cambiado'
@@ -410,7 +409,7 @@ es_MX:
     TWODIGITYEAR: 'Año en 2 dígitos'
   MemberImportForm:
     Help1: "<p>Importar usurious en <em>format CSV</em> (valores separados por comas). <small><a href=\"#\" class=\"toggle-advanced\">Mostrar uso avanzado</a></small></p>\\n"
-    Help2: "<div class=\"advanced\">\\n<h4>Uso Avanzado</h4>\\n<ul>\\n<li>Columnas permitidas: <em>%s</em></li>\\n<li>Usuarios existents son relacionados por su <em>Código</em> único, y actualizados con cualquier valor nuevo desde el archivo importado.</li>\\n<li>Grupos pueden see asignados por la column Grupos. Los grupos son identificados por su <em>código</em>, multiples grupos pueden ser separados por comas. Grupos existentes no son eliminados.</li>\\n</ul>\\n</div>"
+    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: '%d miembros eliminados'
     ResultNone: 'Sin cambios'
@@ -422,6 +421,7 @@ es_MX:
   ModelAdmin:
     DELETE: Eliminar
     DELETEDRECORDS: 'Borrados {count} registros'
+    EMPTYBEFOREIMPORT: 'Clear Database before import'
     IMPORT: 'Importar desde CSV'
     IMPORTEDRECORDS: 'Importados {count} registros'
     NOCSVFILE: 'Por favor navegue hasta el archivo CSV a importar'
@@ -472,6 +472,7 @@ es_MX:
     SINGULARNAME: 'Permission Role Code'
   Permissions:
     PERMISSIONS_CATEGORY: 'Roles y permisos de acceso'
+    UserPermissionsIntro: 'Assigning groups to this user will adjust the permissions they have. See the groups section for details of permissions on individual groups.'
   PhoneNumberField:
     VALIDATION: 'Por favor ingresa un número telefónico válido'
   RelationComplexTableField.ss:

lang/et_EE.yml

@@ -1,143 +1,142 @@
 et_EE:
   AssetAdmin:
-    ADDFILES: 'Lisa failid'
+    ALLOWEDEXTS: 'Allowed extensions'
-    EditOrgMenu: 'Redigeeri ja korrasta'
     NEWFOLDER: 'Uus kaust'
   AssetTableField:
     CREATED: 'Esmakordselt üles laaditud'
     DIM: Mõõtmed
     FILENAME: Failinimi
-    FOLDER: Kaust
+    FOLDER: Folder
-    LASTEDIT: 'Viimage muudetud'
+    LASTEDIT: 'Viimati muudetud'
     OWNER: Omanik
-    SIZE: 'Faili suurus'
+    SIZE: Suurus
     TITLE: Pealkiri
     TYPE: Tüüp
     URL: Aadress
   AssetUploadField:
-    ChooseFiles: 'Vali failid'
+    ChooseFiles: 'Choose files'
-    DRAGFILESHERE: 'Lohista failid siia'
+    DRAGFILESHERE: 'Drag files here'
     DROPAREA: 'Drop Area'
-    EDITALL: 'Muuda kõiki'
+    EDITALL: 'Edit all'
-    EDITANDORGANIZE: 'Redigeeri ja korrasta'
+    EDITANDORGANIZE: 'Edit & organize'
-    EDITINFO: 'Redigeeri faile'
+    EDITINFO: 'Edit files'
-    FILES: Failid
+    FILES: Files
     FROMCOMPUTER: 'Choose files from your computer'
     FROMCOMPUTERINFO: 'Upload from your computer'
-    TOTAL: Kokku
+    TOTAL: Total
     TOUPLOAD: 'Choose files to upload...'
     UPLOADINPROGRESS: 'Please wait… upload in progress'
-    UPLOADOR: VÕI
+    UPLOADOR: OR
   BBCodeParser:
     ALIGNEMENT: Joondus
-    ALIGNEMENTEXAMPLE: 'parem joondus'
+    ALIGNEMENTEXAMPLE: 'Joondus paremale'
     BOLD: 'Paks tekst'
     BOLDEXAMPLE: Paks
     CODE: 'Koodi plokk'
-    CODEDESCRIPTION: 'Vormindamata koodi plokk'
+    CODEDESCRIPTION: 'Kodederimata koodi plokk'
     CODEEXAMPLE: 'Koodi plokk'
-    COLORED: 'Värviline tekst'
+    COLORED: 'Värvitud tekst'
-    COLOREDEXAMPLE: 'sinine tekst'
+    COLOREDEXAMPLE: 'Sinine tekst'
-    EMAILLINK: 'Email link'
+    EMAILLINK: 'Emaili aadress'
-    EMAILLINKDESCRIPTION: 'Loo link e-posti aadressile'
+    EMAILLINKDESCRIPTION: 'Loo link emaili aadrssile'
     IMAGE: Pilt
-    IMAGEDESCRIPTION: 'Näita oma postituses pilti'
+    IMAGEDESCRIPTION: 'Näita pilti oma postituses'
-    ITALIC: 'Kursiiv tekst'
+    ITALIC: 'Kaldus text'
-    ITALICEXAMPLE: Kursiiv
+    ITALICEXAMPLE: Kaldus
-    LINK: 'Veebisaidi link'
+    LINK: 'Kodulehe link'
-    LINKDESCRIPTION: 'Lingi teisele veebisaidile või aadressile'
+    LINKDESCRIPTION: 'Lingi teisele kodulehele või aadressile'
     STRUCK: 'Läbikriipsutatud tekst'
     STRUCKEXAMPLE: Läbikriipsutatud
     UNDERLINE: 'Allajoonitud tekst'
     UNDERLINEEXAMPLE: Allajoonitud
-    UNORDERED: 'Sortimara nimekiri'
+    UNORDERED: 'Järjestamata nimekiri'
     UNORDEREDDESCRIPTION: 'Järjestamata nimekiri'
-    UNORDEREDEXAMPLE1: 'sortimata üksus 1'
+    UNORDEREDEXAMPLE1: 'Järjestamata asi 1'
   BackLink_Button.ss:
     Back: Tagasi
   BasicAuth:
-    ENTERINFO: 'Please enter a username and password.'
+    ENTERINFO: 'Palun sisesta kasutajanimi ja parool.'
-    ERRORNOTADMIN: 'That user is not an administrator.'
+    ERRORNOTADMIN: 'Antud kasutaja ei ole administraator.'
-    ERRORNOTREC: 'That username / password isn''t recognised'
+    ERRORNOTREC: 'See kasutajanimi / parool ei ole tunnustatud'
   Boolean:
     0: 'False'
     ANY: Any
     1: 'True'
   CMSLoadingScreen.ss:
-    LOADING: 'Laadib ...'
+    LOADING: Loading...
     REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
   CMSMain:
     ACCESS: 'Juurdepääs jaotisele ''{title}'''
-    ACCESSALLINTERFACES: 'Ligipääs kogu CMS-ile'
+    ACCESSALLINTERFACES: 'Ligipääs kõigile Sisuhalduse kasutajaliidestele'
     ACCESSALLINTERFACESHELP: 'Overrules more specific access settings.'
     SAVE: Salvesta
   CMSProfileController:
-    MENUTITLE: CMSProfileController
+    MENUTITLE: 'My Profile'
   ChangePasswordEmail.ss:
-    CHANGEPASSWORDTEXT1: 'You changed your password for'
+    CHANGEPASSWORDTEXT1: 'Vahetasid oma parooli lehel'
-    CHANGEPASSWORDTEXT2: 'You can now use the following credentials to log in:'
+    CHANGEPASSWORDTEXT2: 'Nüüd võid kasutada sisse logimiseks järgnevaid andmeid:'
     EMAIL: E-post
-    HELLO: Tere!
+    HELLO: Tere
     PASSWORD: Parool
   CheckboxField:
     - 'False'
     - 'True'
   ComplexTableField:
-    CLOSEPOPUP: 'Close Popup'
+    CLOSEPOPUP: 'Sulge hüpikaken'
-    SUCCESSADD2: 'Lisatud {name}'
+    SUCCESSADD2: 'Added {name}'
-    SUCCESSEDIT: 'Saved %s %s %s'
+    SUCCESSEDIT: 'Salvestatud %s %s %s'
   ComplexTableField.ss:
     ADDITEM: 'Lisa %s'
-    NOITEMSFOUND: 'Ühtegi kirjet ei leitud'
+    NOITEMSFOUND: 'No items found'
-    SORTASC: 'Sordi kasvavas järjekorras'
+    SORTASC: 'Sorteeri kasvavalt'
-    SORTDESC: 'Sordi kahanevas järjekorras'
+    SORTDESC: 'Sorteeri kahanevalt'
   ComplexTableField_popup.ss:
-    NEXT: Järgmine
+    NEXT: Eelmine
-    PREVIOUS: Eelmine
+    PREVIOUS: Järgmine
   ConfirmedPasswordField:
-    ATLEAST: 'Salasõna väikseim võimalik pikkus on {min} tähemärki. '
+    ATLEAST: 'Passwords must be at least {min} characters long.'
-    BETWEEN: 'Salasõna peab olema {min} kuni {max} tähemärki pikk.'
+    BETWEEN: 'Passwords must be {min} to {max} characters long.'
-    MAXIMUM: 'Salasõna suurim võimalik pikkus on {max} tähemärki.'
+    MAXIMUM: 'Passwords must be at most {max} characters long.'
-    SHOWONCLICKTITLE: 'Muuda salasõna'
+    SHOWONCLICKTITLE: 'Muuda parool'
   CreditCardField:
     FIRST: esimene
-    FOURTH: neljas
+    FOURTH: Neljas
     SECOND: teine
     THIRD: kolmas
   CurrencyField:
-    CURRENCYSYMBOL: €
+    CURRENCYSYMBOL: $
   DataObject:
-    PLURALNAME: 'Data Objects'
+    PLURALNAME: 'Andme objektid'
-    SINGULARNAME: 'Data Object'
+    SINGULARNAME: 'Andme objekt'
   Date:
-    DAY: päev
+    DAY: Päev
-    DAYS: päeva
+    DAYS: Päevad
-    HOUR: tund
+    HOUR: Tund
-    HOURS: tundi
+    HOURS: Tunnid
-    MIN: minut
+    MIN: Minut
-    MINS: minutit
+    MINS: Minutid
-    MONTH: kuu
+    MONTH: Kuu
-    MONTHS: kuud
+    MONTHS: Kuud
-    SEC: sekund
+    SEC: Sekund
-    SECS: sekundit
+    SECS: Sekundit
-    TIMEDIFFAGO: '{difference} tagasi'
+    TIMEDIFFAGO: '{difference} ago'
     TIMEDIFFIN: 'in {difference}'
-    YEAR: aasta
+    YEAR: Aasta
-    YEARS: aastat
+    YEARS: Aastad
   DateField:
-    NOTSET: määramata
+    NOTSET: 'Pole seadistatud'
-    TODAY: täna
+    TODAY: Täna
-    VALIDDATEFORMAT2: 'Sisestage kuupäev õiges vormingus ({format})'
+    VALIDDATEFORMAT2: 'Please enter a valid date format ({format})'
-    VALIDDATEMAXDATE: 'Kuupäev peab olema miinimum lubatud kuupäevast ({date}) vanem või sama.'
+    VALIDDATEMAXDATE: 'Your date has to be older or matching the maximum allowed date ({date})'
-    VALIDDATEMINDATE: 'Kuupäev peab olema miinimum lubatud kuupäevast ({date}) uuem või sama.'
+    VALIDDATEMINDATE: 'Your date has to be newer or matching the minimum allowed date ({date})'
   DatetimeField:
     NOTSET: Määramata
   Director:
-    INVALID_REQUEST: 'Sobimatu päring'
+    INVALID_REQUEST: 'Invalid request'
   DropdownField:
     CHOOSE: (Vali)
   EmailField:
-    VALIDATION: 'Palun sisestage e-posti aadress'
+    VALIDATION: 'Please enter an email address'
   Email_BounceRecord:
     PLURALNAME: 'Email Bounce Records'
     SINGULARNAME: 'Email Bounce Record'
@@ -149,7 +148,7 @@ et_EE:
     CssType: 'CSS file'
     DmgType: 'Apple disk image'
     DocType: 'Wordi dokument'
-    Filename: Filename
+    Filename: Failinimi
     GifType: 'GIF image - good for diagrams'
     GzType: 'GZIP tihendatud fail'
     HtlType: 'HTML fail'
@@ -161,13 +160,13 @@ et_EE:
     JsType: 'Javascripti fail'
     Mp3Type: 'MP3 helifail'
     MpgType: 'MPEG videofail'
-    NOFILESIZE: 'Faili suurus on null baiti'
+    NOFILESIZE: 'Faili suurus on null bitti.'
     NOVALIDUPLOAD: 'File is not a valid upload'
-    Name: Nimetus
+    Name: Nimi
     PLURALNAME: Failid
     PdfType: 'Adobe Acrobat PDF file'
     PngType: 'PNG image - good general-purpose format'
-    SINGULARNAME: File
+    SINGULARNAME: Fail
     TOOLARGE: 'Filesize is too large, maximum {size} allowed'
     TOOLARGESHORT: 'Filesize exceeds {size}'
     TiffType: 'Tagged image format'
@@ -179,217 +178,217 @@ et_EE:
     ATTACH: 'Attach {type}'
     ATTACHONCESAVED: '{type}s can be attached once you have saved the record for the first time.'
     ATTACHONCESAVED2: 'Files can be attached once you have saved the record for the first time.'
-    DELETE: 'Kustuta {type}'
+    DELETE: 'Delete {type}'
     DISALLOWEDFILETYPE: 'This filetype is not allowed to be uploaded'
-    FILE: Fail
+    FILE: File
-    FROMCOMPUTER: 'Teie arvutist'
+    FROMCOMPUTER: 'From your Computer'
     FROMFILESTORE: 'From the File Store'
     NOSOURCE: 'Please select a source file to attach'
-    REPLACE: 'Asenda {type}'
+    REPLACE: 'Replace {type}'
   FileIFrameField_iframe.ss:
-    TITLE: 'Pildi üleslaadimise Iframe'
+    TITLE: 'Image Uploading Iframe'
   Filesystem:
     SYNCRESULTS: 'Sync complete: {createdcount} items created, {deletedcount} items deleted'
   Folder:
-    PLURALNAME: Kaustad
+    PLURALNAME: Folders
-    SINGULARNAME: Kaust
+    SINGULARNAME: Folder
   ForgotPasswordEmail.ss:
-    HELLO: Tere!
+    HELLO: Tere
     TEXT1: 'Siin on sinu'
-    TEXT2: 'Salasõna lähtestamise link'
+    TEXT2: 'Parooli tühistus link'
-    TEXT3: for
+    TEXT3: -
   Form:
-    FIELDISREQUIRED: '%s on kohustuslik'
+    FIELDISREQUIRED: '%s on vajalik'
-    SubmitBtnLabel: Mine
+    SubmitBtnLabel: Go
     VALIDATIONCREDITNUMBER: 'Please ensure you have entered the {number} credit card number correctly'
     VALIDATIONNOTUNIQUE: 'Sisestatud väärtus ei ole unikaalne'
-    VALIDATIONPASSWORDSDONTMATCH: 'Salasõnad ei ühti'
+    VALIDATIONPASSWORDSDONTMATCH: 'Paroolid ei katu'
-    VALIDATIONPASSWORDSNOTEMPTY: 'Salasõna ei tohi olla tühi'
+    VALIDATIONPASSWORDSNOTEMPTY: 'Paroolid ei saa olla tühjad'
-    VALIDATIONSTRONGPASSWORD: 'Salasõna peab sisaldama vähemalt ühte numbrit ja ühte tähte.'
+    VALIDATIONSTRONGPASSWORD: 'Passwords must have at least one digit and one alphanumeric character'
-    VALIDATOR: Validaator
+    VALIDATOR: Kinnitaja
-    VALIDCURRENCY: 'Sisestage kehtiv valuuta'
+    VALIDCURRENCY: 'Please enter a valid currency'
   FormField:
     NONE: puudub
   GridAction:
-    DELETE_DESCRIPTION: Kustuta
+    DELETE_DESCRIPTION: Delete
-    Delete: Kustuta
+    Delete: Delete
     UnlinkRelation: Unlink
   GridField:
-    Add: 'Lisa {name}'
+    Add: 'Add {name}'
     Filter: Filter
     FilterBy: 'Filter by '
-    Find: Otsi
+    Find: Find
     LEVELUP: 'Level up'
     LinkExisting: 'Link Existing'
-    NewRecord: 'Uus %s'
+    NewRecord: 'New %s'
     NoItemsFound: 'No items found'
-    PRINTEDAT: Prinditud
+    PRINTEDAT: 'Printed at'
-    PRINTEDBY: Printis
+    PRINTEDBY: 'Printed by'
     PlaceHolder: 'Find {type}'
     PlaceHolderWithLabels: 'Find {type} by {name}'
     RelationSearch: 'Relation search'
-    ResetFilter: Lähtesta
+    ResetFilter: Reset
   GridFieldAction_Delete:
-    DeletePermissionsFailure: 'Puuduvad kustutamis õigused'
+    DeletePermissionsFailure: 'No delete permissions'
   GridFieldDetailForm:
     CancelBtn: Cancel
-    Create: Loo
+    Create: Create
-    Delete: Kustuta
+    Delete: Delete
-    DeletePermissionsFailure: 'Puuduvad kustutamis õigused'
+    DeletePermissionsFailure: 'No delete permissions'
-    Deleted: 'Kustutatud %s %s'
+    Deleted: 'Deleted %s %s'
-    Save: Salvesta
+    Save: Save
-    Saved: 'Salvestatud %s %s'
+    Saved: 'Saved %s %s'
   GridFieldItemEditView.ss: null
   Group:
-    AddRole: 'Lisa grupile roll'
+    AddRole: 'Add a role for this group'
     Code: 'Grupi kood'
-    DefaultGroupTitleAdministrators: Administraator
+    DefaultGroupTitleAdministrators: Administrators
-    DefaultGroupTitleContentAuthors: 'Sisu autorid'
+    DefaultGroupTitleContentAuthors: 'Content Authors'
     Description: Kirjeldus
-    GroupReminder: 'Valides vanemgrupi pärib grupp kõik vanemgrupi rollid'
+    GroupReminder: 'If you choose a parent group, this group will take all it''s roles'
     Locked: 'Lukus?'
-    NoRoles: 'Ühtegi rolli ei leitud'
+    NoRoles: 'No roles found'
-    PLURALNAME: Grupid
+    PLURALNAME: Groups
-    Parent: Vanemgrupp
+    Parent: 'Vanem grupp'
-    RolesAddEditLink: 'Halda rolle'
+    RolesAddEditLink: 'Manage roles'
-    SINGULARNAME: Grupp
+    SINGULARNAME: Group
-    Sort: 'Sortimise järjekord'
+    Sort: Järjesta
     has_many_Permissions: Õigused
     many_many_Members: Liikmed
   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>'
+    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: 'Loodud {count} gruppi'
+    ResultCreated: 'Created {count} groups'
     ResultDeleted: 'Deleted %d groups'
     ResultUpdated: 'Updated %d groups'
   Hierarchy:
     InfiniteLoopNotAllowed: 'Infinite loop found within the "{type}" hierarchy. Please change the parent to resolve this'
   HtmlEditorField:
-    ADDURL: 'Lisa URL'
+    ADDURL: 'Add URL'
-    ADJUSTDETAILSDIMENSIONS: 'Üksikasjad & mõõtmed'
+    ADJUSTDETAILSDIMENSIONS: 'Details &amp; dimensions'
-    ANCHORVALUE: Ankur
+    ANCHORVALUE: Link
-    BUTTONINSERT: Sisesta
+    BUTTONINSERT: Insert
     BUTTONINSERTLINK: 'Sisesta link'
     BUTTONREMOVELINK: 'Eemalda link'
-    BUTTONUpdate: Uuenda
+    BUTTONUpdate: Update
-    CAPTIONTEXT: 'Pealdise tekst'
+    CAPTIONTEXT: 'Caption text'
-    CSSCLASS: 'Joondus / stiil'
+    CSSCLASS: 'Joondus / Stiil'
-    CSSCLASSCENTER: 'Centered, on its own.'
+    CSSCLASSCENTER: 'Keskel, iseseisvalt.'
-    CSSCLASSLEFT: 'On the left, with text wrapping around.'
+    CSSCLASSLEFT: 'Vasakul, tekst voldib ennast ümber.'
-    CSSCLASSLEFTALONE: 'On the left, on its own.'
+    CSSCLASSLEFTALONE: 'Ise vasakule'
-    CSSCLASSRIGHT: 'On the right, with text wrapping around.'
+    CSSCLASSRIGHT: 'Paremal, tekst voldib ennast ümber.'
-    DETAILS: Üksikasjad
+    DETAILS: Details
     EMAIL: 'E-posti aadress'
     FILE: Fail
     FOLDER: Kaust
-    FROMCMS: Sisuhaldussüsteemist
+    FROMCMS: 'From the CMS'
-    FROMCOMPUTER: 'Teie arvutist'
+    FROMCOMPUTER: 'From your computer'
     FROMWEB: 'From the web'
-    FindInFolder: 'Otsi kaustast'
+    FindInFolder: 'Find in Folder'
     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: Mõõtmed
-    IMAGEHEIGHTPX: Kõrgus
+    IMAGEHEIGHTPX: Laius
     IMAGETITLE: 'Title text (tooltip) - for additional information about the image'
     IMAGETITLETEXT: 'Title text (tooltip)'
     IMAGETITLETEXTDESC: 'For additional information about the image'
-    IMAGEWIDTHPX: Laius
+    IMAGEWIDTHPX: Kõrgus
     INSERTMEDIA: 'Insert Media'
-    LINK: 'Sisesta link'
+    LINK: Link
-    LINKANCHOR: 'Anchor on this page'
+    LINKANCHOR: 'Link sellele lehele'
     LINKDESCR: 'Lingi kirjeldus'
-    LINKEMAIL: 'E-posti aadress'
+    LINKEMAIL: 'E-posti aadressi'
     LINKEXTERNAL: 'Teist veebilehte'
     LINKFILE: 'Salvesta fail'
-    LINKINTERNAL: 'Page on the site'
+    LINKINTERNAL: 'Saidil olevat lehekülge'
     LINKOPENNEWWIN: 'Ava link uues aknas?'
-    LINKTO: 'Link to'
+    LINKTO: Lingi
     PAGE: Leht
     URL: URL
     URLNOTANOEMBEDRESOURCE: 'The URL ''{url}'' could not be turned into a media resource.'
     UpdateMEDIA: 'Update Media'
   Image:
-    PLURALNAME: Failid
+    PLURALNAME: Files
-    SINGULARNAME: Fail
+    SINGULARNAME: File
   ImageField:
-    IMAGE: Pilt
+    IMAGE: Image
   Image_Cached:
-    PLURALNAME: Failid
+    PLURALNAME: Files
-    SINGULARNAME: Fail
+    SINGULARNAME: File
   Image_iframe.ss:
     TITLE: 'Pildi üleslaadimise Iframe'
   LeftAndMain:
     CANT_REORGANISE: 'You do not have permission to alter Top level pages. Your change was not saved.'
     DELETED: Kustutatud.
-    DropdownBatchActionsDefault: Toimingud
+    DropdownBatchActionsDefault: Actions
-    HELP: Abi
+    HELP: Spikker
     PAGETYPE: 'Lehekülje tüüp:'
     PERMAGAIN: 'Oled Sisuhaldusest välja logitud. Kui soovite uuesti sisse logida sisestage kasutajanimi ja parool.'
-    PERMALREADY: 'I''m sorry, but you can''t access that part of the CMS.  If you want to log in as someone else, do so below'
+    PERMALREADY: 'Vabandust, aga sul pole lubatud sisuhaldussüsteemi selle osa juurde pääseda. Kui soovid kellegi teisena sisse logida, tee seda allpool.'
-    PERMDEFAULT: 'Please choose an authentication method and enter your credentials to access the CMS.'
+    PERMDEFAULT: 'Sisesta oma e-posti aadress ja parool sisuhaldussüsteemi ligipääsemiseks.'
-    PLEASESAVE: 'Please Save Page: This page could not be upated because it hasn''t been saved yet.'
+    PLEASESAVE: 'Palun Salvesta Lehekülg: Antud lehekülge ei uuendatud, kuna seda ei ole veel salvestatud.'
     PreviewButton: Eelvaade
-    REORGANISATIONSUCCESSFUL: 'Saidipuu ümberjärjestamine oli edukas'
+    REORGANISATIONSUCCESSFUL: 'Reorganised the site tree successfully.'
     SAVEDUP: Salvestatud.
     VersionUnknown: unknown
   LeftAndMain_Menu.ss:
-    Hello: Tere!
+    Hello: Hi
-    LOGOUT: 'Logi välja'
+    LOGOUT: 'Log out'
   LoginAttempt:
     Email: 'E-posti aadress'
     IP: 'IP Aadress'
-    PLURALNAME: 'Sisselogimis katsed'
+    PLURALNAME: 'Login Attempts'
-    SINGULARNAME: 'Sisselogimis katse'
+    SINGULARNAME: 'Login Attempt'
     Status: Staatus
   Member:
-    ADDGROUP: 'Lisa grupp'
+    ADDGROUP: 'Add group'
-    BUTTONCHANGEPASSWORD: 'Muuda salasõna'
+    BUTTONCHANGEPASSWORD: 'Muuda parool'
     BUTTONLOGIN: 'Logi sisse'
     BUTTONLOGINOTHER: 'Logi sisse kellegi teisena'
-    BUTTONLOSTPASSWORD: 'Kaotasin oma salasõna'
+    BUTTONLOSTPASSWORD: 'Kaotasin oma parooli'
-    CONFIRMNEWPASSWORD: 'Kinnita uus salasõna'
+    CANTEDIT: 'You don''t have permission to do that'
-    CONFIRMPASSWORD: 'Kinnita salasõna'
+    CONFIRMNEWPASSWORD: 'Kinnita uus parool'
+    CONFIRMPASSWORD: 'Kinnita parool'
     DATEFORMAT: 'Kuupäeva vorming'
-    DefaultAdminFirstname: Vaikeadministraator
+    DefaultAdminFirstname: 'Default Admin'
-    DefaultDateTime: vaikimisi
+    DefaultDateTime: default
     EMAIL: E-post
     EMPTYNEWPASSWORD: 'The new password can''t be empty, please try again'
-    ENTEREMAIL: 'Palun sisestage e-posti aadress, et saada salasõna lähtestamise link.'
+    ENTEREMAIL: 'Palun sisesta email, et saada paooli tühistamise link'
     ERRORLOCKEDOUT: 'Konto on liiga paljude ebaõnnestunud sisselogimiskatsete tõttu ajutiselt blokeeritud. Palun oota 20 minutit ja proovi siis uuesti.'
-    ERRORNEWPASSWORD: 'You have entered your new password differently, try again'
+    ERRORNEWPASSWORD: 'Te sisestasite oma parooli erinevalt, proovige uuesti'
-    ERRORPASSWORDNOTMATCH: 'Your current password does not match, please try again'
+    ERRORPASSWORDNOTMATCH: 'Sisestatud paroolid ei kattu, palun proovi uuesti'
-    ERRORWRONGCRED: 'Tundub, et e-posti aadress või salasõna on vale. Palun proovi uuesti.'
+    ERRORWRONGCRED: 'Tundub, et e-posti aadress või parool on vale. Palun proovi uuesti.'
     FIRSTNAME: Eesnimi
     INTERFACELANG: 'Kasutajaliidese keel'
     INVALIDNEWPASSWORD: 'We couldn''t accept that password: {password}'
     LOGGEDINAS: 'You''re logged in as {name}.'
-    NEWPASSWORD: 'Uus salasõna'
+    NEWPASSWORD: 'Uus parool'
-    PASSWORD: Salasõna
+    PASSWORD: Parool
-    PLURALNAME: Liikmed
+    PLURALNAME: Kasutajad
-    PROFILESAVESUCCESS: 'Edukalt salvesatud'
+    REMEMBERME: 'Pea mind meeles?'
-    REMEMBERME: 'Jäta mind meelde?'
+    SINGULARNAME: Kasutaja
-    SINGULARNAME: Liige
+    SUBJECTPASSWORDCHANGED: 'Sinu parool on muudetud'
-    SUBJECTPASSWORDCHANGED: 'Teie salasõna on muudetud'
+    SUBJECTPASSWORDRESET: 'Sinu parooli lähtestamise link'
-    SUBJECTPASSWORDRESET: 'Sinu salasõna lähtestamise link'
     SURNAME: Perekonnanimi
     TIMEFORMAT: 'Aja vorming'
-    VALIDATIONMEMBEREXISTS: 'A member already exists with the same %s'
+    VALIDATIONMEMBEREXISTS: 'Sellise e-posti aadressiga liige on juba olemas'
     ValidationIdentifierFailed: 'Can''t overwrite existing member #{id} with identical identifier ({name} = {value}))'
-    WELCOMEBACK: 'Teretulemast tagasi, {firstname}'
+    WELCOMEBACK: 'Welcome Back, {firstname}'
-    YOUROLDPASSWORD: 'Sinu vana salasõna'
+    YOUROLDPASSWORD: 'Sinu vana parool'
     belongs_many_many_Groups: Grupid
-    db_LastVisited: 'Last Visited Date'
+    db_LastVisited: 'Viimati külastatud kuupäev'
-    db_Locale: 'Kasutajaliidese lokaat'
+    db_Locale: 'kohalik välimus'
-    db_LockedOutUntil: 'Locked out until'
+    db_LockedOutUntil: 'Suletud kuni'
     db_NumVisit: 'Külastusi kokku'
-    db_Password: Salasõna
+    db_Password: Parool
-    db_PasswordExpiry: 'Salasõna aegumise kuupäev'
+    db_PasswordExpiry: 'Parool aegumise kuupäev'
   MemberAuthenticator:
-    TITLE: 'E-post ja salasõna'
+    TITLE: 'E-post ja parool'
   MemberDatetimeOptionsetField:
     AMORPM: 'AM (Ante meridiem) or PM (Post meridiem)'
-    'APPLY FILTER': 'Aktiveeri filter'
+    'APPLY FILTER': 'Apply Filter'
     Custom: Custom
     DATEFORMATBAD: 'Date format is invalid'
     DAYNOLEADING: 'Day of month without leading zero'
@@ -399,7 +398,7 @@ et_EE:
     HOURNOLEADING: 'Hour without leading zero'
     MINUTENOLEADING: 'Minute without leading zero'
     MONTHNOLEADING: 'Month digit without leading zero'
-    Preview: Eelvaade
+    Preview: Preview
     SHORTMONTH: 'Short name of month (e.g. Jun)'
     TOGGLEHELP: 'Toggle formatting help'
     TWODIGITDAY: 'Two-digit day of month'
@@ -410,10 +409,10 @@ et_EE:
     TWODIGITYEAR: 'Two-digit year'
   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>'
+    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'
-    ResultNone: 'Muudatusi puuduvad'
+    ResultNone: 'No changes'
     ResultUpdated: 'Updated {count} members'
   MemberPassword:
     PLURALNAME: 'Member Passwords'
@@ -421,14 +420,15 @@ et_EE:
   MemberTableField: null
   ModelAdmin:
     DELETE: Kustuta
-    DELETEDRECORDS: '{count} kirjet imporditud.'
+    DELETEDRECORDS: 'Deleted {count} records.'
+    EMPTYBEFOREIMPORT: 'Clear Database before import'
     IMPORT: 'Impordi CSV failist'
-    IMPORTEDRECORDS: '{count} kirjet imporditud.'
+    IMPORTEDRECORDS: 'Imported {count} records.'
-    NOCSVFILE: 'Please browse for a CSV file to import'
+    NOCSVFILE: 'Palun avage CSV fail impordiks'
-    NOIMPORT: 'Pole midagi importida'
+    NOIMPORT: 'Midagi pole importida'
-    RESET: Lähtesta
+    RESET: Reset
-    Title: Andmemudelid
+    Title: 'Data Models'
-    UPDATEDRECORDS: '{count} kirjet uuendatud.'
+    UPDATEDRECORDS: 'Updated {count} records.'
   ModelAdmin_ImportSpec.ss:
     IMPORTSPECFIELDS: 'Database columns'
     IMPORTSPECLINK: 'Show Specification for %s'
@@ -438,138 +438,139 @@ et_EE:
     FILTER: Filter
     IMPORT: Import
   ModelSidebar.ss:
-    IMPORT_TAB_HEADER: Impordi
+    IMPORT_TAB_HEADER: Import
-    SEARCHLISTINGS: Otsi
+    SEARCHLISTINGS: Search
   MoneyField:
-    FIELDLABELAMOUNT: Kogus
+    FIELDLABELAMOUNT: Amount
-    FIELDLABELCURRENCY: Valuuta
+    FIELDLABELCURRENCY: Currency
   NullableField:
     IsNullLabel: 'Is Null'
   NumericField:
     VALIDATION: '''{value}'' is not a number, only numbers can be accepted for this field'
   Pagination:
-    Page: Lehekülg
+    Page: Page
-    View: Vaata
+    View: View
   Permission:
-    AdminGroup: Administraator
+    AdminGroup: Administrator
     CMS_ACCESS_CATEGORY: CMS-juurdepääs
-    FULLADMINRIGHTS: 'Full administrative rights'
+    FULLADMINRIGHTS: 'Täis administraatori õigused'
     FULLADMINRIGHTS_HELP: 'Implies and overrules all other assigned permissions.'
-    PLURALNAME: Õigused
+    PLURALNAME: Permissions
-    SINGULARNAME: Õigus
+    SINGULARNAME: Permission
   PermissionCheckboxSetField:
     AssignedTo: 'assigned to "{title}"'
-    FromGroup: 'päritud grupilt "{title}"'
+    FromGroup: 'inherited from group "{title}"'
-    FromRole: 'päritud rollilt "{title}"'
+    FromRole: 'inherited from role "{title}"'
     FromRoleOnGroup: 'inherited from role "%s" on group "%s"'
   PermissionRole:
     OnlyAdminCanApply: 'Only admin can apply'
-    PLURALNAME: Rollid
+    PLURALNAME: Roles
-    SINGULARNAME: Roll
+    SINGULARNAME: Role
     Title: Title
   PermissionRoleCode:
     PLURALNAME: 'Permission Role Cods'
     SINGULARNAME: 'Permission Role Code'
   Permissions:
     PERMISSIONS_CATEGORY: 'Rollid ja juurdepääsuõigused'
+    UserPermissionsIntro: 'Assigning groups to this user will adjust the permissions they have. See the groups section for details of permissions on individual groups.'
   PhoneNumberField:
-    VALIDATION: 'Sisestage kehtiv telefoninumber'
+    VALIDATION: 'Palun sisesta kehtiv telefoninumber'
   RelationComplexTableField.ss:
     ADD: Lisa
-    CSVEXPORT: 'Ekspordi CSV vormingusse'
+    CSVEXPORT: 'Export to CSV'
-    NOTFOUND: 'Ei leitud ühtegi kirjet'
+    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.'
+    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 minule salasõna lähtestamise link'
+    BUTTONSEND: 'Saada parooli tühistamise link'
-    CHANGEPASSWORDBELOW: 'You can change your password below.'
+    CHANGEPASSWORDBELOW: 'Saad muuta oma parooli allpool.'
-    CHANGEPASSWORDHEADER: 'Change your password'
+    CHANGEPASSWORDHEADER: 'Muuda oma parool'
-    ENTERNEWPASSWORD: 'Please enter a new password.'
+    ENTERNEWPASSWORD: 'Palun sisesta uus parool.'
-    ERRORPASSWORDPERMISSION: 'You must be logged in in order to change your password!'
+    ERRORPASSWORDPERMISSION: 'Pead olema sisseloginud, et parooli muuta!'
-    LOGGEDOUT: 'You have been logged out.  If you would like to log in again, enter your credentials below.'
+    LOGGEDOUT: 'Olete välja loginud. Kui soovite uuesti siseneda, sisestage oma andmed allpool'
-    LOGIN: 'Log in'
+    LOGIN: 'Logi sisse'
-    NOTEPAGESECURED: 'That page is secured. Enter your credentials below and we will send you right along.'
+    NOTEPAGESECURED: 'See leht on turvatud. Sisesta enda andmed allpool ja me saadame sind otse edasi'
     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: 'Enter your e-mail address and we will send you a link with which you can reset your password'
+    NOTERESETPASSWORD: 'Sisesta oma email ja me saadame sulle lingi kus saad oma parooli tühistada.'
     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: 'Allow viewing, adding and editing users, as well as assigning permissions and roles to them.'
-    APPLY_ROLES: 'Lisa grupile rollid'
+    APPLY_ROLES: 'Apply roles to groups'
     APPLY_ROLES_HELP: 'Ability to edit the roles assigned to a group. Requires the "Access to ''Users'' section" permission.'
-    EDITPERMISSIONS: 'Halda gruppide õigusi'
+    EDITPERMISSIONS: 'Muuda õigusi ja IP aadresse igal grupil'
     EDITPERMISSIONS_HELP: 'Ability to edit Permissions and IP Addresses for a group. Requires the "Access to ''Security'' section" permission.'
-    GROUPNAME: 'Grupi nimi'
+    GROUPNAME: 'Rühma nimi'
-    IMPORTGROUPS: 'Impordi gurpid'
+    IMPORTGROUPS: 'Import groups'
-    IMPORTUSERS: 'Impordi kasutajad'
+    IMPORTUSERS: 'Import users'
-    MEMBERS: Liikmed
+    MEMBERS: Kasutajad
-    MENUTITLE: Turvalisus
+    MENUTITLE: Security
     MemberListCaution: 'Caution: Removing members from this list will remove them from all groups and the database'
-    NEWGROUP: 'Uus grupp'
+    NEWGROUP: 'Uus rühm'
     PERMISSIONS: Õigused
-    ROLES: Rollid
+    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: Rollid
+    TABROLES: Roles
-    Users: Kasutajad
+    Users: Users
   SecurityAdmin_MemberImportForm:
-    BtnImport: 'Impordi CSV failist'
+    BtnImport: 'Import from CSV'
     FileFieldLabel: 'CSV File <small>(Allowed extensions: *.csv)</small>'
   SilverStripeNavigator:
-    Edit: Redigeeri
+    Edit: Edit
   SimpleImageField:
-    NOUPLOAD: 'No Image Uploaded'
+    NOUPLOAD: 'Pilte pole üles laaditud'
   SiteTree:
     TABMAIN: Avaleht
   TableField:
     ISREQUIRED: 'In %s ''%s'' is required'
   TableField.ss:
     ADD: 'Lisa uus rida'
-    ADDITEM: 'Lisa %s'
+    ADDITEM: 'Add %s'
   TableListField:
-    CSVEXPORT: 'Ekspordi CSV vormingusse'
+    CSVEXPORT: 'Ekspordi CSV-sse'
     PRINT: Prindi
-    Print: Prindi
+    Print: Print
     SELECT: 'Vali:'
   TableListField.ss:
-    NOITEMSFOUND: 'Ühtegi kirjet ei leitud'
+    NOITEMSFOUND: 'No items found'
     SORTASC: 'Sordi kasvavas järjekorras'
     SORTDESC: 'Sordi kahanevas järjekorras'
   TableListField_PageControls.ss:
-    DISPLAYING: Kuvatakse
+    DISPLAYING: Displaying
-    OF: /
+    OF: of
-    TO: kuni
+    TO: to
     VIEWFIRST: 'Vaata esimest'
     VIEWLAST: 'Vaata viimast'
     VIEWNEXT: 'Vaata järgmist'
     VIEWPREVIOUS: 'Vaata eelmist'
   TimeField:
-    VALIDATEFORMAT: 'Sisestage kuupäev õiges vormingus ({format})'
+    VALIDATEFORMAT: 'Please enter a valid time format ({format})'
   ToggleField:
-    LESS: vähem
+    LESS: Vähem
-    MORE: rohkem
+    MORE: Veel
   UploadField:
-    ATTACHFILE: 'Lisa fail'
+    ATTACHFILE: 'Attach a file'
-    ATTACHFILES: 'Lisa failid'
+    ATTACHFILES: 'Attach files'
-    AttachFile: 'Lisa fail(id)'
+    AttachFile: 'Attach file(s)'
     DELETE: 'Delete from files'
     DELETEINFO: 'Permanently delete this file from the file store'
-    DOEDIT: Salvesta
+    DOEDIT: Save
     DROPFILE: 'drop a file'
     DROPFILES: 'drop files'
-    Dimensions: Mõõtmed
+    Dimensions: Dimensions
-    EDIT: Redigeeri
+    EDIT: Edit
-    EDITINFO: 'Redigeeri seda faili'
+    EDITINFO: 'Edit this file'
     FIELDNOTSET: 'File information not found'
     FROMCOMPUTER: 'From your computer'
     FROMCOMPUTERINFO: 'Select from files'
     FROMFILES: 'From files'
     HOTLINKINFO: 'Info: This image will be hotlinked. Please ensure you have permissions from the original site creator to do so.'
-    MAXNUMBEROFFILES: 'Failide maksimaalne kogus {count} ületatud.'
+    MAXNUMBEROFFILES: 'Max number of {count} file(s) exceeded.'
     MAXNUMBEROFFILESSHORT: 'Can only upload {count} files'
-    REMOVE: Eemalda
+    REMOVE: Remove
-    REMOVEERROR: 'Tõrge faili eemaldamisel'
+    REMOVEERROR: 'Error removing file'
     REMOVEINFO: 'Remove this file from here, but do not delete it from the file store'
-    STARTALL: 'Alusta kõigiga'
+    STARTALL: 'Start all'
-    STARTALLINFO: 'Alusta kõiki üleslaadimisi'
+    STARTALLINFO: 'Start all uploads'
-    Saved: Salvestatud
+    Saved: Saved
   Versioned:
-    has_many_Versions: Versioonid
+    has_many_Versions: Versioon

lang/fa_IR.yml

@@ -1,7 +1,6 @@
 fa_IR:
   AssetAdmin:
-    ADDFILES: 'Add files'
+    ALLOWEDEXTS: 'Allowed extensions'
-    EditOrgMenu: 'Edit & organize'
     NEWFOLDER: 'پوشه جديد'
   AssetTableField:
     CREATED: 'First uploaded'
@@ -21,7 +20,7 @@ fa_IR:
     EDITALL: 'Edit all'
     EDITANDORGANIZE: 'Edit & organize'
     EDITINFO: 'Edit files'
-    FILES: 'فايل ها'
+    FILES: Files
     FROMCOMPUTER: 'Choose files from your computer'
     FROMCOMPUTERINFO: 'Upload from your computer'
     TOTAL: Total
@@ -60,9 +59,9 @@ fa_IR:
     ERRORNOTADMIN: 'That user is not an administrator.'
     ERRORNOTREC: 'That username / password isn''t recognised'
   Boolean:
-    0: 'False'
+    0: نه
     ANY: هر
-    1: 'True'
+    1: آری
   CMSLoadingScreen.ss:
     LOADING: Loading...
     REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
@@ -72,7 +71,7 @@ fa_IR:
     ACCESSALLINTERFACESHELP: 'Overrules more specific access settings.'
     SAVE: نگاهداری
   CMSProfileController:
-    MENUTITLE: CMSProfileController
+    MENUTITLE: 'My Profile'
   ChangePasswordEmail.ss:
     CHANGEPASSWORDTEXT1: 'شما گذرواژه تان را دگرگون کردید برای'
     CHANGEPASSWORDTEXT2: 'You can now use the following credentials to log in:'
@@ -80,14 +79,14 @@ fa_IR:
     HELLO: درود
     PASSWORD: 'كلمه عبور'
   CheckboxField:
-    - 'False'
+    - نه
-    - 'True'
+    - آری
   ComplexTableField:
     CLOSEPOPUP: 'بستن چنجره'
     SUCCESSADD2: 'Added {name}'
     SUCCESSEDIT: '%s %s %s ذخيره شد'
   ComplexTableField.ss:
-    ADDITEM: 'Add %s'
+    ADDITEM: افزودن
     NOITEMSFOUND: 'No items found'
     SORTASC: 'Sort ascending'
     SORTDESC: 'Sort descending'
@@ -181,7 +180,7 @@ fa_IR:
     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: File
     FROMCOMPUTER: 'From your Computer'
     FROMFILESTORE: 'From the File Store'
     NOSOURCE: 'لطفا محل یک فایل را جهت پیوست انتخاب کنید'
@@ -234,7 +233,7 @@ fa_IR:
   GridFieldDetailForm:
     CancelBtn: Cancel
     Create: Create
-    Delete: حذف
+    Delete: Delete
     DeletePermissionsFailure: 'No delete permissions'
     Deleted: 'Deleted %s %s'
     Save: Save
@@ -258,7 +257,7 @@ fa_IR:
     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>'
-    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>'
+    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: 'گروه %d حذف شد'
     ResultUpdated: 'گروه %d بروز شد'
@@ -348,6 +347,7 @@ fa_IR:
     BUTTONLOGIN: ورود
     BUTTONLOGINOTHER: 'Log in as someone else'
     BUTTONLOSTPASSWORD: 'I''ve lost my password'
+    CANTEDIT: 'You don''t have permission to do that'
     CONFIRMNEWPASSWORD: 'تکرار رمز عبور جدید'
     CONFIRMPASSWORD: 'تکرار رمز عبور'
     DATEFORMAT: 'Date format'
@@ -367,7 +367,6 @@ fa_IR:
     NEWPASSWORD: 'گذرواژه تازه'
     PASSWORD: 'رمز عبور'
     PLURALNAME: اعضاء
-    PROFILESAVESUCCESS: 'Successfully saved.'
     REMEMBERME: 'Remember me next time?'
     SINGULARNAME: عضو
     SUBJECTPASSWORDCHANGED: 'گذرواژه شما دگرگون شد'
@@ -410,7 +409,7 @@ fa_IR:
     TWODIGITYEAR: 'Two-digit year'
   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>'
+    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: 'کاربر %d حذف شد'
     ResultNone: 'تغییری ایجاد نشد'
@@ -422,6 +421,7 @@ fa_IR:
   ModelAdmin:
     DELETE: حذف
     DELETEDRECORDS: 'Deleted {count} records.'
+    EMPTYBEFOREIMPORT: 'Clear Database before import'
     IMPORT: 'Import from CSV'
     IMPORTEDRECORDS: 'Imported {count} records.'
     NOCSVFILE: 'Please browse for a CSV file to import'
@@ -472,6 +472,7 @@ fa_IR:
     SINGULARNAME: 'Permission Role Code'
   Permissions:
     PERMISSIONS_CATEGORY: 'مجوز دسترسی ها و وظایف'
+    UserPermissionsIntro: 'Assigning groups to this user will adjust the permissions they have. See the groups section for details of permissions on individual groups.'
   PhoneNumberField:
     VALIDATION: 'لطفاً شماره تلفن معتبر وارد کنید'
   RelationComplexTableField.ss:

lang/fi.yml

@@ -1,7 +1,6 @@
 fi:
   AssetAdmin:
-    ADDFILES: 'Lisää tiedostoja'
+    ALLOWEDEXTS: 'Allowed extensions'
-    EditOrgMenu: 'Muokkaa ja järjestä'
     NEWFOLDER: 'Uusi kansio'
   AssetTableField:
     CREATED: 'Ensimmäisen kerran ladattu palvelimelle'
@@ -13,7 +12,7 @@ fi:
     SIZE: Koko
     TITLE: Otsikko
     TYPE: Tyyppi
-    URL: URL-osoite
+    URL: URL
   AssetUploadField:
     ChooseFiles: 'Valitse tiedostot'
     DRAGFILESHERE: 'Raahaa tiedotot tähän'
@@ -22,7 +21,7 @@ fi:
     EDITANDORGANIZE: 'Muokkaa & järjestele'
     EDITINFO: 'Muokkaa tiedostoja'
     FILES: Tiedostot
-    FROMCOMPUTER: 'Valitse tiedostoja omalta tietokoneeltasi'
+    FROMCOMPUTER: 'Valitse tiedostot omalta tietokoneeltasi'
     FROMCOMPUTERINFO: 'Siirrä omalta tietokoneeltasi'
     TOTAL: Yhteensä
     TOUPLOAD: 'Valitse ladattavia tiedostoja...'
@@ -60,9 +59,9 @@ fi:
     ERRORNOTADMIN: 'Tämä käyttäjä ei ole ylläpitäjä'
     ERRORNOTREC: 'Tätä käyttäjänimeä/salasanaa ei tunnistettu.'
   Boolean:
-    0: Epätosi
+    0: Ei
     ANY: Yhtään
-    1: Tosi
+    1: Kyllä
   CMSLoadingScreen.ss:
     LOADING: Ladataan...
     REQUIREJS: 'CMS-järjestelmä vaatii, että selaimessasi on JavaSkriptit päällä.'
@@ -72,7 +71,7 @@ fi:
     ACCESSALLINTERFACESHELP: 'Ohittaa tarkemmat käyttöoikeudet.'
     SAVE: Tallenna
   CMSProfileController:
-    MENUTITLE: 'CMS-profiili kontrolleri'
+    MENUTITLE: Profiilini
   ChangePasswordEmail.ss:
     CHANGEPASSWORDTEXT1: 'Vaihdoit salasanasi osoitteelle'
     CHANGEPASSWORDTEXT2: 'Kirjautuaksesi sisään voit käyttää seuraavia tietoja:'
@@ -80,15 +79,15 @@ fi:
     HELLO: Hei
     PASSWORD: Salasana
   CheckboxField:
-    - 'Ei valintaa'
+    - Ei
-    - Valittu
+    - Kyllä
   ComplexTableField:
     CLOSEPOPUP: 'Sulje ponnahdusikkuna'
     SUCCESSADD2: 'Lisättiin {name}'
     SUCCESSEDIT: 'Tallennettu %s %s %s'
   ComplexTableField.ss:
     ADDITEM: 'Lisää %s'
-    NOITEMSFOUND: 'Kohteita ei löytynyt'
+    NOITEMSFOUND: 'Merkintöjä ei löytynyt'
     SORTASC: 'Nouseva järjestys'
     SORTDESC: 'Laskeva järjestys'
   ComplexTableField_popup.ss:
@@ -105,7 +104,7 @@ fi:
     SECOND: toinen
     THIRD: kolmas
   CurrencyField:
-    CURRENCYSYMBOL: €
+    CURRENCYSYMBOL: $
   DataObject:
     PLURALNAME: Dataobjektit
     SINGULARNAME: Dataobjekti
@@ -200,7 +199,7 @@ fi:
     TEXT3: henkilölle
   Form:
     FIELDISREQUIRED: '%s on pakollinen.'
-    SubmitBtnLabel: Lähetä
+    SubmitBtnLabel: Siirrä
     VALIDATIONCREDITNUMBER: 'Tarkista, ovatko antamasi luottokortin numerot ({number}) oikein'
     VALIDATIONNOTUNIQUE: 'Syötetty arvo ei ole yksilöllinen'
     VALIDATIONPASSWORDSDONTMATCH: 'Salasanat eivät täsmää'
@@ -280,7 +279,7 @@ fi:
     CSSCLASSRIGHT: 'Oikealla, tesktin ympätöimänä.'
     DETAILS: Tiedot
     EMAIL: Sähköpostiosoite
-    FILE: Tiedostot
+    FILE: Tiedosto
     FOLDER: Kansio
     FROMCMS: CMS-järjestelmästä
     FROMCOMPUTER: 'Omalta tietokoneeltasi'
@@ -348,6 +347,7 @@ fi:
     BUTTONLOGIN: 'Kirjaudu sisään'
     BUTTONLOGINOTHER: 'Kirjaudu jonain muuna'
     BUTTONLOSTPASSWORD: 'Kadotin salasanani'
+    CANTEDIT: 'You don''t have permission to do that'
     CONFIRMNEWPASSWORD: 'Syötä uusi salasana uudelleen'
     CONFIRMPASSWORD: 'Syötä salasana uudelleen'
     DATEFORMAT: Päivämäärämuoto
@@ -367,9 +367,8 @@ fi:
     NEWPASSWORD: 'Uusi salasana'
     PASSWORD: Salasana
     PLURALNAME: Jäsenet
-    PROFILESAVESUCCESS: 'Tallennettu onnistuneesti.'
     REMEMBERME: 'Muista seuraavalla kerralla?'
-    SINGULARNAME: Käyttäjä
+    SINGULARNAME: Jäsen
     SUBJECTPASSWORDCHANGED: 'Salasanasi on vaihdettu'
     SUBJECTPASSWORDRESET: 'Salasanasi palautuslinkki'
     SURNAME: Sukunimi
@@ -412,7 +411,7 @@ fi:
     Help1: '<p>Tuo käyttäjät <em>CSV-muodossa</em> (arvot pilkulla erotettuina). <small><a href="#" class="toggle-advanced">Näytä edistyksellinen käyttö</a></small></p>'
     Help2: "<div class=\"advanced\">\\n<h4>Edistynyt käyttö</h4>\\n<ul>\\n<li>Sallitut palstat: <em>%s</em></li>\\n<li>Olemassa olevat käyttäjät kohdistetaan uniikilla <em>Code</em>-arvolla, ja päivitetään uudet arvot tuodusta tiedostosta.</li>\\n<li>Ryhmät voidaan kohdistaa <em>Ryhmät</em>-palstaan. Ryhmät tunnistetaan <em>Code</em>-arvosta, useat ryhmät voidaan erottaa pilkulla. Olemassa olevat ryhmäjäsenyydet säilytetään.</li>\\n</ul>\\n</div>"
     ResultCreated: 'Luotiin {count} käyttäjä(ä)'
-    ResultDeleted: 'Poistettu %d käyttäjä(ä)'
+    ResultDeleted: 'Poistettu %d jäsentä'
     ResultNone: 'Ei muutoksia'
     ResultUpdated: 'Päivitettiin {count} käyttäjä(ä)'
   MemberPassword:
@@ -422,6 +421,7 @@ fi:
   ModelAdmin:
     DELETE: Poista
     DELETEDRECORDS: 'Poistettiin {count} tietuetta'
+    EMPTYBEFOREIMPORT: 'Tyhjennä tietokanta ennen tuonti'
     IMPORT: 'Tuo CSV:stä'
     IMPORTEDRECORDS: 'Tuotiin {count} tietuetta'
     NOCSVFILE: 'Selaa ja tuo CSV-tiedosto'
@@ -463,7 +463,7 @@ fi:
     FromRole: 'periytyivät roolista "{title}"'
     FromRoleOnGroup: 'periytynyt roolista "%s" ryhmässä "%s"'
   PermissionRole:
-    OnlyAdminCanApply: 'Only admin can apply'
+    OnlyAdminCanApply: 'Vain järjestelmänvalvoja on oikeudet aseta'
     PLURALNAME: Roolit
     SINGULARNAME: Rooli
     Title: 'Roolin nimi'
@@ -472,12 +472,13 @@ fi:
     SINGULARNAME: 'Käyttöoikeiden roolin koodi'
   Permissions:
     PERMISSIONS_CATEGORY: 'Roolit ja käyttöoikeudet'
+    UserPermissionsIntro: 'Assigning groups to this user will adjust the permissions they have. See the groups section for details of permissions on individual groups.'
   PhoneNumberField:
     VALIDATION: 'Kirjoita pätevä puhelinnumero'
   RelationComplexTableField.ss:
     ADD: Lisää
-    CSVEXPORT: 'Vie CSV-muodossa'
+    CSVEXPORT: 'Vie CSV:nä'
-    NOTFOUND: 'Yhtään kohdetta ei löytynyt'
+    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'
@@ -530,13 +531,13 @@ fi:
     Print: Tulosta
     SELECT: 'Valitse:'
   TableListField.ss:
-    NOITEMSFOUND: 'Kohteita ei löytynyt'
+    NOITEMSFOUND: 'Merkintöjä ei löytynyt'
     SORTASC: 'Järjestä nousevasti'
     SORTDESC: 'Järjestä laskevasti'
   TableListField_PageControls.ss:
     DISPLAYING: Näytetään
     OF: /
-    TO: -»
+    TO: listalle
     VIEWFIRST: 'Näytä ensimmäinen'
     VIEWLAST: 'Näytä viimeinen'
     VIEWNEXT: 'Näytä seuraava'

lang/fo.yml

@@ -1,7 +1,6 @@
 fo:
   AssetAdmin:
-    ADDFILES: 'Add files'
+    ALLOWEDEXTS: 'Allowed extensions'
-    EditOrgMenu: 'Edit & organize'
     NEWFOLDER: 'Nýggj skjátta'
   AssetTableField:
     CREATED: 'First uploaded'
@@ -21,7 +20,7 @@ fo:
     EDITALL: 'Edit all'
     EDITANDORGANIZE: 'Edit & organize'
     EDITINFO: 'Edit files'
-    FILES: Fílur
+    FILES: Files
     FROMCOMPUTER: 'Choose files from your computer'
     FROMCOMPUTERINFO: 'Upload from your computer'
     TOTAL: Total
@@ -72,7 +71,7 @@ fo:
     ACCESSALLINTERFACESHELP: 'Overrules more specific access settings.'
     SAVE: Goym
   CMSProfileController:
-    MENUTITLE: CMSProfileController
+    MENUTITLE: 'My Profile'
   ChangePasswordEmail.ss:
     CHANGEPASSWORDTEXT1: 'Tú broytti loyniorðið hjá'
     CHANGEPASSWORDTEXT2: 'You can now use the following credentials to log in:'
@@ -87,7 +86,7 @@ fo:
     SUCCESSADD2: 'Added {name}'
     SUCCESSEDIT: 'Saved %s %s %s'
   ComplexTableField.ss:
-    ADDITEM: 'Add %s'
+    ADDITEM: 'Stovna %s'
     NOITEMSFOUND: 'No items found'
     SORTASC: 'Raða hækkandi'
     SORTDESC: 'Raða lækkandi'
@@ -181,7 +180,7 @@ fo:
     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: Fíla
+    FILE: File
     FROMCOMPUTER: 'From your Computer'
     FROMFILESTORE: 'From the File Store'
     NOSOURCE: 'Please select a source file to attach'
@@ -234,7 +233,7 @@ fo:
   GridFieldDetailForm:
     CancelBtn: Cancel
     Create: Create
-    Delete: Strika
+    Delete: Delete
     DeletePermissionsFailure: 'No delete permissions'
     Deleted: 'Deleted %s %s'
     Save: Save
@@ -258,7 +257,7 @@ fo:
     many_many_Members: Limir
   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>'
+    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'
     ResultUpdated: 'Updated %d groups'
@@ -348,6 +347,7 @@ fo:
     BUTTONLOGIN: Innrita
     BUTTONLOGINOTHER: 'Innrita sum onkur annar'
     BUTTONLOSTPASSWORD: 'Eg havi gloymt mítt loyniorð'
+    CANTEDIT: 'You don''t have permission to do that'
     CONFIRMNEWPASSWORD: 'Váttað nýtt loyniorð'
     CONFIRMPASSWORD: 'Váttað loyniorð'
     DATEFORMAT: 'Date format'
@@ -367,7 +367,6 @@ fo:
     NEWPASSWORD: 'Nýtt loyniorð'
     PASSWORD: Loyniorð
     PLURALNAME: Limir
-    PROFILESAVESUCCESS: 'Successfully saved.'
     REMEMBERME: 'Minst til mín?'
     SINGULARNAME: Limur
     SUBJECTPASSWORDCHANGED: 'Títt loyniorð er nú broytt'
@@ -410,7 +409,7 @@ fo:
     TWODIGITYEAR: 'Two-digit year'
   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>'
+    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'
     ResultNone: 'No changes'
@@ -422,6 +421,7 @@ fo:
   ModelAdmin:
     DELETE: Strika
     DELETEDRECORDS: 'Deleted {count} records.'
+    EMPTYBEFOREIMPORT: 'Clear Database before import'
     IMPORT: 'Innles frá CSV'
     IMPORTEDRECORDS: 'Imported {count} records.'
     NOCSVFILE: 'Please browse for a CSV file to import'
@@ -472,6 +472,7 @@ fo:
     SINGULARNAME: 'Permission Role Code'
   Permissions:
     PERMISSIONS_CATEGORY: 'Roles and access permissions'
+    UserPermissionsIntro: 'Assigning groups to this user will adjust the permissions they have. See the groups section for details of permissions on individual groups.'
   PhoneNumberField:
     VALIDATION: 'Vinarliga inntøppa eitt galdandi telefonnummar'
   RelationComplexTableField.ss:

lang/fr.yml

@@ -1,7 +1,6 @@
 fr:
   AssetAdmin:
-    ADDFILES: 'Add files'
+    ALLOWEDEXTS: 'Allowed extensions'
-    EditOrgMenu: 'Edit & organize'
     NEWFOLDER: 'Nouveau dossier'
   AssetTableField:
     CREATED: 'Premier chargement'
@@ -20,12 +19,12 @@ fr:
     DROPAREA: 'Zone de dépose'
     EDITALL: 'Tout éditer'
     EDITANDORGANIZE: 'Modifier et organiser'
-    EDITINFO: 'Edit files'
+    EDITINFO: 'Modifier les fichiers'
     FILES: Fichiers
-    FROMCOMPUTER: 'Choose files from your computer'
+    FROMCOMPUTER: 'Choisissez des fichiers de votre ordinateur'
-    FROMCOMPUTERINFO: 'Upload from your computer'
+    FROMCOMPUTERINFO: 'Télécharger depuis votre ordinateur'
     TOTAL: Total
-    TOUPLOAD: 'Choose files to upload...'
+    TOUPLOAD: 'Choisissez les fichiers à télécharger…'
     UPLOADINPROGRESS: 'Patientez s''il vous plaît… téléchargement en cours '
     UPLOADOR: OU
   BBCodeParser:
@@ -60,44 +59,44 @@ fr:
     ERRORNOTADMIN: 'Cet utilisateur n''est pas un administrateur.'
     ERRORNOTREC: 'Cet identifiant / mot de passe n''est pas reconnu'
   Boolean:
-    0: 'False'
+    0: Non
     ANY: Tout
-    1: 'True'
+    1: Oui
   CMSLoadingScreen.ss:
     LOADING: Chargement...
-    REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
+    REQUIREJS: 'Vous devez activer JavaScript pour utiliser le CMS.'
   CMSMain:
-    ACCESS: 'Access to ''{title}'' section'
+    ACCESS: 'Accès à la section « {title} »'
     ACCESSALLINTERFACES: 'Accès à toutes les sections du CMS'
     ACCESSALLINTERFACESHELP: 'Prioritaire sur les droits plus spécifiques d''accès.'
     SAVE: Enregistrer
   CMSProfileController:
-    MENUTITLE: CMSProfileController
+    MENUTITLE: 'Mon profil'
   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: 'Bonjour, '
+    HELLO: Salut
     PASSWORD: 'Mot de passe'
   CheckboxField:
-    - 'False'
+    - Non
-    - 'True'
+    - Oui
   ComplexTableField:
     CLOSEPOPUP: 'Ferme Popup'
     SUCCESSADD2: '{name} ajouté'
     SUCCESSEDIT: 'Sauvegardé %s %s %s'
   ComplexTableField.ss:
-    ADDITEM: 'Add %s'
+    ADDITEM: 'Ajoute %s'
-    NOITEMSFOUND: 'No items found'
+    NOITEMSFOUND: 'Aucun élément n’a été trouvé'
     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.'
+    ATLEAST: 'Le mot de passe doit comporter au moins {min} caractères.'
-    BETWEEN: 'Passwords must be {min} to {max} characters long.'
+    BETWEEN: 'Le mot de passe doit comporter entre {min} et {max} caractères.'
-    MAXIMUM: 'Passwords must be at most {max} characters long.'
+    MAXIMUM: 'Le mot de passe ne doit comporter plus de {max} caractères.'
     SHOWONCLICKTITLE: 'Changer le mot de passe'
   CreditCardField:
     FIRST: premier
@@ -131,68 +130,68 @@ 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})'
   DatetimeField:
-    NOTSET: 'Not set'
+    NOTSET: 'Non renseignée'
   Director:
     INVALID_REQUEST: 'Requête non valide'
   DropdownField:
     CHOOSE: (Choisir)
   EmailField:
-    VALIDATION: 'Please enter an email address'
+    VALIDATION: 'Saisissez une adresse de courrier électronique'
   Email_BounceRecord:
     PLURALNAME: 'Enregistrements des Emails rejetés'
     SINGULARNAME: 'Enregistrement de Email rejeté'
   Enum:
     ANY: Tous
   File:
-    AviType: 'AVI video file'
+    AviType: 'Fichier Vidéo AVI'
     Content: Contenu
-    CssType: 'CSS file'
+    CssType: 'Fichier CSS'
-    DmgType: 'Apple disk image'
+    DmgType: 'Image disque Apple'
-    DocType: 'Word document'
+    DocType: 'Document Word'
     Filename: 'Nom du fichier'
-    GifType: 'GIF image - good for diagrams'
+    GifType: 'Image GIF (adaptée aux diagrammes)'
-    GzType: 'GZIP compressed file'
+    GzType: 'Fichier compressé GZIP'
-    HtlType: 'HTML file'
+    HtlType: 'Fichier HTML'
-    HtmlType: 'HTML file'
+    HtmlType: 'Fichier HTML'
     INVALIDEXTENSION: 'Cette extension n’est pas autorisée (les valides sont : {extensions})'
-    INVALIDEXTENSIONSHORT: 'Extension is not allowed'
+    INVALIDEXTENSIONSHORT: 'Cette extension n’est pas autorisée'
-    IcoType: 'Icon image'
+    IcoType: Icône
-    JpgType: 'JPEG image - good for photos'
+    JpgType: 'Image JPEG (adaptée aux photos)'
-    JsType: 'Javascript file'
+    JsType: 'Fichier JavaScript'
-    Mp3Type: 'MP3 audio file'
+    Mp3Type: 'Fichier audio MP3'
-    MpgType: 'MPEG video file'
+    MpgType: 'Fichier vidéo MPEG'
     NOFILESIZE: 'La taille du fichier est de zéro bytes.'
     NOVALIDUPLOAD: 'Le fichier n’est pas valide pour le téléversement'
     Name: Nom
     PLURALNAME: Fichiers
-    PdfType: 'Adobe Acrobat PDF file'
+    PdfType: 'Fichier PDF Adobe Acrobat'
-    PngType: 'PNG image - good general-purpose format'
+    PngType: 'Image PNG (adaptée à tous les usages)'
     SINGULARNAME: Fichier
-    TOOLARGE: 'Filesize is too large, maximum {size} allowed'
+    TOOLARGE: 'La taille du fichier dépasse la limite de {size}'
-    TOOLARGESHORT: 'Filesize exceeds {size}'
+    TOOLARGESHORT: 'La taille du fichier dépasse les {size}'
-    TiffType: 'Tagged image format'
+    TiffType: 'Image TIFF'
     Title: Titre
-    WavType: 'WAV audo file'
+    WavType: 'Fichier audio WAV'
-    XlsType: 'Excel spreadsheet'
+    XlsType: 'Feuille de calcul Excel'
-    ZipType: 'ZIP compressed file'
+    ZipType: 'Fichier compressé ZIP'
   FileIFrameField:
-    ATTACH: 'Attach {type}'
+    ATTACH: 'Attacher {type}'
-    ATTACHONCESAVED: '{type}s can be attached once you have saved the record for the first time.'
+    ATTACHONCESAVED: 'Des {type} pourront être attachés après un premier enregistrement.'
-    ATTACHONCESAVED2: 'Files can be attached once you have saved the record for the first time.'
+    ATTACHONCESAVED2: 'Des fichiers pourront être attachés après un premier enregistrement.'
-    DELETE: 'Delete {type}'
+    DELETE: 'Supprimer {type}'
     DISALLOWEDFILETYPE: 'Ce type de fichier n’est pas autorisé'
     FILE: Fichier
     FROMCOMPUTER: 'À partir de votre ordinateur'
     FROMFILESTORE: 'Depuis le magasin de fichier'
     NOSOURCE: 'Choisir un fichier à attacher'
-    REPLACE: 'Replace {type}'
+    REPLACE: 'Remplacer {type}'
   FileIFrameField_iframe.ss:
     TITLE: 'Iframe de chargement d’images'
   Filesystem:
     SYNCRESULTS: 'Synchronisation terminée : {createdcount} éléments créés, {deletedcount} éléments supprimés '
   Folder:
-    PLURALNAME: Folders
+    PLURALNAME: Dossiers
-    SINGULARNAME: Folder
+    SINGULARNAME: Dossier
   ForgotPasswordEmail.ss:
     HELLO: Salut
     TEXT1: 'Voici votre'
@@ -200,18 +199,18 @@ fr:
     TEXT3: pour
   Form:
     FIELDISREQUIRED: '%s est requis'
-    SubmitBtnLabel: Go
+    SubmitBtnLabel: Envoyer
-    VALIDATIONCREDITNUMBER: 'Please ensure you have entered the {number} credit card number correctly'
+    VALIDATIONCREDITNUMBER: 'Vérifiez que vous avez bien saisi votre numéro de carte bleue {number}.'
     VALIDATIONNOTUNIQUE: 'La valeur entrée n''est pas unique'
     VALIDATIONPASSWORDSDONTMATCH: 'Les mots de passe ne correspondent pas'
     VALIDATIONPASSWORDSNOTEMPTY: 'Les mots de passe peuvent être vides'
-    VALIDATIONSTRONGPASSWORD: 'Passwords must have at least one digit and one alphanumeric character'
+    VALIDATIONSTRONGPASSWORD: 'Le mot de passe doit comporter au moins un chiffre et un caractère alphanumérique'
     VALIDATOR: Validateur
-    VALIDCURRENCY: 'Please enter a valid currency'
+    VALIDCURRENCY: 'Saisissez une monnaie valide'
   FormField:
     NONE: aucun
   GridAction:
-    DELETE_DESCRIPTION: Supprimer
+    DELETE_DESCRIPTION: Supprime
     Delete: Supprimer
     UnlinkRelation: Séparer
   GridField:
@@ -232,7 +231,7 @@ fr:
   GridFieldAction_Delete:
     DeletePermissionsFailure: 'Vous n’avez pas les autorisations pour supprimer'
   GridFieldDetailForm:
-    CancelBtn: Cancel
+    CancelBtn: Annuler
     Create: Créer
     Delete: Supprimer
     DeletePermissionsFailure: 'Vous n’avez pas les autorisations pour supprimer'
@@ -248,30 +247,30 @@ fr:
     Description: Description
     GroupReminder: 'Si vous choisissez un groupe parent, le groupe actuel héritera de tous ses rôles'
     Locked: 'Verrouillé?'
-    NoRoles: 'Aucun rôle n’a été trouvé'
+    NoRoles: 'Vous n’avez pas la permission pour faire ça'
-    PLURALNAME: Groups
+    PLURALNAME: Groupes
     Parent: 'Groupe parent'
     RolesAddEditLink: 'Ajouter/éditer les rôles'
-    SINGULARNAME: Group
+    SINGULARNAME: Groupe
     Sort: 'Ordre de tri'
     has_many_Permissions: Autorisations
     many_many_Members: Membres
   GroupImportForm:
     Help1: '<p>Importer un ou plusieurs groupe(s) au format <em>CSV</em> (comma-separated values). <small><a href="#" class="toggle-advanced">Montrer l''usage avancé</a></small></p>'
-    Help2: "<div class=\"advanced\">\\n<h4>Utilisations avancée</h4>\\n<ul>\\n<li>Colonnes autorisées&nbsp;: <em>%s</em></li>\\n<li>Les groupes existants dont la valeur <em>Code</em> concorde seront mis à jour avec les données du fichier importé.</li>\\n<li>Des hiérarchies entre groupes peuvent être créées à l’aide de la colonne <em>ParentCode</em>.</li>\\n<li>Des autorisations peuvent être assignées par la colonne <em>PermissionCode</em>. Les autorisations existantes ne seront pas effacées.</li>\\n</ul>\\n</div>"
+    Help2: "<div class=\"advanced\">\\n<h4>Utilisation avancée</h4>\\n<ul>\\n<li>Colonnes autorisées&nbsp;: <em>%s</em></li>\\n<li>Les utilisateurs existants sont retrouvés avec leur <em>Code</em> unique et les registres sont mis à jour avec les nouvelles valeurs du fichier importé.</li>\\n<li>Des hiérarchies de groupes peuvent être créées à l’aide de la colonne <em>ParentCode</em>.</li>\\n<li>Les autorisations sont assignées par la colonne <em>PermissionCode</em>. Les autorisations actuelles ne sont pas modifiées.</li>\\n</ul>\\n</div>"
-    ResultCreated: 'Created {count} groups'
+    ResultCreated: '{count} groupes créés'
     ResultDeleted: '%d groupes supprimés'
     ResultUpdated: '%d groupes mises à jour'
   Hierarchy:
-    InfiniteLoopNotAllowed: 'Infinite loop found within the "{type}" hierarchy. Please change the parent to resolve this'
+    InfiniteLoopNotAllowed: 'Une boucle infinie s’est produite dans la hiérarchie « {type} ». Modifiez le parent pour le résoudre.'
   HtmlEditorField:
-    ADDURL: 'Add URL'
+    ADDURL: 'Ajouter URL'
     ADJUSTDETAILSDIMENSIONS: 'Détails &amp; dimensions'
     ANCHORVALUE: Ancre
     BUTTONINSERT: Insérer
     BUTTONINSERTLINK: 'Insérer un lien'
     BUTTONREMOVELINK: 'Supprimer le lien'
-    BUTTONUpdate: Update
+    BUTTONUpdate: 'Mettre à jour'
     CAPTIONTEXT: Légende
     CSSCLASS: 'Alignement / Style'
     CSSCLASSCENTER: Centré
@@ -280,15 +279,15 @@ fr:
     CSSCLASSRIGHT: 'a droite, avec texte à la ligne.'
     DETAILS: Détails
     EMAIL: 'Adresse email'
-    FILE: Fichiers
+    FILE: Fichier
     FOLDER: Dossier
     FROMCMS: 'Depuis le SGC'
     FROMCOMPUTER: 'Depuis votre ordinateur'
-    FROMWEB: 'From the web'
+    FROMWEB: 'Du web'
     FindInFolder: 'Trouver dans un dossier'
-    IMAGEALT: 'Alternative text (alt)'
+    IMAGEALT: 'Texte alternatif (alt)'
     IMAGEALTTEXT: 'Texte alternatif (alt) - s''affiche si l''image ne peut être affichée.'
-    IMAGEALTTEXTDESC: 'Shown to screen readers or if image can not be displayed'
+    IMAGEALTTEXTDESC: 'Proposé aux lecteurs d’écran ou si l’image ne peut pas être affichée'
     IMAGEDIMENSIONS: Dimensions
     IMAGEHEIGHTPX: Hauteur
     IMAGETITLE: 'Texte du titre (tooltip) - informations à propos de l''image'
@@ -307,21 +306,21 @@ fr:
     LINKTO: 'Lier à'
     PAGE: Page
     URL: URL
-    URLNOTANOEMBEDRESOURCE: 'The URL ''{url}'' could not be turned into a media resource.'
+    URLNOTANOEMBEDRESOURCE: 'L’URL {url} n’a pas pu être utilisée comme ressource média.'
     UpdateMEDIA: 'Mettre à jour le support audiovisuel'
   Image:
-    PLURALNAME: Files
+    PLURALNAME: Fichiers
-    SINGULARNAME: File
+    SINGULARNAME: Fichier
   ImageField:
     IMAGE: Image
   Image_Cached:
-    PLURALNAME: Files
+    PLURALNAME: Fichiers
-    SINGULARNAME: File
+    SINGULARNAME: Fichier
   Image_iframe.ss:
     TITLE: 'Fenêtre de chargement d''images'
   LeftAndMain:
     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.
+    DELETED: Supprimé.
     DropdownBatchActionsDefault: Actions
     HELP: Aide
     PAGETYPE: 'Type de page&nbsp;:'
@@ -329,18 +328,18 @@ fr:
     PERMALREADY: 'Désolé, mais vous ne pouvez pas accéder à cette partie du CMS. Si vous voulez changer d''identité, faites le ci-dessous'
     PERMDEFAULT: 'Saisissez votre adresse de courriel et votre mot de passe pour accéder au CMS.'
     PLEASESAVE: 'Enregistrez la page s’il vous plaît&nbsp;: elle ne pouvait pas être mise à jour car elle n’avait pas encore été sauvegardée.'
-    PreviewButton: Preview
+    PreviewButton: Aperçu
-    REORGANISATIONSUCCESSFUL: 'Reorganised the site tree successfully.'
+    REORGANISATIONSUCCESSFUL: 'L’arbre du site a été bien réorganisé.'
-    SAVEDUP: Saved.
+    SAVEDUP: Enregistré.
     VersionUnknown: inconnu
   LeftAndMain_Menu.ss:
-    Hello: Hi
+    Hello: Bonjour
-    LOGOUT: 'Log out'
+    LOGOUT: Déconnexion
   LoginAttempt:
     Email: 'Adresse Email'
     IP: 'Adresse IP'
-    PLURALNAME: 'Login Attempts'
+    PLURALNAME: 'Essais de connexion'
-    SINGULARNAME: 'Login Attempt'
+    SINGULARNAME: 'Essai de connexion'
     Status: Statut
   Member:
     ADDGROUP: 'Ajouter un groupe'
@@ -348,9 +347,10 @@ fr:
     BUTTONLOGIN: 'Se connecter'
     BUTTONLOGINOTHER: 'Connectez vous avec un différent identifiant'
     BUTTONLOSTPASSWORD: 'J''ai perdu mon mot de passe'
+    CANTEDIT: 'Vous n’avez pas la permission pour faire ça'
     CONFIRMNEWPASSWORD: 'Confirmer nouveau mot de passe'
     CONFIRMPASSWORD: 'Confirmer Mot De Passe'
-    DATEFORMAT: 'Date format'
+    DATEFORMAT: 'Format de la date'
     DefaultAdminFirstname: 'Administrateur par défaut'
     DefaultDateTime: 'par défaut'
     EMAIL: Email
@@ -367,13 +367,12 @@ fr:
     NEWPASSWORD: 'Nouveau mot de passe'
     PASSWORD: 'Mot de passe'
     PLURALNAME: Membres
-    PROFILESAVESUCCESS: 'Sauvegardé avec succès'
     REMEMBERME: 'Se souvenir de moi la prochaine fois ?'
     SINGULARNAME: Membre
     SUBJECTPASSWORDCHANGED: 'Votre mot de passe a été changé'
     SUBJECTPASSWORDRESET: 'Lien pour modifier votre mot de passe'
     SURNAME: 'Nom de famille'
-    TIMEFORMAT: 'Time format'
+    TIMEFORMAT: 'Format horaire'
     VALIDATIONMEMBEREXISTS: 'Il existe déjà un membre avec cet email'
     ValidationIdentifierFailed: 'On ne peut pas réenregistrer le membre nº {id} avec un identifiant identique  ({name} = {value}))'
     WELCOMEBACK: 'Bienvenue {firstname}'
@@ -410,30 +409,31 @@ fr:
     TWODIGITYEAR: 'L’année sur deux chiffres'
   MemberImportForm:
     Help1: '<p>Importer les membres au format<em>CSV format</em> (comma-separated values). <small><a href="#" class="toggle-advanced">Afficher l''usage avancé.</a></small></p>'
-    Help2: "<div class=\"advanced\">\\n<h4>Utilisations avancée</h4>\\n<ul>\\n<li>Colonnes autorisées&nbsp;: <em>%s</em></li>\\n<li>Les membres existants dont la valeur <em>Code</em> concorde seront mis à jour avec les données du fichier importé.</li>\\n<li>Des groupes peuvent être assignés par la colonne <em>Groups</em>. Plusieurs groupes, identifiés par leur <em>Code</em>, peuvent être assignés en les séparant par des virgules. Les groupes existants ne seront pas effacés.</li>\\n</ul>\\n</div>\\n"
+    Help2: "<div class=\"advanced\">\\n<h4>Utilisation avancée</h4>\\n<ul>\\n<li>Colonnes autorisées&nbsp;: <em>%s</em></li>\\n<li>Les utilisateurs existants sont retrouvés avec leur <em>Code</em> unique et les registres sont mis à jour avec les nouvelles valeurs du fichier importé.</li>\\n<li>Des groupes peuvent être assignés à l’aide de la colonne <em>Groups</em>. Les groupes sont identifiés par leur <em>Code</em>, plusieurs groupes peuvent être indiqués en les séparant par des virgules. L’appartenance actuelle aux groupes n’est pas modifiée.</li>\\n</ul>\\n</div>"
-    ResultCreated: 'Created {count} members'
+    ResultCreated: '{count} membres créés'
     ResultDeleted: '%d membres supprimés'
     ResultNone: 'Aucun changements'
-    ResultUpdated: 'Updated {count} members'
+    ResultUpdated: '{count} membres mis à jour'
   MemberPassword:
-    PLURALNAME: 'Member Passwords'
+    PLURALNAME: 'Mots de passe des membres'
-    SINGULARNAME: 'Member Password'
+    SINGULARNAME: 'Mot de passe du membre'
   MemberTableField: null
   ModelAdmin:
     DELETE: Supprime
-    DELETEDRECORDS: 'Deleted {count} records.'
+    DELETEDRECORDS: '{count} enregistrements supprimés.'
+    EMPTYBEFOREIMPORT: 'Vider la base de données avant d’importer'
     IMPORT: 'Importer de CSV'
-    IMPORTEDRECORDS: 'Imported {count} records.'
+    IMPORTEDRECORDS: '{count} enregistrements importés.'
     NOCSVFILE: 'Veuillez choisir un fichier CSV à importer'
     NOIMPORT: 'Rien à importer'
     RESET: Réinitialiser
-    Title: 'Data Models'
+    Title: 'Modèles de données'
-    UPDATEDRECORDS: 'Updated {count} records.'
+    UPDATEDRECORDS: '{count} enregistrements mis à jour.'
   ModelAdmin_ImportSpec.ss:
-    IMPORTSPECFIELDS: 'Database columns'
+    IMPORTSPECFIELDS: 'Colonnes de la base de données'
-    IMPORTSPECLINK: 'Show Specification for %s'
+    IMPORTSPECLINK: 'Afficher la spécification de %s'
     IMPORTSPECRELATIONS: Relations
-    IMPORTSPECTITLE: 'Specification for %s'
+    IMPORTSPECTITLE: 'Spécification de %s'
   ModelAdmin_Tools.ss:
     FILTER: Filtrer
     IMPORT: Importer
@@ -449,35 +449,36 @@ fr:
     VALIDATION: '« {value} » n’est pas un chiffre, seule donnée acceptée dans ce champ '
   Pagination:
     Page: Page
-    View: View
+    View: Afficher
   Permission:
     AdminGroup: Administrateur
     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.'
-    PLURALNAME: Permissions
+    PLURALNAME: Autorisations
-    SINGULARNAME: Permission
+    SINGULARNAME: Autorisation
   PermissionCheckboxSetField:
     AssignedTo: 'assignée au groupe « {title} »'
     FromGroup: 'hérité du groupe « {title} »'
     FromRole: 'héritée du rôle « {title} »'
     FromRoleOnGroup: 'hérité du rôle "%s" du groupe "%s"'
   PermissionRole:
-    OnlyAdminCanApply: 'Only admin can apply'
+    OnlyAdminCanApply: 'Limité aux administrateurs'
-    PLURALNAME: Roles
+    PLURALNAME: Rôles
-    SINGULARNAME: Role
+    SINGULARNAME: Rôle
-    Title: Title
+    Title: Titre
   PermissionRoleCode:
-    PLURALNAME: 'Permission Role Cods'
+    PLURALNAME: 'Codes des autorisations liées au rôle'
-    SINGULARNAME: 'Permission Role Code'
+    SINGULARNAME: 'Code de l’autorisation liée au rôle'
   Permissions:
     PERMISSIONS_CATEGORY: 'Rôles et autorisations d’accès'
+    UserPermissionsIntro: 'Assigner des groupes à cet utilisateur modifiera les autorisations dont il dispose. Consultez la section « Groupes » pour plus de détails sur les autorisations associées à chaque groupe.'
   PhoneNumberField:
     VALIDATION: 'Entrer un numéro de téléphone valide'
   RelationComplexTableField.ss:
     ADD: Ajouter
-    CSVEXPORT: 'Export to CSV'
+    CSVEXPORT: 'Exporter en CSV'
-    NOTFOUND: 'No items found'
+    NOTFOUND: 'Aucun élément n’a été trouvé'
   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'
@@ -488,10 +489,10 @@ fr:
     LOGGEDOUT: 'Vous avez été déconnecté. Si vous voulez vous reconnecter, entrer vos détaisl ci-dessous.'
     LOGIN: Connectez-vous
     NOTEPAGESECURED: 'Cette page est sécurisée. Entrer vos détails ci-dessous et nous vous enverrons directement.'
-    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>Le lien de réinitialisation du mot de passe n’est pas valide ou a expiré.</p><p>Vous pouvez en demander un nouveau <a href="{link1}">en suivant ce lien</a> ou changer de mot de passe après <a href="{link2}">connexion</a>.</p>'
     NOTERESETPASSWORD: 'Entrer votre adresse email et nous vous enverrons un lien pour modifier votre mot de passe'
-    PASSWORDSENTHEADER: 'Password reset link sent to ''{email}'''
+    PASSWORDSENTHEADER: 'Lien de réinitialisation de mot de passe envoyé  à « {email} »'
-    PASSWORDSENTTEXT: 'Thank you! A reset link has been sent to ''{email}'', provided an account exists for this email address.'
+    PASSWORDSENTTEXT: 'Merci ! Un lien de réinitialisation vient d’être envoyé à « {email} », à condition que cette adresse existe.'
   SecurityAdmin:
     ACCESS_HELP: 'Permet de consulter, d’ajouter et d’éditer les utilisateurs, aussi bien que de leur assigner des autorisations et des rôles.'
     APPLY_ROLES: 'Appliquer des rôles aux groupes'
@@ -520,23 +521,23 @@ fr:
   SiteTree:
     TABMAIN: Principal
   TableField:
-    ISREQUIRED: 'In %s ''%s'' is required'
+    ISREQUIRED: 'Dans %s « %s » est requis'
   TableField.ss:
     ADD: 'Ajouter une nouvelle ligne'
-    ADDITEM: 'Add %s'
+    ADDITEM: 'Ajouter %s'
   TableListField:
     CSVEXPORT: 'Exporter vers un fichier CSV'
     PRINT: Imprimer
-    Print: Print
+    Print: Imprimer
     SELECT: 'Sélectionner&nbsp;:'
   TableListField.ss:
-    NOITEMSFOUND: 'No items found'
+    NOITEMSFOUND: 'Aucun élément n’a été trouvé'
     SORTASC: 'Classer en ordre croissant'
     SORTDESC: 'Classer en ordre décroissant'
   TableListField_PageControls.ss:
-    DISPLAYING: Displaying
+    DISPLAYING: 'Affichage de'
-    OF: of
+    OF: de
-    TO: to
+    TO: à
     VIEWFIRST: 'Voir premier'
     VIEWLAST: 'Voir dernier'
     VIEWNEXT: 'Voir suivant'
@@ -550,26 +551,26 @@ fr:
     ATTACHFILE: 'Joindre un fichier'
     ATTACHFILES: 'Joindre des fichiers'
     AttachFile: 'Joindre un ou plusieurs fichiers'
-    DELETE: 'Delete from files'
+    DELETE: 'Supprimer des fichiers'
     DELETEINFO: 'Effacer définitivement ce fichier des archives'
     DOEDIT: Enregistrer
     DROPFILE: 'glissez-déposez un fichier'
     DROPFILES: 'glissez-déposez les fichiers'
     Dimensions: Dimensions
-    EDIT: Edit
+    EDIT: Modifier
     EDITINFO: 'Modifier ce fichier'
     FIELDNOTSET: 'Aucune information sur le fichier n''a été trouvée '
     FROMCOMPUTER: 'Depuis votre ordinateur'
-    FROMCOMPUTERINFO: 'Select from files'
+    FROMCOMPUTERINFO: 'Choisir parmi les fichiers'
     FROMFILES: 'Depuis les fichiers'
-    HOTLINKINFO: 'Info: This image will be hotlinked. Please ensure you have permissions from the original site creator to do so.'
+    HOTLINKINFO: 'Note : Cette image sera liée par un « hotlink », assurez-vous d’avoir l’autorisation des ayant-droits du site web d’origine.'
     MAXNUMBEROFFILES: 'Le nombre maximal de {count} fichiers a été dépassé.'
     MAXNUMBEROFFILESSHORT: 'On ne peut pas télécharger plus de {count} fichiers'
     REMOVE: Supprimer
     REMOVEERROR: 'Le fichier n’a pas pu être supprimé'
     REMOVEINFO: 'Supprimer ce fichier ici sans l’effacer des archives'
     STARTALL: 'Démarrer tout'
-    STARTALLINFO: 'Start all uploads'
+    STARTALLINFO: 'Démarrer tous les téléchargements'
     Saved: Enregistré
   Versioned:
     has_many_Versions: Versions

lang/gl_ES.yml

@@ -1,132 +1,131 @@
 gl_ES:
   AssetAdmin:
-    ADDFILES: 'Add files'
+    ALLOWEDEXTS: 'Allowed extensions'
-    EditOrgMenu: 'Edit & organize'
     NEWFOLDER: NewFolder
   AssetTableField:
-    CREATED: 'First uploaded'
+    CREATED: 'Primeiro subido'
-    DIM: Dimensions
+    DIM: Dimensións
-    FILENAME: Filename
+    FILENAME: 'Nome ficheiro'
-    FOLDER: Folder
+    FOLDER: Cartafol
-    LASTEDIT: 'Last changed'
+    LASTEDIT: 'Último cambio'
-    OWNER: Owner
+    OWNER: Propietario
-    SIZE: 'File size'
+    SIZE: 'Tamaño ficheiro'
-    TITLE: Title
+    TITLE: Título
     TYPE: 'Tipo ficheiro'
     URL: URL
   AssetUploadField:
-    ChooseFiles: 'Choose files'
+    ChooseFiles: 'Escoller ficheiros'
-    DRAGFILESHERE: 'Drag files here'
+    DRAGFILESHERE: 'Arrastrar ficheiro aquí'
-    DROPAREA: 'Drop Area'
+    DROPAREA: 'Área Contedor'
     EDITALL: 'Edit all'
-    EDITANDORGANIZE: 'Edit & organize'
+    EDITANDORGANIZE: 'Editar e organizar'
     EDITINFO: 'Edit files'
-    FILES: Ficheiros
+    FILES: Files
-    FROMCOMPUTER: 'Choose files from your computer'
+    FROMCOMPUTER: 'Escolle ficheiros do teu computador'
     FROMCOMPUTERINFO: 'Upload from your computer'
     TOTAL: Total
     TOUPLOAD: 'Choose files to upload...'
     UPLOADINPROGRESS: 'Please wait… upload in progress'
     UPLOADOR: OR
   BBCodeParser:
-    ALIGNEMENT: Alignment
+    ALIGNEMENT: Aliñamento
-    ALIGNEMENTEXAMPLE: 'right aligned'
+    ALIGNEMENTEXAMPLE: 'aliñamento a dereita'
-    BOLD: 'Bold Text'
+    BOLD: 'Texto en negriña'
-    BOLDEXAMPLE: Bold
+    BOLDEXAMPLE: Negriña
-    CODE: 'Code Block'
+    CODE: 'Bloque de código'
-    CODEDESCRIPTION: 'Unformatted code block'
+    CODEDESCRIPTION: 'Bloque de código sen formato'
-    CODEEXAMPLE: 'Code block'
+    CODEEXAMPLE: 'Bloque de código'
-    COLORED: 'Colored text'
+    COLORED: 'Texto colorado'
-    COLOREDEXAMPLE: 'blue text'
+    COLOREDEXAMPLE: 'texto azul'
-    EMAILLINK: 'Email link'
+    EMAILLINK: 'Ligazón de correo-e'
-    EMAILLINKDESCRIPTION: 'Create link to an email address'
+    EMAILLINKDESCRIPTION: 'Crear ligazón para un enderezo de correo-e'
     IMAGE: Imaxe
-    IMAGEDESCRIPTION: 'Show an image in your post'
+    IMAGEDESCRIPTION: 'Amosar a imaxe na túa publicación'
-    ITALIC: 'Italic Text'
+    ITALIC: 'Texto en cursiva'
-    ITALICEXAMPLE: Italics
+    ITALICEXAMPLE: Cursiva
-    LINK: 'Website link'
+    LINK: 'Ligazón ó sitio web'
-    LINKDESCRIPTION: 'Link to another website or URL'
+    LINKDESCRIPTION: 'Ligar a outro sitio web ou URL'
-    STRUCK: 'Struck-out Text'
+    STRUCK: 'Texto tachado'
-    STRUCKEXAMPLE: Struck-out
+    STRUCKEXAMPLE: Tachado
-    UNDERLINE: 'Underlined Text'
+    UNDERLINE: 'Texto subliñado'
-    UNDERLINEEXAMPLE: Underlined
+    UNDERLINEEXAMPLE: Subliñado
-    UNORDERED: 'Unordered list'
+    UNORDERED: 'Lista desordenada'
-    UNORDEREDDESCRIPTION: 'Unordered list'
+    UNORDEREDDESCRIPTION: 'Lista desordenada'
-    UNORDEREDEXAMPLE1: 'unordered item 1'
+    UNORDEREDEXAMPLE1: 'elemento desordenado 1'
   BackLink_Button.ss:
     Back: Back
   BasicAuth:
-    ENTERINFO: 'Please enter a username and password.'
+    ENTERINFO: 'Por favor insire un nome de usuario e contrasinal.'
-    ERRORNOTADMIN: 'That user is not an administrator.'
+    ERRORNOTADMIN: 'Ese usuario non é un administrador.'
-    ERRORNOTREC: 'That username / password isn''t recognised'
+    ERRORNOTREC: 'Ese nome de usuario/contrasinal non é recoñecido'
   Boolean:
-    0: 'False'
+    0: Falso
     ANY: Ningún
-    1: 'True'
+    1: Verdadeiro
   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'
+    ACCESSALLINTERFACES: 'Acceder a todas as seccións do CMS'
-    ACCESSALLINTERFACESHELP: 'Overrules more specific access settings.'
+    ACCESSALLINTERFACESHELP: 'Anular a configuración de acceso máis específica.'
     SAVE: Gardar
   CMSProfileController:
-    MENUTITLE: CMSProfileController
+    MENUTITLE: 'My Profile'
   ChangePasswordEmail.ss:
-    CHANGEPASSWORDTEXT1: 'You changed your password for'
+    CHANGEPASSWORDTEXT1: 'Mudaches o teu contrasinal por'
-    CHANGEPASSWORDTEXT2: 'You can now use the following credentials to log in:'
+    CHANGEPASSWORDTEXT2: 'Podes empregar agora as seguintes credenciais para iniciar sesión:'
     EMAIL: Correo-e
-    HELLO: Hi
+    HELLO: Ola
     PASSWORD: Contrasinal
   CheckboxField:
-    - 'False'
+    - Falso
-    - 'True'
+    - Verdade
   ComplexTableField:
-    CLOSEPOPUP: 'Close Popup'
+    CLOSEPOPUP: 'Pechar Ventá Emerxente'
     SUCCESSADD2: 'Added {name}'
-    SUCCESSEDIT: 'Saved %s %s %s'
+    SUCCESSEDIT: 'Gardado %s %s %s'
   ComplexTableField.ss:
-    ADDITEM: 'Add %s'
+    ADDITEM: engadir
     NOITEMSFOUND: 'No items found'
-    SORTASC: 'Sort ascending'
+    SORTASC: 'Orde ascendente'
-    SORTDESC: 'Sort descending'
+    SORTDESC: 'Orde descendente'
   ComplexTableField_popup.ss:
-    NEXT: Next
+    NEXT: Seguinte
-    PREVIOUS: Previous
+    PREVIOUS: Anterior
   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: 'Change Password'
+    SHOWONCLICKTITLE: 'Mudar Contrasinal'
   CreditCardField:
-    FIRST: first
+    FIRST: primeiro
-    FOURTH: fourth
+    FOURTH: cuarto
-    SECOND: second
+    SECOND: segundo
-    THIRD: third
+    THIRD: terceiro
   CurrencyField:
-    CURRENCYSYMBOL: $
+    CURRENCYSYMBOL: €
   DataObject:
-    PLURALNAME: 'Data Objects'
+    PLURALNAME: 'Obxectos de Datos'
-    SINGULARNAME: 'Data Object'
+    SINGULARNAME: 'Obxecto de Dato'
   Date:
-    DAY: ' day'
+    DAY: día
-    DAYS: ' days'
+    DAYS: días
-    HOUR: ' hour'
+    HOUR: hora
-    HOURS: ' hours'
+    HOURS: horas
-    MIN: ' min'
+    MIN: min
-    MINS: ' mins'
+    MINS: mins
-    MONTH: ' month'
+    MONTH: mes
-    MONTHS: ' months'
+    MONTHS: meses
-    SEC: ' sec'
+    SEC: seg
-    SECS: ' secs'
+    SECS: segs
     TIMEDIFFAGO: '{difference} ago'
     TIMEDIFFIN: 'in {difference}'
-    YEAR: ' year'
+    YEAR: ano
-    YEARS: ' years'
+    YEARS: anos
   DateField:
-    NOTSET: 'not set'
+    NOTSET: 'sen establecer'
-    TODAY: today
+    TODAY: hoxe
     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})'
@@ -135,12 +134,12 @@ gl_ES:
   Director:
     INVALID_REQUEST: 'Invalid request'
   DropdownField:
-    CHOOSE: (Choose)
+    CHOOSE: (Escoller)
   EmailField:
     VALIDATION: 'Please enter an email address'
   Email_BounceRecord:
-    PLURALNAME: 'Email Bounce Records'
+    PLURALNAME: 'Rexistro de Correos Rexeitados'
-    SINGULARNAME: 'Email Bounce Record'
+    SINGULARNAME: 'Rexistro de Correo Rexeitado'
   Enum:
     ANY: Ningún
   File:
@@ -149,7 +148,7 @@ gl_ES:
     CssType: 'CSS file'
     DmgType: 'Apple disk image'
     DocType: 'Word document'
-    Filename: Filename
+    Filename: 'Nome ficheiro'
     GifType: 'GIF image - good for diagrams'
     GzType: 'GZIP compressed file'
     HtlType: 'HTML file'
@@ -161,17 +160,17 @@ gl_ES:
     JsType: 'Javascript file'
     Mp3Type: 'MP3 audio file'
     MpgType: 'MPEG video file'
-    NOFILESIZE: 'Filesize is zero bytes.'
+    NOFILESIZE: 'O tamaño do ficheiro é cero bytes.'
-    NOVALIDUPLOAD: 'File is not a valid upload'
+    NOVALIDUPLOAD: 'Ficheiro non válido para subir'
-    Name: Name
+    Name: Nome
-    PLURALNAME: Files
+    PLURALNAME: Ficheiros
     PdfType: 'Adobe Acrobat PDF file'
     PngType: 'PNG image - good general-purpose format'
-    SINGULARNAME: File
+    SINGULARNAME: Ficheiro
     TOOLARGE: 'Filesize is too large, maximum {size} allowed'
     TOOLARGESHORT: 'Filesize exceeds {size}'
     TiffType: 'Tagged image format'
-    Title: Title
+    Title: Título
     WavType: 'WAV audo file'
     XlsType: 'Excel spreadsheet'
     ZipType: 'ZIP compressed file'
@@ -180,131 +179,131 @@ gl_ES:
     ATTACHONCESAVED: '{type}s can be attached once you have saved the record for the first time.'
     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'
+    DISALLOWEDFILETYPE: 'Este tipo de ficheiro non está permitido para ser subido'
     FILE: Ficheiro
-    FROMCOMPUTER: 'From your Computer'
+    FROMCOMPUTER: 'Dende o teu Computador'
-    FROMFILESTORE: 'From the File Store'
+    FROMFILESTORE: 'Dende o Almacén de Ficheiros'
-    NOSOURCE: 'Please select a source file to attach'
+    NOSOURCE: 'Por favor selecciona un ficheiro fonte para anexar'
     REPLACE: 'Replace {type}'
   FileIFrameField_iframe.ss:
-    TITLE: 'Image Uploading Iframe'
+    TITLE: 'Iframe subindo imaxe'
   Filesystem:
     SYNCRESULTS: 'Sync complete: {createdcount} items created, {deletedcount} items deleted'
   Folder:
     PLURALNAME: Folders
     SINGULARNAME: Folder
   ForgotPasswordEmail.ss:
-    HELLO: Hi
+    HELLO: Ola
-    TEXT1: 'Here is your'
+    TEXT1: 'Estás aquí'
-    TEXT2: 'password reset link'
+    TEXT2: 'ligazón de reinicio do contrasinal'
-    TEXT3: for
+    TEXT3: para
   Form:
-    FIELDISREQUIRED: '%s is required'
+    FIELDISREQUIRED: '%s é requirido'
     SubmitBtnLabel: Go
     VALIDATIONCREDITNUMBER: 'Please ensure you have entered the {number} credit card number correctly'
-    VALIDATIONNOTUNIQUE: 'The value entered is not unique'
+    VALIDATIONNOTUNIQUE: 'O valor inserido non é único'
-    VALIDATIONPASSWORDSDONTMATCH: 'Passwords don''t match'
+    VALIDATIONPASSWORDSDONTMATCH: 'Os contrasinais non emparellan'
-    VALIDATIONPASSWORDSNOTEMPTY: 'Passwords can''t be empty'
+    VALIDATIONPASSWORDSNOTEMPTY: 'Os contrasinais non pode ser baleiro'
     VALIDATIONSTRONGPASSWORD: 'Passwords must have at least one digit and one alphanumeric character'
-    VALIDATOR: Validator
+    VALIDATOR: Validador
     VALIDCURRENCY: 'Please enter a valid currency'
   FormField:
-    NONE: none
+    NONE: ningún
   GridAction:
-    DELETE_DESCRIPTION: Eliminar
+    DELETE_DESCRIPTION: Delete
-    Delete: Delete
+    Delete: Eliminar
-    UnlinkRelation: Unlink
+    UnlinkRelation: Desligar
   GridField:
     Add: 'Add {name}'
     Filter: Filtro
     FilterBy: 'Filter by '
-    Find: Find
+    Find: Atopar
     LEVELUP: 'Level up'
-    LinkExisting: 'Link Existing'
+    LinkExisting: 'Ligazón existente'
-    NewRecord: 'New %s'
+    NewRecord: 'Novo %s'
-    NoItemsFound: 'No items found'
+    NoItemsFound: 'Ningún elemento atopado'
-    PRINTEDAT: 'Printed at'
+    PRINTEDAT: 'Impreso ás'
-    PRINTEDBY: 'Printed by'
+    PRINTEDBY: 'Impreso por'
     PlaceHolder: 'Find {type}'
     PlaceHolderWithLabels: 'Find {type} by {name}'
-    RelationSearch: 'Relation search'
+    RelationSearch: 'Busca relacionada'
     ResetFilter: Reiniciar
   GridFieldAction_Delete:
-    DeletePermissionsFailure: 'No delete permissions'
+    DeletePermissionsFailure: 'Non eliminar permisos'
   GridFieldDetailForm:
     CancelBtn: Cancel
     Create: Create
-    Delete: Eliminar
+    Delete: Delete
-    DeletePermissionsFailure: 'Non eliminar permisos'
+    DeletePermissionsFailure: 'No delete permissions'
     Deleted: 'Deleted %s %s'
     Save: Save
     Saved: 'Saved %s %s'
   GridFieldItemEditView.ss: null
   Group:
-    AddRole: 'Add a role for this group'
+    AddRole: 'Engadir un role para este grupo'
-    Code: 'Group Code'
+    Code: 'Código de Grupo'
-    DefaultGroupTitleAdministrators: Administrators
+    DefaultGroupTitleAdministrators: Administradores
-    DefaultGroupTitleContentAuthors: 'Content Authors'
+    DefaultGroupTitleContentAuthors: 'Autores do Contido'
-    Description: Description
+    Description: Descrición
-    GroupReminder: 'If you choose a parent group, this group will take all it''s roles'
+    GroupReminder: 'Se escolles un grupo pai, este grupo collerá todos os seus roles'
-    Locked: 'Locked?'
+    Locked: 'Bloqueado?'
-    NoRoles: 'No roles found'
+    NoRoles: 'Ningún rol atopado'
     PLURALNAME: Groups
-    Parent: 'Parent Group'
+    Parent: 'Grupo Pai'
-    RolesAddEditLink: 'Manage roles'
+    RolesAddEditLink: 'Xestionar roles'
     SINGULARNAME: Group
-    Sort: 'Sort Order'
+    Sort: 'Modo de ordenación'
-    has_many_Permissions: Permissions
+    has_many_Permissions: Permisos
-    many_many_Members: Members
+    many_many_Members: Membros
   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>'
+    Help1: '<p>Importar un ou máis grupos no formato <em>CSV</em>  (valores separados por comas). <small><a href="#" class="toggle-advanced">Amosar uso avanzado</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>'
+    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: 'Eliminados %d grupos'
-    ResultUpdated: 'Updated %d groups'
+    ResultUpdated: 'Actualizados %d grupos'
   Hierarchy:
     InfiniteLoopNotAllowed: 'Infinite loop found within the "{type}" hierarchy. Please change the parent to resolve this'
   HtmlEditorField:
     ADDURL: 'Add URL'
     ADJUSTDETAILSDIMENSIONS: 'Details &amp; dimensions'
-    ANCHORVALUE: Anchor
+    ANCHORVALUE: Áncora
-    BUTTONINSERT: Insert
+    BUTTONINSERT: Inserir
-    BUTTONINSERTLINK: 'Insert link'
+    BUTTONINSERTLINK: 'Inserir ligazón'
-    BUTTONREMOVELINK: 'Remove link'
+    BUTTONREMOVELINK: 'Eliminar ligazón'
     BUTTONUpdate: Update
-    CAPTIONTEXT: 'Caption text'
+    CAPTIONTEXT: 'Texto da lenda (caption)'
-    CSSCLASS: 'Alignment / style'
+    CSSCLASS: Alineamento/estilo
-    CSSCLASSCENTER: 'Centered, on its own.'
+    CSSCLASSCENTER: 'Centrado, sobre si mesmo.'
-    CSSCLASSLEFT: 'On the left, with text wrapping around.'
+    CSSCLASSLEFT: 'Sobre a esquerda, co texto arredor del.'
-    CSSCLASSLEFTALONE: 'On the left, on its own.'
+    CSSCLASSLEFTALONE: 'Á esquerda, sobre si mesmo.'
-    CSSCLASSRIGHT: 'On the right, with text wrapping around.'
+    CSSCLASSRIGHT: 'Sobre a dereita, co texto arredor del.'
     DETAILS: Detalles
-    EMAIL: 'Email address'
+    EMAIL: 'Enderezo Correo-e'
-    FILE: File
+    FILE: Ficheiro
-    FOLDER: Folder
+    FOLDER: Cartafol
-    FROMCMS: 'From the CMS'
+    FROMCMS: 'Dende o CMS'
-    FROMCOMPUTER: 'From your computer'
+    FROMCOMPUTER: 'Dende o teu Computador'
     FROMWEB: 'From the web'
     FindInFolder: 'Find in Folder'
     IMAGEALT: 'Alternative text (alt)'
-    IMAGEALTTEXT: 'Alternative text (alt) - shown if image cannot be displayed'
+    IMAGEALTTEXT: 'Texto alternativo (alt) - mostrase se a imaxe non pode visualizarse'
     IMAGEALTTEXTDESC: 'Shown to screen readers or if image can not be displayed'
-    IMAGEDIMENSIONS: Dimensions
+    IMAGEDIMENSIONS: Dimensións
-    IMAGEHEIGHTPX: Height
+    IMAGEHEIGHTPX: Alto
-    IMAGETITLE: 'Title text (tooltip) - for additional information about the image'
+    IMAGETITLE: 'Texto do título (tooltip) - para información adicional sobre a imaxe'
     IMAGETITLETEXT: 'Title text (tooltip)'
     IMAGETITLETEXTDESC: 'For additional information about the image'
-    IMAGEWIDTHPX: Width
+    IMAGEWIDTHPX: Ancho
     INSERTMEDIA: 'Insert Media'
-    LINK: 'Insert Link'
+    LINK: 'Inserir ligazón'
-    LINKANCHOR: 'Anchor on this page'
+    LINKANCHOR: 'Áncora sobre esta páxina'
-    LINKDESCR: 'Link description'
+    LINKDESCR: 'Descrición da ligazón'
-    LINKEMAIL: 'Email address'
+    LINKEMAIL: 'Enderezo Correo-e'
     LINKEXTERNAL: 'Outro sitio web'
-    LINKFILE: 'Download a file'
+    LINKFILE: 'Descargar un ficheiro'
-    LINKINTERNAL: 'Page on the site'
+    LINKINTERNAL: 'Páxina no sitio'
-    LINKOPENNEWWIN: 'Open link in a new window?'
+    LINKOPENNEWWIN: 'Abrir ligazón en nova ventá?'
-    LINKTO: 'Link to'
+    LINKTO: 'Ligar a'
     PAGE: Páxina
     URL: URL
     URLNOTANOEMBEDRESOURCE: 'The URL ''{url}'' could not be turned into a media resource.'
@@ -313,22 +312,22 @@ gl_ES:
     PLURALNAME: Files
     SINGULARNAME: File
   ImageField:
-    IMAGE: Image
+    IMAGE: Imaxe
   Image_Cached:
     PLURALNAME: Files
     SINGULARNAME: File
   Image_iframe.ss:
-    TITLE: 'Image Uploading Iframe'
+    TITLE: 'Iframe subindo imaxe'
   LeftAndMain:
     CANT_REORGANISE: 'You do not have permission to alter Top level pages. Your change was not saved.'
     DELETED: Deleted.
-    DropdownBatchActionsDefault: Actions
+    DropdownBatchActionsDefault: Accións
-    HELP: Help
+    HELP: Axuda
     PAGETYPE: 'Tipo de páxina:'
-    PERMAGAIN: 'You have been logged out of the CMS.  If you would like to log in again, enter a username and password below.'
+    PERMAGAIN: 'Non tes unha sesión válida no CMS. Se queres volver entrar, insire o nome de usuario e contrasinal a continuación.'
-    PERMALREADY: 'I''m sorry, but you can''t access that part of the CMS.  If you want to log in as someone else, do so below'
+    PERMALREADY: 'Sintoo, pero non podes acceder a esta parte do CMS. Se queres iniciar sesión con outras credenciais, faino a continuación'
-    PERMDEFAULT: 'Please choose an authentication method and enter your credentials to access the CMS.'
+    PERMDEFAULT: 'Escolle un método de autenticación e insire as túas credenciais para acceder o CMS.'
-    PLEASESAVE: 'Please Save Page: This page could not be upated because it hasn''t been saved yet.'
+    PLEASESAVE: 'Por favor Garda Páxina: Esta páxina podería non ser actualizada porque inda non foi gardada.'
     PreviewButton: Preview
     REORGANISATIONSUCCESSFUL: 'Reorganised the site tree successfully.'
     SAVEDUP: Saved.
@@ -337,96 +336,97 @@ gl_ES:
     Hello: Hi
     LOGOUT: 'Log out'
   LoginAttempt:
-    Email: 'Email Address'
+    Email: 'Enderezo Correo-e'
-    IP: 'IP Address'
+    IP: 'Enderezo IP'
     PLURALNAME: 'Login Attempts'
     SINGULARNAME: 'Login Attempt'
-    Status: Status
+    Status: Estado
   Member:
     ADDGROUP: 'Add group'
-    BUTTONCHANGEPASSWORD: 'Change Password'
+    BUTTONCHANGEPASSWORD: 'Mudar Contrasinal'
     BUTTONLOGIN: 'Iniciar sesión'
-    BUTTONLOGINOTHER: 'Log in as someone else'
+    BUTTONLOGINOTHER: 'Iniciar sesión como'
-    BUTTONLOSTPASSWORD: 'I''ve lost my password'
+    BUTTONLOSTPASSWORD: 'Perdín o meu contrasinal'
-    CONFIRMNEWPASSWORD: 'Confirm New Password'
+    CANTEDIT: 'You don''t have permission to do that'
-    CONFIRMPASSWORD: 'Confirm Password'
+    CONFIRMNEWPASSWORD: 'Confirmar Novo Contrasinal'
+    CONFIRMPASSWORD: 'Confirmar Contrasinal'
     DATEFORMAT: 'Date format'
-    DefaultAdminFirstname: 'Default Admin'
+    DefaultAdminFirstname: 'Administrador por Defecto'
-    DefaultDateTime: default
+    DefaultDateTime: 'por defecto'
     EMAIL: Correo-e
-    EMPTYNEWPASSWORD: 'The new password can''t be empty, please try again'
+    EMPTYNEWPASSWORD: 'O novo contrasinal non pode ser baleiro, por favor téntao de novo'
-    ENTEREMAIL: 'Please enter an email address to get a password reset link.'
+    ENTEREMAIL: 'Por favor insire un enderezo de correo-e para conseguir unha ligazón de reinicio.'
-    ERRORLOCKEDOUT: 'Your account has been temporarily disabled because of too many failed attempts at logging in. Please try again in 20 minutes.'
+    ERRORLOCKEDOUT: 'A túa conta foi temporalmente deshabilitada porque houbo demasiadas tentativas de inicio de sesión. Téntao de novo en 20 minutos.'
-    ERRORNEWPASSWORD: 'You have entered your new password differently, try again'
+    ERRORNEWPASSWORD: 'Inseriches a nova contrasinal doutra maneira, téntao de novo'
-    ERRORPASSWORDNOTMATCH: 'Your current password does not match, please try again'
+    ERRORPASSWORDNOTMATCH: 'O teu contrasinal actual non emparella, por favor téntao de novo'
-    ERRORWRONGCRED: 'That doesn''t seem to be the right e-mail address or password. Please try again.'
+    ERRORWRONGCRED: 'Ese non parece ser un enderezo de correo-e ou contrasinal. Téntao de novo.'
-    FIRSTNAME: 'First Name'
+    FIRSTNAME: Nome
-    INTERFACELANG: 'Interface Language'
+    INTERFACELANG: 'Idioma da Interface'
     INVALIDNEWPASSWORD: 'We couldn''t accept that password: {password}'
     LOGGEDINAS: 'You''re logged in as {name}.'
-    NEWPASSWORD: 'New Password'
+    NEWPASSWORD: 'Novo Contrasinal'
-    PASSWORD: Password
+    PASSWORD: Contrasinal
-    PLURALNAME: Members
+    PLURALNAME: Membros
-    PROFILESAVESUCCESS: 'Successfully saved.'
+    REMEMBERME: 'Lembrarme a próxima vez?'
-    REMEMBERME: 'Remember me next time?'
+    SINGULARNAME: Membro
-    SINGULARNAME: Member
+    SUBJECTPASSWORDCHANGED: 'O teu contrasinal mudou'
-    SUBJECTPASSWORDCHANGED: 'Your password has been changed'
+    SUBJECTPASSWORDRESET: 'A túa ligazón de reinicio de contrasinal'
-    SUBJECTPASSWORDRESET: 'Your password reset link'
+    SURNAME: Apelidos
-    SURNAME: Surname
     TIMEFORMAT: 'Time format'
-    VALIDATIONMEMBEREXISTS: 'A member already exists with the same %s'
+    VALIDATIONMEMBEREXISTS: 'Un membro ya existe co mesmo %s'
     ValidationIdentifierFailed: 'Can''t overwrite existing member #{id} with identical identifier ({name} = {value}))'
     WELCOMEBACK: 'Welcome Back, {firstname}'
-    YOUROLDPASSWORD: 'Your old password'
+    YOUROLDPASSWORD: 'O teu vello contrasinal'
-    belongs_many_many_Groups: Groups
+    belongs_many_many_Groups: Grupos
-    db_LastVisited: 'Last Visited Date'
+    db_LastVisited: 'Data Última Visita'
-    db_Locale: 'Interface Locale'
+    db_Locale: 'Idioma da Interface'
-    db_LockedOutUntil: 'Locked out until'
+    db_LockedOutUntil: 'Bloqueado ata que'
-    db_NumVisit: 'Number of Visits'
+    db_NumVisit: 'Número de Visitas'
-    db_Password: Password
+    db_Password: Contrasinal
-    db_PasswordExpiry: 'Password Expiry Date'
+    db_PasswordExpiry: 'Data de expiración do contrasinal'
   MemberAuthenticator:
-    TITLE: 'E-mail &amp; Password'
+    TITLE: 'Correo-e e Contrasinal'
   MemberDatetimeOptionsetField:
-    AMORPM: 'AM (Ante meridiem) or PM (Post meridiem)'
+    AMORPM: 'AM (Ante meridiem) ou PM (Post meridiem)'
     'APPLY FILTER': 'Aplicar Filtro'
-    Custom: Custom
+    Custom: Personalizado
-    DATEFORMATBAD: 'Date format is invalid'
+    DATEFORMATBAD: 'O formato da data é inválida'
-    DAYNOLEADING: 'Day of month without leading zero'
+    DAYNOLEADING: 'Día do mes sen ceros a esquerda'
-    DIGITSDECFRACTIONSECOND: 'One or more digits representing a decimal fraction of a second'
+    DIGITSDECFRACTIONSECOND: 'Un ou máis díxitos representando unha fracción decimal dun segundo'
-    FOURDIGITYEAR: 'Four-digit year'
+    FOURDIGITYEAR: 'Catro díxitos ano'
-    FULLNAMEMONTH: 'Full name of month (e.g. June)'
+    FULLNAMEMONTH: 'Nome completo do mes (p.e. Xuño)'
-    HOURNOLEADING: 'Hour without leading zero'
+    HOURNOLEADING: 'Hora sen ceros a esquerda'
-    MINUTENOLEADING: 'Minute without leading zero'
+    MINUTENOLEADING: 'Minuto sen ceros a esquerda'
-    MONTHNOLEADING: 'Month digit without leading zero'
+    MONTHNOLEADING: 'Díxito do mes sen ceros a esquerda'
-    Preview: Preview
+    Preview: Previsualizar
-    SHORTMONTH: 'Short name of month (e.g. Jun)'
+    SHORTMONTH: 'Nome curto do mes (p.e. Xuñ)'
-    TOGGLEHELP: 'Toggle formatting help'
+    TOGGLEHELP: 'Mudar o formato de axuda'
-    TWODIGITDAY: 'Two-digit day of month'
+    TWODIGITDAY: 'Dous díxitos día do mes'
-    TWODIGITHOUR: 'Two digits of hour (00 through 23)'
+    TWODIGITHOUR: 'Dous díxitos para a hora (00 ata 23)'
-    TWODIGITMINUTE: 'Two digits of minute (00 through 59)'
+    TWODIGITMINUTE: 'Dous díxitos minuto (00 ata 59)'
-    TWODIGITMONTH: 'Two-digit month (01=January, etc.)'
+    TWODIGITMONTH: 'Dous díxitos para o mes (01=Xaneiro, etc.)'
-    TWODIGITSECOND: 'Two digits of second (00 through 59)'
+    TWODIGITSECOND: 'Dous díxitos de segundo (00 ata 59)'
-    TWODIGITYEAR: 'Two-digit year'
+    TWODIGITYEAR: 'Dous díxitos ano'
   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>'
+    Help1: '<p>Importar usuarios en <em>formato CSV</em> (valores separados por comas). <small><a href="#" class="toggle-advanced">Amosar uso avanzado</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>'
+    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: 'Eliminados %d membros'
-    ResultNone: 'No changes'
+    ResultNone: 'Sen cambios'
     ResultUpdated: 'Updated {count} members'
   MemberPassword:
     PLURALNAME: 'Member Passwords'
     SINGULARNAME: 'Member Password'
   MemberTableField: null
   ModelAdmin:
-    DELETE: Delete
+    DELETE: Eliminar
     DELETEDRECORDS: 'Deleted {count} records.'
-    IMPORT: 'Import from CSV'
+    EMPTYBEFOREIMPORT: 'Clear Database before import'
+    IMPORT: 'Importar dende CSV'
     IMPORTEDRECORDS: 'Imported {count} records.'
-    NOCSVFILE: 'Please browse for a CSV file to import'
+    NOCSVFILE: 'Por favor navega por un ficheiro CSV para importar'
-    NOIMPORT: 'Nothing to import'
+    NOIMPORT: 'Nada para importar'
-    RESET: Reset
+    RESET: Reiniciar
     Title: 'Data Models'
     UPDATEDRECORDS: 'Updated {count} records.'
   ModelAdmin_ImportSpec.ss:
@@ -441,27 +441,27 @@ gl_ES:
     IMPORT_TAB_HEADER: Import
     SEARCHLISTINGS: Search
   MoneyField:
-    FIELDLABELAMOUNT: Amount
+    FIELDLABELAMOUNT: Cantidade
-    FIELDLABELCURRENCY: Currency
+    FIELDLABELCURRENCY: Moeda
   NullableField:
-    IsNullLabel: 'Is Null'
+    IsNullLabel: 'É Nulo'
   NumericField:
     VALIDATION: '''{value}'' is not a number, only numbers can be accepted for this field'
   Pagination:
     Page: Page
     View: View
   Permission:
-    AdminGroup: Administrator
+    AdminGroup: Administrador
     CMS_ACCESS_CATEGORY: 'Acceso CMS'
-    FULLADMINRIGHTS: 'Full administrative rights'
+    FULLADMINRIGHTS: 'Todos os dereitos administrativos'
-    FULLADMINRIGHTS_HELP: 'Implies and overrules all other assigned permissions.'
+    FULLADMINRIGHTS_HELP: 'Implica e anula todos os outros permisos asinados.'
     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"'
+    FromRoleOnGroup: 'herdado do role "%s" sobre o grupo "%s"'
   PermissionRole:
     OnlyAdminCanApply: 'Only admin can apply'
     PLURALNAME: Roles
@@ -472,61 +472,62 @@ gl_ES:
     SINGULARNAME: 'Permission Role Code'
   Permissions:
     PERMISSIONS_CATEGORY: 'Roles e permisos de acceso'
+    UserPermissionsIntro: 'Assigning groups to this user will adjust the permissions they have. See the groups section for details of permissions on individual groups.'
   PhoneNumberField:
-    VALIDATION: 'Please enter a valid phone number'
+    VALIDATION: 'Por favor insire un número de teléfono válido'
   RelationComplexTableField.ss:
-    ADD: Add
+    ADD: Engadir
     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.'
+    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: 'Send me the password reset link'
+    BUTTONSEND: 'Enviarme a ligazón de restablecemento do contrasinal'
-    CHANGEPASSWORDBELOW: 'You can change your password below.'
+    CHANGEPASSWORDBELOW: 'Podes mudar o contrasinal abaixo.'
-    CHANGEPASSWORDHEADER: 'Change your password'
+    CHANGEPASSWORDHEADER: 'Mudar Contrasinal'
-    ENTERNEWPASSWORD: 'Please enter a new password.'
+    ENTERNEWPASSWORD: 'Por favor insire un novo contrasinal.'
-    ERRORPASSWORDPERMISSION: 'You must be logged in in order to change your password!'
+    ERRORPASSWORDPERMISSION: 'Debes iniciar sesión para poder mudar o teu contrasinal!'
-    LOGGEDOUT: 'You have been logged out.  If you would like to log in again, enter your credentials below.'
+    LOGGEDOUT: 'Pechouse a túa sesión. Se desexas iniciar sesión de novo, insire as túas credenciais a continuación.'
-    LOGIN: 'Log in'
+    LOGIN: 'Iniciar sesión'
-    NOTEPAGESECURED: 'That page is secured. Enter your credentials below and we will send you right along.'
+    NOTEPAGESECURED: 'Esa páxina é segura. Insire as túas credenciais abaixo e enviarémoste dereito a ela.'
     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: 'Enter your e-mail address and we will send you a link with which you can reset your password'
+    NOTERESETPASSWORD: 'Insire o teu enderezo de correo-e e enviarémosche unha ligazón coa que reiniciar o teu contrasinal'
     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: 'Allow viewing, adding and editing users, as well as assigning permissions and roles to them.'
+    ACCESS_HELP: 'Permitir a visualización, adición e edición de usuarios, asemade asinar permisos e roles aos mesmos.'
-    APPLY_ROLES: 'Apply roles to groups'
+    APPLY_ROLES: 'Aplicar roles aos grupos'
-    APPLY_ROLES_HELP: 'Ability to edit the roles assigned to a group. Requires the "Access to ''Users'' section" permission.'
+    APPLY_ROLES_HELP: 'Capacidade para editar os roles asinados a un grupo. Require os permisos "Acceso a sección ''Usuarios'' ".'
-    EDITPERMISSIONS: 'Manage permissions for groups'
+    EDITPERMISSIONS: 'Xestionar permisos para grupos'
-    EDITPERMISSIONS_HELP: 'Ability to edit Permissions and IP Addresses for a group. Requires the "Access to ''Security'' section" permission.'
+    EDITPERMISSIONS_HELP: 'Capacidade para editar Permisos e Enderezos IP para un grupo. Require o permiso "Acceso a sección de ''Seguridade'' ".'
-    GROUPNAME: 'Group name'
+    GROUPNAME: 'Nome do grupo'
-    IMPORTGROUPS: 'Import groups'
+    IMPORTGROUPS: 'Importar grupos'
-    IMPORTUSERS: 'Import users'
+    IMPORTUSERS: 'Importar usuarios'
-    MEMBERS: Members
+    MEMBERS: Membros
     MENUTITLE: Security
-    MemberListCaution: 'Caution: Removing members from this list will remove them from all groups and the database'
+    MemberListCaution: 'Coidado: Eliminando os membros da lista eliminaranse de todos os grupos e da base de datos'
-    NEWGROUP: 'New Group'
+    NEWGROUP: 'Novo grupo'
-    PERMISSIONS: Permissions
+    PERMISSIONS: Permisos
     ROLES: Roles
-    ROLESDESCRIPTION: 'Roles are predefined sets of permissions, and can be assigned to groups.<br />They are inherited from parent groups if required.'
+    ROLESDESCRIPTION: 'Os roles son conxuntos de permisos predefinidos, e poden ser asinados a grupos.<br />Poden ser herdados dos grupos pai si requeridos.'
     TABROLES: Roles
-    Users: Users
+    Users: Usuarios
   SecurityAdmin_MemberImportForm:
-    BtnImport: 'Import from CSV'
+    BtnImport: 'Importar dende CSV'
-    FileFieldLabel: 'CSV File <small>(Allowed extensions: *.csv)</small>'
+    FileFieldLabel: 'Ficheiro CSV <small>(Extensións permitidas: *.csv)</small>'
   SilverStripeNavigator:
     Edit: Edit
   SimpleImageField:
-    NOUPLOAD: 'No Image Uploaded'
+    NOUPLOAD: 'Ningunha Imaxe Subida'
   SiteTree:
     TABMAIN: Principal
   TableField:
     ISREQUIRED: 'In %s ''%s'' is required'
   TableField.ss:
-    ADD: 'Add a new row'
+    ADD: 'Engadir unha nova fila'
     ADDITEM: 'Add %s'
   TableListField:
-    CSVEXPORT: 'Export to CSV'
+    CSVEXPORT: 'Exportar a CSV'
-    PRINT: Print
+    PRINT: Imprimir
     Print: Print
     SELECT: 'Seleccionar:'
   TableListField.ss:
@@ -544,32 +545,32 @@ gl_ES:
   TimeField:
     VALIDATEFORMAT: 'Please enter a valid time format ({format})'
   ToggleField:
-    LESS: less
+    LESS: menos
-    MORE: more
+    MORE: máis
   UploadField:
-    ATTACHFILE: 'Attach a file'
+    ATTACHFILE: 'Anexar un ficheiro'
-    ATTACHFILES: 'Attach files'
+    ATTACHFILES: 'Anexar ficheiros'
-    AttachFile: 'Attach file(s)'
+    AttachFile: 'Anexar ficheiro(s)'
     DELETE: 'Delete from files'
-    DELETEINFO: 'Permanently delete this file from the file store'
+    DELETEINFO: 'Eliminar permanentemente este ficheiro do almacén de ficheiros'
-    DOEDIT: Save
+    DOEDIT: Gardar
-    DROPFILE: 'drop a file'
+    DROPFILE: 'soltar un ficheiro'
-    DROPFILES: 'drop files'
+    DROPFILES: 'ficheiros soltados'
     Dimensions: Dimensions
     EDIT: Edit
-    EDITINFO: 'Edit this file'
+    EDITINFO: 'Editar este ficheiro'
-    FIELDNOTSET: 'File information not found'
+    FIELDNOTSET: 'Ficheiro de información non atopado'
     FROMCOMPUTER: 'Dende o teu Computador'
     FROMCOMPUTERINFO: 'Select from files'
-    FROMFILES: 'From files'
+    FROMFILES: 'Dende ficheiros'
     HOTLINKINFO: 'Info: This image will be hotlinked. Please ensure you have permissions from the original site creator to do so.'
     MAXNUMBEROFFILES: 'Max number of {count} file(s) exceeded.'
     MAXNUMBEROFFILESSHORT: 'Can only upload {count} files'
     REMOVE: Remove
-    REMOVEERROR: 'Error removing file'
+    REMOVEERROR: 'Erro eliminando o ficheiro'
-    REMOVEINFO: 'Remove this file from here, but do not delete it from the file store'
+    REMOVEINFO: 'Eliminar este ficheiro daquí, pero non eliminalo do almacén de ficheiros'
-    STARTALL: 'Start all'
+    STARTALL: 'Comezar todo'
     STARTALLINFO: 'Start all uploads'
-    Saved: Saved
+    Saved: Gardado
   Versioned:
-    has_many_Versions: Versions
+    has_many_Versions: Versións

lang/he_IL.yml

@@ -1,7 +1,6 @@
 he_IL:
   AssetAdmin:
-    ADDFILES: 'Add files'
+    ALLOWEDEXTS: 'Allowed extensions'
-    EditOrgMenu: 'Edit & organize'
     NEWFOLDER: תיקיהחדשה
   AssetTableField:
     CREATED: 'הועלה לראשונה'
@@ -21,7 +20,7 @@ he_IL:
     EDITALL: 'Edit all'
     EDITANDORGANIZE: 'Edit & organize'
     EDITINFO: 'Edit files'
-    FILES: קבצים
+    FILES: Files
     FROMCOMPUTER: 'Choose files from your computer'
     FROMCOMPUTERINFO: 'Upload from your computer'
     TOTAL: Total
@@ -72,7 +71,7 @@ he_IL:
     ACCESSALLINTERFACESHELP: 'Overrules more specific access settings.'
     SAVE: שמור
   CMSProfileController:
-    MENUTITLE: CMSProfileController
+    MENUTITLE: 'My Profile'
   ChangePasswordEmail.ss:
     CHANGEPASSWORDTEXT1: 'שינית את הסיסמא עבור'
     CHANGEPASSWORDTEXT2: 'כעת אתה יכול להשתמש בפרטים הבאים בכדי להתחבר:'
@@ -87,7 +86,7 @@ he_IL:
     SUCCESSADD2: 'Added {name}'
     SUCCESSEDIT: 'Saved %s %s %s'
   ComplexTableField.ss:
-    ADDITEM: 'Add %s'
+    ADDITEM: הוסף
     NOITEMSFOUND: 'No items found'
     SORTASC: 'סדר בסדר עולה'
     SORTDESC: 'סדר בסדר יורד'
@@ -181,7 +180,7 @@ he_IL:
     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: File
     FROMCOMPUTER: 'From your Computer'
     FROMFILESTORE: 'From the File Store'
     NOSOURCE: 'Please select a source file to attach'
@@ -234,7 +233,7 @@ he_IL:
   GridFieldDetailForm:
     CancelBtn: Cancel
     Create: Create
-    Delete: מחק
+    Delete: Delete
     DeletePermissionsFailure: 'No delete permissions'
     Deleted: 'Deleted %s %s'
     Save: Save
@@ -258,7 +257,7 @@ he_IL:
     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>'
-    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>'
+    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'
     ResultUpdated: 'Updated %d groups'
@@ -348,6 +347,7 @@ he_IL:
     BUTTONLOGIN: התחבר
     BUTTONLOGINOTHER: 'התחבר כמשתמש אחר'
     BUTTONLOSTPASSWORD: 'שכחתי את הסיסמא'
+    CANTEDIT: 'You don''t have permission to do that'
     CONFIRMNEWPASSWORD: 'אשר סיסמא חדשה'
     CONFIRMPASSWORD: 'אשר סיסמא'
     DATEFORMAT: 'Date format'
@@ -367,7 +367,6 @@ he_IL:
     NEWPASSWORD: 'סיסמא חדשה'
     PASSWORD: סיסמא
     PLURALNAME: 'חברים רשומים'
-    PROFILESAVESUCCESS: 'Successfully saved.'
     REMEMBERME: 'זכור אותי בפעם הבאה?'
     SINGULARNAME: 'חבר רשום'
     SUBJECTPASSWORDCHANGED: 'סיסמתך השתנתה'
@@ -410,7 +409,7 @@ he_IL:
     TWODIGITYEAR: 'Two-digit year'
   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>'
+    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'
     ResultNone: 'No changes'
@@ -422,6 +421,7 @@ he_IL:
   ModelAdmin:
     DELETE: מחק
     DELETEDRECORDS: 'Deleted {count} records.'
+    EMPTYBEFOREIMPORT: 'Clear Database before import'
     IMPORT: 'ייבא מקובץ CSV'
     IMPORTEDRECORDS: 'Imported {count} records.'
     NOCSVFILE: 'בחר קובץ CSV לייבוא'
@@ -472,6 +472,7 @@ he_IL:
     SINGULARNAME: 'Permission Role Code'
   Permissions:
     PERMISSIONS_CATEGORY: 'Roles and access permissions'
+    UserPermissionsIntro: 'Assigning groups to this user will adjust the permissions they have. See the groups section for details of permissions on individual groups.'
   PhoneNumberField:
     VALIDATION: 'יש להכניס מספר טלפון תקין'
   RelationComplexTableField.ss:

lang/hr.yml

@@ -1,7 +1,6 @@
 hr:
   AssetAdmin:
-    ADDFILES: 'Add files'
+    ALLOWEDEXTS: 'Allowed extensions'
-    EditOrgMenu: 'Edit & organize'
     NEWFOLDER: 'Novi direktorij'
   AssetTableField:
     CREATED: Uploadano
@@ -21,7 +20,7 @@ hr:
     EDITALL: 'Edit all'
     EDITANDORGANIZE: 'Edit & organize'
     EDITINFO: 'Edit files'
-    FILES: Datoteke
+    FILES: Files
     FROMCOMPUTER: 'Choose files from your computer'
     FROMCOMPUTERINFO: 'Upload from your computer'
     TOTAL: Total
@@ -72,7 +71,7 @@ hr:
     ACCESSALLINTERFACESHELP: 'Overrules more specific access settings.'
     SAVE: Snimi
   CMSProfileController:
-    MENUTITLE: CMSProfileController
+    MENUTITLE: 'My Profile'
   ChangePasswordEmail.ss:
     CHANGEPASSWORDTEXT1: 'Promjenili ste lozinku za '
     CHANGEPASSWORDTEXT2: 'Za prijavu koristite slijedeće podatke'
@@ -87,7 +86,7 @@ hr:
     SUCCESSADD2: 'Added {name}'
     SUCCESSEDIT: 'Saved %s %s %s'
   ComplexTableField.ss:
-    ADDITEM: 'Add %s'
+    ADDITEM: Dodaj
     NOITEMSFOUND: 'No items found'
     SORTASC: 'Sortiraj (ascending)'
     SORTDESC: 'Sortiraj (descending)'
@@ -181,7 +180,7 @@ hr:
     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: Datoteka
+    FILE: File
     FROMCOMPUTER: 'From your Computer'
     FROMFILESTORE: 'From the File Store'
     NOSOURCE: 'Please select a source file to attach'
@@ -258,7 +257,7 @@ hr:
     many_many_Members: Članovi
   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>'
+    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'
     ResultUpdated: 'Updated %d groups'
@@ -348,6 +347,7 @@ hr:
     BUTTONLOGIN: Prijavi
     BUTTONLOGINOTHER: 'Prijavite se kao netko drugi'
     BUTTONLOSTPASSWORD: 'Zaboraljena lozinka'
+    CANTEDIT: 'You don''t have permission to do that'
     CONFIRMNEWPASSWORD: 'Potvrdite novu lozinku'
     CONFIRMPASSWORD: 'Potvrdi lozinku'
     DATEFORMAT: 'Date format'
@@ -367,7 +367,6 @@ hr:
     NEWPASSWORD: 'Nova lozinka'
     PASSWORD: Lozinka
     PLURALNAME: Članovi
-    PROFILESAVESUCCESS: 'Successfully saved.'
     REMEMBERME: 'Zapamti me'
     SINGULARNAME: Član
     SUBJECTPASSWORDCHANGED: 'Vaša lozinka je promjenjena'
@@ -410,7 +409,7 @@ hr:
     TWODIGITYEAR: 'Two-digit year'
   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>'
+    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'
     ResultNone: 'No changes'
@@ -422,6 +421,7 @@ hr:
   ModelAdmin:
     DELETE: Delete
     DELETEDRECORDS: 'Deleted {count} records.'
+    EMPTYBEFOREIMPORT: 'Clear Database before import'
     IMPORT: 'Import from CSV'
     IMPORTEDRECORDS: 'Imported {count} records.'
     NOCSVFILE: 'Please browse for a CSV file to import'
@@ -472,6 +472,7 @@ hr:
     SINGULARNAME: 'Permission Role Code'
   Permissions:
     PERMISSIONS_CATEGORY: 'Roles and access permissions'
+    UserPermissionsIntro: 'Assigning groups to this user will adjust the permissions they have. See the groups section for details of permissions on individual groups.'
   PhoneNumberField:
     VALIDATION: 'Molim unesite ispravan telefonski broj'
   RelationComplexTableField.ss:

lang/hu.yml

@@ -1,7 +1,6 @@
 hu:
   AssetAdmin:
-    ADDFILES: 'Add files'
+    ALLOWEDEXTS: 'Allowed extensions'
-    EditOrgMenu: 'Edit & organize'
     NEWFOLDER: 'Új mappa'
   AssetTableField:
     CREATED: 'Először feltöltve'
@@ -21,7 +20,7 @@ hu:
     EDITALL: 'Edit all'
     EDITANDORGANIZE: 'Edit & organize'
     EDITINFO: 'Edit files'
-    FILES: Fájlok
+    FILES: Files
     FROMCOMPUTER: 'Choose files from your computer'
     FROMCOMPUTERINFO: 'Upload from your computer'
     TOTAL: Total
@@ -72,7 +71,7 @@ hu:
     ACCESSALLINTERFACESHELP: 'Overrules more specific access settings.'
     SAVE: Mentés
   CMSProfileController:
-    MENUTITLE: CMSProfileController
+    MENUTITLE: 'My Profile'
   ChangePasswordEmail.ss:
     CHANGEPASSWORDTEXT1: 'Megváltoztattad a jelszavad erre: '
     CHANGEPASSWORDTEXT2: 'Mostantól a következő adatokat használhatod a bejelentkezéshez:'
@@ -87,7 +86,7 @@ hu:
     SUCCESSADD2: 'Added {name}'
     SUCCESSEDIT: 'Saved %s %s %s'
   ComplexTableField.ss:
-    ADDITEM: 'Add %s'
+    ADDITEM: 'Hozzáadás:'
     NOITEMSFOUND: 'No items found'
     SORTASC: 'Rendezés növekvő sorrendben'
     SORTDESC: 'Rendezés csökkenő sorrendben'
@@ -181,7 +180,7 @@ hu:
     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: Fájl
+    FILE: File
     FROMCOMPUTER: 'From your Computer'
     FROMFILESTORE: 'From the File Store'
     NOSOURCE: 'Please select a source file to attach'
@@ -234,7 +233,7 @@ hu:
   GridFieldDetailForm:
     CancelBtn: Cancel
     Create: Create
-    Delete: Törlés
+    Delete: Delete
     DeletePermissionsFailure: 'No delete permissions'
     Deleted: 'Deleted %s %s'
     Save: Save
@@ -258,7 +257,7 @@ hu:
     many_many_Members: Tagok
   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>'
+    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'
     ResultUpdated: 'Updated %d groups'
@@ -348,6 +347,7 @@ hu:
     BUTTONLOGIN: Bejelentkezés
     BUTTONLOGINOTHER: 'Jelentkezzen be másként'
     BUTTONLOSTPASSWORD: 'Elvesztettem a jelszavam'
+    CANTEDIT: 'You don''t have permission to do that'
     CONFIRMNEWPASSWORD: 'Új jelszó megerősítése'
     CONFIRMPASSWORD: 'Jelszó megerősítése'
     DATEFORMAT: 'Date format'
@@ -367,7 +367,6 @@ hu:
     NEWPASSWORD: 'Új jelszó'
     PASSWORD: Jelszó
     PLURALNAME: Tagok
-    PROFILESAVESUCCESS: 'Successfully saved.'
     REMEMBERME: 'Emlékezzen rám legközelebb'
     SINGULARNAME: Tag
     SUBJECTPASSWORDCHANGED: 'A jelszó megváltozott'
@@ -410,7 +409,7 @@ hu:
     TWODIGITYEAR: 'Two-digit year'
   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>'
+    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'
     ResultNone: 'No changes'
@@ -422,6 +421,7 @@ hu:
   ModelAdmin:
     DELETE: Törlés
     DELETEDRECORDS: 'Deleted {count} records.'
+    EMPTYBEFOREIMPORT: 'Clear Database before import'
     IMPORT: 'Betöltés CSV-ből'
     IMPORTEDRECORDS: 'Imported {count} records.'
     NOCSVFILE: 'Kérünk, válaszd ki a betöltendő CSV fájlt'
@@ -472,6 +472,7 @@ hu:
     SINGULARNAME: 'Permission Role Code'
   Permissions:
     PERMISSIONS_CATEGORY: 'Roles and access permissions'
+    UserPermissionsIntro: 'Assigning groups to this user will adjust the permissions they have. See the groups section for details of permissions on individual groups.'
   PhoneNumberField:
     VALIDATION: 'Kérünk, adj meg egy valós telefonszámot.'
   RelationComplexTableField.ss:

lang/hy_AM.yml

@@ -1,7 +1,6 @@
 hy_AM:
   AssetAdmin:
-    ADDFILES: 'Add files'
+    ALLOWEDEXTS: 'Allowed extensions'
-    EditOrgMenu: 'Edit & organize'
     NEWFOLDER: NewFolder
   AssetTableField:
     CREATED: 'First uploaded'
@@ -72,7 +71,7 @@ hy_AM:
     ACCESSALLINTERFACESHELP: 'Overrules more specific access settings.'
     SAVE: Save
   CMSProfileController:
-    MENUTITLE: CMSProfileController
+    MENUTITLE: 'My Profile'
   ChangePasswordEmail.ss:
     CHANGEPASSWORDTEXT1: 'You changed your password for'
     CHANGEPASSWORDTEXT2: 'You can now use the following credentials to log in:'
@@ -258,7 +257,7 @@ hy_AM:
     many_many_Members: 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>'
-    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>'
+    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'
     ResultUpdated: 'Updated %d groups'
@@ -348,6 +347,7 @@ hy_AM:
     BUTTONLOGIN: 'Log in'
     BUTTONLOGINOTHER: 'Log in as someone else'
     BUTTONLOSTPASSWORD: 'I''ve lost my password'
+    CANTEDIT: 'You don''t have permission to do that'
     CONFIRMNEWPASSWORD: 'Confirm New Password'
     CONFIRMPASSWORD: 'Confirm Password'
     DATEFORMAT: 'Date format'
@@ -367,7 +367,6 @@ hy_AM:
     NEWPASSWORD: 'New Password'
     PASSWORD: Password
     PLURALNAME: Members
-    PROFILESAVESUCCESS: 'Successfully saved.'
     REMEMBERME: 'Remember me next time?'
     SINGULARNAME: Member
     SUBJECTPASSWORDCHANGED: 'Your password has been changed'
@@ -410,7 +409,7 @@ hy_AM:
     TWODIGITYEAR: 'Two-digit year'
   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>'
+    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'
     ResultNone: 'No changes'
@@ -422,6 +421,7 @@ hy_AM:
   ModelAdmin:
     DELETE: Delete
     DELETEDRECORDS: 'Deleted {count} records.'
+    EMPTYBEFOREIMPORT: 'Clear Database before import'
     IMPORT: 'Import from CSV'
     IMPORTEDRECORDS: 'Imported {count} records.'
     NOCSVFILE: 'Please browse for a CSV file to import'
@@ -472,6 +472,7 @@ hy_AM:
     SINGULARNAME: 'Permission Role Code'
   Permissions:
     PERMISSIONS_CATEGORY: 'Roles and access permissions'
+    UserPermissionsIntro: 'Assigning groups to this user will adjust the permissions they have. See the groups section for details of permissions on individual groups.'
   PhoneNumberField:
     VALIDATION: 'Please enter a valid phone number'
   RelationComplexTableField.ss:

lang/id.yml

@@ -1,7 +1,6 @@
 id:
   AssetAdmin:
-    ADDFILES: 'Add files'
+    ALLOWEDEXTS: 'Allowed extensions'
-    EditOrgMenu: 'Edit & organize'
     NEWFOLDER: NewFolder
   AssetTableField:
     CREATED: 'First uploaded'
@@ -21,7 +20,7 @@ id:
     EDITALL: 'Edit all'
     EDITANDORGANIZE: 'Edit & organize'
     EDITINFO: 'Edit files'
-    FILES: File-file
+    FILES: Files
     FROMCOMPUTER: 'Choose files from your computer'
     FROMCOMPUTERINFO: 'Upload from your computer'
     TOTAL: Total
@@ -72,7 +71,7 @@ id:
     ACCESSALLINTERFACESHELP: 'Overrules more specific access settings.'
     SAVE: Simpan
   CMSProfileController:
-    MENUTITLE: CMSProfileController
+    MENUTITLE: 'My Profile'
   ChangePasswordEmail.ss:
     CHANGEPASSWORDTEXT1: 'Anda merubah password anda untuk'
     CHANGEPASSWORDTEXT2: 'Anda dapat menggunakan surat kepercayaan berikut untuk masuk:'
@@ -87,7 +86,7 @@ id:
     SUCCESSADD2: 'Added {name}'
     SUCCESSEDIT: 'Telah menyimpan %s %s %s'
   ComplexTableField.ss:
-    ADDITEM: 'Add %s'
+    ADDITEM: 'Tambahkan %s'
     NOITEMSFOUND: 'No items found'
     SORTASC: 'Urut ascending'
     SORTDESC: 'Urut descending'
@@ -258,7 +257,7 @@ id:
     many_many_Members: Anggota-anggota
   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>'
+    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'
     ResultUpdated: 'Updated %d groups'
@@ -348,6 +347,7 @@ id:
     BUTTONLOGIN: Masuk
     BUTTONLOGINOTHER: 'Masuk sebagai orang lain'
     BUTTONLOSTPASSWORD: 'Saya lupa password saya'
+    CANTEDIT: 'You don''t have permission to do that'
     CONFIRMNEWPASSWORD: 'Membenarkan Password Baru'
     CONFIRMPASSWORD: 'Membenarkan Password'
     DATEFORMAT: 'Date format'
@@ -367,7 +367,6 @@ id:
     NEWPASSWORD: 'Password Baru'
     PASSWORD: Password
     PLURALNAME: Anggota-anggota
-    PROFILESAVESUCCESS: 'Telah disimpan dengan sukses.'
     REMEMBERME: 'Ingat saya kali berikutnya?'
     SINGULARNAME: Anggota
     SUBJECTPASSWORDCHANGED: 'Password Anda telah diubah'
@@ -410,7 +409,7 @@ id:
     TWODIGITYEAR: 'Two-digit year'
   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>'
+    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'
     ResultNone: 'No changes'
@@ -422,6 +421,7 @@ id:
   ModelAdmin:
     DELETE: Delete
     DELETEDRECORDS: 'Deleted {count} records.'
+    EMPTYBEFOREIMPORT: 'Clear Database before import'
     IMPORT: 'Import from CSV'
     IMPORTEDRECORDS: 'Imported {count} records.'
     NOCSVFILE: 'Please browse for a CSV file to import'
@@ -472,6 +472,7 @@ id:
     SINGULARNAME: 'Permission Role Code'
   Permissions:
     PERMISSIONS_CATEGORY: 'Roles and access permissions'
+    UserPermissionsIntro: 'Assigning groups to this user will adjust the permissions they have. See the groups section for details of permissions on individual groups.'
   PhoneNumberField:
     VALIDATION: 'Harap masukkan nomor telepon yang valid'
   RelationComplexTableField.ss:

lang/is.yml

@@ -1,7 +1,6 @@
 is:
   AssetAdmin:
-    ADDFILES: 'Add files'
+    ALLOWEDEXTS: 'Allowed extensions'
-    EditOrgMenu: 'Edit & organize'
     NEWFOLDER: NewFolder
   AssetTableField:
     CREATED: 'First uploaded'
@@ -21,7 +20,7 @@ is:
     EDITALL: 'Edit all'
     EDITANDORGANIZE: 'Edit & organize'
     EDITINFO: 'Edit files'
-    FILES: Skrár
+    FILES: Files
     FROMCOMPUTER: 'Choose files from your computer'
     FROMCOMPUTERINFO: 'Upload from your computer'
     TOTAL: Total
@@ -60,9 +59,9 @@ is:
     ERRORNOTADMIN: 'Þessi notandi er ekki stjórnandi'
     ERRORNOTREC: 'Þetta notendanafn / lykilorð er ekki til'
   Boolean:
-    0: 'False'
+    0: Nei
     ANY: Einhver
-    1: 'True'
+    1: Já
   CMSLoadingScreen.ss:
     LOADING: Loading...
     REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
@@ -72,7 +71,7 @@ is:
     ACCESSALLINTERFACESHELP: 'Overrules more specific access settings.'
     SAVE: Vista
   CMSProfileController:
-    MENUTITLE: CMSProfileController
+    MENUTITLE: 'My Profile'
   ChangePasswordEmail.ss:
     CHANGEPASSWORDTEXT1: 'Þú breyttir þínu lykilorði vegna'
     CHANGEPASSWORDTEXT2: 'Þú getur núna notað eftirfarandi auðkenni til að innskrá þig:'
@@ -80,14 +79,14 @@ is:
     HELLO: Hæ
     PASSWORD: Lykilorð
   CheckboxField:
-    - 'False'
+    - Nei
-    - 'True'
+    - Já
   ComplexTableField:
     CLOSEPOPUP: 'Loka glugga'
     SUCCESSADD2: 'Added {name}'
     SUCCESSEDIT: 'Vitað %s %s %s'
   ComplexTableField.ss:
-    ADDITEM: 'Add %s'
+    ADDITEM: 'Bæta við %s.'
     NOITEMSFOUND: 'No items found'
     SORTASC: 'Raða í hækkandi röð'
     SORTDESC: 'Raða í lækkandi röð'
@@ -258,7 +257,7 @@ is:
     many_many_Members: Félagar
   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>'
+    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'
     ResultUpdated: 'Updated %d groups'
@@ -348,6 +347,7 @@ is:
     BUTTONLOGIN: Innskrá
     BUTTONLOGINOTHER: 'Innskrá sem einhver annar'
     BUTTONLOSTPASSWORD: 'Ég er búinn að gleyma lykilorðinu'
+    CANTEDIT: 'You don''t have permission to do that'
     CONFIRMNEWPASSWORD: 'Staðfesta nýja lykilorðið'
     CONFIRMPASSWORD: 'Staðfesta lykilorð'
     DATEFORMAT: 'Date format'
@@ -367,7 +367,6 @@ is:
     NEWPASSWORD: 'Nýtt lykilorð'
     PASSWORD: Lykilorð
     PLURALNAME: Félagar
-    PROFILESAVESUCCESS: 'Vistun tókst.'
     REMEMBERME: 'Muna eftir mér í næsta skipti?'
     SINGULARNAME: Félagar
     SUBJECTPASSWORDCHANGED: 'Lykilorði þínu hefur verið breytt'
@@ -410,7 +409,7 @@ is:
     TWODIGITYEAR: 'Two-digit year'
   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>'
+    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'
     ResultNone: 'No changes'
@@ -422,6 +421,7 @@ is:
   ModelAdmin:
     DELETE: Delete
     DELETEDRECORDS: 'Deleted {count} records.'
+    EMPTYBEFOREIMPORT: 'Clear Database before import'
     IMPORT: 'Import from CSV'
     IMPORTEDRECORDS: 'Imported {count} records.'
     NOCSVFILE: 'Please browse for a CSV file to import'
@@ -472,6 +472,7 @@ is:
     SINGULARNAME: 'Permission Role Code'
   Permissions:
     PERMISSIONS_CATEGORY: 'Roles and access permissions'
+    UserPermissionsIntro: 'Assigning groups to this user will adjust the permissions they have. See the groups section for details of permissions on individual groups.'
   PhoneNumberField:
     VALIDATION: 'Vinsamlegast sláðu inn gilt símanúmer'
   RelationComplexTableField.ss:

lang/it.yml

@@ -1,7 +1,6 @@
 it:
   AssetAdmin:
-    ADDFILES: 'Aggiungi file'
+    ALLOWEDEXTS: 'Allowed extensions'
-    EditOrgMenu: 'Modifica & organizza'
     NEWFOLDER: NuovaCartella
   AssetTableField:
     CREATED: 'Inizialmente caricato'
@@ -21,7 +20,7 @@ it:
     EDITALL: 'Modifica tutti'
     EDITANDORGANIZE: 'Modifica & organizza'
     EDITINFO: 'Modifica file'
-    FILES: File
+    FILES: Files
     FROMCOMPUTER: 'Scegli file dal tuo computer'
     FROMCOMPUTERINFO: 'Carica dal tuo conputer'
     TOTAL: Totale
@@ -60,9 +59,9 @@ it:
     ERRORNOTADMIN: 'Questo utente non è amministratore.'
     ERRORNOTREC: 'Nome utente / password non riconosciuti'
   Boolean:
-    0: Falso
+    0: NO
     ANY: Qualsiasi
-    1: Vero
+    1: SI
   CMSLoadingScreen.ss:
     LOADING: 'Caricamento in corso...'
     REQUIREJS: 'Il CMS richiede JavaScript abilitato.'
@@ -72,7 +71,7 @@ it:
     ACCESSALLINTERFACESHELP: 'Annulla le impostazioni di accesso più specifiche.'
     SAVE: Salva
   CMSProfileController:
-    MENUTITLE: CMSProfileController
+    MENUTITLE: 'Il mio Profilo'
   ChangePasswordEmail.ss:
     CHANGEPASSWORDTEXT1: 'Hai cambiato la password per'
     CHANGEPASSWORDTEXT2: 'Ora puoi utilizzare le seguenti credenziali per accedere:'
@@ -80,14 +79,14 @@ it:
     HELLO: Ciao
     PASSWORD: Password
   CheckboxField:
-    - Falso
+    - No
-    - Vero
+    - Si
   ComplexTableField:
     CLOSEPOPUP: 'Chiudi Finestra'
     SUCCESSADD2: 'Aggiunto {name}'
     SUCCESSEDIT: 'Salvato %s %s %s'
   ComplexTableField.ss:
-    ADDITEM: 'Aggiungi %s'
+    ADDITEM: 'Inserisci %s'
     NOITEMSFOUND: 'Nessun elemento trovato'
     SORTASC: 'Ordina in modo ascendente'
     SORTDESC: 'Ordina in modo discendente'
@@ -105,7 +104,7 @@ it:
     SECOND: secondo
     THIRD: terzo
   CurrencyField:
-    CURRENCYSYMBOL: €
+    CURRENCYSYMBOL: $
   DataObject:
     PLURALNAME: 'Data Objects'
     SINGULARNAME: 'Data Object'
@@ -234,7 +233,7 @@ it:
   GridFieldDetailForm:
     CancelBtn: Annulla
     Create: Crea
-    Delete: Cancella
+    Delete: Elimina
     DeletePermissionsFailure: 'Non hai i permessi per eliminare'
     Deleted: 'Eliminato %s %s'
     Save: Salva
@@ -258,7 +257,7 @@ it:
     many_many_Members: Membri
   GroupImportForm:
     Help1: '<p>Importa gruppi in formato <em>CSV</em> (valori separati da virgole). <small><a href="#" class="toggle-advanced">Mostra utilizzo avanzato</a></small></p>'
-    Help2: "<div class=\"advanced\">\\n<h4>Utilizzo avanzato</h4>\\n<ul>\\n<li>Colonne consentite: <em>%s</em></li>\\n<li>Gruppi esistenti sono individuati attraverso il valore univoco <em>Code</em> e aggiornati con i nuovi valori dal file importato.</li>\\n<li>La gerarchia dei gruppi può essere creata usando la colonna <em>ParentCode</em></li>\\n<li>I Permission Code possono essere assegnati attraverso la colonna <em>PermissionCode</em>. Permission Code esistenti non verranno cancellati.</li>\\n</ul>\\n</div>"
+    Help2: "<div class=\"advanced\">\\n<h4>Utilizzo avanzato</h4>\\n<ul>\\n<li>Colonne consentite: <em>%s</em></li>\\n<li>Gruppi esistenti sono individuati attraverso il valore univoco <em>Code</em> e aggiornati con i nuovi valori \\ndal file importato.</li>\\n<li>La gerarchia dei gruppi può essere creata usando la colonna <em>ParentCode</em></li>\\n<li>I Permission Code possono essere assegnati attraverso la colonna <em>PermissionCode</em>. \\nPermission Code esistenti non verranno cancellati.</li>\\n</ul>\\n</div>"
     ResultCreated: 'Creati {count} gruppi'
     ResultDeleted: 'Eliminati %d gruppi'
     ResultUpdated: 'Aggiornati %d gruppi'
@@ -280,7 +279,7 @@ it:
     CSSCLASSRIGHT: 'Sulla destra, con il testo inserito attorno.'
     DETAILS: Dettagli
     EMAIL: 'Indirizzo email'
-    FILE: Files
+    FILE: File
     FOLDER: Cartella
     FROMCMS: 'Dal CMS'
     FROMCOMPUTER: 'Dal tuo computer'
@@ -348,6 +347,7 @@ it:
     BUTTONLOGIN: Accedi
     BUTTONLOGINOTHER: 'Autenticati come qualcun altro'
     BUTTONLOSTPASSWORD: 'Ho perso la mia password'
+    CANTEDIT: 'You don''t have permission to do that'
     CONFIRMNEWPASSWORD: 'Conferma nuova password'
     CONFIRMPASSWORD: 'Conferma password'
     DATEFORMAT: 'Formato della data'
@@ -367,7 +367,6 @@ it:
     NEWPASSWORD: 'Nuova password'
     PASSWORD: Password
     PLURALNAME: Utenti
-    PROFILESAVESUCCESS: 'Salvato con successo.'
     REMEMBERME: 'Ricordati di me la prossima volta?'
     SINGULARNAME: Utente
     SUBJECTPASSWORDCHANGED: 'La tua password è stata cambiata'
@@ -410,7 +409,7 @@ it:
     TWODIGITYEAR: 'Anno a due cifre'
   MemberImportForm:
     Help1: '<p>Importa utenti in <em>formato CSV</em> (valori separati da virgole). <small><a href="#" class="toggle-advanced">Mostra utilizzo avanzato</a></small></p>'
-    Help2: "<div class=\"advanced\">\\n<h4>Utilizzo avanzato</h4>\\n<ul>\\n<li>Colonne consentite: <em>%s</em></li>\\n<li>Utenti esistenti sono individuati attraverso la proprietà univoca <em>Code</em> e aggiornati con i nuovi valori dal file importato.</li>\\n<li>I gruppi possono essere assegnati attraverso la colonna <em>Groups</em>. I gruppi sono identificati attraverso la loro colonna <em>Code</em>, più gruppi devono essere separati da virgola. L''appartenenza esistente a gruppi non viene cancellata.</li>\\n</ul>\\n</div>"
+    Help2: "<div class=\"advanced\">\\n<h4>Utilizzo avanzato</h4>\\n<ul>\\n<li>Colonne consentite: <em>%s</em></li>\\n<li>Utenti esistenti sono individuati attraverso la proprietà univoca <em>Code</em> e aggiornati con i nuovi valori \\ndal file importato.</li>\\n<li>I gruppi possono essere assegnati attraverso la colonna <em>Groups</em>. I gruppi sono identificati attraverso la loro colonna <em>Code</em>, \\npiù gruppi devono essere separati da virgola. L''appartenenza esistente a gruppi non viene cancellata.</li>\\n</ul>\\n</div>"
     ResultCreated: 'Creati {count} utenti'
     ResultDeleted: 'Eliminati %d utenti'
     ResultNone: 'Nessun cambiamento'
@@ -422,6 +421,7 @@ it:
   ModelAdmin:
     DELETE: Elimina
     DELETEDRECORDS: 'Eliminati {count} record.'
+    EMPTYBEFOREIMPORT: 'Cancella database prima dell''import'
     IMPORT: 'Importa da CSV'
     IMPORTEDRECORDS: 'Importati {count} record.'
     NOCSVFILE: 'Scegli un file CSV da importare'
@@ -449,7 +449,7 @@ it:
     VALIDATION: '''{value}'' non è un numero, solo numeri possono essere accettati per questo campo'
   Pagination:
     Page: Pagina
-    View: Vedi
+    View: Visualizza
   Permission:
     AdminGroup: Amministratore
     CMS_ACCESS_CATEGORY: 'Accesso CMS'
@@ -472,6 +472,7 @@ it:
     SINGULARNAME: 'Codice Ruolo'
   Permissions:
     PERMISSIONS_CATEGORY: 'Ruoli e permessi d''accesso'
+    UserPermissionsIntro: 'L''assegnazione di gruppi a questo utente modificherà i loro permessi. Vedi la sezione dei gruppi per dettagli sui permessi a gruppi individuali.'
   PhoneNumberField:
     VALIDATION: 'Per favore inserisci un numero di telefono valido'
   RelationComplexTableField.ss:

lang/ja_JP.yml

@@ -1,7 +1,6 @@
 ja_JP:
   AssetAdmin:
-    ADDFILES: 'Add files'
+    ALLOWEDEXTS: 'Allowed extensions'
-    EditOrgMenu: 'Edit & organize'
     NEWFOLDER: 新しいフォルダ
   AssetTableField:
     CREATED: 初回アップロード日時
@@ -20,10 +19,10 @@ ja_JP:
     DROPAREA: ドロップ領域
     EDITALL: すべて編集
     EDITANDORGANIZE: 編集と管理
-    EDITINFO: 'Edit files'
+    EDITINFO: ファイルを編集
     FILES: ファイル
     FROMCOMPUTER: 'Choose files from your computer'
-    FROMCOMPUTERINFO: 'Upload from your computer'
+    FROMCOMPUTERINFO: コンピュータからアップロード
     TOTAL: 合計
     TOUPLOAD: 'Choose files to upload...'
     UPLOADINPROGRESS: しばらくお待ちください...アップロードは進行中です
@@ -60,19 +59,19 @@ ja_JP:
     ERRORNOTADMIN: このユーザーは管理者（アドミニストレーター）ではありません
     ERRORNOTREC: 'ユーザー名 / パスワードは認識されませんでした'
   Boolean:
-    0: 'False'
+    0: 偽
     ANY: 何でも
-    1: 'True'
+    1: 真
   CMSLoadingScreen.ss:
     LOADING: 読み込み中...
-    REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
+    REQUIREJS: CMSを利用するにはJavascriptが有効化されている必要があります。
   CMSMain:
     ACCESS: 'Access to ''{title}'' section'
     ACCESSALLINTERFACES: すべてのCMSのセクションへアクセス
     ACCESSALLINTERFACESHELP: 'Overrules more specific access settings.'
     SAVE: 保存
   CMSProfileController:
-    MENUTITLE: CMSProfileController
+    MENUTITLE: 'My Profile'
   ChangePasswordEmail.ss:
     CHANGEPASSWORDTEXT1: このサイトのパスワードが変更されました。
     CHANGEPASSWORDTEXT2: '貴方は現在以下の証明書を使ってログインしています:'
@@ -80,15 +79,15 @@ ja_JP:
     HELLO: こんにちわ！
     PASSWORD: パスワード
   CheckboxField:
-    - 'False'
+    - いいえ
-    - 'True'
+    - はい
   ComplexTableField:
     CLOSEPOPUP: ポップアップを閉じる
     SUCCESSADD2: '{name}を追加しました'
     SUCCESSEDIT: '更新日時 %s %s %s'
   ComplexTableField.ss:
-    ADDITEM: 'Add %s'
+    ADDITEM: '%sを追加する'
-    NOITEMSFOUND: 'No items found'
+    NOITEMSFOUND: 項目が見つかりませんでした
     SORTASC: 昇順
     SORTDESC: ソート（下順）
   ComplexTableField_popup.ss:
@@ -211,7 +210,7 @@ ja_JP:
   FormField:
     NONE: 何もありません
   GridAction:
-    DELETE_DESCRIPTION: 削除
+    DELETE_DESCRIPTION: Delete
     Delete: 削除
     UnlinkRelation: リンク解除
   GridField:
@@ -258,7 +257,7 @@ ja_JP:
     many_many_Members: メンバー
   GroupImportForm:
     Help1: '<p><em>CSV</em>フォーマット(カンマ区切り)から一つ以上のグループを取り込みます。<small><a href="#" class="toggle-advanced">高度な利用法について表示</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>'
+    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: '%dグループを削除しました'
     ResultUpdated: '%dグループを更新しました'
@@ -334,7 +333,7 @@ ja_JP:
     SAVEDUP: 保存済み
     VersionUnknown: 不明
   LeftAndMain_Menu.ss:
-    Hello: Hi
+    Hello: こんにちは！
     LOGOUT: ログアウト
   LoginAttempt:
     Email: メールアドレス
@@ -348,6 +347,7 @@ ja_JP:
     BUTTONLOGIN: ログイン
     BUTTONLOGINOTHER: 他の誰かとしてログイン
     BUTTONLOSTPASSWORD: パスワードを紛失
+    CANTEDIT: 'You don''t have permission to do that'
     CONFIRMNEWPASSWORD: 新しいパスワードを確認します
     CONFIRMPASSWORD: パスワード（確認のためもう一度）
     DATEFORMAT: 'Date format'
@@ -367,7 +367,6 @@ ja_JP:
     NEWPASSWORD: 新しいパスワード
     PASSWORD: パスワード
     PLURALNAME: メンバー
-    PROFILESAVESUCCESS: 保存しました。
     REMEMBERME: パスワードを記憶？
     SINGULARNAME: メンバー
     SUBJECTPASSWORDCHANGED: パスワードが変わりました。
@@ -410,7 +409,7 @@ ja_JP:
     TWODIGITYEAR: 'Two-digit year'
   MemberImportForm:
     Help1: '<p><em>CSVフォーマット</em>(コンマ区切り)でユーザーを取り込みます。 <small><a href="#" class="toggle-advanced">高度な利用方法を表示</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>'
+    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: '{count}メンバーを作成しました'
     ResultDeleted: '%d人のメンバーを削除しました'
     ResultNone: 変更なし
@@ -422,6 +421,7 @@ ja_JP:
   ModelAdmin:
     DELETE: 削除
     DELETEDRECORDS: '{count}レコードを削除しました。'
+    EMPTYBEFOREIMPORT: 'Clear Database before import'
     IMPORT: CSVからインポート
     IMPORTEDRECORDS: '{count}レコードを取り込みました。'
     NOCSVFILE: インポートするためのCSVファイルを参照してください
@@ -472,12 +472,13 @@ ja_JP:
     SINGULARNAME: 'Permission Role Code'
   Permissions:
     PERMISSIONS_CATEGORY: 役割とアクセス権限
+    UserPermissionsIntro: 'Assigning groups to this user will adjust the permissions they have. See the groups section for details of permissions on individual groups.'
   PhoneNumberField:
     VALIDATION: 電話番号を入力してください
   RelationComplexTableField.ss:
     ADD: 追加
-    CSVEXPORT: 'Export to CSV'
+    CSVEXPORT: CSVへ書き出し
-    NOTFOUND: 'No items found'
+    NOTFOUND: 項目が見つかりませんでした
   Security:
     ALREADYLOGGEDIN: 'あなたはこのページにアクセスできません。別のアカウントを持っていたら <a href="%s">再ログイン</a>を行ってください。'
     BUTTONSEND: パスワードリセットのリンクを送信してください
@@ -523,14 +524,14 @@ ja_JP:
     ISREQUIRED: 'In %s ''%s'' is required'
   TableField.ss:
     ADD: 新しい行を追加
-    ADDITEM: 'Add %s'
+    ADDITEM: '%sを追加'
   TableListField:
     CSVEXPORT: CSVにエクスポート
     PRINT: 印刷
     Print: Print
     SELECT: 選択：
   TableListField.ss:
-    NOITEMSFOUND: 'No items found'
+    NOITEMSFOUND: 項目が見つかりませんでした
     SORTASC: 昇順で並べ替え
     SORTDESC: 降順で並べ替え
   TableListField_PageControls.ss:
@@ -556,11 +557,11 @@ ja_JP:
     DROPFILE: ファイルをドロップ
     DROPFILES: ファイルをドロップ
     Dimensions: Dimensions
-    EDIT: Edit
+    EDIT: 編集
     EDITINFO: このファイルを編集
     FIELDNOTSET: ファイル情報が見つかりませんでした
     FROMCOMPUTER: コンピュータから
-    FROMCOMPUTERINFO: 'Select from files'
+    FROMCOMPUTERINFO: ファイルから選択
     FROMFILES: ファイルから
     HOTLINKINFO: 'Info: This image will be hotlinked. Please ensure you have permissions from the original site creator to do so.'
     MAXNUMBEROFFILES: '最大数の{count}ファイルを超えました。'
@@ -569,7 +570,7 @@ ja_JP:
     REMOVEERROR: ファイルの削除におけるエラー
     REMOVEINFO: ここからこのファイルを削除。ただし、ファイルのストレージからこのファイルの削除はしない。
     STARTALL: すべて開始
-    STARTALLINFO: 'Start all uploads'
+    STARTALLINFO: すべてのアップロードを開始
     Saved: 保存しました
   Versioned:
     has_many_Versions: バージョン

lang/km.yml

@@ -1,7 +1,6 @@
 km:
   AssetAdmin:
-    ADDFILES: 'Add files'
+    ALLOWEDEXTS: 'Allowed extensions'
-    EditOrgMenu: 'Edit & organize'
     NEWFOLDER: NewFolder
   AssetTableField:
     CREATED: 'First uploaded'
@@ -21,7 +20,7 @@ km:
     EDITALL: 'Edit all'
     EDITANDORGANIZE: 'Edit & organize'
     EDITINFO: 'Edit files'
-    FILES: ឯកសារ
+    FILES: Files
     FROMCOMPUTER: 'Choose files from your computer'
     FROMCOMPUTERINFO: 'Upload from your computer'
     TOTAL: Total
@@ -72,7 +71,7 @@ km:
     ACCESSALLINTERFACESHELP: 'Overrules more specific access settings.'
     SAVE: Save
   CMSProfileController:
-    MENUTITLE: CMSProfileController
+    MENUTITLE: 'My Profile'
   ChangePasswordEmail.ss:
     CHANGEPASSWORDTEXT1: អ្នកបានផ្លាស់ប្តូរពាក្យសំងាត់សំរាប់
     CHANGEPASSWORDTEXT2: 'You can now use the following credentials to log in:'
@@ -87,7 +86,7 @@ km:
     SUCCESSADD2: 'Added {name}'
     SUCCESSEDIT: 'Saved %s %s %s'
   ComplexTableField.ss:
-    ADDITEM: 'Add %s'
+    ADDITEM: 'បញ្ចូល %s'
     NOITEMSFOUND: 'No items found'
     SORTASC: 'Sort ascending'
     SORTDESC: 'Sort descending'
@@ -258,7 +257,7 @@ km:
     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>'
-    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>'
+    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'
     ResultUpdated: 'Updated %d groups'
@@ -348,6 +347,7 @@ km:
     BUTTONLOGIN: 'Log in'
     BUTTONLOGINOTHER: 'Log in as someone else'
     BUTTONLOSTPASSWORD: 'I''ve lost my password'
+    CANTEDIT: 'You don''t have permission to do that'
     CONFIRMNEWPASSWORD: 'Confirm New Password'
     CONFIRMPASSWORD: 'Confirm Password'
     DATEFORMAT: 'Date format'
@@ -367,7 +367,6 @@ km:
     NEWPASSWORD: 'New Password'
     PASSWORD: Password
     PLURALNAME: សមាជិក
-    PROFILESAVESUCCESS: 'Successfully saved.'
     REMEMBERME: 'Remember me next time?'
     SINGULARNAME: សមាជិក
     SUBJECTPASSWORDCHANGED: ពាក្យសំងាត់របស់អ្នកបានផ្លាស់ប្តូរ
@@ -410,7 +409,7 @@ km:
     TWODIGITYEAR: 'Two-digit year'
   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>'
+    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'
     ResultNone: 'No changes'
@@ -422,6 +421,7 @@ km:
   ModelAdmin:
     DELETE: Delete
     DELETEDRECORDS: 'Deleted {count} records.'
+    EMPTYBEFOREIMPORT: 'Clear Database before import'
     IMPORT: 'Import from CSV'
     IMPORTEDRECORDS: 'Imported {count} records.'
     NOCSVFILE: 'Please browse for a CSV file to import'
@@ -472,6 +472,7 @@ km:
     SINGULARNAME: 'Permission Role Code'
   Permissions:
     PERMISSIONS_CATEGORY: 'Roles and access permissions'
+    UserPermissionsIntro: 'Assigning groups to this user will adjust the permissions they have. See the groups section for details of permissions on individual groups.'
   PhoneNumberField:
     VALIDATION: 'Please enter a valid phone number'
   RelationComplexTableField.ss:

lang/lt.yml

@@ -1,7 +1,6 @@
 lt:
   AssetAdmin:
-    ADDFILES: 'Add files'
+    ALLOWEDEXTS: 'Allowed extensions'
-    EditOrgMenu: 'Edit & organize'
     NEWFOLDER: NewFolder
   AssetTableField:
     CREATED: 'First uploaded'
@@ -21,7 +20,7 @@ lt:
     EDITALL: 'Edit all'
     EDITANDORGANIZE: 'Edit & organize'
     EDITINFO: 'Edit files'
-    FILES: Bylos
+    FILES: Files
     FROMCOMPUTER: 'Choose files from your computer'
     FROMCOMPUTERINFO: 'Upload from your computer'
     TOTAL: Total
@@ -60,9 +59,9 @@ lt:
     ERRORNOTADMIN: 'Vartotojas nėra administratorius'
     ERRORNOTREC: 'Toks vartotojo vardas / slaptažodis neatpažintas'
   Boolean:
-    0: 'False'
+    0: Ne
     ANY: 'Bet koks'
-    1: 'True'
+    1: Taip
   CMSLoadingScreen.ss:
     LOADING: Loading...
     REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
@@ -72,7 +71,7 @@ lt:
     ACCESSALLINTERFACESHELP: 'Overrules more specific access settings.'
     SAVE: Išsaugoti
   CMSProfileController:
-    MENUTITLE: CMSProfileController
+    MENUTITLE: 'My Profile'
   ChangePasswordEmail.ss:
     CHANGEPASSWORDTEXT1: 'Jūs pakeitėte slaptažodį'
     CHANGEPASSWORDTEXT2: 'Nuo šiol galite naudoti šiuos prisijungimo duomenis:'
@@ -80,14 +79,14 @@ lt:
     HELLO: Sveiki
     PASSWORD: Slaptažodis
   CheckboxField:
-    - 'False'
+    - Ne
-    - 'True'
+    - Taip
   ComplexTableField:
     CLOSEPOPUP: Uždaryti
     SUCCESSADD2: 'Added {name}'
     SUCCESSEDIT: 'Išsaugota %s %s %s'
   ComplexTableField.ss:
-    ADDITEM: 'Add %s'
+    ADDITEM: 'Pridėti %s'
     NOITEMSFOUND: 'No items found'
     SORTASC: 'Rūšiuoti A-Z'
     SORTDESC: 'Rūšiuoti Z-A'
@@ -181,7 +180,7 @@ lt:
     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: Byla
+    FILE: Failas
     FROMCOMPUTER: 'Iš jūsų kompiuterio'
     FROMFILESTORE: 'Š failų saugyklos '
     NOSOURCE: 'Please select a source file to attach'
@@ -258,7 +257,7 @@ lt:
     many_many_Members: Nariai
   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>'
+    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'
     ResultUpdated: 'Updated %d groups'
@@ -348,6 +347,7 @@ lt:
     BUTTONLOGIN: Prisijungti
     BUTTONLOGINOTHER: 'Prisijungti kitu vardu'
     BUTTONLOSTPASSWORD: 'Pamiršau savo slaptažodį'
+    CANTEDIT: 'You don''t have permission to do that'
     CONFIRMNEWPASSWORD: 'Patvirtinkite naują slaptažodį'
     CONFIRMPASSWORD: 'Patvirtinkite slaptažodį'
     DATEFORMAT: 'Date format'
@@ -367,7 +367,6 @@ lt:
     NEWPASSWORD: 'Naujas slaptažodis'
     PASSWORD: Slaptažodis
     PLURALNAME: Nariai
-    PROFILESAVESUCCESS: 'Sėkmingai išsaugota.'
     REMEMBERME: 'Prisiminti jungiantis kitą kartą?'
     SINGULARNAME: Narys
     SUBJECTPASSWORDCHANGED: 'Jūsų slaptažodis pakeistas'
@@ -410,7 +409,7 @@ lt:
     TWODIGITYEAR: 'Two-digit year'
   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>'
+    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'
     ResultNone: 'No changes'
@@ -422,6 +421,7 @@ lt:
   ModelAdmin:
     DELETE: Delete
     DELETEDRECORDS: 'Deleted {count} records.'
+    EMPTYBEFOREIMPORT: 'Clear Database before import'
     IMPORT: 'Import from CSV'
     IMPORTEDRECORDS: 'Imported {count} records.'
     NOCSVFILE: 'Please browse for a CSV file to import'
@@ -472,6 +472,7 @@ lt:
     SINGULARNAME: 'Permission Role Code'
   Permissions:
     PERMISSIONS_CATEGORY: 'Roles and access permissions'
+    UserPermissionsIntro: 'Assigning groups to this user will adjust the permissions they have. See the groups section for details of permissions on individual groups.'
   PhoneNumberField:
     VALIDATION: 'Įveskite teisingą telefono numerį'
   RelationComplexTableField.ss:

lang/lv.yml

@@ -1,7 +1,6 @@
 lv:
   AssetAdmin:
-    ADDFILES: 'Add files'
+    ALLOWEDEXTS: 'Allowed extensions'
-    EditOrgMenu: 'Edit & organize'
     NEWFOLDER: NewFolder
   AssetTableField:
     CREATED: 'First uploaded'
@@ -21,7 +20,7 @@ lv:
     EDITALL: 'Edit all'
     EDITANDORGANIZE: 'Edit & organize'
     EDITINFO: 'Edit files'
-    FILES: Faili
+    FILES: Files
     FROMCOMPUTER: 'Choose files from your computer'
     FROMCOMPUTERINFO: 'Upload from your computer'
     TOTAL: Total
@@ -60,9 +59,9 @@ lv:
     ERRORNOTADMIN: 'Šis lietotājs nav administrators.'
     ERRORNOTREC: 'Šis lietotājvārds / parole nav atpazīts'
   Boolean:
-    0: 'False'
+    0: Nē
     ANY: Jebkurš
-    1: 'True'
+    1: Jā
   CMSLoadingScreen.ss:
     LOADING: Loading...
     REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
@@ -72,7 +71,7 @@ lv:
     ACCESSALLINTERFACESHELP: 'Overrules more specific access settings.'
     SAVE: Saglabāt
   CMSProfileController:
-    MENUTITLE: CMSProfileController
+    MENUTITLE: 'My Profile'
   ChangePasswordEmail.ss:
     CHANGEPASSWORDTEXT1: 'Jūs nomainījāt savu paroli '
     CHANGEPASSWORDTEXT2: 'Lai pieslēgtos, izmantojiet sekojošus datus:'
@@ -80,14 +79,14 @@ lv:
     HELLO: Sveiki
     PASSWORD: Parole
   CheckboxField:
-    - 'False'
+    - Nē
-    - 'True'
+    - Jā
   ComplexTableField:
     CLOSEPOPUP: 'Aizvērt izlēcošo logu'
     SUCCESSADD2: 'Added {name}'
     SUCCESSEDIT: 'Saglabāts %s %s %s'
   ComplexTableField.ss:
-    ADDITEM: 'Add %s'
+    ADDITEM: 'Pievienot %s'
     NOITEMSFOUND: 'No items found'
     SORTASC: 'Kārtot augoši'
     SORTDESC: 'Kārtot dilstoši'
@@ -258,7 +257,7 @@ lv:
     many_many_Members: Dalībnieki
   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>'
+    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'
     ResultUpdated: 'Updated %d groups'
@@ -348,6 +347,7 @@ lv:
     BUTTONLOGIN: PIeslēgties
     BUTTONLOGINOTHER: 'Pieslēgties ar citu kontu'
     BUTTONLOSTPASSWORD: 'Aizmirsāt paroli?'
+    CANTEDIT: 'You don''t have permission to do that'
     CONFIRMNEWPASSWORD: 'Apstiprināt jauno paroli'
     CONFIRMPASSWORD: 'Apstiprināt paroli'
     DATEFORMAT: 'Date format'
@@ -367,7 +367,6 @@ lv:
     NEWPASSWORD: 'Jaunā parole'
     PASSWORD: Parole
     PLURALNAME: Dalībnieki
-    PROFILESAVESUCCESS: 'Veiksmīgi saglabāts.'
     REMEMBERME: 'Atcerēties mani nākamreiz?'
     SINGULARNAME: Dalībnieks
     SUBJECTPASSWORDCHANGED: 'Jūsu parole tika nomainīta'
@@ -410,7 +409,7 @@ lv:
     TWODIGITYEAR: 'Two-digit year'
   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>'
+    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'
     ResultNone: 'No changes'
@@ -422,6 +421,7 @@ lv:
   ModelAdmin:
     DELETE: Delete
     DELETEDRECORDS: 'Deleted {count} records.'
+    EMPTYBEFOREIMPORT: 'Clear Database before import'
     IMPORT: 'Import from CSV'
     IMPORTEDRECORDS: 'Imported {count} records.'
     NOCSVFILE: 'Please browse for a CSV file to import'
@@ -472,6 +472,7 @@ lv:
     SINGULARNAME: 'Permission Role Code'
   Permissions:
     PERMISSIONS_CATEGORY: 'Lomu un piekļuves atļaujas'
+    UserPermissionsIntro: 'Assigning groups to this user will adjust the permissions they have. See the groups section for details of permissions on individual groups.'
   PhoneNumberField:
     VALIDATION: 'Lūdzu ievadiet derīgu tālruņa numuru'
   RelationComplexTableField.ss:

lang/mi_NZ.yml

@@ -1,7 +1,6 @@
 mi_NZ:
   AssetAdmin:
-    ADDFILES: 'Tāpiri Kōnae'
+    ALLOWEDEXTS: 'Ngā toronga ka whakaaetia'
-    EditOrgMenu: 'Whakatika me te Whakaraupapa'
     NEWFOLDER: KōpakiHōu
   AssetTableField:
     CREATED: 'Tukuatu tuatahi'
@@ -12,7 +11,7 @@ mi_NZ:
     OWNER: Kaiūmanga
     SIZE: Nuinga
     TITLE: Taitara
-    TYPE: 'Tūmomo '
+    TYPE: 'Momo kōnae'
     URL: PRO
   AssetUploadField:
     ChooseFiles: 'Kōwhiri kōnae'
@@ -72,7 +71,7 @@ mi_NZ:
     ACCESSALLINTERFACESHELP: 'Ka takahi i ngā tautuhinga uru tauwhāiti ake'
     SAVE: Tiaki
   CMSProfileController:
-    MENUTITLE: PūwhakamanaKōtahaCMS
+    MENUTITLE: 'My Profile'
   ChangePasswordEmail.ss:
     CHANGEPASSWORDTEXT1: 'Kua hurihia tō kupuhipa mō'
     CHANGEPASSWORDTEXT2: 'Ka taea te whakamahi i ēnei taipitopito tuakiri ināianei hei takiuru:'
@@ -191,8 +190,8 @@ mi_NZ:
   Filesystem:
     SYNCRESULTS: 'Kua oti te tukutahi: e {createdcount} ngā tūemi i hangaia, e {deletedcount} ngā tūemi i mukua'
   Folder:
-    PLURALNAME: 'Ngā Kōpaki'
+    PLURALNAME: Folders
-    SINGULARNAME: Kōpaki
+    SINGULARNAME: Folder
   ForgotPasswordEmail.ss:
     HELLO: 'Kia ora'
     TEXT1: 'Anei tō'
@@ -200,7 +199,7 @@ mi_NZ:
     TEXT3: mā
   Form:
     FIELDISREQUIRED: 'Ka hiahiatia a %s'
-    SubmitBtnLabel: Haere
+    SubmitBtnLabel: Go
     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'
@@ -235,7 +234,7 @@ mi_NZ:
     CancelBtn: Whakakore
     Create: Hanga
     Delete: Muku
-    DeletePermissionsFailure: 'Kāore he muku whakaaetanga'
+    DeletePermissionsFailure: 'Kāore he whakaaetanga muku'
     Deleted: 'Kua mukua %s %s'
     Save: Tiaki
     Saved: 'I tiakina a %s %s'
@@ -249,16 +248,16 @@ mi_NZ:
     GroupReminder: 'Mēnā ka kōwhiri koe i tētahi rōpū matua, ka whiwhi tēnei rōpū i ōna tūnga katoa'
     Locked: 'Kua raka?'
     NoRoles: 'Kāore i kitea he tūnga'
-    PLURALNAME: 'Ngā Rōpū'
+    PLURALNAME: Groups
     Parent: 'Rōpū Matua'
     RolesAddEditLink: 'Whakahaere tūnga'
-    SINGULARNAME: Rōpū
+    SINGULARNAME: Group
     Sort: 'Raupapa Kōmaka'
     has_many_Permissions: 'Ngā Whakaaetanga'
     many_many_Members: 'Ngā Mema'
   GroupImportForm:
     Help1: '<p>Kawea mai ngā kaiwhakamahi i te hōputu <em>CSV </em> (ngā uara ka wehea ki te piko). <small><a href="#" class="toggle-advanced">Whakaatu whakamahinga ara atu anō</a></small></p>'
-    Help2: "<div class=\"advanced\">\\n<h4>Whakamahinga ara atu anō</h4>\\n<ul>\\n<li>Ngā tīwae ka whakaaetia: <em>%s</em></li>\\n<li>Ka whakaritea ngā kaiwhakamahi mā tō rātou āhuatanga<em>Waehere</em> ahurei, ā, ka whakahōutia ki ngā uara hōu mai i te kōnae kua kawea mai</li>\\n<li>Ka taea te hanga aroākapanga rōpū mā te whakamahi i te tīwae <em>WaehereMatua</em>.</li>\\n<li>Ka taea te tautapa waehere whakaaetanga mā te tīwae<em>WaehereWhakaaetanga</em>. Kāore e ūkuia ngā waehere whakaaetanga o nāianei.</li>\\n</ul>\\n</div>"
+    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: 'I hangaia e {count} ngā rōpū'
     ResultDeleted: 'Kua mukua e %d ngā rōpū'
     ResultUpdated: 'Kua whakahōutia e %d ngā rōpū'
@@ -280,7 +279,7 @@ mi_NZ:
     CSSCLASSRIGHT: 'I te taha matau, me te tuhinga e takai huri noa ana'
     DETAILS: 'Ngā Taipitopito'
     EMAIL: 'Wāhitau Īmēra'
-    FILE: 'Ngā kōnae'
+    FILE: Kōnae
     FOLDER: Kōpaki
     FROMCMS: 'Mai i te CMS'
     FROMCOMPUTER: 'Mai i tō rorohiko'
@@ -310,13 +309,13 @@ mi_NZ:
     URLNOTANOEMBEDRESOURCE: 'Kāore e taea te huri i te PRO ''{url}'' hei rawa pāpāho.'
     UpdateMEDIA: 'Whakahōu Pāpāho'
   Image:
-    PLURALNAME: 'Ngā Kōnae'
+    PLURALNAME: Files
-    SINGULARNAME: Kōnae
+    SINGULARNAME: File
   ImageField:
     IMAGE: Atahanga
   Image_Cached:
-    PLURALNAME: 'Ngā kōnae'
+    PLURALNAME: Files
-    SINGULARNAME: Kōnae
+    SINGULARNAME: File
   Image_iframe.ss:
     TITLE: 'Iframe Tukuatu Atahanga'
   LeftAndMain:
@@ -348,6 +347,7 @@ mi_NZ:
     BUTTONLOGIN: Takiuru
     BUTTONLOGINOTHER: 'Takiuru hei tangata kē'
     BUTTONLOSTPASSWORD: 'Kua ngaro i a au taku kupuhipa'
+    CANTEDIT: 'You don''t have permission to do that'
     CONFIRMNEWPASSWORD: 'Whakaū Kupuhipa Hōu'
     CONFIRMPASSWORD: 'Whakaū Kupuhipa'
     DATEFORMAT: 'Hōputu Rā'
@@ -367,7 +367,6 @@ mi_NZ:
     NEWPASSWORD: 'Kupuhipa Hōu'
     PASSWORD: Kupuhipa
     PLURALNAME: 'Ngā Mema'
-    PROFILESAVESUCCESS: 'I momoho te tiaki'
     REMEMBERME: 'Ka maumahara mai ā muri atu?'
     SINGULARNAME: Mema
     SUBJECTPASSWORDCHANGED: 'Kua hurihia tō kupuhipa'
@@ -410,18 +409,19 @@ mi_NZ:
     TWODIGITYEAR: 'Tau matirua'
   MemberImportForm:
     Help1: '<p>Kawea mai ngā kaiwhakamahi i te <em>hōputu CSV </em> (ngā uara ka wehea ki te piko). <small><a href="#" class="toggle-advanced">Whakaatu whakamahinga ara atu anō</a></small></p>'
-    Help2: "<div class=\"advanced\">\\n<h4>Whakamahinga ara atu anō</h4>\\n<ul>\\n<li>Ngā tīwae ka whakaaetia: <em>%s</em></li>\\n<li>Ka whakaritea ngā kaiwhakamahi mā tō rātou āhuatanga<em>Waehere</em> ahurei, ā, ka whakahōutia ki ngā uara hōu mai i te kōnae kua kawea mai.</li>\\n<li>Ka taea te tautapa rōpū mā te tīwae <em>Ngā Rōpū</em>. Ka tautohua ngā rōpū mā tō rātou āhuatanga <em>Waehere</em>, ka taea te whakawehe i ngā rōpū maha ki te piko. Kāore e ūkuia ngā mematanga rōpū o naianei.</li>\\n</ul>\\n</div>"
+    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: 'I hangaia e {count} ngā mema'
     ResultDeleted: 'Kua mukua e %d ngā mema'
     ResultNone: 'Kāore he huringa'
     ResultUpdated: 'I whakahōutia e {count} mhā mema'
   MemberPassword:
-    PLURALNAME: 'Ngā Kupuhipa Mema'
+    PLURALNAME: 'Member Passwords'
-    SINGULARNAME: 'Kupuhipa Mema'
+    SINGULARNAME: 'Member Password'
   MemberTableField: null
   ModelAdmin:
     DELETE: Muku
     DELETEDRECORDS: 'I mukua e {count} ngā pūkete.'
+    EMPTYBEFOREIMPORT: 'Clear Database before import'
     IMPORT: 'Kawemai i CSV'
     IMPORTEDRECORDS: 'I kawea mai e {count} ngā pūkete.'
     NOCSVFILE: 'Pūtirotiro kia kitea he kōnae CSV hei kawemai'
@@ -448,15 +448,15 @@ mi_NZ:
   NumericField:
     VALIDATION: 'Ehara te ''{value}'' i te tau, ka taea ngā tau anake ki tēnei āpure'
   Pagination:
-    Page: Whārangi
+    Page: Page
-    View: Tiro
+    View: View
   Permission:
     AdminGroup: Kaiwhakahaere
     CMS_ACCESS_CATEGORY: 'Uru CMS'
     FULLADMINRIGHTS: 'Ngā motika kaiwhakahaere katoa'
     FULLADMINRIGHTS_HELP: 'Ka whakapae me te takahi i ērā atu whakaaetanga katoa kua tautapatia.'
-    PLURALNAME: 'Ngā Whakaaetanga'
+    PLURALNAME: Permissions
-    SINGULARNAME: Whakaaetanga
+    SINGULARNAME: Permission
   PermissionCheckboxSetField:
     AssignedTo: 'kua tautapatia ki  "{title}"'
     FromGroup: 'I tukuna iho i te rōpū "{title}"'
@@ -472,6 +472,7 @@ mi_NZ:
     SINGULARNAME: 'Permission Role Code'
   Permissions:
     PERMISSIONS_CATEGORY: 'Ngā tūnga me ngā whakaaetanga uru'
+    UserPermissionsIntro: 'Assigning groups to this user will adjust the permissions they have. See the groups section for details of permissions on individual groups.'
   PhoneNumberField:
     VALIDATION: 'Tāurua he tau waea tika'
   RelationComplexTableField.ss:

lang/ms.yml

@@ -1,7 +1,6 @@
 ms:
   AssetAdmin:
-    ADDFILES: 'Add files'
+    ALLOWEDEXTS: 'Allowed extensions'
-    EditOrgMenu: 'Edit & organize'
     NEWFOLDER: NewFolder
   AssetTableField:
     CREATED: 'First uploaded'
@@ -21,7 +20,7 @@ ms:
     EDITALL: 'Edit all'
     EDITANDORGANIZE: 'Edit & organize'
     EDITINFO: 'Edit files'
-    FILES: Fail-fail
+    FILES: Files
     FROMCOMPUTER: 'Choose files from your computer'
     FROMCOMPUTERINFO: 'Upload from your computer'
     TOTAL: Total
@@ -72,7 +71,7 @@ ms:
     ACCESSALLINTERFACESHELP: 'Overrules more specific access settings.'
     SAVE: Save
   CMSProfileController:
-    MENUTITLE: CMSProfileController
+    MENUTITLE: 'My Profile'
   ChangePasswordEmail.ss:
     CHANGEPASSWORDTEXT1: 'Anda telah mengubah kata lalaun untuk'
     CHANGEPASSWORDTEXT2: 'Sila gunakan maklumat di bawah untuk mendaftar masuk:'
@@ -87,7 +86,7 @@ ms:
     SUCCESSADD2: 'Added {name}'
     SUCCESSEDIT: 'Saved %s %s %s'
   ComplexTableField.ss:
-    ADDITEM: 'Add %s'
+    ADDITEM: Tambah
     NOITEMSFOUND: 'No items found'
     SORTASC: 'Susun secara menaik'
     SORTDESC: 'Susun secara menurun'
@@ -181,7 +180,7 @@ ms:
     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: Fail
+    FILE: File
     FROMCOMPUTER: 'From your Computer'
     FROMFILESTORE: 'From the File Store'
     NOSOURCE: 'Please select a source file to attach'
@@ -258,7 +257,7 @@ ms:
     many_many_Members: Ahli-ahli
   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>'
+    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'
     ResultUpdated: 'Updated %d groups'
@@ -348,6 +347,7 @@ ms:
     BUTTONLOGIN: 'Daftar masuk'
     BUTTONLOGINOTHER: 'Daftar masuk mengunakan id pengguna yang lain'
     BUTTONLOSTPASSWORD: 'Saya telah hilang kata lalaun saya'
+    CANTEDIT: 'You don''t have permission to do that'
     CONFIRMNEWPASSWORD: 'Sahkan Katalaluan Baru'
     CONFIRMPASSWORD: 'Sahkan Kata Lalaun'
     DATEFORMAT: 'Date format'
@@ -367,7 +367,6 @@ ms:
     NEWPASSWORD: 'Katalaluan Baru'
     PASSWORD: 'Kata Lalaun'
     PLURALNAME: Ahli-ahli
-    PROFILESAVESUCCESS: 'Successfully saved.'
     REMEMBERME: 'Ingat (butiran login) saya selepas ini?'
     SINGULARNAME: Ahli
     SUBJECTPASSWORDCHANGED: 'Kata lalaun anda telah ditukar'
@@ -410,7 +409,7 @@ ms:
     TWODIGITYEAR: 'Two-digit year'
   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>'
+    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'
     ResultNone: 'No changes'
@@ -422,6 +421,7 @@ ms:
   ModelAdmin:
     DELETE: Delete
     DELETEDRECORDS: 'Deleted {count} records.'
+    EMPTYBEFOREIMPORT: 'Clear Database before import'
     IMPORT: 'Import from CSV'
     IMPORTEDRECORDS: 'Imported {count} records.'
     NOCSVFILE: 'Please browse for a CSV file to import'
@@ -472,6 +472,7 @@ ms:
     SINGULARNAME: 'Permission Role Code'
   Permissions:
     PERMISSIONS_CATEGORY: 'Roles and access permissions'
+    UserPermissionsIntro: 'Assigning groups to this user will adjust the permissions they have. See the groups section for details of permissions on individual groups.'
   PhoneNumberField:
     VALIDATION: 'Sila isikan nombor telefon yang sah'
   RelationComplexTableField.ss:

lang/nb.yml

@@ -1,10 +1,9 @@
 nb:
   AssetAdmin:
-    ADDFILES: 'Add files'
+    ALLOWEDEXTS: 'Allowed extensions'
-    EditOrgMenu: 'Edit & organize'
     NEWFOLDER: 'Ny Mappe'
   AssetTableField:
-    CREATED: 'First uploaded'
+    CREATED: 'Først opplastet'
     DIM: Dimensjoner
     FILENAME: Filnavn
     FOLDER: Mappe
@@ -20,12 +19,12 @@ nb:
     DROPAREA: Droppunkt
     EDITALL: 'Endre alle'
     EDITANDORGANIZE: 'Rediger & organiser'
-    EDITINFO: 'Edit files'
+    EDITINFO: 'Rediger filer'
     FILES: Filer
-    FROMCOMPUTER: 'Choose files from your computer'
+    FROMCOMPUTER: 'Velg filer fra din pc'
-    FROMCOMPUTERINFO: 'Upload from your computer'
+    FROMCOMPUTERINFO: 'Last opp fra din pc'
     TOTAL: Total
-    TOUPLOAD: 'Choose files to upload...'
+    TOUPLOAD: 'Velg filer til opplasting...'
     UPLOADINPROGRESS: 'Vennligst vent... opplasting pågår'
     UPLOADOR: ELLER
   BBCodeParser:
@@ -60,9 +59,9 @@ nb:
     ERRORNOTADMIN: 'Denne brukeren er ikke administrator.'
     ERRORNOTREC: 'Det brukernavnet / Passord er ikke gjenkjent'
   Boolean:
-    0: 'False'
+    0: Usant
     ANY: Any
-    1: 'True'
+    1: Sant
   CMSLoadingScreen.ss:
     LOADING: 'Laster ...'
     REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
@@ -72,7 +71,7 @@ nb:
     ACCESSALLINTERFACESHELP: 'Overstyrer mer spesifikke adgangsinnstillinger'
     SAVE: Lagre
   CMSProfileController:
-    MENUTITLE: CMSProfileController
+    MENUTITLE: 'My Profile'
   ChangePasswordEmail.ss:
     CHANGEPASSWORDTEXT1: 'Du har byttet passordet for'
     CHANGEPASSWORDTEXT2: 'Du kan nå bruke følgende informasjon for å logge deg inn:'
@@ -80,14 +79,14 @@ nb:
     HELLO: Hei
     PASSWORD: Passord
   CheckboxField:
-    - 'False'
+    - Usant
-    - 'True'
+    - Sant
   ComplexTableField:
     CLOSEPOPUP: 'Lukk Popup'
     SUCCESSADD2: 'Lagt til {name}'
     SUCCESSEDIT: 'Lagret %s %s %s'
   ComplexTableField.ss:
-    ADDITEM: 'Add %s'
+    ADDITEM: 'Legg til %s'
     NOITEMSFOUND: 'No items found'
     SORTASC: 'Sorter stigende'
     SORTDESC: 'Sorter fallende'
@@ -142,39 +141,39 @@ nb:
     PLURALNAME: 'Email Bounce Records'
     SINGULARNAME: 'Email Bounce Record'
   Enum:
-    ANY: Any
+    ANY: Noen
   File:
-    AviType: 'AVI video file'
+    AviType: 'AVI video fil'
     Content: Innhold
-    CssType: 'CSS file'
+    CssType: 'CSS fil'
     DmgType: 'Apple disk image'
-    DocType: 'Word document'
+    DocType: 'Word dokument'
     Filename: Filnavn
-    GifType: 'GIF image - good for diagrams'
+    GifType: 'GIF bilde - bra til diagrammer'
-    GzType: 'GZIP compressed file'
+    GzType: 'GZIP komprimert fil'
-    HtlType: 'HTML file'
+    HtlType: 'HTML fil'
-    HtmlType: 'HTML file'
+    HtmlType: 'HTML fil'
     INVALIDEXTENSION: 'Extension is not allowed (valid: {extensions})'
     INVALIDEXTENSIONSHORT: 'Extension is not allowed'
-    IcoType: 'Icon image'
+    IcoType: 'Ikon bilde'
-    JpgType: 'JPEG image - good for photos'
+    JpgType: 'JPEG bilde - bra til fotografier'
-    JsType: 'Javascript file'
+    JsType: 'Javascript fil'
-    Mp3Type: 'MP3 audio file'
+    Mp3Type: 'MP3 audio fil'
-    MpgType: 'MPEG video file'
+    MpgType: 'MPEG video fil'
     NOFILESIZE: 'Filstørrelsen var 0 bytes.'
     NOVALIDUPLOAD: 'Filen er ikke en gyldig opplasting'
     Name: Navn
     PLURALNAME: Filer
-    PdfType: 'Adobe Acrobat PDF file'
+    PdfType: 'Adobe Acrobat PDF fil'
     PngType: 'PNG image - good general-purpose format'
     SINGULARNAME: Fil
     TOOLARGE: 'Filstørrelse for stor, maksimum {size} tillatt '
     TOOLARGESHORT: 'Filstørrelse overstiger {size}'
     TiffType: 'Tagged image format'
     Title: Tittel
-    WavType: 'WAV audo file'
+    WavType: 'WAV audio fil'
-    XlsType: 'Excel spreadsheet'
+    XlsType: 'Excel regneark'
-    ZipType: 'ZIP compressed file'
+    ZipType: 'ZIP komprimert fil'
   FileIFrameField:
     ATTACH: 'Legg ved {type}'
     ATTACHONCESAVED: '{type}er kan legges til når du har lagret oppføringen for første gang.'
@@ -191,8 +190,8 @@ nb:
   Filesystem:
     SYNCRESULTS: 'Sync complete: {createdcount} items created, {deletedcount} items deleted'
   Folder:
-    PLURALNAME: Folders
+    PLURALNAME: Mapper
-    SINGULARNAME: Folder
+    SINGULARNAME: Mappe
   ForgotPasswordEmail.ss:
     HELLO: Hei
     TEXT1: 'Her er din'
@@ -200,7 +199,7 @@ nb:
     TEXT3: for
   Form:
     FIELDISREQUIRED: 'mangler %s'
-    SubmitBtnLabel: Go
+    SubmitBtnLabel: Utfør
     VALIDATIONCREDITNUMBER: 'Vennligst sjekk at du har skrevet inn {number} korrekt kortnummer'
     VALIDATIONNOTUNIQUE: 'Den spesifiserte verdien er ikke unik'
     VALIDATIONPASSWORDSDONTMATCH: 'Passordene passer ikke med hverandre'
@@ -232,7 +231,7 @@ nb:
   GridFieldAction_Delete:
     DeletePermissionsFailure: 'Ikke tillatt å slette'
   GridFieldDetailForm:
-    CancelBtn: Cancel
+    CancelBtn: Avbryt
     Create: Create
     Delete: Slett
     DeletePermissionsFailure: 'Ikke tillatt å slette'
@@ -249,16 +248,16 @@ nb:
     GroupReminder: 'Hvis du velger en overordnet gruppe, vil denne gruppen arve alle rollene'
     Locked: 'Låst?'
     NoRoles: 'Ingen roller funnet'
-    PLURALNAME: Groups
+    PLURALNAME: Grupper
     Parent: 'Foreldre Gruppe'
     RolesAddEditLink: 'Administrer roller'
-    SINGULARNAME: Group
+    SINGULARNAME: Gruppe
     Sort: Sorteringsrekkefølge
     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>'
+    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: 'Slettede %d grupper'
     ResultUpdated: 'Oppdaterte %d grupper'
@@ -310,13 +309,13 @@ nb:
     URLNOTANOEMBEDRESOURCE: 'The URL ''{url}'' could not be turned into a media resource.'
     UpdateMEDIA: 'Oppdater Media'
   Image:
-    PLURALNAME: Files
+    PLURALNAME: Filer
-    SINGULARNAME: File
+    SINGULARNAME: Fil
   ImageField:
     IMAGE: Bilde
   Image_Cached:
-    PLURALNAME: Files
+    PLURALNAME: Filer
-    SINGULARNAME: File
+    SINGULARNAME: Fil
   Image_iframe.ss:
     TITLE: 'Bildeopplasnings ramme'
   LeftAndMain:
@@ -334,13 +333,13 @@ nb:
     SAVEDUP: Lagret.
     VersionUnknown: Ukjent
   LeftAndMain_Menu.ss:
-    Hello: Hi
+    Hello: Hei
     LOGOUT: 'Logg ut'
   LoginAttempt:
     Email: Epostadresse
     IP: 'IP adresse'
-    PLURALNAME: 'Login Attempts'
+    PLURALNAME: Innloggingsforsøk
-    SINGULARNAME: 'Login Attempt'
+    SINGULARNAME: Innloggingsforsøk
     Status: Status
   Member:
     ADDGROUP: 'Legg til en gruppe'
@@ -348,9 +347,10 @@ nb:
     BUTTONLOGIN: 'Logg inn'
     BUTTONLOGINOTHER: 'Logg inn med en annen brukerkonto'
     BUTTONLOSTPASSWORD: 'Jeg har mistet passordet'
+    CANTEDIT: 'You don''t have permission to do that'
     CONFIRMNEWPASSWORD: 'Bekreft Nytt Passord'
     CONFIRMPASSWORD: 'Bekreft passord'
-    DATEFORMAT: 'Date format'
+    DATEFORMAT: Datoformat
     DefaultAdminFirstname: 'Standard admin'
     DefaultDateTime: Standard
     EMAIL: Epost
@@ -367,13 +367,12 @@ nb:
     NEWPASSWORD: 'Nytt Passord'
     PASSWORD: Passord
     PLURALNAME: Medlemmer
-    PROFILESAVESUCCESS: 'Vellykket lagret.'
     REMEMBERME: 'Husk meg neste gang?'
     SINGULARNAME: Medlem
     SUBJECTPASSWORDCHANGED: 'Ditt passord har blitt endret'
     SUBJECTPASSWORDRESET: 'Link til passordannulering'
     SURNAME: Etternavn
-    TIMEFORMAT: 'Time format'
+    TIMEFORMAT: Tidsformat
     VALIDATIONMEMBEREXISTS: 'Det eksisterer allerede et medlem med denne epost-kontoen.'
     ValidationIdentifierFailed: 'Kan ikke overskrive eksisterende medlem #{id} med identisk identifikator ({name})={value}))'
     WELCOMEBACK: 'Velkommen tilbake, {firstname}'
@@ -410,18 +409,19 @@ nb:
     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>'
+    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: 'Slettet %d medlemmer'
     ResultNone: 'Ingen endringer'
     ResultUpdated: 'Updated {count} members'
   MemberPassword:
-    PLURALNAME: 'Member Passwords'
+    PLURALNAME: Medlemspassord
-    SINGULARNAME: 'Member Password'
+    SINGULARNAME: Medlemspassord
   MemberTableField: null
   ModelAdmin:
     DELETE: Slett
     DELETEDRECORDS: 'Deleted {count} records.'
+    EMPTYBEFOREIMPORT: 'Clear Database before import'
     IMPORT: 'Importer fra CSV'
     IMPORTEDRECORDS: 'Imported {count} records.'
     NOCSVFILE: 'Please browse for a CSV file to import'
@@ -442,21 +442,21 @@ nb:
     SEARCHLISTINGS: Søk
   MoneyField:
     FIELDLABELAMOUNT: Mengde
-    FIELDLABELCURRENCY: Currency
+    FIELDLABELCURRENCY: Valuta
   NullableField:
     IsNullLabel: 'Is Null'
   NumericField:
     VALIDATION: '''{value}'' er ikke et tall, kun tall aksepteres i dette feltet'
   Pagination:
-    Page: Page
+    Page: Side
-    View: View
+    View: Vis
   Permission:
     AdminGroup: Administrator
     CMS_ACCESS_CATEGORY: CMS-tilgang
     FULLADMINRIGHTS: 'Fulle administrative rettigheter'
     FULLADMINRIGHTS_HELP: 'Implies and overrules all other assigned permissions.'
-    PLURALNAME: Permissions
+    PLURALNAME: Tillatelser
-    SINGULARNAME: Permission
+    SINGULARNAME: Tillatelse
   PermissionCheckboxSetField:
     AssignedTo: 'tilordnet "{title}"'
     FromGroup: 'Arvet fra gruppe "{title}"'
@@ -464,19 +464,20 @@ nb:
     FromRoleOnGroup: 'inherited from role "%s" on group "%s"'
   PermissionRole:
     OnlyAdminCanApply: 'Only admin can apply'
-    PLURALNAME: Roles
+    PLURALNAME: Roller
-    SINGULARNAME: Role
+    SINGULARNAME: Rolle
-    Title: Title
+    Title: Tittel
   PermissionRoleCode:
     PLURALNAME: 'Permission Role Cods'
     SINGULARNAME: 'Permission Role Code'
   Permissions:
     PERMISSIONS_CATEGORY: 'Rolle- og tilgangstillatelser'
+    UserPermissionsIntro: 'Assigning groups to this user will adjust the permissions they have. See the groups section for details of permissions on individual groups.'
   PhoneNumberField:
     VALIDATION: 'Vennligst skriv inn et gyldig tlf nummer'
   RelationComplexTableField.ss:
     ADD: 'Legg til'
-    CSVEXPORT: 'Export to CSV'
+    CSVEXPORT: 'Eksporter til 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.'
@@ -527,16 +528,16 @@ nb:
   TableListField:
     CSVEXPORT: 'Eksporter til CSV'
     PRINT: 'Skriv ut'
-    Print: Print
+    Print: 'Skriv ut'
     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
+    DISPLAYING: Viser
-    OF: of
+    OF: av
-    TO: to
+    TO: til
     VIEWFIRST: 'Se første'
     VIEWLAST: 'Se siste'
     VIEWNEXT: 'Se neste'
@@ -550,26 +551,26 @@ nb:
     ATTACHFILE: 'Legg ved fil'
     ATTACHFILES: 'Legg ved filer'
     AttachFile: 'Legg ved fil(er)'
-    DELETE: 'Delete from files'
+    DELETE: 'Slett fra filer'
     DELETEINFO: 'Slett filen permament fra filarkivet'
     DOEDIT: Lagre
     DROPFILE: 'Slipp en fil'
     DROPFILES: 'Slipp filer'
     Dimensions: Dimensjoner
-    EDIT: Edit
+    EDIT: Rediger
     EDITINFO: 'Rediger denne filen'
     FIELDNOTSET: 'Filinformasjon ikke funnet'
     FROMCOMPUTER: 'Fra din pc'
-    FROMCOMPUTERINFO: 'Select from files'
+    FROMCOMPUTERINFO: 'Velg fra filer'
     FROMFILES: 'Fra filer'
-    HOTLINKINFO: 'Info: This image will be hotlinked. Please ensure you have permissions from the original site creator to do so.'
+    HOTLINKINFO: 'Info: Dette bildet vil bli lenket direkte til opprinnelig kilde. Vennligst forsikre deg om at du har tillatelse fra den opprinnelige rettighetshaveren til å gjøre dette.'
     MAXNUMBEROFFILES: 'Maks antall {count} fil(er) overskredet'
     MAXNUMBEROFFILESSHORT: 'Kan kun laste opp {count} filer'
     REMOVE: Fjern
     REMOVEERROR: 'Feil ved fjerning av fil'
     REMOVEINFO: 'Fjern filen herfra, men ikke slett den fra filarkivet'
     STARTALL: 'Start alle'
-    STARTALLINFO: 'Start all uploads'
+    STARTALLINFO: 'Start alle opplastinger'
     Saved: Lagret
   Versioned:
     has_many_Versions: Versjoner

lang/ne.yml

@@ -1,7 +1,6 @@
 ne:
   AssetAdmin:
-    ADDFILES: 'Add files'
+    ALLOWEDEXTS: 'Allowed extensions'
-    EditOrgMenu: 'Edit & organize'
     NEWFOLDER: NewFolder
   AssetTableField:
     CREATED: 'First uploaded'
@@ -72,7 +71,7 @@ ne:
     ACCESSALLINTERFACESHELP: 'Overrules more specific access settings.'
     SAVE: Save
   CMSProfileController:
-    MENUTITLE: CMSProfileController
+    MENUTITLE: 'My Profile'
   ChangePasswordEmail.ss:
     CHANGEPASSWORDTEXT1: 'तपाईंले आफनो पासओड  यसका लागि परिवतन गर्नु भयो '
     CHANGEPASSWORDTEXT2: 'दिएको विवरण अनुसार भित्र जान सक्नुहुन्छ :'
@@ -87,7 +86,7 @@ ne:
     SUCCESSADD2: 'Added {name}'
     SUCCESSEDIT: 'Saved %s %s %s'
   ComplexTableField.ss:
-    ADDITEM: 'Add %s'
+    ADDITEM: थप्
     NOITEMSFOUND: 'No items found'
     SORTASC: 'बढ्दो क्रमाङ्कन '
     SORTDESC: 'घट्दो क्रमाङ्कन '
@@ -181,7 +180,7 @@ ne:
     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: File
     FROMCOMPUTER: 'From your Computer'
     FROMFILESTORE: 'From the File Store'
     NOSOURCE: 'Please select a source file to attach'
@@ -258,7 +257,7 @@ ne:
     many_many_Members: 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>'
-    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>'
+    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'
     ResultUpdated: 'Updated %d groups'
@@ -348,6 +347,7 @@ ne:
     BUTTONLOGIN: 'भित्र जानुस्'
     BUTTONLOGINOTHER: 'अरु कोही भएर भित्र जानुस् '
     BUTTONLOSTPASSWORD: 'मैले मेरो पासओड हराएँ'
+    CANTEDIT: 'You don''t have permission to do that'
     CONFIRMNEWPASSWORD: 'नयाँ पासओड Confirm गर्नुहोस् '
     CONFIRMPASSWORD: 'Confirm पासओड'
     DATEFORMAT: 'Date format'
@@ -367,7 +367,6 @@ ne:
     NEWPASSWORD: 'नयाँ पासओड'
     PASSWORD: पासओड
     PLURALNAME: Members
-    PROFILESAVESUCCESS: 'Successfully saved.'
     REMEMBERME: 'अर्को पटक मलाई सम्झनुस् '
     SINGULARNAME: Member
     SUBJECTPASSWORDCHANGED: 'तपाईंको पासओड परिवतन भएको छ ।'
@@ -410,7 +409,7 @@ ne:
     TWODIGITYEAR: 'Two-digit year'
   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>'
+    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'
     ResultNone: 'No changes'
@@ -422,6 +421,7 @@ ne:
   ModelAdmin:
     DELETE: Delete
     DELETEDRECORDS: 'Deleted {count} records.'
+    EMPTYBEFOREIMPORT: 'Clear Database before import'
     IMPORT: 'Import from CSV'
     IMPORTEDRECORDS: 'Imported {count} records.'
     NOCSVFILE: 'Please browse for a CSV file to import'
@@ -472,6 +472,7 @@ ne:
     SINGULARNAME: 'Permission Role Code'
   Permissions:
     PERMISSIONS_CATEGORY: 'Roles and access permissions'
+    UserPermissionsIntro: 'Assigning groups to this user will adjust the permissions they have. See the groups section for details of permissions on individual groups.'
   PhoneNumberField:
     VALIDATION: 'कृपया मिल्ने फोन नम्बर हाल्नुहोस् '
   RelationComplexTableField.ss:

lang/nl.yml

@@ -1,7 +1,6 @@
 nl:
   AssetAdmin:
-    ADDFILES: 'Add files'
+    ALLOWEDEXTS: 'Allowed extensions'
-    EditOrgMenu: 'Edit & organize'
     NEWFOLDER: 'Nieuwe Map'
   AssetTableField:
     CREATED: 'Eerste upload'
@@ -17,16 +16,16 @@ nl:
   AssetUploadField:
     ChooseFiles: 'Selecteer bestanden'
     DRAGFILESHERE: 'Sleep bestanden hiernaar toe'
-    DROPAREA: 'Hierheen slepen'
+    DROPAREA: 'Drop Area'
-    EDITALL: 'Alles bewerken'
+    EDITALL: 'Edit all'
     EDITANDORGANIZE: 'Bewerk en beheer'
     EDITINFO: 'Edit files'
-    FILES: Bestanden
+    FILES: Files
     FROMCOMPUTER: 'Choose files from your computer'
     FROMCOMPUTERINFO: 'Upload from your computer'
-    TOTAL: Totaal
+    TOTAL: Total
     TOUPLOAD: 'Choose files to upload...'
-    UPLOADINPROGRESS: 'Ogenblikje... bezig met uploaden'
+    UPLOADINPROGRESS: 'Please wait… upload in progress'
     UPLOADOR: OF
   BBCodeParser:
     ALIGNEMENT: Uitlijning
@@ -60,11 +59,11 @@ nl:
     ERRORNOTADMIN: 'Die gebruiker is geen beheerder.'
     ERRORNOTREC: 'De gebruikersnaam en/of wachtwoord wordt niet herkend'
   Boolean:
-    0: 'False'
+    0: Nee
     ANY: Elke
-    1: 'True'
+    1: Ja
   CMSLoadingScreen.ss:
-    LOADING: Laden...
+    LOADING: Loading...
     REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
   CMSMain:
     ACCESS: 'Toegang tot het ''{title}'' gedeelte'
@@ -72,7 +71,7 @@ nl:
     ACCESSALLINTERFACESHELP: 'Overstemt meer specifieke toegangsinstellingen'
     SAVE: Bewaar
   CMSProfileController:
-    MENUTITLE: CMSProfileController
+    MENUTITLE: 'My Profile'
   ChangePasswordEmail.ss:
     CHANGEPASSWORDTEXT1: 'U heeft het wachtwoord veranderd voor'
     CHANGEPASSWORDTEXT2: 'U kunt nu onderstaande gegevens gebruiken om in te loggen:'
@@ -80,14 +79,14 @@ nl:
     HELLO: Hallo
     PASSWORD: Wachtwoord
   CheckboxField:
-    - 'False'
+    - Nee
-    - 'True'
+    - Ja
   ComplexTableField:
     CLOSEPOPUP: 'Sluit Popup'
     SUCCESSADD2: 'Toegevoegd {name}'
     SUCCESSEDIT: '%s %s %s Opgeslagen'
   ComplexTableField.ss:
-    ADDITEM: 'Add %s'
+    ADDITEM: 'Voeg %s toe'
     NOITEMSFOUND: 'No items found'
     SORTASC: 'Sorteer oplopend'
     SORTDESC: 'Sorteer aflopend'
@@ -120,20 +119,20 @@ nl:
     MONTHS: maanden
     SEC: seconde
     SECS: seconden
-    TIMEDIFFAGO: '{difference} geleden'
+    TIMEDIFFAGO: '{difference} ago'
     TIMEDIFFIN: 'in {difference}'
     YEAR: jaar
     YEARS: jaren
   DateField:
     NOTSET: 'niet ingesteld'
     TODAY: vandaag
-    VALIDDATEFORMAT2: 'Vul een valide datum in ({format})'
+    VALIDDATEFORMAT2: 'Please enter a valid date format ({format})'
-    VALIDDATEMAXDATE: 'De datum moet eerder of gelijk zijn aan de maximale datum ({date})'
+    VALIDDATEMAXDATE: 'Your date has to be older or matching the maximum allowed date ({date})'
-    VALIDDATEMINDATE: 'De datum moet nieuwer of gelijk zijn aan de minimale datum ({date})'
+    VALIDDATEMINDATE: 'Your date has to be newer or matching the minimum allowed date ({date})'
   DatetimeField:
     NOTSET: 'Not set'
   Director:
-    INVALID_REQUEST: 'Fout bij verwerken'
+    INVALID_REQUEST: 'Invalid request'
   DropdownField:
     CHOOSE: (Kies)
   EmailField:
@@ -211,34 +210,34 @@ nl:
   FormField:
     NONE: geen
   GridAction:
-    DELETE_DESCRIPTION: Verwijder
+    DELETE_DESCRIPTION: Delete
     Delete: Verwijder
     UnlinkRelation: Ontkoppelen
   GridField:
-    Add: '{name} toevoegen'
+    Add: 'Add {name}'
-    Filter: Filteren
+    Filter: Filter
     FilterBy: Filteren
     Find: Zoek
-    LEVELUP: 'Niveau hoger'
+    LEVELUP: 'Level up'
-    LinkExisting: 'Koppelen aan'
+    LinkExisting: 'Link Existing'
     NewRecord: 'Nieuw %s'
     NoItemsFound: 'Geen items gevonden.'
     PRINTEDAT: 'Geprint om'
     PRINTEDBY: 'Geprint door'
-    PlaceHolder: 'Zoek {type}'
+    PlaceHolder: 'Find {type}'
-    PlaceHolderWithLabels: 'Zoek {type} op {name}'
+    PlaceHolderWithLabels: 'Find {type} by {name}'
     RelationSearch: 'Relation search'
-    ResetFilter: Herstel
+    ResetFilter: Reset
   GridFieldAction_Delete:
     DeletePermissionsFailure: 'Onvoldoende rechten om te verwijderen'
   GridFieldDetailForm:
     CancelBtn: Cancel
     Create: Create
     Delete: Verwijder
-    DeletePermissionsFailure: 'Onvoldoende rechten om te verwijderen'
+    DeletePermissionsFailure: 'No delete permissions'
     Deleted: 'Deleted %s %s'
     Save: Opslaan
-    Saved: '%s %s opgeslagen'
+    Saved: '%s %s %s Opgeslagen'
   GridFieldItemEditView.ss: null
   Group:
     AddRole: 'Voeg een rol toe aan deze groep'
@@ -258,7 +257,7 @@ nl:
     many_many_Members: Lid
   GroupImportForm:
     Help1: '<p>Importeer en of meerdere groepen in <em>CSV</em> formaat (Kommagescheiden bestandsformaat). <small><a href="#" class="toggle-advanced">Toon geavanceerd gebruik</a></small></p>'
-    Help2: '<div class="advanced"><h4>Geavanceerd gebruik</h4><ul><li>Toegestane kolommen: <em>%s</em></li><li>Bestaande groepen worden geïdentificeerd door middel van hun unieke <em>Code</em> waarde en aangepast met de nieuwe waarden van het geïmporteerde bestand</li><li>Groep hiërarchieën kunnen aangemaakt worden met behulp van een <em>ParentCode</em> kolom.</li><li>Toegangsrechten kunnen worden toegekend met de <em>PermissionCode</em> kolom. Bestaande toegangsrechten worden niet gewist.</li></ul></div>'
+    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: '%d groepen verwijderd'
     ResultUpdated: '%d groepen aangepast'
@@ -330,7 +329,7 @@ nl:
     PERMDEFAULT: 'Geef uw e-mailadres en wachtwoord voor toegang tot het CMS.'
     PLEASESAVE: 'Deze pagina kon niet bijgewerkt worden, omdat deze nog niet is bewaard.'
     PreviewButton: Preview
-    REORGANISATIONSUCCESSFUL: 'Menu-indeling is aangepast'
+    REORGANISATIONSUCCESSFUL: 'Reorganised the site tree successfully.'
     SAVEDUP: 'Succesvol opgeslagen'
     VersionUnknown: onbekend
   LeftAndMain_Menu.ss:
@@ -343,11 +342,12 @@ nl:
     SINGULARNAME: 'Login Attempt'
     Status: Status
   Member:
-    ADDGROUP: 'Groep toevoegen'
+    ADDGROUP: 'Add group'
     BUTTONCHANGEPASSWORD: 'Wachtwoord veranderen'
     BUTTONLOGIN: Inloggen
     BUTTONLOGINOTHER: 'Als iemand anders inloggen'
     BUTTONLOSTPASSWORD: 'Ik ben mijn wachtwoord vergeten...'
+    CANTEDIT: 'You don''t have permission to do that'
     CONFIRMNEWPASSWORD: 'Bevestig het nieuwe wachtwoord'
     CONFIRMPASSWORD: 'Bevestig wachtwoord'
     DATEFORMAT: 'Date format'
@@ -362,12 +362,11 @@ nl:
     ERRORWRONGCRED: 'Dat is niet het juiste email adres of wachtwoord. Probeert U het a.u.b. opnieuw.'
     FIRSTNAME: Voornaam
     INTERFACELANG: 'Interface Taal'
-    INVALIDNEWPASSWORD: 'Het wachtwoord {password} is niet geldig'
+    INVALIDNEWPASSWORD: 'We couldn''t accept that password: {password}'
-    LOGGEDINAS: 'U bent ingelogd als {name}.'
+    LOGGEDINAS: 'You''re logged in as {name}.'
-    NEWPASSWORD: 'Nieuw wachtwoord'
+    NEWPASSWORD: 'Nieuw Wachtwoord'
     PASSWORD: Wachtwoord
     PLURALNAME: Leden
-    PROFILESAVESUCCESS: 'Succesvol opgeslagen'
     REMEMBERME: 'Wachtwoord onthouden voor de volgende keer?'
     SINGULARNAME: Lid
     SUBJECTPASSWORDCHANGED: 'Uw wachtwoord is veranderd'
@@ -375,8 +374,8 @@ nl:
     SURNAME: Achternaam
     TIMEFORMAT: 'Time format'
     VALIDATIONMEMBEREXISTS: 'Er bestaat reeds een gebruiker met dit emailadres'
-    ValidationIdentifierFailed: 'Een bestaande gebruiker #{id} kan niet dezelfde unieke velden hebben ({name} = {value}))'
+    ValidationIdentifierFailed: 'Can''t overwrite existing member #{id} with identical identifier ({name} = {value}))'
-    WELCOMEBACK: 'Welkom terug {firstname}'
+    WELCOMEBACK: 'Welcome Back, {firstname}'
     YOUROLDPASSWORD: 'Uw oude wachtwoord'
     belongs_many_many_Groups: Groepen
     db_LastVisited: 'Datum van het laatste bezoek'
@@ -410,7 +409,7 @@ nl:
     TWODIGITYEAR: 'Twee-cijferig jaar'
   MemberImportForm:
     Help1: '<p>Importeer leden in <em>CSV</em> formaat (Kommagescheiden bestandsformaat). <small><a href="#" class="toggle-advanced">Toon geavanceerd gebruik</a></small></p>'
-    Help2: '<div class="advanced"><h4>Geavanceerd gebruik</h4><ul><li>Toegestane kolommen: <em>%s</em></li><li>Bestaande leden worden geïdentificeerd door middel van hun unieke <em>Code</em> waarde en aangepast met de nieuwe waarden van het geïmporteerde bestand</li><li>Groepen kunnen toegewezen worden met de <em>Groups</em> kolom. Groepen worden geïdentificeerd met hun <em>Code</em> waarde en meerdere groepen kunnen worden gescheiden met een komma. Bestaande groep lidmaatschappen worden niet gewist.</li></ul></div></ul></div>'
+    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: '%d leden verwijderd'
     ResultNone: 'Geen wijzingen'
@@ -422,6 +421,7 @@ nl:
   ModelAdmin:
     DELETE: Verwijderen
     DELETEDRECORDS: 'Deleted {count} records.'
+    EMPTYBEFOREIMPORT: 'Clear Database before import'
     IMPORT: 'Importeren vanuit CSV'
     IMPORTEDRECORDS: 'Imported {count} records.'
     NOCSVFILE: 'Selecteer een CSV bestand op uw computer om te importeren'
@@ -472,6 +472,7 @@ nl:
     SINGULARNAME: 'Permission Role Code'
   Permissions:
     PERMISSIONS_CATEGORY: 'Rollen en toegangsrechten'
+    UserPermissionsIntro: 'Assigning groups to this user will adjust the permissions they have. See the groups section for details of permissions on individual groups.'
   PhoneNumberField:
     VALIDATION: 'Voer een geldig telefoonnummer in'
   RelationComplexTableField.ss:
@@ -488,7 +489,7 @@ nl:
     LOGGEDOUT: 'U bent uitgelogd.  Als U weer wilt inloggen kunt U Uw gegevens hier beneden invoeren.'
     LOGIN: 'Meld aan'
     NOTEPAGESECURED: 'Deze pagina is beveiligd. Voer Uw gegevens in en U wordt automatisch doorgestuurd.'
-    NOTERESETLINKINVALID: '<p>De link om uw wachtwoord te kunnen wijzigen is niet meer geldig.</p><p>U kunt het <a href="{link1}">opnieuw proberen</a>  of uw wachtwoord aanpassen door <a href="{link2}">in te loggen</a>.</p>'
+    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: 'Voer Uw emailadres in en we zenden U een link waarmee U Uw wachtwoord opnieuw kunt aanmaken'
     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.'
@@ -502,7 +503,7 @@ nl:
     IMPORTGROUPS: Groepen
     IMPORTUSERS: 'Importeer gebruikers'
     MEMBERS: Leden
-    MENUTITLE: Beveiliging
+    MENUTITLE: Security
     MemberListCaution: 'Let op: Verwijderen van leden van deze lijst heeft als gevolg dat deze uit alle groepen en de database worden verwijderd'
     NEWGROUP: 'Nieuwe Groep'
     PERMISSIONS: Rechten
@@ -542,7 +543,7 @@ nl:
     VIEWNEXT: 'Bekijk volgende'
     VIEWPREVIOUS: 'Bekijk vorige'
   TimeField:
-    VALIDATEFORMAT: 'Vul een valide datum in ({format})'
+    VALIDATEFORMAT: 'Please enter a valid time format ({format})'
   ToggleField:
     LESS: minder
     MORE: meer
@@ -555,7 +556,7 @@ nl:
     DOEDIT: Bewaar
     DROPFILE: 'Bestand hiernaar toe slepen'
     DROPFILES: 'Sleep hier je bestanden'
-    Dimensions: Afmetingen
+    Dimensions: Dimensions
     EDIT: Edit
     EDITINFO: 'Bewerk dit bestand'
     FIELDNOTSET: 'Bestandsinformatie niet gevonden'
@@ -563,9 +564,9 @@ nl:
     FROMCOMPUTERINFO: 'Select from files'
     FROMFILES: 'Bestaande bestanden'
     HOTLINKINFO: 'Info: This image will be hotlinked. Please ensure you have permissions from the original site creator to do so.'
-    MAXNUMBEROFFILES: 'Het maximale aantal ({count}) bestanden is overschreven'
+    MAXNUMBEROFFILES: 'Max number of {count} file(s) exceeded.'
-    MAXNUMBEROFFILESSHORT: 'Maximaal {count} bestanden uploaden'
+    MAXNUMBEROFFILESSHORT: 'Can only upload {count} files'
-    REMOVE: Verwijder
+    REMOVE: Remove
     REMOVEERROR: 'Fout bij verwijderen'
     REMOVEINFO: 'Verwijder (ontkoppel) dit bestand, maar behoud het in bestandsopslag van de website.'
     STARTALL: 'Start alles'

lang/pa.yml

@@ -1,7 +1,6 @@
 pa:
   AssetAdmin:
-    ADDFILES: 'Add files'
+    ALLOWEDEXTS: 'Allowed extensions'
-    EditOrgMenu: 'Edit & organize'
     NEWFOLDER: NewFolder
   AssetTableField:
     CREATED: 'First uploaded'
@@ -72,7 +71,7 @@ pa:
     ACCESSALLINTERFACESHELP: 'Overrules more specific access settings.'
     SAVE: Save
   CMSProfileController:
-    MENUTITLE: CMSProfileController
+    MENUTITLE: 'My Profile'
   ChangePasswordEmail.ss:
     CHANGEPASSWORDTEXT1: 'ਤੁਸੀ ਆਪਣਾ ਪਾਸਵਰਡ ਬਦਲਿਆ ਖਾਤਰ'
     CHANGEPASSWORDTEXT2: 'You can now use the following credentials to log in:'
@@ -87,7 +86,7 @@ pa:
     SUCCESSADD2: 'Added {name}'
     SUCCESSEDIT: 'Saved %s %s %s'
   ComplexTableField.ss:
-    ADDITEM: 'Add %s'
+    ADDITEM: 'ਜੋੜ ੋ '
     NOITEMSFOUND: 'No items found'
     SORTASC: 'Sort ascending'
     SORTDESC: 'Sort descending'
@@ -181,7 +180,7 @@ pa:
     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: File
     FROMCOMPUTER: 'From your Computer'
     FROMFILESTORE: 'From the File Store'
     NOSOURCE: 'Please select a source file to attach'
@@ -258,7 +257,7 @@ pa:
     many_many_Members: 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>'
-    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>'
+    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'
     ResultUpdated: 'Updated %d groups'
@@ -348,6 +347,7 @@ pa:
     BUTTONLOGIN: 'ਲੋਗ ਇਨ'
     BUTTONLOGINOTHER: 'Log in as someone else'
     BUTTONLOSTPASSWORD: 'ਮੈਂ ਆਪਣਾ password ਗੁਆ ਿਲਆ ਹੈ।'
+    CANTEDIT: 'You don''t have permission to do that'
     CONFIRMNEWPASSWORD: 'Confirm New Password'
     CONFIRMPASSWORD: 'Confirm Password'
     DATEFORMAT: 'Date format'
@@ -367,7 +367,6 @@ pa:
     NEWPASSWORD: 'ਨਵਾਂ Password'
     PASSWORD: Password
     PLURALNAME: Members
-    PROFILESAVESUCCESS: 'Successfully saved.'
     REMEMBERME: 'ਮੈਂਨੰੂ ਅਗਲੀ ਵਾਰ ਯਾਦ ਰੱਖਣਾ'
     SINGULARNAME: Member
     SUBJECTPASSWORDCHANGED: 'ਤੁਹਾਡਾ ਪਾਸਵਰਡ ਬਦਲ ਗਆ ਹੈ।         '
@@ -410,7 +409,7 @@ pa:
     TWODIGITYEAR: 'Two-digit year'
   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>'
+    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'
     ResultNone: 'No changes'
@@ -422,6 +421,7 @@ pa:
   ModelAdmin:
     DELETE: Delete
     DELETEDRECORDS: 'Deleted {count} records.'
+    EMPTYBEFOREIMPORT: 'Clear Database before import'
     IMPORT: 'Import from CSV'
     IMPORTEDRECORDS: 'Imported {count} records.'
     NOCSVFILE: 'Please browse for a CSV file to import'
@@ -472,6 +472,7 @@ pa:
     SINGULARNAME: 'Permission Role Code'
   Permissions:
     PERMISSIONS_CATEGORY: 'Roles and access permissions'
+    UserPermissionsIntro: 'Assigning groups to this user will adjust the permissions they have. See the groups section for details of permissions on individual groups.'
   PhoneNumberField:
     VALIDATION: 'ਿਕ੍ਰਪਾ ਕਰਕੇ ਇੱਕ ਸਹੀ ਫ਼ੋਨ ਨੰਬਰ ਪਾਉ'
   RelationComplexTableField.ss:

lang/pl.yml

@@ -1,7 +1,6 @@
 pl:
   AssetAdmin:
-    ADDFILES: 'Dodaj pliki'
+    ALLOWEDEXTS: 'Allowed extensions'
-    EditOrgMenu: 'Edytuj i organizuj'
     NEWFOLDER: NowyFolder
   AssetTableField:
     CREATED: 'Po raz pierwszy wgrany'
@@ -23,9 +22,9 @@ pl:
     EDITINFO: 'Edytuj pliki'
     FILES: Pliki
     FROMCOMPUTER: 'Wybierz pliki z komputera'
-    FROMCOMPUTERINFO: 'Załaduj z komputera'
+    FROMCOMPUTERINFO: 'Załaduj z twojego komputera'
     TOTAL: Razem
-    TOUPLOAD: 'Choose files to upload...'
+    TOUPLOAD: 'Wybierz pliki do załadowania...'
     UPLOADINPROGRESS: 'Pliki są przesyłane... proszę czekać'
     UPLOADOR: LUB
   BBCodeParser:
@@ -60,35 +59,35 @@ pl:
     ERRORNOTADMIN: 'Ten użytkownik nie jest administratorem'
     ERRORNOTREC: 'Nie istnieje taki username/hasło'
   Boolean:
-    0: 'False'
+    0: Nie
     ANY: Jakikolwiek
-    1: 'True'
+    1: Tak
   CMSLoadingScreen.ss:
     LOADING: Wczytywanie...
-    REQUIREJS: 'CMS wymaga włączonego JavaScript.'
+    REQUIREJS: 'CMS wymaga włączonej obsługi JavaScript.'
   CMSMain:
     ACCESS: 'Dostęp do sekcji ''{title}'''
     ACCESSALLINTERFACES: 'Dostęp do wszystkich sekcji CMSa'
     ACCESSALLINTERFACESHELP: 'Nadpisuje bardziej specyficzne ustawienia dostępu.'
     SAVE: Zapisz
   CMSProfileController:
-    MENUTITLE: CMSProfileController
+    MENUTITLE: 'My Profile'
   ChangePasswordEmail.ss:
     CHANGEPASSWORDTEXT1: 'Zmieniłeś hasło na'
     CHANGEPASSWORDTEXT2: 'Teraz możesz używać następujących danych do logowania się:'
-    EMAIL: E-mail
+    EMAIL: Email
     HELLO: Cześć
     PASSWORD: Hasło
   CheckboxField:
-    - 'False'
+    - Nie
-    - 'True'
+    - Tak
   ComplexTableField:
     CLOSEPOPUP: 'Zamknij Okienko'
     SUCCESSADD2: 'Dodano {name}'
     SUCCESSEDIT: 'Zapisano %s %s %s'
   ComplexTableField.ss:
     ADDITEM: 'Dodaj %s'
-    NOITEMSFOUND: 'Nic nie znaleziono'
+    NOITEMSFOUND: 'Nie znaleziono żadnych elementów'
     SORTASC: 'Sortuj rosnąco'
     SORTDESC: 'Sortuj malejąco'
   ComplexTableField_popup.ss:
@@ -146,35 +145,35 @@ pl:
   File:
     AviType: 'AVI video file'
     Content: Zawartość
-    CssType: 'CSS file'
+    CssType: 'Plik CSS'
-    DmgType: 'Apple disk image'
+    DmgType: 'Obraz dysku Apple'
-    DocType: 'Word document'
+    DocType: 'Dokument Worda'
     Filename: 'Nazwa pliku'
-    GifType: 'GIF image - good for diagrams'
+    GifType: 'Obrazek GIF, dobry do diagramów'
     GzType: 'GZIP compressed file'
-    HtlType: 'HTML file'
+    HtlType: 'Plik HTML'
-    HtmlType: 'HTML file'
+    HtmlType: 'Plik HTML'
     INVALIDEXTENSION: 'Rozszerzenie niedozwolone (dozwolone: {extensions})'
     INVALIDEXTENSIONSHORT: 'Rozszerzenie niedozwolone'
-    IcoType: 'Icon image'
+    IcoType: Ikona
-    JpgType: 'JPEG image - good for photos'
+    JpgType: 'Obrazek JPEG, dobry do zdjęć'
-    JsType: 'Javascript file'
+    JsType: 'Plik JavaScript'
-    Mp3Type: 'MP3 audio file'
+    Mp3Type: 'Plik MP3'
     MpgType: 'MPEG video file'
     NOFILESIZE: 'Rozmiar pliku to zero bajtów.'
     NOVALIDUPLOAD: 'Plik nie został poprawnie przesłany'
     Name: Nazwa
     PLURALNAME: Pliki
-    PdfType: 'Adobe Acrobat PDF file'
+    PdfType: 'Plik Adobe Acrobat PDF'
-    PngType: 'PNG image - good general-purpose format'
+    PngType: 'Plik PNG, dobry do zastosowania w większości przypadków'
     SINGULARNAME: Plik
     TOOLARGE: 'Plik jest za duży, maksymalnie dozwolone jest {size}'
     TOOLARGESHORT: 'Rozmiar pliku przekracza {size}'
-    TiffType: 'Tagged image format'
+    TiffType: 'Plik TIFF'
     Title: Tytuł
     WavType: 'WAV audo file'
     XlsType: 'Excel spreadsheet'
-    ZipType: 'ZIP compressed file'
+    ZipType: 'Plik ZIP, skompresowany'
   FileIFrameField:
     ATTACH: 'Dołącz {type}'
     ATTACHONCESAVED: 'Element {type} może zostać dołączony dopiero po pierwszym zapisaniu rekordu.'
@@ -232,7 +231,7 @@ pl:
   GridFieldAction_Delete:
     DeletePermissionsFailure: 'Brak uprawnień do usuwania'
   GridFieldDetailForm:
-    CancelBtn: Cancel
+    CancelBtn: Anuluj
     Create: Stwórz
     Delete: Usuń
     DeletePermissionsFailure: 'Brak uprawnień do usuwania'
@@ -246,7 +245,7 @@ pl:
     DefaultGroupTitleAdministrators: Administratorzy
     DefaultGroupTitleContentAuthors: 'Autor treści'
     Description: Opis
-    GroupReminder: 'Jeśli wybierzesz nadrzędną grupę, ta grupa otrzyma wszystkie jej role'
+    GroupReminder: 'Jeśli wybierzesz nadrzędną grupę, obecna grupa otrzyma wszystkie jej role'
     Locked: 'Zablokowana?'
     NoRoles: 'Nie znaleziono ról'
     PLURALNAME: Grupy
@@ -258,7 +257,7 @@ pl:
     many_many_Members: Członkowie
   GroupImportForm:
     Help1: '<p>Zaimportuj użytkowników w <em>formacie CSV</em> (tekst rozdzielany przecinkami). <small><a href="#" class="toggle-advanced">Zaawansowane</a></small></p>'
-    Help2: "<div class=\"advanced\">\\n\\n<h4>Zaawansowane użycie</h4>\\n\\n<ul>\\n\\n<li>Dozwolone kolumny: <em>%s</em></li>\\n\\n<li>Istniejące grupy są dopasowywane poprzez ich unikalną wartość <em>Kod</em> i aktualizowane nowymi wartościami z zaimportowanego pliku.</li>\\n\\n<li>Można tworzyć hierarchie Grup za pomocą kolumny <em>KodNadrzędny</em>.</li>\\n\\n<li>Kody uprawnień mogą być przypisywane za pomocą kolumny <em>KodUprawnienia</em>. Istniejące kody uprawnień nie są usuwane.</li>\\n\\n</ul>\\n\\n</div>"
+    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: 'Stworzono grup: {count}'
     ResultDeleted: 'Usunięto grup: %d'
     ResultUpdated: 'Zaktualizowano grup: %d'
@@ -328,13 +327,13 @@ pl:
     PERMAGAIN: 'Zostałeś wylogowany z CMSa. Jeśli chcesz zalogować się ponownie, wpisz login i hasło poniżej.'
     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.'
+    PLEASESAVE: 'Proszę zapisać stronę. Ta strona nie mogła zostać uaktualniona, ponieważ nie została jeszcze zapisana.'
     PreviewButton: Podgląd
     REORGANISATIONSUCCESSFUL: 'Pomyślnie zreorganizowano drzewo serwisu.'
     SAVEDUP: Zapisano.
     VersionUnknown: nieznany
   LeftAndMain_Menu.ss:
-    Hello: Cześć
+    Hello: Witaj
     LOGOUT: 'Wyloguj się'
   LoginAttempt:
     Email: 'Adres E-mail'
@@ -348,6 +347,7 @@ pl:
     BUTTONLOGIN: Zaloguj
     BUTTONLOGINOTHER: 'Zaloguj jako ktoś inny'
     BUTTONLOSTPASSWORD: 'Zgubiłem hasło'
+    CANTEDIT: 'You don''t have permission to do that'
     CONFIRMNEWPASSWORD: 'Potwierdź nowe hasło'
     CONFIRMPASSWORD: 'Potwierdź hasło'
     DATEFORMAT: 'Format daty'
@@ -367,7 +367,6 @@ pl:
     NEWPASSWORD: 'Nowe hasło'
     PASSWORD: Hasło
     PLURALNAME: Członkowie
-    PROFILESAVESUCCESS: 'Poprawnie zapisano.'
     REMEMBERME: 'Zapamiętaj mnie?'
     SINGULARNAME: Członek
     SUBJECTPASSWORDCHANGED: 'Twoje hasło zostało zmienione'
@@ -410,18 +409,19 @@ pl:
     TWODIGITYEAR: 'Dwucyfrowy rok'
   MemberImportForm:
     Help1: '<p>Zaimportuj użytkowników w <em>formacie CSV</em> (tekst rozdzielany przecinkami). <small><a href="#" class="toggle-advanced">Zaawansowane</a></small></p>'
-    Help2: "<div class=\"advanced\">\\n<h4>Zaawansowane użycie</h4>\\n<ul>\\n<li>Dozwolone kolumny: <em>%s</em></li>\\n<li>Istniejący użytkownicy są dopasowani poprzez unikalną właściwość <em>Kod</em> i uaktualniani  nowymi wartościami z zaimportowanego pliku.</li>\\n<li>Grupy mogą być przypisane poprzez kolumnę <em>Grupy</em>. Grupy identyfikowane są poprzez unikalną właściwość  <em>Kod</em>, grupy mogą być oddzielone od siebie przecinkiem. Przypisania użytkowników do grup nie są usuwane.</li>\\n</ul>\\n</div>"
+    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: 'Stworzono członków: {count}'
     ResultDeleted: 'Usunięto %d użytkowników'
     ResultNone: 'Bez zmian'
     ResultUpdated: 'Zaktualizowano członków: {count}'
   MemberPassword:
-    PLURALNAME: 'Hasła użytkowników'
+    PLURALNAME: 'Hasła użytkownika'
     SINGULARNAME: 'Hasło użytkownika'
   MemberTableField: null
   ModelAdmin:
     DELETE: Usuń
     DELETEDRECORDS: 'Usunięto rekordów: {count}'
+    EMPTYBEFOREIMPORT: 'Clear Database before import'
     IMPORT: 'Import z CSV'
     IMPORTEDRECORDS: 'Zaimportowano rekordów: {count}'
     NOCSVFILE: 'Wybierz plik CSV do zaimportowania'
@@ -436,9 +436,9 @@ pl:
     IMPORTSPECTITLE: 'Specyfikacja %s'
   ModelAdmin_Tools.ss:
     FILTER: Filtr
-    IMPORT: Importuj
+    IMPORT: Import
   ModelSidebar.ss:
-    IMPORT_TAB_HEADER: Importuj
+    IMPORT_TAB_HEADER: Import
     SEARCHLISTINGS: Znajdź
   MoneyField:
     FIELDLABELAMOUNT: Ilość
@@ -449,35 +449,36 @@ pl:
     VALIDATION: '''{value}'' nie jest liczbą, to pole przyjmuje tylko liczby'
   Pagination:
     Page: Strona
-    View: Pokaż
+    View: Widok
   Permission:
     AdminGroup: Administrator
     CMS_ACCESS_CATEGORY: 'Dostęp do CMSa'
     FULLADMINRIGHTS: 'Pełne prawa administracyjne'
     FULLADMINRIGHTS_HELP: 'Zatwierdza i nadpisuje wszystkie istniejące uprawnienia'
-    PLURALNAME: Zezwolenia
+    PLURALNAME: Uprawnienia
-    SINGULARNAME: Zezwolenie
+    SINGULARNAME: Uprawnienie
   PermissionCheckboxSetField:
     AssignedTo: 'przypisany do "{title}"'
     FromGroup: 'odziedziczone z grupy "{title}"'
     FromRole: 'odziedziczone z roli "{title}"'
     FromRoleOnGroup: 'odziedziczone z roli "%s" w grupie "%s"'
   PermissionRole:
-    OnlyAdminCanApply: 'Only admin can apply'
+    OnlyAdminCanApply: 'Tylko administrator może to zastosować'
     PLURALNAME: Role
     SINGULARNAME: Rola
-    Title: Title
+    Title: Tytuł
   PermissionRoleCode:
-    PLURALNAME: 'Permission Role Cods'
+    PLURALNAME: 'Kod roli uprawnień'
-    SINGULARNAME: 'Permission Role Code'
+    SINGULARNAME: 'Kod roli uprawnienia'
   Permissions:
     PERMISSIONS_CATEGORY: 'Uprawnienia ról i dostępu'
+    UserPermissionsIntro: 'Assigning groups to this user will adjust the permissions they have. See the groups section for details of permissions on individual groups.'
   PhoneNumberField:
     VALIDATION: 'Wprowadź poprawny numer telefonu'
   RelationComplexTableField.ss:
     ADD: Dodaj
     CSVEXPORT: 'Eksportuj do CSV'
-    NOTFOUND: 'Nic nie znaleziono'
+    NOTFOUND: 'Nie znaleziono żadnych elementów'
   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'
@@ -530,7 +531,7 @@ pl:
     Print: Drukuj
     SELECT: 'Wybierz:'
   TableListField.ss:
-    NOITEMSFOUND: 'Nic nie znaleziono'
+    NOITEMSFOUND: 'Nie znaleziono żadnych elementów'
     SORTASC: 'Sortuj w porządku rosnącym'
     SORTDESC: 'Sortuj w porządku malejącym'
   TableListField_PageControls.ss:
@@ -562,7 +563,7 @@ pl:
     FROMCOMPUTER: 'Z komputera'
     FROMCOMPUTERINFO: 'Wybierz z plików'
     FROMFILES: 'Z plików'
-    HOTLINKINFO: 'Info: This image will be hotlinked. Please ensure you have permissions from the original site creator to do so.'
+    HOTLINKINFO: 'Informacja: Ten obrazek pochodzi z zewnętrznego serwisu. Upewnij się, że jego twórca pozwala korzystać z niego.'
     MAXNUMBEROFFILES: 'Osiągnięto maksymalną liczbę {count} plików.'
     MAXNUMBEROFFILESSHORT: 'Można wgrać tylko {count} plik(ów/i)'
     REMOVE: Usuń

lang/pt.yml

@@ -1,8 +1,7 @@
 pt:
   AssetAdmin:
-    ADDFILES: 'Add files'
+    ALLOWEDEXTS: 'Allowed extensions'
-    EditOrgMenu: 'Edit & organize'
+    NEWFOLDER: 'Nova pasta'
-    NEWFOLDER: NewFolder
   AssetTableField:
     CREATED: 'First uploaded'
     DIM: Dimensions
@@ -15,42 +14,42 @@ pt:
     TYPE: 'File type'
     URL: URL
   AssetUploadField:
-    ChooseFiles: 'Choose files'
+    ChooseFiles: 'Escolher ficheiros'
-    DRAGFILESHERE: 'Drag files here'
+    DRAGFILESHERE: 'Arrastar os ficheiros para aqui'
-    DROPAREA: 'Drop Area'
+    DROPAREA: 'Área de arraste'
     EDITALL: 'Edit all'
-    EDITANDORGANIZE: 'Edit & organize'
+    EDITANDORGANIZE: 'Editar e organizar'
     EDITINFO: 'Edit files'
-    FILES: Ficheiros
+    FILES: Files
-    FROMCOMPUTER: 'Choose files from your computer'
+    FROMCOMPUTER: 'Escolher ficheiros do seu computador'
     FROMCOMPUTERINFO: 'Upload from your computer'
     TOTAL: Total
     TOUPLOAD: 'Choose files to upload...'
     UPLOADINPROGRESS: 'Please wait… upload in progress'
-    UPLOADOR: OR
+    UPLOADOR: OU
   BBCodeParser:
     ALIGNEMENT: Alinhamento
     ALIGNEMENTEXAMPLE: 'Alinhado à direita'
     BOLD: 'Texto Negrito'
     BOLDEXAMPLE: Negrito
-    CODE: 'Code Block'
+    CODE: 'Bloco de código'
-    CODEDESCRIPTION: 'Unformatted code block'
+    CODEDESCRIPTION: 'Bloco de código não formatado'
-    CODEEXAMPLE: 'Code block'
+    CODEEXAMPLE: 'Bloco de código'
     COLORED: 'Texto colorido'
     COLOREDEXAMPLE: 'Texto azul'
     EMAILLINK: 'Email link'
-    EMAILLINKDESCRIPTION: 'Create link to an email address'
+    EMAILLINKDESCRIPTION: 'Criar link para o endereço de email'
-    IMAGE: Image
+    IMAGE: Imagem
-    IMAGEDESCRIPTION: 'Show an image in your post'
+    IMAGEDESCRIPTION: 'Apresentar imagem na sua publicação'
     ITALIC: 'Texto Itálico'
     ITALICEXAMPLE: Itálico
     LINK: 'Website link'
-    LINKDESCRIPTION: 'Link to another website or URL'
+    LINKDESCRIPTION: 'Link para outro site ou URL'
     STRUCK: 'Struck-out Text'
     STRUCKEXAMPLE: Struck-out
     UNDERLINE: 'Texto Sublinhado'
     UNDERLINEEXAMPLE: Sublinhado
-    UNORDERED: 'Unordered list'
+    UNORDERED: 'Lista não ordenada'
     UNORDEREDDESCRIPTION: 'Lista não ordenada'
     UNORDEREDEXAMPLE1: 'item não ordenado 1'
   BackLink_Button.ss:
@@ -60,9 +59,9 @@ pt:
     ERRORNOTADMIN: 'Esse utilizador não é um administrador.'
     ERRORNOTREC: 'Esse nome de utilizador / password não é válido'
   Boolean:
-    0: 'False'
+    0: Não
     ANY: Qualquer
-    1: 'True'
+    1: Sim
   CMSLoadingScreen.ss:
     LOADING: Loading...
     REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
@@ -72,7 +71,7 @@ pt:
     ACCESSALLINTERFACESHELP: 'Overrules more specific access settings.'
     SAVE: Guardar
   CMSProfileController:
-    MENUTITLE: CMSProfileController
+    MENUTITLE: 'My Profile'
   ChangePasswordEmail.ss:
     CHANGEPASSWORDTEXT1: 'Modificou a sua password para'
     CHANGEPASSWORDTEXT2: 'Pode utilizar agora as seguintes credenciais para se autenticar:'
@@ -80,14 +79,14 @@ pt:
     HELLO: Olá
     PASSWORD: Palavra-chave
   CheckboxField:
-    - 'False'
+    - Não
-    - 'True'
+    - Sim
   ComplexTableField:
     CLOSEPOPUP: 'Fechar Janela'
     SUCCESSADD2: 'Added {name}'
     SUCCESSEDIT: 'Guardado  %s %s %s'
   ComplexTableField.ss:
-    ADDITEM: 'Add %s'
+    ADDITEM: 'Adicionar %s'
     NOITEMSFOUND: 'No items found'
     SORTASC: 'Ordenar ascendente'
     SORTDESC: 'Ordenar descendente'
@@ -152,7 +151,7 @@ pt:
     Filename: 'Nome do ficheiro'
     GifType: 'GIF image - good for diagrams'
     GzType: 'GZIP compressed file'
-    HtlType: 'HTML file'
+    HtlType: 'Ficheiro HTML'
     HtmlType: 'HTML file'
     INVALIDEXTENSION: 'Extension is not allowed (valid: {extensions})'
     INVALIDEXTENSIONSHORT: 'Extension is not allowed'
@@ -174,7 +173,7 @@ pt:
     Title: Título
     WavType: 'WAV audo file'
     XlsType: 'Excel spreadsheet'
-    ZipType: 'ZIP compressed file'
+    ZipType: 'Ficheiro compactado (ZIP)'
   FileIFrameField:
     ATTACH: 'Attach {type}'
     ATTACHONCESAVED: '{type}s can be attached once you have saved the record for the first time.'
@@ -212,27 +211,27 @@ pt:
     NONE: nenhum
   GridAction:
     DELETE_DESCRIPTION: Delete
-    Delete: Delete
+    Delete: Apagar
     UnlinkRelation: Unlink
   GridField:
     Add: 'Add {name}'
-    Filter: Filter
+    Filter: Filtrar
     FilterBy: 'Filter by '
-    Find: Find
+    Find: Procurar
     LEVELUP: 'Level up'
-    LinkExisting: 'Link Existing'
+    LinkExisting: 'Link existente'
-    NewRecord: 'New %s'
+    NewRecord: 'Novo %s'
-    NoItemsFound: 'No items found'
+    NoItemsFound: 'Não foram encontrados elementos'
-    PRINTEDAT: 'Printed at'
+    PRINTEDAT: 'Impresso em'
-    PRINTEDBY: 'Printed by'
+    PRINTEDBY: 'Impresso por'
     PlaceHolder: 'Find {type}'
     PlaceHolderWithLabels: 'Find {type} by {name}'
-    RelationSearch: 'Relation search'
+    RelationSearch: 'Pesquisa relacionada'
-    ResetFilter: Reset
+    ResetFilter: Redefinir
   GridFieldAction_Delete:
-    DeletePermissionsFailure: 'No delete permissions'
+    DeletePermissionsFailure: 'Não tem permissões para apagar'
   GridFieldDetailForm:
-    CancelBtn: Cancel
+    CancelBtn: Cancelar
     Create: Create
     Delete: Delete
     DeletePermissionsFailure: 'No delete permissions'
@@ -241,34 +240,34 @@ pt:
     Saved: 'Saved %s %s'
   GridFieldItemEditView.ss: null
   Group:
-    AddRole: 'Add a role for this group'
+    AddRole: 'Adicionar regra a este grupo'
     Code: 'Grupo de código'
     DefaultGroupTitleAdministrators: Administradores
     DefaultGroupTitleContentAuthors: 'Autores de Conteúdo'
     Description: Descrição
-    GroupReminder: 'If you choose a parent group, this group will take all it''s roles'
+    GroupReminder: 'Se escolher um grupo associado, arrecadará todas as regras deste'
     Locked: 'Fechado?'
-    NoRoles: 'No roles found'
+    NoRoles: 'Não foram encontradas regras'
     PLURALNAME: Groups
     Parent: 'Grupo pai'
-    RolesAddEditLink: 'Manage roles'
+    RolesAddEditLink: 'Gerir regras'
     SINGULARNAME: Group
     Sort: 'Ordem de ordenação'
     has_many_Permissions: Permissões
     many_many_Members: Membros
   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>'
+    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: 'Apagados %d grupos'
     ResultUpdated: 'Updated %d groups'
   Hierarchy:
     InfiniteLoopNotAllowed: 'Infinite loop found within the "{type}" hierarchy. Please change the parent to resolve this'
   HtmlEditorField:
     ADDURL: 'Add URL'
     ADJUSTDETAILSDIMENSIONS: 'Details &amp; dimensions'
-    ANCHORVALUE: Anchor
+    ANCHORVALUE: Âncora
-    BUTTONINSERT: Insert
+    BUTTONINSERT: Inserir
     BUTTONINSERTLINK: 'Inserir link'
     BUTTONREMOVELINK: 'Remover link'
     BUTTONUpdate: Update
@@ -276,14 +275,14 @@ pt:
     CSSCLASS: 'Alinhamento / estilo'
     CSSCLASSCENTER: 'Centrado sozinho.'
     CSSCLASSLEFT: 'Na esquerda, com texto envolvido.'
-    CSSCLASSLEFTALONE: 'On the left, on its own.'
+    CSSCLASSLEFTALONE: 'No lado esquerdo, por si só.'
     CSSCLASSRIGHT: 'Na direita, com texto envolvido.'
-    DETAILS: Details
+    DETAILS: Detalhes
     EMAIL: 'Endereço email'
     FILE: Ficheiro
     FOLDER: Pasta
-    FROMCMS: 'From the CMS'
+    FROMCMS: 'A partir do CMS'
-    FROMCOMPUTER: 'From your computer'
+    FROMCOMPUTER: 'Do seu computador'
     FROMWEB: 'From the web'
     FindInFolder: 'Find in Folder'
     IMAGEALT: 'Alternative text (alt)'
@@ -297,7 +296,7 @@ pt:
     IMAGEWIDTHPX: Largura
     INSERTMEDIA: 'Insert Media'
     LINK: 'Inserir/editar link no texto seleccionado'
-    LINKANCHOR: 'Anchor on this page'
+    LINKANCHOR: 'Âncora nesta página'
     LINKDESCR: 'Descrição do link'
     LINKEMAIL: 'Endereço email'
     LINKEXTERNAL: 'Outro site'
@@ -313,7 +312,7 @@ pt:
     PLURALNAME: Files
     SINGULARNAME: File
   ImageField:
-    IMAGE: Image
+    IMAGE: Imagem
   Image_Cached:
     PLURALNAME: Files
     SINGULARNAME: File
@@ -322,17 +321,17 @@ pt:
   LeftAndMain:
     CANT_REORGANISE: 'You do not have permission to alter Top level pages. Your change was not saved.'
     DELETED: Deleted.
-    DropdownBatchActionsDefault: Actions
+    DropdownBatchActionsDefault: Ações
-    HELP: Help
+    HELP: Ajuda
-    PAGETYPE: 'Page type: '
+    PAGETYPE: 'Tipo de página: '
-    PERMAGAIN: 'You have been logged out of the CMS.  If you would like to log in again, enter a username and password below.'
+    PERMAGAIN: 'Saiu do CMS. Se se deseja autenticar novamente insira as suas credenciais abaixo.'
     PERMALREADY: 'I''m sorry, but you can''t access that part of the CMS.  If you want to log in as someone else, do so below'
     PERMDEFAULT: 'Please choose an authentication method and enter your credentials to access the CMS.'
     PLEASESAVE: 'Please Save Page: This page could not be upated because it hasn''t been saved yet.'
     PreviewButton: Preview
     REORGANISATIONSUCCESSFUL: 'Reorganised the site tree successfully.'
     SAVEDUP: Saved.
-    VersionUnknown: unknown
+    VersionUnknown: desconhecido
   LeftAndMain_Menu.ss:
     Hello: Hi
     LOGOUT: 'Log out'
@@ -348,11 +347,12 @@ pt:
     BUTTONLOGIN: Entrar
     BUTTONLOGINOTHER: 'Autenticar-se com outras credenciais'
     BUTTONLOSTPASSWORD: 'Recuperar Password'
+    CANTEDIT: 'You don''t have permission to do that'
     CONFIRMNEWPASSWORD: 'Confirmar Nova Password'
     CONFIRMPASSWORD: 'Confirmar Password'
     DATEFORMAT: 'Date format'
     DefaultAdminFirstname: 'Administrador por Omissão'
-    DefaultDateTime: default
+    DefaultDateTime: 'por omissão'
     EMAIL: Email
     EMPTYNEWPASSWORD: 'A password não pode ser vazia, tente novamente.'
     ENTEREMAIL: 'Por favor introduza um endereço de email para obter uma ligação para o reinício da palavra-chave. '
@@ -367,7 +367,6 @@ pt:
     NEWPASSWORD: 'Nova Password'
     PASSWORD: Password
     PLURALNAME: Membros
-    PROFILESAVESUCCESS: 'Guardado com Sucesso'
     REMEMBERME: 'Lembrar-se de mim?'
     SINGULARNAME: Membro
     SUBJECTPASSWORDCHANGED: 'A sua password foi alterada'
@@ -389,7 +388,7 @@ pt:
     TITLE: 'Email e Password'
   MemberDatetimeOptionsetField:
     AMORPM: 'AM (Ante meridiem) or PM (Post meridiem)'
-    'APPLY FILTER': 'Apply Filter'
+    'APPLY FILTER': 'Aplicar filtros'
     Custom: Custom
     DATEFORMATBAD: 'Date format is invalid'
     DAYNOLEADING: 'Day of month without leading zero'
@@ -410,10 +409,10 @@ pt:
     TWODIGITYEAR: 'Two-digit year'
   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>'
+    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: 'Apagados %d utilizadores'
-    ResultNone: 'No changes'
+    ResultNone: 'Sem alterações'
     ResultUpdated: 'Updated {count} members'
   MemberPassword:
     PLURALNAME: 'Member Passwords'
@@ -422,6 +421,7 @@ pt:
   ModelAdmin:
     DELETE: Delete
     DELETEDRECORDS: 'Deleted {count} records.'
+    EMPTYBEFOREIMPORT: 'Clear Database before import'
     IMPORT: 'Import from CSV'
     IMPORTEDRECORDS: 'Imported {count} records.'
     NOCSVFILE: 'Please browse for a CSV file to import'
@@ -441,8 +441,8 @@ pt:
     IMPORT_TAB_HEADER: Import
     SEARCHLISTINGS: Search
   MoneyField:
-    FIELDLABELAMOUNT: Amount
+    FIELDLABELAMOUNT: Quantidade
-    FIELDLABELCURRENCY: Currency
+    FIELDLABELCURRENCY: Moeda
   NullableField:
     IsNullLabel: 'é Vazio'
   NumericField:
@@ -466,12 +466,13 @@ pt:
     OnlyAdminCanApply: 'Only admin can apply'
     PLURALNAME: Roles
     SINGULARNAME: Role
-    Title: Title
+    Title: Título
   PermissionRoleCode:
     PLURALNAME: 'Permission Role Cods'
     SINGULARNAME: 'Permission Role Code'
   Permissions:
     PERMISSIONS_CATEGORY: 'Regras e permissões de acesso'
+    UserPermissionsIntro: 'Assigning groups to this user will adjust the permissions they have. See the groups section for details of permissions on individual groups.'
   PhoneNumberField:
     VALIDATION: 'Por favor insira um número de telefone válido'
   RelationComplexTableField.ss:
@@ -494,22 +495,22 @@ pt:
     PASSWORDSENTTEXT: 'Thank you! A reset link has been sent to ''{email}'', provided an account exists for this email address.'
   SecurityAdmin:
     ACCESS_HELP: 'Allow viewing, adding and editing users, as well as assigning permissions and roles to them.'
-    APPLY_ROLES: 'Apply roles to groups'
+    APPLY_ROLES: 'Aplicar regras a grupos'
     APPLY_ROLES_HELP: 'Ability to edit the roles assigned to a group. Requires the "Access to ''Users'' section" permission.'
-    EDITPERMISSIONS: 'Manage permissions for groups'
+    EDITPERMISSIONS: 'Gerir permissões de grupos'
     EDITPERMISSIONS_HELP: 'Ability to edit Permissions and IP Addresses for a group. Requires the "Access to ''Security'' section" permission.'
     GROUPNAME: 'Nome do Grupo'
-    IMPORTGROUPS: 'Import groups'
+    IMPORTGROUPS: 'Importar grupos'
-    IMPORTUSERS: 'Import users'
+    IMPORTUSERS: 'Importar utilizadores'
     MEMBERS: Membros
     MENUTITLE: Security
     MemberListCaution: 'Caution: Removing members from this list will remove them from all groups and the database'
-    NEWGROUP: 'New Group'
+    NEWGROUP: 'Novo grupo'
     PERMISSIONS: Permissões
     ROLES: Regras
     ROLESDESCRIPTION: 'Roles are predefined sets of permissions, and can be assigned to groups.<br />They are inherited from parent groups if required.'
-    TABROLES: Roles
+    TABROLES: Regras
-    Users: Users
+    Users: Utilizadores
   SecurityAdmin_MemberImportForm:
     BtnImport: 'Import from CSV'
     FileFieldLabel: 'CSV File <small>(Allowed extensions: *.csv)</small>'
@@ -547,29 +548,29 @@ pt:
     LESS: menos
     MORE: mais
   UploadField:
-    ATTACHFILE: 'Attach a file'
+    ATTACHFILE: 'Adicionar um ficheiro'
-    ATTACHFILES: 'Attach files'
+    ATTACHFILES: 'Adicionar ficheiros'
-    AttachFile: 'Attach file(s)'
+    AttachFile: 'Adicionar ficheiro(s)'
     DELETE: 'Delete from files'
-    DELETEINFO: 'Permanently delete this file from the file store'
+    DELETEINFO: 'Remover permanentemente este ficheiro do sistema'
-    DOEDIT: Save
+    DOEDIT: Guardar
-    DROPFILE: 'drop a file'
+    DROPFILE: 'arrastar um ficheiro'
-    DROPFILES: 'drop files'
+    DROPFILES: 'arrastar ficheiros'
     Dimensions: Dimensions
     EDIT: Edit
-    EDITINFO: 'Edit this file'
+    EDITINFO: 'Editar este ficheiro'
-    FIELDNOTSET: 'File information not found'
+    FIELDNOTSET: 'Informação do ficheiro não encontrada'
-    FROMCOMPUTER: 'From your computer'
+    FROMCOMPUTER: 'Do computador'
     FROMCOMPUTERINFO: 'Select from files'
-    FROMFILES: 'From files'
+    FROMFILES: 'De ficheiros'
     HOTLINKINFO: 'Info: This image will be hotlinked. Please ensure you have permissions from the original site creator to do so.'
     MAXNUMBEROFFILES: 'Max number of {count} file(s) exceeded.'
     MAXNUMBEROFFILESSHORT: 'Can only upload {count} files'
     REMOVE: Remove
-    REMOVEERROR: 'Error removing file'
+    REMOVEERROR: 'Erro ao mover o ficheiro'
-    REMOVEINFO: 'Remove this file from here, but do not delete it from the file store'
+    REMOVEINFO: 'Remover este ficheiro daqui, mas não apaga do sistema'
-    STARTALL: 'Start all'
+    STARTALL: 'Iniciar todos'
     STARTALLINFO: 'Start all uploads'
-    Saved: Saved
+    Saved: Guardado
   Versioned:
     has_many_Versions: Versões

lang/pt_BR.yml

@@ -1,7 +1,6 @@
 pt_BR:
   AssetAdmin:
-    ADDFILES: 'Add files'
+    ALLOWEDEXTS: 'Allowed extensions'
-    EditOrgMenu: 'Edit & organize'
     NEWFOLDER: 'Nova Pasta'
   AssetTableField:
     CREATED: 'Primeiro upload'
@@ -21,7 +20,7 @@ pt_BR:
     EDITALL: 'Edit all'
     EDITANDORGANIZE: 'Edit & organize'
     EDITINFO: 'Edit files'
-    FILES: Arquivos
+    FILES: Files
     FROMCOMPUTER: 'Choose files from your computer'
     FROMCOMPUTERINFO: 'Upload from your computer'
     TOTAL: Total
@@ -72,7 +71,7 @@ pt_BR:
     ACCESSALLINTERFACESHELP: 'Overrules more specific access settings.'
     SAVE: Salvar
   CMSProfileController:
-    MENUTITLE: CMSProfileController
+    MENUTITLE: 'My Profile'
   ChangePasswordEmail.ss:
     CHANGEPASSWORDTEXT1: 'Você alterou sua senha para'
     CHANGEPASSWORDTEXT2: 'Agora, você pode usar as seguintes credenciais para realizar o login:'
@@ -87,7 +86,7 @@ pt_BR:
     SUCCESSADD2: 'Added {name}'
     SUCCESSEDIT: '%s %s %s salvo(s)'
   ComplexTableField.ss:
-    ADDITEM: 'Add %s'
+    ADDITEM: 'Incluir %s'
     NOITEMSFOUND: 'No items found'
     SORTASC: 'Ordenar ascendente'
     SORTDESC: 'Ordenar descendente'
@@ -181,7 +180,7 @@ pt_BR:
     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: Arquivo
+    FILE: File
     FROMCOMPUTER: 'From your Computer'
     FROMFILESTORE: 'From the File Store'
     NOSOURCE: 'Please select a source file to attach'
@@ -234,7 +233,7 @@ pt_BR:
   GridFieldDetailForm:
     CancelBtn: Cancel
     Create: Create
-    Delete: Excluir
+    Delete: Delete
     DeletePermissionsFailure: 'No delete permissions'
     Deleted: 'Deleted %s %s'
     Save: Save
@@ -258,7 +257,7 @@ pt_BR:
     many_many_Members: Membros
   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>'
+    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'
     ResultUpdated: 'Updated %d groups'
@@ -348,6 +347,7 @@ pt_BR:
     BUTTONLOGIN: Entrar
     BUTTONLOGINOTHER: 'Entrar com outro usuário'
     BUTTONLOSTPASSWORD: 'Esqueci minha senha'
+    CANTEDIT: 'You don''t have permission to do that'
     CONFIRMNEWPASSWORD: 'Confirme Nova Senha'
     CONFIRMPASSWORD: 'Confirme Senha'
     DATEFORMAT: 'Date format'
@@ -367,7 +367,6 @@ pt_BR:
     NEWPASSWORD: 'Nova Senha'
     PASSWORD: Senha
     PLURALNAME: Membros
-    PROFILESAVESUCCESS: 'Salvo com sucesso.'
     REMEMBERME: 'Lembrar de mim'
     SINGULARNAME: Membro
     SUBJECTPASSWORDCHANGED: 'Sua senha foi alterada'
@@ -410,7 +409,7 @@ pt_BR:
     TWODIGITYEAR: 'Two-digit year'
   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>'
+    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'
     ResultNone: 'No changes'
@@ -422,6 +421,7 @@ pt_BR:
   ModelAdmin:
     DELETE: Excluir
     DELETEDRECORDS: 'Deleted {count} records.'
+    EMPTYBEFOREIMPORT: 'Clear Database before import'
     IMPORT: 'importar do CSV'
     IMPORTEDRECORDS: 'Imported {count} records.'
     NOCSVFILE: 'Por favor, localize um arquivo CSV para importar'
@@ -472,6 +472,7 @@ pt_BR:
     SINGULARNAME: 'Permission Role Code'
   Permissions:
     PERMISSIONS_CATEGORY: 'Roles and access permissions'
+    UserPermissionsIntro: 'Assigning groups to this user will adjust the permissions they have. See the groups section for details of permissions on individual groups.'
   PhoneNumberField:
     VALIDATION: 'Por favor digite um número de telefone válido'
   RelationComplexTableField.ss:

lang/ro.yml

@@ -1,7 +1,6 @@
 ro:
   AssetAdmin:
-    ADDFILES: 'Add files'
+    ALLOWEDEXTS: 'Allowed extensions'
-    EditOrgMenu: 'Edit & organize'
     NEWFOLDER: NewFolder
   AssetTableField:
     CREATED: 'First uploaded'
@@ -21,7 +20,7 @@ ro:
     EDITALL: 'Edit all'
     EDITANDORGANIZE: 'Edit & organize'
     EDITINFO: 'Edit files'
-    FILES: Fisiere
+    FILES: Files
     FROMCOMPUTER: 'Choose files from your computer'
     FROMCOMPUTERINFO: 'Upload from your computer'
     TOTAL: Total
@@ -72,7 +71,7 @@ ro:
     ACCESSALLINTERFACESHELP: 'Overrules more specific access settings.'
     SAVE: Save
   CMSProfileController:
-    MENUTITLE: CMSProfileController
+    MENUTITLE: 'My Profile'
   ChangePasswordEmail.ss:
     CHANGEPASSWORDTEXT1: 'Ti-ai schimbat parola in'
     CHANGEPASSWORDTEXT2: 'You can now use the following credentials to log in:'
@@ -87,7 +86,7 @@ ro:
     SUCCESSADD2: 'Added {name}'
     SUCCESSEDIT: 'Saved %s %s %s'
   ComplexTableField.ss:
-    ADDITEM: 'Add %s'
+    ADDITEM: Adaugă
     NOITEMSFOUND: 'No items found'
     SORTASC: 'Sortează ascendent'
     SORTDESC: 'Sortează descendent'
@@ -181,7 +180,7 @@ ro:
     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: Fisier
+    FILE: File
     FROMCOMPUTER: 'From your Computer'
     FROMFILESTORE: 'From the File Store'
     NOSOURCE: 'Please select a source file to attach'
@@ -258,7 +257,7 @@ ro:
     many_many_Members: Membri
   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>'
+    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'
     ResultUpdated: 'Updated %d groups'
@@ -348,6 +347,7 @@ ro:
     BUTTONLOGIN: Autentificare
     BUTTONLOGINOTHER: 'Log in as someone else'
     BUTTONLOSTPASSWORD: 'Am uitat parola'
+    CANTEDIT: 'You don''t have permission to do that'
     CONFIRMNEWPASSWORD: 'Confirmati noua parola'
     CONFIRMPASSWORD: 'Confirmati parola'
     DATEFORMAT: 'Date format'
@@ -367,7 +367,6 @@ ro:
     NEWPASSWORD: 'Noua parola'
     PASSWORD: Parola
     PLURALNAME: Membri
-    PROFILESAVESUCCESS: 'Successfully saved.'
     REMEMBERME: 'Tine-ma minte?'
     SINGULARNAME: Membru
     SUBJECTPASSWORDCHANGED: 'Parola dumneavoastra a fost schimbata'
@@ -410,7 +409,7 @@ ro:
     TWODIGITYEAR: 'Two-digit year'
   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>'
+    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'
     ResultNone: 'No changes'
@@ -422,6 +421,7 @@ ro:
   ModelAdmin:
     DELETE: Delete
     DELETEDRECORDS: 'Deleted {count} records.'
+    EMPTYBEFOREIMPORT: 'Clear Database before import'
     IMPORT: 'Import from CSV'
     IMPORTEDRECORDS: 'Imported {count} records.'
     NOCSVFILE: 'Please browse for a CSV file to import'
@@ -472,6 +472,7 @@ ro:
     SINGULARNAME: 'Permission Role Code'
   Permissions:
     PERMISSIONS_CATEGORY: 'Roles and access permissions'
+    UserPermissionsIntro: 'Assigning groups to this user will adjust the permissions they have. See the groups section for details of permissions on individual groups.'
   PhoneNumberField:
     VALIDATION: 'Please enter a valid phone number'
   RelationComplexTableField.ss:

lang/ru.yml

@@ -1,7 +1,6 @@
 ru:
   AssetAdmin:
-    ADDFILES: 'Добавить файлы'
+    ALLOWEDEXTS: 'Allowed extensions'
-    EditOrgMenu: 'Edit & organize'
     NEWFOLDER: 'Новая папка'
   AssetTableField:
     CREATED: 'Первая загрузка'
@@ -15,16 +14,16 @@ ru:
     TYPE: Тип
     URL: URL
   AssetUploadField:
-    ChooseFiles: 'Выбрать файлы'
+    ChooseFiles: 'Выберите файлы'
     DRAGFILESHERE: 'Перетащите файлы сюда'
     DROPAREA: Контейнер
     EDITALL: 'Редактировать все'
-    EDITANDORGANIZE: 'Edit & organize'
+    EDITANDORGANIZE: 'Редактирование и систематизация'
     EDITINFO: 'Редактировать файлы'
     FILES: Файлы
-    FROMCOMPUTER: 'Выбрать файлы с диска вашего компьютера'
+    FROMCOMPUTER: 'Выберите файлы с диска вашего компьютера'
     FROMCOMPUTERINFO: 'Загрузить с диска вашего компьютера'
-    TOTAL: 'Всего:'
+    TOTAL: Всего
     TOUPLOAD: 'Выберите файлы для загрузки...'
     UPLOADINPROGRESS: 'Идет загрузка... Пожалуйста, подождите'
     UPLOADOR: ИЛИ
@@ -61,7 +60,7 @@ ru:
     ERRORNOTREC: 'Такое имя пользователя или пароль не существует'
   Boolean:
     0: 'False'
-    ANY: Any
+    ANY: Все
     1: 'True'
   CMSLoadingScreen.ss:
     LOADING: 'Идет загрузка...'
@@ -69,10 +68,10 @@ ru:
   CMSMain:
     ACCESS: 'Доступ к разделу ''{title}'''
     ACCESSALLINTERFACES: 'Доступ ко всему интерфейсу CMS'
-    ACCESSALLINTERFACESHELP: 'Overrules more specific access settings.'
+    ACCESSALLINTERFACESHELP: 'Отменяет индивидуальные настройки прав доступа.'
     SAVE: Сохранить
   CMSProfileController:
-    MENUTITLE: CMSProfileController
+    MENUTITLE: 'Мой профиль'
   ChangePasswordEmail.ss:
     CHANGEPASSWORDTEXT1: 'Вы изменили свой пароль на'
     CHANGEPASSWORDTEXT2: 'Для того, чтобы войти, используйте сейчас следующие учетные данные:'
@@ -84,7 +83,7 @@ ru:
     - 'True'
   ComplexTableField:
     CLOSEPOPUP: 'Закрыть всплывающее окно'
-    SUCCESSADD2: 'Добавлено {name}'
+    SUCCESSADD2: '{name} добавлено'
     SUCCESSEDIT: 'Сохранено %s %s %s'
   ComplexTableField.ss:
     ADDITEM: 'Добавить %s'
@@ -128,8 +127,8 @@ ru:
     NOTSET: 'не установлено'
     TODAY: сегодня
     VALIDDATEFORMAT2: 'Пожалуйста, задайте верный формат даты ({format})'
-    VALIDDATEMAXDATE: 'Your date has to be older or matching the maximum allowed date ({date})'
+    VALIDDATEMAXDATE: 'Требуется значение даты, совпадающее с максимальным ({date}) или более старое'
-    VALIDDATEMINDATE: 'Your date has to be newer or matching the minimum allowed date ({date})'
+    VALIDDATEMINDATE: 'Требуется значение даты, совпадающее с минимальным ({date}) или более новое'
   DatetimeField:
     NOTSET: 'Не задано'
   Director:
@@ -139,8 +138,8 @@ ru:
   EmailField:
     VALIDATION: 'Пожалуйста, задайте адрес email.'
   Email_BounceRecord:
-    PLURALNAME: 'Email Bounce Records'
+    PLURALNAME: 'Записи о недоставленных сообщениях'
-    SINGULARNAME: 'Email Bounce Record'
+    SINGULARNAME: 'Запись о недоставленном сообщении'
   Enum:
     ANY: Любой
   File:
@@ -162,7 +161,7 @@ ru:
     Mp3Type: 'Аудиофайл MP3'
     MpgType: 'Видеофайл MPEG'
     NOFILESIZE: 'Размер файла 0 байт.'
-    NOVALIDUPLOAD: 'File is not a valid upload'
+    NOVALIDUPLOAD: 'Недействительный файл для загрузки'
     Name: Название
     PLURALNAME: Файлы
     PdfType: 'Файл Adobe Acrobat PDF'
@@ -178,7 +177,7 @@ ru:
   FileIFrameField:
     ATTACH: 'Прикрепить {type}'
     ATTACHONCESAVED: 'Вы сможете прикрепить {type}s после первого сохранения записи.'
-    ATTACHONCESAVED2: 'Files can be attached once you have saved the record for the first time.'
+    ATTACHONCESAVED2: 'Вы сможете прикрепитьфайлы после первого сохранения записи.'
     DELETE: 'Удалить {type}'
     DISALLOWEDFILETYPE: 'Загрузка этого типа файла не допускается'
     FILE: Файл
@@ -189,7 +188,7 @@ ru:
   FileIFrameField_iframe.ss:
     TITLE: 'Iframe загрузки изображений'
   Filesystem:
-    SYNCRESULTS: 'Синхронизация завершена; создано элементов: {createdcount}, удалено элементов: {deletedcount}'
+    SYNCRESULTS: 'Синхронизация завершена: {createdcount} элементов создано, {deletedcount} элементов удалено'
   Folder:
     PLURALNAME: Папки
     SINGULARNAME: Папка
@@ -200,12 +199,12 @@ ru:
     TEXT3: для
   Form:
     FIELDISREQUIRED: 'Поле %s является обязательным'
-    SubmitBtnLabel: Go
+    SubmitBtnLabel: Выбрать
     VALIDATIONCREDITNUMBER: 'Пожалуйста, убедитесь, что номер кредитной карты {number} задан правильно'
     VALIDATIONNOTUNIQUE: 'Введенное значение не уникально'
     VALIDATIONPASSWORDSDONTMATCH: 'Пароли не совпадают'
     VALIDATIONPASSWORDSNOTEMPTY: 'Пароли не могут быть пустыми'
-    VALIDATIONSTRONGPASSWORD: 'Пароль должен содержать как минимум одну цифру и один буквенно-цифровой символ.'
+    VALIDATIONSTRONGPASSWORD: 'Пароль должен содержать как минимум одну цифру и один буквенно-числовой символ.'
     VALIDATOR: Валидатор
     VALIDCURRENCY: 'Пожалуйста, укажите валюту правильно'
   FormField:
@@ -213,15 +212,15 @@ ru:
   GridAction:
     DELETE_DESCRIPTION: Удалить
     Delete: Удалить
-    UnlinkRelation: Unlink
+    UnlinkRelation: 'Отменить связь'
   GridField:
     Add: 'Добавить {name}'
     Filter: Фильтр
-    FilterBy: 'Фильтровать по'
+    FilterBy: 'Фильтр по'
     Find: Найти
     LEVELUP: 'Уровень выше'
-    LinkExisting: 'Link Existing'
+    LinkExisting: Связать
-    NewRecord: 'Новый %s'
+    NewRecord: 'Новый(-ая) %s'
     NoItemsFound: 'Элементов не найдено'
     PRINTEDAT: 'Когда распечатано:'
     PRINTEDBY: 'Кем распечатано:'
@@ -232,7 +231,7 @@ ru:
   GridFieldAction_Delete:
     DeletePermissionsFailure: 'Нет прав на удаление'
   GridFieldDetailForm:
-    CancelBtn: Cancel
+    CancelBtn: Отмена
     Create: Создать
     Delete: Удалить
     DeletePermissionsFailure: 'Нет прав на удаление'
@@ -244,9 +243,9 @@ ru:
     AddRole: 'Добавить роль для этой группы'
     Code: 'Код группы'
     DefaultGroupTitleAdministrators: Администраторы
-    DefaultGroupTitleContentAuthors: Авторы
+    DefaultGroupTitleContentAuthors: 'Авторы содержимого'
     Description: Описание
-    GroupReminder: 'If you choose a parent group, this group will take all it''s roles'
+    GroupReminder: 'При назначении группы верхнего уровня все роли будут переняты из нее'
     Locked: 'Блокировано?'
     NoRoles: 'Ролей не найдено'
     PLURALNAME: Группы
@@ -257,10 +256,10 @@ ru:
     has_many_Permissions: 'Права групп пользователей'
     many_many_Members: 'Члены группы'
   GroupImportForm:
-    Help1: '<p>Импорт групп в формате <em>CSV</em> (comma-separated values). <small><a href="#" class="toggle-advanced">Показать подробности</a></small></p>'
+    Help1: '<p>Импорт одной или нескольких групп в формате <em>CSV</em> (comma-separated values). <small><a href="#" class="toggle-advanced">Показать подробности</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>'
+    Help2: "<div class=\"advanced\">\\n<h4>Расширенное использование</h4>\\n<ul>\\n<li>Разрешенные столбцы: <em>%s</em></li>\\n<li>Существующие группы сверяются с уникальным значением <em>Code</em> и новые значения из \\nимпортированного файла вносятся в записи</li>\\n<li>Иерархические структуры групп создаются посредством столбца <em>ParentCode</em>.</li>\\n<li>Назначение кодов прав доступа производится с помощью столбца <em>PermissionCode</em>. Существующие коды прав доступа \\nне сбрасываются.</li>\\n</ul>\\n</div>"
     ResultCreated: 'Создано {count} групп'
-    ResultDeleted: '%d групп удалено'
+    ResultDeleted: 'Удалено %d групп'
     ResultUpdated: 'Обновлено %d групп'
   Hierarchy:
     InfiniteLoopNotAllowed: 'Обнаружен бесконечный цикл в иерархической структуре "{type}". Для исправления ошибки измените страницу, находящуюся уровнем выше'
@@ -306,7 +305,7 @@ ru:
     LINKOPENNEWWIN: 'Открыть ссылку в новом окне?'
     LINKTO: 'Ссылка на'
     PAGE: Страница
-    URL: Ссылка
+    URL: URL
     URLNOTANOEMBEDRESOURCE: 'Не удалось преобразовать ссылку ''{url}'' в медиа-ресурс.'
     UpdateMEDIA: 'Обновить медиафайл'
   Image:
@@ -348,13 +347,14 @@ ru:
     BUTTONLOGIN: Войти
     BUTTONLOGINOTHER: 'Войти под другим именем'
     BUTTONLOSTPASSWORD: 'Я забыл пароль'
+    CANTEDIT: 'У вас недостаточно прав'
     CONFIRMNEWPASSWORD: 'Подтвердить новый пароль'
     CONFIRMPASSWORD: 'Подтвердить пароль'
     DATEFORMAT: 'Формат даты'
-    DefaultAdminFirstname: 'Администратор по умолчанию'
+    DefaultAdminFirstname: 'Администратор по умолчанию '
-    DefaultDateTime: 'по умолчанию'
+    DefaultDateTime: 'по умолч.'
     EMAIL: Email
-    EMPTYNEWPASSWORD: 'Поле для нового пароля не может быть пустым; пожалуйста, повторите попытку'
+    EMPTYNEWPASSWORD: 'Поле нового пароля не может быть пустым; пожалуйста, повторите попытку'
     ENTEREMAIL: 'Введите email, чтобы получить ссылку на сброс пароля.'
     ERRORLOCKEDOUT: 'Ваша учетная запись временно заблокирована из-за слишком большого количества неудачных попыток авторизации. Пожалуйста, попытайтесь снова через 20 минут.'
     ERRORNEWPASSWORD: 'Вы ввели Ваш новый пароль по-разному, попробуйте снова'
@@ -367,7 +367,6 @@ ru:
     NEWPASSWORD: 'Новый пароль'
     PASSWORD: Пароль
     PLURALNAME: 'Члены группы'
-    PROFILESAVESUCCESS: 'Сохранение прошло успешно'
     REMEMBERME: 'Запомнить меня?'
     SINGULARNAME: 'Член группы'
     SUBJECTPASSWORDCHANGED: 'Ваш пароль изменен'
@@ -375,7 +374,7 @@ ru:
     SURNAME: Фамилия
     TIMEFORMAT: 'Формат времени'
     VALIDATIONMEMBEREXISTS: 'Этот адрес email уже зарегистрирован'
-    ValidationIdentifierFailed: 'Can''t overwrite existing member #{id} with identical identifier ({name} = {value}))'
+    ValidationIdentifierFailed: 'Невозможно заменить существующего участника #{id} c таким же идентификатором ({name} = {value}))'
     WELCOMEBACK: 'Добро пожаловать, {firstname}'
     YOUROLDPASSWORD: 'Ваш прежний пароль'
     belongs_many_many_Groups: Группы
@@ -390,7 +389,7 @@ ru:
   MemberDatetimeOptionsetField:
     AMORPM: 'AM (Ante meridiem) или PM (Post meridiem)'
     'APPLY FILTER': 'Применить фильтр'
-    Custom: 'Свой формат'
+    Custom: Пользовательский
     DATEFORMATBAD: 'Неверный формат даты'
     DAYNOLEADING: 'Число месяца без ведущего нуля'
     DIGITSDECFRACTIONSECOND: 'Одна или более цифр для обозначения десятых долей секунды'
@@ -410,7 +409,7 @@ ru:
     TWODIGITYEAR: 'Год: двумя цифрами'
   MemberImportForm:
     Help1: '<p>Импорт пользователей в формате <em>CSV</em> (comma-separated values). <small><a href="#" class="toggle-advanced">Показать подробности</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>'
+    Help2: "<div class=\"advanced\">\\n<h4>Расширенное использование</h4>\\n<ul>\\n<li>Разрешенные столбцы: <em>%s</em></li>\\n<li>Существующие пользователи сверяются c уникальным атрибутом <em>Code</em> и новые значения из \\nимпортированного файла вносятся в записи о пользователях.</li>\\n<li>Назначение групп производится с помощью столбца <em>Groups</em>. Группы идентифицируются по атрибуту <em>Code</em>, \\nотдельные группы разделяются запятой. Если участник входит в какую-либо группу, это свойство не обнуляется.</li>\\n</ul>\\n</div>"
     ResultCreated: 'Создано {count} участников'
     ResultDeleted: 'Удалено %d участников'
     ResultNone: 'Изменений нет'
@@ -422,6 +421,7 @@ ru:
   ModelAdmin:
     DELETE: Удалить
     DELETEDRECORDS: 'Удалено {count} записей.'
+    EMPTYBEFOREIMPORT: 'Очистить базу данных перед импортированием'
     IMPORT: 'Импорт из CSV'
     IMPORTEDRECORDS: 'Импортировано {count} записей.'
     NOCSVFILE: 'Выберите CSV-файл для импорта'
@@ -454,7 +454,7 @@ ru:
     AdminGroup: Администратор
     CMS_ACCESS_CATEGORY: 'Доступ к CMS'
     FULLADMINRIGHTS: 'Все права администратора'
-    FULLADMINRIGHTS_HELP: 'Implies and overrules all other assigned permissions.'
+    FULLADMINRIGHTS_HELP: 'Отменяет все другие предоставленные права доступа.'
     PLURALNAME: 'Права доступа'
     SINGULARNAME: 'Право доступа'
   PermissionCheckboxSetField:
@@ -463,15 +463,16 @@ ru:
     FromRole: 'перенято из роли "{title}"'
     FromRoleOnGroup: 'перенято из роли "%s" для группы "%s"'
   PermissionRole:
-    OnlyAdminCanApply: 'Only admin can apply'
+    OnlyAdminCanApply: 'Может применяться только администратором'
     PLURALNAME: Роли
     SINGULARNAME: Роль
-    Title: Title
+    Title: Название
   PermissionRoleCode:
-    PLURALNAME: 'Permission Role Cods'
+    PLURALNAME: 'Коды ролей доступа'
-    SINGULARNAME: 'Permission Role Code'
+    SINGULARNAME: 'Код роли доступа'
   Permissions:
     PERMISSIONS_CATEGORY: 'Роли и права доступа'
+    UserPermissionsIntro: 'При включении этого пользователя в определенную группу его права доступа будут изменены соответствующим образом. Более подробные сведения по правам доступа для отдельных групп вы найдете в разделе "Группы".'
   PhoneNumberField:
     VALIDATION: 'Пожалуйста, введите верный номер телефона'
   RelationComplexTableField.ss:
@@ -488,26 +489,26 @@ ru:
     LOGGEDOUT: 'Вы вышли. Если Вы хотите войти снова, введите ваши учетные данные ниже.'
     LOGIN: Вход
     NOTEPAGESECURED: 'Эта страница защищена. Пожалуйста, введите свои учетные данные для входа.'
-    NOTERESETLINKINVALID: '<p>Неверная ссылка переустановки пароля или время действия ссылки истекло.</p><p>Вы можете повторно запросить ссылку, щелкнув <a href="{link1}">здесь</a>, или поменять пароль, <a href="{link2}">войдя в систему</a>.</p>'
+    NOTERESETLINKINVALID: '<p>Неверная ссылка переустановки пароля или время действия ссылки истекло.</p><p>Вы можете повторно запросить ссылку, щелкнув <a href="{link1}">здесь</a>, или поменять пароль, <a href="{link2}">войдя в систему</a>.</p> '
     NOTERESETPASSWORD: 'Введите Ваш адрес email, и Вам будет отправлена ссылка, по которой Вы сможете переустановить свой пароль'
     PASSWORDSENTHEADER: 'Ссылка для переустановки пароля выслана на ''{email}'''
-    PASSWORDSENTTEXT: 'Thank you! A reset link has been sent to ''{email}'', provided an account exists for this email address.'
+    PASSWORDSENTTEXT: 'Ссылка переустановки пароля была выслана на адрес ''{email}'' (письмо дойдет до получателя только в том случае, если аккаунт с таким электронным адресом действительно зарегистрирован).'
   SecurityAdmin:
-    ACCESS_HELP: 'Allow viewing, adding and editing users, as well as assigning permissions and roles to them.'
+    ACCESS_HELP: 'Возможность просматривать, добавлять и редактировать пользователей, а также присваивать им определенные роли и права доступа.'
-    APPLY_ROLES: 'Применить роли к группам'
+    APPLY_ROLES: 'Присвоить роли группам'
-    APPLY_ROLES_HELP: 'Возможность редактировать роли, присвоенные той или иной группе. Необходимо разрешение на доступ к разделу "Пользователи".'
+    APPLY_ROLES_HELP: 'Возможность редактировать роли, присвоенные той или иной группе. Необходимо разрешение на доступ к разделу "Пользователи". '
     EDITPERMISSIONS: 'Задать разрешения и IP адреса для каждой группы'
-    EDITPERMISSIONS_HELP: 'Возможность редактировать права доступа и IP-адреса определенной группы. Необходимо разрешение на доступ к разделу "Безопасность".'
+    EDITPERMISSIONS_HELP: 'Возможность редактировать права доступа и IP-адреса определенной группы. Необходимо разрешение на доступ к разделу "Безопасность". '
     GROUPNAME: 'Имя группы'
     IMPORTGROUPS: 'Импортировать группы'
-    IMPORTUSERS: 'Импортировать пользователей'
+    IMPORTUSERS: 'Импорт пользователей'
     MEMBERS: Участники
     MENUTITLE: Безопасность
-    MemberListCaution: 'Внимание: при удалении участников из этого списка они будут удалены из всех групп и из базы данных'
+    MemberListCaution: 'Внимание: при удалении участников из этого списка они будут удалены из всех групп и из базы данных '
     NEWGROUP: 'Новая группа'
     PERMISSIONS: 'Права доступа'
     ROLES: Роли
-    ROLESDESCRIPTION: 'Roles are predefined sets of permissions, and can be assigned to groups.<br />They are inherited from parent groups if required.'
+    ROLESDESCRIPTION: 'Роли представляют собой сочетания различных прав доступа, которые могут быть присвоены группам.<br />При необходимости они наследуются от групп более высокого уровня.'
     TABROLES: Роли
     Users: Пользователи
   SecurityAdmin_MemberImportForm:
@@ -536,13 +537,13 @@ ru:
   TableListField_PageControls.ss:
     DISPLAYING: Отображение
     OF: из
-    TO: to
+    TO: по
     VIEWFIRST: Первый
     VIEWLAST: Последний
     VIEWNEXT: Следующий
     VIEWPREVIOUS: Предыдущий
   TimeField:
-    VALIDATEFORMAT: 'Пожалуйста, задайте верный формат времени ({format})'
+    VALIDATEFORMAT: 'Пожалуйста, задайте верный формат времени {format})'
   ToggleField:
     LESS: меньше
     MORE: больше
@@ -553,8 +554,8 @@ ru:
     DELETE: 'Удалить из файлов'
     DELETEINFO: 'Окончательно удалить этот файл с сервера'
     DOEDIT: Сохранить
-    DROPFILE: 'перетащить файл сюда'
+    DROPFILE: 'перетащите файл сюда'
-    DROPFILES: 'перетащите файлы сюда'
+    DROPFILES: 'перетащить файлы'
     Dimensions: Размеры
     EDIT: Редактировать
     EDITINFO: 'Редактировать этот файл'

lang/si.yml

@@ -1,7 +1,6 @@
 si:
   AssetAdmin:
-    ADDFILES: 'Add files'
+    ALLOWEDEXTS: 'Allowed extensions'
-    EditOrgMenu: 'Edit & organize'
     NEWFOLDER: 'අලත් ගොනුවක්'
   AssetTableField:
     CREATED: 'පලමු ලිපිය අප්ලෝඩ් කරන ලදී'
@@ -21,7 +20,7 @@ si:
     EDITALL: 'Edit all'
     EDITANDORGANIZE: 'Edit & organize'
     EDITINFO: 'Edit files'
-    FILES: ලිපි
+    FILES: Files
     FROMCOMPUTER: 'Choose files from your computer'
     FROMCOMPUTERINFO: 'Upload from your computer'
     TOTAL: Total
@@ -72,7 +71,7 @@ si:
     ACCESSALLINTERFACESHELP: 'Overrules more specific access settings.'
     SAVE: 'සේවි කරන්න'
   CMSProfileController:
-    MENUTITLE: CMSProfileController
+    MENUTITLE: 'My Profile'
   ChangePasswordEmail.ss:
     CHANGEPASSWORDTEXT1: 'අලුත් මුර පදය'
     CHANGEPASSWORDTEXT2: 'ප්රවිශ්ට වීමට පහත දත්ත යොදාගන්න'
@@ -87,7 +86,7 @@ si:
     SUCCESSADD2: 'Added {name}'
     SUCCESSEDIT: 'Saved %s %s %s'
   ComplexTableField.ss:
-    ADDITEM: 'Add %s'
+    ADDITEM: 'එකතු කරන්න'
     NOITEMSFOUND: 'No items found'
     SORTASC: 'ආරෝහන පිළිවෙලට'
     SORTDESC: 'ආවරෝහන පිළිවෙලට'
@@ -181,7 +180,7 @@ si:
     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: File
     FROMCOMPUTER: 'From your Computer'
     FROMFILESTORE: 'From the File Store'
     NOSOURCE: 'Please select a source file to attach'
@@ -258,7 +257,7 @@ si:
     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>'
-    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>'
+    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'
     ResultUpdated: 'Updated %d groups'
@@ -348,6 +347,7 @@ si:
     BUTTONLOGIN: ඇතුල්වන්න
     BUTTONLOGINOTHER: 'වෙනත් නමකින් ඇතුල්වන්න'
     BUTTONLOSTPASSWORD: 'මුර පදය නැති වී ඇත'
+    CANTEDIT: 'You don''t have permission to do that'
     CONFIRMNEWPASSWORD: 'අලුත් මුර පදය හරිද'
     CONFIRMPASSWORD: 'මුර පදය හරිද'
     DATEFORMAT: 'Date format'
@@ -367,7 +367,6 @@ si:
     NEWPASSWORD: 'අලුත් මුර පදයක්'
     PASSWORD: 'මුර පදය'
     PLURALNAME: සාමාජිකයින්
-    PROFILESAVESUCCESS: 'Successfully saved.'
     REMEMBERME: 'මතක‌ තබා ගන්න?'
     SINGULARNAME: සාමාජිකයා
     SUBJECTPASSWORDCHANGED: 'මුර පදය අලුත් කරන ලදී'
@@ -410,7 +409,7 @@ si:
     TWODIGITYEAR: 'Two-digit year'
   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>'
+    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'
     ResultNone: 'No changes'
@@ -422,6 +421,7 @@ si:
   ModelAdmin:
     DELETE: Delete
     DELETEDRECORDS: 'Deleted {count} records.'
+    EMPTYBEFOREIMPORT: 'Clear Database before import'
     IMPORT: 'Import from CSV'
     IMPORTEDRECORDS: 'Imported {count} records.'
     NOCSVFILE: 'Please browse for a CSV file to import'
@@ -472,6 +472,7 @@ si:
     SINGULARNAME: 'Permission Role Code'
   Permissions:
     PERMISSIONS_CATEGORY: 'Roles and access permissions'
+    UserPermissionsIntro: 'Assigning groups to this user will adjust the permissions they have. See the groups section for details of permissions on individual groups.'
   PhoneNumberField:
     VALIDATION: 'නිවැරදි දුරකතන අ0කයක් යොදන්න'
   RelationComplexTableField.ss:

lang/sk.yml

@@ -1,7 +1,6 @@
 sk:
   AssetAdmin:
-    ADDFILES: 'Pridať súbory'
+    ALLOWEDEXTS: 'Allowed extensions'
-    EditOrgMenu: 'Editovať & organizovať'
     NEWFOLDER: 'Nový priečinok'
   AssetTableField:
     CREATED: 'Prvýkrát nahrané'
@@ -17,13 +16,13 @@ sk:
   AssetUploadField:
     ChooseFiles: 'Vyberte súbory'
     DRAGFILESHERE: 'Tiahni súbory sem'
-    DROPAREA: 'Oblasť tiahni (Drop)'
+    DROPAREA: 'Oblasť upustenia'
     EDITALL: 'Editovať všetko'
     EDITANDORGANIZE: 'Editovať a organizovať'
     EDITINFO: 'Editovať súbory'
     FILES: Súbory
     FROMCOMPUTER: 'Vyberte súbory z vášho počítača'
-    FROMCOMPUTERINFO: 'Nahrať z vášho počítača'
+    FROMCOMPUTERINFO: 'Nahrat z vášho počítača'
     TOTAL: Súhrn
     TOUPLOAD: 'Vyberte súbory pre nahratie...'
     UPLOADINPROGRESS: 'Čakajte prosím… prebieha nahrávanie'
@@ -60,19 +59,19 @@ sk:
     ERRORNOTADMIN: 'Tento používateľ nie je administrátor.'
     ERRORNOTREC: 'Toto používateľské meno / heslo nebolo rozpoznané'
   Boolean:
-    0: Nepravda
+    0: Nie
     ANY: Ktorýkoľvek
-    1: Pravda
+    1: Áno
   CMSLoadingScreen.ss:
     LOADING: 'Načíta sa ...'
-    REQUIREJS: 'CMS vyžaduje, aby ste mali JavaScript povolený.'
+    REQUIREJS: 'CMS vyžaduje, aby ste mali JavaScript zapnutý.'
   CMSMain:
     ACCESS: 'Prístup k ''{title}'' sekcii'
     ACCESSALLINTERFACES: 'Pristup do všetkých častí CMS.'
     ACCESSALLINTERFACESHELP: 'Prepisuje viac špecifických  nastavení prístupu.'
     SAVE: Uložiť
   CMSProfileController:
-    MENUTITLE: CMSProfileController
+    MENUTITLE: 'Môj profil'
   ChangePasswordEmail.ss:
     CHANGEPASSWORDTEXT1: 'Vaše heslo bolo zmenené pre'
     CHANGEPASSWORDTEXT2: 'Teraz môžete použiť nasledujúce prihlasovacie údaje na prihlásenie:'
@@ -80,8 +79,8 @@ sk:
     HELLO: 'Dobrý deň'
     PASSWORD: Heslo
   CheckboxField:
-    - Nepravda
+    - Nie
-    - Pravda
+    - Áno
   ComplexTableField:
     CLOSEPOPUP: 'Zatvoriť okno'
     SUCCESSADD2: 'Pridané {name}'
@@ -97,7 +96,7 @@ sk:
   ConfirmedPasswordField:
     ATLEAST: 'Heslá musia byť nejmenej {min} znakov dlhé.'
     BETWEEN: 'Heslá musia byť {min} až {max} znakov dlhé.'
-    MAXIMUM: 'Heslá musie byť najviac {max} znakov dlhé.'
+    MAXIMUM: 'Heslá musia byť najviac {max} znakov dlhé.'
     SHOWONCLICKTITLE: 'Zmeniť heslo'
   CreditCardField:
     FIRST: prvý
@@ -105,7 +104,7 @@ sk:
     SECOND: druhý
     THIRD: tretí
   CurrencyField:
-    CURRENCYSYMBOL: Euro
+    CURRENCYSYMBOL: $
   DataObject:
     PLURALNAME: 'Datové objekty'
     SINGULARNAME: 'Dátový objekt'
@@ -125,7 +124,7 @@ sk:
     YEAR: rok
     YEARS: roky
   DateField:
-    NOTSET: 'nIe je nastavené'
+    NOTSET: nezadané
     TODAY: dnes
     VALIDDATEFORMAT2: 'Prosím zadajte platný formát dátumu ({format})'
     VALIDDATEMAXDATE: 'Váš dátum musí byť starší alebo odpovedajúci maximu povoleného dátumu ({date})'
@@ -177,9 +176,9 @@ sk:
     ZipType: 'ZIP komprimačný súbor'
   FileIFrameField:
     ATTACH: 'Pripojiť {type}'
-    ATTACHONCESAVED: '{type} je možné pripojiť až budete mať najskôr uložený záznam.'
+    ATTACHONCESAVED: '{type} je možné pripojiť až budete mať najprv uložený záznam.'
-    ATTACHONCESAVED2: 'Súbory je možné pripojiť až budete mať najskôr uložený záznam.'
+    ATTACHONCESAVED2: 'Súbory je možné pripojiť až budete mať najprv uložený záznam.'
-    DELETE: 'Smazať {type}'
+    DELETE: 'Zmazať {type}'
     DISALLOWEDFILETYPE: 'Tento typ súboru nie je povolený nahrať'
     FILE: Súbor
     FROMCOMPUTER: 'Z vášho počitača'
@@ -189,7 +188,7 @@ sk:
   FileIFrameField_iframe.ss:
     TITLE: 'Rámec pre nahranie obrázku'
   Filesystem:
-    SYNCRESULTS: 'Synchronizácia kompletná: {createdcount} položky vytvorenéy, {deletedcount} položky smazané'
+    SYNCRESULTS: 'Synchronizácia kompletná: {createdcount} položky vytvorené, {deletedcount} položky zmazané'
   Folder:
     PLURALNAME: Priečinky
     SINGULARNAME: Priečinok
@@ -200,19 +199,19 @@ sk:
     TEXT3: pre
   Form:
     FIELDISREQUIRED: '%s je požadované'
-    SubmitBtnLabel: Coď
+    SubmitBtnLabel: Choď
     VALIDATIONCREDITNUMBER: 'Uistite sa, že ste zadali číslo {number} kreditnej karty správne'
     VALIDATIONNOTUNIQUE: 'Zadaná hodnota nie je unikátna'
     VALIDATIONPASSWORDSDONTMATCH: 'Hesla sa nezhodujú'
     VALIDATIONPASSWORDSNOTEMPTY: 'Heslá nemôžu byť prázdne'
-    VALIDATIONSTRONGPASSWORD: 'Heslá musia obsahovať nejmenej jednu číslicu a jeden alfanumerický znak.'
+    VALIDATIONSTRONGPASSWORD: 'Heslá musia obsahovať aspoň jednu číslicu a jedno písmeno'
     VALIDATOR: Validácia
     VALIDCURRENCY: 'Prosím zadajte platnú menu'
   FormField:
     NONE: žiadne
   GridAction:
-    DELETE_DESCRIPTION: Smazať
+    DELETE_DESCRIPTION: Zmazať
-    Delete: Smazať
+    Delete: Zmazať
     UnlinkRelation: Odpojiť
   GridField:
     Add: 'Pridať {name}'
@@ -223,47 +222,47 @@ sk:
     LinkExisting: 'Prepojenie existujúcich'
     NewRecord: 'Nový %s'
     NoItemsFound: 'Žiadne položky'
-    PRINTEDAT: 'Vytlačene v'
+    PRINTEDAT: 'Vytlačené v'
     PRINTEDBY: Vytlačené
     PlaceHolder: 'Vyhľadať {type}'
     PlaceHolderWithLabels: 'Vyhľadať {type} podľa {name}'
     RelationSearch: 'Vzťah hľadania'
-    ResetFilter: Resetovať
+    ResetFilter: Reset
   GridFieldAction_Delete:
-    DeletePermissionsFailure: 'Žiadne oprávnenia smazať'
+    DeletePermissionsFailure: 'Žiadne oprávnenia zmazať'
   GridFieldDetailForm:
     CancelBtn: Zrušiť
     Create: Vytvoriť
-    Delete: Vymazať
+    Delete: Zmazať
-    DeletePermissionsFailure: 'Žiadne oprávnenia smazať'
+    DeletePermissionsFailure: 'Žiadne oprávnenia zmazať'
-    Deleted: 'Smazané %s %s'
+    Deleted: 'Zmazané %s %s'
     Save: Uložiť
     Saved: 'Uložené %s %s'
   GridFieldItemEditView.ss: null
   Group:
-    AddRole: 'Pridať novú úlohu pre túto skupinu'
+    AddRole: 'Pridať úlohu pre túto skupinu'
     Code: 'Kód skupiny'
     DefaultGroupTitleAdministrators: Administratori
     DefaultGroupTitleContentAuthors: 'Autori obsahu'
     Description: Popis
-    GroupReminder: 'Ak vyberiete nadriadenú skupinu, bude táto skupina mať všetky role'
+    GroupReminder: 'Ak vyberiete nadriadenú skupinu, bude táto skupina mať všetky úlohy'
     Locked: 'Zamknuté?'
-    NoRoles: 'Nenašli sa role'
+    NoRoles: 'Nenašli sa úlohy'
     PLURALNAME: Skupiny
     Parent: 'Nadradená skupina'
-    RolesAddEditLink: 'Pridať/upraviť úlohy'
+    RolesAddEditLink: 'Spravovať úlohy'
     SINGULARNAME: Skupina
     Sort: 'Poradie zoradenia'
     has_many_Permissions: Právomoci
     many_many_Members: Členovia
   GroupImportForm:
     Help1: 'Importovať jednu alebo viac skupín v CSV formáte (čiarkov oddelené hodnoty). Zobraziť pokročilé použitie'
-    Help2: "<div class=\"advanced\">\\n<h4>Pokročilé použitie</h4>\\n<ul>\\n<li>Povolené stĺpce: <em>%s</em></li>\\n<li>Existujúce skupiny sú porovnávané podľa ich unikátnej hodnoty <em>Code</em>, a aktualizované novými hodnotami z importovaného súboru.</li>\\n<li>Hierarchia skupín môže byť vytvorená použitím stĺpca <em>ParentCode</em>.</li>\\n<li>K´dy práv môžu byt pridelené pomocou stĺpca <em>PermissionCode</em>. Existujúce právai nie sú vymazané.</li>\\n</ul>\\n</div>"
+    Help2: "<div class=\"advanced\">\\n<h4>Pokročilé použitie</h4>\\n<ul>\\n<li>Povolené stĺpce: <em>%s</em></li>\\n<li>Existujúce skupiny sú porovnávané ich unikátnou vlastnostou <em>Code</em>, a aktualizované s novými hodnotami z\\nimportovaného súboru.</li>\\n<li>Hierarchia skupín môže byť tvorená použitím stĺpce <em>ParentCode</em>.</li>\\n<li>Kódy oprávnení môžu byť priradené stĺpcom <em>PermissionCode</em>. Existujúce oprávnenia nie sú smazáné.</li>\\n</ul>\\n</div>"
     ResultCreated: 'Vytvorených {count} skupín'
     ResultDeleted: 'Vymazané %d skupiny'
     ResultUpdated: 'Aktualizované %d skupiny'
   Hierarchy:
-    InfiniteLoopNotAllowed: 'Nekonečná smyčka sa nachádza v "{type}" hierarchii. Prosím zmeňte rodiča pre vyriešenie tohto problému'
+    InfiniteLoopNotAllowed: 'Nekonečná smyčka sa nachádza v {type} hierarchii. Prosím zmeňte rodiča pre vyriešenie tohto problému'
   HtmlEditorField:
     ADDURL: 'Pridať URL'
     ADJUSTDETAILSDIMENSIONS: 'Detaily &amp; rozmery'
@@ -280,20 +279,20 @@ sk:
     CSSCLASSRIGHT: 'Vpravo, s obtekajúcim textom.'
     DETAILS: Detaily
     EMAIL: 'E-mailovú adresu'
-    FILE: Súbory
+    FILE: Súbor
     FOLDER: Adresár
     FROMCMS: 'Z CMS'
     FROMCOMPUTER: 'Z vášho počitača'
     FROMWEB: 'Z webu'
     FindInFolder: 'Vyhľadať v priečinku'
     IMAGEALT: 'Atlernatívny text (alt)'
-    IMAGEALTTEXT: 'Atlernatívny text (alt) - zobrazí sa ak obrázok nemože byť zobrazený'
+    IMAGEALTTEXT: 'Atlernatívni text (alt) - vypísaní pokiaľ nemože byť zobrazení obrázok'
     IMAGEALTTEXTDESC: 'Zobrazí sa na obrazovke, keď obrázok nemôže byť zobrazený'
     IMAGEDIMENSIONS: Rozmery
     IMAGEHEIGHTPX: Výška
-    IMAGETITLE: 'Text titulku (tooltip) - pre doplňujúce informácie o obrázku'
+    IMAGETITLE: 'Text titulky (tooltip) - pre doplňujúce informácie o obrázku'
-    IMAGETITLETEXT: 'Text titulku (tooltip)'
+    IMAGETITLETEXT: 'Text titulky (tooltip)'
-    IMAGETITLETEXTDESC: 'Text titulku (tooltip) - pre doplňujúce informácie o obrázku'
+    IMAGETITLETEXTDESC: 'Pre doplňujúce informácie o obrázku'
     IMAGEWIDTHPX: Šírka
     INSERTMEDIA: 'Vložiť média'
     LINK: 'Vložiť/upraviť odkaz na zvýraznený text'
@@ -321,7 +320,7 @@ sk:
     TITLE: 'Rámec pre nahranie obrázku'
   LeftAndMain:
     CANT_REORGANISE: 'Nemáte oprávnenie meniť stránky najvyššej úrovne. Vaša zmena nebola uložená.'
-    DELETED: Smazané.
+    DELETED: Zmazané.
     DropdownBatchActionsDefault: Akcie
     HELP: Pomoc
     PAGETYPE: 'Typ stránky:'
@@ -335,7 +334,7 @@ sk:
     VersionUnknown: neznáme
   LeftAndMain_Menu.ss:
     Hello: Ahoj
-    LOGOUT: 'Odhlásit sa'
+    LOGOUT: 'Odhlásiť sa'
   LoginAttempt:
     Email: 'Emailová adresa'
     IP: 'IP adreasa'
@@ -348,6 +347,7 @@ sk:
     BUTTONLOGIN: 'Prihlásiť sa'
     BUTTONLOGINOTHER: 'Prihlásiť sa ako niekto iný'
     BUTTONLOSTPASSWORD: 'Stratil som svoje heslo'
+    CANTEDIT: 'Nemáte oprávnenie toto vykonať'
     CONFIRMNEWPASSWORD: 'Potvrďte nové heslo'
     CONFIRMPASSWORD: 'Potvrďte heslo'
     DATEFORMAT: 'Formát dátumu'
@@ -366,10 +366,9 @@ sk:
     LOGGEDINAS: 'Ste prihlásený/á ako {name}.'
     NEWPASSWORD: 'Nové heslo'
     PASSWORD: Heslo
-    PLURALNAME: Uživatelia
+    PLURALNAME: Členovia
-    PROFILESAVESUCCESS: 'Úspešne uložné.'
     REMEMBERME: 'Pamätať si ma nabudúce?'
-    SINGULARNAME: Uživatel
+    SINGULARNAME: Člen
     SUBJECTPASSWORDCHANGED: 'Vaše heslo bolo zmenené'
     SUBJECTPASSWORDRESET: 'Odkaz na resetovanie hesla'
     SURNAME: Priezvisko
@@ -401,7 +400,7 @@ sk:
     MONTHNOLEADING: 'Číslo mesiaca bez úvodnej nuly'
     Preview: Náhľad
     SHORTMONTH: 'Krátky názov mesiaca (napr. jún)'
-    TOGGLEHELP: 'Prepnúť napovedu formátovania'
+    TOGGLEHELP: 'Prepnúť nápovedu formátovania'
     TWODIGITDAY: 'Dvojčíslie dňa mesiaca'
     TWODIGITHOUR: 'Dvojčíslie hodiny (00 až 23)'
     TWODIGITMINUTE: 'Dvojčíslie minúty (00 až 59)'
@@ -410,23 +409,24 @@ sk:
     TWODIGITYEAR: 'Dvojčíslie roka'
   MemberImportForm:
     Help1: 'Importovať členov v <em>CSV formáte</em> (čiarkov oddelené hodnoty). Zobraziť pokročile použitie'
-    Help2: "<div class=\"advanced\">\\n<h4>Pokročilé použite</h4>\\n<ul>\\n<li>Povolené stĺpce: <em>%s</em></li>\\n<li>Existujúci použivatelia sú porovnávaní podľa ich unikátnej hodnoty <em>Code</em>y, a aktualizovaní novými hodnotami z importovaného súboru.</li>\\n<li>Skupiny môžu byť pripojené podľa stĺpca <em>Groups</em>. Skupiny sú identifikované ich hodnotou <em>Code</em>, viacero skupín môže byť oddelených pomocou čiarky. Existujúce členstvá v skupinách nie sú vymazané.</li>\\n</ul>\\n</div>"
+    Help2: "<div class=\"advanced\">\\n<h4>Pokročilé použitie</h4>\\n<ul>\\n<li>Povolené stĺpce: <em>%s</em></li>\\n<li>Existujúci užívatelia sú porovnávaní ich unikátnou vlastnosťou <em>Code</em>, a aktualizovaní s novými hodnotami z\\nimportovaného súboru.</li>\\n<li>Skupiny môžu byťt priradené stĺpcom <em>Groups</em>. Skupiny sú identifikované ich vlastnosťou <em>Code</em>,\\nviacero skupín môže byť oddelené čiarkou. Existujúce členstvá skupiny nie sú smazané.</li>\\n</ul>\\n</div>"
     ResultCreated: 'Vytvorených {count} členov'
     ResultDeleted: 'Zmazaných %d členov'
     ResultNone: 'Žiadne zmeny'
     ResultUpdated: 'Aktualizovaných {count} členov'
   MemberPassword:
-    PLURALNAME: 'Členské heslá'
+    PLURALNAME: 'Heslá člena'
-    SINGULARNAME: 'Členské heslo'
+    SINGULARNAME: 'Heslo člena'
   MemberTableField: null
   ModelAdmin:
-    DELETE: Vymazať
+    DELETE: Zmazať
-    DELETEDRECORDS: 'Smazaných {count} záznamov.'
+    DELETEDRECORDS: 'Zmazaných {count} záznamov.'
+    EMPTYBEFOREIMPORT: 'Vyčistiť databázu pred importovaním'
     IMPORT: 'Importovať z CSV'
     IMPORTEDRECORDS: 'Importovaných {count} záznamov.'
     NOCSVFILE: 'Prosím vyhľadajte CSV súbor pre importovanie'
     NOIMPORT: 'Nie je čo importovať'
-    RESET: Resetovať
+    RESET: Reset
     Title: 'Dátové modely'
     UPDATEDRECORDS: 'Aktualizovaných {count} záznamov.'
   ModelAdmin_ImportSpec.ss:
@@ -435,16 +435,16 @@ sk:
     IMPORTSPECRELATIONS: Relácie
     IMPORTSPECTITLE: 'Špecifikácia pre %s'
   ModelAdmin_Tools.ss:
-    FILTER: Filter
+    FILTER: Filtrovať
     IMPORT: Importovať
   ModelSidebar.ss:
     IMPORT_TAB_HEADER: Importovať
-    SEARCHLISTINGS: Vyhľadať
+    SEARCHLISTINGS: Hľadať
   MoneyField:
     FIELDLABELAMOUNT: Množstvo
     FIELDLABELCURRENCY: Mena
   NullableField:
-    IsNullLabel: 'Je Null'
+    IsNullLabel: 'Is Null'
   NumericField:
     VALIDATION: '''{value}'' nie je číslo, iba čísla môžu byť akceptované pre toto pole'
   Pagination:
@@ -454,24 +454,25 @@ sk:
     AdminGroup: Administrátor
     CMS_ACCESS_CATEGORY: 'Prístup do CMS'
     FULLADMINRIGHTS: 'Plné administrátorské práva'
-    FULLADMINRIGHTS_HELP: 'Znamená, a prepíše všetky ostatné pridelené oprávnenia.'
+    FULLADMINRIGHTS_HELP: 'Ma prednosť pred všetkými ostatnými prideleniami a právomocami.'
     PLURALNAME: Oprávnenia
     SINGULARNAME: Oprávnenie
   PermissionCheckboxSetField:
     AssignedTo: 'pripojené k "{title}"'
     FromGroup: 'zdedené zo skupiny "{title}"'
-    FromRole: 'zdedené z role "{title}"'
+    FromRole: 'zdedené z úlohy "{title}"'
     FromRoleOnGroup: 'zdediť z úlohy "%s" v skupine "%s"'
   PermissionRole:
     OnlyAdminCanApply: 'Iba administrátor môže použiť'
-    PLURALNAME: Role
+    PLURALNAME: Úlohy
-    SINGULARNAME: Role
+    SINGULARNAME: Úloha
     Title: Názov
   PermissionRoleCode:
-    PLURALNAME: 'Kódy oprávnenia rolí'
+    PLURALNAME: 'Kódy právomocí úloh'
-    SINGULARNAME: 'Kód oprávnenia role'
+    SINGULARNAME: 'Kód právomocí úloh'
   Permissions:
-    PERMISSIONS_CATEGORY: 'Role a prístupové práva'
+    PERMISSIONS_CATEGORY: 'Úlohy a prístupové práva'
+    UserPermissionsIntro: 'Priradenie skupín tomuto užívateľovi upraví oprávnenia, ktoré má. Pozri sekcia skupiny pre podrobnosti o oprávneniach k jednotlivým skupinám.'
   PhoneNumberField:
     VALIDATION: 'Prosím zadajte platné telefónne číslo'
   RelationComplexTableField.ss:
@@ -490,8 +491,8 @@ sk:
     NOTEPAGESECURED: 'Táto stránka je zabezpečená. Zadajte svoje prihlasovacie údaje a my Vám zároveň pošleme práva.'
     NOTERESETLINKINVALID: '<p>Odkaz na resetovanie hesla nie je platný alebo je prošlý.</p><p>Môžte požiadať o nový <a href="{link1}">tu</a> alebo zmeňte svoje heslo až <a href="{link2}">sa prihlásite</a>.</p>'
     NOTERESETPASSWORD: 'Zadajte svoju e-mailovú adresu a my Vám pošleme odkaz na resetovanie hesla'
-    PASSWORDSENTHEADER: 'Odkaz na resetovanie hesla bol odeslaný na ''{email}'''
+    PASSWORDSENTHEADER: 'Odkaz na resetovanie hesla bol odoslaný na ''{email}'''
-    PASSWORDSENTTEXT: 'Ďakujeme! Resetovací odkaz bol odeslaný na ''{email}'', pokiaľ účet existuje pre túto emailovú adresu.'
+    PASSWORDSENTTEXT: 'Ďakujeme! Resetovací odkaz bol odoslaný na ''''{email}'''', pokiaľ účet existuje pre túto emailovú adresu.'
   SecurityAdmin:
     ACCESS_HELP: 'Povoliť prezeranie, pridávanie a úpravu uživaťeľov, ako aj pridelovanie právomoci pre nich.'
     APPLY_ROLES: 'Aplikovať úlohy skupinám'
@@ -520,21 +521,21 @@ sk:
   SiteTree:
     TABMAIN: Hlavné
   TableField:
-    ISREQUIRED: 'V %s ''%s'' je požadované'
+    ISREQUIRED: 'V %s ''%s je požadované'
   TableField.ss:
     ADD: 'Pridať nový riadok'
     ADDITEM: 'Pridať %s'
   TableListField:
     CSVEXPORT: 'Exportovať do CSV'
     PRINT: Vytlačiť
-    Print: Tlač
+    Print: Tlačiť
     SELECT: 'Vyberte:'
   TableListField.ss:
     NOITEMSFOUND: 'Žiadne položky'
     SORTASC: 'Triedit v vzostupnom poradí'
     SORTDESC: 'Triediť v zostupnom poradí'
   TableListField_PageControls.ss:
-    DISPLAYING: 'Zobrazuje sa'
+    DISPLAYING: Zobrazujem
     OF: z
     TO: do
     VIEWFIRST: 'Zobraziť prvé'
@@ -550,8 +551,8 @@ sk:
     ATTACHFILE: 'Priložiť súbor'
     ATTACHFILES: 'Priložiť súbory'
     AttachFile: 'Priložiť súbor(y)'
-    DELETE: 'Smazať zo súborov'
+    DELETE: 'Zmazať zo súborov'
-    DELETEINFO: 'Trvalo smazať tento súbor z úložiska súborov'
+    DELETEINFO: 'Trvalo zmazať tento súbor z úložiska súborov'
     DOEDIT: Uložiť
     DROPFILE: 'pusť súbor'
     DROPFILES: 'pusť súbory'
@@ -559,7 +560,7 @@ sk:
     EDIT: Editovať
     EDITINFO: 'Editovať súbor'
     FIELDNOTSET: 'Žiadna informácia o súbore'
-    FROMCOMPUTER: 'Z vášho počítača'
+    FROMCOMPUTER: 'Z vášho počitača'
     FROMCOMPUTERINFO: 'Vyberte zo súborov'
     FROMFILES: 'Zo súborov'
     HOTLINKINFO: 'Info: Tento obrázok bude "hotlinkovaný". Uistete sa prosím, že máte oprávnenie od pôvodneho tvorcu webu, aby sa tak stalo.'
@@ -567,7 +568,7 @@ sk:
     MAXNUMBEROFFILESSHORT: 'Môžte nahrať iba {count} súborov'
     REMOVE: Odstrániť
     REMOVEERROR: 'Chyba odstránenia súboru'
-    REMOVEINFO: 'Odstrániť tento súbor odtiaľ, ale nesmazať z úložiska súborov'
+    REMOVEINFO: 'Odstrániť tento súbor odtiaľ, ale nezmazať z úložiska súborov'
     STARTALL: 'Začni všetko'
     STARTALLINFO: 'Začni všetko nahrávať'
     Saved: Uložené

lang/sl.yml

@@ -1,7 +1,6 @@
 sl:
   AssetAdmin:
-    ADDFILES: 'Add files'
+    ALLOWEDEXTS: 'Allowed extensions'
-    EditOrgMenu: 'Edit & organize'
     NEWFOLDER: 'Nova mapa'
   AssetTableField:
     CREATED: 'Naloženo na začetku'
@@ -21,7 +20,7 @@ sl:
     EDITALL: 'Edit all'
     EDITANDORGANIZE: 'Edit & organize'
     EDITINFO: 'Edit files'
-    FILES: Datoteke
+    FILES: Files
     FROMCOMPUTER: 'Choose files from your computer'
     FROMCOMPUTERINFO: 'Upload from your computer'
     TOTAL: Total
@@ -60,9 +59,9 @@ sl:
     ERRORNOTADMIN: 'Uporabnik ni administrator tega spletnega mesta.'
     ERRORNOTREC: 'Ne prepoznam uporabniškega imena ali gesla'
   Boolean:
-    0: 'False'
+    0: Ne
     ANY: Katerikoli
-    1: 'True'
+    1: Da
   CMSLoadingScreen.ss:
     LOADING: Loading...
     REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
@@ -72,7 +71,7 @@ sl:
     ACCESSALLINTERFACESHELP: 'Omogoča bolj specifične nastavitve za možnosti dostop.'
     SAVE: Shrani
   CMSProfileController:
-    MENUTITLE: CMSProfileController
+    MENUTITLE: 'My Profile'
   ChangePasswordEmail.ss:
     CHANGEPASSWORDTEXT1: 'Geslo ste spremenili v'
     CHANGEPASSWORDTEXT2: 'Za prijavo lahko odslej uporabite naslednje podatke:'
@@ -80,14 +79,14 @@ sl:
     HELLO: 'Pozdravljeni,'
     PASSWORD: Geslo
   CheckboxField:
-    - 'False'
+    - Ne
-    - 'True'
+    - Da
   ComplexTableField:
     CLOSEPOPUP: 'Zapri okno'
     SUCCESSADD2: 'Added {name}'
     SUCCESSEDIT: 'Shranjeno: %s %s %s'
   ComplexTableField.ss:
-    ADDITEM: 'Add %s'
+    ADDITEM: 'Dodaj %s'
     NOITEMSFOUND: 'No items found'
     SORTASC: 'Razvrsti naraščajoče'
     SORTDESC: 'Razvrsti padajoče'
@@ -234,7 +233,7 @@ sl:
   GridFieldDetailForm:
     CancelBtn: Cancel
     Create: Create
-    Delete: Izbriši
+    Delete: Delete
     DeletePermissionsFailure: 'No delete permissions'
     Deleted: 'Deleted %s %s'
     Save: Save
@@ -258,7 +257,7 @@ sl:
     many_many_Members: Uporabniki
   GroupImportForm:
     Help1: '<p>Uvozi eno ali več skupin v formatu <em>CSV</ em> (comma-separated values). <small> <a href="#" class="toggle-advanced">Prikaži možnosti za napredno urejanje</ a> </ small> </ p>'
-    Help2: '<div class="advanced"> <h4>Napredno urejanje</ h4> <ul> <li>Dovoljeni stolpci: <em>%s</ em>.</ li><li>Skupine so definirane z vrednostjo< em>Code</ em> in so posodobljene z novimi vrednostmi iz uvožene datoteke.</ li><li>Hierarhijo skupin ureja stolpec <em>ParentCode </ em>.</ li> <li>Dovoljenja so dodeljena v stolpcu <em>PermissionCode</ em>. Obstoječa dovoljenja se ne izbrišejo.</li></ul></div>'
+    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: 'Število izbrisanih skupin %d'
     ResultUpdated: 'Število ponastavljenih skupin %d'
@@ -348,6 +347,7 @@ sl:
     BUTTONLOGIN: Prijava
     BUTTONLOGINOTHER: 'Prijavite se z drugim uporabniškim imenom'
     BUTTONLOSTPASSWORD: 'Pozabil-a sem geslo'
+    CANTEDIT: 'You don''t have permission to do that'
     CONFIRMNEWPASSWORD: 'Potrdi novo geslo'
     CONFIRMPASSWORD: 'Potrdi geslo'
     DATEFORMAT: 'Date format'
@@ -367,7 +367,6 @@ sl:
     NEWPASSWORD: 'Novo geslo'
     PASSWORD: Geslo
     PLURALNAME: Uporabniki
-    PROFILESAVESUCCESS: Shranjeno!
     REMEMBERME: 'Zapomni si me do prihodnjič'
     SINGULARNAME: Uporabnik
     SUBJECTPASSWORDCHANGED: 'Geslo je bilo spremenjeno'
@@ -410,7 +409,7 @@ sl:
     TWODIGITYEAR: 'Two-digit year'
   MemberImportForm:
     Help1: '<p>Uvoz uporabnikov v <em>formatu CSV</em> (comma-separated values). <small><a href="#" class="toggle-advanced">Prikaži možnosti za napredno urejanje.</a></small></p>'
-    Help2: '<div class="advanced"> <h4>Napredno urejanje</ h4><ul><li>Dovoljeni stolpci: <em>%s</ em>.</ li><li>Člani imajo unikatne vrednosti < em>Code</ em>; posodobljeni so z vrednostmi iz uvožene datoteke.</ li><li>Skupine so članom pripisane v stolpcu <em>Groups</ em>. Skupine so definirane z vrednostjo< em>Code</ em>; kadar je navedenih več skupin, so te ločene z vejico. Že dodeljena članstva v skupinah se ne izbrišejo.</ li> </ul></div>'
+    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: 'Število izbrisanih uporabnikov: %d'
     ResultNone: 'Ni sprememb'
@@ -422,6 +421,7 @@ sl:
   ModelAdmin:
     DELETE: Izbriši
     DELETEDRECORDS: 'Deleted {count} records.'
+    EMPTYBEFOREIMPORT: 'Clear Database before import'
     IMPORT: 'Uvozi CSV-datoteko'
     IMPORTEDRECORDS: 'Imported {count} records.'
     NOCSVFILE: 'Poiščite CSV-datoteko za uvoz'
@@ -472,6 +472,7 @@ sl:
     SINGULARNAME: 'Permission Role Code'
   Permissions:
     PERMISSIONS_CATEGORY: 'Vloge in dovoljenja za dostop'
+    UserPermissionsIntro: 'Assigning groups to this user will adjust the permissions they have. See the groups section for details of permissions on individual groups.'
   PhoneNumberField:
     VALIDATION: 'Vpišite veljavno telefonsko številko'
   RelationComplexTableField.ss:

lang/sr.yml

@@ -1,7 +1,6 @@
 sr:
   AssetAdmin:
-    ADDFILES: 'Add files'
+    ALLOWEDEXTS: 'Allowed extensions'
-    EditOrgMenu: 'Edit & organize'
     NEWFOLDER: 'Нова фасцикла'
   AssetTableField:
     CREATED: 'Прво достављено'
@@ -21,7 +20,7 @@ sr:
     EDITALL: 'Edit all'
     EDITANDORGANIZE: 'Edit & organize'
     EDITINFO: 'Edit files'
-    FILES: Fajlovi
+    FILES: Files
     FROMCOMPUTER: 'Choose files from your computer'
     FROMCOMPUTERINFO: 'Upload from your computer'
     TOTAL: Total
@@ -72,7 +71,7 @@ sr:
     ACCESSALLINTERFACESHELP: 'Overrules more specific access settings.'
     SAVE: Сачувај
   CMSProfileController:
-    MENUTITLE: CMSProfileController
+    MENUTITLE: 'My Profile'
   ChangePasswordEmail.ss:
     CHANGEPASSWORDTEXT1: 'Променили сте своју лозинку за '
     CHANGEPASSWORDTEXT2: 'Сада можете да користите следеће податке за пријављивање:'
@@ -87,7 +86,7 @@ sr:
     SUCCESSADD2: 'Added {name}'
     SUCCESSEDIT: 'Saved %s %s %s'
   ComplexTableField.ss:
-    ADDITEM: 'Add %s'
+    ADDITEM: 'Додај '
     NOITEMSFOUND: 'No items found'
     SORTASC: 'Сортирај у растућем поретку'
     SORTDESC: 'Сортирају у опадајућем поретку'
@@ -181,7 +180,7 @@ sr:
     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: File
     FROMCOMPUTER: 'From your Computer'
     FROMFILESTORE: 'From the File Store'
     NOSOURCE: 'Please select a source file to attach'
@@ -258,7 +257,7 @@ sr:
     many_many_Members: članovi
   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>'
+    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'
     ResultUpdated: 'Updated %d groups'
@@ -348,6 +347,7 @@ sr:
     BUTTONLOGIN: 'Пријави се'
     BUTTONLOGINOTHER: 'Пријавите се као неко други'
     BUTTONLOSTPASSWORD: 'Заборавио сам лозинку'
+    CANTEDIT: 'You don''t have permission to do that'
     CONFIRMNEWPASSWORD: 'Потврдите нову лозинку'
     CONFIRMPASSWORD: 'Потврдите лозинку'
     DATEFORMAT: 'Date format'
@@ -367,7 +367,6 @@ sr:
     NEWPASSWORD: 'Нова лозинка'
     PASSWORD: Лозинка
     PLURALNAME: članovi
-    PROFILESAVESUCCESS: 'Successfully saved.'
     REMEMBERME: 'Запамти ме за следећи пут'
     SINGULARNAME: član
     SUBJECTPASSWORDCHANGED: 'Ваша лозинка је промењена'
@@ -410,7 +409,7 @@ sr:
     TWODIGITYEAR: 'Two-digit year'
   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>'
+    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'
     ResultNone: 'No changes'
@@ -422,6 +421,7 @@ sr:
   ModelAdmin:
     DELETE: Delete
     DELETEDRECORDS: 'Deleted {count} records.'
+    EMPTYBEFOREIMPORT: 'Clear Database before import'
     IMPORT: 'Import from CSV'
     IMPORTEDRECORDS: 'Imported {count} records.'
     NOCSVFILE: 'Please browse for a CSV file to import'
@@ -472,6 +472,7 @@ sr:
     SINGULARNAME: 'Permission Role Code'
   Permissions:
     PERMISSIONS_CATEGORY: 'Roles and access permissions'
+    UserPermissionsIntro: 'Assigning groups to this user will adjust the permissions they have. See the groups section for details of permissions on individual groups.'
   PhoneNumberField:
     VALIDATION: 'Унесите исправан број телефона'
   RelationComplexTableField.ss:

lang/sv.yml

@@ -1,7 +1,6 @@
 sv:
   AssetAdmin:
-    ADDFILES: 'Lägg till filer'
+    ALLOWEDEXTS: 'Allowed extensions'
-    EditOrgMenu: 'Redigera och organisera'
     NEWFOLDER: 'Ny mapp'
   AssetTableField:
     CREATED: 'Först uppladdad'
@@ -72,7 +71,7 @@ sv:
     ACCESSALLINTERFACESHELP: 'Ersätter mer specifika behörighetsinställningar.'
     SAVE: Spara
   CMSProfileController:
-    MENUTITLE: 'Min profil'
+    MENUTITLE: 'Min Profil'
   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:'
@@ -87,7 +86,7 @@ sv:
     SUCCESSADD2: 'Lade till {name}'
     SUCCESSEDIT: 'Sparade %s %s %s'
   ComplexTableField.ss:
-    ADDITEM: 'Lägg till %s'
+    ADDITEM: 'Lägg till'
     NOITEMSFOUND: 'Inga rader hittades'
     SORTASC: 'Sortera stigande'
     SORTDESC: 'Sortera fallande'
@@ -105,7 +104,7 @@ sv:
     SECOND: andra
     THIRD: tredje
   CurrencyField:
-    CURRENCYSYMBOL: €
+    CURRENCYSYMBOL: $
   DataObject:
     PLURALNAME: Dataobjekt
     SINGULARNAME: Dataobjekt
@@ -128,8 +127,8 @@ sv:
     NOTSET: 'inte angivet'
     TODAY: 'i dag'
     VALIDDATEFORMAT2: 'Var god att ange datumet i ett giltigt format ({format})'
-    VALIDDATEMAXDATE: 'Angivet datum måste vara tidigare än eller samma som det senaste godkända datumet ({date})'
+    VALIDDATEMAXDATE: 'Angivet datum måste vara tidigare eller samma som det senaste godkända datumet ({date})'
-    VALIDDATEMINDATE: 'Angivet datum måste vara senare än eller samma som det tidigaste godkända datumet ({date})'
+    VALIDDATEMINDATE: 'Angivet datum måste vara senare eller samma som det tidigaste godkända datumet ({date})'
   DatetimeField:
     NOTSET: 'Ej satt'
   Director:
@@ -177,8 +176,8 @@ sv:
     ZipType: 'ZIP packad fil'
   FileIFrameField:
     ATTACH: 'Bifoga {type}'
-    ATTACHONCESAVED: '{type}er kan bifogas när du sparat posten för första gången'
+    ATTACHONCESAVED: '{type}er kan läggas till efter att du sparat första gången.'
-    ATTACHONCESAVED2: 'Filer kan bifogas när du sparat posten för första gången'
+    ATTACHONCESAVED2: 'Filer kan läggas till efter att du sparat första gången.'
     DELETE: 'Radera {type}'
     DISALLOWEDFILETYPE: 'Filtypen är inte tillåten för uppladdning'
     FILE: Fil
@@ -206,7 +205,7 @@ sv:
     VALIDATIONPASSWORDSDONTMATCH: 'Lösenorden stämmer inte överrens '
     VALIDATIONPASSWORDSNOTEMPTY: 'Lösenordfältet får inte vara tomt'
     VALIDATIONSTRONGPASSWORD: 'Lösenord måste innehålla minst en siffra och en bokstav.'
-    VALIDATOR: Validering
+    VALIDATOR: Validator
     VALIDCURRENCY: 'Var vänlig ange en korrekt valuta'
   FormField:
     NONE: ingen
@@ -254,11 +253,11 @@ sv:
     RolesAddEditLink: 'Hantera roller'
     SINGULARNAME: Grupp
     Sort: Sorteringsordning
-    has_many_Permissions: Tillstånd
+    has_many_Permissions: Behörigheter
     many_many_Members: Medlemmar
   GroupImportForm:
     Help1: '<p>Importera en eller flera grupper i <em>CSV</em>- format (komma-separerade värden). <small><a href="#" class ="toggle-advanced">Visa avancerade val</a></small></p>'
-    Help2: "<div class=\"advanced\">\\n<h4>Avancerat</h4>\\n<ul>\\n<li>Tillåtna kolumner<em>%s</em></li>\\n<li>Existerande grupper matchas deras unika <em>kod</em>-attribut och uppdateras med alla nya värden från den importerade filen</li>\\n<li>Grupphierarkier kan skapas genom att använda en <em>ParentCode</em>-kolumn.</li>\\n<li>Behörighetskoder kan anges genom en <em>PermissionCode</em>-kolumn. Existerande behörighetskoder raderas inte.</li>\\n</ul>\\n</div>"
+    Help2: "<div class=\"advanced\">\\n<h4>Avancerat </h4>\\n<ul>\\n<li>Tillåtna kolumner: <em>%s</em></li>\\n<li>Existerade användare matchas av deras unika <em>kod</em>-attribut och uppdateras med alla nya värden från den importerade filen</li>\\n<li>Grupper kan anges i <em>Grupp</em>-kolumnen. Grupper identiferas av deras <em>Code</em>-attribut. Anges flera grupper separeras dessa med kommatecken. Existerande användarrättigheter till grupperna tas inte bort.</li>\\n</ul>\\n</div>"
     ResultCreated: 'Skapade {count} grupper'
     ResultDeleted: 'Raderade %d grupper'
     ResultUpdated: 'Uppdaterade %d grupper'
@@ -330,7 +329,7 @@ sv:
     PERMDEFAULT: 'Var god välj en inloggningsmetod och fyll i dina uppgifter för att logga in i CMSet.'
     PLEASESAVE: 'Var god spara sidan. Den kan inte uppdateras för att den har inte sparats ännu.'
     PreviewButton: Förhandsgranska
-    REORGANISATIONSUCCESSFUL: 'Omorganisering av sidträdet lyckades.'
+    REORGANISATIONSUCCESSFUL: 'Omorganisationen av sidträdet luyckades.'
     SAVEDUP: Sparad.
     VersionUnknown: okänd
   LeftAndMain_Menu.ss:
@@ -348,6 +347,7 @@ sv:
     BUTTONLOGIN: 'Logga in'
     BUTTONLOGINOTHER: 'Logga in som annan användare'
     BUTTONLOSTPASSWORD: 'Jag har glömt mitt lösenord'
+    CANTEDIT: 'Du har inte tillstånd att ändra sidor på toppnivå. Dina ändringar har inte sparats.'
     CONFIRMNEWPASSWORD: 'Bekräfta nytt lösenord'
     CONFIRMPASSWORD: 'Bekräfta lösenord'
     DATEFORMAT: Datumformat
@@ -367,7 +367,6 @@ sv:
     NEWPASSWORD: 'Nytt lösenord'
     PASSWORD: Lösenord
     PLURALNAME: Medlemmar
-    PROFILESAVESUCCESS: 'Lyckades spara.'
     REMEMBERME: 'Kom ihåg mig nästa gång?'
     SINGULARNAME: Medlem
     SUBJECTPASSWORDCHANGED: 'Ditt lösenord har ändrats'
@@ -410,7 +409,7 @@ sv:
     TWODIGITYEAR: 'Två siffror för år'
   MemberImportForm:
     Help1: '<p>Importera användare i <em>CSV-format</em> (kommaseparerade värden). <small>a href="#" class="toggle-advanced">Visa avancerat</a></small></p>'
-    Help2: "<div class=\"advanced\">\\n<h4>Avancerat </h4>\\n<ul>\\n<li>Tillåtna kolumner: <em>%s</em></li>\\n<li>Existerade medlemmar matchas av deras unika <em>kod</em>-attribut och uppdateras med alla nya värden från den importerade filen</li>\\n<li>Grupper kan anges i <em>Grupp</em>-kolumnen. Grupper identiferas av deras <em>Code</em>-attribut. Anges flera grupper separeras dessa med kommatecken. Existerande gruppmedlemskap tas inte bort.</li>\\n</ul>\\n</div>"
+    Help2: "<div class=\"advanced\">\\n<h4>Avancerat </h4>\\n<ul>\\n<li>Tillåtna kolumner: <em>%s</em></li>\\n<li>Existerade användare matchas av deras unika <em>kod</em>-attribut och uppdateras med alla nya värden från den importerade filen</li>\\n<li>Grupper kan anges i <em>Grupp</em>-kolumnen. Grupper identiferas av deras <em>Code</em>-attribut. Anges flera grupper separeras dessa med kommatecken. Existerande användarrättigheter till grupperna tas inte bort.</li>\\n</ul>\\n</div>"
     ResultCreated: 'Skapade {count} medlemmar'
     ResultDeleted: 'Raderade %d medlemmar'
     ResultNone: 'Inga ändringar'
@@ -422,6 +421,7 @@ sv:
   ModelAdmin:
     DELETE: Radera
     DELETEDRECORDS: 'Raderade {count} poster.'
+    EMPTYBEFOREIMPORT: 'Töm databasen före import'
     IMPORT: 'Importera från CSV'
     IMPORTEDRECORDS: 'Importerade {count} poster.'
     NOCSVFILE: 'Var god och bläddra efter en CSV-fil för import'
@@ -433,7 +433,7 @@ sv:
     IMPORTSPECFIELDS: Databaskolumner
     IMPORTSPECLINK: 'Visa specifikation för %s'
     IMPORTSPECRELATIONS: Relationer
-    IMPORTSPECTITLE: 'Specification för %s'
+    IMPORTSPECTITLE: 'Specifikation för %s'
   ModelAdmin_Tools.ss:
     FILTER: 'Filtrera på'
     IMPORT: Importera
@@ -446,7 +446,7 @@ sv:
   NullableField:
     IsNullLabel: 'Är NULL'
   NumericField:
-    VALIDATION: '''{value}'' är inget nummer, bara nummer kan accepteras för det här fältet'
+    VALIDATION: '''{value}'' är inget nummer, bara siffror (utan mellanslag) kan accepteras för det här fältet'
   Pagination:
     Page: Sida
     View: Visa
@@ -468,10 +468,11 @@ sv:
     SINGULARNAME: Roll
     Title: Rollnamn
   PermissionRoleCode:
-    PLURALNAME: åtkomsträttighetskoder
+    PLURALNAME: 'Koder för rollrättigheter'
-    SINGULARNAME: åtkomsträttighetskod
+    SINGULARNAME: 'Kodför rollrättigheter'
   Permissions:
     PERMISSIONS_CATEGORY: 'Roller och åtkomsträttigheter'
+    UserPermissionsIntro: 'Genom att välja grupper för denna användare så ändras användarens rättigheter. Gå till grupper för att se vilka rättigheter de olika grupperna har.'
   PhoneNumberField:
     VALIDATION: 'Var god ange ett giltigt telefonnummer'
   RelationComplexTableField.ss:
@@ -518,7 +519,7 @@ sv:
   SimpleImageField:
     NOUPLOAD: 'Ingen bild uppladdad'
   SiteTree:
-    TABMAIN: Allmänt
+    TABMAIN: Huvudsaklig
   TableField:
     ISREQUIRED: 'För %s är ''%s'' obligatoriskt'
   TableField.ss:
@@ -556,7 +557,7 @@ sv:
     DROPFILE: 'Släpp en fil'
     DROPFILES: 'släpp filer'
     Dimensions: Dimensioner
-    EDIT: Redigera
+    EDIT: Ändra
     EDITINFO: 'Redigera filen'
     FIELDNOTSET: 'Hittade ingen filinformation'
     FROMCOMPUTER: 'Från din dator'

lang/th.yml

@@ -1,7 +1,6 @@
 th:
   AssetAdmin:
-    ADDFILES: เพิ่มไฟล์
+    ALLOWEDEXTS: 'Allowed extensions'
-    EditOrgMenu: 'Edit & organize'
     NEWFOLDER: สร้างโฟลเดอร์ใหม่
   AssetTableField:
     CREATED: อัพโหลดครั้งแรก
@@ -17,12 +16,12 @@ th:
   AssetUploadField:
     ChooseFiles: เลือกไฟล์
     DRAGFILESHERE: ลากไฟล์มาไว้ที่นี่
-    DROPAREA: 'Drop Area'
+    DROPAREA: พื้นที่วางข้อมูล
     EDITALL: แก้ไขทั้งหมด
     EDITANDORGANIZE: 'แก้ไข & จัดระเบียบ'
     EDITINFO: แก้ไขไฟล์
     FILES: ไฟล์
-    FROMCOMPUTER: 'Choose files from your computer'
+    FROMCOMPUTER: เลือกไฟล์จากคอมพิวเตอร์ของคุณ
     FROMCOMPUTERINFO: อัพโหลดจากเครื่องคอมพิวเตอร์ของคุณ
     TOTAL: รวมทั้งหมด
     TOUPLOAD: เลือกไฟล์ที่ต้องการอัพโหลด...
@@ -42,14 +41,14 @@ th:
     EMAILLINKDESCRIPTION: สร้างลิงค์ให้กับที่อยู่อีเมล์
     IMAGE: รูปภาพ
     IMAGEDESCRIPTION: แสดงรูปภาพในหน้าบทความของคุณ
-    ITALIC: 'Italic Text'
+    ITALIC: ข้อความตัวเอียง
-    ITALICEXAMPLE: Italics
+    ITALICEXAMPLE: ตัวเอียง
     LINK: ลิงก์เว็บไซต์
-    LINKDESCRIPTION: 'ลิงก์ที่ชี้ไปยังเว็บไซต์หรือ URL อื่นๆ'
+    LINKDESCRIPTION: 'ลิงก์ไปที่เว็บไซต์อื่นๆ หรือ URL อื่นๆ'
-    STRUCK: 'Struck-out Text'
+    STRUCK: ข้อความแบบขีดเส้นใต้
     STRUCKEXAMPLE: Struck-out
     UNDERLINE: 'Underlined Text'
-    UNDERLINEEXAMPLE: Underlined
+    UNDERLINEEXAMPLE: ยังไม่ได้กำหนด
     UNORDERED: 'Unordered list'
     UNORDEREDDESCRIPTION: 'Unordered list'
     UNORDEREDEXAMPLE1: 'unordered item 1'
@@ -60,31 +59,31 @@ th:
     ERRORNOTADMIN: ผู้ใช้งานรายดังกล่าวไม่ใช่ผู้ดูแลระบบ
     ERRORNOTREC: 'That username / password isn''t recognised'
   Boolean:
-    0: เท็จ
+    0: ไม่ตกลง
-    ANY: Any
+    ANY: ใดๆ
-    1: จริง
+    1: ตกลง
   CMSLoadingScreen.ss:
     LOADING: กำลังโหลด...
-    REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
+    REQUIREJS: 'CMS ตัวนี้จำเป็นต้องมีการเปิดใช้งานจาวาสคริปต์'
   CMSMain:
     ACCESS: 'เข้าไปในส่วนของ ''{title}'''
     ACCESSALLINTERFACES: 'เข้าถึงพื้นที่ในส่วนของ CMS ทั้งหมด'
     ACCESSALLINTERFACESHELP: 'Overrules more specific access settings.'
     SAVE: บันทึก
   CMSProfileController:
-    MENUTITLE: CMSProfileController
+    MENUTITLE: 'My Profile'
   ChangePasswordEmail.ss:
     CHANGEPASSWORDTEXT1: คุณได้เปลี่ยนรหัสผ่านสำหรับ
-    CHANGEPASSWORDTEXT2: 'You can now use the following credentials to log in:'
+    CHANGEPASSWORDTEXT2: 'คุณสามารถใช้ข้อมูลส่วนตัวต่อไปนี้เพื่อเข้าสู่ระบบ:'
     EMAIL: อีเมล
     HELLO: สวัสดี
     PASSWORD: รหัสผ่าน
   CheckboxField:
-    - เท็จ
+    - ไม่ตกลง
-    - จริง
+    - ตกลง
   ComplexTableField:
     CLOSEPOPUP: ปิดหน้าต่างป๊อปอัพ
-    SUCCESSADD2: 'เพิ่ม {name} แล้ว'
+    SUCCESSADD2: 'เพิ่มแล้ว {name}'
     SUCCESSEDIT: 'บันทึกแล้ว %s %s %s'
   ComplexTableField.ss:
     ADDITEM: 'เพิ่ม %s'
@@ -96,14 +95,14 @@ th:
     PREVIOUS: ก่อนหน้า
   ConfirmedPasswordField:
     ATLEAST: 'Passwords must be at least {min} characters long.'
-    BETWEEN: 'Passwords must be {min} to {max} characters long.'
+    BETWEEN: 'รหัสผ่านต้องมีความยาวตัวอักษรอย่างน้อย {min} ถึง {max} ตัวอักษร'
     MAXIMUM: 'Passwords must be at most {max} characters long.'
     SHOWONCLICKTITLE: เปลี่ยนรหัสผ่าน
   CreditCardField:
-    FIRST: first
+    FIRST: แรก
-    FOURTH: fourth
+    FOURTH: ที่สี่
     SECOND: วินาที
-    THIRD: third
+    THIRD: ที่สาม
   CurrencyField:
     CURRENCYSYMBOL: $
   DataObject:
@@ -125,24 +124,24 @@ th:
     YEAR: ปี
     YEARS: ปี
   DateField:
-    NOTSET: 'not set'
+    NOTSET: ไม่ต้องตั้งค่า
     TODAY: วันนี้
-    VALIDDATEFORMAT2: 'กรุณากรอกรูปแบบวันที่ที่ถูกต้อง ({format})'
+    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})'
   DatetimeField:
     NOTSET: ไม่ต้องกำหนด
   Director:
-    INVALID_REQUEST: คำร้องขอไม่ถูกต้อง
+    INVALID_REQUEST: การร้องขอไม่ถูกต้อง
   DropdownField:
     CHOOSE: (เลือก)
   EmailField:
-    VALIDATION: 'Please enter an email address'
+    VALIDATION: กรุณากรอกที่อยู่อีเมล
   Email_BounceRecord:
     PLURALNAME: 'Email Bounce Records'
     SINGULARNAME: 'Email Bounce Record'
   Enum:
-    ANY: Any
+    ANY: ใดๆ
   File:
     AviType: 'ไฟล์วีดีโอ AVI'
     Content: เนื้อหา
@@ -150,41 +149,41 @@ th:
     DmgType: 'Apple disk image'
     DocType: 'เอกสาร Word'
     Filename: ชื่อไฟล์
-    GifType: 'GIF image - good for diagrams'
+    GifType: 'รูปภาพ GIF - ดีสำหรับแผนผังหรือไดอะแกรม'
     GzType: 'ไฟล์บีบอัดข้อมูล GZIP'
     HtlType: 'ไฟล์ HTML'
     HtmlType: 'ไฟล์ HTML'
     INVALIDEXTENSION: 'Extension is not allowed (valid: {extensions})'
-    INVALIDEXTENSIONSHORT: 'Extension is not allowed'
+    INVALIDEXTENSIONSHORT: ส่วนเสริมไม่ได้รับอนุญาตให้ใช้งาน
     IcoType: รูปไอคอน
-    JpgType: 'JPEG image - good for photos'
+    JpgType: 'รูปภาพ JPEG - ดีสำหรับภาพถ่าย'
     JsType: ไฟล์จาวาสคริปต์
     Mp3Type: 'ไฟล์เสียง MP3'
     MpgType: 'ไฟล์วีดีโอ MPEG'
-    NOFILESIZE: 'Filesize is zero bytes.'
+    NOFILESIZE: ขนาดไฟล์มีขนาดเป็นศูนย์
     NOVALIDUPLOAD: 'File is not a valid upload'
     Name: ชื่อ
     PLURALNAME: ไฟล์
     PdfType: 'ไฟล์ Adobe Acrobat PDF'
-    PngType: 'PNG image - good general-purpose format'
+    PngType: 'รูปภาพ PNG - ดีสำหรับรูปแบบที่มีเป้าหมายสำหรับใช้งานทั่วไป'
     SINGULARNAME: ไฟล์
     TOOLARGE: 'Filesize is too large, maximum {size} allowed'
-    TOOLARGESHORT: 'Filesize exceeds {size}'
+    TOOLARGESHORT: 'ขนาดไฟล์เกินจำนวนที่จำกัดไว้ {size}'
     TiffType: 'ไฟล์รูปภาพ TIF'
     Title: ชื่อ
     WavType: 'ไฟล์เสียง WAV'
     XlsType: 'สเปรดชีท Excel'
     ZipType: 'ไฟล์บีบอัดข้อมูล ZIP'
   FileIFrameField:
-    ATTACH: 'แนบไฟล์ {type}'
+    ATTACH: 'แนบ {type}'
     ATTACHONCESAVED: '{type}s can be attached once you have saved the record for the first time.'
     ATTACHONCESAVED2: 'Files can be attached once you have saved the record for the first time.'
-    DELETE: 'Delete {type}'
+    DELETE: 'ลบ {type}'
     DISALLOWEDFILETYPE: 'This filetype is not allowed to be uploaded'
     FILE: ไฟล์
     FROMCOMPUTER: จากเครื่องคอมพิวเตอร์ของคุณ
     FROMFILESTORE: จากพื้นที่จัดเก็บไฟล์
-    NOSOURCE: กรุณาเลือกไฟล์ต้นฉบับที่ต้องการแนบไฟล์
+    NOSOURCE: กรุณาเลือกไฟล์แหล่งข้อมูลที่ต้องการแนบไฟล์
     REPLACE: 'แทนที่ {type}'
   FileIFrameField_iframe.ss:
     TITLE: 'Image Uploading Iframe'
@@ -199,7 +198,7 @@ th:
     TEXT2: ลิงค์รีเซ็ตรหัสผ่าน
     TEXT3: สำหรับ
   Form:
-    FIELDISREQUIRED: '%s is required'
+    FIELDISREQUIRED: '%s เป็นข้อมูลที่จำเป็น'
     SubmitBtnLabel: ไป
     VALIDATIONCREDITNUMBER: 'Please ensure you have entered the {number} credit card number correctly'
     VALIDATIONNOTUNIQUE: 'The value entered is not unique'
@@ -209,7 +208,7 @@ th:
     VALIDATOR: Validator
     VALIDCURRENCY: กรุณากรอกสกุลเงินที่ถูกต้อง
   FormField:
-    NONE: none
+    NONE: ไม่มี
   GridAction:
     DELETE_DESCRIPTION: ลบ
     Delete: ลบ
@@ -221,32 +220,32 @@ th:
     Find: ค้นหา
     LEVELUP: 'Level up'
     LinkExisting: ลิงก์ที่มีอยู่
-    NewRecord: 'New %s'
+    NewRecord: 'ใหม่ %s'
     NoItemsFound: ไม่พบรายการที่ต้องการ
-    PRINTEDAT: สั่งพิมพ์เมื่อ
+    PRINTEDAT: ถูกสั่งพิมพ์ที่
-    PRINTEDBY: สั่งพิมพ์โดย
+    PRINTEDBY: พิมพ์โดย
     PlaceHolder: 'ค้นหา {type}'
-    PlaceHolderWithLabels: 'ค้นหา {type} โดย {name}'
+    PlaceHolderWithLabels: 'Find {type} by {name}'
     RelationSearch: 'Relation search'
     ResetFilter: รีเซ็ต
   GridFieldAction_Delete:
-    DeletePermissionsFailure: ไม่มีสิทธิ์ในการลบ
+    DeletePermissionsFailure: ไม่ได้รับสิทธิ์ให้ลบได้
   GridFieldDetailForm:
-    CancelBtn: Cancel
+    CancelBtn: ยกเลิก
     Create: สร้าง
     Delete: ลบ
-    DeletePermissionsFailure: ไม่ได้รับสิทธิ์ให้ลบทิ้งได้
+    DeletePermissionsFailure: 'No delete permissions'
     Deleted: 'ลบ %s %s แล้ว'
     Save: บันทึก
-    Saved: 'บันทึก %s %s แล้ว'
+    Saved: 'บันทึกแล้ว %s %s'
   GridFieldItemEditView.ss: null
   Group:
-    AddRole: 'Add a role for this group'
+    AddRole: เพิ่มบทบาทให้กับกลุ่มนี้
     Code: รหัสกลุ่ม
     DefaultGroupTitleAdministrators: ผู้ดูและระบบ
     DefaultGroupTitleContentAuthors: ผู้แต่งเนื้อหา
     Description: คำอธิบาย
-    GroupReminder: 'If you choose a parent group, this group will take all it''s roles'
+    GroupReminder: 'หากคุณเลือกกลุ่มแม่, กลุ่มดังกล่าวนี้จะถึงบทบาททั้งหมดของกลุ่มแม่มา'
     Locked: 'ล็อค?'
     NoRoles: ไม่พบบทบาทที่ต้องการ
     PLURALNAME: กลุ่ม
@@ -258,15 +257,15 @@ th:
     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>'
-    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>'
+    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'
+    ResultCreated: 'สร้างกลุ่มแล้ว {count} กลุ่ม'
     ResultDeleted: 'ลบกลุ่มแล้ว %d กลุ่ม'
     ResultUpdated: 'อัพเดทแล้ว %d กลุ่ม'
   Hierarchy:
     InfiniteLoopNotAllowed: 'Infinite loop found within the "{type}" hierarchy. Please change the parent to resolve this'
   HtmlEditorField:
-    ADDURL: 'Add URL'
+    ADDURL: 'เพิ่ม URL'
-    ADJUSTDETAILSDIMENSIONS: 'Details &amp; dimensions'
+    ADJUSTDETAILSDIMENSIONS: 'รายละเอียด &amp; ขนาดสัดส่วน'
     ANCHORVALUE: Anchor
     BUTTONINSERT: แทรก
     BUTTONINSERTLINK: แทรกลิงค์
@@ -284,18 +283,18 @@ th:
     FOLDER: โฟลเดอร์
     FROMCMS: 'จาก CMS'
     FROMCOMPUTER: จากคอมพิวเตอร์ของคุณ
-    FROMWEB: 'From the web'
+    FROMWEB: จากเว็บไซต์
     FindInFolder: ค้นหาในโฟลเดอร์
     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: Dimensions
+    IMAGEDIMENSIONS: ขนาดสัดส่วน
     IMAGEHEIGHTPX: ส่วนสูง
     IMAGETITLE: 'Title text (tooltip) - for additional information about the image'
-    IMAGETITLETEXT: 'Title text (tooltip)'
+    IMAGETITLETEXT: 'ข้อความหัวเรื่อง (tooltip)'
     IMAGETITLETEXTDESC: 'For additional information about the image'
     IMAGEWIDTHPX: ความกว้าง
-    INSERTMEDIA: 'Insert Media'
+    INSERTMEDIA: แทรกมีเดีย
     LINK: ลิงก์
     LINKANCHOR: 'Anchor on this page'
     LINKDESCR: คำอธิบายลิงค์
@@ -308,7 +307,7 @@ th:
     PAGE: หน้าเว็บ
     URL: URL
     URLNOTANOEMBEDRESOURCE: 'The URL ''{url}'' could not be turned into a media resource.'
-    UpdateMEDIA: อัพเดทไฟล์มีเดีย
+    UpdateMEDIA: อัพเดทมีเดีย
   Image:
     PLURALNAME: ไฟล์
     SINGULARNAME: ไฟล์
@@ -318,7 +317,7 @@ th:
     PLURALNAME: ไฟล์
     SINGULARNAME: ไฟล์
   Image_iframe.ss:
-    TITLE: 'Image Uploading Iframe'
+    TITLE: 'หน้าต่าง iframe สำหรับอัพโหลดรูปภาพ'
   LeftAndMain:
     CANT_REORGANISE: 'You do not have permission to alter Top level pages. Your change was not saved.'
     DELETED: ลบแล้ว
@@ -332,22 +331,23 @@ th:
     PreviewButton: ดูตัวอย่าง
     REORGANISATIONSUCCESSFUL: 'Reorganised the site tree successfully.'
     SAVEDUP: บันทึกแล้ว
-    VersionUnknown: unknown
+    VersionUnknown: ไม่ทราบ
   LeftAndMain_Menu.ss:
     Hello: สวัสดีค่ะ
     LOGOUT: ออกจากระบบ
   LoginAttempt:
     Email: ที่อยู่อีเมล
     IP: ไอพีเครื่อง
-    PLURALNAME: 'Login Attempts'
+    PLURALNAME: จำนวนครั้งการเข้าสู่ระบบ
-    SINGULARNAME: 'Login Attempt'
+    SINGULARNAME: จำนวนครั้งการเข้าสู่ระบบ
     Status: สถานะ
   Member:
-    ADDGROUP: เพิ่มกลุ่มใหม่
+    ADDGROUP: เพิ่มกลุ่ม
     BUTTONCHANGEPASSWORD: เปลี่ยนรหัสผ่าน
     BUTTONLOGIN: เข้าสู่ระบบ
     BUTTONLOGINOTHER: 'Log in as someone else'
     BUTTONLOSTPASSWORD: ฉันลืมรหัสผ่านของฉัน
+    CANTEDIT: 'You don''t have permission to do that'
     CONFIRMNEWPASSWORD: ยืนยันรหัสผ่านใหม่
     CONFIRMPASSWORD: ยืนยันรหัสผ่าน
     DATEFORMAT: รูปแบบวันที่
@@ -358,7 +358,7 @@ th:
     ENTEREMAIL: กรุณากรอกที่อยู่อีเมลเพื่อขอรับลิงก์สำหรับรีเซ็ตรหัสผ่านใหม่
     ERRORLOCKEDOUT: 'Your account has been temporarily disabled because of too many failed attempts at logging in. Please try again in 20 minutes.'
     ERRORNEWPASSWORD: 'You have entered your new password differently, try again'
-    ERRORPASSWORDNOTMATCH: 'Your current password does not match, please try again'
+    ERRORPASSWORDNOTMATCH: 'รหัสผ่านไม่ตรงกัน กรุณาลองใหม่อีกครั้ง'
     ERRORWRONGCRED: 'That doesn''t seem to be the right e-mail address or password. Please try again.'
     FIRSTNAME: ชื่อจริง
     INTERFACELANG: ภาษาสำหรับหน้าจอติดต่อผู้ใช้
@@ -367,8 +367,7 @@ th:
     NEWPASSWORD: รหัสผ่านใหม่
     PASSWORD: รหัสผ่าน
     PLURALNAME: สมาชิก
-    PROFILESAVESUCCESS: บันทึกเรียบร้อยแล้ว
+    REMEMBERME: 'จำรหัสผ่านไว้สำหรับครั้งต่อไป?'
-    REMEMBERME: 'Remember me next time?'
     SINGULARNAME: สมาชิก
     SUBJECTPASSWORDCHANGED: รหัสผ่านได้รับการเปลี่ยนแปลงแล้ว
     SUBJECTPASSWORDRESET: ลิงค์สำหรับรีเซ็ตรหัสผ่านใหม่ของคุณ
@@ -381,7 +380,7 @@ th:
     belongs_many_many_Groups: กลุ่ม
     db_LastVisited: วันที่เยี่ยมชมล่าสุด
     db_Locale: ภาษาสำหรับส่วนอินเทอร์เฟซ
-    db_LockedOutUntil: 'Locked out until'
+    db_LockedOutUntil: ออกจากระบบจนกว่า
     db_NumVisit: จำนวนการเข้าชม
     db_Password: รหัสผ่าน
     db_PasswordExpiry: วันที่รหัสผ่านหมดอายุ
@@ -389,7 +388,7 @@ th:
     TITLE: 'อีเมล &amp; รหัสผ่าน'
   MemberDatetimeOptionsetField:
     AMORPM: 'AM (Ante meridiem) or PM (Post meridiem)'
-    'APPLY FILTER': ประยุกต์ตัวกรองข้อมูล
+    'APPLY FILTER': ประยุกต์ใช้ตัวกรองข้อมูล
     Custom: Custom
     DATEFORMATBAD: รูปแบบวันที่ไม่ถูกต้อง
     DAYNOLEADING: 'Day of month without leading zero'
@@ -410,7 +409,7 @@ th:
     TWODIGITYEAR: 'Two-digit year'
   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>'
+    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: 'ลบสมาชิกแล้ว %d สมาชิก'
     ResultNone: ยังไม่มีการเปลี่ยนแปลง
@@ -421,21 +420,22 @@ th:
   MemberTableField: null
   ModelAdmin:
     DELETE: ลบ
-    DELETEDRECORDS: 'Deleted {count} records.'
+    DELETEDRECORDS: 'ลบแล้ว {count} รายการ'
+    EMPTYBEFOREIMPORT: 'Clear Database before import'
     IMPORT: 'นำเข้าจากไฟล์ CSV'
-    IMPORTEDRECORDS: 'Imported {count} records.'
+    IMPORTEDRECORDS: 'นำเข้าแล้ว {count} รายการ'
     NOCSVFILE: 'กรุณาเปิดดูเพื่อเลือกไฟล์ CSV สำหรับนำเข้าข้อมูล'
     NOIMPORT: ไม่มีข้อมูลให้นำเข้า
     RESET: รีเซ็ต
     Title: 'Data Models'
-    UPDATEDRECORDS: 'Updated {count} records.'
+    UPDATEDRECORDS: 'อัพเดทแล้ว {count} รายการ'
   ModelAdmin_ImportSpec.ss:
     IMPORTSPECFIELDS: 'Database columns'
     IMPORTSPECLINK: 'Show Specification for %s'
     IMPORTSPECRELATIONS: Relations
     IMPORTSPECTITLE: 'Specification for %s'
   ModelAdmin_Tools.ss:
-    FILTER: ตัวกรองข้อมูล
+    FILTER: กรองข้อมูล
     IMPORT: นำเข้า
   ModelSidebar.ss:
     IMPORT_TAB_HEADER: นำเข้า
@@ -455,29 +455,30 @@ th:
     CMS_ACCESS_CATEGORY: 'การเข้าถึง CMS'
     FULLADMINRIGHTS: 'Full administrative rights'
     FULLADMINRIGHTS_HELP: 'Implies and overrules all other assigned permissions.'
-    PLURALNAME: สิทธิ์
+    PLURALNAME: สิทธิ์อนุญาต
-    SINGULARNAME: สิทธิ์
+    SINGULARNAME: สิทธิ์อนุญาต
   PermissionCheckboxSetField:
     AssignedTo: 'assigned to "{title}"'
     FromGroup: 'inherited from group "{title}"'
     FromRole: 'inherited from role "{title}"'
     FromRoleOnGroup: 'inherited from role "%s" on group "%s"'
   PermissionRole:
-    OnlyAdminCanApply: 'Only admin can apply'
+    OnlyAdminCanApply: เฉพาะผู้ดูแลเท่านั้นที่สามารถนำไปใช้ได้
     PLURALNAME: บทบาท
     SINGULARNAME: บทบาท
-    Title: Title
+    Title: หัวเรื่อง
   PermissionRoleCode:
     PLURALNAME: 'Permission Role Cods'
     SINGULARNAME: 'Permission Role Code'
   Permissions:
     PERMISSIONS_CATEGORY: บทบาทและสิทธิ์การเข้าใช้งาน
+    UserPermissionsIntro: 'Assigning groups to this user will adjust the permissions they have. See the groups section for details of permissions on individual groups.'
   PhoneNumberField:
-    VALIDATION: 'Please enter a valid phone number'
+    VALIDATION: กรุณากรอกหมายเลขโทรศัพท์ที่ถูกต้อง
   RelationComplexTableField.ss:
     ADD: เพิ่ม
-    CSVEXPORT: 'ส่งออกไปเป็น CSV'
+    CSVEXPORT: 'ส่งออกเป็นไฟล์ CSV'
-    NOTFOUND: 'No items found'
+    NOTFOUND: ไม่พบรายการที่ต้องการ
   Security:
     ALREADYLOGGEDIN: 'คุณไม่จำเป็นต้องเข้ามาที่หน้าเว็บนี้. หากคุณมีบัญชีอื่นๆที่สามารถเข้าถึงหน้าเว็บนี้ได้อยู่แล้ว คุณสามารถ <a href="%s">เข้าสู่ระบบอีกครั้ง</a>'
     BUTTONSEND: ส่งลิงค์รีเซ็ตรหัสผ่านให้กับฉัน
@@ -499,13 +500,13 @@ th:
     EDITPERMISSIONS: บริหารการสิทธิ์การเข้าใช้งานสำหรับกลุ่ม
     EDITPERMISSIONS_HELP: 'Ability to edit Permissions and IP Addresses for a group. Requires the "Access to ''Security'' section" permission.'
     GROUPNAME: ชื่อกลุ่มสมาชิก
-    IMPORTGROUPS: นำเข้ากลุ่มผู้ใช้งาน
+    IMPORTGROUPS: นำเข้ากลุ่ม
-    IMPORTUSERS: นำเข้าชื่อผู้ใช้งาน
+    IMPORTUSERS: นำเข้าผู้ใช้งาน
     MEMBERS: สมาชิก
     MENUTITLE: ความปลอดภัย
     MemberListCaution: 'Caution: Removing members from this list will remove them from all groups and the database'
     NEWGROUP: สร้างกลุ่มใหม่
-    PERMISSIONS: สิทธิ์
+    PERMISSIONS: สิทธิ์อนุญาต
     ROLES: บทบาท
     ROLESDESCRIPTION: 'Roles are predefined sets of permissions, and can be assigned to groups.<br />They are inherited from parent groups if required.'
     TABROLES: บทบาท
@@ -527,16 +528,16 @@ th:
   TableListField:
     CSVEXPORT: 'ส่งข้อมูลออกเป็น CSV'
     PRINT: สั่งพิมพ์
-    Print: สั่งพิมพ์
+    Print: พิมพ์
     SELECT: เลือก
   TableListField.ss:
     NOITEMSFOUND: ไม่พบรายการที่ต้องการ
     SORTASC: จัดเรียงลำดับจากน้อยมามาก
     SORTDESC: จัดเรียงลำดับจากมากมาน้อย
   TableListField_PageControls.ss:
-    DISPLAYING: แสดงข้อมูล
+    DISPLAYING: แสดง
     OF: จาก
-    TO: to
+    TO: ถึง
     VIEWFIRST: ดูหน้าแรก
     VIEWLAST: เปิดดูหน้าสุดท้าย
     VIEWNEXT: เปิดดูหน้าเว็บถัดไป
@@ -549,27 +550,27 @@ th:
   UploadField:
     ATTACHFILE: แนบไฟล์
     ATTACHFILES: แนบไฟล์
-    AttachFile: ไฟล์แนบ
+    AttachFile: แนบไฟล์
-    DELETE: ลบออกจากไฟล์
+    DELETE: ลบจากไฟล์
-    DELETEINFO: ลบไฟล์นี้จากพื้นที่จัดเก็บไฟล์เป็นการถาวร
+    DELETEINFO: ลบไฟล์นี้ออกจากพื้นที่จัดเก็บไฟล์อย่างถาวร
     DOEDIT: บันทึก
     DROPFILE: ลบไฟล์
-    DROPFILES: วางไฟล์
+    DROPFILES: ลบไฟล์
     Dimensions: ขนาดสัดส่วน
     EDIT: แก้ไข
     EDITINFO: แก้ไขไฟล์นี้
     FIELDNOTSET: ไม่พบข้อมูลเกี่ยวกับไฟล์
-    FROMCOMPUTER: จากเครื่องคอมพิวเตอร์ของคุณ
+    FROMCOMPUTER: จากคอมพิวเตอร์ของคุณ
-    FROMCOMPUTERINFO: 'Select from files'
+    FROMCOMPUTERINFO: เลือกจากไฟล์
     FROMFILES: จากไฟล์
     HOTLINKINFO: 'Info: This image will be hotlinked. Please ensure you have permissions from the original site creator to do so.'
     MAXNUMBEROFFILES: 'Max number of {count} file(s) exceeded.'
-    MAXNUMBEROFFILESSHORT: 'สามารถอัพโหลดได้เพียง{count} ไฟล์'
+    MAXNUMBEROFFILESSHORT: 'Can only upload {count} files'
     REMOVE: ลบออก
-    REMOVEERROR: เกิดข้อผิดพลาดในการลบไฟล์ออก
+    REMOVEERROR: พบข้อผิดพลาดในระหว่างการลบไฟล์
-    REMOVEINFO: 'Remove this file from here, but do not delete it from the file store'
+    REMOVEINFO: 'ลบไฟล์นี้จากที่นี่ แต่ไม่ต้องลบไฟล์ดังกล่าวจากพื้นที่จัดเก็บไฟล์'
     STARTALL: เริ่มทั้งหมด
-    STARTALLINFO: 'Start all uploads'
+    STARTALLINFO: เริ่มการอัพโหลดทั้งหมด
     Saved: บันทึกแล้ว
   Versioned:
     has_many_Versions: เวอร์ชั่น

lang/tr.yml

@@ -1,7 +1,6 @@
 tr:
   AssetAdmin:
-    ADDFILES: 'Add files'
+    ALLOWEDEXTS: 'Allowed extensions'
-    EditOrgMenu: 'Edit & organize'
     NEWFOLDER: YeniKlasör
   AssetTableField:
     CREATED: 'Yüklenme tarihi'
@@ -21,7 +20,7 @@ tr:
     EDITALL: 'Edit all'
     EDITANDORGANIZE: 'Edit & organize'
     EDITINFO: 'Edit files'
-    FILES: Dosyalar
+    FILES: Files
     FROMCOMPUTER: 'Choose files from your computer'
     FROMCOMPUTERINFO: 'Upload from your computer'
     TOTAL: Total
@@ -60,9 +59,9 @@ tr:
     ERRORNOTADMIN: 'O kullanıcı, yönetici değildir'
     ERRORNOTREC: 'Kullanıcı adı / şifre hatalı'
   Boolean:
-    0: 'False'
+    0: Yanlış
     ANY: Herhangi
-    1: 'True'
+    1: Doğru
   CMSLoadingScreen.ss:
     LOADING: Loading...
     REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
@@ -72,7 +71,7 @@ tr:
     ACCESSALLINTERFACESHELP: 'Overrules more specific access settings.'
     SAVE: Kaydet
   CMSProfileController:
-    MENUTITLE: CMSProfileController
+    MENUTITLE: 'My Profile'
   ChangePasswordEmail.ss:
     CHANGEPASSWORDTEXT1: 'Parolanız değiştirildi:'
     CHANGEPASSWORDTEXT2: 'Sisteme giriş yapabilmek için aşağıdaki kullanıcı bilgilerinizi kullanabilirsiniz:'
@@ -80,14 +79,14 @@ tr:
     HELLO: Merhaba
     PASSWORD: Parola
   CheckboxField:
-    - 'False'
+    - Yanlış
-    - 'True'
+    - Doğru
   ComplexTableField:
     CLOSEPOPUP: 'Açılır Pancereyi Kapat'
     SUCCESSADD2: 'Added {name}'
     SUCCESSEDIT: 'Kaydedildi %s %s %s'
   ComplexTableField.ss:
-    ADDITEM: 'Add %s'
+    ADDITEM: '%s ekle'
     NOITEMSFOUND: 'No items found'
     SORTASC: 'Sırala (artan)'
     SORTDESC: 'Sırala (azalan)'
@@ -181,7 +180,7 @@ tr:
     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: Dosya
+    FILE: File
     FROMCOMPUTER: 'From your Computer'
     FROMFILESTORE: 'From the File Store'
     NOSOURCE: 'Please select a source file to attach'
@@ -211,7 +210,7 @@ tr:
   FormField:
     NONE: hiç
   GridAction:
-    DELETE_DESCRIPTION: Sil
+    DELETE_DESCRIPTION: Delete
     Delete: Sil
     UnlinkRelation: Unlink
   GridField:
@@ -234,7 +233,7 @@ tr:
   GridFieldDetailForm:
     CancelBtn: Cancel
     Create: Create
-    Delete: Sil
+    Delete: Delete
     DeletePermissionsFailure: 'No delete permissions'
     Deleted: 'Deleted %s %s'
     Save: Save
@@ -258,7 +257,7 @@ tr:
     many_many_Members: Üyeler
   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>'
+    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'
     ResultUpdated: 'Updated %d groups'
@@ -348,6 +347,7 @@ tr:
     BUTTONLOGIN: Giriş
     BUTTONLOGINOTHER: 'Başka bir kullanıcı olarak giriş yap'
     BUTTONLOSTPASSWORD: 'Şifremi kaybettim'
+    CANTEDIT: 'You don''t have permission to do that'
     CONFIRMNEWPASSWORD: 'Yeni Şifreyi Onayla'
     CONFIRMPASSWORD: 'Şifreyi Onayla'
     DATEFORMAT: 'Date format'
@@ -367,7 +367,6 @@ tr:
     NEWPASSWORD: 'Yeni Şifre'
     PASSWORD: Şifre
     PLURALNAME: Üyeler
-    PROFILESAVESUCCESS: 'Başarıyla kaydedildi.'
     REMEMBERME: 'Beni hatırla?'
     SINGULARNAME: Üye
     SUBJECTPASSWORDCHANGED: 'Parolanız değiştirildi'
@@ -410,7 +409,7 @@ tr:
     TWODIGITYEAR: 'Two-digit year'
   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>'
+    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'
     ResultNone: 'No changes'
@@ -422,6 +421,7 @@ tr:
   ModelAdmin:
     DELETE: Sil
     DELETEDRECORDS: 'Deleted {count} records.'
+    EMPTYBEFOREIMPORT: 'Clear Database before import'
     IMPORT: 'CSV''den içer aktar'
     IMPORTEDRECORDS: 'Imported {count} records.'
     NOCSVFILE: 'CSV dosyası ekleme'
@@ -472,6 +472,7 @@ tr:
     SINGULARNAME: 'Permission Role Code'
   Permissions:
     PERMISSIONS_CATEGORY: 'Roller ve giriş izinleri'
+    UserPermissionsIntro: 'Assigning groups to this user will adjust the permissions they have. See the groups section for details of permissions on individual groups.'
   PhoneNumberField:
     VALIDATION: 'Lütfen geçerli bir telefon numarası giriniz'
   RelationComplexTableField.ss:
@@ -527,7 +528,7 @@ tr:
   TableListField:
     CSVEXPORT: 'CSV olarak kaydet'
     PRINT: Yazdır
-    Print: Yazdır
+    Print: Print
     SELECT: Seç
   TableListField.ss:
     NOITEMSFOUND: 'No items found'

lang/uk.yml

@@ -1,7 +1,6 @@
 uk:
   AssetAdmin:
-    ADDFILES: 'Add files'
+    ALLOWEDEXTS: 'Allowed extensions'
-    EditOrgMenu: 'Edit & organize'
     NEWFOLDER: 'Нова Тека'
   AssetTableField:
     CREATED: 'Вперше завантажено'
@@ -21,7 +20,7 @@ uk:
     EDITALL: 'Edit all'
     EDITANDORGANIZE: 'Edit & organize'
     EDITINFO: 'Edit files'
-    FILES: Файли
+    FILES: Files
     FROMCOMPUTER: 'Choose files from your computer'
     FROMCOMPUTERINFO: 'Upload from your computer'
     TOTAL: Total
@@ -72,7 +71,7 @@ uk:
     ACCESSALLINTERFACESHELP: 'Overrules more specific access settings.'
     SAVE: Зберегти
   CMSProfileController:
-    MENUTITLE: CMSProfileController
+    MENUTITLE: 'My Profile'
   ChangePasswordEmail.ss:
     CHANGEPASSWORDTEXT1: 'Ви змінили свій пароль для'
     CHANGEPASSWORDTEXT2: 'Тепер Ви можете використовувати наступні дані для входу:'
@@ -87,7 +86,7 @@ uk:
     SUCCESSADD2: 'Added {name}'
     SUCCESSEDIT: 'Saved %s %s %s'
   ComplexTableField.ss:
-    ADDITEM: 'Add %s'
+    ADDITEM: Додати
     NOITEMSFOUND: 'No items found'
     SORTASC: 'За зростанням'
     SORTDESC: 'За спаданням'
@@ -258,7 +257,7 @@ uk:
     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>'
-    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>'
+    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'
     ResultUpdated: 'Updated %d groups'
@@ -348,6 +347,7 @@ uk:
     BUTTONLOGIN: Увійти
     BUTTONLOGINOTHER: 'Увійдіть кимось іншим'
     BUTTONLOSTPASSWORD: 'Я загубив свій пароль'
+    CANTEDIT: 'You don''t have permission to do that'
     CONFIRMNEWPASSWORD: 'Підтвердіть новий пароль'
     CONFIRMPASSWORD: 'Підтвердіть пароль'
     DATEFORMAT: 'Date format'
@@ -367,7 +367,6 @@ uk:
     NEWPASSWORD: 'Новий пароль'
     PASSWORD: Пароль
     PLURALNAME: Члени
-    PROFILESAVESUCCESS: 'Збереження пройшло успішно.'
     REMEMBERME: 'Пам''ятати мене наступного разу?'
     SINGULARNAME: Член
     SUBJECTPASSWORDCHANGED: 'Ваш пароль змінено'
@@ -410,7 +409,7 @@ uk:
     TWODIGITYEAR: 'Two-digit year'
   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>'
+    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'
     ResultNone: 'No changes'
@@ -422,6 +421,7 @@ uk:
   ModelAdmin:
     DELETE: Delete
     DELETEDRECORDS: 'Deleted {count} records.'
+    EMPTYBEFOREIMPORT: 'Clear Database before import'
     IMPORT: 'Імпортувати з CSV'
     IMPORTEDRECORDS: 'Imported {count} records.'
     NOCSVFILE: 'Please browse for a CSV file to import'
@@ -472,6 +472,7 @@ uk:
     SINGULARNAME: 'Permission Role Code'
   Permissions:
     PERMISSIONS_CATEGORY: 'Roles and access permissions'
+    UserPermissionsIntro: 'Assigning groups to this user will adjust the permissions they have. See the groups section for details of permissions on individual groups.'
   PhoneNumberField:
     VALIDATION: 'Будь ласка, введіть дійсний номер телефону'
   RelationComplexTableField.ss:

lang/uz.yml

@@ -1,7 +1,6 @@
 uz:
   AssetAdmin:
-    ADDFILES: 'Add files'
+    ALLOWEDEXTS: 'Allowed extensions'
-    EditOrgMenu: 'Edit & organize'
     NEWFOLDER: NewFolder
   AssetTableField:
     CREATED: 'First uploaded'
@@ -72,7 +71,7 @@ uz:
     ACCESSALLINTERFACESHELP: 'Overrules more specific access settings.'
     SAVE: Saqlash
   CMSProfileController:
-    MENUTITLE: CMSProfileController
+    MENUTITLE: 'My Profile'
   ChangePasswordEmail.ss:
     CHANGEPASSWORDTEXT1: 'You changed your password for'
     CHANGEPASSWORDTEXT2: 'You can now use the following credentials to log in:'
@@ -258,7 +257,7 @@ uz:
     many_many_Members: 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>'
-    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>'
+    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'
     ResultUpdated: 'Updated %d groups'
@@ -348,6 +347,7 @@ uz:
     BUTTONLOGIN: 'Log in'
     BUTTONLOGINOTHER: 'Log in as someone else'
     BUTTONLOSTPASSWORD: 'I''ve lost my password'
+    CANTEDIT: 'You don''t have permission to do that'
     CONFIRMNEWPASSWORD: 'Confirm New Password'
     CONFIRMPASSWORD: 'Confirm Password'
     DATEFORMAT: 'Date format'
@@ -367,7 +367,6 @@ uz:
     NEWPASSWORD: 'New Password'
     PASSWORD: Password
     PLURALNAME: Members
-    PROFILESAVESUCCESS: 'Successfully saved.'
     REMEMBERME: 'Remember me next time?'
     SINGULARNAME: Member
     SUBJECTPASSWORDCHANGED: 'Your password has been changed'
@@ -410,7 +409,7 @@ uz:
     TWODIGITYEAR: 'Two-digit year'
   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>'
+    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'
     ResultNone: 'No changes'
@@ -422,6 +421,7 @@ uz:
   ModelAdmin:
     DELETE: Delete
     DELETEDRECORDS: 'Deleted {count} records.'
+    EMPTYBEFOREIMPORT: 'Clear Database before import'
     IMPORT: 'Import from CSV'
     IMPORTEDRECORDS: 'Imported {count} records.'
     NOCSVFILE: 'Please browse for a CSV file to import'
@@ -472,6 +472,7 @@ uz:
     SINGULARNAME: 'Permission Role Code'
   Permissions:
     PERMISSIONS_CATEGORY: 'Roles and access permissions'
+    UserPermissionsIntro: 'Assigning groups to this user will adjust the permissions they have. See the groups section for details of permissions on individual groups.'
   PhoneNumberField:
     VALIDATION: 'Please enter a valid phone number'
   RelationComplexTableField.ss:

lang/vi_VN.yml

@@ -1,7 +1,6 @@
 vi_VN:
   AssetAdmin:
-    ADDFILES: 'Add files'
+    ALLOWEDEXTS: 'Allowed extensions'
-    EditOrgMenu: 'Edit & organize'
     NEWFOLDER: NewFolder
   AssetTableField:
     CREATED: 'First uploaded'
@@ -72,7 +71,7 @@ vi_VN:
     ACCESSALLINTERFACESHELP: 'Overrules more specific access settings.'
     SAVE: Lưu
   CMSProfileController:
-    MENUTITLE: CMSProfileController
+    MENUTITLE: 'My Profile'
   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:'
@@ -87,7 +86,7 @@ vi_VN:
     SUCCESSADD2: 'Added {name}'
     SUCCESSEDIT: 'Saved %s %s %s'
   ComplexTableField.ss:
-    ADDITEM: 'Add %s'
+    ADDITEM: Thêm
     NOITEMSFOUND: 'No items found'
     SORTASC: 'Sort ascending'
     SORTDESC: 'Sort descending'
@@ -258,7 +257,7 @@ vi_VN:
     many_many_Members: 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>'
-    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>'
+    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'
     ResultUpdated: 'Updated %d groups'
@@ -348,6 +347,7 @@ vi_VN:
     BUTTONLOGIN: 'Log in'
     BUTTONLOGINOTHER: 'Log in as someone else'
     BUTTONLOSTPASSWORD: 'I''ve lost my password'
+    CANTEDIT: 'You don''t have permission to do that'
     CONFIRMNEWPASSWORD: 'Confirm New Password'
     CONFIRMPASSWORD: 'Confirm Password'
     DATEFORMAT: 'Date format'
@@ -367,7 +367,6 @@ vi_VN:
     NEWPASSWORD: 'New Password'
     PASSWORD: Password
     PLURALNAME: Members
-    PROFILESAVESUCCESS: 'Successfully saved.'
     REMEMBERME: 'Remember me next time?'
     SINGULARNAME: Member
     SUBJECTPASSWORDCHANGED: 'Thay đổi mật khẩu'
@@ -410,7 +409,7 @@ vi_VN:
     TWODIGITYEAR: 'Two-digit year'
   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>'
+    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'
     ResultNone: 'No changes'
@@ -422,6 +421,7 @@ vi_VN:
   ModelAdmin:
     DELETE: Delete
     DELETEDRECORDS: 'Deleted {count} records.'
+    EMPTYBEFOREIMPORT: 'Clear Database before import'
     IMPORT: 'Import from CSV'
     IMPORTEDRECORDS: 'Imported {count} records.'
     NOCSVFILE: 'Please browse for a CSV file to import'
@@ -472,6 +472,7 @@ vi_VN:
     SINGULARNAME: 'Permission Role Code'
   Permissions:
     PERMISSIONS_CATEGORY: 'Roles and access permissions'
+    UserPermissionsIntro: 'Assigning groups to this user will adjust the permissions they have. See the groups section for details of permissions on individual groups.'
   PhoneNumberField:
     VALIDATION: 'Please enter a valid phone number'
   RelationComplexTableField.ss:

lang/zh_CN.yml

@@ -1,7 +1,6 @@
 zh_CN:
   AssetAdmin:
-    ADDFILES: 'Add files'
+    ALLOWEDEXTS: 'Allowed extensions'
-    EditOrgMenu: 'Edit & organize'
     NEWFOLDER: 新建文件夹
   AssetTableField:
     CREATED: 第一次被上传
@@ -21,7 +20,7 @@ zh_CN:
     EDITALL: 'Edit all'
     EDITANDORGANIZE: 'Edit & organize'
     EDITINFO: 'Edit files'
-    FILES: 文件
+    FILES: Files
     FROMCOMPUTER: 'Choose files from your computer'
     FROMCOMPUTERINFO: 'Upload from your computer'
     TOTAL: Total
@@ -72,7 +71,7 @@ zh_CN:
     ACCESSALLINTERFACESHELP: 'Overrules more specific access settings.'
     SAVE: 保存
   CMSProfileController:
-    MENUTITLE: CMSProfileController
+    MENUTITLE: 'My Profile'
   ChangePasswordEmail.ss:
     CHANGEPASSWORDTEXT1: 您已更改了登陆%s的密码
     CHANGEPASSWORDTEXT2: 您现在可以用下列权限信息进行登路：
@@ -87,7 +86,7 @@ zh_CN:
     SUCCESSADD2: 'Added {name}'
     SUCCESSEDIT: 'Saved %s %s %s'
   ComplexTableField.ss:
-    ADDITEM: 'Add %s'
+    ADDITEM: 新加
     NOITEMSFOUND: 'No items found'
     SORTASC: 正序排列
     SORTDESC: 倒序排列
@@ -181,7 +180,7 @@ zh_CN:
     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: File
     FROMCOMPUTER: 'From your Computer'
     FROMFILESTORE: 'From the File Store'
     NOSOURCE: 'Please select a source file to attach'
@@ -234,7 +233,7 @@ zh_CN:
   GridFieldDetailForm:
     CancelBtn: Cancel
     Create: Create
-    Delete: 删除
+    Delete: Delete
     DeletePermissionsFailure: 'No delete permissions'
     Deleted: 'Deleted %s %s'
     Save: Save
@@ -258,7 +257,7 @@ zh_CN:
     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>'
-    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>'
+    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'
     ResultUpdated: 'Updated %d groups'
@@ -348,6 +347,7 @@ zh_CN:
     BUTTONLOGIN: 登录
     BUTTONLOGINOTHER: 使用其他帐户登录
     BUTTONLOSTPASSWORD: 忘记密码
+    CANTEDIT: 'You don''t have permission to do that'
     CONFIRMNEWPASSWORD: 确认新密码
     CONFIRMPASSWORD: 确认密码
     DATEFORMAT: 'Date format'
@@ -367,7 +367,6 @@ zh_CN:
     NEWPASSWORD: 新密码
     PASSWORD: 密码
     PLURALNAME: 成员
-    PROFILESAVESUCCESS: 'Successfully saved.'
     REMEMBERME: 记住我的信息？
     SINGULARNAME: 成员
     SUBJECTPASSWORDCHANGED: 您的密码已更改
@@ -410,7 +409,7 @@ zh_CN:
     TWODIGITYEAR: 'Two-digit year'
   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>'
+    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'
     ResultNone: 'No changes'
@@ -422,6 +421,7 @@ zh_CN:
   ModelAdmin:
     DELETE: 删除
     DELETEDRECORDS: 'Deleted {count} records.'
+    EMPTYBEFOREIMPORT: 'Clear Database before import'
     IMPORT: 'Import from CSV'
     IMPORTEDRECORDS: 'Imported {count} records.'
     NOCSVFILE: 'Please browse for a CSV file to import'
@@ -472,6 +472,7 @@ zh_CN:
     SINGULARNAME: 'Permission Role Code'
   Permissions:
     PERMISSIONS_CATEGORY: 'Roles and access permissions'
+    UserPermissionsIntro: 'Assigning groups to this user will adjust the permissions they have. See the groups section for details of permissions on individual groups.'
   PhoneNumberField:
     VALIDATION: 请输入有效电话号码
   RelationComplexTableField.ss:

lang/zh_TW.yml

@@ -1,7 +1,6 @@
 zh_TW:
   AssetAdmin:
-    ADDFILES: 'Add files'
+    ALLOWEDEXTS: 'Allowed extensions'
-    EditOrgMenu: 'Edit & organize'
     NEWFOLDER: 新資料夾
   AssetTableField:
     CREATED: 第一次上傳
@@ -72,7 +71,7 @@ zh_TW:
     ACCESSALLINTERFACESHELP: 'Overrules more specific access settings.'
     SAVE: 儲存
   CMSProfileController:
-    MENUTITLE: CMSProfileController
+    MENUTITLE: 'My Profile'
   ChangePasswordEmail.ss:
     CHANGEPASSWORDTEXT1: 您為這個帳戶改密碼：
     CHANGEPASSWORDTEXT2: 您可以用下列的帳號密碼登入：
@@ -87,7 +86,7 @@ zh_TW:
     SUCCESSADD2: 'Added {name}'
     SUCCESSEDIT: 'Saved %s %s %s'
   ComplexTableField.ss:
-    ADDITEM: 'Add %s'
+    ADDITEM: 新增
     NOITEMSFOUND: 'No items found'
     SORTASC: 向上排序
     SORTDESC: 向下排序
@@ -181,7 +180,7 @@ zh_TW:
     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: File
     FROMCOMPUTER: 'From your Computer'
     FROMFILESTORE: 'From the File Store'
     NOSOURCE: 'Please select a source file to attach'
@@ -258,7 +257,7 @@ zh_TW:
     many_many_Members: 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>'
-    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>'
+    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'
     ResultUpdated: 'Updated %d groups'
@@ -348,6 +347,7 @@ zh_TW:
     BUTTONLOGIN: 登入
     BUTTONLOGINOTHER: 用別的帳戶登入
     BUTTONLOSTPASSWORD: 忘記密碼
+    CANTEDIT: 'You don''t have permission to do that'
     CONFIRMNEWPASSWORD: 確認新密碼
     CONFIRMPASSWORD: 確認密碼
     DATEFORMAT: 'Date format'
@@ -367,7 +367,6 @@ zh_TW:
     NEWPASSWORD: 新密碼
     PASSWORD: 密碼
     PLURALNAME: Members
-    PROFILESAVESUCCESS: 'Successfully saved.'
     REMEMBERME: 下次記住我
     SINGULARNAME: Member
     SUBJECTPASSWORDCHANGED: 密碼更改成功。
@@ -410,7 +409,7 @@ zh_TW:
     TWODIGITYEAR: 'Two-digit year'
   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>'
+    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'
     ResultNone: 'No changes'
@@ -422,6 +421,7 @@ zh_TW:
   ModelAdmin:
     DELETE: Delete
     DELETEDRECORDS: 'Deleted {count} records.'
+    EMPTYBEFOREIMPORT: 'Clear Database before import'
     IMPORT: 'Import from CSV'
     IMPORTEDRECORDS: 'Imported {count} records.'
     NOCSVFILE: 'Please browse for a CSV file to import'
@@ -472,6 +472,7 @@ zh_TW:
     SINGULARNAME: 'Permission Role Code'
   Permissions:
     PERMISSIONS_CATEGORY: 'Roles and access permissions'
+    UserPermissionsIntro: 'Assigning groups to this user will adjust the permissions they have. See the groups section for details of permissions on individual groups.'
   PhoneNumberField:
     VALIDATION: 請輸入有效的電話號碼
   RelationComplexTableField.ss:

scss/GridField.scss

@@ -156,21 +156,17 @@ $gf_grid_x:	16px;
 				cursor: pointer;
 			}
 			td {
+				width: auto;
+				max-width: 500px; //This number is semi-arbitary. It is acting as a percentage limit, rather than actually constricting the width to 500px.
+				word-wrap:break-word;
 				// Give browser some hints on which cols take priority:
 				// The last column (buttons) should always shrink to fit.
-				// Overwritten for IE7, which doesn't support this.
+				// Overwritten for IE7, which doesn't support this.			
-				width: auto;
-				white-space:nowrap;
 				&.col-buttons {
 					width: 40px;
 					padding:0 $gf_grid_x/2;
 					text-align: left;
 				}
-
-				&.col-description {
-					width: auto;
-				}
-
 				&.col-listChildrenLink {
 					width:$gf_grid_x;
 					border-right:none;

templates/forms/TabSet.ss

@@ -1,4 +1,4 @@
-<div $AttributesHTML>
+<div $getAttributesHTML("class") class="ss-tabset $extraClass">
 	<ul>
 	<% loop Tabs %>
 		<li class="$FirstLast $MiddleString $extraClass"><a href="#$id" id="tab-$id">$Title</a></li>

tests/filesystem/FileNameFilterTest.php

@@ -53,5 +53,59 @@ class FileNameFilterTest extends SapphireTest {
 			strlen($result)
 		);
 	}
-	
+
+	public function testUnderscoresStartOfNameRemoved() {
+		$name = '_test.txt';
+		$filter = new FileNameFilter();
+		$this->assertEquals('test.txt', $filter->filter($name));
+	}
+
+	public function testDoubleUnderscoresStartOfNameRemoved() {
+		$name = '__test.txt';
+		$filter = new FileNameFilter();
+		$this->assertEquals('test.txt', $filter->filter($name));
+	}
+
+	public function testDotsStartOfNameRemoved() {
+		$name = '.test.txt';
+		$filter = new FileNameFilter();
+		$this->assertEquals('test.txt', $filter->filter($name));
+	}
+
+	public function testDoubleDotsStartOfNameRemoved() {
+		$name = '..test.txt';
+		$filter = new FileNameFilter();
+		$this->assertEquals('test.txt', $filter->filter($name));
+	}
+
+	public function testMixedInvalidCharsStartOfNameRemoved() {
+		$name = '..#@$#@$^__test.txt';
+		$filter = new FileNameFilter();
+		$this->assertEquals('test.txt', $filter->filter($name));
+	}
+
+	public function testWhitespaceRemoved() {
+		$name = ' test doc.txt';
+		$filter = new FileNameFilter();
+		$this->assertEquals('test-doc.txt', $filter->filter($name));
+	}
+
+	public function testUnderscoresReplacedWithDashes() {
+		$name = 'test_doc.txt';
+		$filter = new FileNameFilter();
+		$this->assertEquals('test-doc.txt', $filter->filter($name));
+	}
+
+	public function testNonAsciiCharsReplacedWithDashes() {
+		$name = '!@#$%^test_123@##@$#%^.txt';
+		$filter = new FileNameFilter();
+		$this->assertEquals('test-123.txt', $filter->filter($name));
+	}
+
+	public function testDuplicateDashesRemoved() {
+		$name = 'test--document.txt';
+		$filter = new FileNameFilter();
+		$this->assertEquals('test-document.txt', $filter->filter($name));
+	}
+
 }

tests/forms/DropdownFieldTest.php

@@ -82,67 +82,47 @@ class DropdownFieldTest extends SapphireTest {
 	
 	public function testNumberOfSelectOptionsAvailable() {
 		/* Create a field with a blank value */
-		$field = $this->testDropdownField('(Any)');
+		$field = $this->createDropdownField('(Any)');
-		
-		/* 3 options are available */
 		$this->assertEquals(count($this->findOptionElements($field->Field())), 3, '3 options are available');
-		
-		/* There is one selected option, since a dropdown can only possibly have one! */
 		$selectedOptions = $this->findSelectedOptionElements($field->Field());
 		$this->assertEquals(count($selectedOptions), 1,
 			'We only have 1 selected option, since a dropdown can only possibly have one!');
 		
 		/* Create a field without a blank value */
-		$field = $this->testDropdownField();
+		$field = $this->createDropdownField();
-		
-		/* 2 options are available */
 		$this->assertEquals(count($this->findOptionElements($field->Field())), 2, '2 options are available');
-		
-		/* There are no selected options */
 		$selectedOptions = $this->findSelectedOptionElements($field->Field());
 		$this->assertEquals(count($selectedOptions), 0, 'There are no selected options');
 	}
 	
 	public function testIntegerZeroValueSeelctedOptionBehaviour() {
-		$field = $this->testDropdownField('(Any)', 0);
+		$field = $this->createDropdownField('(Any)', 0);
 		$selectedOptions = $this->findSelectedOptionElements($field->Field());
-		
-		/* The selected option is "No" */
 		$this->assertEquals((string) $selectedOptions[0], 'No', 'The selected option is "No"');
 	}
 
 	public function testBlankStringValueSelectedOptionBehaviour() {
-		$field = $this->testDropdownField('(Any)');
+		$field = $this->createDropdownField('(Any)');
 		$selectedOptions = $this->findSelectedOptionElements($field->Field());
-		
-		/* The selected option is "(Any)" */
 		$this->assertEquals((string) $selectedOptions[0], '(Any)', 'The selected option is "(Any)"');
 	}
 	
 	public function testNullValueSelectedOptionBehaviour() {
-		$field = $this->testDropdownField('(Any)', null);
+		$field = $this->createDropdownField('(Any)', null);
 		$selectedOptions = $this->findSelectedOptionElements($field->Field());
-
-		/* The selected option is "(Any)" */
 		$this->assertEquals((string) $selectedOptions[0], '(Any)', 'The selected option is "(Any)"');
 	}
 	
 	public function testStringValueSelectedOptionBehaviour() {
-		$field = $this->testDropdownField('(Any)', '1');
+		$field = $this->createDropdownField('(Any)', '1');
 		$selectedOptions = $this->findSelectedOptionElements($field->Field());
-		
-		/* The selected option is "Yes" */
 		$this->assertEquals((string) $selectedOptions[0], 'Yes', 'The selected option is "Yes"');
-		
 		$field->setSource(array(
 			'Cats' => 'Cats and Kittens',
 			'Dogs' => 'Dogs and Puppies'
 		));
 		$field->setValue('Cats');
-
 		$selectedOptions = $this->findSelectedOptionElements($field->Field());
-		
-		/* The selected option is "Cats and Kittens" */
 		$this->assertEquals((string) $selectedOptions[0], 'Cats and Kittens',
 			'The selected option is "Cats and Kittens"');
 	}
@@ -156,7 +136,7 @@ class DropdownFieldTest extends SapphireTest {
 	 * @param string|integer $value The default value of the field
 	 * @return DropdownField object
 	 */
-	public function testDropdownField($emptyString = null, $value = '') {
+	public function createDropdownField($emptyString = null, $value = '') {
 		/* Set up source, with 0 and 1 integers as the values */
 		$source = array(
 			0 => 'No',
@@ -164,7 +144,7 @@ class DropdownFieldTest extends SapphireTest {
 		);
 		
 		$field = new DropdownField('Field', null, $source, $value);
-		$field->setEmptyString($emptyString);
+		if($emptyString !== null) $field->setEmptyString($emptyString);
 
 		return $field;
 	}

tests/forms/FormFieldTest.php

@@ -5,6 +5,22 @@
  */
 class FormFieldTest extends SapphireTest {
 
+	public function testAddExtraClass() {
+		$field = new FormField('MyField');
+		$field->addExtraClass('class1');
+		$field->addExtraClass('class2');
+		$this->assertStringEndsWith('class1 class2', $field->extraClass());
+	}
+
+	public function testRemoveExtraClass() {
+		$field = new FormField('MyField');
+		$field->addExtraClass('class1');
+		$field->addExtraClass('class2');
+		$this->assertStringEndsWith('class1 class2', $field->extraClass());
+		$field->removeExtraClass('class1');
+		$this->assertStringEndsWith('class2', $field->extraClass());
+	}
+
 	public function testAttributes() {
 		$field = new FormField('MyField');
 		$field->setAttribute('foo', 'bar');
@@ -48,7 +64,7 @@ class FormFieldTest extends SapphireTest {
 		$this->assertNotContains('two="2"', $field->getAttributesHTML('one', 'two'));
 		$this->assertContains('three="3"', $field->getAttributesHTML('one', 'two'));
 	}
-	
+
 	public function testEveryFieldTransformsReadonlyAsClone() {
 		$fieldClasses = ClassInfo::subclassesFor('FormField');
 		foreach($fieldClasses as $fieldClass) {

tests/templates/SSViewerTestProcess.ss

@@ -0,0 +1,7 @@
+<html>
+	<% include SSViewerTestProcessHead %>
+
+	<body>
+		<% include SSViewerTestCommentsWithInclude %>
+	</body>
+</html>

tests/templates/SSViewerTestProcessHead.ss

@@ -0,0 +1,3 @@
+<head>
+	<% require javascript(framework/tests/forms/RequirementsTest_a.js) %>
+</head>

tests/view/SSViewerTest.php

@@ -1025,6 +1025,42 @@ after')
 		$result = $viewer->process(new ArrayData(array('List' => $list)));
 		$this->assertEquals($result, '');
 	}
+
+	public function testProcessOnlyIncludesRequirementsOnce() {
+		$template = new SSViewer(array('SSViewerTestProcess'));
+		$basePath = dirname($this->getCurrentRelativePath()) . '/forms';
+
+		$backend = new Requirements_Backend;
+		$backend->set_combined_files_enabled(false);
+		$backend->combine_files(
+			'RequirementsTest_ab.css',
+			array(
+				$basePath . '/RequirementsTest_a.css',
+				$basePath . '/RequirementsTest_b.css'
+			)
+		);
+
+		Requirements::set_backend($backend);
+
+		$this->assertEquals(1, substr_count($template->process(array()), "a.css"));
+		$this->assertEquals(1, substr_count($template->process(array()), "b.css"));
+
+		// if we disable the requirements then we should get nothing
+		$template->includeRequirements(false);
+		$this->assertEquals(0, substr_count($template->process(array()), "a.css"));
+		$this->assertEquals(0, substr_count($template->process(array()), "b.css"));
+	}
+
+	public function testRequireCallInTemplateInclude() {
+		$template = new SSViewer(array('SSViewerTestProcess'));
+		
+		Requirements::set_suffix_requirements(false);
+
+		$this->assertEquals(1, substr_count(
+			$template->process(array()), 
+			"tests/forms/RequirementsTest_a.js"
+		));
+	}
 }
 
 /**

thirdparty/jquery-ui/datepicker/i18n/jquery.ui.datepicker-en.js

@@ -19,7 +19,7 @@ jQuery(function($){
 		firstDay: 0,
 		isRTL: false,
 		showMonthAfterYear: false,
-		yearSuffix: ''
+		yearSuffix: ''};
 	$.datepicker.setDefaults($.datepicker.regional['en']);
 });
 

view/SSViewer.php

@@ -563,6 +563,11 @@ class SSViewer {
 	 */
 	protected static $current_custom_theme = null;
 
+	/**
+	 * @var boolean
+	 */
+	protected $includeRequirements = true;
+
 	/**
 	 * Create a template from a string instead of a .ss file
 	 * 
@@ -592,7 +597,7 @@ class SSViewer {
 	/**
 	 * Returns the path to the theme folder
 	 *
-	 * @return String
+	 * @return string
 	 */
 	public static function get_theme_folder() {
 		return self::current_theme() ? THEMES_DIR . "/" . self::current_theme() : project();
@@ -667,7 +672,11 @@ class SSViewer {
 	}
 	
 	/**
-	 * Returns true if at least one of the listed templates exists
+	 * Returns true if at least one of the listed templates exists.
+	 *
+	 * @param array $templates
+	 *
+	 * @return boolean
 	 */
 	public static function hasTemplate($templates) {
 		$manifest = SS_TemplateLoader::instance()->getManifest();
@@ -681,20 +690,25 @@ class SSViewer {
 	
 	/**
 	 * Set a global rendering option.
+	 *
 	 * The following options are available:
 	 *  - rewriteHashlinks: If true (the default), <a href="#..."> will be rewritten to contain the 
 	 *    current URL.  This lets it play nicely with our <base> tag.
 	 *  - If rewriteHashlinks = 'php' then, a piece of PHP script will be inserted before the hash 
 	 *    links: "<?php echo $_SERVER['REQUEST_URI']; ?>".  This is useful if you're generating a 
 	 *    page that will be saved to a .php file and may be accessed from different URLs.
+	 *
+	 * @param string $optionName
+	 * @param mixed $optionVal
 	 */
 	public static function setOption($optionName, $optionVal) {
 		SSViewer::$options[$optionName] = $optionVal;
 	}
 	
 	/**
- 	 * @param String
+ 	 * @param string
- 	 * @return Mixed
+ 	 *
+ 	 * @return mixed
 	 */
 	public static function getOption($optionName) {
 		return SSViewer::$options[$optionName];
@@ -705,6 +719,7 @@ class SSViewer {
 	);
     
 	protected static $topLevel = array();
+
 	public static function topLevel() {
 		if(SSViewer::$topLevel) {
 			return SSViewer::$topLevel[sizeof(SSViewer::$topLevel)-1];
@@ -728,6 +743,7 @@ class SSViewer {
 	/**
 	 * @param string $identifier A template name without '.ss' extension or path
 	 * @param string $type The template type, either "main", "Includes" or "Layout"
+	 *
 	 * @return string Full system path to a template file
 	 */
 	public static function getTemplateFileByType($identifier, $type) {
@@ -766,6 +782,7 @@ class SSViewer {
 
 	/**
 	 * Set the cache object to use when storing / retrieving partial cache blocks.
+	 *
 	 * @param Zend_Cache_Core $cache
 	 */
 	public function setPartialCacheStore($cache) {
@@ -773,13 +790,23 @@ class SSViewer {
 	}
 
 	/**
-	 * Get the cache object to use when storing / retrieving partial cache blocks
+	 * Get the cache object to use when storing / retrieving partial cache blocks.
+	 *
 	 * @return Zend_Cache_Core
 	 */
 	public function getPartialCacheStore() {
 		return $this->partialCacheStore ? $this->partialCacheStore : SS_Cache::factory('cacheblock');
 	}
 
+	/**
+	 * Flag whether to include the requirements in this response.
+	 *
+	 * @param boolean
+	 */
+	public function includeRequirements($incl = true) {
+		$this->includeRequirements = $incl;
+	}
+
 	/**
 	 * An internal utility function to set up variables in preparation for including a compiled
 	 * template, then do the include
@@ -790,6 +817,7 @@ class SSViewer {
 	 * @param Object $item - The item to use as the root scope for the template
 	 * @param array|null $overlay - Any variables to layer on top of the scope
 	 * @param array|null $underlay - Any variables to layer underneath the scope
+	 *
 	 * @return string - The result of executing the template
 	 */
 	protected function includeGeneratedTemplate($cacheFile, $item, $overlay, $underlay) {
@@ -814,15 +842,18 @@ class SSViewer {
 
 	/**
 	 * The process() method handles the "meat" of the template processing.
-	 * It takes care of caching the output (via {@link SS_Cache}),
+	 *
-	 * as well as replacing the special "$Content" and "$Layout"
+	 * It takes care of caching the output (via {@link SS_Cache}), as well as 
-	 * placeholders with their respective subtemplates.
+	 * replacing the special "$Content" and "$Layout" placeholders with their 
+	 * respective subtemplates.
+	 *
 	 * The method injects extra HTML in the header via {@link Requirements::includeInHTML()}.
 	 * 
 	 * Note: You can call this method indirectly by {@link ViewableData->renderWith()}.
 	 * 
 	 * @param ViewableData $item
-	 * @param SS_Cache $cache Optional cache backend
+	 * @param SS_Cache $cache Optional cache backend.
+	 *
 	 * @return String Parsed template output.
 	 */
 	public function process($item, $arguments = null) {
@@ -863,14 +894,18 @@ class SSViewer {
 		foreach(array('Content', 'Layout') as $subtemplate) {
 			if(isset($this->chosenTemplates[$subtemplate])) {
 				$subtemplateViewer = new SSViewer($this->chosenTemplates[$subtemplate]);
+				$subtemplateViewer->includeRequirements(false);
 				$subtemplateViewer->setPartialCacheStore($this->getPartialCacheStore());
 
 				$underlay[$subtemplate] = $subtemplateViewer->process($item, $arguments);
 			}
 		}
 
-		$val = $this->includeGeneratedTemplate($cacheFile, $item, $arguments, $underlay);
+		$output = $this->includeGeneratedTemplate($cacheFile, $item, $arguments, $underlay);
-		$output = Requirements::includeInHTML($template, $val);
+		
+		if($this->includeRequirements) {
+			$output = Requirements::includeInHTML($template, $output);
+		}
 		
 		array_pop(SSViewer::$topLevel);
 
@@ -882,6 +917,7 @@ class SSViewer {
 				} else { 
 					$thisURLRelativeToBase = strip_tags($_SERVER['REQUEST_URI']); 
 				}
+
 				$output = preg_replace('/(<a[^>]+href *= *)"#/i', '\\1"' . $thisURLRelativeToBase . '#', $output);
 			}
 		}
@@ -895,6 +931,8 @@ class SSViewer {
 	 */
 	public static function execute_template($template, $data, $arguments = null) {
 		$v = new SSViewer($template);
+		$v->includeRequirements(false);
+
 		return $v->process($data, $arguments);
 	}